From e20c99ba42ca6ac017bb6535011f84f42f647885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 5 Aug 2016 21:25:45 +0200 Subject: [PATCH 0001/3392] package/mpd: bump to version 0.19.18 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/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 2395cb7bad..4b564bf5b2 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 487ec8ad2b1c1c193c2a7c8975a8b8fe2e4f0335bcc2e9356b2b34a0179fb2f7 mpd-0.19.17.tar.xz +sha256 764c991c54980cb97e876e3f65d63410c0c561b7be996b832e058053e005ed47 mpd-0.19.18.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 6e2cf8c90e..e88261d2f9 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.19 -MPD_VERSION = $(MPD_VERSION_MAJOR).17 +MPD_VERSION = $(MPD_VERSION_MAJOR).18 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost libglib2 From 05e8d6af1bac8093825fcb388eab07f1e0752f83 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 9 Aug 2016 10:07:37 +0100 Subject: [PATCH 0002/3392] diffutils: bump version to 3.4 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/diffutils/diffutils.hash | 2 +- package/diffutils/diffutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/diffutils/diffutils.hash b/package/diffutils/diffutils.hash index 27eace2844..2094e9755b 100644 --- a/package/diffutils/diffutils.hash +++ b/package/diffutils/diffutils.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c diffutils-3.3.tar.xz +sha256 db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2 diffutils-3.4.tar.xz diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 191fd2e172..9370f66d55 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIFFUTILS_VERSION = 3.3 +DIFFUTILS_VERSION = 3.4 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) From 067b268fe0423b17f4eff90940707ea45b52daaa Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 9 Aug 2016 10:07:38 +0100 Subject: [PATCH 0003/3392] sqlite: bump version to 3.14.0 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 4 ++-- package/sqlite/sqlite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index ce03e1ecd3..b4db80d90b 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,4 +1,4 @@ # From http://www.sqlite.org/download.html -sha1 f6f76e310389e3f510b23826f805850449ae8653 sqlite-autoconf-3130000.tar.gz +sha1 f0ed10b416c467062c76b899f08c773c713fb8fd sqlite-autoconf-3140000.tar.gz # Calculated based on the hash above -sha256 e2797026b3310c9d08bd472f6d430058c6dd139ff9d4e30289884ccd9744086b sqlite-autoconf-3130000.tar.gz +sha256 742db0ebbd9cc91ed6a41857f50aa9795fc859c994a256125135cd07f6cdfd76 sqlite-autoconf-3140000.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 0dadd76516..9703f82de3 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3130000 +SQLITE_VERSION = 3140000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2016 SQLITE_LICENSE = Public domain From f6a582815a48e2fe0b494b7cca8bd9eeb6af0d02 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 9 Aug 2016 22:34:01 -0300 Subject: [PATCH 0004/3392] libgtk3: bump to version 3.20.8 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index b6998a4968..e665d2130c 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.20/gtk+-3.20.6.sha256sum -sha256 3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2 gtk+-3.20.6.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.20/gtk+-3.20.8.sha256sum +sha256 9841bd9b4d23c045c474b10fdde9da958af904b63783701e796391d55d4396f3 gtk+-3.20.8.tar.xz diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 08d172fdbe..0c93d89bb8 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.20 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).6 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).8 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPLv2+ From bfc66f2585b3823da11ac65d9ca6d37d3a1f53a4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 9 Aug 2016 22:34:17 -0300 Subject: [PATCH 0005/3392] libinput: bump to version 1.4.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libinput/libinput.hash | 4 ++-- package/libinput/libinput.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index 9f628ccd27..a1a7ca2fec 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-July/030121.html -sha256 76ef10874519d1a67b57e5c68ede06106b9fbf611a3ecf69c84886107c67b420 libinput-1.4.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2016-August/030348.html +sha256 26e7b3ab499358caba499705680ea7e5851af2bd37dc32f2be64181610d6392a libinput-1.4.1.tar.xz diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 01b677203d..5ce51c2096 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.4.0 +LIBINPUT_VERSION = 1.4.1 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From 6c418fdc410bbf0a6418ccea32c544fe94945749 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 10 Aug 2016 10:35:34 +0100 Subject: [PATCH 0006/3392] lvm2: bump version to 2.02.163 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 65945a1fdc..18bd62c5a0 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 9544bb7706488ac128d477af7294bcfd7b7e47cb0b1d604ea52c4545d6c3a5a71311945994dd1114cb1ce086d2006a35ef1d8b0fdd3082dfe5cc468cb0168057 LVM2.2.02.162.tgz +sha512 6316505e185673471a3434aec10f7978461688eb6c8391b02326a09bd0e83f8bedb2cbccb3c8dd2be0475bf516443ef23f09d1001bcff5b0dfd40941b3f1aefc LVM2.2.02.163.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 8a51120ef1..11eedbed1d 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.162 +LVM2_VERSION = 2.02.163 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES From a60010930da3e6db96b1c6961eadc9f08e1d6c15 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 10 Aug 2016 07:20:04 -0300 Subject: [PATCH 0007/3392] vala: bump to version 0.32.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index 930196430a..4a4a41c8dc 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,2 +1,2 @@ -# From https://download.gnome.org/sources/vala/0.32/vala-0.32.0.sha256sum -sha256 07a2aa4ede040789b4b5af817a42249d703bfe8affccb7732ca2b53d00c1fb6e vala-0.32.0.tar.xz +# From https://download.gnome.org/sources/vala/0.32/vala-0.32.1.sha256sum +sha256 dd0d47e548a34cfb1e4b04149acd082a86414c49057ffb79902eb9a508a161a9 vala-0.32.1.tar.xz diff --git a/package/vala/vala.mk b/package/vala/vala.mk index b236c54f9c..4cdc0d71a8 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ################################################################################ VALA_VERSION_MAJOR = 0.32 -VALA_VERSION = $(VALA_VERSION_MAJOR).0 +VALA_VERSION = $(VALA_VERSION_MAJOR).1 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPLv2.1+ From 1e5ec4683a120d6b062acf3e4edb2c4210837a62 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 9 Aug 2016 23:31:04 -0300 Subject: [PATCH 0008/3392] libtasn1: bump to version 4.9 Add upstream patch to fix build failure with gcc warnings on. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...gure-don-t-add-Werror-to-build-flags.patch | 28 +++++++++++++++++++ package/libtasn1/libtasn1.hash | 2 +- package/libtasn1/libtasn1.mk | 4 ++- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 package/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch diff --git a/package/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch b/package/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch new file mode 100644 index 0000000000..387ba7aa3b --- /dev/null +++ b/package/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch @@ -0,0 +1,28 @@ +From dd091c8af163213e12aa92f61bc4916e0f102633 Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos +Date: Tue, 26 Jul 2016 08:45:33 +0200 +Subject: [PATCH] configure: don't add -Werror to build flags + +Signed-off-by: Gustavo Zacarias +--- +Patch status: upstream + + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7a14e04..066f5fe 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -70,8 +70,6 @@ AC_ARG_ENABLE([gcc-warnings], + ) + + if test "$gl_gcc_warnings" = yes; then +- gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) +- + nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings + nw="$nw -Wc++-compat" # We don't care strongly about C++ compilers + nw="$nw -Wtraditional" # Warns on #elif which we use often +-- +2.7.3 + diff --git a/package/libtasn1/libtasn1.hash b/package/libtasn1/libtasn1.hash index dc65210387..5b2100e87d 100644 --- a/package/libtasn1/libtasn1.hash +++ b/package/libtasn1/libtasn1.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 fa802fc94d79baa00e7397cedf29eb6827d4bd8b4dd77b577373577c93a8c513 libtasn1-4.8.tar.gz +sha256 4f6f7a8fd691ac2b8307c8ca365bad711db607d4ad5966f6938a9d2ecd65c920 libtasn1-4.9.tar.gz diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk index c51d8c0072..6b7e6b3364 100644 --- a/package/libtasn1/libtasn1.mk +++ b/package/libtasn1/libtasn1.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTASN1_VERSION = 4.8 +LIBTASN1_VERSION = 4.9 LIBTASN1_SITE = http://ftp.gnu.org/gnu/libtasn1 LIBTASN1_DEPENDENCIES = host-bison LIBTASN1_LICENSE = GPLv3+, LGPLv2.1+ @@ -12,5 +12,7 @@ LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB LIBTASN1_INSTALL_STAGING = YES # 'missing' fallback logic botched so disable it completely LIBTASN1_CONF_ENV = MAKEINFO="true" +# For 0001-configure-don-t-add-Werror-to-build-flags.patch +LIBTASN1_AUTORECONF = YES $(eval $(autotools-package)) From 6525c6d2283771061c269956486c1fd1ee5a7320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Poggi?= Date: Fri, 12 Aug 2016 13:10:56 +0200 Subject: [PATCH 0009/3392] barebox: bump version to 2016.08 Signed-off-by: Raphael Poggi 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 fd5cb8ccbf..1548b0d2cd 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2016.06.0" + bool "2016.08.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2016.06.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2016.08.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 9db68eb2e9..adcd4e0b97 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,5 +1,5 @@ -# http://www.barebox.org/download/barebox-2016.06.0.tar.bz2.md5 -md5 7dac834e637db66e624bf058e9310212 barebox-2016.06.0.tar.bz2 +# http://www.barebox.org/download/barebox-2016.08.0.tar.bz2.md5 +md5 66b8f79d337fa4a7bb8744b1a7867474 barebox-2016.08.0.tar.bz2 # Locally calculated -sha256 a214167c55bf691f686397379e8b9557a1d597e56b7c1bf9607b478a1c4c597e barebox-2016.06.0.tar.bz2 +sha256 610d3422137f0e6e9a72f51caad17d1b2c46314ee03b2ae35799a1c5425478ab barebox-2016.08.0.tar.bz2 From 9e44acf092543337b489833b75c50d41cdbf49ad Mon Sep 17 00:00:00 2001 From: Rodrigo Rebello Date: Thu, 11 Aug 2016 22:00:14 -0300 Subject: [PATCH 0010/3392] irssi: bump to version 0.8.19 Signed-off-by: Rodrigo Rebello Signed-off-by: Peter Korsgaard --- package/irssi/irssi.hash | 2 +- package/irssi/irssi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index fa49d8594a..f65d6c3658 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 c0a177f749757c2d171ebe49ab0f0dd9cf9374dea81ab01904d0549bcb057840 irssi-0.8.18.tar.xz +sha256 4ca0040548e814ea93eb7d602ab7d6d379afcbbdf10e84160523ce69c73ee5d3 irssi-0.8.19.tar.xz diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index 8272e4404f..a1e278e6ca 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 0.8.18 +IRSSI_VERSION = 0.8.19 IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz # Do not use the github helper here. The generated tarball is *NOT* the # same as the one uploaded by upstream for the release. From f892015d78eb0f2cc7ddd754beabcf41bfa6da6b Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 11 Aug 2016 20:58:05 -0700 Subject: [PATCH 0011/3392] package/docker-engine: bump to v1.12.0 Bump docker-engine to the latest stable v1.12.0 from v1.12.0-rc3. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 1de09f84b0..6078fbfd40 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 bc256d2a348efbf236eab991254c925fa1917dd1e29cb40586f1696f4e24852e docker-engine-v1.12.0-rc4.tar.gz +sha256 f8139acba98248eb1fdb0b6d94efee89b876f9a50d00e263dc144fd2b0c372d4 docker-engine-v1.12.0.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 80b00410ea..3d39aac4cb 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = v1.12.0-rc4 +DOCKER_ENGINE_VERSION = v1.12.0 DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 6ad14a368798619d67d68a3b297333c153230ae1 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 13 Aug 2016 10:58:23 -0700 Subject: [PATCH 0012/3392] package/runc: bump version to cc29e3 Bump runc to cc29e3dded8e27ba8f65738f40d251c885030a28 This version is required by Docker Engine v1.12.0. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index e6ec483ac2..c409a664e2 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 77f9d4df1657fecc939be0261fcccccd34d5b22c02b8a49abad23fac33b4059a runc-v1.0.0-rc1.tar.gz +sha256 196b78c6caf1a4c6257314b393381baffa7c82bb2690ac02a7b3d6cd6cfe7776 runc-cc29e3dded8e27ba8f65738f40d251c885030a28.tar.gz diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 7ebba5702b..e2ab5edf2d 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = v1.0.0-rc1 +RUNC_VERSION = cc29e3dded8e27ba8f65738f40d251c885030a28 RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE From 02fa3ceaebd995580ae2aab6848e9ff797ea3b18 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 15 Aug 2016 15:08:22 +0200 Subject: [PATCH 0013/3392] igd2-for-linux: bump to version 1.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/igd2-for-linux/igd2-for-linux.hash | 2 +- package/igd2-for-linux/igd2-for-linux.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/igd2-for-linux/igd2-for-linux.hash b/package/igd2-for-linux/igd2-for-linux.hash index a46fe5f9db..f1c9a7bd3e 100644 --- a/package/igd2-for-linux/igd2-for-linux.hash +++ b/package/igd2-for-linux/igd2-for-linux.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 a8edc4c14aa104dcffa79d1f3057b8b9c5cef0f8f43901f61e306120a4efe01f igd2-for-linux-v1.1.tar.gz +sha256 523545a26b0d662e9f6913bec2518df6e70f4d497935d88983d994336a1b0ea9 igd2-for-linux-v1.2.tar.gz diff --git a/package/igd2-for-linux/igd2-for-linux.mk b/package/igd2-for-linux/igd2-for-linux.mk index 8b63c044cb..8944c0521e 100644 --- a/package/igd2-for-linux/igd2-for-linux.mk +++ b/package/igd2-for-linux/igd2-for-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGD2_FOR_LINUX_VERSION = v1.1 +IGD2_FOR_LINUX_VERSION = v1.2 IGD2_FOR_LINUX_SITE = $(call github,ffontaine,igd2-for-linux,$(IGD2_FOR_LINUX_VERSION)) IGD2_FOR_LINUX_LICENSE = GPLv2 From f5cfefffda6a5aab7efc83bc295672d558401e54 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 15 Aug 2016 23:15:10 +0200 Subject: [PATCH 0014/3392] openzwave: bump to version 1.5 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openzwave/openzwave.hash | 2 +- package/openzwave/openzwave.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openzwave/openzwave.hash b/package/openzwave/openzwave.hash index bab940ef1d..cd1231f80d 100644 --- a/package/openzwave/openzwave.hash +++ b/package/openzwave/openzwave.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 ca122365f6237dc245be0129eb460e78126976b9c7bd06487795d3acfc9f2a5f openzwave-v1.4.tar.gz +sha256 abfb4c7e7728e86ba374c2e0ef7de912594eb24a8c44935457352df844530238 openzwave-V1.5.tar.gz diff --git a/package/openzwave/openzwave.mk b/package/openzwave/openzwave.mk index c8892a9033..2723086b82 100644 --- a/package/openzwave/openzwave.mk +++ b/package/openzwave/openzwave.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENZWAVE_VERSION = v1.4 +OPENZWAVE_VERSION = V1.5 OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION)) OPENZWAVE_LICENSE = LGPLv3+, GPLv3 (examples), Apache-2.0 (sh2ju.sh) OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \ From 00b344cc547c39af150c0196ff1e70785465f17d Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Fri, 12 Aug 2016 15:30:06 -0700 Subject: [PATCH 0015/3392] xen: Bump to version 4.7 Bump Xen up to 4.7 which is the latest release. Signed-off-by: Alistair Francis Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index c124b3a556..602e6c7dcf 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 xen-4.6.0.tar.gz +sha256 be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623 xen-4.7.0.tar.gz diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 759667af45..eb40454b60 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.6.0 +XEN_VERSION = 4.7.0 XEN_SITE = http://bits.xensource.com/oss-xen/release/$(XEN_VERSION) XEN_LICENSE = GPLv2 XEN_LICENSE_FILES = COPYING From 5050a94ae9f448641e05ce29c931671ffdc62784 Mon Sep 17 00:00:00 2001 From: Judd Meinders Date: Thu, 11 Aug 2016 12:14:30 -0500 Subject: [PATCH 0016/3392] lxc: version bump to 2.0.3 Removed IPv6 and werror configure.ac patch(s) as changes where incorporated upsteam. Signed-off-by: Judd Meinders Signed-off-by: Matt Weber Signed-off-by: Peter Korsgaard --- package/lxc/0001-drop-werror.patch | 16 ------- ...-Fix-redefinition-of-struct-in6_addr.patch | 43 ------------------- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 4 +- 4 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 package/lxc/0001-drop-werror.patch delete mode 100644 package/lxc/0002-Fix-redefinition-of-struct-in6_addr.patch diff --git a/package/lxc/0001-drop-werror.patch b/package/lxc/0001-drop-werror.patch deleted file mode 100644 index d2a8673a86..0000000000 --- a/package/lxc/0001-drop-werror.patch +++ /dev/null @@ -1,16 +0,0 @@ -Don't do -Werror it breaks builds on some scenarios with trivialities. - -Signed-off-by: Gustavo Zacarias - -diff -Nura lxc-lxc-1.0.4/configure.ac lxc-lxc-1.0.4.orig/configure.ac ---- lxc-lxc-1.0.4.orig/configure.ac 2014-07-04 10:31:19.821029891 -0300 -+++ lxc-lxc-1.0.4/configure.ac 2014-06-13 14:07:45.000000000 -0300 -@@ -560,7 +560,7 @@ - LXC_CHECK_TLS - - if test "x$GCC" = "xyes"; then -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall" - fi - - # Files requiring some variable expansion diff --git a/package/lxc/0002-Fix-redefinition-of-struct-in6_addr.patch b/package/lxc/0002-Fix-redefinition-of-struct-in6_addr.patch deleted file mode 100644 index b48ece38f6..0000000000 --- a/package/lxc/0002-Fix-redefinition-of-struct-in6_addr.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 245bba9aadf8e7aea487b6fbd851f86c75524552 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Thu, 19 May 2016 21:51:27 +0200 -Subject: [PATCH] Fix redefinition of struct in6_addr -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -struct in6_addr is both defined in the C library header -and the Linux kernel header . - -lxc_user_nic.c includes both and . The -later one includes . - -This breaks build with the musl libc: - error: redefinition of ‘struct in6_addr’ - -As lxc_user_nic.c does not use any references from it -is safe to remove this header. - -Upstream status: Pending -https://github.com/lxc/lxc/pull/1029 - -Signed-off-by: Jörg Krause ---- - src/lxc/lxc_user_nic.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c -index 87780ca..0cb38ba 100644 ---- a/src/lxc/lxc_user_nic.c -+++ b/src/lxc/lxc_user_nic.c -@@ -41,7 +41,6 @@ - #include - #include - #include --#include - #include - #include - #include --- -2.8.2 - diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 747010162c..3dee7fc6c9 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9588ad1b04e114ee7370f690c65131e28098b28d2521d97c73557d11897ed0be lxc-1.1.5.tar.gz +sha256 82df40a0cdd44639ee677d560be95348de48afa93a10a20e959dadb4431ee8d6 lxc-2.0.3.tar.gz diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 819096959a..b1cd385878 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,13 +4,11 @@ # ################################################################################ -LXC_VERSION = 1.1.5 +LXC_VERSION = 2.0.3 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = LGPLv2.1+ LXC_LICENSE_FILES = COPYING LXC_DEPENDENCIES = libcap host-pkgconf -# we're patching configure.ac -LXC_AUTORECONF = YES LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ --disable-lua --disable-python \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) From d3a1d96f8903b3d8ba288a932f3427109854c674 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 16 Aug 2016 09:37:45 -0300 Subject: [PATCH 0017/3392] dbus: bump to version 1.10.10 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- 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 d38b298067..1b20d3f2e5 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 baf3d22baa26d3bdd9edc587736cd5562196ce67996d65b82103bedbe1f0c014 dbus-1.10.8.tar.gz +sha256 9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43 dbus-1.10.10.tar.gz diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 6064501210..1388e346bf 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.10.8 +DBUS_VERSION = 1.10.10 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools) DBUS_LICENSE_FILES = COPYING From 4ec5542679264bc06a0356ef92f06ad7a0abe06d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 17 Aug 2016 08:37:54 +0200 Subject: [PATCH 0018/3392] m68k: flat one memory region works with small kernel patch Greg Ungerer fixed recently a bug in the Linux kernel, which allows to use one memory region again. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- arch/Config.in | 1 - .../patches/linux/m68knommu-fix-signal.patch | 45 +++++++++++++++++++ configs/qemu_m68k_mcf5208_defconfig | 2 + 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 board/qemu/m68k-mcf5208/patches/linux/m68knommu-fix-signal.patch diff --git a/arch/Config.in b/arch/Config.in index b980e05b9a..8000dcaa5f 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -331,7 +331,6 @@ choice config BR2_BINFMT_FLAT_ONE bool "One memory region" - depends on !BR2_m68k help All segments are linked into one memory region. diff --git a/board/qemu/m68k-mcf5208/patches/linux/m68knommu-fix-signal.patch b/board/qemu/m68k-mcf5208/patches/linux/m68knommu-fix-signal.patch new file mode 100644 index 0000000000..b56994b239 --- /dev/null +++ b/board/qemu/m68k-mcf5208/patches/linux/m68knommu-fix-signal.patch @@ -0,0 +1,45 @@ +m68knommu: fix user a5 register being overwritten + +On no-MMU systems the application a5 register can be overwitten with the +address of the process data segment when processing application signals. +For flat format applications compiled with full absolute relocation this +effectively corrupts the a5 register on signal processing - and this very +quickly leads to process crash and often takes out the whole system with +a panic as well. + +This has no effect on flat format applications compiled with the more +common PIC methods (such as -msep-data). These format applications reserve +a5 for the pointer to the data segment anyway - so it doesn't change it. + +A long time ago the a5 register was used in the code packed into the user +stack to enable signal return processing. And so it had to be restored on +end of signal cleanup processing back to the original a5 user value. This +was historically done by saving away a5 in the sigcontext structure. At +some point (a long time back it seems) the a5 restore process was changed +and it was hard coded to put the user data segment address directly into a5. +Which is ok for the common PIC compiled application case, but breaks the +full relocation application code. + +We no longer use this type of signal handling mechanism and so we don't +need to do anything special to save and restore a5 at all now. So remove the +code that hard codes a5 to the address of the user data segment. + +Signed-off-by: Greg Ungerer +--- + arch/m68k/kernel/signal.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c +index 2dcee3a..9202f82 100644 +--- a/arch/m68k/kernel/signal.c ++++ b/arch/m68k/kernel/signal.c +@@ -213,7 +213,6 @@ static inline int frame_extra_sizes(int f) + + static inline void adjustformat(struct pt_regs *regs) + { +- ((struct switch_stack *)regs - 1)->a5 = current->mm->start_data; + /* + * set format byte to make stack appear modulo 4, which it will + * be when doing the rte +-- +1.9.1 diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index f911467609..659ae3d8e6 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -9,6 +9,8 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_GLOBAL_PATCH_DIR="board/qemu/m68k-mcf5208/patches" + # Linux headers same as kernel, a 4.7 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y From 77a7a6b9d7854b377a6c24711b6c64a670729e15 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 16 Aug 2016 22:28:59 -0300 Subject: [PATCH 0019/3392] memcached: bump to version 1.4.30 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/memcached/memcached.hash | 6 +++--- package/memcached/memcached.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index ab57b5116e..b1353b2f43 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,4 +1,4 @@ -# From http://www.memcached.org/files/memcached-1.4.29.tar.gz.sha1 -sha1 8994b4d0dbcc8d536f3d6cd4763489a3c51ca44b memcached-1.4.29.tar.gz +# From http://www.memcached.org/files/memcached-1.4.30.tar.gz.sha1 +sha1 bb8644a4110932e331d1539f0435bc6a0e558827 memcached-1.4.30.tar.gz # Calculated based on the hash above -sha256 c61a3a7f9c82e574559797bbf4bb01ad8b79e436ca80b8e46f5b51ae39b03d0b memcached-1.4.29.tar.gz +sha256 e0bea597c9082557f3357f63db08c3d5121ccc8502f300a48d4cb84d22e8be5f memcached-1.4.30.tar.gz diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 42742ff988..b40ca84ba0 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.4.29 +MEMCACHED_VERSION = 1.4.30 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From ca4237c766fe2d0d494ed3d4b91a483728147349 Mon Sep 17 00:00:00 2001 From: Rodrigo Rebello Date: Tue, 16 Aug 2016 21:10:38 -0300 Subject: [PATCH 0020/3392] git: bump version to 2.9.3 Signed-off-by: Rodrigo Rebello Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index e7763f30a3..9776df1e3e 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 e8fe60bc72c1c979feb43740b3c74fea7f8ffbe7712b71cd9734ddb9c89282a2 git-2.9.1.tar.xz +sha256 9f1473350c1792310b51af03a9cb5cce841f68202f835b20d46312a30232fa63 git-2.9.3.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 2f282007fc..d9cd95a60a 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.9.1 +GIT_VERSION = 2.9.3 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2 LGPLv2.1+ From 27ccabcadb3f421686ac78e4fa3295e7c2a734c3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 16 Aug 2016 20:07:12 -0300 Subject: [PATCH 0021/3392] sysstat: bump to version 11.4.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/sysstat/sysstat.hash | 2 +- package/sysstat/sysstat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index 539bbed53b..3170fc9812 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,2 +1,2 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 ef97b454c254a37587485f61071db1fd9374f276 sysstat-11.2.5.tar.xz +sha1 59769deddef02acd60db3a42d772e57bd0978efb sysstat-11.4.0.tar.xz diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 1be3d82ef8..de6cd9f9e8 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 11.2.5 +SYSSTAT_VERSION = 11.4.0 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard SYSSTAT_CONF_OPTS = --disable-man-group --disable-sensors From 7df128ce04e0d09d3251bb9d299c7c67cf2130b8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 18 Aug 2016 10:45:23 -0300 Subject: [PATCH 0022/3392] libglib2: bump to version 2.48.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 6463759f24..35728e2e33 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,2 +1,2 @@ -# https://download.gnome.org/sources/glib/2.48/glib-2.48.1.sha256sum -sha256 74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612 glib-2.48.1.tar.xz +# https://download.gnome.org/sources/glib/2.48/glib-2.48.2.sha256sum +sha256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 glib-2.48.2.tar.xz diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index e2bff6d501..6b1a387946 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.48 -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 0652eb4d47f7d67a74363b4719ab8b2c5e89c33f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 18 Aug 2016 10:45:37 -0300 Subject: [PATCH 0023/3392] libgtk3: bump to version 3.20.9 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index e665d2130c..d839a0180d 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.20/gtk+-3.20.8.sha256sum -sha256 9841bd9b4d23c045c474b10fdde9da958af904b63783701e796391d55d4396f3 gtk+-3.20.8.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.20/gtk+-3.20.9.sha256sum +sha256 83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17 gtk+-3.20.9.tar.xz diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 0c93d89bb8..67a0f025e2 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.20 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).8 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).9 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPLv2+ From 2970711de7516b171b9c214be388bad49177b842 Mon Sep 17 00:00:00 2001 From: Marcin Nowakowski Date: Thu, 18 Aug 2016 12:17:47 +0200 Subject: [PATCH 0024/3392] package/elfutils: set program-prefix to default ("eu-") Elfutils program names collide with binutils' binaries. By default applications provided by elfutils are prefixed with "eu-", but in Buildroot that setting is overridden by pkg-autotools. The option in pkg-autotools rules was added to avoid including a target triple in some packages as a prefix, so restore elfutils default behaviour by adding a "eu-" program-prefix. Signed-off-by: Marcin Nowakowski Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: add comment in the .mk file explaining why we have a custom program prefix, as suggested by Arnout.] Signed-off-by: Thomas Petazzoni --- package/elfutils/elfutils.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index b999d0f9cd..6af12236e1 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -14,7 +14,12 @@ ELFUTILS_DEPENDENCIES = zlib # We patch configure.ac ELFUTILS_AUTORECONF = YES -ELFUTILS_CONF_OPTS += --disable-werror + +# Pass a custom program prefix to avoid a naming conflict between +# elfutils binaries and binutils binaries. +ELFUTILS_CONF_OPTS += \ + --disable-werror \ + --program-prefix="eu-" # elfutils gets confused when lfs mode is forced, so don't ELFUTILS_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) From 5ab751ca44e9da6f406876ff582b3a813056b0d4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 18 Aug 2016 08:37:29 +0200 Subject: [PATCH 0025/3392] toolchain-buildroot: allow to build ppc64(le) musl toolchains Latest musl release supports ppc64 architecture (both big endian and little endian), so this commit adds support for this. Since musl implements the ELFv2 ABI for both big-endian and little-endian PowerPC64, we have to force using this ABI on PowerPC64 big endian (normally elfv1 is the default). Also, only gcc 6.x has the necessary changes to support musl on PowerPC 64, so we restrict the gcc version selection accordingly. Tested with Qemu for big endian and little endian configurations. Signed-off-by: Waldemar Brodkorb [Thomas: add comment about the ABI flag in gcc.mk, rework commit log.] Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 8 ++++++++ package/gcc/gcc.mk | 10 ++++++++++ toolchain/toolchain-buildroot/Config.in | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 2b54959d0e..4d02931518 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -30,6 +30,8 @@ choice depends on !BR2_x86_jaguar && !BR2_x86_steamroller # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 + # musl ppc64 unsupported + depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL select BR2_GCC_NEEDS_MPC select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 @@ -46,6 +48,8 @@ choice depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X) # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 + # musl ppc64 unsupported + depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 @@ -66,6 +70,8 @@ choice depends on !BR2_cortex_a17 # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 + # musl ppc64 unsupported + depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102 select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE @@ -75,6 +81,8 @@ choice bool "gcc 5.x" # Broken or unsupported architectures depends on !BR2_arc && !BR2_bfin + # musl ppc64 unsupported + depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 032015c628..39c3eebd21 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -231,6 +231,16 @@ HOST_GCC_COMMON_CONF_OPTS += \ --with-long-double-128 endif +# PowerPC64 big endian by default uses the elfv1 ABI, and PowerPC 64 +# little endian by default uses the elfv2 ABI. However, musl has +# decided to use the elfv2 ABI for both, so we force the elfv2 ABI for +# Power64 big endian when the selected C library is musl. +ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_powerpc64),yy) +HOST_GCC_COMMON_CONF_OPTS += \ + --with-abi=elfv2 \ + --without-long-double-128 +endif + HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"' ifeq ($(BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS),) ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 0b97bbf6aa..78cac14d14 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -70,7 +70,7 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL bool "musl" depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ BR2_microblaze || BR2_mips || BR2_mipsel || BR2_powerpc || \ - BR2_sh || BR2_x86_64 + BR2_powerpc64 || BR2_powerpc64le || BR2_sh || BR2_x86_64 depends on !BR2_powerpc_SPE # not supported, build breaks # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 From e73a1db4646c2d6696c529b7bdd2b59d54ff460a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Fri, 19 Aug 2016 14:48:02 +0200 Subject: [PATCH 0026/3392] python-requests-toolbelt: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Vögele Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-requests-toolbelt/Config.in | 7 +++++++ .../python-requests-toolbelt.hash | 3 +++ .../python-requests-toolbelt.mk | 14 ++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/python-requests-toolbelt/Config.in create mode 100644 package/python-requests-toolbelt/python-requests-toolbelt.hash create mode 100644 package/python-requests-toolbelt/python-requests-toolbelt.mk diff --git a/package/Config.in b/package/Config.in index 645fa297b0..ade3e34678 100644 --- a/package/Config.in +++ b/package/Config.in @@ -752,6 +752,7 @@ menu "External python modules" source "package/python-pyyaml/Config.in" source "package/python-pyzmq/Config.in" source "package/python-requests/Config.in" + source "package/python-requests-toolbelt/Config.in" source "package/python-rpi-gpio/Config.in" source "package/python-rtslib-fb/Config.in" source "package/python-scapy3k/Config.in" diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in new file mode 100644 index 0000000000..ba2b95152e --- /dev/null +++ b/package/python-requests-toolbelt/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT + bool "python-requests-toolbelt" + select BR2_PACKAGE_PYTHON_REQUESTS # runtime + help + A utility belt for advanced users of python-requests. + + https://toolbelt.readthedocs.org diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.hash b/package/python-requests-toolbelt/python-requests-toolbelt.hash new file mode 100644 index 0000000000..89f5ca1114 --- /dev/null +++ b/package/python-requests-toolbelt/python-requests-toolbelt.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/requests-toolbelt/json, sha256 locally computed +md5 bfe2009905f460f4764c32cfbbf4205f requests-toolbelt-0.7.0.tar.gz +sha256 33899d4a559c3f0f5e9fbc115d337c4236febdc083755a160a4132d92fc3c91a requests-toolbelt-0.7.0.tar.gz diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.mk b/package/python-requests-toolbelt/python-requests-toolbelt.mk new file mode 100644 index 0000000000..2e944c067d --- /dev/null +++ b/package/python-requests-toolbelt/python-requests-toolbelt.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-requests-toolbelt +# +################################################################################ + +PYTHON_REQUESTS_TOOLBELT_VERSION = 0.7.0 +PYTHON_REQUESTS_TOOLBELT_SOURCE = requests-toolbelt-$(PYTHON_REQUESTS_TOOLBELT_VERSION).tar.gz +PYTHON_REQUESTS_TOOLBELT_SITE = https://pypi.python.org/packages/59/78/1d391d30ebf74079a8e4de6ab66fdca5362903ef2df64496f4697e9bb626 +PYTHON_REQUESTS_TOOLBELT_SETUP_TYPE = setuptools +PYTHON_REQUESTS_TOOLBELT_LICENSE = Apache-2.0 +PYTHON_REQUESTS_TOOLBELT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From a9ca6963095ee64f0be943a34a972f024fa0e893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Fri, 19 Aug 2016 15:42:24 +0200 Subject: [PATCH 0027/3392] python-sip: allow package to be built using Qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Vögele Signed-off-by: Thomas Petazzoni --- package/python-sip/Config.in | 7 ++++++- package/python-sip/python-sip.mk | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/python-sip/Config.in b/package/python-sip/Config.in index 45e48ad00e..1f8961d0df 100644 --- a/package/python-sip/Config.in +++ b/package/python-sip/Config.in @@ -2,12 +2,17 @@ comment "python-sip needs a toolchain w/ C++, threads" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "python-sip needs qt or qt5" + depends on BR2_USE_MMU + depends on BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 + config BR2_PACKAGE_PYTHON_SIP bool "python-sip" depends on BR2_INSTALL_LIBSTDCPP # qt depends on BR2_TOOLCHAIN_HAS_THREADS # qt depends on BR2_USE_MMU # qt - select BR2_PACKAGE_QT + depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 help SIP is a tool that makes it very easy to create Python bindings for C and C++ libraries. It was originally diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index d13801fb82..0c0a94738d 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -10,7 +10,11 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON PYTHON_SIP_LICENSE = SIP license or GPLv2 or GPLv3 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 +ifeq ($(BR2_PACKAGE_QT5),y) +PYTHON_SIP_DEPENDENCIES = qt5base +else PYTHON_SIP_DEPENDENCIES = qt +endif ifeq ($(BR2_PACKAGE_PYTHON),y) PYTHON_SIP_DEPENDENCIES += python From ec9825e38ed0f56b66f9c11f432cab7487a0f5cf Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Fri, 19 Aug 2016 22:45:04 +0530 Subject: [PATCH 0028/3392] logrotate: bump version to 3.10.0 Cc: Thomas Petazzoni Signed-off-by: Rahul Bedarkar [Thomas: add 0002-Use-autoconf-checks-for-strndup-and-asprintf.patch, needed for gcc 6.x build.] Signed-off-by: Thomas Petazzoni --- ...conf-checks-for-strndup-and-asprintf.patch | 61 +++++++++++++++++++ package/logrotate/logrotate.hash | 2 +- package/logrotate/logrotate.mk | 2 +- 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch diff --git a/package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch b/package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch new file mode 100644 index 0000000000..14efc1d359 --- /dev/null +++ b/package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch @@ -0,0 +1,61 @@ +From e626f4ca5169036a0042e55e58aca2bb5cc19ad7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 19 Aug 2016 22:39:17 +0200 +Subject: [PATCH] Use autoconf checks for strndup and asprintf + +The current code in config.c can provide its own implementation of +asprintf() and strndup() if not provided by the system. However, in +order to decide if they should be provided, the check done is: + + #if !defined(name_of_function) + +which only works if the function is actually defined as a macro, which +is not necessarily the case. + +Therefore, we replace this logic by a proper AC_CHECK_FUNCS() check in +the configure script. + +Signed-off-by: Thomas Petazzoni +--- + config.c | 4 ++-- + configure.ac | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/config.c b/config.c +index 8731348..8741e48 100644 +--- a/config.c ++++ b/config.c +@@ -45,7 +45,7 @@ + #include "asprintf.c" + #endif + +-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE) ++#if !defined(HAVE_ASPRINTF) && !defined(_FORTIFY_SOURCE) + #include + + int asprintf(char **string_ptr, const char *format, ...) +@@ -78,7 +78,7 @@ int asprintf(char **string_ptr, const char *format, ...) + + #endif + +-#if !defined(strndup) ++#if !defined(HAVE_STRNDUP) + char *strndup(const char *s, size_t n) + { + size_t nAvail; +diff --git a/configure.ac b/configure.ac +index 5c83d20..51da52a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,6 +18,8 @@ AC_SYS_LARGEFILE + AC_CHECK_LIB([popt],[poptParseArgvString],, + AC_MSG_ERROR([libpopt required but not found])) + ++AC_CHECK_FUNCS([strndup asprintf]) ++ + dnl Needed for out-of-source builds + mkdir -p test + +-- +2.7.4 + diff --git a/package/logrotate/logrotate.hash b/package/logrotate/logrotate.hash index 77d4dc8077..ee31f8e051 100644 --- a/package/logrotate/logrotate.hash +++ b/package/logrotate/logrotate.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2de00c65e23fa9d7909cae6594e550b9abe9a7eb1553669ddeaca92d30f97009 logrotate-3.9.2.tar.gz +sha256 db63b5932190cba941357c029b595a7fddf43539943aa1e0ca53a96136e4c5d9 logrotate-3.10.0.tar.gz diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index de4d837cad..96012c003a 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOGROTATE_VERSION = 3.9.2 +LOGROTATE_VERSION = 3.10.0 LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION)) LOGROTATE_LICENSE = GPLv2+ LOGROTATE_LICENSE_FILES = COPYING From a351f375973072eecafc09f1c233c5c53bbaad3f Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 11 Aug 2016 23:39:56 +0530 Subject: [PATCH 0029/3392] util-linux: bump version to 2.28.1 Drop upstream patch 0001-build-sys-fix-uClibc-ng-scanf-check.patch. Release notes: https://www.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28.1-ReleaseNotes Signed-off-by: Rahul Bedarkar [Thomas: remove --enable-libuuid-force-uuidd support.] Signed-off-by: Thomas Petazzoni --- ...-build-sys-fix-uClibc-ng-scanf-check.patch | 34 ------------------- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 7 ++-- 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 package/util-linux/0001-build-sys-fix-uClibc-ng-scanf-check.patch diff --git a/package/util-linux/0001-build-sys-fix-uClibc-ng-scanf-check.patch b/package/util-linux/0001-build-sys-fix-uClibc-ng-scanf-check.patch deleted file mode 100644 index 801b72b26d..0000000000 --- a/package/util-linux/0001-build-sys-fix-uClibc-ng-scanf-check.patch +++ /dev/null @@ -1,34 +0,0 @@ -From bac7fbdb2d141879526ca4342d56d2c749ba8af5 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 3 Jun 2016 04:23:28 +0200 -Subject: [PATCH] build-sys: fix uClibc-ng scanf check - -uClibc-ng tries to be compatible with GNU libc and defines -__GLIBC__ and pretend to be version 2.2. -We once changed it to 2.10, but then some hard to fix problems -in different software packages (gcc) occured. -It would be better if we disable the special GNU libc checks -for uClibc-ng here. uClibc-ng implements the required scanf -functionality. - -Signed-off-by: Waldemar Brodkorb ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3ba723f..ec197ee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -581,7 +581,7 @@ AC_CACHE_VAL([scanf_cv_alloc_modifier], - #include - #include - -- #ifdef __GLIBC__ -+ #if defined(__GLIBC__) && !defined(__UCLIBC__) - - #if !(__GLIBC_PREREQ(2, 7)) - #error %m is not available --- -2.1.4 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index ca581025c8..17094f4a7f 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.28/sha256sums.asc -sha256 395847e2a18a2c317170f238892751e73a57104565344f8644090c8b091014bb util-linux-2.28.tar.xz +sha256 3ece4ea4a34ef786b68f5c415e848390424232abd1ee00f7ee5bddc30657b60f util-linux-2.28.1.tar.xz diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 9c7bd87126..3c8496a157 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -4,16 +4,15 @@ # ################################################################################ -UTIL_LINUX_VERSION = 2.28 +UTIL_LINUX_VERSION_MAJOR = 2.28 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz -UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION) +UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) # README.licensing claims that some files are GPLv2-only, but this is not true. # Some files are GPLv3+ but only in tests. UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, libblkid and libmount LGPLv2.1+, libuuid BSD-3c UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 -# For 0001-build-sys-fix-uClibc-ng-scanf-check.patch -UTIL_LINUX_AUTORECONF = YES UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = host-pkgconf # uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support From 92d00f9ea1e6e7fbb79713caf96fce525a5fe841 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 19 Aug 2016 21:56:27 -0300 Subject: [PATCH 0030/3392] gstreamer1: bump to version 1.8.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index b32fcfe813..c85518e270 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.8.2.tar.xz.sha256sum -sha256 9dbebe079c2ab2004ef7f2649fa317cabea1feb4fb5605c24d40744b90918341 gstreamer-1.8.2.tar.xz +# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.8.3.tar.xz.sha256sum +sha256 66b37762d4fdcd63bce5a2bec57e055f92420e95037361609900278c0db7c53f gstreamer-1.8.3.tar.xz diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index beea3b70ea..4036825548 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.8.2 +GSTREAMER1_VERSION = 1.8.3 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From c30545b4c9c342df87161e470f4fa41faa251baa Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 19 Aug 2016 21:56:28 -0300 Subject: [PATCH 0031/3392] gst1-plugins-base: bump to version 1.8.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 9c4ae8a4cd..83f0e83461 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.8.2.tar.xz.sha256sum -sha256 9d7109c8fb0a5dec8edb17b0053c59a46aba7ddf48dc48ea822ebbbd4339d38d gst-plugins-base-1.8.2.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.8.3.tar.xz.sha256sum +sha256 114871d4d63606b4af424a8433cd923e4ff66896b244bb7ac97b9da47f71e79e gst-plugins-base-1.8.3.tar.xz diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 1b2d343729..3416e94969 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.8.2 +GST1_PLUGINS_BASE_VERSION = 1.8.3 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From 3b58f30bb37cd96021ad23f0b666e9cc57c77d69 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 19 Aug 2016 21:56:29 -0300 Subject: [PATCH 0032/3392] gst1-plugins-good: bump to version 1.8.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 404ee07cd2..2e3db3d81b 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.8.2.tar.xz.sha256sum -sha256 8d7549118a3b7a009ece6bb38a05b66709c551d32d2adfd89eded4d1d7a23944 gst-plugins-good-1.8.2.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.8.3.tar.xz.sha256sum +sha256 a1d6579ba203a7734927c24b90bf6590d846c5a5fcec01a48201018c8ad2827a gst-plugins-good-1.8.3.tar.xz diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 8d7ff29618..05f2650ef1 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.8.2 +GST1_PLUGINS_GOOD_VERSION = 1.8.3 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From c815cf19e379faf1b81fd2c074a73744bfc69693 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 19 Aug 2016 21:56:30 -0300 Subject: [PATCH 0033/3392] gst1-plugins-bad: bump to version 1.8.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index d4d9b47f84..a0d6cdccc9 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.8.2.tar.xz.sha256sum -sha256 d7995317530c8773ec088f94d9320909d41da61996b801ebacce9a56af493f97 gst-plugins-bad-1.8.2.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.8.3.tar.xz.sha256sum +sha256 7899fcb18e6a1af2888b19c90213af018a57d741c6e72ec56b133bc73ec8509b gst-plugins-bad-1.8.3.tar.xz diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 3ffdd10d19..ca2dbfa641 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.8.2 +GST1_PLUGINS_BAD_VERSION = 1.8.3 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From 693af1610c9bc98a84c018a9da91761219eb456f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 19 Aug 2016 21:56:31 -0300 Subject: [PATCH 0034/3392] gst1-plugins-ugly: bump to version 1.8.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index d384d48a5a..1c6aa7d80a 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.8.2.tar.xz.sha256sum -sha256 9c5b33a2a98fc1d6d6c99a1b536b1fb2de45f53cc8bf8ab85a8b8141fed1a8ac gst-plugins-ugly-1.8.2.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.8.3.tar.xz.sha256sum +sha256 6fa2599fdd072d31fbaf50c34af406e2be944a010b1f4eab67a5fe32a0310693 gst-plugins-ugly-1.8.3.tar.xz diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 8864b04c71..2e9891e9ff 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.8.2 +GST1_PLUGINS_UGLY_VERSION = 1.8.3 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From 2140e2d498adffbf3132910312cc4d5c0203cfde Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 19 Aug 2016 21:56:32 -0300 Subject: [PATCH 0035/3392] gst1-validate: bump to version 1.8.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-validate/gst1-validate.hash | 4 ++-- package/gstreamer1/gst1-validate/gst1-validate.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-validate/gst1-validate.hash b/package/gstreamer1/gst1-validate/gst1-validate.hash index 2394f8a16d..09061f402a 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.hash +++ b/package/gstreamer1/gst1-validate/gst1-validate.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.8.2.tar.xz.sha256sum -sha256 33c5b585c5ca1659fe6c09fdf02e45d8132c0d386b405bf527b14ab481a0bafe gst-validate-1.8.2.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.8.3.tar.xz.sha256sum +sha256 4525a4fb5b85b8a49674e00d652bee9ac62c56241c148abbff23efa50a224e34 gst-validate-1.8.3.tar.xz diff --git a/package/gstreamer1/gst1-validate/gst1-validate.mk b/package/gstreamer1/gst1-validate/gst1-validate.mk index ee76817258..72daa45aa0 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.mk +++ b/package/gstreamer1/gst1-validate/gst1-validate.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VALIDATE_VERSION = 1.8.2 +GST1_VALIDATE_VERSION = 1.8.3 GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz GST1_VALIDATE_SITE = http://gstreamer.freedesktop.org/src/gst-validate GST1_VALIDATE_LICENSE = LGPLv2.1+ From c0805f3a4e19d596b9b073fcf489a5c64ee401c9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 19 Aug 2016 23:14:08 -0300 Subject: [PATCH 0036/3392] cantarell: bump to version 0.0.25 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/cantarell/cantarell.hash | 4 ++-- package/cantarell/cantarell.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cantarell/cantarell.hash b/package/cantarell/cantarell.hash index e2cc00eda4..330e7869d1 100644 --- a/package/cantarell/cantarell.hash +++ b/package/cantarell/cantarell.hash @@ -1,2 +1,2 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.24.sha256sum -sha256 9cad649ae84f7e4ca1be637c27e2fa19e1fbf00d4bf6480171ccfad405b39264 cantarell-fonts-0.0.24.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.25.sha256sum +sha256 14a228aa0b516dfc367b434a850f955a00c57fc549cbb05348e2b150196a737f cantarell-fonts-0.0.25.tar.xz diff --git a/package/cantarell/cantarell.mk b/package/cantarell/cantarell.mk index b4133ecdbd..3cdf600dd2 100644 --- a/package/cantarell/cantarell.mk +++ b/package/cantarell/cantarell.mk @@ -5,7 +5,7 @@ ################################################################################ CANTARELL_VERSION_MAJOR = 0.0 -CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).24 +CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).25 CANTARELL_SITE = http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) CANTARELL_SOURCE = cantarell-fonts-$(CANTARELL_VERSION).tar.xz CANTARELL_DEPENDENCIES = host-pkgconf From 5b3ea400a07a914c9a2f9f819f6052ca6dc3e53f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 19 Aug 2016 23:14:45 -0300 Subject: [PATCH 0037/3392] pangomm: bump to version 2.40.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/pangomm/pangomm.hash | 4 ++-- package/pangomm/pangomm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pangomm/pangomm.hash b/package/pangomm/pangomm.hash index 4f39e51501..b5d527fa7b 100644 --- a/package/pangomm/pangomm.hash +++ b/package/pangomm/pangomm.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/pangomm/2.40/pangomm-2.40.0.sha256sum -sha256 7dd0afa9dcce57cdb0aad77da9ea46823ee8515d5f3ffd895b9ede7365c3d70d pangomm-2.40.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/pangomm/2.40/pangomm-2.40.1.sha256sum +sha256 9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af pangomm-2.40.1.tar.xz diff --git a/package/pangomm/pangomm.mk b/package/pangomm/pangomm.mk index 2db7890022..2a85e39fa3 100644 --- a/package/pangomm/pangomm.mk +++ b/package/pangomm/pangomm.mk @@ -5,7 +5,7 @@ ################################################################################ PANGOMM_VERSION_MAJOR = 2.40 -PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).0 +PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).1 PANGOMM_SOURCE = pangomm-$(PANGOMM_VERSION).tar.xz PANGOMM_SITE = http://ftp.gnome.org/pub/gnome/sources/pangomm/$(PANGOMM_VERSION_MAJOR) PANGOMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools) From 9d4b6c1e97f856a200b40ef0134c874e9944c25a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sat, 20 Aug 2016 00:15:53 -0300 Subject: [PATCH 0038/3392] libmnl: bump to version 1.0.4 And drop upstream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libmnl/0001-uclinux.patch | 26 -------------------------- package/libmnl/libmnl.hash | 6 +++--- package/libmnl/libmnl.mk | 3 +-- 3 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/libmnl/0001-uclinux.patch diff --git a/package/libmnl/0001-uclinux.patch b/package/libmnl/0001-uclinux.patch deleted file mode 100644 index e8f97c6c17..0000000000 --- a/package/libmnl/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ae2acfa7d287e3ffc0bb66091059b86f62775bd5 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 15:24:47 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dcd3cf8..313a015 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,7 @@ AC_DISABLE_STATIC - LT_INIT - CHECK_GCC_FVISIBILITY - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package/libmnl/libmnl.hash b/package/libmnl/libmnl.hash index c16dfe7ae6..98385b857c 100644 --- a/package/libmnl/libmnl.hash +++ b/package/libmnl/libmnl.hash @@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/libmnl/libmnl-1.0.3.tar.bz2.{md5sum,sha1sum} -md5 7d95fc3bea3365bc03c48e484224f65f libmnl-1.0.3.tar.bz2 -sha1 c27e25f67c6422ebf893fc3a844af8085a1c5b63 libmnl-1.0.3.tar.bz2 +# From ftp://ftp.netfilter.org/pub/libmnl/libmnl-1.0.4.tar.bz2.{md5sum,sha1sum} +md5 be9b4b5328c6da1bda565ac5dffadb2d libmnl-1.0.4.tar.bz2 +sha1 2db40dea612e88c62fd321906be40ab5f8f1685a libmnl-1.0.4.tar.bz2 diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk index b16c5345c0..407c4f19ba 100644 --- a/package/libmnl/libmnl.mk +++ b/package/libmnl/libmnl.mk @@ -4,11 +4,10 @@ # ################################################################################ -LIBMNL_VERSION = 1.0.3 +LIBMNL_VERSION = 1.0.4 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2 LIBMNL_SITE = http://netfilter.org/projects/libmnl/files LIBMNL_INSTALL_STAGING = YES -LIBMNL_AUTORECONF = YES LIBMNL_LICENSE = LGPLv2.1+ LIBMNL_LICENSE_FILES = COPYING From 6c69921eced469ade6c98a6c1c9771ebc3d67beb Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 10 Aug 2016 10:28:48 +0100 Subject: [PATCH 0039/3392] glibc: add version 2.24 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/glibc/Config.in | 12 ++++++++++++ package/glibc/glibc.hash | 1 + 2 files changed, 13 insertions(+) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index f86822d18c..de95cb2ef2 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -22,6 +22,17 @@ config BR2_GLIBC_VERSION_2_23 # No support for pthread barriers on < v9 ISA depends on !BR2_sparc +config BR2_GLIBC_VERSION_2_24 + bool "2.24" + # No support for pthread barriers on < v9 ISA + depends on !BR2_sparc + # Linux 3.2 or later kernel headers are required on all arches. + # See: https://sourceware.org/ml/libc-alpha/2016-08/msg00212.html + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 + +comment "glibc-2.24 needs kernel headers >= 3.2" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 + endchoice endif @@ -30,3 +41,4 @@ config BR2_GLIBC_VERSION_STRING string default "2.22" if BR2_GLIBC_VERSION_2_22 default "2.23" if BR2_GLIBC_VERSION_2_23 + default "2.24" if BR2_GLIBC_VERSION_2_24 diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 052f281316..befe80c3c5 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,3 +1,4 @@ # Locally calculated after checking pgp signature (glibc) sha256 eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 glibc-2.22.tar.xz sha256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 glibc-2.23.tar.xz +sha256 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 glibc-2.24.tar.xz From e834d3f65da6fa470c93bca1853daa9c85d932b8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sat, 20 Aug 2016 11:42:11 -0300 Subject: [PATCH 0040/3392] mpv: bump to version 0.19.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/mpv/mpv.hash | 2 +- package/mpv/mpv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash index 8a2f44b82a..1594cb9282 100644 --- a/package/mpv/mpv.hash +++ b/package/mpv/mpv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e413d57fec4ad43b9f9b848f38d13fb921313fc9a4a64bf1e906c8d0f7a46329 v0.18.1.tar.gz +sha256 3df5811942cd1d71f48eb4720092fdafec11885bf6dd6d1d3e6413f32e5d67e2 v0.19.0.tar.gz sha256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b waf-1.8.12 diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index d2ed3f2a68..123dff4943 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPV_VERSION = 0.18.1 +MPV_VERSION = 0.19.0 MPV_WAF_VERSION = 1.8.12 MPV_SITE = https://github.com/mpv-player/mpv/archive MPV_SOURCE = v$(MPV_VERSION).tar.gz From 06cc7bcb2285f71248d443f5807f7e93de00bcba Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sat, 20 Aug 2016 11:53:02 -0300 Subject: [PATCH 0041/3392] opus: bump to version 1.1.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/opus/opus.hash | 2 +- package/opus/opus.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opus/opus.hash b/package/opus/opus.hash index 1d483987fd..2aac69b064 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 0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd opus-1.1.2.tar.gz +sha256 58b6fe802e7e30182e95d0cde890c0ace40b6f125cffc50635f0ad2eef69b633 opus-1.1.3.tar.gz diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 71fdcb3f0c..5cd727f1e7 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPUS_VERSION = 1.1.2 +OPUS_VERSION = 1.1.3 OPUS_SITE = http://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3c OPUS_LICENSE_FILES = COPYING From 62504125f88200e01fc633a1dd2f68ad50489b1b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 20 Aug 2016 16:05:19 +0200 Subject: [PATCH 0042/3392] gcc: fix gcc version dependencies for the PowerPC64/musl exclusion In commit 5ab751ca44e9da6f406876ff582b3a813056b0d4 ("toolchain-buildroot: allow to build ppc64(le) musl toolchains"), support for building a musl toolchain for ppc64(le) was added. Since this support only works with gcc 6, some additional dependencies have been added to the older gcc versions so that they cannot be selected on ppc64(le)/musl. Unfortunately, the expression of the dependency was wrong, and leads to those older gcc versions being non-selectable if you're not using musl. Indeed, the dependencies look like this: depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL So as soon as you're not using musl, BR2_TOOLCHAIN_USES_MUSL is false, so the entire condition is false, and the gcc version is not available. Due to this, only gcc 6.x can be selected currently with uclibc or glibc, which is clearly not the intended behavior. This commit reworks those dependencies to: depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) which more clearly expresses what we want: "We don't want to (have a toolchain that uses musl and (be building either for PPC64 or PPC64le))" Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 4d02931518..37728e006f 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -31,7 +31,7 @@ choice # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 # musl ppc64 unsupported - depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) select BR2_GCC_NEEDS_MPC select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 @@ -49,7 +49,7 @@ choice # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 # musl ppc64 unsupported - depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 @@ -71,7 +71,7 @@ choice # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 # musl ppc64 unsupported - depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102 select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE @@ -82,7 +82,7 @@ choice # Broken or unsupported architectures depends on !BR2_arc && !BR2_bfin # musl ppc64 unsupported - depends on !BR2_powerpc64 && !BR2_powerpc64le && BR2_TOOLCHAIN_USES_MUSL + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_5 From 516b521554c0361f888c85d78707f42b9b8cd8db Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 22 Aug 2016 07:39:33 +0300 Subject: [PATCH 0043/3392] lirc-tools: enable for musl Upstream removed use of the GLOB_BRACE glob(3) GNU extension in release 0.9.4 (commits 493857625 and 8bff82ed9c). See https://sourceforge.net/p/lirc/tickets/174/. Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/lirc-tools/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/lirc-tools/Config.in b/package/lirc-tools/Config.in index 60476b7935..6eaf828817 100644 --- a/package/lirc-tools/Config.in +++ b/package/lirc-tools/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIRC_TOOLS depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE # dlopen() depends on !BR2_STATIC_LIBS help @@ -19,7 +18,7 @@ config BR2_PACKAGE_LIRC_TOOLS http://www.lirc.org/ -comment "lirc-tools needs a uClibc or glibc toolchain w/ threads, dynamic library, C++" +comment "lirc-tools needs a toolchain w/ threads, dynamic library, C++" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_MUSL + || !BR2_INSTALL_LIBSTDCPP From 0b7bf72aa49b617494eb3250e97a69b61f21dff2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 20 Aug 2016 16:12:01 +0200 Subject: [PATCH 0044/3392] glibc: remove unnecessary !BR2_sparc dependencies The BR2_TOOLCHAIN_BUILDROOT_GLIBC option is already not selectable on BR2_sparc, so there is no need to have an additional "depends on !BR2_sparc" on each of the glibc versions. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/glibc/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/glibc/Config.in b/package/glibc/Config.in index de95cb2ef2..85aace6e29 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -12,20 +12,14 @@ choice config BR2_GLIBC_VERSION_2_22 bool "2.22" - # No support for pthread barriers on < v9 ISA - depends on !BR2_sparc # Too old to build with gcc >= 6.x depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_6 config BR2_GLIBC_VERSION_2_23 bool "2.23" - # No support for pthread barriers on < v9 ISA - depends on !BR2_sparc config BR2_GLIBC_VERSION_2_24 bool "2.24" - # No support for pthread barriers on < v9 ISA - depends on !BR2_sparc # Linux 3.2 or later kernel headers are required on all arches. # See: https://sourceware.org/ml/libc-alpha/2016-08/msg00212.html depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 From 721e1c1e9ca13f37e3d6aafb0a570fd6fb67fbea Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 22 Aug 2016 21:19:54 +0200 Subject: [PATCH 0045/3392] musl: enable mips64 support Add support for mips64, which is available since musl 1.1.15. Only gcc 6.x has required support for it. Tested variations of little/big endian and hard/soft float. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/gcc/Config.in.host | 6 ++++++ toolchain/toolchain-buildroot/Config.in | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 37728e006f..72627147d3 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -50,6 +50,8 @@ choice depends on !BR2_mips_32r6 && !BR2_mips_64r6 # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) + # musl mips64 unsupported + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 @@ -72,6 +74,8 @@ choice depends on !BR2_mips_32r6 && !BR2_mips_64r6 # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) + # musl mips64 unsupported + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102 select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE @@ -83,6 +87,8 @@ choice depends on !BR2_arc && !BR2_bfin # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) + # musl mips64 unsupported + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 78cac14d14..9fdfb4282f 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -68,9 +68,10 @@ comment "glibc only available with shared lib support" config BR2_TOOLCHAIN_BUILDROOT_MUSL bool "musl" - depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ - BR2_microblaze || BR2_mips || BR2_mipsel || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh || BR2_x86_64 + depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ + BR2_microblaze || BR2_mips || BR2_mipsel || BR2_mips64 || \ + BR2_mips64el || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ + BR2_sh || BR2_x86_64 depends on !BR2_powerpc_SPE # not supported, build breaks # Unsupported for MIPS R6 depends on !BR2_mips_32r6 && !BR2_mips_64r6 From ff559846fdc11f718ef6ed49c25117fab90b8019 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 23 Aug 2016 14:19:44 +0200 Subject: [PATCH 0046/3392] support/download: Add support to pass options directly to downloaders This adds support to pass options to the underlying command that is used by downloader. Useful for retrieving data with server-side checking for user login or passwords, use a proxy or use specific options for cloning a repository via git and hg. Signed-off-by: Romain Perier Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/download/bzr | 4 +++- support/download/cp | 4 +++- support/download/cvs | 4 +++- support/download/git | 6 ++++-- support/download/hg | 4 +++- support/download/scp | 4 +++- support/download/svn | 4 +++- support/download/wget | 4 +++- 8 files changed, 25 insertions(+), 9 deletions(-) diff --git a/support/download/bzr b/support/download/bzr index e18b01f39c..75b7b415c1 100755 --- a/support/download/bzr +++ b/support/download/bzr @@ -26,6 +26,8 @@ repo="${2}" rev="${3}" basename="${4}" +shift 4 # Get rid of our options + # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _bzr() { @@ -49,5 +51,5 @@ if [ ${bzr_version} -ge ${bzr_min_version} ]; then fi _bzr export ${verbose} --root="'${basename}/'" --format=tgz \ - ${timestamp_opt} - "'${repo}'" -r "'${rev}'" \ + ${timestamp_opt} - "${@}" "'${repo}'" -r "'${rev}'" \ >"${output}" diff --git a/support/download/cp b/support/download/cp index 09ce3d1100..0ee1f3ba82 100755 --- a/support/download/cp +++ b/support/download/cp @@ -28,10 +28,12 @@ shift $((OPTIND-1)) output="${1}" source="${2}" +shift 2 # Get rid of our options + # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _localfiles() { eval ${LOCALFILES} "${@}" } -_localfiles ${verbose} "'${source}'" "'${output}'" +_localfiles ${verbose} "${@}""'${source}'" "'${output}'" diff --git a/support/download/cvs b/support/download/cvs index 7980389a4e..50050ab1c9 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -26,6 +26,8 @@ rev="${3}" rawname="${4}" basename="${5}" +shift 5 # Get rid of our options + # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _cvs() { @@ -48,6 +50,6 @@ fi export TZ=UTC _cvs ${verbose} -z3 -d"'${repo}'" \ - co -d "'${basename}'" ${select} "'${rev}'" -P "'${rawname}'" + co "${@}" -d "'${basename}'" ${select} "'${rev}'" -P "'${rawname}'" tar czf "${output}" "${basename}" diff --git a/support/download/git b/support/download/git index 416cd1baf2..281db61a9a 100755 --- a/support/download/git +++ b/support/download/git @@ -30,6 +30,8 @@ repo="${2}" cset="${3}" basename="${4}" +shift 4 # Get rid of our options + # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _git() { @@ -46,7 +48,7 @@ _git() { git_done=0 if [ -n "$(_git ls-remote "'${repo}'" "'${cset}'" 2>&1)" ]; then printf "Doing shallow clone\n" - if _git clone ${verbose} --depth 1 -b "'${cset}'" "'${repo}'" "'${basename}'"; then + if _git clone ${verbose} "${@}" --depth 1 -b "'${cset}'" "'${repo}'" "'${basename}'"; then git_done=1 else printf "Shallow clone failed, falling back to doing a full clone\n" @@ -54,7 +56,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} "'${repo}'" "'${basename}'" + _git clone ${verbose} "${@}" "'${repo}'" "'${basename}'" fi pushd "${basename}" >/dev/null diff --git a/support/download/hg b/support/download/hg index 25cb4e9d35..3af01690b3 100755 --- a/support/download/hg +++ b/support/download/hg @@ -25,13 +25,15 @@ repo="${2}" cset="${3}" basename="${4}" +shift 4 # Get rid of our options + # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _hg() { eval ${HG} "${@}" } -_hg clone ${verbose} --noupdate "'${repo}'" "'${basename}'" +_hg clone ${verbose} "${@}" --noupdate "'${repo}'" "'${basename}'" _hg archive ${verbose} --repository "'${basename}'" --type tgz \ --prefix "'${basename}'" --rev "'${cset}'" \ diff --git a/support/download/scp b/support/download/scp index 95cf502be2..825fd41c64 100755 --- a/support/download/scp +++ b/support/download/scp @@ -23,10 +23,12 @@ shift $((OPTIND-1)) output="${1}" url="${2}" +shift 2 # Get rid of our options + # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _scp() { eval ${SCP} "${@}" } -_scp ${verbose} "'${url}'" "'${output}'" +_scp ${verbose} "${@}" "'${url}'" "'${output}'" diff --git a/support/download/svn b/support/download/svn index 4dcdd06239..77abf3d02d 100755 --- a/support/download/svn +++ b/support/download/svn @@ -25,12 +25,14 @@ repo="${2}" rev="${3}" basename="${4}" +shift 4 # Get rid of our options + # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _svn() { eval ${SVN} "${@}" } -_svn export ${verbose} "'${repo}@${rev}'" "'${basename}'" +_svn export ${verbose} "${@}" "'${repo}@${rev}'" "'${basename}'" tar czf "${output}" "${basename}" diff --git a/support/download/wget b/support/download/wget index 0fc7ffa94e..768de904c3 100755 --- a/support/download/wget +++ b/support/download/wget @@ -23,10 +23,12 @@ shift $((OPTIND-1)) output="${1}" url="${2}" +shift 2 # Get rid of our options + # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _wget() { eval ${WGET} "${@}" } -_wget ${verbose} -O "'${output}'" "'${url}'" +_wget ${verbose} "${@}" -O "'${output}'" "'${url}'" From 91b34e0abc99b7346f71bbc99283ff7ffac34799 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 23 Aug 2016 14:19:45 +0200 Subject: [PATCH 0047/3392] pkg-download: Allow packages to pass generic options to download methods Introduce a new package variable $(PKG)_DL_OPTS. When this variable is defined, its value is passed to the downloader as options to the underlying command. Packages can now retrieve archives from server expecting logins and passwords, use referer url, proxy or specific options for cloning a repository. Signed-off-by: Romain Perier Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pkg-download.mk | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 315203f331..3b6561bd1e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -81,7 +81,8 @@ define DOWNLOAD_GIT -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_BASE_NAME) + $($(PKG)_BASE_NAME) \ + $($(PKG)_DL_OPTS) endef # TODO: improve to check that the given PKG_DL_VERSION exists on the remote @@ -97,7 +98,8 @@ define DOWNLOAD_BZR -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_BASE_NAME) + $($(PKG)_BASE_NAME) \ + $($(PKG)_DL_OPTS) endef define SOURCE_CHECK_BZR @@ -112,7 +114,8 @@ define DOWNLOAD_CVS $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \ $($(PKG)_DL_VERSION) \ $($(PKG)_RAWNAME) \ - $($(PKG)_BASE_NAME) + $($(PKG)_BASE_NAME) \ + $($(PKG)_DL_OPTS) endef # Not all CVS servers support ls/rls, use login to see if we can connect @@ -127,7 +130,8 @@ define DOWNLOAD_SVN -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_BASE_NAME) + $($(PKG)_BASE_NAME) \ + $($(PKG)_DL_OPTS) endef define SOURCE_CHECK_SVN @@ -143,7 +147,8 @@ define DOWNLOAD_SCP -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ $(QUIET) \ -- \ - '$(call stripurischeme,$(call qstrip,$(1)))' + '$(call stripurischeme,$(call qstrip,$(1)))' \ + $($(PKG)_DL_OPTS) endef define SOURCE_CHECK_SCP @@ -157,7 +162,8 @@ define DOWNLOAD_HG -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_BASE_NAME) + $($(PKG)_BASE_NAME) \ + $($(PKG)_DL_OPTS) endef # TODO: improve to check that the given PKG_DL_VERSION exists on the remote @@ -172,7 +178,8 @@ define DOWNLOAD_WGET -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ $(QUIET) \ -- \ - '$(call qstrip,$(1))' + '$(call qstrip,$(1))' \ + $($(PKG)_DL_OPTS) endef define SOURCE_CHECK_WGET @@ -185,7 +192,8 @@ define DOWNLOAD_LOCALFILES -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ $(QUIET) \ -- \ - $(call stripurischeme,$(call qstrip,$(1))) + $(call stripurischeme,$(call qstrip,$(1))) \ + $($(PKG)_DL_OPTS) endef define SOURCE_CHECK_LOCALFILES From 03f12377178e209f599f00b3fafb33dfa649abc7 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 23 Aug 2016 14:19:46 +0200 Subject: [PATCH 0048/3392] docs/manual: Document the variable $(PKG)_DL_OPTS This adds a description of the optional variable $(PKG)_DL_OPTS. When it is set, this option passes additional options to the downloader. Signed-off-by: Romain Perier Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index ef895ec917..51408e8694 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -250,6 +250,13 @@ information is (assuming the package name is +libfoo+) : +LIBFOO_SITE=/opt/software/libfoo.tar.gz+ + +LIBFOO_SITE=$(TOPDIR)/../src/libfoo+ +* +LIBFOO_DL_OPTS+ is a space-separated list of additional options to + pass to the downloader. Useful for retrieving documents with + server-side checking for user logins and passwords, or to use a proxy. + All download methods valid for +LIBFOO_SITE_METHOD+ are supported; + valid options depend on the download method (consult the man page + for the respective download utilities). + * +LIBFOO_EXTRA_DOWNLOADS+ is a space-separated list of additional files that Buildroot should download. If an entry contains +://+ then Buildroot will assume it is a complete URL and will download From 41c08629b1efcd1bf2c984ba22d56f209bb50354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Tue, 23 Aug 2016 12:56:49 +0200 Subject: [PATCH 0049/3392] python-pyqt: Removed 'compileall' directive from INSTALL_TARGET_CMDS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since all python modules are now byte-compiled globally this is no longer necessary. Signed-off-by: Manuel Vögele Signed-off-by: Thomas Petazzoni --- package/python-pyqt/python-pyqt.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/python-pyqt/python-pyqt.mk b/package/python-pyqt/python-pyqt.mk index fa298c480f..50e835170f 100644 --- a/package/python-pyqt/python-pyqt.mk +++ b/package/python-pyqt/python-pyqt.mk @@ -108,9 +108,6 @@ define PYTHON_PYQT_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4/__init__.py $(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4/uic/$(PYTHON_PYQT_RM_PORT_BASE) - PYTHONPATH="$(PYTHON_PATH)" \ - $(HOST_DIR)/usr/bin/python -c "import compileall; \ - compileall.compile_dir('$(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4')" endef $(eval $(generic-package)) From 03c3fcd5bcf9c1361888119f866eac4b55575b48 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 23 Aug 2016 10:19:08 -0300 Subject: [PATCH 0050/3392] libnetfilter_conntrack: bump to version 1.0.6 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libnetfilter_conntrack/libnetfilter_conntrack.hash | 6 +++--- package/libnetfilter_conntrack/libnetfilter_conntrack.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash index 67d1e408a1..de9d1d3fcf 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash @@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.5.tar.bz2.{md5sum,sha1sum} -md5 6aa1bd3c1d0723235ac897087b4cd4e5 libnetfilter_conntrack-1.0.5.tar.bz2 -sha1 9aed8733d98af39d57fffd929c2bea70f1dcba06 libnetfilter_conntrack-1.0.5.tar.bz2 +# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.tar.bz2.{md5sum,sha1sum} +md5 7139c5f408dd9606ffecfd5dcda8175b libnetfilter_conntrack-1.0.6.tar.bz2 +sha1 015f985a8e171889a67769ba02d070eca53bac07 libnetfilter_conntrack-1.0.6.tar.bz2 diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 33f129404e..ec05f6dc32 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.5 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.6 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES From 7b5fc8ab0f689caadb86b4260c0ace29a9b947b7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 23 Aug 2016 10:19:09 -0300 Subject: [PATCH 0051/3392] conntrack-tools: bump to version 1.4.4 Drop usptream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- .../0001-src-fix-build-with-musl-libc.patch | 37 ------------------- package/conntrack-tools/conntrack-tools.hash | 6 +-- package/conntrack-tools/conntrack-tools.mk | 2 +- 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 package/conntrack-tools/0001-src-fix-build-with-musl-libc.patch diff --git a/package/conntrack-tools/0001-src-fix-build-with-musl-libc.patch b/package/conntrack-tools/0001-src-fix-build-with-musl-libc.patch deleted file mode 100644 index 5881f98721..0000000000 --- a/package/conntrack-tools/0001-src-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d7b20d9bbed23a7a7e40af2f5e78f37ff67e8d93 Mon Sep 17 00:00:00 2001 -From: Rodrigo Rebello -Date: Mon, 23 Nov 2015 02:12:48 -0200 -Subject: [PATCH] src: fix build with musl libc - -The GNU version of 'struct tcphdr' is not exposed by musl libc headers -unless _GNU_SOURCE is defined. Without this definition, the build fails -with: - - rpc.c: In function 'rpc_helper_cb': - rpc.c:351:15: error: 'struct tcphdr' has no member named 'doff' - offset += th->doff * 4; - ^ - -Upstream status: sent -http://patchwork.ozlabs.org/patch/547376/ - -Signed-off-by: Rodrigo Rebello ---- - src/helpers/rpc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/helpers/rpc.c b/src/helpers/rpc.c -index 82493c2..3a7b337 100644 ---- a/src/helpers/rpc.c -+++ b/src/helpers/rpc.c -@@ -28,6 +28,7 @@ - - #include - #include -+#define _GNU_SOURCE - #include - #include - --- -2.1.4 - diff --git a/package/conntrack-tools/conntrack-tools.hash b/package/conntrack-tools/conntrack-tools.hash index 7ff1cf7a4b..9d6817721d 100644 --- a/package/conntrack-tools/conntrack-tools.hash +++ b/package/conntrack-tools/conntrack-tools.hash @@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/conntrack-tools/conntrack-tools-1.4.3.tar.bz2.{md5sum,sha1sum} -md5 966a5d8f846ddf5304bcd12685c0707f conntrack-tools-1.4.3.tar.bz2 -sha1 509db30f34b283f4a74a7e638ba0ca713d3fe98c conntrack-tools-1.4.3.tar.bz2 +# From ftp://ftp.netfilter.org/pub/conntrack-tools/conntrack-tools-1.4.4.tar.bz2.{md5sum,sha1sum} +md5 acd9e0b27cf16ae3092ba900e4d7560e conntrack-tools-1.4.4.tar.bz2 +sha1 25b36fb6832373ef899bade3b82adf5382b9a05b conntrack-tools-1.4.4.tar.bz2 diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk index 728758789c..b73aa7f4db 100644 --- a/package/conntrack-tools/conntrack-tools.mk +++ b/package/conntrack-tools/conntrack-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNTRACK_TOOLS_VERSION = 1.4.3 +CONNTRACK_TOOLS_VERSION = 1.4.4 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ From b8d446cd56dc1c8d553ac23c68316fc444de82a0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 23 Aug 2016 10:19:33 -0300 Subject: [PATCH 0052/3392] libnetfilter_acct: bump to version 1.0.3 Drop upstream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libnetfilter_acct/0001-uclinux.patch | 26 ------------------- .../libnetfilter_acct/libnetfilter_acct.hash | 6 ++--- .../libnetfilter_acct/libnetfilter_acct.mk | 2 +- 3 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 package/libnetfilter_acct/0001-uclinux.patch diff --git a/package/libnetfilter_acct/0001-uclinux.patch b/package/libnetfilter_acct/0001-uclinux.patch deleted file mode 100644 index 070f02cdce..0000000000 --- a/package/libnetfilter_acct/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bfcaf00a8c972e2c10412d917f08626eb05079c7 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 15:32:03 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ad1bef8..24a7bb9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_DISABLE_STATIC - LT_INIT - CHECK_GCC_FVISIBILITY - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package/libnetfilter_acct/libnetfilter_acct.hash b/package/libnetfilter_acct/libnetfilter_acct.hash index 852617c0b0..7c38664612 100644 --- a/package/libnetfilter_acct/libnetfilter_acct.hash +++ b/package/libnetfilter_acct/libnetfilter_acct.hash @@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_acct/libnetfilter_acct-1.0.2.tar.bz2.{md5sum,sha1sum} -md5 2118d9514c079839ebd9cb3144ad2ad7 libnetfilter_acct-1.0.2.tar.bz2 -sha1 ca0186912b5ee57088a20dd0a5b78606fd6af02e libnetfilter_acct-1.0.2.tar.bz2 +# From ftp://ftp.netfilter.org/pub/libnetfilter_acct/libnetfilter_acct-1.0.3.tar.bz2.{md5sum,sha1sum} +md5 814b2972b2f5c740ff87510bc109168b libnetfilter_acct-1.0.3.tar.bz2 +sha1 4b9073e4aa989b0f000c8da1ab01b22fceed52b2 libnetfilter_acct-1.0.3.tar.bz2 diff --git a/package/libnetfilter_acct/libnetfilter_acct.mk b/package/libnetfilter_acct/libnetfilter_acct.mk index 5adb6e0dfe..3870ef84ed 100644 --- a/package/libnetfilter_acct/libnetfilter_acct.mk +++ b/package/libnetfilter_acct/libnetfilter_acct.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_ACCT_VERSION = 1.0.2 +LIBNETFILTER_ACCT_VERSION = 1.0.3 LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz2 LIBNETFILTER_ACCT_SITE = http://www.netfilter.org/projects/libnetfilter_acct/files LIBNETFILTER_ACCT_INSTALL_STAGING = YES From ae0e8950540fb668599fa243b5107637154c047b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 23 Aug 2016 10:19:34 -0300 Subject: [PATCH 0053/3392] nfacct: bump to version 1.0.2 Drop upstream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/nfacct/0001-uclinux.patch | 26 -------------------------- package/nfacct/nfacct.hash | 6 +++--- package/nfacct/nfacct.mk | 2 +- 3 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 package/nfacct/0001-uclinux.patch diff --git a/package/nfacct/0001-uclinux.patch b/package/nfacct/0001-uclinux.patch deleted file mode 100644 index 295a370b46..0000000000 --- a/package/nfacct/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From da1a0c186232d1bca9c723bd47d11a6e3807ae29 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 16:16:48 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 9679112..9a34bdc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,7 +15,7 @@ AC_PROG_INSTALL - AC_PROG_LN_S - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package/nfacct/nfacct.hash b/package/nfacct/nfacct.hash index 48561abcd7..737354ef3f 100644 --- a/package/nfacct/nfacct.hash +++ b/package/nfacct/nfacct.hash @@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/nfacct/nfacct-1.0.1.tar.bz2.{md5sum,sha1sum} -md5 992e863409d144350dbc8f0554a0f478 nfacct-1.0.1.tar.bz2 -sha1 57c5fa68a172b30b6c5ea6cb36be685e207312ef nfacct-1.0.1.tar.bz2 +# From ftp://ftp.netfilter.org/pub/nfacct/nfacct-1.0.2.tar.bz2.{md5sum,sha1sum} +md5 94faafdaaed85ca9220c5692be8a408e nfacct-1.0.2.tar.bz2 +sha1 17d6576778227ea93c62600d9b18ff4932963c6a nfacct-1.0.2.tar.bz2 diff --git a/package/nfacct/nfacct.mk b/package/nfacct/nfacct.mk index 7e42160957..d19d02fbfe 100644 --- a/package/nfacct/nfacct.mk +++ b/package/nfacct/nfacct.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFACCT_VERSION = 1.0.1 +NFACCT_VERSION = 1.0.2 NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2 NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files NFACCT_DEPENDENCIES = host-pkgconf \ From 3a0a0b9af67f3728ee669bf85e2a0ec62a60a184 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 23 Aug 2016 10:40:19 -0300 Subject: [PATCH 0054/3392] libksba: bump to version 1.3.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libksba/libksba.hash | 2 +- package/libksba/libksba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index 92abbab6ea..f0a38f3de3 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 f6c2883cebec5608692d8730843d87f237c0964d923bbe7aa89c05f20558ad4f libksba-1.3.4.tar.bz2 +sha256 41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340 libksba-1.3.5.tar.bz2 diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index 40a8c9b5a4..e29b6ae1dd 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKSBA_VERSION = 1.3.4 +LIBKSBA_VERSION = 1.3.5 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba LIBKSBA_LICENSE = LGPLv3+ or GPLv2+ (library, headers), GPLv3+ (manual, tests, build system) From ce55f82eda08597c52ea45ad2c79ffe55f4d5a6c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 23 Aug 2016 10:27:47 -0300 Subject: [PATCH 0055/3392] diffutils: bump to version 3.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/diffutils/diffutils.hash | 2 +- package/diffutils/diffutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/diffutils/diffutils.hash b/package/diffutils/diffutils.hash index 2094e9755b..7e99f1fc65 100644 --- a/package/diffutils/diffutils.hash +++ b/package/diffutils/diffutils.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2 diffutils-3.4.tar.xz +sha256 dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 diffutils-3.5.tar.xz diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 9370f66d55..d3e608ce05 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIFFUTILS_VERSION = 3.4 +DIFFUTILS_VERSION = 3.5 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) From 1091f0978c6808292ad8d088e82c4cd4c118ea99 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 23 Aug 2016 11:26:09 -0300 Subject: [PATCH 0056/3392] mosh: bump to version 1.2.6 Now supports nettle as crypto backend too. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/mosh/Config.in | 2 +- package/mosh/mosh.hash | 4 ++-- package/mosh/mosh.mk | 12 ++++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package/mosh/Config.in b/package/mosh/Config.in index b4189ee10d..d1fbd632eb 100644 --- a/package/mosh/Config.in +++ b/package/mosh/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_MOSH depends on BR2_USE_WCHAR select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_NETTLE if !BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB # runtime dependency select BR2_PACKAGE_OPENSSH if !BR2_PACKAGE_DROPBEAR_CLIENT diff --git a/package/mosh/mosh.hash b/package/mosh/mosh.hash index ab925b5126..31f59c7f5e 100644 --- a/package/mosh/mosh.hash +++ b/package/mosh/mosh.hash @@ -1,2 +1,2 @@ -# From: http://mailman.mit.edu/pipermail/mosh-users/2015-July/000283.html -sha256 1af809e5d747c333a852fbf7acdbf4d354dc4bbc2839e3afe5cf798190074be3 mosh-1.2.5.tar.gz +# From https://mailman.mit.edu/pipermail/mosh-users/2016-August/000330.html +sha256 7e82b7fbfcc698c70f5843bb960dadb8e7bd7ac1d4d2151c9d979372ea850e85 mosh-1.2.6.tar.gz diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk index f8c45e8ccd..2cd358b397 100644 --- a/package/mosh/mosh.mk +++ b/package/mosh/mosh.mk @@ -4,12 +4,20 @@ # ################################################################################ -MOSH_VERSION = 1.2.5 +MOSH_VERSION = 1.2.6 MOSH_SITE = https://mosh.mit.edu -MOSH_DEPENDENCIES = zlib ncurses protobuf openssl host-pkgconf +MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf MOSH_LICENSE = GPLv3+ with exception MOSH_LICENSE_FILES = COPYING COPYING.iOS +ifeq ($(BR2_PACKAGE_OPENSSL),y) +MOSH_CONF_OPTS += --with-crypto-library=openssl +MOSH_DEPENDENCIES += openssl +else +MOSH_CONF_OPTS += --with-crypto-library=nettle +MOSH_DEPENDENCIES += nettle +endif + # help the detection of the SSP support: mosh configure.ac doesn't do # a link test, so it doesn't detect when the toolchain doesn't have # libssp. From 689ae6e404c8d54a600cb4c62976a9987c08c022 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 23 Aug 2016 14:19:47 +0200 Subject: [PATCH 0057/3392] package/amd-catalyst: Add AMD proprietary graphic stack support This commits adds support for the AMD Catalyst Linux driver 15.9 (15.201.1151). It includes the fglrx kernel module with various fixes to make it work with at least Linux kernel 4.4 LTS, the userspace OpenGL stack and the xorg driver module. Signed-off-by: Romain Perier Reviewed-by: "Yann E. MORIN" [Thomas: - fixup whitespace issues noticed by Yann. - register AMD_CATALYST_PREPARE_MODULE as a post-patch hook rather than calling it during the configure step, also suggested by Yann.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + .../0001-Add-support-for-Linux-4.0.patch | 45 +++++++ .../0002-Add-support-for-Linux-4.1.patch | 31 +++++ .../0003-Add-support-for-Linux-4.2.patch | 121 ++++++++++++++++++ ...Use-fpregs_active-instead-of-has_fpu.patch | 33 +++++ ...a-local-copy-of-copy_xregs_to_kernel.patch | 79 ++++++++++++ .../0006-Add-support-for-Linux-4.4.patch | 78 +++++++++++ .../0007-remove-gpl-symbols.patch | 54 ++++++++ package/amd-catalyst/20-fglrx.conf | 4 + package/amd-catalyst/Config.in | 54 ++++++++ package/amd-catalyst/amd-catalyst.hash | 2 + package/amd-catalyst/amd-catalyst.mk | 120 +++++++++++++++++ package/amd-catalyst/gl.pc | 12 ++ 13 files changed, 634 insertions(+) create mode 100644 package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch create mode 100644 package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch create mode 100644 package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch create mode 100644 package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch create mode 100644 package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch create mode 100644 package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch create mode 100644 package/amd-catalyst/0007-remove-gpl-symbols.patch create mode 100644 package/amd-catalyst/20-fglrx.conf create mode 100644 package/amd-catalyst/Config.in create mode 100644 package/amd-catalyst/amd-catalyst.hash create mode 100644 package/amd-catalyst/amd-catalyst.mk create mode 100644 package/amd-catalyst/gl.pc diff --git a/package/Config.in b/package/Config.in index ade3e34678..3e8c515126 100644 --- a/package/Config.in +++ b/package/Config.in @@ -344,6 +344,7 @@ endmenu source "package/acpitool/Config.in" source "package/aer-inject/Config.in" source "package/am335x-pru-package/Config.in" + source "package/amd-catalyst/Config.in" source "package/avrdude/Config.in" source "package/bcache-tools/Config.in" source "package/biosdevname/Config.in" diff --git a/package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch b/package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch new file mode 100644 index 0000000000..a0db9621a1 --- /dev/null +++ b/package/amd-catalyst/0001-Add-support-for-Linux-4.0.patch @@ -0,0 +1,45 @@ +From c35482bc0cc56b40263b74c3e58e42be867fd9f2 Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Thu, 17 Sep 2015 15:41:46 +0200 +Subject: [PATCH] Add support for Linux 4.0 + +Signed-off-by: Romain Perier +--- + common/lib/modules/fglrx/build_mod/firegl_public.c | 5 +++++ + common/lib/modules/fglrx/build_mod/kcl_str.c | 4 ++++ + 2 files changed, 9 insertions(+) + +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 677565d..6017e89 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -285,6 +285,11 @@ MODULE_DEVICE_TABLE(pci, fglrx_pci_table); + + MODULE_INFO(supported, "external"); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) ++#define read_cr4() __read_cr4() ++#define write_cr4(cr4) __write_cr4(cr4) ++#endif ++ + /* globals constants */ + const char* KCL_SYSINFO_OsVersionString = UTS_RELEASE; + const unsigned int KCL_SYSINFO_PageSize = PAGE_SIZE; +diff --git a/common/lib/modules/fglrx/build_mod/kcl_str.c b/common/lib/modules/fglrx/build_mod/kcl_str.c +index 2d89eb0..bacdb69 100755 +--- a/common/lib/modules/fglrx/build_mod/kcl_str.c ++++ b/common/lib/modules/fglrx/build_mod/kcl_str.c +@@ -42,6 +42,10 @@ + #include "kcl_type.h" + #include "kcl_str.h" + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) ++#define strnicmp strncasecmp ++#endif ++ + /** \brief Fill memory with a constant byte + * \param s Pointer to memory + * \param c Initializing value +-- +2.8.1 + diff --git a/package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch b/package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch new file mode 100644 index 0000000000..cc95916e1e --- /dev/null +++ b/package/amd-catalyst/0002-Add-support-for-Linux-4.1.patch @@ -0,0 +1,31 @@ +From e9c8ccb4c8c842042542b792c51f9a7ec6c85e06 Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Thu, 17 Sep 2015 15:44:59 +0200 +Subject: [PATCH] Add support for Linux 4.1 + +Signed-off-by: Romain Perier +--- + common/lib/modules/fglrx/build_mod/firegl_public.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 6017e89..94778f1 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -3508,10 +3508,12 @@ int ATI_API_CALL KCL_InstallInterruptHandler( + KCL_PUB_InterruptHandlerWrap, + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + ((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)), +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) + //when MSI enabled. keep irq disabled when calling the action handler, + //exclude this IRQ from irq balancing (only on one CPU) + ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)), ++#else ++ ((useMSI) ? (0x0) : (IRQF_SHARED)), + #endif + dev_name, + context); +-- +2.8.1 + diff --git a/package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch b/package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch new file mode 100644 index 0000000000..7458162965 --- /dev/null +++ b/package/amd-catalyst/0003-Add-support-for-Linux-4.2.patch @@ -0,0 +1,121 @@ +From e2e6c2dac2a0311a022208dd289374b832538329 Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Tue, 14 Jul 2015 12:56:37 +0200 +Subject: [PATCH] Add support for Linux 4.2 + +Deal with the FPU code renaming + +Signed-off-by: Romain Perier +--- + common/lib/modules/fglrx/build_mod/firegl_public.c | 38 ++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 94778f1..749ea51 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -191,9 +191,17 @@ + #include + #include + #include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + #include "asm/i387.h" ++#else ++#include ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + #include ++#else ++#include ++#endif + #endif + + #include "firegl_public.h" +@@ -1711,6 +1719,9 @@ void ATI_API_CALL KCL_SetCurrentProcessState(KCL_ENUM_ProcessState state) + + #if defined(__i386__) + #ifndef __HAVE_ARCH_CMPXCHG ++#ifndef __xg ++#define __xg(x) ((volatile long *)(x)) ++#endif + static inline + unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old, + unsigned long new, int size) +@@ -1747,7 +1758,11 @@ unsigned long ATI_API_CALL kcl__cmpxchg(volatile void *ptr, unsigned long old, + unsigned long new, int size) + { + #ifndef __HAVE_ARCH_CMPXCHG ++#if defined(__i386__) + return __fgl_cmpxchg(ptr,old,new,size); ++#elif defined(__x86_64__) ++ return cmpxchg((unsigned long*)ptr,old,new); ++#endif + #else + /* On kernel version 2.6.34 passing a variable or unsupported size + * argument to the __cmpxchg macro causes the default-clause of a +@@ -6443,21 +6458,36 @@ static int KCL_fpu_save_init(struct task_struct *tsk) + struct fpu *fpu = &tsk->thread.fpu; + + if(static_cpu_has(X86_FEATURE_XSAVE)) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + fpu_xsave(fpu); + if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) ++#else ++ copy_xregs_to_kernel(&fpu->state.xsave); ++ if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) ++#endif + return 1; + } else if (static_cpu_has(X86_FEATURE_FXSR)) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + fpu_fxsave(fpu); ++#else ++ copy_fxregs_to_kernel(fpu); ++#endif + } else { + asm volatile("fnsave %[fx]; fwait" ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + : [fx] "=m" (fpu->state->fsave)); ++#else ++ : [fx] "=m" (fpu->state.fsave)); ++#endif + return 0; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES)) { + asm volatile("fnclex"); + return 0; + } ++#endif + return 1; + } + #endif +@@ -6469,8 +6499,12 @@ static int KCL_fpu_save_init(struct task_struct *tsk) + void ATI_API_CALL KCL_fpu_begin(void) + { + #ifdef CONFIG_X86_64 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + kernel_fpu_begin(); + #else ++ __kernel_fpu_begin(); ++#endif ++#else + #ifdef TS_USEDFPU + struct thread_info *cur_thread = current_thread_info(); + struct task_struct *cur_task = get_current(); +@@ -6515,7 +6549,11 @@ void ATI_API_CALL KCL_fpu_begin(void) + */ + void ATI_API_CALL KCL_fpu_end(void) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) + kernel_fpu_end(); ++#else ++ __kernel_fpu_end(); ++#endif + } + + /** Create new directory entry under "/proc/...." +-- +2.8.1 + diff --git a/package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch b/package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch new file mode 100644 index 0000000000..4d375b8ad8 --- /dev/null +++ b/package/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch @@ -0,0 +1,33 @@ +From 7120f00015570a2e4d9b6532731960d509c71cba Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Thu, 17 Sep 2015 15:48:30 +0200 +Subject: [PATCH] Use fpregs_active instead of has_fpu + +This is for Linux 4.2 + +Thanks to Tim Gardner for the patch. + +Signed-off-by: Romain Perier +--- + common/lib/modules/fglrx/build_mod/firegl_public.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 749ea51..4c1f9a5 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -6528,7 +6528,11 @@ void ATI_API_CALL KCL_fpu_begin(void) + /* The thread structure is changed with the commit below for kernel 3.3: + * https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8 + */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) ++ if (cur_task->thread.fpu.fpregs_active) ++#else + if (cur_task->thread.fpu.has_fpu) ++#endif + #else + if (cur_task->thread.has_fpu) + #endif +-- +2.8.1 + diff --git a/package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch b/package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch new file mode 100644 index 0000000000..c9513ef188 --- /dev/null +++ b/package/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch @@ -0,0 +1,79 @@ +From eb703737be5c91c1a0817351db8ec152c523c85d Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Thu, 17 Sep 2015 15:49:46 +0200 +Subject: [PATCH] Use a local copy of copy_xregs_to_kernel + +This is needed for Linux 4.2. + +Thanks to Tim Gardner for the patch. + +Signed-off-by: Romain Perier +--- + common/lib/modules/fglrx/build_mod/firegl_public.c | 44 +++++++++++++++++++++- + 1 file changed, 43 insertions(+), 1 deletion(-) + +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 4c1f9a5..bb67bba 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -6443,6 +6443,48 @@ int ATI_API_CALL kcl_sscanf(const char * buf, const char * fmt, ...) + return i; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) ++/* ++ * Save processor xstate to xsave area. ++ */ ++static void _copy_xregs_to_kernel(struct xregs_state *xstate) ++{ ++ u64 mask = -1; ++ u32 lmask = mask; ++ u32 hmask = mask >> 32; ++ int err = 0; ++ ++ /*WARN_ON(!alternatives_patched);*/ ++ ++ /* ++ * If xsaves is enabled, xsaves replaces xsaveopt because ++ * it supports compact format and supervisor states in addition to ++ * modified optimization in xsaveopt. ++ * ++ * Otherwise, if xsaveopt is enabled, xsaveopt replaces xsave ++ * because xsaveopt supports modified optimization which is not ++ * supported by xsave. ++ * ++ * If none of xsaves and xsaveopt is enabled, use xsave. ++ */ ++ alternative_input_2( ++ "1:"XSAVE, ++ XSAVEOPT, ++ X86_FEATURE_XSAVEOPT, ++ XSAVES, ++ X86_FEATURE_XSAVES, ++ [xstate] "D" (xstate), "a" (lmask), "d" (hmask) : ++ "memory"); ++ asm volatile("2:\n\t" ++ xstate_fault(err) ++ : "0" (err) ++ : "memory"); ++ ++ /* We should never fault when copying to a kernel buffer: */ ++ WARN_ON_FPU(err); ++} ++#endif ++ + /** \brief Generate UUID + * \param buf pointer to the generated UUID + * \return None +@@ -6462,7 +6504,7 @@ static int KCL_fpu_save_init(struct task_struct *tsk) + fpu_xsave(fpu); + if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) + #else +- copy_xregs_to_kernel(&fpu->state.xsave); ++ _copy_xregs_to_kernel(&fpu->state.xsave); + if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) + #endif + return 1; +-- +2.8.1 + diff --git a/package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch b/package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch new file mode 100644 index 0000000000..104e2c599d --- /dev/null +++ b/package/amd-catalyst/0006-Add-support-for-Linux-4.4.patch @@ -0,0 +1,78 @@ +From 54b230e26a1889c08507e791ab043f8a4b4ff771 Mon Sep 17 00:00:00 2001 +From: Romain Perier +Date: Thu, 7 Jul 2016 14:40:53 +0200 +Subject: [PATCH] Add support for Linux 4.4 + +It fixes various things like the use of seq_printf because its API +changed. It also replaces the call to mtrr_add and mtrr_del by +arch_phys_wc_add and arch_phys_wc_del because these symbols are +no longer exported for Linux >= 4.3.x. + +Signed-off-by: Romain Perier +--- + common/lib/modules/fglrx/build_mod/firegl_public.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index bb67bba..b4b2d30 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -636,9 +636,16 @@ static int firegl_major_proc_read(struct seq_file *m, void* data) + + len = snprintf(buf, request, "%d\n", major); + #else ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) ++ seq_printf(m, "%d\n", major); ++ len = 0; ++#else + len = seq_printf(m, "%d\n", major); + #endif + ++#endif ++ + KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len); + + return len; +@@ -3432,7 +3439,11 @@ int ATI_API_CALL KCL_MEM_MTRR_Support(void) + int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size) + { + #ifdef CONFIG_MTRR ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) ++ return arch_phys_wc_add(base, size); ++#else + return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1); ++#endif + #else /* !CONFIG_MTRR */ + return -EPERM; + #endif /* !CONFIG_MTRR */ +@@ -3441,7 +3452,12 @@ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size + int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size) + { + #ifdef CONFIG_MTRR ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) ++ arch_phys_wc_del(reg); ++ return 0; ++#else + return mtrr_del(reg, base, size); ++#endif + #else /* !CONFIG_MTRR */ + return -EPERM; + #endif /* !CONFIG_MTRR */ +@@ -6505,8 +6521,13 @@ static int KCL_fpu_save_init(struct task_struct *tsk) + if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) + #else + _copy_xregs_to_kernel(&fpu->state.xsave); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) ++ if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP)) ++#else + if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) + #endif ++ ++#endif + return 1; + } else if (static_cpu_has(X86_FEATURE_FXSR)) { + #if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) +-- +2.8.1 + diff --git a/package/amd-catalyst/0007-remove-gpl-symbols.patch b/package/amd-catalyst/0007-remove-gpl-symbols.patch new file mode 100644 index 0000000000..d0094b0934 --- /dev/null +++ b/package/amd-catalyst/0007-remove-gpl-symbols.patch @@ -0,0 +1,54 @@ +Author: Manuel Rüger +Date: Sat, 2 Jan 2016 17:24:30 +0100 +URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-drivers/ati-drivers/files?id=179aa11ed2f1bd79cf1b190263c3a7a07279fc50 + +Signed-off-by: Romain Perier +--- +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:02.000000000 -0400 ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:11.000000000 -0400 +@@ -136,7 +136,6 @@ + #include + #include + #include +-#include // for flush_tlb_page + #include + #ifdef CONFIG_MTRR + #include +@@ -251,6 +250,26 @@ + #define WRITE_CR4(x) write_cr4(x) + #endif + ++#define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory") ++#define __flush_tlb() native_write_cr3(native_read_cr3()) ++ ++static inline void __flush_tlb_all(void) ++{ ++ if (cpu_has_pge) ++ { ++ unsigned long flags, cr4; ++ raw_local_irq_save(flags); ++ cr4 = native_read_cr4(); ++ native_write_cr4(cr4 & ~X86_CR4_PGE); ++ native_write_cr4(cr4); ++ raw_local_irq_restore(flags); ++ } ++ else ++ { ++ __flush_tlb(); ++ } ++} ++ + // ============================================================ + /* globals */ + +--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:35.000000000 -0400 ++++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:48.000000000 -0400 +@@ -868,7 +868,7 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(vo + #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) + if(pdev) + { +-#if (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8)) ++#if 0 && (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8)) + pci_ignore_hotplug(pdev); + #else + pdev->ignore_hotplug = 1; diff --git a/package/amd-catalyst/20-fglrx.conf b/package/amd-catalyst/20-fglrx.conf new file mode 100644 index 0000000000..d83ff582f6 --- /dev/null +++ b/package/amd-catalyst/20-fglrx.conf @@ -0,0 +1,4 @@ +Section "Device" + Identifier "AMD Radeon GPU" + Driver "fglrx" +EndSection diff --git a/package/amd-catalyst/Config.in b/package/amd-catalyst/Config.in new file mode 100644 index 0000000000..1578324aac --- /dev/null +++ b/package/amd-catalyst/Config.in @@ -0,0 +1,54 @@ +comment "amd-catalyst needs a glibc toolchain" + depends on BR2_i386 || BR2_x86_64 + depends on !BR2_TOOLCHAIN_USES_GLIBC + +config BR2_PACKAGE_AMD_CATALYST + bool "amd-catalyst" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_TOOLCHAIN_USES_GLIBC + help + The binary-only driver blob for AMD cards. + This driver supports AMD Radeon HD 5xxx and newer graphics + cards. + + http://www.amd.com/ + +if BR2_PACKAGE_AMD_CATALYST + +comment "amd-catalyst X.org drivers needs a modular Xorg server <= 1.17" + depends on !BR2_PACKAGE_XORG7 \ + || !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR \ + || !BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 + +config BR2_PACKAGE_AMD_CATALYST_XORG + bool "X.org drivers" + default y + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR + depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 + select BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX + select BR2_PACKAGE_ACPID # runtime + select BR2_PACKAGE_XLIB_LIBX11 # runtime + select BR2_PACKAGE_XLIB_LIBXEXT # runtime + select BR2_PACKAGE_XLIB_LIBXCOMPOSITE # runtime + # This package does not have standard GL headers + select BR2_PACKAGE_MESA3D_HEADERS + select BR2_PACKAGE_HAS_LIBGL + +if BR2_PACKAGE_AMD_CATALYST_XORG + +config BR2_PACKAGE_PROVIDES_LIBGL + default "amd-catalyst" + +endif + +comment "amd-catalyst kernel module needs a kernel to be built" + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_AMD_CATALYST_MODULE + bool "fglrx kernel module" + depends on BR2_LINUX_KERNEL + help + Builds and install the fglrx kernel module + +endif # BR2_PACKAGE_AMD_CATALYST diff --git a/package/amd-catalyst/amd-catalyst.hash b/package/amd-catalyst/amd-catalyst.hash new file mode 100644 index 0000000000..9f9b0a3149 --- /dev/null +++ b/package/amd-catalyst/amd-catalyst.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 bf3e6e7d5c51db3d075410a3f116f865b82823debc1d66698d187249feec6a91 amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip diff --git a/package/amd-catalyst/amd-catalyst.mk b/package/amd-catalyst/amd-catalyst.mk new file mode 100644 index 0000000000..aca77816be --- /dev/null +++ b/package/amd-catalyst/amd-catalyst.mk @@ -0,0 +1,120 @@ +################################################################################ +# +# amd-catalyst +# +################################################################################ + +AMD_CATALYST_VERSION = 15.9 +AMD_CATALYST_VERBOSE_VER = 15.201.1151 +AMD_CATALYST_SITE = http://www2.ati.com/drivers/linux +AMD_CATALYST_DL_OPTS = --referer='http://support.amd.com' +AMD_CATALYST_SOURCE = amd-catalyst-$(AMD_CATALYST_VERSION)-linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.zip +AMD_CATALYST_LICENSE = AMD Software License +AMD_CATALYST_LICENSE_FILES = LICENSE.txt +AMD_CATALYST_INSTALL_STAGING = YES +AMD_CATALYST_SUFFIX = $(if $(BR2_x86_64),_64) +AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX) +AMD_CATALYST_LIB_SUFFIX = $(if $(BR2_x86_64),64) + + +define AMD_CATALYST_EXTRACT_CMDS + unzip -q $(DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D) + $(SHELL) $(@D)/AMD-Catalyst-$(AMD_CATALYST_VERSION)-Linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.run --extract $(@D) +endef + +ifeq ($(BR2_PACKAGE_AMD_CATALYST_MODULE),y) +AMD_CATALYST_MODULE_SUBDIRS = common/lib/modules/fglrx/build_mod/2.6.x +AMD_CATALYST_MODULE_MAKE_OPTS = \ + CFLAGS_MODULE="-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space" + +define AMD_CATALYST_PREPARE_MODULE + # The Makefile expects to have source in the folder 2.6.x + cp $(@D)/common/lib/modules/fglrx/build_mod/*.{c,h} \ + $(@D)/common/lib/modules/fglrx/build_mod/2.6.x + # This static lib is required during the link + cp $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)/lib/modules/fglrx/build_mod/libfglrx_ip.a \ + $(@D)/common/lib/modules/fglrx/build_mod/2.6.x +endef + +AMD_CATALYST_POST_PATCH_HOOKS += AMD_CATALYST_PREPARE_MODULE + +$(eval $(kernel-module)) +endif + +ifeq ($(BR2_PACKAGE_AMD_CATALYST_XORG), y) + +# GL headers are needed by any package that wants to use libgl, so they need to +# be installed before any user of it. The only way to do so is to have this +# package depends on mesa3d-headers. +AMD_CATALYST_DEPENDENCIES += mesa3d-headers +AMD_CATALYST_PROVIDES = libgl +AMD_CATALYST_X11R6_LIB = $(@D)/xpic$(if $(BR2_x86_64),_64a)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX) + +define AMD_CATALYST_INSTALL_GL_LIBS + $(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/fglrx/fglrx-libGL.so.1.2 \ + $(1)/usr/lib + ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1.2 + ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1 + ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so +endef + +define AMD_CATALYST_INSTALL_STAGING_XORG + $(call AMD_CATALYST_INSTALL_GL_LIBS,$(STAGING_DIR)) + $(INSTALL) -D -m 0644 package/amd-catalyst/gl.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc +endef + +AMD_CATALYST_XORG_DRIVERS_FILES = modules/amdxmm.so \ + modules/drivers/fglrx_drv.so \ + modules/linux/libfglrxdrm.so + +define AMD_CATALYST_INSTALL_XORG + # Xorg drivers + $(foreach f,$(AMD_CATALYST_XORG_DRIVERS_FILES), \ + $(INSTALL) -D -m 0755 $(AMD_CATALYST_X11R6_LIB)/$(f) \ + $(TARGET_DIR)/usr/lib/xorg/$(f) + ) + + # Xorg is not able to detect the driver automatically + $(INSTALL) -D -m 0644 package/amd-catalyst/20-fglrx.conf \ + $(TARGET_DIR)/etc/X11/xorg.conf.d/20-fglrx.conf + + + # Common files: containing binary profiles about GPUs, + # required by the fglrx_drv xorg driver + $(INSTALL) -d $(TARGET_DIR)/etc/ati + $(INSTALL) -m 0644 $(@D)/common/etc/ati/* $(TARGET_DIR)/etc/ati/ + + # DRI and GLX xorg modules: by default DRI is activated, + # these modules are required by the fglrx_drv.so xorg driver + $(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/modules/dri/fglrx_dri.so \ + $(TARGET_DIR)/usr/lib/dri/fglrx_dri.so + $(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/extensions/fglrx/fglrx-libglx.so \ + $(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so + $(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/glesx.so \ + $(TARGET_DIR)/usr/lib/xorg/modules/glesx.so + + # Userspace GL libraries, also runtime dependency of most of the cmdline + # tools + $(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/*.so \ + $(TARGET_DIR)/usr/lib/ + $(call AMD_CATALYST_INSTALL_GL_LIBS,$(TARGET_DIR)) + + # Runtime dependency required by libfglrxdrm.so + $(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/libatiuki.so.1.0 \ + $(TARGET_DIR)/usr/lib/ + ln -sf libatiuki.so.1.0 \ + $(TARGET_DIR)/usr/lib/libatiuki.so.1 +endef + +endif + +define AMD_CATALYST_INSTALL_STAGING_CMDS + $(call AMD_CATALYST_INSTALL_STAGING_XORG) +endef + +define AMD_CATALYST_INSTALL_TARGET_CMDS + $(call AMD_CATALYST_INSTALL_XORG) +endef + +$(eval $(generic-package)) diff --git a/package/amd-catalyst/gl.pc b/package/amd-catalyst/gl.pc new file mode 100644 index 0000000000..8729271fa0 --- /dev/null +++ b/package/amd-catalyst/gl.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: gl +Description: AMD Catalyst OpenGL library +Version: 15.9 +Libs: -L${libdir} -lGL -lm -lXext -lX11 -ldl +Cflags: -I${includedir} +glx_tls: no + From f0c3cfc2dace594a831d84a5ca05ae96cf81260b Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 23 Aug 2016 14:19:48 +0200 Subject: [PATCH 0058/3392] package/amd-catalyst: Add command line tools The AMD Catalyst driver includes some command line tools for displaying specific infos about the GL stack or to test 3D, like fglxinfo or fgl_gears. This commit adds support to install such tools. Signed-off-by: Romain Perier Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/amd-catalyst/Config.in | 5 +++++ package/amd-catalyst/amd-catalyst.mk | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/package/amd-catalyst/Config.in b/package/amd-catalyst/Config.in index 1578324aac..b10ed3b11f 100644 --- a/package/amd-catalyst/Config.in +++ b/package/amd-catalyst/Config.in @@ -40,6 +40,11 @@ if BR2_PACKAGE_AMD_CATALYST_XORG config BR2_PACKAGE_PROVIDES_LIBGL default "amd-catalyst" +config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS + bool "command-line configuration tools" + help + Build and install the AMD command line tools. + endif comment "amd-catalyst kernel module needs a kernel to be built" diff --git a/package/amd-catalyst/amd-catalyst.mk b/package/amd-catalyst/amd-catalyst.mk index aca77816be..4c1844c4d3 100644 --- a/package/amd-catalyst/amd-catalyst.mk +++ b/package/amd-catalyst/amd-catalyst.mk @@ -109,12 +109,32 @@ endef endif +ifeq ($(BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS), y) +AMD_CATALYST_CMDLINE_TOOLS_FILES = \ + atiode \ + atiodcli \ + fgl_glxgears \ + aticonfig \ + amd-console-helper \ + fglrxinfo + +define AMD_CATALYST_INSTALL_CMDLINE_TOOLS + $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/atieventsd \ + $(TARGET_DIR)/usr/sbin + $(foreach f,$(AMD_CATALYST_CMDLINE_TOOLS_FILES), \ + $(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/$(f) \ + $(TARGET_DIR)/usr/bin/$(f) + ) +endef +endif + define AMD_CATALYST_INSTALL_STAGING_CMDS $(call AMD_CATALYST_INSTALL_STAGING_XORG) endef define AMD_CATALYST_INSTALL_TARGET_CMDS $(call AMD_CATALYST_INSTALL_XORG) + $(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS) endef $(eval $(generic-package)) From 2f196d9cdc7f1e825d012bd1e8a3fe2de7319869 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 23 Aug 2016 14:19:49 +0200 Subject: [PATCH 0059/3392] package/amd-catalyst: Add support AMD CCCLE The AMD Catalyst Linux driver includes a graphical controler center for AMD graphics accelerators, called Catalyst Controler Center. This commits adds support to install this tool by adding a separated prompt. Signed-off-by: Romain Perier [Thomas: - As noticed by Yann, fixed the dependency of the comment related to the Qt PNG functionality. - Also add the Qt PNG dependency to the BR2_PACKAGE_AMD_CATALYST_CCCLE option itself, noticed by Yann. - Add an empty line, also noticed by Yann.] Signed-off-by: Thomas Petazzoni --- package/amd-catalyst/Config.in | 17 +++++++++++++++++ package/amd-catalyst/amd-catalyst.mk | 10 ++++++++++ 2 files changed, 27 insertions(+) diff --git a/package/amd-catalyst/Config.in b/package/amd-catalyst/Config.in index b10ed3b11f..55099accf0 100644 --- a/package/amd-catalyst/Config.in +++ b/package/amd-catalyst/Config.in @@ -45,6 +45,23 @@ config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS help Build and install the AMD command line tools. +comment "Catalyst Control Center needs Qt4 with X11 and PNG support" + depends on !BR2_PACKAGE_QT || !BR2_PACKAGE_QT_X11 \ + || BR2_PACKAGE_QT_NOPNG + +config BR2_PACKAGE_AMD_CATALYST_CCCLE + bool "Catalyst Control Center" + depends on BR2_PACKAGE_QT + depends on BR2_PACKAGE_QT_X11 + depends on !BR2_PACKAGE_QT_NOPNG + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng + select BR2_PACKAGE_PROCPS_NG # runtime + select BR2_PACKAGE_QT_GUI_MODULE + select BR2_PACKAGE_QT_ACCESSIBILITY + help + Installs the Catalyst Control Center, a Qt graphical tool to + control AMD graphics accelerators. + endif comment "amd-catalyst kernel module needs a kernel to be built" diff --git a/package/amd-catalyst/amd-catalyst.mk b/package/amd-catalyst/amd-catalyst.mk index 4c1844c4d3..07eb0faf7f 100644 --- a/package/amd-catalyst/amd-catalyst.mk +++ b/package/amd-catalyst/amd-catalyst.mk @@ -128,6 +128,15 @@ define AMD_CATALYST_INSTALL_CMDLINE_TOOLS endef endif +ifeq ($(BR2_PACKAGE_AMD_CATALYST_CCCLE), y) +define AMD_CATALYST_INSTALL_CCCLE + $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/amdcccle \ + $(TARGET_DIR)/usr/bin/amdcccle + $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/amdnotifyui \ + $(TARGET_DIR)/usr/sbin/amdnotifyui +endef +endif + define AMD_CATALYST_INSTALL_STAGING_CMDS $(call AMD_CATALYST_INSTALL_STAGING_XORG) endef @@ -135,6 +144,7 @@ endef define AMD_CATALYST_INSTALL_TARGET_CMDS $(call AMD_CATALYST_INSTALL_XORG) $(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS) + $(call AMD_CATALYST_INSTALL_CCCLE) endef $(eval $(generic-package)) From ceb02c00ff88624f900fa4203745d5ce535b87b7 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 23 Aug 2016 14:19:50 +0200 Subject: [PATCH 0060/3392] package/amd-catalyst: Add support for OpenCL The AMD Catalyst Linux driver includes OpenCL libraries for GPGPU computing. This commits adds support to install the binary blobs and ICD profiles. Signed-off-by: Romain Perier Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/amd-catalyst/Config.in | 6 ++++++ package/amd-catalyst/amd-catalyst.mk | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/package/amd-catalyst/Config.in b/package/amd-catalyst/Config.in index 55099accf0..96e7f06481 100644 --- a/package/amd-catalyst/Config.in +++ b/package/amd-catalyst/Config.in @@ -73,4 +73,10 @@ config BR2_PACKAGE_AMD_CATALYST_MODULE help Builds and install the fglrx kernel module +config BR2_PACKAGE_AMD_CATALYST_OPENCL + bool "OpenCL support" + help + Installs the OpenCL binary blobs and the ICD profile + for GPGPU computing. + endif # BR2_PACKAGE_AMD_CATALYST diff --git a/package/amd-catalyst/amd-catalyst.mk b/package/amd-catalyst/amd-catalyst.mk index 07eb0faf7f..30973534b2 100644 --- a/package/amd-catalyst/amd-catalyst.mk +++ b/package/amd-catalyst/amd-catalyst.mk @@ -41,6 +41,29 @@ AMD_CATALYST_POST_PATCH_HOOKS += AMD_CATALYST_PREPARE_MODULE $(eval $(kernel-module)) endif +ifeq ($(BR2_PACKAGE_AMD_CATALYST_OPENCL),y) + +AMD_CATALYST_OCL_SUFFIX = $(if $(BR2_x86_64),64,32) +AMD_CATALYST_OPENCL_FILES = \ + libOpenCL.so.1 \ + libaticalcl.so \ + libamdocl$(AMD_CATALYST_OCL_SUFFIX).so \ + libamdocl12cl$(AMD_CATALYST_OCL_SUFFIX).so + +define AMD_CATALYST_INSTALL_OPENCL + $(foreach f,$(AMD_CATALYST_OPENCL_FILES), \ + $(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/$(f) $(TARGET_DIR)/usr/lib/$(f) + ) + ln -sf libOpenCL.so.1 \ + $(TARGET_DIR)/usr/lib/libOpenCL.so + $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/bin/clinfo \ + $(TARGET_DIR)/usr/bin/clinfo + $(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd \ + $(TARGET_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd +endef + +endif + ifeq ($(BR2_PACKAGE_AMD_CATALYST_XORG), y) # GL headers are needed by any package that wants to use libgl, so they need to @@ -145,6 +168,7 @@ define AMD_CATALYST_INSTALL_TARGET_CMDS $(call AMD_CATALYST_INSTALL_XORG) $(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS) $(call AMD_CATALYST_INSTALL_CCCLE) + $(call AMD_CATALYST_INSTALL_OPENCL) endef $(eval $(generic-package)) From 1e3dfef19d8ae3804671a03b30003fa2d8115fc6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 23 Aug 2016 18:26:32 +0200 Subject: [PATCH 0061/3392] package/libegl: add option for wayland extensions Wayland requires that an OpenGL/EGL implementation provides a few extensions, so that wayland servers and clients can exchange buffers. Currently, only one OpenGL/EGL implementation provides those extensions: mesa3d. However, other implementations are catching up, especially the proprietary NVidia driver, which has as of late introduced those extensions. Other, non-public implementations may also provide those extensions. A lot of wayland-related packages require those extensions, and currently they have to depend on mesa3d to provide OpenGL/EGL, which precludes using those packages when a non-mesa3d provider is enabled, even when that providers implements the necessary extensions. Add an option to the libegl virtual package, that providers on OpenGL/EGL can select to state they provide those extensions. Packages that need those extensions can additionally depend on this new option, instead of the existing libegl package. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/opengl/libegl/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/opengl/libegl/Config.in b/package/opengl/libegl/Config.in index 8401bb22ed..f756fbeadf 100644 --- a/package/opengl/libegl/Config.in +++ b/package/opengl/libegl/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_HAS_LIBEGL bool +config BR2_PACKAGE_HAS_LIBEGL_WAYLAND + bool + depends on BR2_PACKAGE_HAS_LIBEGL + config BR2_PACKAGE_PROVIDES_LIBEGL depends on BR2_PACKAGE_HAS_LIBEGL string From aab7cab8220466fa2043f59e45051341ecd27946 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 23 Aug 2016 18:26:33 +0200 Subject: [PATCH 0062/3392] package/mesa3d: also implements the EGL wayland extensions mesa3d implements the EGL extensions for wayland. State so. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/mesa3d/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 45ca69c4fc..6f60ee1b34 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -150,6 +150,7 @@ comment "Additional API Support" config BR2_PACKAGE_MESA3D_OPENGL_EGL bool "OpenGL EGL" select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBEGL_WAYLAND help Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications similar to GLX, for X, and WGL, for Windows. From 427fcaa52379a16483e74a40f2d6a592f5d0bdee Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 23 Aug 2016 18:26:34 +0200 Subject: [PATCH 0063/3392] package/libgtk3: needs OpenGL-EGL/wayland Currently, libgtk3 depends on either a full OpenGL stack, or on a OpenGL-EGL stack provided by mesa3d. This is because, when using the wayland backend, libgtk3 needs an OpenGL-EGL stack tht provides the wayland extensions. So far, only mesa3d would provide those extensions. But now, those extensions are trickling down to other implementations, like the Nvidia driver or other (even non-public) implementations. Change the condition to be on the recently introduced libegl-wayland option. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/libgtk3/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 39105acd9b..2dd6dfacd1 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -4,10 +4,10 @@ comment "libgtk3 needs a toolchain w/ wchar, threads, C++" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS -comment "libgtk3 needs an OpenGL or OpenGL EGL backend provided by mesa3d" +comment "libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL && \ + depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND && \ !BR2_PACKAGE_HAS_LIBGL config BR2_PACKAGE_LIBGTK3 @@ -29,7 +29,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL || \ + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLANDD || \ BR2_PACKAGE_HAS_LIBGL help The GTK+ version 3 graphical user interface library @@ -65,7 +65,7 @@ comment "Wayland GDK backend needs an OpenGL EGL backend provided by mesa3d w/ h config BR2_PACKAGE_LIBGTK3_WAYLAND bool "Wayland GDK backend" default y - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS From 652d674e066e9c1b8eec9057778d2c9a34f8261d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 23 Aug 2016 22:20:11 +0200 Subject: [PATCH 0064/3392] package/amd-catalyst: fix circular Config.in dependency The current amd-catalyst options related to the CCCLE tool create the following Config.in circular dependency: package/qt/Config.in:134:error: recursive dependency detected! package/qt/Config.in:134: symbol BR2_PACKAGE_QT_GUI_MODULE is selected by BR2_PACKAGE_AMD_CATALYST_CCCLE package/amd-catalyst/Config.in:52: symbol BR2_PACKAGE_AMD_CATALYST_CCCLE depends on BR2_PACKAGE_QT_NOPNG package/qt/Config.in:277: symbol BR2_PACKAGE_QT_NOPNG is part of choice package/qt/Config.in:271: choice contains symbol package/qt/Config.in:271: choice contains symbol BR2_PACKAGE_QT_GUI_MODULE But in fact, it turns out that selecting BR2_PACKAGE_QT_GUI_MODULE is not necessary, since we already "depends on BR2_PACKAGE_QT_X11", which itself selects BR2_PACKAGE_QT_GUI_MODULE. Therefore, to fix this problem we simply remove the "select BR2_PACKAGE_QT_GUI_MODULE" from the BR2_PACKAGE_AMD_CATALYST_CCCLE option. Signed-off-by: Thomas Petazzoni --- package/amd-catalyst/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/amd-catalyst/Config.in b/package/amd-catalyst/Config.in index 96e7f06481..85551ed803 100644 --- a/package/amd-catalyst/Config.in +++ b/package/amd-catalyst/Config.in @@ -56,7 +56,6 @@ config BR2_PACKAGE_AMD_CATALYST_CCCLE depends on !BR2_PACKAGE_QT_NOPNG select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng select BR2_PACKAGE_PROCPS_NG # runtime - select BR2_PACKAGE_QT_GUI_MODULE select BR2_PACKAGE_QT_ACCESSIBILITY help Installs the Catalyst Control Center, a Qt graphical tool to From 40b6d22eabe21c9682102870a0a01c868ac1e3da Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 23 Aug 2016 17:53:23 -0300 Subject: [PATCH 0065/3392] openvpn: bump to version 2.3.12 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 179198e50e..ce005d3d51 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 0f5f1ca1dc5743fa166d93dd4ec952f014b5f33bafd88f0ea34b455cae1434a7 openvpn-2.3.11.tar.xz +sha256 13b963414e2430215981868c77b9795d93653ee535a2d73576f7bb2c28200abc openvpn-2.3.12.tar.xz diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index f3985cd2ef..0e59fdc98d 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.3.11 +OPENVPN_VERSION = 2.3.12 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl From f04e0136d1a9fa77e0085398c77e316237dca5ff Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 24 Aug 2016 09:23:50 -0300 Subject: [PATCH 0066/3392] memcached: bump to version 1.4.31 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/memcached/memcached.hash | 6 +++--- package/memcached/memcached.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index b1353b2f43..918a36bbf5 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,4 +1,4 @@ -# From http://www.memcached.org/files/memcached-1.4.30.tar.gz.sha1 -sha1 bb8644a4110932e331d1539f0435bc6a0e558827 memcached-1.4.30.tar.gz +# From http://www.memcached.org/files/memcached-1.4.31.tar.gz.sha1 +sha1 3ea34f5bc5c5aacb76cfc07f4ee5847f33526cb6 memcached-1.4.31.tar.gz # Calculated based on the hash above -sha256 e0bea597c9082557f3357f63db08c3d5121ccc8502f300a48d4cb84d22e8be5f memcached-1.4.30.tar.gz +sha256 77ce5f820bafe94c33bf7bd86268d9bcdb3b76f68128d795b106db53d528707f memcached-1.4.31.tar.gz diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index b40ca84ba0..409942837a 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.4.30 +MEMCACHED_VERSION = 1.4.31 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From 15c0de8b3544f67bc61e5f9ce149b70bbf297c69 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 24 Aug 2016 16:58:59 +0300 Subject: [PATCH 0067/3392] libnetfilter_acct: remove autoreconf Since commit b8d446cd56dc (libnetfilter_acct: bump to version 1.0.3, 2016-08-23) we no longer patch configure.ac. Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libnetfilter_acct/libnetfilter_acct.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libnetfilter_acct/libnetfilter_acct.mk b/package/libnetfilter_acct/libnetfilter_acct.mk index 3870ef84ed..c2fa234778 100644 --- a/package/libnetfilter_acct/libnetfilter_acct.mk +++ b/package/libnetfilter_acct/libnetfilter_acct.mk @@ -9,7 +9,6 @@ LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz LIBNETFILTER_ACCT_SITE = http://www.netfilter.org/projects/libnetfilter_acct/files LIBNETFILTER_ACCT_INSTALL_STAGING = YES LIBNETFILTER_ACCT_DEPENDENCIES = host-pkgconf libmnl -LIBNETFILTER_ACCT_AUTORECONF = YES LIBNETFILTER_ACCT_LICENSE = LGPLv2.1+ LIBNETFILTER_ACCT_LICENSE_FILES = COPYING From 7f02e6b1e81e826a88968780243925ec895926ca Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 24 Aug 2016 16:59:00 +0300 Subject: [PATCH 0068/3392] nfacct: remove autoreconf Since commit ae0e8950540f (nfacct: bump to version 1.0.2, 2016-08-23) we no longer patch configure.ac. Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/nfacct/nfacct.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/nfacct/nfacct.mk b/package/nfacct/nfacct.mk index d19d02fbfe..a4e20452bf 100644 --- a/package/nfacct/nfacct.mk +++ b/package/nfacct/nfacct.mk @@ -9,7 +9,6 @@ NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2 NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files NFACCT_DEPENDENCIES = host-pkgconf \ libnetfilter_acct -NFACCT_AUTORECONF = YES NFACCT_LICENSE = GPLv2 NFACCT_LICENSE_FILES = COPYING From a9cc30847badb96bc56645e8abdb14f6f2ec7304 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 24 Aug 2016 19:55:27 +0300 Subject: [PATCH 0069/3392] openipmi: bump to version 2.0.22 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/openipmi/openipmi.hash | 3 ++- package/openipmi/openipmi.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index e6fafe48ab..30e37634ef 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,4 +1,5 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 54f63ab7fe09f6a4b0b718601fe9c61014aa220b OpenIPMI-2.0.21.tar.gz +sha1 826081e7ed0ad430de9b8fdb75a9eaa10c99b660 OpenIPMI-2.0.22.tar.gz # Locally computed +sha256 4988900043c35fcfa9b2bf275d6593904f6429221befb770ba6ecb5502108e55 OpenIPMI-2.0.22.tar.gz sha256 0eafaa502ccf752899c5089159574081067d0c4ac53ea0ace33a5087f33ea32a 0001-ui-use-standard-uint32_t.patch diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index ea46e191da..9faa7c685f 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,9 +4,9 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.21 +OPENIPMI_VERSION = 2.0.22 OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library -OPENIPMI_SOURCE = OpenIPMI-2.0.21.tar.gz +OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_PATCH = \ http://sourceforge.net/p/openipmi/patches/26/attachment/0001-ui-use-standard-uint32_t.patch OPENIPMI_LICENSE = LGPLv2+, GPLv2+, BSD-3c From 9280bcff708494e7a62eda50ffd378438d247db7 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Thu, 25 Aug 2016 23:01:03 +1200 Subject: [PATCH 0070/3392] micropython: bump version to v1.8.3 Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/micropython/micropython.hash | 2 +- package/micropython/micropython.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index b3a7c22ccc..ea42bfb270 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,2 +1,2 @@ #locally computed -sha256 f8ea3faffa797de1a06c16c8f57c784c665b318ca08ac17f74dcbc95322d47de micropython-v1.6.tar.gz +sha256 871378fcf1f1042c399896d5673da67d12e1fb36c2e706af289fc959bc8f7a57 micropython-v1.8.3.tar.gz diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 853caa2c3e..047e340896 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = v1.6 +MICROPYTHON_VERSION = v1.8.3 MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION)) MICROPYTHON_LICENSE = MIT MICROPYTHON_LICENSE_FILES = LICENSE @@ -16,14 +16,21 @@ ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb),) MICROPYTHON_CFLAGS = -DMICROPY_GCREGS_SETJMP=1 endif +# When building from a tarball we don't have some of the dependencies that are in +# the git repository as submodules +MICROPYTHON_MAKE_OPTS = MICROPY_PY_BTREE=0 +MICROPYTHON_MAKE_OPTS += MICROPY_PY_USSL=0 + define MICROPYTHON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/unix \ + $(MICROPYTHON_MAKE_OPTS) \ CROSS_COMPILE=$(TARGET_CROSS) \ CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) endef define MICROPYTHON_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/unix \ + $(MICROPYTHON_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) \ PREFIX=$(TARGET_DIR)/usr \ install From da22fccffb3ab6bbeb123410790bd390b3ae2a05 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Thu, 25 Aug 2016 23:01:04 +1200 Subject: [PATCH 0071/3392] micropython-lib: bump version to v1.8.2 Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/micropython-lib/micropython-lib.hash | 2 +- package/micropython-lib/micropython-lib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/micropython-lib/micropython-lib.hash b/package/micropython-lib/micropython-lib.hash index 30d0cf8882..fc1595a9ce 100644 --- a/package/micropython-lib/micropython-lib.hash +++ b/package/micropython-lib/micropython-lib.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 e659444fadd755c1b5dbff091aa1b23a835e7361da3a32f38774bd39a15937ad micropython-lib-v1.0.tar.gz +sha256 4f9250a93413c9925b912d54fe3aaee2d275c82bdb447fc07a090fc60287f5e8 micropython-lib-v1.8.2.tar.gz diff --git a/package/micropython-lib/micropython-lib.mk b/package/micropython-lib/micropython-lib.mk index 4ed2120a7e..a0b533a53f 100644 --- a/package/micropython-lib/micropython-lib.mk +++ b/package/micropython-lib/micropython-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_LIB_VERSION = v1.0 +MICROPYTHON_LIB_VERSION = v1.8.2 MICROPYTHON_LIB_SITE = $(call github,micropython,micropython-lib,$(MICROPYTHON_LIB_VERSION)) MICROPYTHON_LIB_LICENSE = Python software foundation license v2 (some modules), MIT (everything else) MICROPYTHON_LIB_LICENSE_FILES = LICENSE From bacff38e08a3cf7c5ead0e5de59011134e009931 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Aug 2016 21:19:27 +0200 Subject: [PATCH 0072/3392] package/freeswitch: bump version to 1.6.10 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/freeswitch/freeswitch.hash | 4 ++-- package/freeswitch/freeswitch.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 20411585a2..4a4d6dae5c 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,2 +1,2 @@ -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.9.tar.xz.sha256 -sha256 aa5f191113be2bd44cb4f2108da3dcc37be3234c6b733896fbff97526ac66451 freeswitch-1.6.9.tar.xz +# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.10.tar.xz.sha256 +sha256 b7beaaac29dc0a58cc34cfd402bf1c7e8ca06975722fd8ddb2983cbed17dd6e4 freeswitch-1.6.10.tar.xz diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index e7e9eceafd..b65096b7c0 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.6.9 +FREESWITCH_VERSION = 1.6.10 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases FREESWITCH_LICENSE = MPLv1.1, \ From 9c67af2c524ad2b6585af2f5e43f76dacd7cc109 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 25 Aug 2016 23:47:16 +0200 Subject: [PATCH 0073/3392] system/skeleton: use uid/gid 65534 for nobody/nogroup As recently discussed on lwn.net: https://lwn.net/Articles/695478/ The kernel has special behaviour for uid/gid 65534: 1. The kernel maps UIDs > 65535 to it when some subsystem/API/fs only supports 16bit UIDs, but a 32bit UID is passed to it. 2. it's used by the kernel's user namespacing as the internal UID that external UIDs are mapped to that don't have any local mapping. 3. It's used by NFS for all user IDs that cannot be mapped locally if UID mapping is enabled. Most distributions already map (or are in the progress of changing) nobody/nogroup to the 65534 uid/gid, so lets do so as well. Signed-off-by: Peter Korsgaard Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- system/skeleton/etc/group | 2 +- system/skeleton/etc/passwd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/skeleton/etc/group b/system/skeleton/etc/group index c813da2022..76346b35f2 100644 --- a/system/skeleton/etc/group +++ b/system/skeleton/etc/group @@ -22,5 +22,5 @@ plugdev:x:46: staff:x:50: lock:x:54: netdev:x:82: -nogroup:x:99: users:x:100: +nogroup:x:65534: diff --git a/system/skeleton/etc/passwd b/system/skeleton/etc/passwd index 883265ad6f..d8281d2585 100644 --- a/system/skeleton/etc/passwd +++ b/system/skeleton/etc/passwd @@ -6,4 +6,4 @@ sync:x:4:100:sync:/bin:/bin/sync mail:x:8:8:mail:/var/spool/mail:/bin/false www-data:x:33:33:www-data:/var/www:/bin/false operator:x:37:37:Operator:/var:/bin/false -nobody:x:99:99:nobody:/home:/bin/false +nobody:x:65534:65534:nobody:/home:/bin/false From 8972c398ff8b6b3550735c9e15fd61cdc7297049 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 23 Aug 2016 16:40:00 +0200 Subject: [PATCH 0074/3392] blktrace: re-enable on uClibc With a small patch, blktrace can work on uClibc: we simply need to link with librt to use the posix_spawn*() functions. [Thomas: add reference to upstream commit.] Signed-off-by: Thomas Petazzoni --- .../0001-iowatcher-link-with-lrt.patch | 31 +++++++++++++++++++ package/blktrace/Config.in | 5 --- 2 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 package/blktrace/0001-iowatcher-link-with-lrt.patch diff --git a/package/blktrace/0001-iowatcher-link-with-lrt.patch b/package/blktrace/0001-iowatcher-link-with-lrt.patch new file mode 100644 index 0000000000..689a67814a --- /dev/null +++ b/package/blktrace/0001-iowatcher-link-with-lrt.patch @@ -0,0 +1,31 @@ +From 80d87b99d72034441ea4fbab81f5c80c1ef3b067 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 23 Aug 2016 16:36:14 +0200 +Subject: [PATCH] iowatcher: link with -lrt + +Some C libraries (notably uClibc) have the posix_spawn*() functions in +librt, so let's link iowatcher with -lrt. + +Signed-off-by: Thomas Petazzoni +Upstream-status: merged + (http://git.kernel.org/cgit/linux/kernel/git/axboe/blktrace.git/commit/?id=d1ab783430f5a832e973ed9a293da146c04c6702) +--- + iowatcher/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iowatcher/Makefile b/iowatcher/Makefile +index 7b5101c..502476d 100644 +--- a/iowatcher/Makefile ++++ b/iowatcher/Makefile +@@ -19,7 +19,7 @@ all: $(ALL) + $(CC) -o $*.o -c $(ALL_CFLAGS) $< + + iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm ++ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -lrt + + depend: + @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend +-- +2.7.4 + diff --git a/package/blktrace/Config.in b/package/blktrace/Config.in index 958f004d11..38c0947e1c 100644 --- a/package/blktrace/Config.in +++ b/package/blktrace/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_BLKTRACE bool "blktrace" - # Uses posix_spawn() - depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS select BR2_PACKAGE_LIBAIO help @@ -10,6 +8,3 @@ config BR2_PACKAGE_BLKTRACE up to user space. http://git.kernel.dk/?p=blktrace.git;a=summary - -comment "blktrace needs a glibc or musl toolchain" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) From ff9ca7096bff21702f8d44c4c3b0380391fa8b19 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 22 Aug 2016 07:34:28 +0200 Subject: [PATCH 0075/3392] python-crcmod: new package Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-crcmod/Config.in | 8 ++++++++ package/python-crcmod/python-crcmod.hash | 3 +++ package/python-crcmod/python-crcmod.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-crcmod/Config.in create mode 100644 package/python-crcmod/python-crcmod.hash create mode 100644 package/python-crcmod/python-crcmod.mk diff --git a/package/Config.in b/package/Config.in index 3e8c515126..ad26def671 100644 --- a/package/Config.in +++ b/package/Config.in @@ -654,6 +654,7 @@ menu "External python modules" source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-crc16/Config.in" + source "package/python-crcmod/Config.in" source "package/python-crossbar/Config.in" source "package/python-cryptography/Config.in" source "package/python-cssselect/Config.in" diff --git a/package/python-crcmod/Config.in b/package/python-crcmod/Config.in new file mode 100644 index 0000000000..289a3aee8b --- /dev/null +++ b/package/python-crcmod/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_CRCMOD + bool "python-crcmod" + help + The software in this package is a Python module for + generating objects that compute the Cyclic Redundancy + Check (CRC). + + http://crcmod.sourceforge.net/ diff --git a/package/python-crcmod/python-crcmod.hash b/package/python-crcmod/python-crcmod.hash new file mode 100644 index 0000000000..7ce549c302 --- /dev/null +++ b/package/python-crcmod/python-crcmod.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/crcmod/json, sha256 locally computed +md5 2d5b92117d958dcead94f9e17f54cd32 crcmod-1.7.tar.gz +sha256 dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e crcmod-1.7.tar.gz diff --git a/package/python-crcmod/python-crcmod.mk b/package/python-crcmod/python-crcmod.mk new file mode 100644 index 0000000000..1aab7f5084 --- /dev/null +++ b/package/python-crcmod/python-crcmod.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-crcmod +# +################################################################################ + +PYTHON_CRCMOD_VERSION = 1.7 +PYTHON_CRCMOD_SOURCE = crcmod-$(PYTHON_CRCMOD_VERSION).tar.gz +PYTHON_CRCMOD_SITE = https://pypi.python.org/packages/6b/b0/e595ce2a2527e169c3bcd6c33d2473c1918e0b7f6826a043ca1245dd4e5b +PYTHON_CRCMOD_SETUP_TYPE = distutils +PYTHON_CRCMOD_LICENSE = MIT +PYTHON_CRCMOD_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 2893d2f22c757edc3cfc6bc8fff8d2dbd7f7fe1a Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 15 Aug 2016 17:03:36 +0200 Subject: [PATCH 0076/3392] package/ffmpeg: bump to version 3.1.2 - Remove non-existing configure options: - --disable-mips32r2 - --disable-libvo-aacenc - --enable-libdcadec (https://github.com/FFmpeg/FFmpeg/commit/e259dc86a80398d56d1aabcf6203f80616a4d04d) - Amend renamed configure options: - --disable-mipsdspr1 has been renamed to --disable-mipsdsp Remove all Kodi-related patches according to upstream repo: https://github.com/xbmc/FFmpeg/commits/release/3.1-xbmc Kodi now uses an unpatched ffmpeg. Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ub-palette-as-stored-on-normal-dvd-s.patch | 63 ----------- ...t-returns-AVERROR_IO-we-are-done.-ff.patch | 32 ------ ...7-TV-Teletext-support-for-DVB-EBU-Te.patch | 47 -------- ...accept-mpegts-PMT-that-isn-t-current.patch | 46 -------- ...-PMT-unless-it-s-version-has-changed.patch | 48 -------- ...mps-as-well-as-PCR-timestamps-to-fin.patch | 105 ------------------ ...tream-durations-using-read_timestamp.patch | 74 ------------ ...second-skew-between-streams-in-mov-b.patch | 33 ------ ...-mpegts-demuxer-on-some-malformed-mp.patch | 44 -------- ...-Speed-up-mpegts-av_find_stream_info.patch | 30 ----- ...va-playback-of-streams-that-don-t-st.patch | 77 ------------- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 20 +--- 13 files changed, 3 insertions(+), 618 deletions(-) delete mode 100644 package/ffmpeg/0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch delete mode 100644 package/ffmpeg/0003-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch delete mode 100644 package/ffmpeg/0004-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch delete mode 100644 package/ffmpeg/0005-Don-t-accept-mpegts-PMT-that-isn-t-current.patch delete mode 100644 package/ffmpeg/0006-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch delete mode 100644 package/ffmpeg/0007-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch delete mode 100644 package/ffmpeg/0008-Get-stream-durations-using-read_timestamp.patch delete mode 100644 package/ffmpeg/0009-changed-allow-4-second-skew-between-streams-in-mov-b.patch delete mode 100644 package/ffmpeg/0010-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch delete mode 100644 package/ffmpeg/0011-Speed-up-mpegts-av_find_stream_info.patch delete mode 100644 package/ffmpeg/0012-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch diff --git a/package/ffmpeg/0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch b/package/ffmpeg/0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch deleted file mode 100644 index a51a7d3c9c..0000000000 --- a/package/ffmpeg/0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 74f1c9b43b191a9d6b494e90a4a11677fca33c13 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Sun, 11 Sep 2011 19:04:51 +0200 -Subject: [PATCH 01/13] Support raw dvdsub palette as stored on normal dvd's - -This is how the palette is stored on dvd's. Currently -only xbmc passes the palette information to libavcodec -this way. - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavcodec/dvdsubdec.c | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c -index 39604f3..a711e16 100644 ---- a/libavcodec/dvdsubdec.c -+++ b/libavcodec/dvdsubdec.c -@@ -64,6 +64,24 @@ static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t * - } - } - -+static void ayvu_to_argb(const uint8_t *ayvu, uint32_t *argb, int num_values) -+{ -+ uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; -+ uint8_t r, g, b; -+ int i, y, cb, cr, a; -+ int r_add, g_add, b_add; -+ -+ for (i = num_values; i > 0; i--) { -+ a = *ayvu++; -+ y = *ayvu++; -+ cr = *ayvu++; -+ cb = *ayvu++; -+ YUV_TO_RGB1_CCIR(cb, cr); -+ YUV_TO_RGB2_CCIR(r, g, b, y); -+ *argb++ = (a << 24) | (r << 16) | (g << 8) | b; -+ } -+} -+ - static int decode_run_2bit(GetBitContext *gb, int *color) - { - unsigned int v, t; -@@ -697,6 +715,12 @@ static av_cold int dvdsub_init(AVCodecContext *avctx) - parse_ifo_palette(ctx, ctx->ifo_str); - if (ctx->palette_str) - parse_palette(ctx, ctx->palette_str); -+ -+ if (!ctx->has_palette && avctx->extradata_size == 64) { -+ ayvu_to_argb((uint8_t*)avctx->extradata, ctx->palette, 16); -+ ctx->has_palette = 1; -+ } -+ - if (ctx->has_palette) { - int i; - av_log(avctx, AV_LOG_DEBUG, "palette:"); --- -2.1.0 - diff --git a/package/ffmpeg/0003-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch b/package/ffmpeg/0003-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch deleted file mode 100644 index 034413405f..0000000000 --- a/package/ffmpeg/0003-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 54200b3e6009c6870e33c02c8bbcf023fcd92cac Mon Sep 17 00:00:00 2001 -From: Cory Fields -Date: Mon, 28 Jun 2010 01:55:31 -0400 -Subject: [PATCH 03/13] if av_read_packet returns AVERROR_IO, we are done. - ffmpeg's codecs might or might not handle returning any completed demuxed - packets correctly - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavformat/utils.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libavformat/utils.c b/libavformat/utils.c -index ae6347a..3e8af50 100644 ---- a/libavformat/utils.c -+++ b/libavformat/utils.c -@@ -1304,6 +1304,8 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) - if (ret < 0) { - if (ret == AVERROR(EAGAIN)) - return ret; -+ if (ret == AVERROR(EIO)) -+ return ret; - /* flush the parsers */ - for (i = 0; i < s->nb_streams; i++) { - st = s->streams[i]; --- -2.1.0 - diff --git a/package/ffmpeg/0004-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch b/package/ffmpeg/0004-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch deleted file mode 100644 index bc6a2d456d..0000000000 --- a/package/ffmpeg/0004-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e9236f6fe3fae1ad4a3a2b6b63db493b083f0b21 Mon Sep 17 00:00:00 2001 -From: Cory Fields -Date: Mon, 28 Jun 2010 02:10:50 -0400 -Subject: [PATCH 04/13] added: Ticket #7187, TV Teletext support for DVB EBU - Teletext streams - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavcodec/avcodec.h | 4 ++++ - libavformat/mpegts.c | 2 ++ - 2 files changed, 6 insertions(+) - -diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h -index dabae1b..dd6ef3f 100644 ---- a/libavcodec/avcodec.h -+++ b/libavcodec/avcodec.h -@@ -520,6 +520,10 @@ enum AVCodecID { - AV_CODEC_ID_PJS = MKBETAG('P','h','J','S'), - AV_CODEC_ID_ASS = MKBETAG('A','S','S',' '), ///< ASS as defined in Matroska - -+ /* data codecs */ -+ AV_CODEC_ID_VBI_DATA= 0x17500, -+ AV_CODEC_ID_VBI_TELETEXT, -+ - /* other specific kind of codecs (generally used for attachments) */ - AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. - AV_CODEC_ID_TTF = 0x18000, -diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c -index 97da0a3..5dd28f1 100644 ---- a/libavformat/mpegts.c -+++ b/libavformat/mpegts.c -@@ -729,6 +729,8 @@ static const StreamType DESC_types[] = { - { 0x7b, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, - { 0x56, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_TELETEXT }, - { 0x59, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_SUBTITLE }, /* subtitling descriptor */ -+ { 0x45, AVMEDIA_TYPE_DATA, AV_CODEC_ID_VBI_DATA }, /* VBI Data descriptor */ -+ { 0x46, AVMEDIA_TYPE_DATA, AV_CODEC_ID_VBI_TELETEXT }, /* VBI Teletext descriptor */ - { 0 }, - }; - --- -2.1.0 - diff --git a/package/ffmpeg/0005-Don-t-accept-mpegts-PMT-that-isn-t-current.patch b/package/ffmpeg/0005-Don-t-accept-mpegts-PMT-that-isn-t-current.patch deleted file mode 100644 index feb58f7b25..0000000000 --- a/package/ffmpeg/0005-Don-t-accept-mpegts-PMT-that-isn-t-current.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1f48ee2290e9041b0371eb9a9cb742e9568930a1 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Sun, 18 Sep 2011 19:16:34 +0200 -Subject: [PATCH 05/13] Don't accept mpegts PMT that isn't current - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavformat/mpegts.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c -index 5dd28f1..9f85aed 100644 ---- a/libavformat/mpegts.c -+++ b/libavformat/mpegts.c -@@ -572,6 +572,7 @@ typedef struct SectionHeader { - uint8_t tid; - uint16_t id; - uint8_t version; -+ uint8_t current; - uint8_t sec_num; - uint8_t last_sec_num; - } SectionHeader; -@@ -643,6 +644,7 @@ static int parse_section_header(SectionHeader *h, - val = get8(pp, p_end); - if (val < 0) - return val; -+ h->current = val & 0x1; - h->version = (val >> 1) & 0x1f; - val = get8(pp, p_end); - if (val < 0) -@@ -1968,6 +1970,8 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len - return; - if (ts->skip_changes) - return; -+ if (!h->current) -+ return; - - ts->stream->ts_id = h->id; - --- -2.1.0 - diff --git a/package/ffmpeg/0006-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch b/package/ffmpeg/0006-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch deleted file mode 100644 index 0418f25eb1..0000000000 --- a/package/ffmpeg/0006-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch +++ /dev/null @@ -1,48 +0,0 @@ -From db98fbe37f2f7175ff03b8d582e940518ddf3642 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Sun, 18 Sep 2011 19:17:23 +0200 -Subject: [PATCH 06/13] Don't reparse PMT unless it's version has changed - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavformat/mpegts.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c -index 9f85aed..25007a6 100644 ---- a/libavformat/mpegts.c -+++ b/libavformat/mpegts.c -@@ -88,6 +88,7 @@ struct MpegTSFilter { - int es_id; - int last_cc; /* last cc code (-1 if first packet) */ - int64_t last_pcr; -+ int last_version; /* last version of data on this pid */ - enum MpegTSFilterType type; - union { - MpegTSPESFilter pes_filter; -@@ -450,6 +451,7 @@ static MpegTSFilter *mpegts_open_filter(MpegTSContext *ts, unsigned int pid, - filter->es_id = -1; - filter->last_cc = -1; - filter->last_pcr= -1; -+ filter->last_version = -1; - - return filter; - } -@@ -1972,6 +1974,10 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len - return; - if (!h->current) - return; -+ if (h->version == filter->last_version) -+ return; -+ filter->last_version = h->version; -+ av_dlog(ts->stream, "version=%d\n", filter->last_version); - - ts->stream->ts_id = h->id; - --- -2.1.0 - diff --git a/package/ffmpeg/0007-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch b/package/ffmpeg/0007-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch deleted file mode 100644 index 259b35939e..0000000000 --- a/package/ffmpeg/0007-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch +++ /dev/null @@ -1,105 +0,0 @@ -From fdd8caea6535434a877587f5325e914ba50ed17f Mon Sep 17 00:00:00 2001 -From: Cory Fields -Date: Fri, 9 Jul 2010 16:43:31 -0400 -Subject: [PATCH 07/13] Read PID timestamps as well as PCR timestamps to find - location in mpegts stream - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavformat/mpegts.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 46 insertions(+), 2 deletions(-) - -diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c -index 25007a6..d5a8a45 100644 ---- a/libavformat/mpegts.c -+++ b/libavformat/mpegts.c -@@ -2459,6 +2459,44 @@ static void seek_back(AVFormatContext *s, AVIOContext *pb, int64_t pos) { - av_log(s, pb->seekable ? AV_LOG_ERROR : AV_LOG_INFO, "Unable to seek back to the start\n"); - } - -+static int parse_timestamp(int64_t *ts, const uint8_t *buf) -+{ -+ int afc, flags; -+ const uint8_t *p; -+ -+ if(!(buf[1] & 0x40)) /* must be a start packet */ -+ return -1; -+ -+ afc = (buf[3] >> 4) & 3; -+ p = buf + 4; -+ if (afc == 0 || afc == 2) /* invalid or only adaption field */ -+ return -1; -+ if (afc == 3) -+ p += p[0] + 1; -+ if (p >= buf + TS_PACKET_SIZE) -+ return -1; -+ -+ if (p[0] != 0x00 || p[1] != 0x00 || p[2] != 0x01) /* packet_start_code_prefix */ -+ return -1; -+ -+ flags = p[3] | 0x100; /* stream type */ -+ if (!((flags >= 0x1c0 && flags <= 0x1df) || -+ (flags >= 0x1e0 && flags <= 0x1ef) || -+ (flags == 0x1bd) || (flags == 0x1fd))) -+ return -1; -+ -+ flags = p[7]; -+ if ((flags & 0xc0) == 0x80) { -+ *ts = ff_parse_pes_pts(p+9); -+ return 0; -+ } else if ((flags & 0xc0) == 0xc0) { -+ *ts = ff_parse_pes_pts(p+9+5); -+ return 0; -+ } -+ return -1; -+} -+ -+ - static int mpegts_read_header(AVFormatContext *s) - { - MpegTSContext *ts = s->priv_data; -@@ -2658,6 +2696,7 @@ static av_unused int64_t mpegts_get_pcr(AVFormatContext *s, int stream_index, - uint8_t buf[TS_PACKET_SIZE]; - int pcr_l, pcr_pid = - ((PESContext *)s->streams[stream_index]->priv_data)->pcr_pid; -+ int pid = ((PESContext*)s->streams[stream_index]->priv_data)->pid; - int pos47 = ts->pos47_full % ts->raw_packet_size; - pos = - ((*ppos + ts->raw_packet_size - 1 - pos47) / ts->raw_packet_size) * -@@ -2679,6 +2718,11 @@ static av_unused int64_t mpegts_get_pcr(AVFormatContext *s, int stream_index, - *ppos = pos; - return timestamp; - } -+ if ((pid < 0 || (AV_RB16(buf + 1) & 0x1fff) == pid) && -+ parse_timestamp(×tamp, buf) == 0) { -+ *ppos = pos; -+ return timestamp; -+ } - pos += ts->raw_packet_size; - } - -@@ -2778,7 +2822,7 @@ AVInputFormat ff_mpegts_demuxer = { - .read_header = mpegts_read_header, - .read_packet = mpegts_read_packet, - .read_close = mpegts_read_close, -- .read_timestamp = mpegts_get_dts, -+ .read_timestamp = mpegts_get_pcr, - .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT, - .priv_class = &mpegts_class, - }; -@@ -2790,7 +2834,7 @@ AVInputFormat ff_mpegtsraw_demuxer = { - .read_header = mpegts_read_header, - .read_packet = mpegts_raw_read_packet, - .read_close = mpegts_read_close, -- .read_timestamp = mpegts_get_dts, -+ .read_timestamp = mpegts_get_pcr, - .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT, - .priv_class = &mpegtsraw_class, - }; --- -2.1.0 - diff --git a/package/ffmpeg/0008-Get-stream-durations-using-read_timestamp.patch b/package/ffmpeg/0008-Get-stream-durations-using-read_timestamp.patch deleted file mode 100644 index 0b80c113e1..0000000000 --- a/package/ffmpeg/0008-Get-stream-durations-using-read_timestamp.patch +++ /dev/null @@ -1,74 +0,0 @@ -From c57e5b8154f5fe1457f4c64e04885a2cdfb37f51 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Sat, 22 Oct 2011 19:01:38 +0200 -Subject: [PATCH 08/13] Get stream durations using read_timestamp - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavformat/utils.c | 39 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 39 insertions(+) - -diff --git a/libavformat/utils.c b/libavformat/utils.c -index 3e8af50..f4fb172 100644 ---- a/libavformat/utils.c -+++ b/libavformat/utils.c -@@ -2356,6 +2356,41 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic) - #define DURATION_MAX_READ_SIZE 250000LL - #define DURATION_MAX_RETRY 4 - -+static void av_estimate_timings_from_pts2(AVFormatContext *ic, int64_t old_offset) -+{ -+ AVStream *st; -+ int i, step= 1024; -+ int64_t ts, pos; -+ -+ for(i=0;inb_streams;i++) { -+ st = ic->streams[i]; -+ -+ pos = 0; -+ ts = ic->iformat->read_timestamp(ic, i, &pos, DURATION_MAX_READ_SIZE); -+ if (ts == AV_NOPTS_VALUE) -+ continue; -+ if (st->start_time > ts || st->start_time == AV_NOPTS_VALUE) -+ st->start_time = ts; -+ -+ pos = avio_size(ic->pb) - 1; -+ do { -+ pos -= step; -+ ts = ic->iformat->read_timestamp(ic, i, &pos, pos + step); -+ step += step; -+ } while (ts == AV_NOPTS_VALUE && pos >= step && step < DURATION_MAX_READ_SIZE); -+ -+ if (ts == AV_NOPTS_VALUE) -+ continue; -+ -+ if (st->duration < ts - st->start_time || st->duration == AV_NOPTS_VALUE) -+ st->duration = ts - st->start_time; -+ } -+ -+ fill_all_stream_timings(ic); -+ -+ avio_seek(ic->pb, old_offset, SEEK_SET); -+} -+ - /* only usable for MPEG-PS streams */ - static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) - { -@@ -2506,6 +2541,10 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset) - * the components */ - fill_all_stream_timings(ic); - ic->duration_estimation_method = AVFMT_DURATION_FROM_STREAM; -+ } else if (ic->iformat->read_timestamp && -+ file_size && ic->pb->seekable) { -+ /* get accurate estimate from the PTSes */ -+ av_estimate_timings_from_pts2(ic, old_offset); - } else { - /* less precise: use bitrate info */ - estimate_timings_from_bit_rate(ic); --- -2.1.0 - diff --git a/package/ffmpeg/0009-changed-allow-4-second-skew-between-streams-in-mov-b.patch b/package/ffmpeg/0009-changed-allow-4-second-skew-between-streams-in-mov-b.patch deleted file mode 100644 index fb0aad1e13..0000000000 --- a/package/ffmpeg/0009-changed-allow-4-second-skew-between-streams-in-mov-b.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4bcec3ef0042244b0ade00d132368d0872f73c72 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Wed, 8 Dec 2010 14:03:43 +0000 -Subject: [PATCH 09/13] changed: allow 4 second skew between streams in mov - before attempting to seek - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavformat/mov.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libavformat/mov.c b/libavformat/mov.c -index 8d66c0a..127ffd9 100644 ---- a/libavformat/mov.c -+++ b/libavformat/mov.c -@@ -4028,8 +4028,8 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st) - if (!sample || (!s->pb->seekable && current_sample->pos < sample->pos) || - (s->pb->seekable && - ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb && -- ((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) || -- (FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))))) { -+ ((FFABS(best_dts - dts) <= 4*AV_TIME_BASE && current_sample->pos < sample->pos) || -+ (FFABS(best_dts - dts) > 4*AV_TIME_BASE && dts < best_dts)))))) { - sample = current_sample; - best_dts = dts; - *st = avst; --- -2.1.0 - diff --git a/package/ffmpeg/0010-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch b/package/ffmpeg/0010-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch deleted file mode 100644 index d13d0730b8..0000000000 --- a/package/ffmpeg/0010-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch +++ /dev/null @@ -1,44 +0,0 @@ -From cb7c19124165508ae5f38a385a14f9c13b096a27 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Fri, 26 Nov 2010 20:56:48 +0000 -Subject: [PATCH 10/13] fixed: memleak in mpegts demuxer on some malformed (??) - mpegts files with too large pes packets - -at-visions sample file brokenStream.mpg - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavformat/mpegts.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c -index d5a8a45..e070f1f 100644 ---- a/libavformat/mpegts.c -+++ b/libavformat/mpegts.c -@@ -832,6 +832,10 @@ static void reset_pes_packet_state(PESContext *pes) - - static void new_pes_packet(PESContext *pes, AVPacket *pkt) - { -+ if(pkt->data) { -+ av_log(pes->stream, AV_LOG_ERROR, "ignoring previously allocated packet on stream %d\n", pkt->stream_index); -+ av_free_packet(pkt); -+ } - av_init_packet(pkt); - - pkt->buf = pes->buffer; -@@ -2649,6 +2653,8 @@ static int mpegts_read_packet(AVFormatContext *s, AVPacket *pkt) - - pkt->size = -1; - ts->pkt = pkt; -+ ts->pkt->data = NULL; -+ - ret = handle_packets(ts, 0); - if (ret < 0) { - av_free_packet(ts->pkt); --- -2.1.0 - diff --git a/package/ffmpeg/0011-Speed-up-mpegts-av_find_stream_info.patch b/package/ffmpeg/0011-Speed-up-mpegts-av_find_stream_info.patch deleted file mode 100644 index 7c81f1d5fd..0000000000 --- a/package/ffmpeg/0011-Speed-up-mpegts-av_find_stream_info.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c315a758a292200c22925603682e259849d6d558 Mon Sep 17 00:00:00 2001 -From: Joakim Plate -Date: Mon, 28 Jun 2010 21:26:54 +0000 -Subject: [PATCH 11/13] Speed up mpegts av_find_stream_info - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavformat/mpegts.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c -index e070f1f..dd9e129 100644 ---- a/libavformat/mpegts.c -+++ b/libavformat/mpegts.c -@@ -994,7 +994,7 @@ static int mpegts_push_data(MpegTSFilter *filter, - goto skip; - - /* stream not present in PMT */ -- if (!pes->st) { -+ if (ts->auto_guess && !pes->st) { - if (ts->skip_changes) - goto skip; - --- -2.1.0 - diff --git a/package/ffmpeg/0012-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch b/package/ffmpeg/0012-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch deleted file mode 100644 index f346da131f..0000000000 --- a/package/ffmpeg/0012-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 939ebbbc46ca9995637415594f1815633587104f Mon Sep 17 00:00:00 2001 -From: marc -Date: Mon, 18 Feb 2013 17:18:18 +0000 -Subject: [PATCH 12/13] dxva-h264 Fix dxva playback of streams that don't start - with an I-Frame. - -Patch part of the XBMC patch set for ffmpeg, downloaded from -https://github.com/xbmc/FFmpeg/. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - libavcodec/dxva2_h264.c | 8 ++++++++ - libavcodec/h264.c | 1 + - libavcodec/h264.h | 2 ++ - libavcodec/h264_slice.c | 1 + - 4 files changed, 12 insertions(+) - -diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c -index 6deccc3..85b25fd 100644 ---- a/libavcodec/dxva2_h264.c -+++ b/libavcodec/dxva2_h264.c -@@ -451,6 +451,14 @@ static int dxva2_h264_end_frame(AVCodecContext *avctx) - - if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0) - return -1; -+ -+ // Wait for an I-frame before start decoding. Workaround for ATI UVD and UVD+ GPUs -+ if (!h->got_first_iframe) { -+ if (!(ctx_pic->pp.wBitFields & (1 << 15))) -+ return -1; -+ h->got_first_iframe = 1; -+ } -+ - ret = ff_dxva2_common_end_frame(avctx, h->cur_pic_ptr->f, - &ctx_pic->pp, sizeof(ctx_pic->pp), - &ctx_pic->qm, sizeof(ctx_pic->qm), -diff --git a/libavcodec/h264.c b/libavcodec/h264.c -index 222bf58..ea2ec17 100644 ---- a/libavcodec/h264.c -+++ b/libavcodec/h264.c -@@ -1085,6 +1085,7 @@ void ff_h264_flush_change(H264Context *h) - h->mmco_reset = 1; - for (i = 0; i < h->nb_slice_ctx; i++) - h->slice_ctx[i].list_count = 0; -+ h->got_first_iframe = 0; - } - - /* forget old pics after a seek */ -diff --git a/libavcodec/h264.h b/libavcodec/h264.h -index b94f06b..bc9458b 100644 ---- a/libavcodec/h264.h -+++ b/libavcodec/h264.h -@@ -741,6 +741,8 @@ typedef struct H264Context { - int luma_weight_flag[2]; ///< 7.4.3.2 luma_weight_lX_flag - int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag - -+ int got_first_iframe; -+ - // Timestamp stuff - int sei_buffering_period_present; ///< Buffering period SEI flag - int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs -diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c -index 53f61ca..b171d78 100644 ---- a/libavcodec/h264_slice.c -+++ b/libavcodec/h264_slice.c -@@ -1189,6 +1189,7 @@ static int h264_slice_header_init(H264Context *h, int reinit) - ff_h264_free_tables(h, 0); - h->first_field = 0; - h->prev_interlaced_frame = 1; -+ h->got_first_iframe = 0; - - init_scan_tables(h); - ret = ff_h264_alloc_tables(h); --- -2.1.0 - diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index 3120a7aa4c..e3f45700f2 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 97be8a6c1cab2c52015544f76d40f6fd0babcb1b40cf601b4e57fb818564157c ffmpeg-2.8.7.tar.xz +sha256 58d2a2b69f0f46fe8aacd45e582c62e380ba611b5baf6a4dfcf2906eb2b9bd61 ffmpeg-3.1.2.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index c42336f800..a816ceac29 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 2.8.7 +FFMPEG_VERSION = 3.1.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -40,7 +40,7 @@ FFMPEG_CONF_OPTS = \ --enable-runtime-cpudetect \ --disable-hardcoded-tables \ --disable-memalign-hack \ - --disable-mipsdspr1 \ + --disable-mipsdsp \ --disable-mipsdspr2 \ --disable-msa \ --enable-hwaccels \ @@ -57,7 +57,6 @@ FFMPEG_CONF_OPTS = \ --disable-libnut \ --disable-libopenjpeg \ --disable-libschroedinger \ - --disable-libvo-aacenc \ --disable-libvo-amrwbenc \ --disable-symver \ --disable-doc @@ -217,13 +216,6 @@ FFMPEG_CONF_OPTS += --disable-openssl endif endif -ifeq ($(BR2_PACKAGE_LIBDCADEC),y) -FFMPEG_CONF_OPTS += --enable-libdcadec -FFMPEG_DEPENDENCIES += libdcadec -else -FFMPEG_CONF_OPTS += --disable-libdcadec -endif - ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy) FFMPEG_DEPENDENCIES += libebur128 endif @@ -445,14 +437,6 @@ else FFMPEG_CONF_OPTS += --enable-mipsfpu endif -ifeq ($(BR2_mips_32r2),y) -FFMPEG_CONF_OPTS += \ - --enable-mips32r2 -else -FFMPEG_CONF_OPTS += \ - --disable-mips32r2 -endif - ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) FFMPEG_CONF_OPTS += --enable-altivec else From 30a87d332779f8dda1260ad7947c5482427cd447 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 15 Aug 2016 17:03:37 +0200 Subject: [PATCH 0077/3392] package/ffmpeg: default to --cpu=generic for MIPS architecture This option is needed to prevent this message from configure: WARNING: unknown CPU. Disabling all MIPS optimizations. Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls [Thomas: - group with the other --cpu conditions so that only one is passed. - improve the comment.] Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index a816ceac29..91e7fa979a 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -449,12 +449,17 @@ else FFMPEG_CONF_OPTS += --disable-pic endif -ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),) +# Default to --cpu=generic for MIPS architecture, in order to avoid a +# warning from ffmpeg's configure script. +ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y) +FFMPEG_CONF_OPTS += --cpu=generic +else ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),) FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_CPU) else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),) FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH) endif + FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF)) # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others From 02f749b5b2f4532c5b2daed539b4b5634b28a260 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 15 Aug 2016 17:03:38 +0200 Subject: [PATCH 0078/3392] package/ffmpeg: re-enable for mips64r2 and mips64r6 ffmpeg 3 fixed support for mips64r2 and mips64r6, for details see http://patchwork.ozlabs.org/patch/626756/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/Config.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 096ff95c29..6b7a6e7b1f 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS bool # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 - # ffmpeg's configure script only supports mips64 (r1) variant - default y if !BR2_nios2 && !BR2_mips_64r2 && !BR2_mips_64r6 + default y if !BR2_nios2 menuconfig BR2_PACKAGE_FFMPEG bool "ffmpeg" From d9ea46425ba886e479b658dc8e7f55cc175cfad7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 15 Aug 2016 17:03:39 +0200 Subject: [PATCH 0079/3392] package/ffmpeg: add optional support for opencv ffmpeg only needs the imgproc module of opencv: https://github.com/FFmpeg/FFmpeg/commit/15708f13477aaf2effdc0d7fc727507bc468335a Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 91e7fa979a..1d041012e7 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -48,7 +48,6 @@ FFMPEG_CONF_OPTS = \ --disable-frei0r \ --disable-libopencore-amrnb \ --disable-libopencore-amrwb \ - --disable-libopencv \ --disable-libcdio \ --disable-libdc1394 \ --disable-libfaac \ @@ -249,6 +248,15 @@ else FFMPEG_CONF_OPTS += --disable-vdpau endif +# To avoid a circular dependency only use opencv if opencv itself does +# not depend on ffmpeg. +ifeq ($(BR2_PACKAGE_OPENCV_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV_WITH_FFMPEG),yx) +FFMPEG_CONF_OPTS += --enable-libopencv +FFMPEG_DEPENDENCIES += opencv +else +FFMPEG_CONF_OPTS += --disable-libopencv +endif + ifeq ($(BR2_PACKAGE_OPUS),y) FFMPEG_CONF_OPTS += --enable-libopus FFMPEG_DEPENDENCIES += opus From 87c436d8c5f4c5b07a000b48614698075e2eb822 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 15 Aug 2016 17:03:40 +0200 Subject: [PATCH 0080/3392] package/tvheadend: remove compat patch for ffmpeg < 3.x Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ert-minimum-required-version-numbers.patch | 51 ------------------- 1 file changed, 51 deletions(-) delete mode 100644 package/tvheadend/0002-ffmpeg-revert-minimum-required-version-numbers.patch diff --git a/package/tvheadend/0002-ffmpeg-revert-minimum-required-version-numbers.patch b/package/tvheadend/0002-ffmpeg-revert-minimum-required-version-numbers.patch deleted file mode 100644 index 74136fe451..0000000000 --- a/package/tvheadend/0002-ffmpeg-revert-minimum-required-version-numbers.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 78a7b7365a67fa2f5394c6b4ca39de01b00416dc Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 2 Apr 2016 19:05:52 +0200 -Subject: [PATCH 1/1] ffmpeg: revert minimum required version numbers - -This commit reverts the minimum version numbers required by configure to -the values before -https://github.com/tvheadend/tvheadend/commit/1359effe28a0381b8c9cbd362d6e144fb87b00fc#diff-e2d5a00791bce9a01f99bc6fd613a39dL486 -in order to allow compilation with older versions of ffmpeg again. - -Please note that the previous version numbers of all ffmpeg libs, with -the exception of libavfilter, are those of ffmpeg 2.0.7: -https://ffmpeg.org/olddownload.html - -Therefore I synced the minimum version number required for libavfilter to -3.79.101 and not to 4.0.0 as previous in tvheadend's configure script. - -Signed-off-by: Bernd Kuhls -[Patch sent upstream: https://github.com/tvheadend/tvheadend/pull/838] ---- - configure | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure b/configure -index be3d2e2..2ffd280 100755 ---- a/configure -+++ b/configure -@@ -512,13 +512,13 @@ else - if enabled_or_auto libav; then - has_libav=true - -- check_pkg libavfilter ">=6.31.100" || has_libav=false -- check_pkg libswresample ">=2.0.101" || has_libav=false -- check_pkg libavresample ">=3.0.0" || has_libav=false -- check_pkg libswscale ">=4.0.100" || has_libav=false -- check_pkg libavformat ">=57.25.100" || has_libav=false -- check_pkg libavcodec ">=57.24.102" || has_libav=false -- check_pkg libavutil ">=55.17.103" || has_libav=false -+ check_pkg libavfilter ">=3.79.101" || has_libav=false -+ check_pkg libswresample ">=0.17.102" || has_libav=false -+ check_pkg libavresample ">=1.1.0" || has_libav=false -+ check_pkg libswscale ">=2.3.100" || has_libav=false -+ check_pkg libavformat ">=55.12.100" || has_libav=false -+ check_pkg libavcodec ">=55.18.102" || has_libav=false -+ check_pkg libavutil ">=52.38.100" || has_libav=false - - if $has_libav; then - enable libav --- -2.8.0.rc3 - From c9c611f9982fc4e690a41145474fc7f13fb17b58 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 15 Aug 2016 17:03:41 +0200 Subject: [PATCH 0081/3392] package/vlc: add support for ffmpeg 3.0 Instead of bumping vlc to git master (no vlc 3.x release yet) we use a patch from deb-multimedia.org which provides the necessary changes for ffmpeg 3.x support to vlc 2.2, compile-tested using this defconfig: BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y BR2_PACKAGE_FFMPEG_POSTPROC=y BR2_PACKAGE_FFMPEG_SWSCALE=y BR2_PACKAGE_VLC=y This patch can be removed when vlc is bumped to 3.x. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/vlc/0008-ffmpeg-3.0.patch | 283 ++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) create mode 100644 package/vlc/0008-ffmpeg-3.0.patch diff --git a/package/vlc/0008-ffmpeg-3.0.patch b/package/vlc/0008-ffmpeg-3.0.patch new file mode 100644 index 0000000000..892c625c94 --- /dev/null +++ b/package/vlc/0008-ffmpeg-3.0.patch @@ -0,0 +1,283 @@ +Changes for ffmpeg 3.0 + +This file is a copy of debian/patches/04_ffmpeg-3.0.diff, to be found in +http://www.deb-multimedia.org/pool/main/v/vlc-dmo/vlc-dmo_2.2.4.orig.tar.gz + +Signed-off-by: Bernd Kuhls + +--- a/configure.ac ++++ b/configure.ac +@@ -2324,7 +2324,7 @@ AC_ARG_ENABLE(avcodec, + AS_IF([test "${enable_avcodec}" != "no"], [ + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ + PKG_CHECK_EXISTS([libavutil < 55],, [ +- AC_MSG_ERROR([libavutil versions 55 and later are not supported.]) ++ AC_MSG_WARN([libavutil versions 55 and later are not supported.]) + ]) + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" +@@ -2334,7 +2334,7 @@ AS_IF([test "${enable_avcodec}" != "no"] + VLC_RESTORE_FLAGS + have_avcodec="yes" + ],[ +- AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.]) ++ AC_MSG_WARN([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.]) + ]) + ], [ + have_avcodec="no" +@@ -2383,7 +2383,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a " + case "${avfork}" in + ffmpeg) + PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ +- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.]) ++ AC_MSG_WARN([VA API requires FFmpeg libavcodec < 57.10 or libav.]) + ]) + ;; + esac +@@ -2417,7 +2417,7 @@ AS_IF([test "${enable_dxva2}" != "no"], + case "${avfork}" in + ffmpeg) + PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ +- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.]) ++ AC_MSG_WARN([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.]) + ]) + ;; + esac +@@ -2509,7 +2509,7 @@ AS_IF([test "${enable_avformat}" != "no" + ]) + VLC_RESTORE_FLAGS + ],[ +- AC_MSG_ERROR([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.]) ++ AC_MSG_WARN([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.]) + ]) + ]) + AM_CONDITIONAL([HAVE_AVFORMAT], [test "${enable_avformat}" != "no"]) +@@ -2538,7 +2538,7 @@ then + ]) + VLC_RESTORE_FLAGS + ],[ +- AC_MSG_ERROR([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.]) ++ AC_MSG_WARN([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.]) + ]) + fi + +@@ -3181,7 +3181,7 @@ AS_IF([test "${have_vdpau}" = "yes" -a " + libav) av_vdpau_ver="55.26.0" ;; + ffmpeg) av_vdpau_ver="55.42.100" + PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ +- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.]) ++ AC_MSG_WARN([VDPAU requires FFmpeg libavcodec < 57.10 or libav.]) + ]) + ;; + esac +--- a/modules/codec/avcodec/audio.c ++++ b/modules/codec/avcodec/audio.c +@@ -39,7 +39,7 @@ + #include + #include + +-#include ++#include + + #include "avcodec.h" + +--- a/modules/codec/avcodec/video.c ++++ b/modules/codec/avcodec/video.c +@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC + static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * ); + static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * ); + #endif +-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *, +- const enum PixelFormat * ); ++static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *, ++ const enum AVPixelFormat * ); + + static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc ) + { +@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo + p_sys->p_codec = p_codec; + p_sys->i_codec_id = i_codec_id; + p_sys->psz_namecodec = psz_namecodec; +- p_sys->p_ff_pic = avcodec_alloc_frame(); ++ p_sys->p_ff_pic = av_frame_alloc(); + p_sys->b_delayed_open = true; + p_sys->p_va = NULL; + vlc_sem_init( &p_sys->sem_mt, 0 ); +@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo + if( ffmpeg_OpenCodec( p_dec ) < 0 ) + { + msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec ); +- avcodec_free_frame( &p_sys->p_ff_pic ); ++ av_frame_free( &p_sys->p_ff_pic ); + vlc_sem_destroy( &p_sys->sem_mt ); + free( p_sys ); + return VLC_EGENERIC; +@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec ) + wait_mt( p_sys ); + + if( p_sys->p_ff_pic ) +- avcodec_free_frame( &p_sys->p_ff_pic ); ++ av_frame_free( &p_sys->p_ff_pic ); + + if( p_sys->p_va ) + vlc_va_Delete( p_sys->p_va ); +@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru + } + #endif + +-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, +- const enum PixelFormat *pi_fmt ) ++static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, ++ const enum AVPixelFormat *pi_fmt ) + { + decoder_t *p_dec = p_context->opaque; + decoder_sys_t *p_sys = p_dec->p_sys; +--- a/modules/codec/avcodec/encoder.c ++++ b/modules/codec/avcodec/encoder.c +@@ -41,7 +41,7 @@ + #include + + #include +-#include ++#include + + #include "avcodec.h" + #include "avcommon.h" +@@ -311,7 +311,7 @@ int OpenEncoder( vlc_object_t *p_this ) + else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id, + &psz_namecodec ) ) + { +- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE ) ++ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE ) + return VLC_EGENERIC; /* handed chroma output */ + + i_cat = VIDEO_ES; +@@ -555,7 +555,7 @@ int OpenEncoder( vlc_object_t *p_this ) + + if( p_codec->pix_fmts ) + { +- const enum PixelFormat *p = p_codec->pix_fmts; ++ const enum AVPixelFormat *p = p_codec->pix_fmts; + for( ; *p != -1; p++ ) + { + if( *p == p_context->pix_fmt ) break; +@@ -1017,7 +1017,7 @@ errmsg: + } + } + +- p_sys->frame = avcodec_alloc_frame(); ++ p_sys->frame = av_frame_alloc(); + if( !p_sys->frame ) + { + goto error; +@@ -1048,7 +1048,7 @@ static void vlc_av_packet_Release(block_ + { + vlc_av_packet_t *b = (void *) block; + +- av_free_packet(&b->packet); ++ av_packet_unref(&b->packet); + free(b); + } + +@@ -1088,7 +1088,7 @@ static block_t *EncodeVideo( encoder_t * + AVFrame *frame = NULL; + if( likely(p_pict) ) { + frame = p_sys->frame; +- avcodec_get_frame_defaults( frame ); ++ av_frame_unref( frame ); + for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ ) + { + p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels; +@@ -1188,7 +1188,7 @@ static block_t *EncodeVideo( encoder_t * + av_pkt.duration / p_sys->p_context->time_base.den, p_sys->p_context ); + if( unlikely(p_block == NULL) ) + { +- av_free_packet( &av_pkt ); ++ av_packet_unref( &av_pkt ); + return NULL; + } + +@@ -1329,7 +1329,7 @@ static block_t *handle_delay_buffer( enc + //How much we need to copy from new packet + const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes; + +- avcodec_get_frame_defaults( p_sys->frame ); ++ av_frame_unref( p_sys->frame ); + p_sys->frame->format = p_sys->p_context->sample_fmt; + p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay; + +@@ -1451,7 +1451,7 @@ static block_t *EncodeAudio( encoder_t * + while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) || + ( p_sys->b_variable && p_aout_buf->i_nb_samples ) ) + { +- avcodec_get_frame_defaults( p_sys->frame ); ++ av_frame_unref( p_sys->frame ); + if( p_sys->b_variable ) + p_sys->frame->nb_samples = p_aout_buf->i_nb_samples; + else +@@ -1514,7 +1514,7 @@ void CloseEncoder( vlc_object_t *p_this + encoder_t *p_enc = (encoder_t *)p_this; + encoder_sys_t *p_sys = p_enc->p_sys; + +- /*FIXME: we should use avcodec_free_frame, but we don't require so new avcodec that has it*/ ++ /*FIXME: we should use av_frame_free, but we don't require so new avcodec that has it*/ + av_freep( &p_sys->frame ); + + vlc_avcodec_lock(); +--- a/modules/demux/avformat/demux.c ++++ b/modules/demux/avformat/demux.c +@@ -734,14 +734,14 @@ static int Demux( demux_t *p_demux ) + } + if( pkt.stream_index < 0 || pkt.stream_index >= p_sys->i_tk ) + { +- av_free_packet( &pkt ); ++ av_packet_unref( &pkt ); + return 1; + } + const AVStream *p_stream = p_sys->ic->streams[pkt.stream_index]; + if( p_stream->time_base.den <= 0 ) + { + msg_Warn( p_demux, "Invalid time base for the stream %d", pkt.stream_index ); +- av_free_packet( &pkt ); ++ av_packet_unref( &pkt ); + return 1; + } + if( p_stream->codec->codec_id == AV_CODEC_ID_SSA ) +@@ -749,7 +749,7 @@ static int Demux( demux_t *p_demux ) + p_frame = BuildSsaFrame( &pkt, p_sys->i_ssa_order++ ); + if( !p_frame ) + { +- av_free_packet( &pkt ); ++ av_packet_unref( &pkt ); + return 1; + } + } +@@ -757,7 +757,7 @@ static int Demux( demux_t *p_demux ) + { + if( ( p_frame = block_Alloc( pkt.size ) ) == NULL ) + { +- av_free_packet( &pkt ); ++ av_packet_unref( &pkt ); + return 0; + } + memcpy( p_frame->p_buffer, pkt.data, pkt.size ); +@@ -838,7 +838,7 @@ static int Demux( demux_t *p_demux ) + else + block_Release( p_frame ); + +- av_free_packet( &pkt ); ++ av_packet_unref( &pkt ); + return 1; + } + +--- a/modules/codec/avcodec/vaapi.c ++++ b/modules/codec/avcodec/vaapi.c +@@ -595,7 +595,7 @@ static int Create( vlc_va_t *p_va, AVCod + return err; + + /* Only VLD supported */ +- p_va->pix_fmt = PIX_FMT_VAAPI_VLD; ++ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD; + p_va->setup = Setup; + p_va->get = Get; + p_va->release = Release; From 67db45a9fb5f78a175b67cac56be1eafb1c5a9e9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 26 Aug 2016 16:03:56 -0300 Subject: [PATCH 0082/3392] gawk: bump to version 4.1.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gawk/gawk.hash | 2 +- package/gawk/gawk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash index 7f746d8814..e2c7806cc5 100644 --- a/package/gawk/gawk.hash +++ b/package/gawk/gawk.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 e3cf55e91e31ea2845f8338bedd91e40671fc30e4d82ea147d220e687abda625 gawk-4.1.3.tar.xz +sha256 53e184e2d0f90def9207860531802456322be091c7b48f23fdc79cda65adc266 gawk-4.1.4.tar.xz diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index b5b0f8d562..7c6689b30c 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 4.1.3 +GAWK_VERSION = 4.1.4 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk From a3cf05758d81ccc90f3b5eae9122a5b02b431f90 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Aug 2016 08:01:41 +0200 Subject: [PATCH 0083/3392] package/ffmpeg: bump version to 3.1.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 e3f45700f2..e7d5979d23 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 58d2a2b69f0f46fe8aacd45e582c62e380ba611b5baf6a4dfcf2906eb2b9bd61 ffmpeg-3.1.2.tar.xz +sha256 f8575c071e2a64437aeb70c8c030b385cddbe0b5cde20c9b18a6def840128822 ffmpeg-3.1.3.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 1d041012e7..fe6aa3d045 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.1.2 +FFMPEG_VERSION = 3.1.3 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From 2b141fcebd03a170fe05681dbb92524f7ea11f0d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Aug 2016 09:35:11 +0200 Subject: [PATCH 0084/3392] package/unixodbc: bump version to 2.3.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/unixodbc/unixodbc.hash | 6 ++++-- package/unixodbc/unixodbc.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/unixodbc/unixodbc.hash b/package/unixodbc/unixodbc.hash index a5c2d115ef..e99169c15d 100644 --- a/package/unixodbc/unixodbc.hash +++ b/package/unixodbc/unixodbc.hash @@ -1,2 +1,4 @@ -# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.2.tar.gz.md5 -md5 5e4528851eda5d3d4aed249b669bd05b unixODBC-2.3.2.tar.gz +# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.4.tar.gz.md5 +md5 bd25d261ca1808c947cb687e2034be81 unixODBC-2.3.4.tar.gz +# Locally computed +sha256 2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39 unixODBC-2.3.4.tar.gz diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk index 067c1ca663..f66daab4a8 100644 --- a/package/unixodbc/unixodbc.mk +++ b/package/unixodbc/unixodbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNIXODBC_VERSION = 2.3.2 +UNIXODBC_VERSION = 2.3.4 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC UNIXODBC_INSTALL_STAGING = YES From 242e0087e544325cc11bd37f1125aa8b2516d8a2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 12:34:21 +0200 Subject: [PATCH 0085/3392] core: move pkg-utils.mk to support/ pkg-utils.mk contains various definitions that are used in the package infrastructures and packages themselves. However, those definitions can be useful in other parts of Buildroot, and are already used in a few places that are not related to the package infrastructure. Also, $(sep) will be needed early in the Makefile when we eventually support multiple br2-external trees. Since this file only contains definitions, we can include it anytime. So, consider that file to no longer be specific to the package infras: - move it to support and rename it, - move a few similar definitions from the main Makefile to that file. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- Makefile | 10 +--- package/pkg-utils.mk | 96 ------------------------------------ support/misc/utils.mk | 111 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 104 deletions(-) create mode 100644 support/misc/utils.mk diff --git a/Makefile b/Makefile index 6a1c9e10f8..9275c4d2cd 100644 --- a/Makefile +++ b/Makefile @@ -106,14 +106,8 @@ else ifneq ($(filter-out $(nobuild_targets),$(MAKECMDGOALS)),) BR_BUILDING = y endif -# Strip quotes and then whitespaces -qstrip = $(strip $(subst ",,$(1))) -#")) - -# Variables for use in Make constructs -comma := , -empty := -space := $(empty) $(empty) +# Include some helper macros and variables +include support/misc/utils.mk ifneq ("$(origin O)", "command line") O := output diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index c61b3b67c4..28db4813e2 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -5,43 +5,6 @@ # ################################################################################ -# Case conversion macros. This is inspired by the 'up' macro from gmsl -# (http://gmsl.sf.net). It is optimised very heavily because these macros -# are used a lot. It is about 5 times faster than forking a shell and tr. -# -# The caseconvert-helper creates a definition of the case conversion macro. -# After expansion by the outer $(eval ), the UPPERCASE macro is defined as: -# $(strip $(eval __tmp := $(1)) $(eval __tmp := $(subst a,A,$(__tmp))) ... ) -# In other words, every letter is substituted one by one. -# -# The caseconvert-helper allows us to create this definition out of the -# [FROM] and [TO] lists, so we don't need to write down every substition -# manually. The uses of $ and $$ quoting are chosen in order to do as -# much expansion as possible up-front. -# -# Note that it would be possible to conceive a slightly more optimal -# implementation that avoids the use of __tmp, but that would be even -# more unreadable and is not worth the effort. - -[FROM] := a b c d e f g h i j k l m n o p q r s t u v w x y z - . -[TO] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _ - -define caseconvert-helper -$(1) = $$(strip \ - $$(eval __tmp := $$(1))\ - $(foreach c, $(2),\ - $$(eval __tmp := $$(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),$$(__tmp))))\ - $$(__tmp)) -endef - -$(eval $(call caseconvert-helper,UPPERCASE,$(join $(addsuffix :,$([FROM])),$([TO])))) -$(eval $(call caseconvert-helper,LOWERCASE,$(join $(addsuffix :,$([TO])),$([FROM])))) - -# Sanitize macro cleans up generic strings so it can be used as a filename -# and in rules. Particularly useful for VCS version strings, that can contain -# slashes, colons (OK in filenames but not in rules), and spaces. -sanitize = $(subst $(space),_,$(subst :,_,$(subst /,_,$(strip $(1))))) - # # Manipulation of .config files based on the Kconfig # infrastructure. Used by the BusyBox package, the Linux kernel @@ -82,65 +45,6 @@ INFLATE.tar = cat # suitable-extractor(filename): returns extractor based on suffix suitable-extractor = $(INFLATE$(suffix $(1))) -# MESSAGE Macro -- display a message in bold type -MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(call qstrip,$(1))$(TERM_RESET)" -TERM_BOLD := $(shell tput smso 2>/dev/null) -TERM_RESET := $(shell tput rmso 2>/dev/null) - -# Utility functions for 'find' -# findfileclauses(filelist) => -name 'X' -o -name 'Y' -findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1))) -# finddirclauses(base, dirlist) => -path 'base/dirX' -o -path 'base/dirY' -finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2))) - -# Miscellaneous utility functions -# notfirstword(wordlist): returns all but the first word in wordlist -notfirstword = $(wordlist 2,$(words $(1)),$(1)) - -# Needed for the foreach loops to loop over the list of hooks, so that -# each hook call is properly separated by a newline. -define sep - - -endef - -PERCENT = % -QUOTE = ' -# ' # Meh... syntax-highlighting - -# This macro properly escapes a command string, then prints it with printf: -# -# - first, backslash '\' are self-escaped, so that they do not escape -# the following char and so that printf properly outputs a backslash; -# -# - next, single quotes are escaped by closing an existing one, adding -# an escaped one, and re-openning a new one (see below for the reason); -# -# - then '%' signs are self-escaped so that the printf does not interpret -# them as a format specifier, in case the variable contains an actual -# printf with a format; -# -# - finally, $(sep) is replaced with the literal '\n' so that make does -# not break on the so-expanded variable, but so that the printf does -# correctly output an LF. -# -# Note: this must be escaped in this order to avoid over-escaping the -# previously escaped elements. -# -# Once everything has been escaped, it is passed between single quotes -# (that's why the single-quotes are escaped they way they are, above, -# and why the dollar sign is not escaped) to printf(1). A trailing -# newline is apended, too. -# -# Note: leading or trailing spaces are *not* stripped. -# -define PRINTF - printf '$(subst $(sep),\n,\ - $(subst $(PERCENT),$(PERCENT)$(PERCENT),\ - $(subst $(QUOTE),$(QUOTE)\$(QUOTE)$(QUOTE),\ - $(subst \,\\,$(1)))))\n' -endef - # check-deprecated-variable -- throw an error on deprecated variables # example: # $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS)) diff --git a/support/misc/utils.mk b/support/misc/utils.mk new file mode 100644 index 0000000000..990a3d1fd6 --- /dev/null +++ b/support/misc/utils.mk @@ -0,0 +1,111 @@ +################################################################################ +# +# This file contains various utility macros and variables used about +# everywhere in make constructs. +# +################################################################################ + +# Strip quotes and then whitespaces +qstrip = $(strip $(subst ",,$(1))) +#")) + +# Variables for use in Make constructs +comma := , +empty := +space := $(empty) $(empty) + +# Case conversion macros. This is inspired by the 'up' macro from gmsl +# (http://gmsl.sf.net). It is optimised very heavily because these macros +# are used a lot. It is about 5 times faster than forking a shell and tr. +# +# The caseconvert-helper creates a definition of the case conversion macro. +# After expansion by the outer $(eval ), the UPPERCASE macro is defined as: +# $(strip $(eval __tmp := $(1)) $(eval __tmp := $(subst a,A,$(__tmp))) ... ) +# In other words, every letter is substituted one by one. +# +# The caseconvert-helper allows us to create this definition out of the +# [FROM] and [TO] lists, so we don't need to write down every substition +# manually. The uses of $ and $$ quoting are chosen in order to do as +# much expansion as possible up-front. +# +# Note that it would be possible to conceive a slightly more optimal +# implementation that avoids the use of __tmp, but that would be even +# more unreadable and is not worth the effort. + +[FROM] := a b c d e f g h i j k l m n o p q r s t u v w x y z - . +[TO] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _ + +define caseconvert-helper +$(1) = $$(strip \ + $$(eval __tmp := $$(1))\ + $(foreach c, $(2),\ + $$(eval __tmp := $$(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),$$(__tmp))))\ + $$(__tmp)) +endef + +$(eval $(call caseconvert-helper,UPPERCASE,$(join $(addsuffix :,$([FROM])),$([TO])))) +$(eval $(call caseconvert-helper,LOWERCASE,$(join $(addsuffix :,$([TO])),$([FROM])))) + +# Sanitize macro cleans up generic strings so it can be used as a filename +# and in rules. Particularly useful for VCS version strings, that can contain +# slashes, colons (OK in filenames but not in rules), and spaces. +sanitize = $(subst $(space),_,$(subst :,_,$(subst /,_,$(strip $(1))))) + +# MESSAGE Macro -- display a message in bold type +MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(call qstrip,$(1))$(TERM_RESET)" +TERM_BOLD := $(shell tput smso 2>/dev/null) +TERM_RESET := $(shell tput rmso 2>/dev/null) + +# Utility functions for 'find' +# findfileclauses(filelist) => -name 'X' -o -name 'Y' +findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1))) +# finddirclauses(base, dirlist) => -path 'base/dirX' -o -path 'base/dirY' +finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2))) + +# Miscellaneous utility functions +# notfirstword(wordlist): returns all but the first word in wordlist +notfirstword = $(wordlist 2,$(words $(1)),$(1)) + +# Needed for the foreach loops to loop over the list of hooks, so that +# each hook call is properly separated by a newline. +define sep + + +endef + +PERCENT = % +QUOTE = ' +# ' # Meh... syntax-highlighting + +# This macro properly escapes a command string, then prints it with printf: +# +# - first, backslash '\' are self-escaped, so that they do not escape +# the following char and so that printf properly outputs a backslash; +# +# - next, single quotes are escaped by closing an existing one, adding +# an escaped one, and re-openning a new one (see below for the reason); +# +# - then '%' signs are self-escaped so that the printf does not interpret +# them as a format specifier, in case the variable contains an actual +# printf with a format; +# +# - finally, $(sep) is replaced with the literal '\n' so that make does +# not break on the so-expanded variable, but so that the printf does +# correctly output an LF. +# +# Note: this must be escaped in this order to avoid over-escaping the +# previously escaped elements. +# +# Once everything has been escaped, it is passed between single quotes +# (that's why the single-quotes are escaped they way they are, above, +# and why the dollar sign is not escaped) to printf(1). A trailing +# newline is apended, too. +# +# Note: leading or trailing spaces are *not* stripped. +# +define PRINTF + printf '$(subst $(sep),\n,\ + $(subst $(PERCENT),$(PERCENT)$(PERCENT),\ + $(subst $(QUOTE),$(QUOTE)\$(QUOTE)$(QUOTE),\ + $(subst \,\\,$(1)))))\n' +endef From 666edc7aa0c8c44bacdc020b4dc3cbd10c5929f0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 12:34:22 +0200 Subject: [PATCH 0086/3392] core: commonalise the bundled and br2-external %_defconfig rules The code for both cases is exactly the same, and only differs in the location where defconfig files are looked for. We use an intermediate macro to generate the corresponding rules, because directly generating the rules is ugly and needs lots of escaping and double-dollar-ing for the $(eval ...) and $(foreach ...) calls to play nicely together. Furthermore, that will be tremendously useful when we support multiple br2-external trees. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Thomas De Schampheleire Cc: Arnout Vandecappelle Reviewed-by: Romain Naour [Thomas: move comment outside of the make target, so that it isn't displayed on stdout when loading a defconfig.] Signed-off-by: Thomas Petazzoni --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9275c4d2cd..5ce520b0d5 100644 --- a/Makefile +++ b/Makefile @@ -847,14 +847,13 @@ olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN) +define percent_defconfig # Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig outputmakefile - @$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(TOPDIR)/configs/$@ \ - $< --defconfig=$(TOPDIR)/configs/$@ $(CONFIG_CONFIG_IN) - -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(BR2_EXTERNAL)/configs/%_defconfig outputmakefile - @$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(BR2_EXTERNAL)/configs/$@ \ - $< --defconfig=$(BR2_EXTERNAL)/configs/$@ $(CONFIG_CONFIG_IN) +%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile + @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ + $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) +endef +$(eval $(foreach d,$(TOPDIR) $(BR2_EXTERNAL),$(call percent_defconfig,$(d))$(sep))) savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< \ From 9429e7b698638399ecfd73aa37545594f253a074 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 12:34:24 +0200 Subject: [PATCH 0087/3392] core: introduce an intermediate rule before the configurators Currently, all configurators depend on generating the out-of-tree Makefile wrapper. In an upcoming patch, we'll need to also generate a kconfig fragment, so it will have to kick in before we run the configurators. Introduce a new intermediate "prepare-kconfig" rule, so we can commonalise the dependencies of the configurators. Move the dependency on the Makefile wrapper to that new intermediate rule. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Arnout Vandecappelle Cc: Thomas De Schampheleire Reviewed-by: Romain Naour [Thomas: mark prepare-kconfig as a phony target.] Signed-off-by: Thomas Petazzoni --- Makefile | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 5ce520b0d5..d1298d8ee2 100644 --- a/Makefile +++ b/Makefile @@ -760,6 +760,9 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y) HOSTCFLAGS = $(CFLAGS_FOR_BUILD) export HOSTCFLAGS +.PHONY: prepare-kconfig +prepare-kconfig: outputmakefile + $(BUILD_DIR)/buildroot-config/%onf: mkdir -p $(@D)/lxdialog PKG_CONFIG_PATH="$(HOST_PKG_CONFIG_PATH)" $(MAKE) CC="$(HOSTCC_NOCCACHE)" HOSTCC="$(HOSTCC_NOCCACHE)" \ @@ -779,19 +782,19 @@ COMMON_CONFIG_ENV = \ HOST_GCC_VERSION="$(HOSTCC_VERSION)" \ SKIP_LEGACY= -xconfig: $(BUILD_DIR)/buildroot-config/qconf outputmakefile +xconfig: $(BUILD_DIR)/buildroot-config/qconf prepare-kconfig @$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN) -gconfig: $(BUILD_DIR)/buildroot-config/gconf outputmakefile +gconfig: $(BUILD_DIR)/buildroot-config/gconf prepare-kconfig @$(COMMON_CONFIG_ENV) srctree=$(TOPDIR) $< $(CONFIG_CONFIG_IN) -menuconfig: $(BUILD_DIR)/buildroot-config/mconf outputmakefile +menuconfig: $(BUILD_DIR)/buildroot-config/mconf prepare-kconfig @$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN) -nconfig: $(BUILD_DIR)/buildroot-config/nconf outputmakefile +nconfig: $(BUILD_DIR)/buildroot-config/nconf prepare-kconfig @$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN) -config: $(BUILD_DIR)/buildroot-config/conf outputmakefile +config: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) $< $(CONFIG_CONFIG_IN) # For the config targets that automatically select options, we pass @@ -799,22 +802,22 @@ config: $(BUILD_DIR)/buildroot-config/conf outputmakefile # no values are set for the legacy options so a subsequent oldconfig # will query them. Therefore, run an additional olddefconfig. -oldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +oldconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) $< --oldconfig $(CONFIG_CONFIG_IN) -randconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +randconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --randconfig $(CONFIG_CONFIG_IN) @$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null -allyesconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +allyesconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --allyesconfig $(CONFIG_CONFIG_IN) @$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null -allnoconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +allnoconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --allnoconfig $(CONFIG_CONFIG_IN) @$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null -randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +randpackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg @$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \ KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \ @@ -822,7 +825,7 @@ randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @rm -f $(CONFIG_DIR)/.config.nopkg @$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null -allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg @$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \ KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \ @@ -830,7 +833,7 @@ allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @rm -f $(CONFIG_DIR)/.config.nopkg @$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null -allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg @$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \ KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \ @@ -838,24 +841,24 @@ allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @rm -f $(CONFIG_DIR)/.config.nopkg @$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null -silentoldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +silentoldconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig $(COMMON_CONFIG_ENV) $< --silentoldconfig $(CONFIG_CONFIG_IN) -olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +olddefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig $(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) -defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +defconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN) define percent_defconfig # Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile +%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig prepare-kconfig @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) endef $(eval $(foreach d,$(TOPDIR) $(BR2_EXTERNAL),$(call percent_defconfig,$(d))$(sep))) -savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile +savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) $< \ --savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \ $(CONFIG_CONFIG_IN) From b1e079b68b794b428e756adf75485a8b1ceade13 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 12:34:25 +0200 Subject: [PATCH 0088/3392] core: move rule to create basic directories Some of those directories will be needed even during configuration, like BUILD_DIR, where we'll store the generated kconfig snippet. So, move the rule to create them outside the BR2_HAVE_DOT_CONFIG block. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Reviewed-by: Romain Naour [Thomas: fixup commit log, as noticed by Romain Naour.] Signed-off-by: Thomas Petazzoni --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index d1298d8ee2..c9865a6402 100644 --- a/Makefile +++ b/Makefile @@ -200,6 +200,15 @@ LEGAL_LICENSES_TXT_HOST = $(LEGAL_INFO_DIR)/host-licenses.txt LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings LEGAL_REPORT = $(LEGAL_INFO_DIR)/README +################################################################################ +# +# staging and target directories do NOT list these as +# dependencies anywhere else +# +################################################################################ +$(BUILD_DIR) $(TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): + @mkdir -p $@ + BR2_CONFIG = $(CONFIG_DIR)/.config # Pull in the user's configuration file @@ -496,15 +505,6 @@ world: target-post-image legal-info legal-info-prepare legal-info-clean printvars help \ list-defconfigs target-finalize target-post-image source-check -################################################################################ -# -# staging and target directories do NOT list these as -# dependencies anywhere else -# -################################################################################ -$(BUILD_DIR) $(TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): - @mkdir -p $@ - # Populating the staging with the base directories is handled by the skeleton package $(STAGING_DIR): @mkdir -p $(STAGING_DIR) From 4802db3dad05ff8926d4fb462fc9282c07544487 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 12:34:26 +0200 Subject: [PATCH 0089/3392] core: introduce a generated kconfig snippet Add the infrastructure for adding generated kconfig snippet in the menuconfig. For now, the kconfig snippet is generated empty, the recipe for filling it in will be introduced in sub-sequent patches. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Arnout Vandecappelle Cc: Thomas De Schampheleire Cc: Samuel Martin Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- Config.in | 6 ++++++ Makefile | 10 +++++++++- docs/manual/manual.mk | 3 +++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Config.in b/Config.in index 741a7ce8ad..5273cada79 100644 --- a/Config.in +++ b/Config.in @@ -18,6 +18,10 @@ config BR2_EXTERNAL string option env="BR2_EXTERNAL" +config BR2_BUILD_DIR + string + option env="BUILD_DIR" + # Hidden config symbols for packages to check system gcc version config BR2_HOST_GCC_VERSION string @@ -763,3 +767,5 @@ menu "User-provided options" source "$BR2_EXTERNAL/Config.in" endmenu + +source "$BR2_BUILD_DIR/.br2-external.in" diff --git a/Makefile b/Makefile index c9865a6402..c7ac59edf3 100644 --- a/Makefile +++ b/Makefile @@ -761,7 +761,7 @@ HOSTCFLAGS = $(CFLAGS_FOR_BUILD) export HOSTCFLAGS .PHONY: prepare-kconfig -prepare-kconfig: outputmakefile +prepare-kconfig: outputmakefile $(BUILD_DIR)/.br2-external.in $(BUILD_DIR)/buildroot-config/%onf: mkdir -p $(@D)/lxdialog @@ -780,6 +780,7 @@ COMMON_CONFIG_ENV = \ BR2_CONFIG=$(BR2_CONFIG) \ BR2_EXTERNAL=$(BR2_EXTERNAL) \ HOST_GCC_VERSION="$(HOSTCC_VERSION)" \ + BUILD_DIR=$(BUILD_DIR) \ SKIP_LEGACY= xconfig: $(BUILD_DIR)/buildroot-config/qconf prepare-kconfig @@ -880,6 +881,13 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif +# Even though the target is a real file, we mark it as PHONY as we +# want it to be re-generated each time make is invoked, in case the +# value of BR2_EXTERNAL is changed. +.PHONY: $(BUILD_DIR)/.br2-external.in +$(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) + @touch $@ + # 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 diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk index caf080a84d..b26f912341 100644 --- a/docs/manual/manual.mk +++ b/docs/manual/manual.mk @@ -7,6 +7,9 @@ MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)) MANUAL_RESOURCES = $(TOPDIR)/docs/images +# Ensure the kconfig snippet is generated (for MANUAL_GEN_LISTS, below): +MANUAL_DEPENDENCIES += prepare-kconfig + # Our manual needs to generate lists define MANUAL_GEN_LISTS $(Q)$(call MESSAGE,"Updating the manual lists...") From 3c695928f593d2f7eff3d8ac60fcd9ac21a26c57 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 12:34:23 +0200 Subject: [PATCH 0090/3392] doc/asciidoc: add possibility to define document dependencies Currently, a document can not have dependencies, except for the purely internal ones (like checking asciidoc version, and presence of dblatex). For our own manual, this will come in handy when we introduce a generated kconfig snippet, so we can actually make the manual depend on that snippet being generated first. For external documents, it can be used to depend on host-packages if need be (e.g. a custom host packages that generates specific media files included in the manual). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Samuel Martin Cc: Thomas De Schampheleire Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-asciidoc.txt | 3 +++ package/doc-asciidoc.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt index 6e21786962..0c10fd124a 100644 --- a/docs/manual/adding-packages-asciidoc.txt +++ b/docs/manual/adding-packages-asciidoc.txt @@ -63,6 +63,9 @@ information is (assuming the document name is +foo+) : to one or more directories containing so-called resources (like CSS or images). By default, empty. +* +FOO_DEPENDENCIES+, optional, the list of packages (most probably, + host-packages) that must be built before building this document. + There are also additional hooks (see xref:hooks[] for general information on hooks), that a document may set to define extra actions to be done at various steps: diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index 4f765b8856..cb6e616603 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -141,7 +141,7 @@ endef ################################################################################ define ASCIIDOC # Single line, because splitting a foreach is not easy... -$(1)-check-dependencies: asciidoc-check-dependencies +$(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_HOOKS),$$(call $$(hook))$$(sep)) # Single line, because splitting a foreach is not easy... From fba75c8f9e56e0e17221ab0d827b55f16fc3d78e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Jul 2016 12:34:27 +0200 Subject: [PATCH 0091/3392] docs/manual: prepare-kconfig can be used as a dependency of documents Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Samuel Martin Cc: Thomas De Schampheleire Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-asciidoc.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt index 0c10fd124a..a278d44cc9 100644 --- a/docs/manual/adding-packages-asciidoc.txt +++ b/docs/manual/adding-packages-asciidoc.txt @@ -65,6 +65,8 @@ information is (assuming the document name is +foo+) : * +FOO_DEPENDENCIES+, optional, the list of packages (most probably, host-packages) that must be built before building this document. + If a hook of your document needs to access the _Kconfig_ structure, + you may add +prepare-kconfig+ to the list of dependencies. There are also additional hooks (see xref:hooks[] for general information on hooks), that a document may set to define extra actions to be done at From 6fc7a761480b888fa05015b28045377af2afa7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Sun, 28 Aug 2016 14:41:03 +0200 Subject: [PATCH 0092/3392] wine: Bump to version 1.8.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumping to stable version 1.8.4 Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/wine/wine.hash | 2 +- package/wine/wine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 3f856ba9fe..d58ac02cd4 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 d7cecdf7aab93bfe950e6f83ec526681b8770788c7b2a802bfe50ff97fc17a6c wine-1.8.3.tar.bz2 +sha256 515d10439777a4816fe5b0a0fc9a4ce498a2ecfd23eba0c25dc00f3d6c805079 wine-1.8.4.tar.bz2 diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 632eed3c5a..aceea352db 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,7 +4,7 @@ # ################################################################################ -WINE_VERSION = 1.8.3 +WINE_VERSION = 1.8.4 WINE_SOURCE = wine-$(WINE_VERSION).tar.bz2 WINE_SITE = https://dl.winehq.org/wine/source/1.8 WINE_LICENSE = LGPLv2.1+ From e782cd5b1bc231dda527d5d0a04e6a338669b92c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 28 Aug 2016 01:03:04 +0200 Subject: [PATCH 0093/3392] Revert "Added local directory as source of kernel code" This reverts commit 73da2ff6f718f2889e3c5024d899f8d58f502863. The reason for adding support for a local location was to be able to do development on the Linux kernel source tree on a local directory rather than have to clone it for every build. We already have a mechanism for that, it's called override-srcdir. It's been available since September 2011, more than a year before this patch was committed. Otherwise, we're going to be adding support for local sources in other packages. First was U-Boot as submitted by Adam. But what next? We can't have such support for all packages, especially since override-srcdir does the job. Besides, using a local source tree makes the build non-reproducible, so we don't really want to have this in a .config (or defconfig). We only handle the boolean option in legacy, as there is nothing we can do with the directory path. Signed-off-by: "Yann E. MORIN" Cc: Rafal Fabich Cc: Peter Korsgaard Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Adam Duskett Signed-off-by: Peter Korsgaard --- Config.in.legacy | 12 ++++++++++++ linux/Config.in | 13 ------------- linux/linux.mk | 3 --- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 746b80a8d0..59e3f84bdc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -142,6 +142,18 @@ comment "build, or run, in unpredictable ways. " comment "----------------------------------------------------" endif +############################################################################### +comment "Legacy options removed in 2016.11" + +config BR2_LINUX_KERNEL_CUSTOM_LOCAL + bool "Linux kernel local directory option removed" + help + The option to select a local directory as the source of the Linux + kernel has been removed. It hurts reproducibility of builds. + + In case you were using this option during development of your + Linux kernel, use the override mechanism instead. + ############################################################################### comment "Legacy options removed in 2016.08" diff --git a/linux/Config.in b/linux/Config.in index e02d138bcf..ebcafcc0ee 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -69,12 +69,6 @@ config BR2_LINUX_KERNEL_CUSTOM_SVN This option allows Buildroot to get the Linux kernel source code from a Subversion repository. -config BR2_LINUX_KERNEL_CUSTOM_LOCAL - bool "Local directory" - help - This option allows Buildroot to get the Linux kernel source - code from a local directory. - endchoice config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE @@ -102,12 +96,6 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION endif -config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH - string "Path to the local directory" - depends on BR2_LINUX_KERNEL_CUSTOM_LOCAL - help - Path to the local directory with the Linux kernel source code. - config BR2_LINUX_KERNEL_VERSION string default "4.7" if BR2_LINUX_KERNEL_LATEST_VERSION @@ -116,7 +104,6 @@ config BR2_LINUX_KERNEL_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL default BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION \ if BR2_LINUX_KERNEL_CUSTOM_GIT || BR2_LINUX_KERNEL_CUSTOM_HG || BR2_LINUX_KERNEL_CUSTOM_SVN - default "custom" if BR2_LINUX_KERNEL_CUSTOM_LOCAL # # Patch selection diff --git a/linux/linux.mk b/linux/linux.mk index fb844ef7a8..6e41a920a1 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -21,9 +21,6 @@ LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)) LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL))) LINUX_SOURCE = $(notdir $(LINUX_TARBALL)) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) -else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_LOCAL),y) -LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH)) -LINUX_SITE_METHOD = local else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_SITE_METHOD = git From 144498c82638f0e3da2978b2494e3a8372378e89 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 29 Aug 2016 12:27:11 -0300 Subject: [PATCH 0094/3392] pango: bump to version 1.40.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 67b67f0444..036838cbd9 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.36/pango-1.40.1.sha256sum -sha256 e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40 pango-1.40.1.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-1.40.2.sha256sum +sha256 90582a02bc89318d205814fc097f2e9dd164d26da5f27c53ea42d583b34c3cd1 pango-1.40.2.tar.xz diff --git a/package/pango/pango.mk b/package/pango/pango.mk index bdad8c689d..ba07aec245 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.40 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).1 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).2 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_AUTORECONF = YES From ca6811fe84477c15255a2f3b8c9c31c0337591a1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 29 Aug 2016 13:59:11 -0300 Subject: [PATCH 0095/3392] ccache: bump to version 3.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/ccache/ccache.hash | 4 ++-- package/ccache/ccache.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 7e616cece7..03b8c26a5b 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,2 +1,2 @@ -# Verified key https://samba.org/ftp/ccache/ccache-3.2.5.tar.xz.asc - sha256 computed locally -sha256 117011534b199dbe290b08acae1591c81525536a1e140da22e0fbc04c20bab85 ccache-3.2.5.tar.xz +# Verified key https://samba.org/ftp/ccache/ccache-3.3.tar.xz.asc - sha256 computed locally +sha256 d88e6f5f62f9ce5eeee673972a5731f76e22a5c708cfbc264ecd25a93fffba07 ccache-3.3.tar.xz diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index c4f0310486..06deb65a97 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 3.2.5 +CCACHE_VERSION = 3.3 CCACHE_SITE = https://samba.org/ftp/ccache CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPLv3+, others From 3e1a10746303a61dac219939be870231b2621f9c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 29 Aug 2016 20:18:17 -0300 Subject: [PATCH 0096/3392] gvfs: bump to version 1.28.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gvfs/gvfs.hash | 4 ++-- package/gvfs/gvfs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index 1fec32c982..440671f79c 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.28/gvfs-1.28.2.sha256sum -sha256 bc6af45cff7e7e8d33c3a4be1d27e479f10f80105a6f2d1fae75c5c0d40636d9 gvfs-1.28.2.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.28/gvfs-1.28.3.sha256sum +sha256 458c4cb68570f6ef4a9e152995c62d0057c3e0a07ed64d84c7200cdd22f0bd17 gvfs-1.28.3.tar.xz diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 8e885732df..e2947fd735 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -5,7 +5,7 @@ ################################################################################ GVFS_VERSION_MAJOR = 1.28 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).2 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).3 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES From 27de4c1d366f0bf288c89b950a947409533e4f1c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 30 Aug 2016 12:23:25 -0300 Subject: [PATCH 0097/3392] libinput: bump to version 1.4.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libinput/libinput.hash | 4 ++-- package/libinput/libinput.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index a1a7ca2fec..0cdcc387cc 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-August/030348.html -sha256 26e7b3ab499358caba499705680ea7e5851af2bd37dc32f2be64181610d6392a libinput-1.4.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2016-August/030857.html +sha256 8c38826a785594811bef6a9daadbfa2e172e3f070f8863393d6fb7ca4c68e451 libinput-1.4.2.tar.xz diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 5ce51c2096..eb74e34cd8 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.4.1 +LIBINPUT_VERSION = 1.4.2 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From 3c4aa539f5f8498269b68091663e0155d8a0838a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 30 Aug 2016 13:57:14 +0200 Subject: [PATCH 0098/3392] mosquitto: bump to version 1.4.10 Signed-off-by: Peter Korsgaard --- package/mosquitto/mosquitto.hash | 4 ++-- package/mosquitto/mosquitto.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 68dac00f86..b0b860f98c 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,2 +1,2 @@ -# From https://www.eclipse.org/downloads/download.php?file=/mosquitto/source/mosquitto-1.4.9.tar.gz -sha512 5994159d9a8da248a877f3032f36ca9a865d9b4efaafac329620864049992a77d414e02252cbbfef89ea2c37dc761b1885a89e19fc8e82b2a42d38f31e761d4d mosquitto-1.4.9.tar.gz +# From https://www.eclipse.org/downloads/download.php?file=/mosquitto/source/mosquitto-1.4.10.tar.gz +sha512 fe5d6d7196a137a496ba6881c77d852396baefb4f0b83ccd9a22175fc05b09e48a09ea249e30ec7db966e11de134ebcc4e2e9b1fd40b31dc59fb0fa2f60b75a1 mosquitto-1.4.10.tar.gz diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index f2ede6c9e4..96607f32e3 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.4.9 +MOSQUITTO_VERSION = 1.4.10 MOSQUITTO_SITE = http://mosquitto.org/files/source MOSQUITTO_LICENSE = EPLv1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 From d340eb39953d35048c030e1602b026f46734c9b7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 30 Aug 2016 11:42:29 +0200 Subject: [PATCH 0099/3392] alljoyn: bump to version 16.04a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/alljoyn/alljoyn.hash | 2 +- package/alljoyn/alljoyn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alljoyn/alljoyn.hash b/package/alljoyn/alljoyn.hash index e18d66e717..47dd0d4de4 100644 --- a/package/alljoyn/alljoyn.hash +++ b/package/alljoyn/alljoyn.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 41bd424d376d22dc2b48cc035400bd63595d19467eeb6a7ae81429f5a43ed2e2 alljoyn-16.04.00-src.tar.gz +sha256 fc437d96cf1213f18048240b5d12a374b31894d21830a0a6ccf562ffa13425d5 alljoyn-16.04.00a-src.tar.gz diff --git a/package/alljoyn/alljoyn.mk b/package/alljoyn/alljoyn.mk index 71262587da..69d5dedc41 100644 --- a/package/alljoyn/alljoyn.mk +++ b/package/alljoyn/alljoyn.mk @@ -5,7 +5,7 @@ ################################################################################ ALLJOYN_REV = 16.04 -ALLJOYN_VERSION = $(ALLJOYN_REV).00 +ALLJOYN_VERSION = $(ALLJOYN_REV).00a ALLJOYN_SOURCE = alljoyn-$(ALLJOYN_VERSION)-src.tar.gz ALLJOYN_SITE = https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_REV) # See https://allseenalliance.org/alliance/ip-policy From af6865a4faf35b3abde368ed4d47f0f0cdc8ca2c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 30 Aug 2016 11:46:10 +0200 Subject: [PATCH 0100/3392] alljoyn-tcl: bump to version 16.04a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/alljoyn-tcl/alljoyn-tcl.hash | 2 +- package/alljoyn-tcl/alljoyn-tcl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alljoyn-tcl/alljoyn-tcl.hash b/package/alljoyn-tcl/alljoyn-tcl.hash index a1cdf1627e..208d676c8b 100644 --- a/package/alljoyn-tcl/alljoyn-tcl.hash +++ b/package/alljoyn-tcl/alljoyn-tcl.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 ce6a05a67ff405ba6274e85fe750d98f40cbe7ab2c968218c7741a10bd86e21a ajtcl-16.04.00-src.tar.gz +sha256 da13614a9db79067937b744a87328fed84d99ba62e3de19b0ddc4a83e4b2447e ajtcl-16.04.00a-src.tar.gz diff --git a/package/alljoyn-tcl/alljoyn-tcl.mk b/package/alljoyn-tcl/alljoyn-tcl.mk index a5c7e4ec83..cabdf8992a 100644 --- a/package/alljoyn-tcl/alljoyn-tcl.mk +++ b/package/alljoyn-tcl/alljoyn-tcl.mk @@ -5,7 +5,7 @@ ################################################################################ ALLJOYN_TCL_REV = 16.04 -ALLJOYN_TCL_VERSION = $(ALLJOYN_TCL_REV).00 +ALLJOYN_TCL_VERSION = $(ALLJOYN_TCL_REV).00a ALLJOYN_TCL_SOURCE = ajtcl-$(ALLJOYN_TCL_VERSION)-src.tar.gz ALLJOYN_TCL_SITE = \ https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_TCL_REV) From da3bb9167cbef357e6736cfd5c0ba6bb41042e3b Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 31 Aug 2016 10:18:05 +0200 Subject: [PATCH 0101/3392] package/procps-ng: Bump to version 3.3.12 Signed-off-by: Jeroen Roovers Signed-off-by: Peter Korsgaard --- .../procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch | 2 +- package/procps-ng/procps-ng.hash | 4 ++-- package/procps-ng/procps-ng.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch b/package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch index c25da3b278..1329ac4bbd 100644 --- a/package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch +++ b/package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch @@ -35,7 +35,7 @@ diff -Nura procps-ng-3.3.10.orig/Makefile.am procps-ng-3.3.10/Makefile.am @@ -97,6 +97,7 @@ slabtop_LDADD = $(LDADD) @NCURSES_LIBS@ watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c - watch_LDADD = $(LDADD) @WATCH_NCURSES_LIBS@ + watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS) +watch_CFLAGS = @WATCH_NCURSES_CFLAGS@ top_top_SOURCES = \ top/top.h \ diff --git a/package/procps-ng/procps-ng.hash b/package/procps-ng/procps-ng.hash index c98fb14e69..62d61727b1 100644 --- a/package/procps-ng/procps-ng.hash +++ b/package/procps-ng/procps-ng.hash @@ -1,3 +1,3 @@ # From http://sourceforge.net/projects/procps-ng/files/Production/ -md5 6cc5b94c1c5b8cbc89ad345a7b522f74 procps-ng-3.3.11.tar.xz -sha1 1bdca65547df9ed019bd83649b0f8b8eaa017e25 procps-ng-3.3.11.tar.xz +md5 957e42e8b193490b2111252e4a2b443c procps-ng-3.3.12.tar.xz +sha1 82c0745f150f1385ca01fe7d24f05f74e31c94c6 procps-ng-3.3.12.tar.xz diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 51a70a5dc5..83323b700e 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCPS_NG_VERSION = 3.3.11 +PROCPS_NG_VERSION = 3.3.12 PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPLv2+, libproc and libps LGPLv2+ From b82b8b23b2f1c30fd63e07c7daf1ab7d4c083c70 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 31 Aug 2016 11:31:17 +0200 Subject: [PATCH 0102/3392] gssdp: bump to version 0.99.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gssdp/gssdp.hash | 4 ++-- package/gssdp/gssdp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gssdp/gssdp.hash b/package/gssdp/gssdp.hash index 485c03f962..373898868d 100644 --- a/package/gssdp/gssdp.hash +++ b/package/gssdp/gssdp.hash @@ -1,2 +1,2 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/0.14/gssdp-0.14.16.sha256sum: -sha256 54520bfb230b9c8c938eba88d87df44e04749682c95fb8aa381d13441345c5b2 gssdp-0.14.16.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/0.99/gssdp-0.99.0.sha256sum: +sha256 29330adea7314fde44b769e01b2ffa1d2d34e8955b0f82f20bfb425d8421bc60 gssdp-0.99.0.tar.xz diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk index 59f633f496..6a61789337 100644 --- a/package/gssdp/gssdp.mk +++ b/package/gssdp/gssdp.mk @@ -4,8 +4,8 @@ # ################################################################################ -GSSDP_VERSION_MAJOR = 0.14 -GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).16 +GSSDP_VERSION_MAJOR = 0.99 +GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).0 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPLv2+ From df3df495c4ed0e3611cd845c769dd5edb97a7eba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 31 Aug 2016 11:31:36 +0200 Subject: [PATCH 0103/3392] gupnp: bump to version 0.99.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index e0082ac127..6bdc0c03a9 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,2 +1,2 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/0.20/gupnp-0.20.18.sha256sum: -sha256 c5e0e11061f8d0ff9c8dccc196f39c45a49c0153c9a72abf6290ab34d1cbb021 gupnp-0.20.18.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/0.99/gupnp-0.99.0.sha256sum: +sha256 695c745ae7ecef9482bd91821d84bb98764cbcca0d0f71acb6d46ac1be23a1be gupnp-0.99.0.tar.xz diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index f7c32b5be8..fe80838eeb 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -4,8 +4,8 @@ # ################################################################################ -GUPNP_VERSION_MAJOR = 0.20 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).18 +GUPNP_VERSION_MAJOR = 0.99 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).0 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPLv2+ From 511a161b87424fbe06747b233242d1f3ff915bf2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 30 Aug 2016 23:33:27 +0200 Subject: [PATCH 0104/3392] valgrind: let the valgrind configure script detect TLS availability Back in 2005, in commit a2c326396a43ecbc8d02c3d815d4010a7ba2e004 ("update valgrind to the latest and greatest"), an explicit --disable-tls option was added. More recently, in commit 31a3f4bd54e12b8d6de286ab8fb6d9651990e2f5 ("valgrind: enable tls support") changed this to be conditional on BR2_GCC_ENABLE_TLS. However, the configure script of valgrind is perfectly capable of detecting TLS support, even in a cross-compilation case: it tries to compile a program that uses __thread and sees if it works. Since we're about to modify how BR2_GCC_ENABLE_TLS is handled, we'd better remove its usage from packages, and valgrind is the only package using this config option. Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- package/valgrind/valgrind.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 46ba13eb12..b97d446062 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -15,12 +15,6 @@ VALGRIND_INSTALL_STAGING = YES # patch 0004-Fixes-for-musl-libc.patch touching configure.ac VALGRIND_AUTORECONF = YES -ifeq ($(BR2_GCC_ENABLE_TLS),y) -VALGRIND_CONF_OPTS += --enable-tls -else -VALGRIND_CONF_OPTS += --disable-tls -endif - # When Valgrind detects a 32-bit MIPS architecture, it forcibly adds # -march=mips32 to CFLAGS; when it detects a 64-bit MIPS architecture, # it forcibly adds -march=mips64. This causes Valgrind to be built From 1bd02bc230e1b3b22ca3eb23fb3dcb91b878283a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 30 Aug 2016 23:33:28 +0200 Subject: [PATCH 0105/3392] gcc: remove BR2_GCC_ENABLE_TLS option The current BR2_GCC_ENABLE_TLS can cause users to make incorrect choices, and is not very useful. This options allows to decide whether we pass --enable-tls or --disable-tls to gcc, to enable or disable support for Thread Local Storage. Its behavior is: - The option is default to "y" but only exists if we're using uClibc/NPTL or glibc. - When we're using uClibc, the option can be disabled. So, in practice, this means that currently: - TLS support is always on for glibc - TLS support is on by default for uClibc/NPTL, but can be disabled in the configuration. This is in fact bad and causes the build failure reported in bug #7424 (this bug is still reproducible on master) - TLS support is always disabled for uClibc/no-thread and uClibc/linuxthreads. - TLS support is always disabled for musl. This does not cause any build failure, but musl can use TLS support, and therefore be more efficient. According to http://www.openwall.com/lists/musl/2012/10/04/1, "Note that if you've been building gcc with --disable-tls, __thread was already working but gets emulated (very poorly; it's slow and will abort() if it runs out of memory) through libgcc.". So, this commit completely removes the BR2_GCC_ENABLE_TLS and instead makes the right choice inside gcc.mk directly: - TLS support enabled for glibc, musl and uClibc/NPTL - TLS support in other cases, i.e uClibc/no-thread and uClibc/linuxthreads. We have intentionally *not* added the option to Config.in.legacy. Indeed, the new behavior is *exactly* the same as the older behavior, with the exception of: - People can no longer disable TLS support in uClibc/NPTL, which was anyway causing a build failure and therefore was not used. - TLS support is now enabled on musl, but people using musl already had BR2_GCC_ENABLE_TLS not set, so they wouldn't get the legacy warning. Fixes bug #7424. Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- package/gcc/Config.in.host | 8 -------- package/gcc/gcc.mk | 9 ++++++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 72627147d3..aa0a698b56 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -154,14 +154,6 @@ config BR2_TOOLCHAIN_BUILDROOT_FORTRAN Fortran language and you want Fortran libraries to be installed on your target system. -config BR2_GCC_ENABLE_TLS - bool "Enable compiler tls support" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC - default y - depends on BR2_PTHREADS_NATIVE || BR2_TOOLCHAIN_BUILDROOT_GLIBC - help - Enable the compiler to generate code for accessing - thread local storage variables - config BR2_GCC_ENABLE_LTO bool "Enable compiler link-time-optimization support" select BR2_BINUTILS_ENABLE_LTO diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 39c3eebd21..82050b4a59 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -133,10 +133,13 @@ ifeq ($(BR2_sparc)$(BR2_sparc64),y) HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer endif -ifeq ($(BR2_GCC_ENABLE_TLS),y) -HOST_GCC_COMMON_CONF_OPTS += --enable-tls -else +# TLS support is not needed on uClibc/no-thread and +# uClibc/linux-threads, otherwise, for all other situations (glibc, +# musl and uClibc/NPTL), we need it. +ifeq ($(BR2_TOOLCHAIN_BUILDROOT_UCLIBC)$(BR2_PTHREADS)$(BR2_PTHREADS_NONE),yy) HOST_GCC_COMMON_CONF_OPTS += --disable-tls +else +HOST_GCC_COMMON_CONF_OPTS += --enable-tls endif ifeq ($(BR2_GCC_ENABLE_LTO),y) From a895c27e5f611c527aed73ee43a7a3cb0d4f053f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 1 Sep 2016 14:22:25 +0200 Subject: [PATCH 0106/3392] docs/website/news.html: add 2016.08 announcement link Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index 0fefb053c8..84040c63ee 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

2016.08 released

The stable 2016.08 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2016.08 release.

From cff53ce35b8dab3bbdd9aa4471d1ecb3238c9fab Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 1 Sep 2016 14:23:11 +0200 Subject: [PATCH 0107/3392] Kickoff 2016.11 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 283147cc84..3163a83aea 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ else # umask all: # Set and export the version string -export BR2_VERSION := 2016.08 +export BR2_VERSION := 2016.11-git # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) From e4cbaffe2b818dab3ebef3bbb08fb5ca5637d8b5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 2 Sep 2016 12:55:03 -0300 Subject: [PATCH 0108/3392] mpv: remove stray patch It's remaining from the master-next merge and no longer applies. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...0002-wscript-improve-stdatomic-check.patch | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 package/mpv/0002-wscript-improve-stdatomic-check.patch diff --git a/package/mpv/0002-wscript-improve-stdatomic-check.patch b/package/mpv/0002-wscript-improve-stdatomic-check.patch deleted file mode 100644 index c2a307e9ab..0000000000 --- a/package/mpv/0002-wscript-improve-stdatomic-check.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5a635a0066b10d2ba25e0ce78cc57b2be619371c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 8 Aug 2016 23:34:32 +0200 -Subject: [PATCH] wscript: improve stdatomic check - -The current stdatomic check verifies the availability of the function by -calling atomic_load(). It also uses this test to check if linking -against libatomic is needed or not. - -Unfortunately, on specific architectures (namely SPARC), using -atomic_load() does *not* require linking against libatomic, while other -atomic operations do. Due to this, mpv's wscript concludes that -stdatomic is available, and that linking against libatomic is not -needed, causing the following link failure: - -[190/190] Linking build/mpv -audio/out/ao.c.13.o: In function `ao_query_and_reset_events': -/home/peko/autobuild/instance-0/output/build/mpv-0.18.1/build/../audio/out/ao.c:399: undefined reference to `__atomic_fetch_and_4' - -In order to fix this, the stdatomic check is adjusted to call -atomic_fetch_add() instead, which does require libatomic. Thanks to -this, the wscript realizes that linking against libatomic is needed, and -the build works fine. - -Signed-off-by: Thomas Petazzoni ---- -Submitted upstream: https://github.com/mpv-player/mpv/pull/3403 - - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index a18df6f..4c49caf 100644 ---- a/wscript -+++ b/wscript -@@ -154,7 +154,7 @@ main_dependencies = [ - 'func': check_libs(['atomic'], - check_statement('stdatomic.h', - 'atomic_int_least64_t test = ATOMIC_VAR_INIT(123);' -- 'int test2 = atomic_load(&test)')) -+ 'atomic_fetch_add(&test, 1)')) - }, { - 'name': 'atomic-builtins', - 'desc': 'compiler support for __atomic built-ins', --- -2.7.4 - From ffba4aec9c28cb86448e0ce142af4b6c6d93ca6f Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Fri, 2 Sep 2016 14:22:51 +0200 Subject: [PATCH 0109/3392] snmppp: bump to 3.3.7 Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/snmppp/snmppp.hash | 2 +- package/snmppp/snmppp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index a278ebfb28..462f4135d9 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 65d8bef3fb0e28892b7768e4027c2873b5556fc89c5440008508bf8ec91764cd snmp++-3.3.5.tar.gz +sha256 2ef82819f2c4e9fec4c054a3e78a6d66f9927e306ea61d3a7aa6fe1218663da8 snmp++-3.3.7.tar.gz diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 026fe6ecca..69ec925fc0 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.3.5 +SNMPPP_VERSION = 3.3.7 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf From 15cf25114a4918bab0bf7a5d5cd198f864c02929 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Fri, 2 Sep 2016 14:22:52 +0200 Subject: [PATCH 0110/3392] agentpp: bump to 4.0.6 Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/agentpp/agentpp.hash | 2 +- package/agentpp/agentpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index 6b992f9769..eb36b0f80f 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 d473b98d5f08e572b474c375c11ff1c4c5323824eb721c3979b6c5258b72949d agent++-4.0.4.tar.gz +sha256 913013000d685c8a6459dc0b862a85336c757c481b9aed99174a19788c719f36 agent++-4.0.6.tar.gz diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index 7b1edec719..55f2324319 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.0.4 +AGENTPP_VERSION = 4.0.6 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 From 9b18f4fbe8c810a62ed991a87309c28dfda4bac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Sat, 3 Sep 2016 17:24:49 +0200 Subject: [PATCH 0111/3392] lxc: revive "drop-werror" patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 5050a94ae9f448641e05ce29c931671ffdc62784 dropped patch that remove '-Werror' from CFLAGS. However, it seems this patch is still necessary: http://autobuild.buildroot.net/results/b1cbca6d0396863654b1d09ccc3163c5f6124ab8 http://autobuild.buildroot.net/results/fcf2834ad74b95548d25dad2274704ea401f9665 http://autobuild.buildroot.net/results/048be2fc702c9dba9ca4439ff687d71b30c10551 http://autobuild.buildroot.net/results/939246c9a4f433dfd0dc414988f5957441b8e9b4 Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- package/lxc/0001-drop-werror.patch | 16 ++++++++++++++++ package/lxc/lxc.mk | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 package/lxc/0001-drop-werror.patch diff --git a/package/lxc/0001-drop-werror.patch b/package/lxc/0001-drop-werror.patch new file mode 100644 index 0000000000..d2a8673a86 --- /dev/null +++ b/package/lxc/0001-drop-werror.patch @@ -0,0 +1,16 @@ +Don't do -Werror it breaks builds on some scenarios with trivialities. + +Signed-off-by: Gustavo Zacarias + +diff -Nura lxc-lxc-1.0.4/configure.ac lxc-lxc-1.0.4.orig/configure.ac +--- lxc-lxc-1.0.4.orig/configure.ac 2014-07-04 10:31:19.821029891 -0300 ++++ lxc-lxc-1.0.4/configure.ac 2014-06-13 14:07:45.000000000 -0300 +@@ -560,7 +560,7 @@ + LXC_CHECK_TLS + + if test "x$GCC" = "xyes"; then +- CFLAGS="$CFLAGS -Wall -Werror" ++ CFLAGS="$CFLAGS -Wall" + fi + + # Files requiring some variable expansion diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index b1cd385878..a3e24b4367 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -9,6 +9,8 @@ LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = LGPLv2.1+ LXC_LICENSE_FILES = COPYING LXC_DEPENDENCIES = libcap host-pkgconf +# we're patching configure.ac +LXC_AUTORECONF = YES LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ --disable-lua --disable-python \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) From 8e195d63ba7c6404f31b15414ffbb92dbfb338a8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 3 Sep 2016 18:24:06 +0200 Subject: [PATCH 0112/3392] package/dosfstools: Fix undefined PATH_MAX under musl Dosfstools doesn't build with musl only if BR2_PACKAGE_HAS_UDEV is set due to a missing include for PATH_MAX (limits.h). Fixes: http://autobuild.buildroot.net/results/346/346feda6a4a83850dbb62919eb33482302053490 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ....c-Fix-undefined-PATH_MAX-under-musl.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch diff --git a/package/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch b/package/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch new file mode 100644 index 0000000000..9740304603 --- /dev/null +++ b/package/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch @@ -0,0 +1,31 @@ +From 06ce096dabd8a29c72dc0bc5110d2c4867baa490 Mon Sep 17 00:00:00 2001 +From: Alessio Sergi +Date: Fri, 6 May 2016 18:18:18 +0200 +Subject: [PATCH] src/device_info.c: Fix undefined PATH_MAX under musl + +In musl libc, PATH_MAX is defined in . + +Status: pending +https://github.com/dosfstools/dosfstools/pull/27 + +[Romain: add patch status] +Signed-off-by: Romain Naour +--- + src/device_info.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/device_info.c b/src/device_info.c +index f5d11ac..cd57388 100644 +--- a/src/device_info.c ++++ b/src/device_info.c +@@ -17,6 +17,7 @@ + */ + + ++#include + #include + #include + #include +-- +2.5.5 + From 66c767aeed40b631e0e8b9a7a770a24662b3f3ea Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 4 Sep 2016 00:58:40 +0200 Subject: [PATCH 0113/3392] package/cryptodev: properly declare providers cryptodev-linux and ocf-linux are providers of the cryptodev virtual package, so they must declare themselves as such. We do not have any problem for now, as the only consumer (openssl) of both cryptodev-linux and ocf-linux did not depend on the virtual package but on each provider. The other consumer is gnutls, but has only a dependency on cryptodev-linux. However, openssl can be turned into a proper consumer of the virtual package, which would trigger the bug. For the sake of correctness, make both cryptodev-linux and ocf-linux declare themselves as providers for the cryptodev virtual package. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/cryptodev-linux/cryptodev-linux.mk | 2 ++ package/ocf-linux/ocf-linux.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk index c3f5355345..d23b6474f8 100644 --- a/package/cryptodev-linux/cryptodev-linux.mk +++ b/package/cryptodev-linux/cryptodev-linux.mk @@ -10,6 +10,8 @@ CRYPTODEV_LINUX_INSTALL_STAGING = YES CRYPTODEV_LINUX_LICENSE = GPLv2+ CRYPTODEV_LINUX_LICENSE_FILES = COPYING +CRYPTODEV_LINUX_PROVIDES = cryptodev + define CRYPTODEV_LINUX_MODULE_GEN_VERSION_H $(MAKE) -C $(@D) version.h endef diff --git a/package/ocf-linux/ocf-linux.mk b/package/ocf-linux/ocf-linux.mk index 35968d5edc..01854fa73a 100644 --- a/package/ocf-linux/ocf-linux.mk +++ b/package/ocf-linux/ocf-linux.mk @@ -8,6 +8,8 @@ OCF_LINUX_VERSION = 20120127 OCF_LINUX_SITE = http://downloads.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION) OCF_LINUX_INSTALL_STAGING = YES +OCF_LINUX_PROVIDES = cryptodev + OCF_LINUX_MODULE_SUBDIRS = ocf OCF_LINUX_MODULE_MAKE_OPTS = \ CONFIG_OCF_OCF=m \ From cf03d6fe04c9e31889055a4cc038597b0a4b3f80 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 4 Sep 2016 00:58:41 +0200 Subject: [PATCH 0114/3392] package/openssl: depend on the virtual cryptodev package Instead of depending on each provider of cryptodev, make openssl depend on the virtual package. This is easy because in both cases the openssl build systems needs the same configuration options. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/openssl/openssl.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index b926fe30af..efe2b49ad8 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -28,14 +28,9 @@ ifeq ($(BR2_USE_MMU),) OPENSSL_CFLAGS += -DHAVE_FORK=0 endif -ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) +ifeq ($(BR2_PACKAGE_HAS_CRYPTODEV),y) OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS -OPENSSL_DEPENDENCIES += cryptodev-linux -endif - -ifeq ($(BR2_PACKAGE_OCF_LINUX),y) -OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS -OPENSSL_DEPENDENCIES += ocf-linux +OPENSSL_DEPENDENCIES += cryptodev endif # Some architectures are optimized in OpenSSL From 35524d3733a5570794b1460bd545ad33bf6b49ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 4 Sep 2016 00:58:42 +0200 Subject: [PATCH 0115/3392] package/jpeg: properly declare providers libjpeg and jpeg-turo are providers of the jpeg virtual package, so they must declare themselves as such. We do not have any problem, because the dependency is computed from the Kconfig-defined option BR2_PACKAGE_PROVIDES_JPEG, and we do not check the Makefile-defined _PROVIDES variable. For the sake of correctness, make both libjpeg and jpeg-turo declare themselves as providers for the jpeg virtual package. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/jpeg-turbo/jpeg-turbo.mk | 2 ++ package/libjpeg/libjpeg.mk | 1 + 2 files changed, 3 insertions(+) diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index 047e925909..454b648c73 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -10,6 +10,8 @@ JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_ JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like) JPEG_TURBO_LICENSE_FILES = README README-turbo.txt JPEG_TURBO_INSTALL_STAGING = YES +JPEG_TURBO_PROVIDES = jpeg + JPEG_TURBO_CONF_OPTS = --with-jpeg8 ifeq ($(BR2_X86_CPU_HAS_MMX)$(BR2_ARM_CPU_HAS_NEON),y) diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index 14aba61fd4..b8f4bac56e 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -10,6 +10,7 @@ LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = jpeg-license (BSD-3c-like) LIBJPEG_LICENSE_FILES = README LIBJPEG_INSTALL_STAGING = YES +LIBJPEG_PROVIDES = jpeg define LIBJPEG_REMOVE_USELESS_TOOLS rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom wrjpgcom) From 4b480c4ea7a522156013b93dc09a1a7c034c8245 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Sat, 3 Sep 2016 20:21:56 -0400 Subject: [PATCH 0116/3392] libwebsockets: bump to version 2.0.2 Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- package/libwebsockets/libwebsockets.hash | 2 +- package/libwebsockets/libwebsockets.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index c931a0db71..dc44da5334 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 e91f59fb6238462b4ffdfef2482239558b8a02198c9c6076eb3f86eb1c4e935d libwebsockets-v1.7.5.tar.gz +sha256 43865604debd06686ac4d8d0783976c4e10dd519ccd5c94e1b53878ec6178a59 libwebsockets-v2.0.2.tar.gz diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index 5bb7ae44a2..a9b4a25634 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = v1.7.5 +LIBWEBSOCKETS_VERSION = v2.0.2 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE From 26248571b625207a01e529aa439fdef49d2459dc Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sat, 3 Sep 2016 21:15:35 +1200 Subject: [PATCH 0117/3392] micropython: fix build failures Fixes: http://autobuild.buildroot.net/results/061c66987e9c33a6641c8183f5e0badae516fc1d http://autobuild.buildroot.net/results/62e5b5c6d9dca0f41fb4e7d462ebfbb02f8d29da http://autobuild.buildroot.net/results/a6437a49659a7b2983269e758dba9fa5a29240d7 Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- ...ovide-mp_raw_code_load_file-for-any-.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch diff --git a/package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch b/package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch new file mode 100644 index 0000000000..8465ce9e7d --- /dev/null +++ b/package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch @@ -0,0 +1,27 @@ +From 4177e71862a2817d2555abd8d0bc9a8a361dad8a Mon Sep 17 00:00:00 2001 +From: Chris Packham +Date: Sat, 3 Sep 2016 20:44:12 +1200 +Subject: [PATCH] py/emitglue.c: provide mp_raw_code_load_file for any unix + architecture + +Signed-off-by: Chris Packham +--- + py/emitglue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/py/emitglue.c b/py/emitglue.c +index 1b9992b..2e79d5f 100644 +--- a/py/emitglue.c ++++ b/py/emitglue.c +@@ -381,7 +381,7 @@ mp_raw_code_t *mp_raw_code_load_mem(const byte *buf, size_t len) { + // here we define mp_raw_code_load_file depending on the port + // TODO abstract this away properly + +-#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && (defined(__unix__))) ++#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || defined(__unix__) + // unix file reader + + #include +-- +2.9.2.518.ged577c6.dirty + From 49f574237983ae2e69e4a4c43df7be98902a63be Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 4 Sep 2016 16:14:00 +0200 Subject: [PATCH 0118/3392] package/binutils: Disable -Os for ARM cortex-M cpus ERROR: reloc type R_ARM_THM_MOVW_ABS_NC unsupported in this context ERROR: reloc type R_ARM_THM_MOVT_ABS unsupported in this context 2 bad relocscollect2: error: ld returned 1 exit status Binutils build fine with -O1, -O2 or -O3. Reported upstream: https://sourceware.org/bugzilla/show_bug.cgi?id=20552 Fixes: http://autobuild.buildroot.net/results/e72/e727e6e9cf361acc786acec192a88f5f5444a2f6 Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/binutils/binutils.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index ff90a16d83..97daeff0e6 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -77,6 +77,13 @@ ifeq ($(BR2_bfin),y) BINUTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1" endif +# Workaround a build issue with -Os for ARM Cortex-M cpus. +# (Binutils 2.25.1 and 2.26.1) +# https://sourceware.org/bugzilla/show_bug.cgi?id=20552 +ifeq ($(BR2_ARM_CPU_ARMV7M)$(BR2_OPTIMIZE_S),yy) +BINUTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O2" +endif + # Install binutils after busybox to prefer full-blown utilities ifeq ($(BR2_PACKAGE_BUSYBOX),y) BINUTILS_DEPENDENCIES += busybox From 2e042507168b5b4b76ff7c3d40e5dc7dfc54cc58 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 5 Sep 2016 14:40:07 +0100 Subject: [PATCH 0119/3392] qemu: bump version to 2.7.0 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 2d6d96cb82..572a5c911a 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,2 +1,2 @@ # Locally computed, tarball verified with GPG signature -sha256 c9ac4a651b273233d21b8bec32e30507cb9cce7900841febc330956a1a8434ec qemu-2.6.0.tar.bz2 +sha256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 qemu-2.7.0.tar.bz2 diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 5ca0e77f24..42dd9c2991 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 2.6.0 +QEMU_VERSION = 2.7.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2 QEMU_SITE = http://wiki.qemu.org/download QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c From f243fc5c2e9d36f7b60ab45f1575f9b2ff341923 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 5 Sep 2016 14:40:08 +0100 Subject: [PATCH 0120/3392] privoxy: bump version to 3.0.26 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/privoxy/privoxy.hash | 6 +++--- package/privoxy/privoxy.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/privoxy/privoxy.hash b/package/privoxy/privoxy.hash index aea8f2d587..72226b14fc 100644 --- a/package/privoxy/privoxy.hash +++ b/package/privoxy/privoxy.hash @@ -1,3 +1,3 @@ -# From http://sourceforge.net/projects/ijbswa/files/Sources/3.0.24%20%28stable%29/ -md5 44a47d1a5000db8cccd61ace0e25e7f7 privoxy-3.0.24-stable-src.tar.gz -sha1 343c547a9e795ff029a78310963e0c04448975ee privoxy-3.0.24-stable-src.tar.gz +# From http://sourceforge.net/projects/ijbswa/files/Sources/3.0.26%20%28stable%29/ +md5 8a1c842112ccea68c19b7ceb4a0e999f privoxy-3.0.26-stable-src.tar.gz +sha1 b646624006225979f83453ba542e448667f45998 privoxy-3.0.26-stable-src.tar.gz diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk index 4b5a1a6d30..267ddc2704 100644 --- a/package/privoxy/privoxy.mk +++ b/package/privoxy/privoxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PRIVOXY_VERSION = 3.0.24 +PRIVOXY_VERSION = 3.0.26 PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz # configure not shipped From 1c58e8747583cb0ace55e81354a5e949c030ea90 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 5 Sep 2016 14:40:09 +0100 Subject: [PATCH 0121/3392] nano: bump version to 2.7.0 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/nano/nano.hash | 2 +- package/nano/nano.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 40a694262c..fc628eb734 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 22f79cc635458e0c0d110d211576f1edc03b112a62d73b914826a46547a6ac27 nano-2.6.2.tar.xz +sha256 f86af39514ae74e20bef3c29cd01d1090a9aca772a70e9c9f9e70c3d14b39521 nano-2.7.0.tar.xz diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 7800b583de..984a5fc662 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,8 +4,8 @@ # ################################################################################ -NANO_VERSION_MAJOR = 2.6 -NANO_VERSION = $(NANO_VERSION_MAJOR).2 +NANO_VERSION_MAJOR = 2.7 +NANO_VERSION = $(NANO_VERSION_MAJOR).0 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPLv3+ From 7c478dfaeeb61748f1ccab0b3e7991b8fa5967d9 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 5 Sep 2016 14:40:10 +0100 Subject: [PATCH 0122/3392] mutt: bump version to 1.7.0 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index baee620692..ae7de58d00 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 mutt-1.6.1.tar.gz +sha256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 mutt-1.7.0.tar.gz diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index e6ea6e4000..989a1b68f2 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 1.6.1 +MUTT_VERSION = 1.7.0 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPLv2+ MUTT_LICENSE_FILES = GPL From d1cb59adac9dd6723fc85e43eccce7fce29c12e9 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 5 Sep 2016 14:40:11 +0100 Subject: [PATCH 0123/3392] git: bump version to 2.10.0 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 9776df1e3e..e2cf300a66 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 9f1473350c1792310b51af03a9cb5cce841f68202f835b20d46312a30232fa63 git-2.9.3.tar.xz +sha256 c73364ac00ae85ffc6cfb12ca2700bb0edf30f63262be97be4039be594ff29e7 git-2.10.0.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index d9cd95a60a..3730b77ad9 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.9.3 +GIT_VERSION = 2.10.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2 LGPLv2.1+ From fbd79e25b861d0325906475efb707e727c67ea9f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 5 Sep 2016 15:51:54 +0100 Subject: [PATCH 0124/3392] e2fsprogs: bump version to 1.43.2 - Upstream patches removed. - Do not autoreconf since this was neecessary for one of those patches that are now upstream. Also remove host-gettext dependency for the same reason. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- .../0002-fuse2fs-might-need-librt.patch | 63 ------------------- .../0003-fuse2fs-needs-SYSLIBS.patch | 30 --------- package/e2fsprogs/e2fsprogs.hash | 4 +- package/e2fsprogs/e2fsprogs.mk | 8 +-- 4 files changed, 3 insertions(+), 102 deletions(-) delete mode 100644 package/e2fsprogs/0002-fuse2fs-might-need-librt.patch delete mode 100644 package/e2fsprogs/0003-fuse2fs-needs-SYSLIBS.patch diff --git a/package/e2fsprogs/0002-fuse2fs-might-need-librt.patch b/package/e2fsprogs/0002-fuse2fs-might-need-librt.patch deleted file mode 100644 index fef3d20c9b..0000000000 --- a/package/e2fsprogs/0002-fuse2fs-might-need-librt.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 14d9e94315cd8144ac72d368c45e70869a66799c Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 9 Jun 2016 07:47:03 -0300 -Subject: [PATCH] fuse2fs: might need librt - -It uses clock_gettime() which in older glibc versions is in librt. - -Signed-off-by: Gustavo Zacarias -[yann.morin.1998@free.fr: properly expand it in the Makefile] -Signed-off-by: "Yann E. MORIN" ---- -Patch status: sent to linux-ext4 ML - - configure.ac | 5 +++++ - misc/Makefile.in | 3 ++- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 67d7231..a387dfd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1162,6 +1162,11 @@ if test "$ac_cv_func_dlopen" = yes ; then - fi - AC_SUBST(MAGIC_LIB) - dnl -+dnl Check to see if librt is required for clock_gettime() (glibc < 2.17) -+dnl -+AC_CHECK_LIB(rt, clock_gettime, [CLOCK_GETTIME_LIB=-lrt]) -+AC_SUBST(CLOCK_GETTIME_LIB) -+dnl - dnl Check to see if the FUSE library is -lfuse or -losxfuse - dnl - FUSE_CMT= -diff --git a/misc/Makefile.in b/misc/Makefile.in -index 43e3c7e..070a6e3 100644 ---- a/misc/Makefile.in -+++ b/misc/Makefile.in -@@ -387,7 +387,8 @@ fuse2fs: $(FUSE2FS_OBJS) $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) \ - $(LIBEXT2FS) - $(E) " LD $@" - $(Q) $(CC) $(ALL_LDFLAGS) -o fuse2fs $(FUSE2FS_OBJS) $(LIBS) \ -- $(LIBFUSE) $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL) -+ $(LIBFUSE) $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL) \ -+ $(CLOCK_GETTIME_LIB) - - journal.o: $(srcdir)/../debugfs/journal.c - $(E) " CC $@" -diff --git a/misc/Makefile.in b/misc/Makefile.in -index 43e3c7e..070a6e3 100644 ---- a/misc/Makefile.in -+++ b/misc/Makefile.in -@@ -32,6 +32,8 @@ - - @FUSE_CMT@FUSE_PROG= fuse2fs - -+CLOCK_GETTIME_LIB = @CLOCK_GETTIME_LIB@ -+ - SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \ - $(E2IMAGE_PROG) @FSCK_PROG@ e2undo - USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) \ --- -2.7.3 - diff --git a/package/e2fsprogs/0003-fuse2fs-needs-SYSLIBS.patch b/package/e2fsprogs/0003-fuse2fs-needs-SYSLIBS.patch deleted file mode 100644 index 61c696528e..0000000000 --- a/package/e2fsprogs/0003-fuse2fs-needs-SYSLIBS.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ff6147dd7197519e561e796d56545c4e11eb43fa Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 22 Jun 2016 20:55:35 -0300 -Subject: [PATCH e2fsprogs] fuse2fs: needs SYSLIBS - -It otherwise leads to build failure when using an unbundled libintl. - -Signed-off-by: Gustavo Zacarias ---- -Status: sent to ML http://marc.info/?l=linux-ext4&m=146664003825136&w=2 - - misc/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/misc/Makefile.in b/misc/Makefile.in -index f67c9c7..e487692 100644 ---- a/misc/Makefile.in -+++ b/misc/Makefile.in -@@ -389,7 +389,7 @@ fuse2fs: $(FUSE2FS_OBJS) $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) \ - $(E) " LD $@" - $(Q) $(CC) $(ALL_LDFLAGS) -o fuse2fs $(FUSE2FS_OBJS) $(LIBS) \ - $(LIBFUSE) $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL) \ -- $(CLOCK_GETTIME_LIB) -+ $(CLOCK_GETTIME_LIB) $(SYSLIBS) - - journal.o: $(srcdir)/../debugfs/journal.c - $(E) " CC $@" --- -2.7.3 - diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index ec7557303c..57287f4547 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,2 +1,2 @@ -# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.1/sha256sums.asc -sha256 97e36a029224e2606baa6e9ea693b04a4d192ccd714572a1b50a2df9c687b23d e2fsprogs-1.43.1.tar.xz +# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.2/sha256sums.asc +sha256 ddba23e44e06cbe32c7b1026bc92f9487b9cb08c89e961d007cb2a5e87c4ef5e e2fsprogs-1.43.2.tar.xz diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 7aa0285365..3f3b1c0ea2 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.43.1 +E2FSPROGS_VERSION = 1.43.2 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause @@ -15,12 +15,6 @@ E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux # we don't have a host-util-linux HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf -# For 0002-fuse2fs-might-need-librt.patch -# host-gettext for the gettext macro file needed at autoreconf time -E2FSPROGS_AUTORECONF = YES -E2FSPROGS_DEPENDENCIES += host-gettext -HOST_E2FSPROGS_DEPENDENCIES += host-gettext - # e4defrag doesn't build on older systems like RHEL5.x, and we don't # need it on the host anyway. # Disable fuse2fs as well to avoid carrying over deps, and it's unused From e1b348e94eba00581ae33fd66a6eff2bfac62e18 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Sep 2016 17:56:23 +0200 Subject: [PATCH 0125/3392] package/{mesa3d, mesa3d-headers}: bump version to 12.0.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 4 ++-- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index c3b57e4ea8..4b6842e03d 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 = 12.0.1 +MESA3D_HEADERS_VERSION = 12.0.2 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION) MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index fa01128c97..65c59a5868 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2016-July/000227.html -sha256 bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389 mesa-12.0.1.tar.xz +# From https://cgit.freedesktop.org/mesa/mesa/plain/docs/relnotes/12.0.2.html +sha256 d957a5cc371dcd7ff2aa0d87492f263aece46f79352f4520039b58b1f32552cb mesa-12.0.2.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 19dec49f33..12ceee84c1 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 = 12.0.1 +MESA3D_VERSION = 12.0.2 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos From 9b77525c9a749a2dac57327257ac8ccb5dfe3d45 Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Mon, 5 Sep 2016 20:41:37 +0300 Subject: [PATCH 0126/3392] toolchain: Bump ARC tools to arc-2016.09-eng011 As described at: 4520524ba055706236db9f00dd79f1b2e2e87fde this commit continues a series of updates of ARC tools. This time we're updating tools to arc-2016.09-eng011. This engenering build contains the following updates: 1. rebase binutils on top of the latest upstream master 2. update GCC to version 6.2 We still keep GDB as it is of arc-2016.03 release because there're some issues we'd like to resolve before releasing it to wider audience. So again note this is next engineering builds of arc-2016.09 series and it might have all kinds of breakages, please don't use it for production builds. Signed-off-by: Vlad Zakharov Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 2 +- .../0300-ld-makefile.patch | 0 .../0301-check-ldrunpath-length.patch | 0 .../0500-add-sysroot-fix-from-bug-3049.patch | 0 .../0600-poison-system-directories.patch | 0 package/binutils/binutils.hash | 2 +- package/binutils/binutils.mk | 2 +- package/gcc/Config.in.host | 2 +- .../301-missing-execinfo_h.patch | 0 .../860-cilk-wchar.patch | 0 .../940-uclinux-enable-threads.patch | 0 package/gcc/gcc.hash | 2 +- 12 files changed, 5 insertions(+), 5 deletions(-) rename package/binutils/{arc-2016.09-eng010 => arc-2016.09-eng011}/0300-ld-makefile.patch (100%) rename package/binutils/{arc-2016.09-eng010 => arc-2016.09-eng011}/0301-check-ldrunpath-length.patch (100%) rename package/binutils/{arc-2016.09-eng010 => arc-2016.09-eng011}/0500-add-sysroot-fix-from-bug-3049.patch (100%) rename package/binutils/{arc-2016.09-eng010 => arc-2016.09-eng011}/0600-poison-system-directories.patch (100%) rename package/gcc/{arc-2016.09-eng010 => arc-2016.09-eng011}/301-missing-execinfo_h.patch (100%) rename package/gcc/{arc-2016.09-eng010 => arc-2016.09-eng011}/860-cilk-wchar.patch (100%) rename package/gcc/{arc-2016.09-eng010 => arc-2016.09-eng011}/940-uclinux-enable-threads.patch (100%) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 86daa0cb4f..883032927e 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -28,7 +28,7 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2016.09-eng010" if BR2_arc + default "arc-2016.09-eng011" if BR2_arc default "2.24" if BR2_BINUTILS_VERSION_2_24_X default "2.25.1" if BR2_BINUTILS_VERSION_2_25_X default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X diff --git a/package/binutils/arc-2016.09-eng010/0300-ld-makefile.patch b/package/binutils/arc-2016.09-eng011/0300-ld-makefile.patch similarity index 100% rename from package/binutils/arc-2016.09-eng010/0300-ld-makefile.patch rename to package/binutils/arc-2016.09-eng011/0300-ld-makefile.patch diff --git a/package/binutils/arc-2016.09-eng010/0301-check-ldrunpath-length.patch b/package/binutils/arc-2016.09-eng011/0301-check-ldrunpath-length.patch similarity index 100% rename from package/binutils/arc-2016.09-eng010/0301-check-ldrunpath-length.patch rename to package/binutils/arc-2016.09-eng011/0301-check-ldrunpath-length.patch diff --git a/package/binutils/arc-2016.09-eng010/0500-add-sysroot-fix-from-bug-3049.patch b/package/binutils/arc-2016.09-eng011/0500-add-sysroot-fix-from-bug-3049.patch similarity index 100% rename from package/binutils/arc-2016.09-eng010/0500-add-sysroot-fix-from-bug-3049.patch rename to package/binutils/arc-2016.09-eng011/0500-add-sysroot-fix-from-bug-3049.patch diff --git a/package/binutils/arc-2016.09-eng010/0600-poison-system-directories.patch b/package/binutils/arc-2016.09-eng011/0600-poison-system-directories.patch similarity index 100% rename from package/binutils/arc-2016.09-eng010/0600-poison-system-directories.patch rename to package/binutils/arc-2016.09-eng011/0600-poison-system-directories.patch diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 397962880d..aedb045d17 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -4,4 +4,4 @@ sha512 0b36dda0e6d32cd25613c0e64b56b28312515c54d6a159efd3db9a86717f114ab0a0a1f6 sha512 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322bb6cb2b45e8df812f0e8ac059149f8a1f69ba3ed9d86a35c6a540b67 binutils-2.26.1.tar.bz2 # Locally calculated (fetched from Github) -sha512 32d2f04ec62ee0491fd711baf7e6f28052170b1fa4cb8f6046ca4709e03250335a65b362295c13c7c44f8a28d91d2c54b0ab7c8f0f2e2324ea8ba2c80cbee29a binutils-arc-2016.09-eng010.tar.gz +sha512 829e14152dbd18bad36d7e161bdde52e92e8b439ab9fbc18655172f0e2fae954885286e77ceaab9e13b68f3ca19506068c3b1808a2e88f12ad6674d421519b64 binutils-arc-2016.09-eng011.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 97daeff0e6..71ea2b0be0 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,7 +9,7 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2016.09-eng010 +BINUTILS_VERSION = arc-2016.09-eng011 else BINUTILS_VERSION = 2.25.1 endif diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 6f6e582489..0e2c1a7cdb 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -121,7 +121,7 @@ config BR2_GCC_VERSION default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.4.0" if BR2_GCC_VERSION_5_X default "6.1.0" if BR2_GCC_VERSION_6_X - default "arc-2016.09-eng010" if BR2_GCC_VERSION_4_8_ARC + default "arc-2016.09-eng011" if BR2_GCC_VERSION_4_8_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS string "Additional gcc options" diff --git a/package/gcc/arc-2016.09-eng010/301-missing-execinfo_h.patch b/package/gcc/arc-2016.09-eng011/301-missing-execinfo_h.patch similarity index 100% rename from package/gcc/arc-2016.09-eng010/301-missing-execinfo_h.patch rename to package/gcc/arc-2016.09-eng011/301-missing-execinfo_h.patch diff --git a/package/gcc/arc-2016.09-eng010/860-cilk-wchar.patch b/package/gcc/arc-2016.09-eng011/860-cilk-wchar.patch similarity index 100% rename from package/gcc/arc-2016.09-eng010/860-cilk-wchar.patch rename to package/gcc/arc-2016.09-eng011/860-cilk-wchar.patch diff --git a/package/gcc/arc-2016.09-eng010/940-uclinux-enable-threads.patch b/package/gcc/arc-2016.09-eng011/940-uclinux-enable-threads.patch similarity index 100% rename from package/gcc/arc-2016.09-eng010/940-uclinux-enable-threads.patch rename to package/gcc/arc-2016.09-eng011/940-uclinux-enable-threads.patch diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 2e115516ec..a18d1dd9be 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -12,4 +12,4 @@ sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d sha512 eeed3e2018b8c012aabce419e8d718fde701e5c3c179b4486c61ba46e5736eecc8fccdd18b01fcd973a42c6ad3116dbbe2ee247fe3757d622d373f93ebaf8d2e gcc-6.1.0.tar.bz2 # Locally calculated (fetched from Github) -sha512 a788737022c178a1e7704e4ecd3438937f2239bf27fd487db2b00e4bb5c6604535842e4d6798f120488bdbf0b226fa9c94f4b8aede4ce9d20b0add6bcec82927 gcc-arc-2016.09-eng010.tar.gz +sha512 5fa11058adc0fc3d33bb860151660101bc20c7147cd92bc235057cd722e7fdb923ac0bdf27b09499b8587abb0c420867229bd782bc10bee0c76116c099b5a76c gcc-arc-2016.09-eng011.tar.gz From 0a0a45f038706c74769640d05302fe1da3af4411 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Mon, 5 Sep 2016 21:16:15 +1200 Subject: [PATCH 0127/3392] micropython: replace local fix with upstream one The fix from commit 26248571b625 ("micropython: fix build failures") was applied upstream. This replaces the local buildroot fix with the patch that was accepted upstream. Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- ...ovide-mp_raw_code_load_file-for-any-.patch | 27 ------------------- package/micropython/micropython.hash | 1 + package/micropython/micropython.mk | 1 + 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch diff --git a/package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch b/package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch deleted file mode 100644 index 8465ce9e7d..0000000000 --- a/package/micropython/0002-py-emitglue.c-provide-mp_raw_code_load_file-for-any-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4177e71862a2817d2555abd8d0bc9a8a361dad8a Mon Sep 17 00:00:00 2001 -From: Chris Packham -Date: Sat, 3 Sep 2016 20:44:12 +1200 -Subject: [PATCH] py/emitglue.c: provide mp_raw_code_load_file for any unix - architecture - -Signed-off-by: Chris Packham ---- - py/emitglue.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/py/emitglue.c b/py/emitglue.c -index 1b9992b..2e79d5f 100644 ---- a/py/emitglue.c -+++ b/py/emitglue.c -@@ -381,7 +381,7 @@ mp_raw_code_t *mp_raw_code_load_mem(const byte *buf, size_t len) { - // here we define mp_raw_code_load_file depending on the port - // TODO abstract this away properly - --#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && (defined(__unix__))) -+#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || defined(__unix__) - // unix file reader - - #include --- -2.9.2.518.ged577c6.dirty - diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index ea42bfb270..a8ad2ba4d2 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,2 +1,3 @@ #locally computed sha256 871378fcf1f1042c399896d5673da67d12e1fb36c2e706af289fc959bc8f7a57 micropython-v1.8.3.tar.gz +sha256 ff3194ebecda99023d7c1bb94d32b31b9491e95a79958a25ffd05213c5553acc 8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 047e340896..590956e846 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -9,6 +9,7 @@ MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION)) MICROPYTHON_LICENSE = MIT MICROPYTHON_LICENSE_FILES = LICENSE MICROPYTHON_DEPENDENCIES = host-pkgconf libffi +MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch # Use fallback implementation for exception handling on architectures that don't # have explicit support. From 83cdd08d9e08d1c5cb4d84018197d6da9e58f7f2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Sep 2016 13:56:34 +0200 Subject: [PATCH 0128/3392] package/kodi: Fix compilation of kodi-pvr-vbox with gcc6 Fixes a compile error not yet caught by autobuilders: In file included from /home/bernd/buildroot/br2/output/build/kodi-pvr-vbox-15e864d160da5a051e18aef06f3a53e49808be02/src/client.cpp:24:0: /home/bernd/buildroot/br2/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/include/kodi/xbmc_pvr_dll.h:423:63: error: 'SEEK_SET' was not declared in this scope long long SeekLiveStream(long long iPosition, int iWhence = SEEK_SET); ^~~~~~~~ /home/bernd/buildroot/br2/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/include/kodi/xbmc_pvr_dll.h:510:67: error: 'SEEK_SET' was not declared in this scope long long SeekRecordedStream(long long iPosition, int iWhence = SEEK_SET); ^~~~~~~~ CMakeFiles/pvr.vbox.dir/build.make:62: recipe for target 'CMakeFiles/pvr.vbox.dir/src/client.cpp.o' failed using this defconfig BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_BINUTILS_VERSION_2_26_X=y BR2_GCC_VERSION_6_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_INIT_NONE=y BR2_PACKAGE_KODI=y BR2_PACKAGE_KODI_PVR_VBOX=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_XORG7=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...vr_types.h-Fix-compilation-with-gcc6.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch diff --git a/package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch b/package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch new file mode 100644 index 0000000000..a3a9d50ed1 --- /dev/null +++ b/package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch @@ -0,0 +1,30 @@ +From a17e8d39cf01e26955574acd236b4ef5b54b8c3b Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Mon, 5 Sep 2016 12:34:20 +0200 +Subject: [PATCH 2/2] xbmc_pvr_types.h: Fix compilation with gcc6 + +Backport of upstream commit from master branch: +https://github.com/xbmc/xbmc/commit/c8a346109926fa03bf6882c0b6e3885af0e0f8ed + +This patch can be removed when Kodi is bumped to 17.0-Krypton. + +Signed-off-by: Bernd Kuhls +--- + xbmc/addons/include/xbmc_pvr_types.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xbmc/addons/include/xbmc_pvr_types.h b/xbmc/addons/include/xbmc_pvr_types.h +index c5ab20b..e518de1 100644 +--- a/xbmc/addons/include/xbmc_pvr_types.h ++++ b/xbmc/addons/include/xbmc_pvr_types.h +@@ -34,6 +34,7 @@ + #endif + #include + #include ++#include + + #include "xbmc_addon_types.h" + #include "xbmc_epg_types.h" +-- +2.9.3 + From 56fd53734731e13339edc2b82bdd63160f3f135d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Sep 2016 12:02:18 +0200 Subject: [PATCH 0129/3392] package/libva: bump version to 1.7.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva/libva.hash | 4 ++-- package/libva/libva.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 8e8d348a58..c2e5ea4644 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/libva/2016-June/004034.html -sha1 6405ce9adcad2bc31122d766f2a99250657f9f8a libva-1.7.1.tar.bz2 +# From https://lists.freedesktop.org/archives/libva/2016-September/004379.html +sha1 a89680d34236fdc63adeec25cf431c005644b8c6 libva-1.7.2.tar.bz2 diff --git a/package/libva/libva.mk b/package/libva/libva.mk index b6a7ca53a6..df1758efcd 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 1.7.1 +LIBVA_VERSION = 1.7.2 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = http://www.freedesktop.org/software/vaapi/releases/libva LIBVA_LICENSE = MIT From 0c6635e9d6a9b0f1d361f1363c4b647adcae6da2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Sep 2016 12:02:19 +0200 Subject: [PATCH 0130/3392] package/libva-intel-driver: bump version to 1.7.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva-intel-driver/libva-intel-driver.hash | 4 ++-- package/libva-intel-driver/libva-intel-driver.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libva-intel-driver/libva-intel-driver.hash b/package/libva-intel-driver/libva-intel-driver.hash index a480c2cceb..24c2170451 100644 --- a/package/libva-intel-driver/libva-intel-driver.hash +++ b/package/libva-intel-driver/libva-intel-driver.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/libva/2016-June/004035.html -sha1 eb3660197ce4781af4db4d97b0d7965900e7b06e libva-intel-driver-1.7.1.tar.bz2 +# From https://lists.freedesktop.org/archives/libva/2016-September/004380.html +sha1 9373afadd6ec0d6d983cf5bb2001d91c22b39719 libva-intel-driver-1.7.2.tar.bz2 diff --git a/package/libva-intel-driver/libva-intel-driver.mk b/package/libva-intel-driver/libva-intel-driver.mk index dadd67be81..c388de1589 100644 --- a/package/libva-intel-driver/libva-intel-driver.mk +++ b/package/libva-intel-driver/libva-intel-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_INTEL_DRIVER_VERSION = 1.7.1 +LIBVA_INTEL_DRIVER_VERSION = 1.7.2 LIBVA_INTEL_DRIVER_SOURCE = libva-intel-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 LIBVA_INTEL_DRIVER_SITE = http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver LIBVA_INTEL_DRIVER_LICENSE = MIT From 1d0ff54c1464444c39c310ef9108794ac4547bb4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Sep 2016 22:37:55 +0200 Subject: [PATCH 0131/3392] package/amd-catalyst: fix legal-info Fixes http://autobuild.buildroot.net/results/4f1/4f1e9b4bf43add4712e82d4a58e633abb2a7d2b8/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/amd-catalyst/amd-catalyst.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/amd-catalyst/amd-catalyst.mk b/package/amd-catalyst/amd-catalyst.mk index 30973534b2..5636f81c9d 100644 --- a/package/amd-catalyst/amd-catalyst.mk +++ b/package/amd-catalyst/amd-catalyst.mk @@ -10,7 +10,7 @@ AMD_CATALYST_SITE = http://www2.ati.com/drivers/linux AMD_CATALYST_DL_OPTS = --referer='http://support.amd.com' AMD_CATALYST_SOURCE = amd-catalyst-$(AMD_CATALYST_VERSION)-linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.zip AMD_CATALYST_LICENSE = AMD Software License -AMD_CATALYST_LICENSE_FILES = LICENSE.txt +AMD_CATALYST_LICENSE_FILES = LICENSE.TXT AMD_CATALYST_INSTALL_STAGING = YES AMD_CATALYST_SUFFIX = $(if $(BR2_x86_64),_64) AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX) From e03cb2eb2edf73b79156e8f54c80d04dc0846e89 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 5 Sep 2016 18:16:52 -0300 Subject: [PATCH 0132/3392] libgtk3: fix typo It's wayland, not waylandd, hence gtk3+ with the wayland backend went completely poof. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libgtk3/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 2dd6dfacd1..738f865099 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -29,7 +29,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_USE_MMU # glib2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLANDD || \ + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL help The GTK+ version 3 graphical user interface library From 7a08e6f33cde04c2041c34dbbadf0b268fcce458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Tue, 6 Sep 2016 11:38:54 +0200 Subject: [PATCH 0133/3392] lxc: use uptream patch to handle --disable-werror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This new patch does change behavior, but it was accepted by upstream and could be removed on next version bump. Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- .../0001-configure-add-disable-werror.patch | 49 +++++++++++++++++++ package/lxc/0001-drop-werror.patch | 16 ------ package/lxc/lxc.mk | 2 +- 3 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 package/lxc/0001-configure-add-disable-werror.patch delete mode 100644 package/lxc/0001-drop-werror.patch diff --git a/package/lxc/0001-configure-add-disable-werror.patch b/package/lxc/0001-configure-add-disable-werror.patch new file mode 100644 index 0000000000..7bd9729703 --- /dev/null +++ b/package/lxc/0001-configure-add-disable-werror.patch @@ -0,0 +1,49 @@ +From e9f34eb4e25fc18411121c4e55557530ddc1f49c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= +Date: Sun, 4 Sep 2016 09:35:44 +0200 +Subject: [PATCH] configure: add --disable-werror +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +-Werror may break builds on some scenarios with trivialities +(especially during developments). + +Upstream status: accepted (https://github.com/lxc/lxc/pull/1168) + +Signed-off-by: Jérôme Pouiller +--- + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 39e313a..0103579 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -152,6 +152,11 @@ if test "x$with_systemdsystemunitdir" != "xno"; then + AC_SUBST([SYSTEMD_UNIT_DIR], [$with_systemdsystemunitdir]) + fi + ++AC_ARG_ENABLE([werror], ++ [AC_HELP_STRING([--disable-werror], ++ [do not treat warnings as errors])], ++ [], [enable_werror=yes]) ++ + # Allow enabling deprecated executables + AC_ARG_ENABLE([deprecated], + [AC_HELP_STRING([--enable-deprecated], +@@ -630,7 +635,10 @@ AC_PROG_SED + LXC_CHECK_TLS + + if test "x$GCC" = "xyes"; then +- CFLAGS="$CFLAGS -Wall -Werror" ++ CFLAGS="$CFLAGS -Wall" ++ if test "x$enable_werror" = "xyes"; then ++ CFLAGS="$CFLAGS -Werror" ++ fi + fi + + # Files requiring some variable expansion +-- +2.8.1 + diff --git a/package/lxc/0001-drop-werror.patch b/package/lxc/0001-drop-werror.patch deleted file mode 100644 index d2a8673a86..0000000000 --- a/package/lxc/0001-drop-werror.patch +++ /dev/null @@ -1,16 +0,0 @@ -Don't do -Werror it breaks builds on some scenarios with trivialities. - -Signed-off-by: Gustavo Zacarias - -diff -Nura lxc-lxc-1.0.4/configure.ac lxc-lxc-1.0.4.orig/configure.ac ---- lxc-lxc-1.0.4.orig/configure.ac 2014-07-04 10:31:19.821029891 -0300 -+++ lxc-lxc-1.0.4/configure.ac 2014-06-13 14:07:45.000000000 -0300 -@@ -560,7 +560,7 @@ - LXC_CHECK_TLS - - if test "x$GCC" = "xyes"; then -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall" - fi - - # Files requiring some variable expansion diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index a3e24b4367..9e21fc0234 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -12,7 +12,7 @@ LXC_DEPENDENCIES = libcap host-pkgconf # we're patching configure.ac LXC_AUTORECONF = YES LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ - --disable-lua --disable-python \ + --disable-lua --disable-python --disable-werror \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) From 25d28ca9883e46b8de45aface47b835673234068 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 6 Sep 2016 10:59:00 -0300 Subject: [PATCH 0134/3392] btrfs-progs: bump to version 4.7.2 Drop all of the upstreamed patches (not precisely in the same form) and rebase the only required patch for proper static builds with staging libs required by other packages. Build-tested for arm-glibc, arm-uclibc, arm-musl and arm-uclibc-static. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...ll-static-library-and-headers-in-in.patch} | 14 +- ...nfigure-refactor-backtrace-detection.patch | 132 ------------------ ...ure-refactor-always_inline-detection.patch | 42 ------ ...le-fix-undefined-PATH_MAX-under-musl.patch | 67 --------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 6 files changed, 10 insertions(+), 249 deletions(-) rename package/btrfs-progs/{0004-Makefile.in-install-static-library-and-headers-in-in.patch => 0001-Makefile.in-install-static-library-and-headers-in-in.patch} (76%) delete mode 100644 package/btrfs-progs/0001-configure-refactor-backtrace-detection.patch delete mode 100644 package/btrfs-progs/0002-configure-refactor-always_inline-detection.patch delete mode 100644 package/btrfs-progs/0003-compile-fix-undefined-PATH_MAX-under-musl.patch diff --git a/package/btrfs-progs/0004-Makefile.in-install-static-library-and-headers-in-in.patch b/package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch similarity index 76% rename from package/btrfs-progs/0004-Makefile.in-install-static-library-and-headers-in-in.patch rename to package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch index e6e9eab8bb..d861dfc80a 100644 --- a/package/btrfs-progs/0004-Makefile.in-install-static-library-and-headers-in-in.patch +++ b/package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch @@ -12,15 +12,17 @@ should be installed by "install-static". Indeed, "make install" cannot be used if the support for shared library is not enabled. Signed-off-by: Thomas Petazzoni +[Gustavo: Rebase for btrfs-progs 4.7.2] +Signed-off-by: Gustavo Zacarias --- Makefile.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 8450ab3..0d3b490 100644 +index 19697ff..5870a58 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -183,7 +183,7 @@ test: test-fsck test-convert test-misc +@@ -219,7 +219,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz # NOTE: For static compiles, you need to have all the required libs # static equivalent available # @@ -29,10 +31,10 @@ index 8450ab3..0d3b490 100644 version.h: version.sh version.h.in configure.ac @echo " [SH] $@" -@@ -346,6 +346,10 @@ install-static: $(progs_static) $(INSTALLDIRS) - for p in $(progs_static) ; do \ - $(INSTALL) -D -m755 $$p $(DESTDIR)$(bindir)/`basename $$p .static` ; \ +@@ -384,6 +384,10 @@ install-static: $(progs_static) $(INSTALLDIRS) done + # btrfsck is a link to btrfs in the src tree, make it so for installed file as well + $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static + $(INSTALL) -m755 -d $(DESTDIR)$(libdir) + $(INSTALL) $(libs_static) $(DESTDIR)$(libdir) + $(INSTALL) -m755 -d $(DESTDIR)$(incdir) @@ -41,5 +43,5 @@ index 8450ab3..0d3b490 100644 $(INSTALLDIRS): @echo "Making install in $(patsubst install-%,%,$@)" -- -2.7.4 +2.7.3 diff --git a/package/btrfs-progs/0001-configure-refactor-backtrace-detection.patch b/package/btrfs-progs/0001-configure-refactor-backtrace-detection.patch deleted file mode 100644 index 0f834ded94..0000000000 --- a/package/btrfs-progs/0001-configure-refactor-backtrace-detection.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 9bef473d17ec01efe760462271791dfaaea280c0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 29 Jul 2015 22:35:19 +0200 -Subject: [PATCH 1/3] configure: refactor backtrace() detection - -The current code assumes that if __GLIBC__ is not defined, backtrace -support is not available, and defines BTRFS_DISABLE_BACKTRACE. - -However, this macro is already defined by the configure.ac script when ---disable-backtrace is passed. This means that if you are using a C -library like musl which does not define __GLIBC__, and you pass ---disable-backtrace, you get a macro redefinition. - -Instead of relying on __GLIBC__, this commit implements a proper -configure.ac based detection of backtrace support: - - * If the user passes --enable-backtrace, we check if the backtrace() - function is available. If not, we abort the configure process with - an error. Otherwise we enable backtrace support by defining - HAVE_BACKTRACE. - - * If the user passes --disable-backtrace, then we don't enable - backtrace support. - - * If the user passes nothing special, we auto-detect: if backtrace() - is available, we use it, otherwise we simply warn at configure time - but not fail. - -Upstream-status: pending -Signed-off-by: Thomas Petazzoni -Signed-off-by: Brendan Heading ---- - configure.ac | 32 ++++++++++++++++++++++---------- - kerncompat.h | 9 ++++----- - 2 files changed, 26 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c3a22d1..e936a10 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,22 +63,34 @@ AC_DEFUN([PKG_STATIC], [ - fi - ]) - -- -+# Provide a --{enable,disable}-backtrace option. If not passed, set -+# enable_backtrace to 'auto' so that we try to enable backtrace -+# support if available, but if not available, we gracefully fallback -+# without backtrace support. - AC_ARG_ENABLE([backtrace], - AS_HELP_STRING([--disable-backtrace], [disable btrfs backtrace]), -- [], [enable_backtrace=yes] -+ [enable_backtrace=${enableval}], [enable_backtrace=auto] - ) - --AS_IF([test "x$enable_backtrace" = xno], [ -- AC_DEFINE([BTRFS_DISABLE_BACKTRACE], [1], [disable backtrace stuff in kerncompat.h ]) --]) -- --if test "x$enable_backtrace" = xyes; then -- AC_CHECK_HEADERS([execinfo.h]) -- AC_CHECK_FUNCS([backtrace backtrace_symbols_fd], [], -- AC_MSG_ERROR([standard library does not have backtrace support])) -+# Backtrace support requested (enable_backtrace is either 'yes' or -+# 'auto'), so check for needed headers and functions. -+if test "x$enable_backtrace" != xno; then -+ AC_CHECK_HEADERS([execinfo.h]) -+ AC_CHECK_FUNCS([backtrace backtrace_symbols_fd]) - fi - -+if test "x$ac_cv_func_backtrace" = xno; then -+ # If backtrace support was requested but not available, we fail if -+ # --enable-backtrace was passed, or we simply warn if we're -+ # auto-detecting. -+ if test "x$enable_backtrace" = xyes ; then -+ AC_MSG_ERROR([standard library does not have backtrace support]) -+ elif test "x$enable_backtrace" = xauto ; then -+ AC_MSG_WARN([standard library does not have backtrace support, disabled]) -+ fi -+else -+ AC_DEFINE([HAVE_BACKTRACE], [1], [Enable backtrace support]) -+fi - - AC_ARG_ENABLE([documentation], - AS_HELP_STRING([--disable-documentation], [do not build domumentation]), -diff --git a/kerncompat.h b/kerncompat.h -index 5d92856..8318665 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -33,11 +33,10 @@ - #include - - #ifndef __GLIBC__ --#define BTRFS_DISABLE_BACKTRACE - #define __always_inline __inline __attribute__ ((__always_inline__)) - #endif - --#ifndef BTRFS_DISABLE_BACKTRACE -+#ifdef HAVE_BACKTRACE - #include - #endif - -@@ -65,7 +64,7 @@ - #define ULONG_MAX (~0UL) - #endif - --#ifndef BTRFS_DISABLE_BACKTRACE -+#ifdef HAVE_BACKTRACE - #define MAX_BACKTRACE 16 - static inline void print_trace(void) - { -@@ -285,7 +284,7 @@ static inline long IS_ERR(const void *ptr) - #define vmalloc(x) malloc(x) - #define vfree(x) free(x) - --#ifndef BTRFS_DISABLE_BACKTRACE -+#ifdef HAVE_BACKTRACE - #define BUG_ON(c) assert_trace(#c, __FILE__, __func__, __LINE__, !(c)) - #else - #define BUG_ON(c) assert(!(c)) -@@ -293,7 +292,7 @@ static inline long IS_ERR(const void *ptr) - - #define WARN_ON(c) BUG_ON(c) - --#ifndef BTRFS_DISABLE_BACKTRACE -+#ifdef HAVE_BACKTRACE - #define ASSERT(c) assert_trace(#c, __FILE__, __func__, __LINE__, (c)) - #else - #define ASSERT(c) assert(c) --- -2.4.3 - diff --git a/package/btrfs-progs/0002-configure-refactor-always_inline-detection.patch b/package/btrfs-progs/0002-configure-refactor-always_inline-detection.patch deleted file mode 100644 index f54d2501a2..0000000000 --- a/package/btrfs-progs/0002-configure-refactor-always_inline-detection.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1d99ae25bb1bd4879c6f20f607faf3040018ee84 Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Thu, 30 Jul 2015 15:44:52 +0100 -Subject: [PATCH 2/3] configure: refactor always_inline detection - -Use configure.ac to detect the availability of the always_inline glibc -macro, and define it only if it does not exist. - -Signed-off-by: Brendan Heading ---- - configure.ac | 1 + - kerncompat.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e936a10..d3d81a1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -41,6 +41,7 @@ AC_PATH_PROG([RMDIR], [rmdir], [rmdir]) - - AC_CHECK_FUNCS([openat], [], - [AC_MSG_ERROR([cannot find openat() function])]) -+AC_CHECK_DECLS([__always_inline]) - - m4_ifndef([PKG_PROG_PKG_CONFIG], - [m4_fatal([Could not locate the pkg-config autoconf -diff --git a/kerncompat.h b/kerncompat.h -index 8318665..757b9b4 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -32,7 +32,7 @@ - - #include - --#ifndef __GLIBC__ -+#ifndef HAVE_DECL___ALWAYS_INLINE - #define __always_inline __inline __attribute__ ((__always_inline__)) - #endif - --- -2.4.3 - diff --git a/package/btrfs-progs/0003-compile-fix-undefined-PATH_MAX-under-musl.patch b/package/btrfs-progs/0003-compile-fix-undefined-PATH_MAX-under-musl.patch deleted file mode 100644 index 35260148b2..0000000000 --- a/package/btrfs-progs/0003-compile-fix-undefined-PATH_MAX-under-musl.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3197a4b058615d81aa4623fb5a52e57d7fbc3af2 Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Thu, 30 Jul 2015 15:47:16 +0100 -Subject: [PATCH 3/3] compile: fix undefined PATH_MAX under musl - -musl's strict implementation requires #include for PATH_MAX. - -Upstream-status: submitted -Signed-off-by: Brendan Heading ---- - cmds-inspect.c | 1 + - cmds-receive.c | 1 + - cmds-scrub.c | 1 + - cmds-send.c | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/cmds-inspect.c b/cmds-inspect.c -index 71451fe..9712581 100644 ---- a/cmds-inspect.c -+++ b/cmds-inspect.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include "kerncompat.h" - #include "ioctl.h" -diff --git a/cmds-receive.c b/cmds-receive.c -index 071bea9..d4b3103 100644 ---- a/cmds-receive.c -+++ b/cmds-receive.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/cmds-scrub.c b/cmds-scrub.c -index b7aa809..5a85dc4 100644 ---- a/cmds-scrub.c -+++ b/cmds-scrub.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include "ctree.h" - #include "ioctl.h" -diff --git a/cmds-send.c b/cmds-send.c -index 20bba18..a0b7f95 100644 ---- a/cmds-send.c -+++ b/cmds-send.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include "ctree.h" - #include "ioctl.h" --- -2.4.3 - diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 799c878f0c..4cd00aaad6 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 62db60c6a0868afb6302112cea54c756873bc30b826696b167ec03ecd61b2f12 btrfs-progs-v4.1.2.tar.xz +sha256 f49bc9e143ffe60260c5bd70ef3b624576673f8b50f41e309892a425f7fbe60f btrfs-progs-v4.7.2.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 87680574c7..e094986753 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.1.2 +BTRFS_PROGS_VERSION = 4.7.2 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib From 81c8bd86e3e7be9521a22dc879c5266998659c5a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 6 Sep 2016 14:29:02 -0300 Subject: [PATCH 0135/3392] linux-headers: bump 3.{12, 18}.x and 4.1.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f3a99e5348..939a20a964 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -238,12 +238,12 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.81" if BR2_KERNEL_HEADERS_3_2 default "3.4.112" if BR2_KERNEL_HEADERS_3_4 default "3.10.103" if BR2_KERNEL_HEADERS_3_10 - default "3.12.62" if BR2_KERNEL_HEADERS_3_12 + default "3.12.63" if BR2_KERNEL_HEADERS_3_12 default "3.14.77" if BR2_KERNEL_HEADERS_3_14 - default "3.18.40" if BR2_KERNEL_HEADERS_3_18 + default "3.18.41" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.31" if BR2_KERNEL_HEADERS_4_1 + default "4.1.32" if BR2_KERNEL_HEADERS_4_1 default "4.2.8" if BR2_KERNEL_HEADERS_4_2 default "4.3.6" if BR2_KERNEL_HEADERS_4_3 default "4.4.19" if BR2_KERNEL_HEADERS_4_4 From 83b3dc25be96ceec520945adc6fdf6ab9db109f3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 5 Sep 2016 23:56:02 -0300 Subject: [PATCH 0136/3392] libenca: bump to version 1.19 Switch to homepage download URL to get the smaller xz-compressed variant. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libenca/libenca.hash | 2 +- package/libenca/libenca.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libenca/libenca.hash b/package/libenca/libenca.hash index e6d6b35d1f..1a03c8fa46 100644 --- a/package/libenca/libenca.hash +++ b/package/libenca/libenca.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 14457b185c77b947ca2f8e09a2c3ec66940d97a2ccea28b8e61a6e0f3a0033f6 libenca-1.16.tar.gz +sha256 3a487eca40b41021e2e4b7a6440b97d822e6532db5464471f572ecf77295e8b8 enca-1.19.tar.xz diff --git a/package/libenca/libenca.mk b/package/libenca/libenca.mk index 184cac943a..b87427a35c 100644 --- a/package/libenca/libenca.mk +++ b/package/libenca/libenca.mk @@ -4,8 +4,9 @@ # ################################################################################ -LIBENCA_VERSION = 1.16 -LIBENCA_SITE = $(call github,nijel,enca,$(LIBENCA_VERSION)) +LIBENCA_VERSION = 1.19 +LIBENCA_SITE = http://dl.cihar.com/enca +LIBENCA_SOURCE = enca-$(LIBENCA_VERSION).tar.xz LIBENCA_INSTALL_STAGING = YES LIBENCA_LICENSE = GPLv2 LIBENCA_LICENSE_FILES = COPYING From 1b06c1851137a61cb27a8c898a32a447febf6cec Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 5 Sep 2016 23:59:11 -0300 Subject: [PATCH 0137/3392] mpv: bump to version 0.20.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/mpv/mpv.hash | 2 +- package/mpv/mpv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash index 1594cb9282..eea0db0176 100644 --- a/package/mpv/mpv.hash +++ b/package/mpv/mpv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3df5811942cd1d71f48eb4720092fdafec11885bf6dd6d1d3e6413f32e5d67e2 v0.19.0.tar.gz +sha256 fe6ec9d2ded5ce84b963f54b812d579d04f944f4a737f3ae639c4d5d9e842b56 v0.20.0.tar.gz sha256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b waf-1.8.12 diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index 123dff4943..4f04fdfc47 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPV_VERSION = 0.19.0 +MPV_VERSION = 0.20.0 MPV_WAF_VERSION = 1.8.12 MPV_SITE = https://github.com/mpv-player/mpv/archive MPV_SOURCE = v$(MPV_VERSION).tar.gz From 09def84be82a00ea47a638fb9cd71acf1d1ec82c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 6 Sep 2016 00:45:57 -0300 Subject: [PATCH 0138/3392] ncmpc: bump to version 0.25 The download has a .sig file so use it. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/ncmpc/ncmpc.hash | 4 ++-- package/ncmpc/ncmpc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ncmpc/ncmpc.hash b/package/ncmpc/ncmpc.hash index 1acc64dc10..e7646b2e3a 100644 --- a/package/ncmpc/ncmpc.hash +++ b/package/ncmpc/ncmpc.hash @@ -1,2 +1,2 @@ -# Calculated locally -sha256 0e6f76b2b11449cfa479d2830ac681f4e3bff54a95a9134b069dd5a173b4c3e9 ncmpc-0.24.tar.xz +# Locally calculated after checking pgp signature +sha256 6e328acb71d06ae9e6c5fced99bc28ae78bcab1a73130b42ce9ab08a814ecea4 ncmpc-0.25.tar.xz diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index 050b6b8343..b5fa7cdf3c 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -5,7 +5,7 @@ ################################################################################ NCMPC_VERSION_MAJOR = 0 -NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).24 +NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).25 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) NCMPC_DEPENDENCIES = host-pkgconf libglib2 libmpdclient ncurses From c5647bbf43c4cd875af96de8a080b76f8dca0b8d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 6 Sep 2016 00:46:39 -0300 Subject: [PATCH 0139/3392] mpd-mpc: bump to version 0.28 The download has a .sig file so use it. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/mpd-mpc/mpd-mpc.hash | 4 ++-- package/mpd-mpc/mpd-mpc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mpd-mpc/mpd-mpc.hash b/package/mpd-mpc/mpd-mpc.hash index b4003867e9..8336893744 100644 --- a/package/mpd-mpc/mpd-mpc.hash +++ b/package/mpd-mpc/mpd-mpc.hash @@ -1,2 +1,2 @@ -# Locally computed -sha256 45a2be0a6dea65ed43f631294c24e74b83c8ee66d1ba6ab47d0744ddb1e62064 mpc-0.27.tar.xz +# Locally calculated after checking pgp signature +sha256 a4337d06c85dc81a638821d30fce8a137a58d13d510be34a11c1cce95cabc547 mpc-0.28.tar.xz diff --git a/package/mpd-mpc/mpd-mpc.mk b/package/mpd-mpc/mpd-mpc.mk index f5e95999c3..d9aa1f8795 100644 --- a/package/mpd-mpc/mpd-mpc.mk +++ b/package/mpd-mpc/mpd-mpc.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_MPC_VERSION_MAJOR = 0 -MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).27 +MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).28 MPD_MPC_SITE = http://www.musicpd.org/download/mpc/$(MPD_MPC_VERSION_MAJOR) MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz MPD_MPC_LICENSE = GPLv2+ From 73bc370c642fdf02532d59a556406f8d33daa22a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 6 Sep 2016 00:46:53 -0300 Subject: [PATCH 0140/3392] mpd: bump to version 0.19.19 It fixes runtime issues with ffmpeg 3.1.x Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 4b564bf5b2..8f620e7648 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 764c991c54980cb97e876e3f65d63410c0c561b7be996b832e058053e005ed47 mpd-0.19.18.tar.xz +sha256 bc856cda4136403446d53d11576f86990b61d1fe4668f6008e9eae47450d4e1d mpd-0.19.19.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index de168c16ad..0bf8ece08b 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.19 -MPD_VERSION = $(MPD_VERSION_MAJOR).18 +MPD_VERSION = $(MPD_VERSION_MAJOR).19 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost libglib2 From 4b2ba364b00e46a93c451477b252d170822b4fe7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 5 Sep 2016 23:39:39 -0300 Subject: [PATCH 0141/3392] e2fsprogs: bump to version 1.43.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/e2fsprogs/e2fsprogs.hash | 4 ++-- package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 57287f4547..5fd9f3d6b4 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,2 +1,2 @@ -# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.2/sha256sums.asc -sha256 ddba23e44e06cbe32c7b1026bc92f9487b9cb08c89e961d007cb2a5e87c4ef5e e2fsprogs-1.43.2.tar.xz +# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.3/sha256sums.asc +sha256 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37 e2fsprogs-1.43.3.tar.xz diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 3f3b1c0ea2..022ba5283a 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.43.2 +E2FSPROGS_VERSION = 1.43.3 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause From 2bc1cc7cc182c61a430083b9132c6638caaf5632 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 5 Sep 2016 23:39:57 -0300 Subject: [PATCH 0142/3392] webkitgtk: bump to version 2.12.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 6 +++--- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index f74677eb61..f01c7f0c07 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,4 +1,4 @@ -# From http://www.webkitgtk.org/releases/webkitgtk-2.12.4.tar.xz.sha1 -sha1 ebfe6015d81129b6a13a9596d065c54e9c1b93f6 webkitgtk-2.12.4.tar.xz +# From http://www.webkitgtk.org/releases/webkitgtk-2.12.5.tar.xz.sha1 +sha1 2d73fd5b47c68c73aea8b3d7b88acc8e62bdb99c webkitgtk-2.12.5.tar.xz # Calculated based on the hash above -sha256 424d3177599abbc1eb1a1ad7928dd280a62006e992f2fada2e059375a9609a77 webkitgtk-2.12.4.tar.xz +sha256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 webkitgtk-2.12.5.tar.xz diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index f5c4334553..7843373995 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.12.4 +WEBKITGTK_VERSION = 2.12.5 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From 4904c4ce8ac8b605b2591df1c259f5ad70bed48f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Sep 2016 23:00:56 +0200 Subject: [PATCH 0143/3392] package/opencv3: use BR2_TOOLCHAIN_HAS_LIBATOMIC It uses __atomic_fetch_add_4 so libatomic must be pulled in if necessary. Fixes http://autobuild.buildroot.net/results/652/6521223b426c3cb4dfefab27bc6021900db6910e/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/opencv3/Config.in | 2 ++ package/opencv3/opencv3.mk | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in index 2f4aa7aca8..4c00bf1b94 100644 --- a/package/opencv3/Config.in +++ b/package/opencv3/Config.in @@ -1,6 +1,7 @@ menuconfig BR2_PACKAGE_OPENCV3 bool "opencv3" select BR2_PACKAGE_ZLIB + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR @@ -335,6 +336,7 @@ config BR2_PACKAGE_OPENCV3_INSTALL_DATA endif # BR2_PACKAGE_OPENCV3 comment "opencv3 needs a toolchain w/ C++, NPTL, wchar, dynamic library" + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 91cdfe6428..2529de9f4b 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -10,6 +10,11 @@ OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3c OPENCV3_LICENSE_FILES = LICENSE +# Uses __atomic_fetch_add_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +OPENCV3_CONF_OPTS += -DCMAKE_CXX_FLAGS="-latomic" +endif + # OpenCV component options OPENCV3_CONF_OPTS += \ -DBUILD_DOCS=OFF \ From 35387e190c1fdf6ea28055468fec05ea7ea03e4e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Sep 2016 12:29:09 +0200 Subject: [PATCH 0144/3392] package/opencv: Fix compiling VFP assembler code Fixes build errors in ffmpeg http://autobuild.buildroot.net/results/c32/c32a21240a9933796ee850349a62ff3c2314f25c/ http://autobuild.buildroot.net/results/22a/22a9769d83d2a398bb6b264d342b2077c41c9cc5/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...c.h-Fix-compiling-VFP-assembler-code.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/opencv/0003-types_c.h-Fix-compiling-VFP-assembler-code.patch diff --git a/package/opencv/0003-types_c.h-Fix-compiling-VFP-assembler-code.patch b/package/opencv/0003-types_c.h-Fix-compiling-VFP-assembler-code.patch new file mode 100644 index 0000000000..85a23a0740 --- /dev/null +++ b/package/opencv/0003-types_c.h-Fix-compiling-VFP-assembler-code.patch @@ -0,0 +1,37 @@ +From 18c868c47307b786d1bea729dccaad7f8d696cb7 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 6 Sep 2016 11:49:00 +0200 +Subject: [PATCH 1/1] types_c.h: Fix compiling VFP assembler code + +Replace asm by __asm__ according to +https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords +as suggested by Arnout Vandecappelle: +http://lists.busybox.net/pipermail/buildroot/2016-September/171491.html + +to fix build errors in ffmpeg with opencv2 support detected by +buildroot autobuilders: +http://autobuild.buildroot.net/results/c32/c32a21240a9933796ee850349a62ff3c2314f25c/build-end.log + +Patch sent upstream: https://github.com/opencv/opencv/pull/7242 + +Signed-off-by: Bernd Kuhls +--- + modules/core/include/opencv2/core/types_c.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/core/include/opencv2/core/types_c.h b/modules/core/include/opencv2/core/types_c.h +index c21cd2c..771715d 100644 +--- a/modules/core/include/opencv2/core/types_c.h ++++ b/modules/core/include/opencv2/core/types_c.h +@@ -318,7 +318,7 @@ enum { + int res; \ + float temp; \ + (void)temp; \ +- asm(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \ ++ __asm__(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \ + return res; + // 2. version for double + #ifdef __clang__ +-- +2.9.3 + From 1b69855b69118622d4048b6b744df0ee2ba29b5b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Sep 2016 16:51:20 +0200 Subject: [PATCH 0145/3392] package/ffmpeg: add optional support for opencv3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index a90d437e4f..782d913e68 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -253,6 +253,9 @@ endif ifeq ($(BR2_PACKAGE_OPENCV_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV_WITH_FFMPEG),yx) FFMPEG_CONF_OPTS += --enable-libopencv FFMPEG_DEPENDENCIES += opencv +else ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx) +FFMPEG_CONF_OPTS += --enable-libopencv +FFMPEG_DEPENDENCIES += opencv3 else FFMPEG_CONF_OPTS += --disable-libopencv endif From da91eaae731a0ec0bd1dbd1dc55805afd1fa0b92 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 2 Sep 2016 22:31:27 +0200 Subject: [PATCH 0146/3392] package/efl: bump to 1.18.0 Elementary, evas-generic-loaders and emotion-generic-loaders are now part of efl 1.18 package [1]. Merge the elementery and evas-generic-loaders package to the efl one. Rename librsvg option (srvg/libsrvg) [1] https://phab.enlightenment.org/w/efl_and_elementary_1_18/ Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/efl/Config.in | 14 ++++++++++++++ package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 97157f8cb4..1cc681c242 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -199,6 +199,20 @@ config BR2_PACKAGE_EFL_WEBP help This enables the loader code that loads images using WebP. +config BR2_PACKAGE_EFL_LIBRAW + bool "libraw loader" + select BR2_PACKAGE_LIBRAW + help + This option enables the Evas generic Libraw loader + +config BR2_PACKAGE_EFL_SVG + bool "SVG loader" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz + select BR2_PACKAGE_LIBRSVG + select BR2_PACKAGE_CAIRO + help + This option enables the Evas generic SVG loader + endif # BR2_PACKAGE_EFL comment "efl needs udev /dev management and a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 2ddc0056d7..81727a2d9c 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,2 +1,2 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.17.2.tar.xz.sha256 -sha256 9aa93ff0ab4bdf95d5cf9606bd7efece611691ca22eb6fc3484fe6e7a92bf8b6 efl-1.17.2.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.0.tar.xz.sha256 +sha256 06a0bbf5c28f96731b115b0adfa11374d07beb983ae4612ed25b34f4ab5cbf9e efl-1.18.0.tar.xz diff --git a/package/efl/efl.mk b/package/efl/efl.mk index d404e71e95..83588c1688 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.17.2 +EFL_VERSION = 1.18.0 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+ @@ -24,16 +24,26 @@ EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ # Configure options: # --disable-lua-old: build elua for the target. +# --disable-poppler: disable poppler image loader. # --disable-sdl: disable sdl2 support. +# --disable-spectre: disable spectre image loader. # --disable-xinput22: disable X11 XInput v2.2+ support. # --with-opengl=none: disable opengl support. +# --with-doxygen: disable doxygen documentation EFL_CONF_OPTS = \ --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ + --with-eet-eet=$(HOST_DIR)/usr/bin/eet \ + --with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \ + --with-elementary-codegen=$(HOST_DIR)/usr/bin/elementary_codegen \ + --with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \ --with-elua=$(HOST_DIR)/usr/bin/elua \ --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \ --disable-lua-old \ + --disable-poppler \ --disable-sdl \ + --disable-spectre \ --disable-xinput22 \ + --with-doxygen=no \ --with-opengl=none # Disable untested configuration warning. @@ -217,6 +227,20 @@ else EFL_CONF_OPTS += --disable-image-loader-webp endif +ifeq ($(BR2_PACKAGE_EFL_LIBRAW),y) +EFL_DEPENDENCIES += libraw +EFL_CONF_OPTS += --enable-libraw +else +EFL_CONF_OPTS += --disable-libraw +endif + +ifeq ($(BR2_PACKAGE_EFL_SVG),y) +EFL_DEPENDENCIES += librsvg cairo +EFL_CONF_OPTS += --enable-librsvg +else +EFL_CONF_OPTS += --disable-librsvg +endif + $(eval $(autotools-package)) ################################################################################ @@ -254,9 +278,12 @@ HOST_EFL_DEPENDENCIES = \ # --disable-libmount: remove dependency on host-util-linux libmount. # --disable-lua-old: build elua for the host. # --disable-physics: remove Bullet dependency. +# --disable-poppler: disable poppler image loader. +# --disable-spectre: disable spectre image loader. # --enable-image-loader-gif=no: disable Gif dependency. # --enable-image-loader-tiff=no: disable Tiff dependency. # --with-crypto=none: remove dependencies on openssl or gnutls. +# --with-doxygen: disable doxygen documentation # --with-x11=none: remove dependency on X.org. # Yes I really know what I am doing. HOST_EFL_CONF_OPTS += \ @@ -266,14 +293,20 @@ HOST_EFL_CONF_OPTS += \ --disable-gstreamer1 \ --disable-libeeze \ --disable-libmount \ + --disable-libraw \ + --disable-librsvg \ --disable-lua-old \ --disable-multisense \ --disable-physics \ + --disable-poppler \ + --disable-spectre \ + --disable-xcf \ --enable-image-loader-gif=no \ --enable-image-loader-jpeg=yes \ --enable-image-loader-png=yes \ --enable-image-loader-tiff=no \ --with-crypto=none \ + --with-doxygen=no \ --with-glib=yes \ --with-opengl=none \ --with-x11=none \ From 1169f584f0d3aaad8baae36fc8593a6b4af35820 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 2 Sep 2016 22:31:28 +0200 Subject: [PATCH 0147/3392] package/enlightenment: remove elementary dependency elementary is now provided by efl package, so remove elementary package dependency. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/enlightenment/Config.in | 1 - package/enlightenment/enlightenment.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index 05ee6fc619..5509e63f57 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -15,7 +15,6 @@ config BR2_PACKAGE_ENLIGHTENMENT select BR2_PACKAGE_EFL_X_XLIB select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start select BR2_PACKAGE_EFL_PNG # needed at runtime by enlightenment_start - select BR2_PACKAGE_ELEMENTARY select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG select BR2_PACKAGE_XCB_UTIL_KEYSYMS diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 2440cec7a7..b172383d15 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -14,7 +14,6 @@ ENLIGHTENMENT_DEPENDENCIES = \ host-pkgconf \ host-efl \ efl \ - elementary \ libevas-generic-loaders \ xcb-util-keysyms From e29907ade90bb65aaef1650d030de3f20548393d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 2 Sep 2016 22:31:29 +0200 Subject: [PATCH 0148/3392] package/enlightenment: remove libevas-generic-loaders dependency libevas-generic-loaders is now provided by efl package, so remove libevas-generic-loaders package dependency. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/enlightenment/Config.in | 3 +-- package/enlightenment/enlightenment.mk | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index 5509e63f57..b5d889bc65 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -15,8 +15,7 @@ config BR2_PACKAGE_ENLIGHTENMENT select BR2_PACKAGE_EFL_X_XLIB select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start select BR2_PACKAGE_EFL_PNG # needed at runtime by enlightenment_start - select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS - select BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG + select BR2_PACKAGE_EFL_SVG select BR2_PACKAGE_XCB_UTIL_KEYSYMS help Enlightenment, also known simply as E, is a stacking window diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index b172383d15..34c4f21a04 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -14,7 +14,6 @@ ENLIGHTENMENT_DEPENDENCIES = \ host-pkgconf \ host-efl \ efl \ - libevas-generic-loaders \ xcb-util-keysyms ENLIGHTENMENT_CONF_OPTS = \ From e50e1b72aa19b035da026a7999a09e5eaa1c112e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 2 Sep 2016 22:31:30 +0200 Subject: [PATCH 0149/3392] package/terminology: remove elementary dependency elementary is now provided by efl package, so remove elementary package dependency. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/terminology/Config.in | 1 - package/terminology/terminology.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/terminology/Config.in b/package/terminology/Config.in index c574af7f2d..f367ce51e9 100644 --- a/package/terminology/Config.in +++ b/package/terminology/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_TERMINOLOGY bool "terminology" depends on BR2_PACKAGE_EFL - select BR2_PACKAGE_ELEMENTARY help Terminology is an EFL terminal emulator with some extra bells and whistles. diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk index d6c41d7477..86b51c5c5d 100644 --- a/package/terminology/terminology.mk +++ b/package/terminology/terminology.mk @@ -10,7 +10,7 @@ TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2c TERMINOLOGY_LICENSE_FILES = COPYING -TERMINOLOGY_DEPENDENCIES = efl elementary host-pkgconf +TERMINOLOGY_DEPENDENCIES = efl host-pkgconf TERMINOLOGY_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc $(eval $(autotools-package)) From c22b7580237a0b9106fad18770a464c353a954a8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 2 Sep 2016 22:31:31 +0200 Subject: [PATCH 0150/3392] package/elementary: remove package elementary package is not used anymore, remove it. Add a legacy entry. Signed-off-by: Romain Naour [Thomas: move the legacy entry at the right place.] Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++ package/Config.in | 1 - ...-.eo.h-files-from-includesub_HEADERS.patch | 45 ----------------- package/elementary/Config.in | 15 ------ package/elementary/elementary.hash | 2 - package/elementary/elementary.mk | 48 ------------------- 6 files changed, 7 insertions(+), 111 deletions(-) delete mode 100644 package/elementary/0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch delete mode 100644 package/elementary/Config.in delete mode 100644 package/elementary/elementary.hash delete mode 100644 package/elementary/elementary.mk diff --git a/Config.in.legacy b/Config.in.legacy index 59e3f84bdc..c76aeb1c10 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_ELEMENTARY + bool "elementary package removed" + select BR2_LEGACY + select BR2_PACKAGE_EFL + help + With EFL 1.18, elementary is now provided by the efl package. + config BR2_LINUX_KERNEL_CUSTOM_LOCAL bool "Linux kernel local directory option removed" help diff --git a/package/Config.in b/package/Config.in index 6a770a3add..2acc73956f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -241,7 +241,6 @@ comment "Graphic libraries" source "package/directfb/Config.in" source "package/directfb-examples/Config.in" source "package/efl/Config.in" - source "package/elementary/Config.in" source "package/fbdump/Config.in" source "package/fbgrab/Config.in" source "package/fbset/Config.in" diff --git a/package/elementary/0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch b/package/elementary/0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch deleted file mode 100644 index 75a36a2233..0000000000 --- a/package/elementary/0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2f6a65718a0992d0624836ce4b1416a7420782d2 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 25 Jul 2016 22:52:41 +0200 -Subject: [PATCH] lib: remove *.eo.h files from includesub_HEADERS - -Otherwise *.eo.h files will be installed twice, so it can break a -parallel install on fast machines, whereby two make jobs may run -concurrently, trying to install the same files. - -/usr/bin/install -c -m 644 elm_sys_notify.eo.h -/usr/bin/install -c -m 644 elm_sys_notify.eo.h -usr/bin/install: cannot create regular file 'elm_sys_notify.eo.h': File exists - -Fixes: -http://autobuild.buildroot.net/results/7e9/7e9caffe442dcf40ee41da56fd3f55ffedf3a291 - -Signed-off-by: Romain Naour ---- - src/lib/Makefile.am | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index 40fb597..9df9424 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -351,8 +351,6 @@ elm_systray_eo.h \ - elm_systray_common.h \ - elm_systray_watcher.h \ - elm_sys_notify.h \ --elm_sys_notify.eo.h \ --elm_sys_notify_dbus.eo.h \ - elm_table.h \ - elm_table_eo.h \ - elm_table_legacy.h \ -@@ -381,7 +379,6 @@ elm_win_common.h \ - elm_win_eo.h \ - elm_win_legacy.h \ - elm_win_standard.h \ --elm_win_standard.eo.h \ - elm_helper.h - includesubdir = $(includedir)/elementary-@VMAJ@/ - --- -2.5.5 - diff --git a/package/elementary/Config.in b/package/elementary/Config.in deleted file mode 100644 index f356784731..0000000000 --- a/package/elementary/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_ELEMENTARY - bool "elementary" - depends on BR2_PACKAGE_EFL - depends on BR2_TOOLCHAIN_HAS_THREADS # elm_store.c - depends on !BR2_STATIC_LIBS - help - Elementary is a widget toolkit and EFL wrapper and convenience - library to make it easy to build applications and tools with UIs - with less code. - - https://enlightenment.org - -comment "elementary needs a toolchain w/ threads, dynamic library" - depends on BR2_PACKAGE_EFL - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/elementary/elementary.hash b/package/elementary/elementary.hash deleted file mode 100644 index f173752a2f..0000000000 --- a/package/elementary/elementary.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://download.enlightenment.org/rel/libs/elementary/elementary-1.17.1.tar.xz.sha256 -sha256 85e116a453a8ac23da878670534c6292832756d2f3a33603278486f309963d91 elementary-1.17.1.tar.xz diff --git a/package/elementary/elementary.mk b/package/elementary/elementary.mk deleted file mode 100644 index e686647aee..0000000000 --- a/package/elementary/elementary.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# elementary -# -################################################################################ - -ELEMENTARY_VERSION = 1.17.1 -ELEMENTARY_SOURCE = elementary-$(ELEMENTARY_VERSION).tar.xz -ELEMENTARY_SITE = http://download.enlightenment.org/rel/libs/elementary -ELEMENTARY_LICENSE = LGPLv2.1 -ELEMENTARY_LICENSE_FILES = COPYING - -# 0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch -ELEMENTARY_AUTORECONF = YES -ELEMENTARY_GETTEXTIZE = YES - -ELEMENTARY_INSTALL_STAGING = YES - -ELEMENTARY_DEPENDENCIES = host-pkgconf host-efl host-elementary efl - -ELEMENTARY_CONF_OPTS = \ - --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ - --with-eet-eet=$(HOST_DIR)/usr/bin/eet \ - --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \ - --with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \ - --with-elementary-codegen=$(HOST_DIR)/usr/bin/elementary_codegen \ - --with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \ - --with-doxygen=no \ - --disable-elementary-test - -# We need a host package in order to provide elm_prefs_cc and -# elementary_codegen. -HOST_ELEMENTARY_DEPENDENCIES = host-pkgconf host-efl -HOST_ELEMENTARY_CONF_OPTS = \ - --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ - --with-eet-eet=$(HOST_DIR)/usr/bin/eet \ - --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \ - --with-doxygen=no \ - --disable-elementary-test - -# Use Eolian C++ parser only if enabled in the efl stack. -ifeq ($(BR2_PACKAGE_EFL_EOLIAN_CPP),y) -ELEMENTARY_CONF_OPTS += --with-eolian-cxx=$(HOST_DIR)/usr/bin/eolian_cxx -HOST_ELEMENTARY_CONF_OPTS += --with-eolian-cxx=$(HOST_DIR)/usr/bin/eolian_cxx -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) From 0e51731760788d068339a32d1601232782c2bb0d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 2 Sep 2016 22:31:32 +0200 Subject: [PATCH 0151/3392] package/libevas-generic-loaders: remove package libevas-generic-loaders package is not used anymore, remove it. Add a legacy entry. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 8 ++++ package/Config.in | 1 - package/libevas-generic-loaders/Config.in | 41 ------------------- .../libevas-generic-loaders.hash | 2 - .../libevas-generic-loaders.mk | 38 ----------------- 5 files changed, 8 insertions(+), 82 deletions(-) delete mode 100644 package/libevas-generic-loaders/Config.in delete mode 100644 package/libevas-generic-loaders/libevas-generic-loaders.hash delete mode 100644 package/libevas-generic-loaders/libevas-generic-loaders.mk diff --git a/Config.in.legacy b/Config.in.legacy index c76aeb1c10..60d414bea6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS + bool "libevas-generic-loaders package removed" + select BR2_LEGACY + select BR2_PACKAGE_EFL + help + With EFL 1.18, libevas-generic-loaders is now provided by the efl + package. + config BR2_PACKAGE_ELEMENTARY bool "elementary package removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 2acc73956f..add6052c5e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -954,7 +954,6 @@ menu "Graphics" source "package/libdri2/Config.in" source "package/libdrm/Config.in" source "package/libepoxy/Config.in" - source "package/libevas-generic-loaders/Config.in" source "package/libexif/Config.in" source "package/libfm/Config.in" source "package/libfm-extra/Config.in" diff --git a/package/libevas-generic-loaders/Config.in b/package/libevas-generic-loaders/Config.in deleted file mode 100644 index c171d47193..0000000000 --- a/package/libevas-generic-loaders/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS - bool "libevas generic loaders" - depends on BR2_PACKAGE_EFL - select BR2_PACKAGE_ZLIB - help - These are additional "generic" loaders for Evas that are - stand-alone executables that evas may run from its generic - loader module. - - https://www.enlightenment.org/ - -if BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS - -config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_LIBRAW - bool "libraw loader" - depends on BR2_INSTALL_LIBSTDCPP # libraw - select BR2_PACKAGE_LIBRAW - help - This option enables the Evas generic Libraw loader - -comment "libraw loader needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG - bool "SVG loader" - depends on BR2_USE_MMU # librsvg -> glib2 - depends on BR2_USE_WCHAR # librsvg -> glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2 - depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz - select BR2_PACKAGE_LIBRSVG - select BR2_PACKAGE_CAIRO - help - This option enables the Evas generic SVG loader - -comment "SVG loader needs a toolchain w/ wchar, threads, C++" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP - -endif diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.hash b/package/libevas-generic-loaders/libevas-generic-loaders.hash deleted file mode 100644 index ee2ae9bb51..0000000000 --- a/package/libevas-generic-loaders/libevas-generic-loaders.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://download.enlightenment.org/rel/libs/evas_generic_loaders/evas_generic_loaders-1.17.0.tar.xz.sha256 -sha256 c2f5193a9326532d3ab3ff76f547b9d17b33ae7221ce4d6e0aefb905ba0dd87a evas_generic_loaders-1.17.0.tar.xz diff --git a/package/libevas-generic-loaders/libevas-generic-loaders.mk b/package/libevas-generic-loaders/libevas-generic-loaders.mk deleted file mode 100644 index abc436b9de..0000000000 --- a/package/libevas-generic-loaders/libevas-generic-loaders.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# libevas-generic-loaders -# -################################################################################ - -LIBEVAS_GENERIC_LOADERS_VERSION = 1.17.0 -LIBEVAS_GENERIC_LOADERS_SOURCE = evas_generic_loaders-$(LIBEVAS_GENERIC_LOADERS_VERSION).tar.xz -LIBEVAS_GENERIC_LOADERS_SITE = http://download.enlightenment.org/rel/libs/evas_generic_loaders -LIBEVAS_GENERIC_LOADERS_LICENSE = GPLv2 -LIBEVAS_GENERIC_LOADERS_LICENSE_FILES = COPYING - -LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES - -LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = host-pkgconf efl zlib - -# poppler >= 0.32 is not supported by the current version of -# libevas-generic-loaders. -LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \ - --disable-poppler \ - --disable-spectre \ - --disable-gstreamer - -ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_LIBRAW),y) -LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += libraw -LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --enable-libraw -else -LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --disable-libraw -endif - -ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG),y) -LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += librsvg cairo -LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --enable-svg -else -LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --disable-svg -endif - -$(eval $(autotools-package)) From 7ae11c0ffd4605516769cdeaab9fce1a0b400a02 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 2 Sep 2016 22:31:33 +0200 Subject: [PATCH 0152/3392] package/expedite: bump to lastest commit expedite from 1.15 branch doesn't build anymore with efl 1.18 due to API changes. Since there is no new release or 1.18 scpecific branch, use the latest commit. Add a hash file. Signed-off-by: Romain Naour [Thomas: fix hash file.] Signed-off-by: Thomas Petazzoni --- package/expedite/expedite.hash | 2 ++ package/expedite/expedite.mk | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 package/expedite/expedite.hash diff --git a/package/expedite/expedite.hash b/package/expedite/expedite.hash new file mode 100644 index 0000000000..85c4444eb6 --- /dev/null +++ b/package/expedite/expedite.hash @@ -0,0 +1,2 @@ +# locally computed +sha256 a8690a714c16d6b67e7fd6d70973e9805c3569a9131900b1feaf183220496831 expedite-ffa005ea3de26b4219f32c285cb1665bb1366163.tar.gz diff --git a/package/expedite/expedite.mk b/package/expedite/expedite.mk index 8754dc0da7..0b2901d80d 100644 --- a/package/expedite/expedite.mk +++ b/package/expedite/expedite.mk @@ -4,8 +4,7 @@ # ################################################################################ -# efl-1.15 branch -EXPEDITE_VERSION = 3ce8b3f1451700f9a2da60c2e717c644220e2449 +EXPEDITE_VERSION = ffa005ea3de26b4219f32c285cb1665bb1366163 EXPEDITE_SITE = http://git.enlightenment.org/tools/expedite.git EXPEDITE_SITE_METHOD = git EXPEDITE_LICENSE = BSD-2c From cbd0aee306bc0757ff54b7887406c86b8c0fd23c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 2 Sep 2016 22:31:34 +0200 Subject: [PATCH 0153/3392] package/enlightenment: bump to v0.21.2 Remove upstream patch. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...-only-when-Wayland-support-is-enable.patch | 39 ------------------- package/enlightenment/enlightenment.hash | 4 +- package/enlightenment/enlightenment.mk | 2 +- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 package/enlightenment/0001-E-include-uuid.h-only-when-Wayland-support-is-enable.patch diff --git a/package/enlightenment/0001-E-include-uuid.h-only-when-Wayland-support-is-enable.patch b/package/enlightenment/0001-E-include-uuid.h-only-when-Wayland-support-is-enable.patch deleted file mode 100644 index 3f33fa3286..0000000000 --- a/package/enlightenment/0001-E-include-uuid.h-only-when-Wayland-support-is-enable.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 368c4c7cc5722b2edfe98fb3a8999f8f01bc9b56 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 5 Aug 2016 21:14:46 +0200 -Subject: [PATCH] E: include uuid.h only when Wayland support is enabled. - -libuuid is checked only when Wayland support is enabled and -uuid_t uuid is guarded by HAVE_WAYLAND. - -So move include uuid.h below a HAVE_WAYLAND. - -Signed-off-by: Romain Naour ---- - src/bin/e_pixmap.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c -index 2bd94a7..0b01473 100644 ---- a/src/bin/e_pixmap.c -+++ b/src/bin/e_pixmap.c -@@ -2,6 +2,7 @@ - - #ifdef HAVE_WAYLAND - # include "e_comp_wl.h" -+# include - # ifndef EGL_TEXTURE_FORMAT - # define EGL_TEXTURE_FORMAT 0x3080 - # endif -@@ -13,8 +14,6 @@ - # include "e_comp_x.h" - #endif - --#include -- - static Eina_Hash *pixmaps[2] = {NULL}; - static Eina_Hash *aliases[2] = {NULL}; - --- -2.5.5 - diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index ecfe537893..8abbd963ba 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,2 +1,2 @@ -# From https://www.enlightenment.org/news/e-0.20.10-release -sha256 59fd447d120d91d18958a31a5827f97842cc472f2e22f132b2c7d4d208944baf enlightenment-0.20.10.tar.xz +# From https://www.enlightenment.org/news/e-0.21.2-release +sha256 a877645dc70aee71141013888863b69a1029f575f685e285b570db7c736f253a enlightenment-0.21.2.tar.xz diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 34c4f21a04..a86fb86942 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.20.10 +ENLIGHTENMENT_VERSION = 0.21.2 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2c From d0bbbe5c9ed8564965101b5980b04ec8ba2e5432 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 2 Sep 2016 22:31:35 +0200 Subject: [PATCH 0154/3392] package/enlightenment: set eldbus-codegen path Otherwise the one from the host may be used. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/enlightenment/enlightenment.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index a86fb86942..d77421f44a 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -19,6 +19,7 @@ ENLIGHTENMENT_DEPENDENCIES = \ ENLIGHTENMENT_CONF_OPTS = \ --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ --with-eet-eet=$(HOST_DIR)/usr/bin/eet \ + --with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \ --disable-pam \ --disable-rpath From c6c83d17beda67efffef52f8558f7367f3b32000 Mon Sep 17 00:00:00 2001 From: Judd Meinders Date: Tue, 30 Aug 2016 16:21:59 -0500 Subject: [PATCH 0155/3392] audit: add powerpc64 arch support Signed-off-by: Judd Meinders Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni --- package/audit/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/audit/Config.in b/package/audit/Config.in index df5a5cc877..7550f3a6cd 100644 --- a/package/audit/Config.in +++ b/package/audit/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_AUDIT_ARCH_SUPPORTS bool default y if BR2_aarch64 || BR2_arm || BR2_armeb || \ - BR2_i386 || BR2_powerpc || BR2_x86_64 + BR2_i386 || BR2_powerpc || BR2_powerpc64 || \ + BR2_x86_64 config BR2_PACKAGE_AUDIT bool "audit" From 5b33f15ff1467d4a09d36e240d604abb67308873 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 5 Sep 2016 20:13:03 -0300 Subject: [PATCH 0156/3392] gst1-libav: bump to version 1.8.3 Now that we moved to ffmpeg 3.x the build and runtime (when patched) problems have gone away. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 227b92aa5a..46d48a956e 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.8.2.tar.xz.sha256sum -sha256 b5f3c7a27b39b5f5c2f0bfd546b0c655020faf6b38d27b64b346c43e5ebf687a gst-libav-1.8.2.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.8.3.tar.xz.sha256sum +sha256 9006a05990089f7155ee0e848042f6bb24e52ab1d0a59ff8d1b5d7e33001a495 gst-libav-1.8.3.tar.xz diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index bb78d98959..c535952b38 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.8.2 +GST1_LIBAV_VERSION = 1.8.3 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = http://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_CONF_OPTS = --with-system-libav From 76f2bd4a2139dc617306fe9d38692a7aaca90b7c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 5 Sep 2016 20:13:04 -0300 Subject: [PATCH 0157/3392] gstreamer1: switch URLs to https In order to avoid pointless redirects since they're 301. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- package/gstreamer1/gst1-validate/gst1-validate.mk | 2 +- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f008767661..4ca441656b 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -6,7 +6,7 @@ GST_OMX_VERSION = 1.2.0 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz -GST_OMX_SITE = http://gstreamer.freedesktop.org/src/gst-omx +GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx GST_OMX_LICENSE = LGPLv2.1 GST_OMX_LICENSE_FILES = COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index c535952b38..5706c64623 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -6,7 +6,7 @@ GST1_LIBAV_VERSION = 1.8.3 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz -GST1_LIBAV_SITE = http://gstreamer.freedesktop.org/src/gst-libav +GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_CONF_OPTS = --with-system-libav GST1_LIBAV_DEPENDENCIES = \ host-pkgconf ffmpeg gstreamer1 gst1-plugins-base \ diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ca2dbfa641..eb935bc290 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -6,7 +6,7 @@ GST1_PLUGINS_BAD_VERSION = 1.8.3 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz -GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad +GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB # Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 3416e94969..5a35897292 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -6,7 +6,7 @@ GST1_PLUGINS_BASE_VERSION = 1.8.3 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz -GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base +GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB GST1_PLUGINS_BASE_LICENSE = LGPLv2+, LGPLv2.1+ diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 05f2650ef1..b4bc2e474c 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -6,7 +6,7 @@ GST1_PLUGINS_GOOD_VERSION = 1.8.3 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz -GST1_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good +GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING GST1_PLUGINS_GOOD_LICENSE = LGPLv2.1+ diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 2e9891e9ff..4a67a73bce 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -6,7 +6,7 @@ GST1_PLUGINS_UGLY_VERSION = 1.8.3 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz -GST1_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly +GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING # GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled. GST1_PLUGINS_UGLY_LICENSE = LGPLv2.1+ diff --git a/package/gstreamer1/gst1-validate/gst1-validate.mk b/package/gstreamer1/gst1-validate/gst1-validate.mk index 72daa45aa0..372e5d6633 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.mk +++ b/package/gstreamer1/gst1-validate/gst1-validate.mk @@ -6,7 +6,7 @@ GST1_VALIDATE_VERSION = 1.8.3 GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz -GST1_VALIDATE_SITE = http://gstreamer.freedesktop.org/src/gst-validate +GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate GST1_VALIDATE_LICENSE = LGPLv2.1+ GST1_VALIDATE_LICENSE_FILES = COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 4036825548..d69c3e87cd 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -6,7 +6,7 @@ GSTREAMER1_VERSION = 1.8.3 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz -GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer +GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING GSTREAMER1_LICENSE = LGPLv2+, LGPLv2.1+ From 1767dcf8d15eec58c8e07654a5d63827f3edb100 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 6 Sep 2016 22:14:14 +0200 Subject: [PATCH 0158/3392] libevdev: bump version to 1.5.4 For details see [1] and [2]. [1] https://lists.freedesktop.org/archives/input-tools/2016-August/001324.html [2] https://lists.freedesktop.org/archives/input-tools/2016-August/001327.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- 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 a2074f877e..a2a5cd8acb 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,2 +1,2 @@ -# Hash from https://lists.freedesktop.org/archives/input-tools/2016-June/001307.html -sha256 5ee2163656a61f5703cb5c08a05c9471ffb7b640bfbe2c55194ea50d908f629b libevdev-1.5.2.tar.xz +# Hash from https://lists.freedesktop.org/archives/input-tools/2016-August/001327.html +sha256 11fe76d62cc76fbc9dbf8e94696a80eee63780139161e5cf54c55ec21a8173a4 libevdev-1.5.4.tar.xz diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index 3f2bbd4f96..ef660c77b0 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.5.2 +LIBEVDEV_VERSION = 1.5.4 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = X11 From ae56ad666f2af2382d532d1db4ad7e1961cfe2a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Sep 2016 17:31:17 +0200 Subject: [PATCH 0159/3392] package/freerdp: fix typo in x11 libs check Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/freerdp/freerdp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index e8e5be49b1..c3a3e55d05 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -111,7 +111,7 @@ endif # Xorg is enabled but neither the server nor the X client are, then # there's nothing that guarantees those two libs are enabled. So we # really must check for them. -ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBX11),yy) +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXEXT),yy) FREERDP_DEPENDENCIES += xlib_libX11 xlib_libXext FREERDP_CONF_OPTS += -DWITH_X11=ON else From 14051a6344f3ea20dcde148955dd9581295d64d0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 6 Sep 2016 09:51:07 +0200 Subject: [PATCH 0160/3392] domoticz: bump to version 87286ee (beta) This version includes the patch on execinfo (commit 775da272719b52bca37b44a40e935a1eb9d10466) so remove the 0001-add-proper-check-for-detecting-header-execinfo.h.patch file This version also fixes arc and musl build (ambiguous call to abs and missing linux/ioctl header): http://autobuild.buildroot.net/results/b5406ca587592a3bac446d1f1df93d3eb45b96a9 fixed by commit 331cd7d6eef6f9f2658b91e662644d88c31eaf64 http://autobuild.buildroot.net/results/62ec0d348153dff0efd4c1975a9198c17f01f1fa fixed by commit 6ea21db228124565466bf16b0400d40a5eaad30d Due to DOS line endings, it is easier to reference this beta release than converting git patches. The stable release should be released in the first week of October. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...heck-for-detecting-header-execinfo.h.patch | 58 ------------------- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 package/domoticz/0001-add-proper-check-for-detecting-header-execinfo.h.patch diff --git a/package/domoticz/0001-add-proper-check-for-detecting-header-execinfo.h.patch b/package/domoticz/0001-add-proper-check-for-detecting-header-execinfo.h.patch deleted file mode 100644 index 55bbb7dc99..0000000000 --- a/package/domoticz/0001-add-proper-check-for-detecting-header-execinfo.h.patch +++ /dev/null @@ -1,58 +0,0 @@ -From f0da50118f7bd01ed7fa97e75b790a8232d8d4dc Mon Sep 17 00:00:00 2001 -From: Rahul Bedarkar -Date: Thu, 25 Aug 2016 17:23:38 +0530 -Subject: [PATCH] add proper check for detecting header - -domoticz.cpp currently assumes that on GNU/Linux systems header - is available. But that is not true. Since it provided by -C library and uClibc can be built without backtrace support. And in -such cases we get following build error. - - domoticz-3.4834/main/domoticz.cpp:48:22: fatal error: execinfo.h: No such file or directory - #include - ^ - compilation terminated. - -Instead of depending on __gnu_linux__, add check for detecting -presence of and guard code for dumpstack accordingly. - -This build failure is detected by Buildroot autobuilder. -http://autobuild.buildroot.net/results/393/393f839e160b51ca12ac36058718ad2f0c1b50a6/ - -Signed-off-by: Rahul Bedarkar ---- - CMakeLists.txt | 7 +++++++ - main/domoticz.cpp | 2 +- - 2 files changed, 8 insertions(+), 1 deletion(-) - -Index: b/CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,6 +61,13 @@ - "Where to put the executables for Domoticz" - ) - -+INCLUDE(CheckIncludeFiles) -+CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H) -+ -+IF(HAVE_EXECINFO_H) -+ ADD_DEFINITIONS(-DHAVE_EXECINFO_H) -+ENDIF(HAVE_EXECINFO_H) -+ - #set(CMAKE_EXE_LINKER_FLAGS "-static") - - # Macro for setting up precompiled headers. Usage: -Index: b/main/domoticz.cpp -=================================================================== ---- a/main/domoticz.cpp -+++ b/main/domoticz.cpp -@@ -44,7 +44,7 @@ - #include - #endif - --#ifdef __gnu_linux__ -+#ifdef HAVE_EXECINFO_H - #include - static void dumpstack(void) { - // Notes : diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 9180a9b159..b56bb95b7e 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 02b4cdde8e376258aeae3d5621edf8bb6b3563c34282e50194db343fcec9c0f5 domoticz-3.4834.tar.gz +sha256 f5eaa8db192c314374deb8d58471f3a338da1397be635ebaa4b1a5f664450b05 domoticz-87286ee76ad15420c52689f1e4eeeab56fb04d40.tar.gz diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index adcf06172e..aceae2d3d2 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 3.4834 +DOMOTICZ_VERSION = 87286ee76ad15420c52689f1e4eeeab56fb04d40 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPLv3 DOMOTICZ_LICENSE_FILES = License.txt From fc8cac962baf5668dbc623ae5d411b75f77d3384 Mon Sep 17 00:00:00 2001 From: Padraig James Connolly Date: Tue, 6 Sep 2016 16:23:35 +0100 Subject: [PATCH 0161/3392] configs/galileo: update to 3.14 kernel This commit updates the kernel for Galileo board BSP from 3.8 to 3.14. Signed-off-by: Padraig Connolly Signed-off-by: Thomas Petazzoni --- .../{linux-3.8.config => linux-3.14.config} | 97 ++++++++++--------- configs/galileo_defconfig | 10 +- 2 files changed, 54 insertions(+), 53 deletions(-) rename board/intel/galileo/{linux-3.8.config => linux-3.14.config} (86%) diff --git a/board/intel/galileo/linux-3.8.config b/board/intel/galileo/linux-3.14.config similarity index 86% rename from board/intel/galileo/linux-3.8.config rename to board/intel/galileo/linux-3.14.config index 961f0f8864..58564da9ec 100644 --- a/board/intel/galileo/linux-3.8.config +++ b/board/intel/galileo/linux-3.14.config @@ -1,9 +1,9 @@ -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_FHANDLE=y +CONFIG_KERNEL_LZMA=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_BSD_PROCESS_ACCT=y @@ -22,7 +22,6 @@ 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 @@ -32,16 +31,15 @@ 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_X86_INTEL_QUARK=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_16BIT is not set CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=y CONFIG_X86_MSR=y @@ -56,7 +54,7 @@ CONFIG_EFI_CAPSULE=m CONFIG_HZ_100=y CONFIG_KEXEC=y CONFIG_PHYSICAL_START=0x400000 -# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x1000000 # CONFIG_COMPAT_VDSO is not set CONFIG_PM_RUNTIME=y CONFIG_PM_DEBUG=y @@ -64,7 +62,6 @@ 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 @@ -79,11 +76,12 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_SYN_COOKIES=y # CONFIG_IPV6_SIT is not set +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_CAN=m -CONFIG_CAN_RAW=m -CONFIG_CAN_BCM=m +# CONFIG_CAN_GW is not set CONFIG_CAN_J1939=m CONFIG_CAN_VCAN=m CONFIG_CAN_SLCAN=m @@ -96,20 +94,18 @@ 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_MAC80211_LEDS=y CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_DEBUG_DEVRES=y CONFIG_MTD=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_M25P80=y +CONFIG_MTD_BLOCK=m # CONFIG_PNP_DEBUG_MESSAGES is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=2 @@ -117,6 +113,7 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=1 CONFIG_BLK_DEV_RAM_SIZE=81920 CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_93CX6=m CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=y @@ -124,10 +121,12 @@ CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_SPI_ATTRS=y # CONFIG_SCSI_LOWLEVEL is not set CONFIG_NETDEVICES=y +CONFIG_TUN=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_ARC is not set # CONFIG_NET_VENDOR_ATHEROS is not set # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_BROCADE is not set @@ -138,7 +137,6 @@ CONFIG_NETDEVICES=y # 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 @@ -156,19 +154,19 @@ CONFIG_E1000=m # 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_ETH=m # CONFIG_STMMAC_PLATFORM is not set -CONFIG_STMMAC_PCI=y -CONFIG_STMMAC_DA=y +CONFIG_STMMAC_PCI=m # 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_PHYLIB=y CONFIG_PPP=m CONFIG_PPP_DEFLATE=m CONFIG_PPP_ASYNC=m -CONFIG_IWLWIFI=m +# CONFIG_RTL_CARDS is not set # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_KEYBOARD is not set @@ -189,41 +187,41 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_SC16IS7XX=m +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_HW_RANDOM is not set CONFIG_HPET=y # CONFIG_HPET_MMAP is not set -CONFIG_I2C_CHARDEV=y +CONFIG_I2C=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_PTP_1588_CLOCK=y +CONFIG_GPIO_SCH=y +CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y -# CONFIG_HWMON is not set +CONFIG_GPIO_PCF857X=y +CONFIG_HWMON=m +CONFIG_SENSORS_LM75=m +# CONFIG_X86_PKG_TEMP_THERMAL 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_DEFAULT_PERSIST is not set CONFIG_USB_EHCI_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m @@ -237,40 +235,44 @@ 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_SERIAL=y 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_NEW_LEDS=y +CONFIG_LEDS_CLASS=m CONFIG_RTC_CLASS=y +# CONFIG_RTC_SYSTOHC is not set 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_INTEL_QRK_ESRAM=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y CONFIG_IIO_BUFFER_CB=y CONFIG_IIO_LIS331DLH_INTEL_QRK=y +CONFIG_IIO_ST_ACCEL_3AXIS=y CONFIG_AD7298=m CONFIG_ADC1x8S102=m +CONFIG_IIO_SYSFS_TRIGGER=m +CONFIG_IIO_HRTIMER_TRIGGER=m CONFIG_PWM=y -CONFIG_EFI_VARS=m CONFIG_DMI_SYSFS=y +CONFIG_EFI_VARS=m +# CONFIG_EFI_RUNTIME_MAP is not set +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=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 @@ -285,23 +287,22 @@ 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_MAGIC_SYSRQ=y CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_FTRACE is not set CONFIG_DEBUG_STACKOVERFLOW=y +CONFIG_TIMER_STATS=y +CONFIG_LATENCYTOP=y +# CONFIG_FTRACE is not set 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 +CONFIG_CRC_T10DIF=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 9334266b1e..4f63c230cd 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,6 +1,6 @@ BR2_x86_x1000=y -# Linux headers same as kernel, a 3.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8=y +# Linux headers same as kernel, a 3.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=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 @@ -11,10 +11,10 @@ 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_CUSTOM_REPO_URL="https://github.com/padraigconnolly/Linux-x1000.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ceeb288e39a4ba10643dec9ffb91baabf313f7d1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/intel/galileo/linux-3.8.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/intel/galileo/linux-3.14.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y From 0cd962b3bcb842985369cb276e6cba0f8b15289c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 31 Aug 2016 18:29:54 +0200 Subject: [PATCH 0162/3392] gtest: retrieve package from github https://googletest.googlecode.com/files is no more available, so update gtest.mk and gtest.hash to retrieve googletest source code as a tar.gz (and not a zip) from github as https://googletest.googlecode.com is now a redirection to https://github.com/google/googletest. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gtest/gtest.hash | 4 ++-- package/gtest/gtest.mk | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index 8ff79cb0d6..79e31e466d 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,2 +1,2 @@ -# From http://code.google.com/p/googletest/downloads/detail?name=gtest-1.7.0.zip&can=2&q= -sha1 f85f6d2481e2c6c4a18539e391aa4ea8ab0394af gtest-1.7.0.zip +# Locally computed: +sha256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc gtest-release-1.7.0.tar.gz diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 11aa7e9bae..eb30905c2a 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -5,9 +5,8 @@ ################################################################################ # Make sure this remains the same version as the gmock one -GTEST_VERSION = 1.7.0 -GTEST_SOURCE = gtest-$(GTEST_VERSION).zip -GTEST_SITE = http://googletest.googlecode.com/files +GTEST_VERSION = release-1.7.0 +GTEST_SITE = $(call github,google,googletest,$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO GTEST_LICENSE = BSD-3c @@ -22,10 +21,6 @@ GTEST_LICENSE_FILES = LICENSE # the gtest sources. GTEST_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF -define GTEST_EXTRACT_CMDS - $(UNZIP) $(DL_DIR)/$(GTEST_SOURCE) -d $(BUILD_DIR) -endef - define GTEST_INSTALL_STAGING_CMDS $(INSTALL) -D -m 0755 $(@D)/libgtest.a $(STAGING_DIR)/usr/lib/libgtest.a $(INSTALL) -D -m 0755 $(@D)/libgtest_main.a $(STAGING_DIR)/usr/lib/libgtest_main.a From 86dc25e2b6b19967363a04f38894154c69f4f245 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 6 Sep 2016 23:01:23 +0200 Subject: [PATCH 0163/3392] package/python-pillow: bump to version 3.3.1 This patch bumps python pillow to version 3.3.1 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index bf7828dbd0..fa6834ed7b 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,4 +1,4 @@ -# https://pypi.python.org/pypi?:action=show_md5&digest=b5a15b03bf402fe254636c015fcf04da -md5 b5a15b03bf402fe254636c015fcf04da Pillow-3.3.0.tar.gz +https://pypi.python.org/pypi?:action=show_md5&digest=3bc85204223b52e96ed05c9441507eed +md5 3bc85204223b52e96ed05c9441507eed Pillow-3.3.1.tar.gz # sha256 locally computed -sha256 031e7c9c885a4f343d1ad366c7fd2340449dc70318acb4a28d6411994f0accd1 Pillow-3.3.0.tar.gz +sha256 3491ca65d9fdba4db094ab3f8e17170425e7dd670e507921a665a1975d1b3df1 Pillow-3.3.1.tar.gz diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 619c55b865..9116e122f3 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 3.3.0 +PYTHON_PILLOW_VERSION = 3.3.1 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz -PYTHON_PILLOW_SITE = https://pypi.python.org/packages/e0/27/f61098a12f14690689924de93ffdd101463083a80bf8ff3e0c218addf05b +PYTHON_PILLOW_SITE = https://pypi.python.org/packages/7b/32/e6978aed8fba6398c00eec25f12798fb57647a6cef4f85db1567e3d086ef PYTHON_PILLOW_LICENSE = PIL Software License PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_SETUP_TYPE = setuptools From ea1e9e03442a5b375aa2214ba92e48ebba89070a Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Tue, 23 Aug 2016 18:54:48 +0200 Subject: [PATCH 0164/3392] package/php: switch from libmysqlclient to mysqlnd The Mysql Native Driver has been the default mysql driver since PHP 5.4, but buildroot was still using libmysqlclient. Mysqlnd has several advantages such as improved memory management and the more favorable PHP licensing terms. (can combine it with proprietary PHP extensions like Ioncube loader, while libmysqlclient requires commercial licensing if you link to it and do not fall under their GPL/FOSS license exception) Signed-off-by: Floris Bos Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/php/Config.ext | 12 ------------ package/php/php.mk | 6 ++---- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/package/php/Config.ext b/package/php/Config.ext index 82aaf41eb0..7c3ba7e8c4 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -113,10 +113,6 @@ endif config BR2_PACKAGE_PHP_EXT_MYSQLI bool "Mysqli" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # mysql - depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL help MySQL Improved extension support @@ -135,17 +131,9 @@ if BR2_PACKAGE_PHP_EXT_PDO config BR2_PACKAGE_PHP_EXT_PDO_MYSQL bool "MySQL" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # mysql - depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL help PDO driver for MySQL -comment "MySQL drivers need a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL bool "PostgreSQL" select BR2_PACKAGE_POSTGRESQL diff --git a/package/php/php.mk b/package/php/php.mk index d7e27a13dc..deaf56ef4f 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -181,8 +181,7 @@ endif ### Native SQL extensions ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y) -PHP_CONF_OPTS += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config -PHP_DEPENDENCIES += mysql +PHP_CONF_OPTS += --with-mysqli endif ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y) PHP_CONF_OPTS += --with-sqlite3=$(STAGING_DIR)/usr @@ -199,8 +198,7 @@ PHP_DEPENDENCIES += sqlite PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION endif ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y) -PHP_CONF_OPTS += --with-pdo-mysql=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += mysql +PHP_CONF_OPTS += --with-pdo-mysql endif ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL),y) PHP_CONF_OPTS += --with-pdo-pgsql=$(STAGING_DIR)/usr From 6ddb8b720c45eedcc4759e029c6b8f2e4d9aaf4a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Sep 2016 23:43:48 +0200 Subject: [PATCH 0165/3392] package/leveldb: bump version to 1.19 Rebased 0002-Add-install-recipe.patch Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/leveldb/0002-Add-install-recipe.patch | 8 ++++---- package/leveldb/leveldb.hash | 2 +- package/leveldb/leveldb.mk | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/leveldb/0002-Add-install-recipe.patch b/package/leveldb/0002-Add-install-recipe.patch index 38c2ca8d3d..8645a6464c 100644 --- a/package/leveldb/0002-Add-install-recipe.patch +++ b/package/leveldb/0002-Add-install-recipe.patch @@ -15,10 +15,10 @@ diff --git a/Makefile b/Makefile index 2bd2cad..530f2c3 100644 --- a/Makefile +++ b/Makefile -@@ -225,3 +225,19 @@ else - .c.o: - $(CC) $(CFLAGS) -c $< -o $@ - endif +@@ -412,3 +412,19 @@ else + + $(SHARED_OUTDIR)/%.o: %.c + $(CC) $(CFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@ + +INSTALL_ROOT = / +INSTALL_PREFIX= usr/local diff --git a/package/leveldb/leveldb.hash b/package/leveldb/leveldb.hash index 1f83e6e718..4af30fbe6f 100644 --- a/package/leveldb/leveldb.hash +++ b/package/leveldb/leveldb.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4aa1a7479bc567b95a59ac6fb79eba49f61884d6fd400f20b7af147d54c5cee5 leveldb-v1.18.tar.gz +sha256 7d7a14ae825e66aabeb156c1c3fae9f9a76d640ef6b40ede74cc73da937e5202 leveldb-v1.19.tar.gz diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk index e2c267b82b..2ce3e4ace4 100644 --- a/package/leveldb/leveldb.mk +++ b/package/leveldb/leveldb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEVELDB_VERSION = v1.18 +LEVELDB_VERSION = v1.19 LEVELDB_SITE = $(call github,google,leveldb,$(LEVELDB_VERSION)) LEVELDB_LICENSE = BSD-3c LEVELDB_LICENSE_FILES = LICENSE From b700157db40410907d6a07582eacbb5030fd919e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 5 Sep 2016 22:11:50 -0300 Subject: [PATCH 0166/3392] package/binutils: add binutils 2.27 And drop upstream patches. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/binutils/2.27/0120-sh-conf.patch | 46 +++ package/binutils/2.27/0300-ld-makefile.patch | 41 +++ .../2.27/0301-check-ldrunpath-length.patch | 36 +++ .../0500-add-sysroot-fix-from-bug-3049.patch | 52 +++ .../2.27/0600-poison-system-directories.patch | 306 ++++++++++++++++++ .../binutils/2.27/0905-bfin-rofixup-bug.patch | 21 ++ package/binutils/Config.in.host | 4 + package/binutils/binutils.hash | 1 + 8 files changed, 507 insertions(+) create mode 100644 package/binutils/2.27/0120-sh-conf.patch create mode 100644 package/binutils/2.27/0300-ld-makefile.patch create mode 100644 package/binutils/2.27/0301-check-ldrunpath-length.patch create mode 100644 package/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch create mode 100644 package/binutils/2.27/0600-poison-system-directories.patch create mode 100644 package/binutils/2.27/0905-bfin-rofixup-bug.patch diff --git a/package/binutils/2.27/0120-sh-conf.patch b/package/binutils/2.27/0120-sh-conf.patch new file mode 100644 index 0000000000..cc14ef4029 --- /dev/null +++ b/package/binutils/2.27/0120-sh-conf.patch @@ -0,0 +1,46 @@ +From 1ceee199e9a32034c6def7700fdbb26335ca76a3 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 34b66f7..905bc7b 100755 +--- a/configure ++++ b/configure +@@ -3939,7 +3939,7 @@ case "${target}" in + or1k*-*-*) + noconfigdirs="$noconfigdirs gdb" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 4977d97..1e69ee2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1276,7 +1276,7 @@ case "${target}" in + or1k*-*-*) + noconfigdirs="$noconfigdirs gdb" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.4.3 + diff --git a/package/binutils/2.27/0300-ld-makefile.patch b/package/binutils/2.27/0300-ld-makefile.patch new file mode 100644 index 0000000000..73cc098024 --- /dev/null +++ b/package/binutils/2.27/0300-ld-makefile.patch @@ -0,0 +1,41 @@ +From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:40:53 +0100 +Subject: [PATCH] ld-makefile + +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +--- + ld/Makefile.am | 2 +- + ld/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index 0b3b049..3871c74 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -57,7 +57,7 @@ endif + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +diff --git a/ld/Makefile.in b/ld/Makefile.in +index ed98f87..530e4c9 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include +-- +2.4.3 + diff --git a/package/binutils/2.27/0301-check-ldrunpath-length.patch b/package/binutils/2.27/0301-check-ldrunpath-length.patch new file mode 100644 index 0000000000..3b4c204c7f --- /dev/null +++ b/package/binutils/2.27/0301-check-ldrunpath-length.patch @@ -0,0 +1,36 @@ +From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:41:47 +0100 +Subject: [PATCH] check-ldrunpath-length + +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +--- + ld/emultempl/elf32.em | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em +index 0405d4f..efd3300 100644 +--- a/ld/emultempl/elf32.em ++++ b/ld/emultempl/elf32.em +@@ -1242,6 +1242,8 @@ fragment <link.next) + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) +-- +2.4.3 + diff --git a/package/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch b/package/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch new file mode 100644 index 0000000000..f67a43efdf --- /dev/null +++ b/package/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch @@ -0,0 +1,52 @@ +From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:42:48 +0100 +Subject: [PATCH] add sysroot fix from bug #3049 + +Always try to prepend the sysroot prefix to absolute filenames first. + +http://bugs.gentoo.org/275666 +http://sourceware.org/bugzilla/show_bug.cgi?id=10340 + +Signed-off-by: Sven Rebhan +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +--- + ld/ldfile.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 96f9ecc..1439309 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -335,18 +335,25 @@ ldfile_open_file_search (const char *arch, + directory first. */ + if (! entry->flags.maybe_archive) + { +- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) ++ /* For absolute pathnames, try to always open the file in the ++ sysroot first. If this fails, try to open the file at the ++ given location. */ ++ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); ++ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) ++ && ld_sysroot) + { + char *name = concat (ld_sysroot, entry->filename, + (const char *) NULL); + if (ldfile_try_open_bfd (name, entry)) + { + entry->filename = name; ++ entry->flags.sysrooted = TRUE; + return TRUE; + } + free (name); + } +- else if (ldfile_try_open_bfd (entry->filename, entry)) ++ ++ if (ldfile_try_open_bfd (entry->filename, entry)) + return TRUE; + + if (IS_ABSOLUTE_PATH (entry->filename)) +-- +2.4.3 + diff --git a/package/binutils/2.27/0600-poison-system-directories.patch b/package/binutils/2.27/0600-poison-system-directories.patch new file mode 100644 index 0000000000..d16994ec0c --- /dev/null +++ b/package/binutils/2.27/0600-poison-system-directories.patch @@ -0,0 +1,306 @@ +From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.26] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texinfo | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 276fb77..35c58eb 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -14,6 +14,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index a446283..d1f9504 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -786,6 +786,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1442,6 +1443,8 @@ Optional Features: + --disable-largefile omit support for large files + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15491,7 +15494,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 188172d..2cd8443 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index d84ec4e..3476b26 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -164,6 +164,14 @@ typedef struct { + /* If set, display the target memory usage (per memory region). */ + bfd_boolean print_memory_usage; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bfd_boolean poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bfd_boolean error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texinfo b/ld/ld.texinfo +index 1dd7492..fb1438e 100644 +--- a/ld/ld.texinfo ++++ b/ld/ld.texinfo +@@ -2332,6 +2332,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 1439309..086b354 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) + new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 6f11e7b..0ca3110 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -144,6 +144,8 @@ enum option_values + OPTION_PRINT_MEMORY_USAGE, + OPTION_REQUIRE_DEFINED_SYMBOL, + OPTION_ORPHAN_HANDLING, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index bb0b9cc..a23c56c 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -257,6 +257,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = TRUE; + command_line.warn_search_mismatch = TRUE; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = TRUE; ++ command_line.error_poison_system_directories = FALSE; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 4cad209..be7d584 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] = + { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, + '\0', N_("=MODE"), N_("Control how orphan sections are handled."), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = FALSE; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = TRUE; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = TRUE; ++ + while (ingroup) + { + lang_leave_group (); +-- +2.4.3 + diff --git a/package/binutils/2.27/0905-bfin-rofixup-bug.patch b/package/binutils/2.27/0905-bfin-rofixup-bug.patch new file mode 100644 index 0000000000..da9d586551 --- /dev/null +++ b/package/binutils/2.27/0905-bfin-rofixup-bug.patch @@ -0,0 +1,21 @@ +Fixes: LINKER BUG: .rofixup section size mismatch + +Workaround from adi-toolchain commit: +af414ec1fb628ddb1562f062f3db49823ca14ca2 +[#6798] binutils-2.21/bfd: temp workaround for rofixup mismatch errors. + +Signed-off-by: Waldemar Brodkorb + +diff -Nur binutils-2.26.1.orig/bfd/elf32-bfin.c binutils-2.26.1/bfd/elf32-bfin.c +--- binutils-2.26.1.orig/bfd/elf32-bfin.c 2015-11-13 09:27:40.000000000 +0100 ++++ binutils-2.26.1/bfd/elf32-bfin.c 2016-07-31 00:50:48.357995132 +0200 +@@ -4879,7 +4879,8 @@ + + case R_BFIN_FUNCDESC: + picrel->fd++; +- picrel->relocsfd++; ++ if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC) ++ picrel->relocsfd++; + break; + + /* This relocation describes the C++ object vtable hierarchy. diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 883032927e..6ef89a5a5c 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -24,6 +24,9 @@ choice config BR2_BINUTILS_VERSION_2_26_X bool "binutils 2.26.1" + config BR2_BINUTILS_VERSION_2_27_X + bool "binutils 2.27" + endchoice config BR2_BINUTILS_VERSION @@ -32,6 +35,7 @@ config BR2_BINUTILS_VERSION default "2.24" if BR2_BINUTILS_VERSION_2_24_X default "2.25.1" if BR2_BINUTILS_VERSION_2_25_X default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X + default "2.27" if BR2_BINUTILS_VERSION_2_27_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index aedb045d17..645bad1d7b 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -2,6 +2,7 @@ sha512 5ec95ad47d49b12c4558a8db0ca2109d3ee1955e3776057f3330c4506f8f4d1cf5e505fbf8a16b98403a0fcdeaaf986fe0a22be6456247dbdace63ce1f776b12 binutils-2.24.tar.bz2 sha512 0b36dda0e6d32cd25613c0e64b56b28312515c54d6a159efd3db9a86717f114ab0a0a1f69d08975084d55713ebaeab64e4085c9b3d1c3fa86712869f80eb954d binutils-2.25.1.tar.bz2 sha512 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322bb6cb2b45e8df812f0e8ac059149f8a1f69ba3ed9d86a35c6a540b67 binutils-2.26.1.tar.bz2 +sha512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb binutils-2.27.tar.bz2 # Locally calculated (fetched from Github) sha512 829e14152dbd18bad36d7e161bdde52e92e8b439ab9fbc18655172f0e2fae954885286e77ceaab9e13b68f3ca19506068c3b1808a2e88f12ad6674d421519b64 binutils-arc-2016.09-eng011.tar.gz From ac9b7ef51bfb3bd4d3bcdbc424cdcbc993c074ff Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 5 Sep 2016 22:12:10 -0300 Subject: [PATCH 0167/3392] gcc: bump 6.x series to 6.2.0 Adjust some patches to avoid patching the ChangeLog which isn't quite the same. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../{6.1.0 => 6.2.0}/100-uclibc-conf.patch | 0 .../301-missing-execinfo_h.patch | 0 .../810-arm-softfloat-libgcc.patch | 0 .../830-arm_unbreak_armv4t.patch | 0 .../gcc/{6.1.0 => 6.2.0}/860-cilk-wchar.patch | 0 .../890-fix-m68k-compile.patch | 0 .../891-fix-m68k-uclinux.patch | 0 ...mkmap-symver-support-skip_underscore.patch | 16 +-------------- ...in-use-the-generic-linker-version-in.patch | 20 +------------------ ...DWARF-compilation-with-FDPIC-targets.patch | 16 +-------------- .../940-uclinux-enable-threads.patch | 0 package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 ++-- 13 files changed, 6 insertions(+), 52 deletions(-) rename package/gcc/{6.1.0 => 6.2.0}/100-uclibc-conf.patch (100%) rename package/gcc/{6.1.0 => 6.2.0}/301-missing-execinfo_h.patch (100%) rename package/gcc/{6.1.0 => 6.2.0}/810-arm-softfloat-libgcc.patch (100%) rename package/gcc/{6.1.0 => 6.2.0}/830-arm_unbreak_armv4t.patch (100%) rename package/gcc/{6.1.0 => 6.2.0}/860-cilk-wchar.patch (100%) rename package/gcc/{6.1.0 => 6.2.0}/890-fix-m68k-compile.patch (100%) rename package/gcc/{6.1.0 => 6.2.0}/891-fix-m68k-uclinux.patch (100%) rename package/gcc/{6.1.0 => 6.2.0}/892-libgcc-mkmap-symver-support-skip_underscore.patch (83%) rename package/gcc/{6.1.0 => 6.2.0}/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch (98%) rename package/gcc/{6.1.0 => 6.2.0}/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch (82%) rename package/gcc/{6.1.0 => 6.2.0}/940-uclinux-enable-threads.patch (100%) diff --git a/package/gcc/6.1.0/100-uclibc-conf.patch b/package/gcc/6.2.0/100-uclibc-conf.patch similarity index 100% rename from package/gcc/6.1.0/100-uclibc-conf.patch rename to package/gcc/6.2.0/100-uclibc-conf.patch diff --git a/package/gcc/6.1.0/301-missing-execinfo_h.patch b/package/gcc/6.2.0/301-missing-execinfo_h.patch similarity index 100% rename from package/gcc/6.1.0/301-missing-execinfo_h.patch rename to package/gcc/6.2.0/301-missing-execinfo_h.patch diff --git a/package/gcc/6.1.0/810-arm-softfloat-libgcc.patch b/package/gcc/6.2.0/810-arm-softfloat-libgcc.patch similarity index 100% rename from package/gcc/6.1.0/810-arm-softfloat-libgcc.patch rename to package/gcc/6.2.0/810-arm-softfloat-libgcc.patch diff --git a/package/gcc/6.1.0/830-arm_unbreak_armv4t.patch b/package/gcc/6.2.0/830-arm_unbreak_armv4t.patch similarity index 100% rename from package/gcc/6.1.0/830-arm_unbreak_armv4t.patch rename to package/gcc/6.2.0/830-arm_unbreak_armv4t.patch diff --git a/package/gcc/6.1.0/860-cilk-wchar.patch b/package/gcc/6.2.0/860-cilk-wchar.patch similarity index 100% rename from package/gcc/6.1.0/860-cilk-wchar.patch rename to package/gcc/6.2.0/860-cilk-wchar.patch diff --git a/package/gcc/6.1.0/890-fix-m68k-compile.patch b/package/gcc/6.2.0/890-fix-m68k-compile.patch similarity index 100% rename from package/gcc/6.1.0/890-fix-m68k-compile.patch rename to package/gcc/6.2.0/890-fix-m68k-compile.patch diff --git a/package/gcc/6.1.0/891-fix-m68k-uclinux.patch b/package/gcc/6.2.0/891-fix-m68k-uclinux.patch similarity index 100% rename from package/gcc/6.1.0/891-fix-m68k-uclinux.patch rename to package/gcc/6.2.0/891-fix-m68k-uclinux.patch diff --git a/package/gcc/6.1.0/892-libgcc-mkmap-symver-support-skip_underscore.patch b/package/gcc/6.2.0/892-libgcc-mkmap-symver-support-skip_underscore.patch similarity index 83% rename from package/gcc/6.1.0/892-libgcc-mkmap-symver-support-skip_underscore.patch rename to package/gcc/6.2.0/892-libgcc-mkmap-symver-support-skip_underscore.patch index 1f779ed6f4..73ee6c5faa 100644 --- a/package/gcc/6.1.0/892-libgcc-mkmap-symver-support-skip_underscore.patch +++ b/package/gcc/6.2.0/892-libgcc-mkmap-symver-support-skip_underscore.patch @@ -35,23 +35,9 @@ version information for Blackfin, instead of using a custom one. Signed-off-by: Thomas Petazzoni --- - libgcc/ChangeLog | 5 +++++ libgcc/mkmap-symver.awk | 6 +++++- - 2 files changed, 10 insertions(+), 1 deletion(-) + 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog -index 6559564..129e43f 100644 ---- a/libgcc/ChangeLog -+++ b/libgcc/ChangeLog -@@ -1,3 +1,8 @@ -+2016-08-19 Thomas Petazzoni -+ -+ PR gcc/74748 -+ * libgcc/mkmap-symver.awk: add support for skip_underscore -+ - 2016-04-27 Release Manager - - * GCC 6.1.0 released. diff --git a/libgcc/mkmap-symver.awk b/libgcc/mkmap-symver.awk index 266832a..30bb179 100644 --- a/libgcc/mkmap-symver.awk diff --git a/package/gcc/6.1.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch b/package/gcc/6.2.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch similarity index 98% rename from package/gcc/6.1.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch rename to package/gcc/6.2.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch index 8db50b589f..454295d0ed 100644 --- a/package/gcc/6.1.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch +++ b/package/gcc/6.2.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch @@ -22,28 +22,10 @@ symbols in libgcc, and therefore all libgcc symbols were marked as Signed-off-by: Thomas Petazzoni --- - libgcc/ChangeLog | 6 + libgcc/config/bfin/libgcc-glibc.ver | 1894 +---------------------------------- libgcc/config/bfin/t-linux | 3 +- - 3 files changed, 10 insertions(+), 1893 deletions(-) + 2 files changed, 4 insertions(+), 1893 deletions(-) -diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog -index 129e43f..36c0194 100644 ---- a/libgcc/ChangeLog -+++ b/libgcc/ChangeLog -@@ -1,6 +1,12 @@ - 2016-08-19 Thomas Petazzoni - - PR gcc/74748 -+ * libgcc/config/bfin/libgcc-glibc.ver, libgcc/config/bfin/t-linux: -+ use generic linker version information on Blackfin. -+ -+2016-08-19 Thomas Petazzoni -+ -+ PR gcc/74748 - * libgcc/mkmap-symver.awk: add support for skip_underscore - - 2016-04-27 Release Manager diff --git a/libgcc/config/bfin/libgcc-glibc.ver b/libgcc/config/bfin/libgcc-glibc.ver index b1bd2df..2af3df7 100644 --- a/libgcc/config/bfin/libgcc-glibc.ver diff --git a/package/gcc/6.1.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch b/package/gcc/6.2.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch similarity index 82% rename from package/gcc/6.1.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch rename to package/gcc/6.2.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch index cf3f2b8595..ce49de7ee9 100644 --- a/package/gcc/6.1.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch +++ b/package/gcc/6.2.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch @@ -17,23 +17,9 @@ Fixes PR gcc/68468. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- - libgcc/ChangeLog | 5 +++++ libgcc/unwind-dw2-fde-dip.c | 8 ++++++-- - 2 files changed, 11 insertions(+), 2 deletions(-) + 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog -index 36c0194..2e78d20 100644 ---- a/libgcc/ChangeLog -+++ b/libgcc/ChangeLog -@@ -1,3 +1,8 @@ -+2016-08-19 Waldemar Brodkorb -+ -+ PR gcc/68468 -+ * libgcc/unwind-dw2-fde-dip.c: fix build on FDPIC targets. -+ - 2016-08-19 Thomas Petazzoni - - PR gcc/74748 diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c index f7a1c3f..801bce8 100644 --- a/libgcc/unwind-dw2-fde-dip.c diff --git a/package/gcc/6.1.0/940-uclinux-enable-threads.patch b/package/gcc/6.2.0/940-uclinux-enable-threads.patch similarity index 100% rename from package/gcc/6.1.0/940-uclinux-enable-threads.patch rename to package/gcc/6.2.0/940-uclinux-enable-threads.patch diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 0e2c1a7cdb..d470710542 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -120,7 +120,7 @@ config BR2_GCC_VERSION default "4.8.5" if BR2_GCC_VERSION_4_8_X default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.4.0" if BR2_GCC_VERSION_5_X - default "6.1.0" if BR2_GCC_VERSION_6_X + default "6.2.0" if BR2_GCC_VERSION_6_X default "arc-2016.09-eng011" if BR2_GCC_VERSION_4_8_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index a18d1dd9be..e55adf0b7c 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -8,8 +8,8 @@ sha512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbc sha512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe gcc-4.9.4.tar.bz2 # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.4.0/sha512.sum sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b gcc-5.4.0.tar.bz2 -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.1.0/sha512.sum -sha512 eeed3e2018b8c012aabce419e8d718fde701e5c3c179b4486c61ba46e5736eecc8fccdd18b01fcd973a42c6ad3116dbbe2ee247fe3757d622d373f93ebaf8d2e gcc-6.1.0.tar.bz2 +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.2.0/sha512.sum +sha512 1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a83ce1cd4cdd2d1cb0b3e3c34e9b7ae1b2ab83dfc649ee817ab05247c76198 gcc-6.2.0.tar.bz2 # Locally calculated (fetched from Github) sha512 5fa11058adc0fc3d33bb860151660101bc20c7147cd92bc235057cd722e7fdb923ac0bdf27b09499b8587abb0c420867229bd782bc10bee0c76116c099b5a76c gcc-arc-2016.09-eng011.tar.gz From e38f19a21d5675560224ac8632242964ae03825c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 7 Sep 2016 10:11:52 +0100 Subject: [PATCH 0168/3392] linux-headers: bump 4.7.x series to 4.7.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 939a20a964..9d8f030bab 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -249,5 +249,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.4.19" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 - default "4.7.2" if BR2_KERNEL_HEADERS_4_7 + default "4.7.3" if BR2_KERNEL_HEADERS_4_7 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 0e855d8b8fab5511f7c61ecd97ae22299d3e7c58 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 7 Sep 2016 10:11:53 +0100 Subject: [PATCH 0169/3392] linux: bump default to version 4.7.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 43d63c0cd0..4b701a4a91 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.7.2)" + bool "Latest version (4.7.3)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.7.2" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.7.3" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 1cd3e4bf8a09c322f91cdb955017bf1a78c579c9 Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Wed, 7 Sep 2016 11:02:03 +0200 Subject: [PATCH 0170/3392] libpng: bump to version 1.6.25 1.6.23 tarballs have moved so, while we are at modifying libpng.mk, bump to 1.6.25. [Peter: add back upstream sha1 hash] Signed-off-by: Julien BOIBESSOT Signed-off-by: Peter Korsgaard --- .../libpng/0001-Disable-pngfix-and-png-fix-itxt.patch | 5 ++++- ...append-prefix-to-symbol-names-in-version-script.patch | 9 ++++++--- package/libpng/libpng.hash | 7 ++++--- package/libpng/libpng.mk | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch index 30c3623e43..d232e4d62f 100644 --- a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch +++ b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch @@ -7,6 +7,9 @@ Disable the new pngfix and png-fix-itxt tools: they take up space, fail to build on some oddball toolchain configurations and aren't expected/needed in a non-interactive embedded system. +[Julien: update for 1.6.25] +Signed-off-by: Julien Boibessot + Signed-off-by: Gustavo Zacarias --- Makefile.am | 2 +- @@ -32,7 +35,7 @@ index a66f6aa..4e67782 100644 +++ b/Makefile.in @@ -104,7 +104,7 @@ check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \ pngstest$(EXEEXT) pngvalid$(EXEEXT) pngimage$(EXEEXT) \ - $(am__EXEEXT_1) + pngcp$(EXEEXT) $(am__EXEEXT_1) @HAVE_CLOCK_GETTIME_TRUE@am__append_1 = timepng -bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT) +bin_PROGRAMS = diff --git a/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch b/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch index 0754e21381..2a9bfd1e1d 100644 --- a/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch +++ b/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch @@ -12,6 +12,9 @@ Original patch by: Sonic Zhang [Gustavo: update for 1.6.22] Signed-off-by: Gustavo Zacarias +[Julien: update for 1.6.25] +Signed-off-by: Julien Boibessot + Signed-off-by: Gustavo Zacarias --- Makefile.am | 2 +- @@ -22,7 +25,7 @@ diff --git a/Makefile.am b/Makefile.am index 3430dca..db6a7a2 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -236,7 +236,7 @@ contrib/tools/pngfix.o: pnglibconf.h +@@ -245,7 +245,7 @@ contrib/tools/pngfix.o: pnglibconf.h # interfering with the symbol file format. SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\ -DPNGLIB_VERSION='@PNGLIB_VERSION@'\ @@ -35,13 +38,13 @@ diff --git a/Makefile.in b/Makefile.in index 4e67782..5f468d9 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -754,7 +754,7 @@ SUFFIXES = .chk .out +@@ -766,7 +766,7 @@ SUFFIXES = .chk .out # interfering with the symbol file format. SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0' \ -DPNGLIB_VERSION='@PNGLIB_VERSION@' \ - -DSYMBOL_PREFIX='$(SYMBOL_PREFIX)' -DPNG_NO_USE_READ_MACROS \ + -DSYMBOL_PREFIX='' -DPNG_NO_USE_READ_MACROS \ - -DPNG_BUILDING_SYMBOL_TABLE $(am__append_6) + -DPNG_BUILDING_SYMBOL_TABLE $(am__append_7) # EXT_LIST is a list of the possibly library directory extensions, this exists -- diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index 04e8e40e3b..cc4bde2887 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,3 +1,4 @@ -# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.23/ -md5 9b320a05ed4db1f3f0865c8a951fd9aa libpng-1.6.23.tar.xz -sha1 4857fb8dbd5ca7ddacc40c183e340b9ffa34a097 libpng-1.6.23.tar.xz +# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.25/ +sha1 fb471b7732d886b5adf10b4d689a90c88f005aa5 libpng-1.6.25.tar.xz +# Locally computed: +sha256 09fe8d8341e8bfcfb3263100d9ac7ea2155b28dd8535f179111c1672ac8d8811 libpng-1.6.25.tar.xz diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 0dfc53590f..c577cd5477 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.23 +LIBPNG_VERSION = 1.6.25 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION) From 475387b43987b73a76b321599fb8da90c6b81c40 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 7 Sep 2016 10:16:08 +0100 Subject: [PATCH 0171/3392] libcurl: bump version to 7.50.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 2 +- package/libcurl/libcurl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index ff0026de81..c2b4eccdb1 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 3c12c5f54ccaa1d40abc65d672107dcc75d3e1fcb38c267484334280096e5156 curl-7.50.1.tar.bz2 +sha256 0c72105df4e9575d68bcf43aea1751056c1d29b1040df6194a49c5ac08f8e233 curl-7.50.2.tar.bz2 diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 4a018b87f9..00a61d278e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.50.1 +LIBCURL_VERSION = 7.50.2 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = http://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 75f217f253837c01360f61c6c3535011ab2891b5 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 7 Sep 2016 16:11:02 +0100 Subject: [PATCH 0172/3392] lvm2: bump version to 2.02.165 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 18bd62c5a0..c7e730760b 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 6316505e185673471a3434aec10f7978461688eb6c8391b02326a09bd0e83f8bedb2cbccb3c8dd2be0475bf516443ef23f09d1001bcff5b0dfd40941b3f1aefc LVM2.2.02.163.tgz +sha512 33324ad334852bc4217a9c33ded0a05645dac5141c68e34f1d385662be7e5bd5a4bc73539dd9c507cd7013d67b893b171df5d59e4f0b253233b003e7d48ac7a0 LVM2.2.02.165.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 11eedbed1d..3a5dcff677 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.163 +LVM2_VERSION = 2.02.165 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES From 27071be0d8c648a6f7ec314c29f5b3a033e1208a Mon Sep 17 00:00:00 2001 From: Theo Debrouwere Date: Wed, 7 Sep 2016 17:37:07 +0200 Subject: [PATCH 0173/3392] pugixml: new package pugixml is a light-weight C++ XML processing library. It features: * DOM-like interface with rich traversal/modification capabilities * Extremely fast non-validating XML parser which constructs the DOM tree from an XML file/buffer * XPath 1.0 implementation for complex data-driven tree queries * Full Unicode support with Unicode interface variants and automatic encoding conversions Homepage: http://pugixml.org/ Repository: https://github.com/zeux/pugixml Signed-off-by: Theo Debrouwere Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/pugixml/Config.in | 16 ++++++++++++++++ package/pugixml/pugixml.hash | 2 ++ package/pugixml/pugixml.mk | 15 +++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 package/pugixml/Config.in create mode 100644 package/pugixml/pugixml.hash create mode 100644 package/pugixml/pugixml.mk diff --git a/package/Config.in b/package/Config.in index add6052c5e..2b5a4d193a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1093,6 +1093,7 @@ menu "JSON/XML" source "package/libxslt/Config.in" source "package/libyaml/Config.in" source "package/mxml/Config.in" + source "package/pugixml/Config.in" source "package/rapidjson/Config.in" source "package/rapidxml/Config.in" source "package/raptor/Config.in" diff --git a/package/pugixml/Config.in b/package/pugixml/Config.in new file mode 100644 index 0000000000..5310b10cb8 --- /dev/null +++ b/package/pugixml/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_PUGIXML + bool "pugixml" + depends on BR2_INSTALL_LIBSTDCPP + help + Light-weight, simple and fast XML parser for C++ with XPath support + + Features: + * DOM-like interface with rich traversal/modification capabilities + * Extremely fast non-validating XML parser which constructs the DOM tree + from an XML file/buffer + * XPath 1.0 implementation for complex data-driven tree queries + * Full Unicode support with Unicode interface variants and automatic + encoding conversions + + http://pugixml.org/ + https://github.com/zeux/pugixml diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash new file mode 100644 index 0000000000..9007f7cae6 --- /dev/null +++ b/package/pugixml/pugixml.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 fbe10d46f61d769f7d92a296102e4e2bd3ee16130f11c5b10a1aae590ea1f5ca pugixml-1.7.tar.gz diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk new file mode 100644 index 0000000000..2e4f0ce561 --- /dev/null +++ b/package/pugixml/pugixml.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# pugixml +# +################################################################################ + +PUGIXML_VERSION = 1.7 +PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) +PUGIXML_LICENSE = MIT +PUGIXML_LICENSE_FILES = readme.txt +PUGIXML_INSTALL_STAGING = YES + +PUGIXML_SUBDIR = scripts + +$(eval $(cmake-package)) From 565fdbd6641ab2883cb9d6a1a9f8de82a71839b2 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Wed, 7 Sep 2016 22:42:37 +0200 Subject: [PATCH 0174/3392] acpica: bump version to 20160831 New version has been build- and run-tested on x86_64 and aarch64. Signed-off-by: Erico Nunes Signed-off-by: Peter Korsgaard --- package/acpica/acpica.hash | 2 +- package/acpica/acpica.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/acpica/acpica.hash b/package/acpica/acpica.hash index 8d5257ff26..ca6dd929d5 100644 --- a/package/acpica/acpica.hash +++ b/package/acpica/acpica.hash @@ -1,2 +1,2 @@ # locally computed hash -sha256 4ac73a5887b643dcca483f0241cbb808a53326846928edad9a2f86cffcde5850 acpica-unix2-20160527.tar.gz +sha256 fea808449aac29442c22419ad9e3eaa6b1a35f02e0db2b2f8802dc3af69e4965 acpica-unix2-20160831.tar.gz diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk index b8459d8759..a42eb728eb 100644 --- a/package/acpica/acpica.mk +++ b/package/acpica/acpica.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACPICA_VERSION = 20160527 +ACPICA_VERSION = 20160831 ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz ACPICA_SITE = https://acpica.org/sites/acpica/files ACPICA_LICENSE = BSD-3c or GPLv2 From ada5d835011b335ad2cb3c4f6d50e185cc0973cd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 7 Sep 2016 22:46:14 +0200 Subject: [PATCH 0175/3392] pugixml: add toolchain comment Reported-by: Samuel Martin Signed-off-by: Peter Korsgaard --- package/pugixml/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/pugixml/Config.in b/package/pugixml/Config.in index 5310b10cb8..d67e69573c 100644 --- a/package/pugixml/Config.in +++ b/package/pugixml/Config.in @@ -14,3 +14,6 @@ config BR2_PACKAGE_PUGIXML http://pugixml.org/ https://github.com/zeux/pugixml + +comment "pugixml needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP From 5609fe65aa7a3b85f1226f57439abd07a2869fae Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 7 Sep 2016 22:21:23 +0200 Subject: [PATCH 0176/3392] package/stress-ng: fix install commande Don't use make install otherwise stress-ng will be rebuild without required link libraries if any. Furthermore, using INSTALL allow to set the file permission correcly on the target. Fixes: http://autobuild.buildroot.net/results/bba/bba4d0b635ab6849f969b8a0363ebe9f5fafd82e Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/stress-ng/stress-ng.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 6015a1e9e9..e12895a676 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -15,8 +15,11 @@ define STRESS_NG_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) endef +# Don't use make install otherwise stress-ng will be rebuild without +# required link libraries if any. Furthermore, using INSTALL allow to +# set the file permission correcly on the target. define STRESS_NG_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(INSTALL) -m 0755 -D $(@D)/stress-ng $(TARGET_DIR)/usr/bin/stress-ng endef $(eval $(generic-package)) From ac184e85ea32eda750a7651c429e9bff7493cc49 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 7 Sep 2016 22:21:24 +0200 Subject: [PATCH 0177/3392] package/stress-ng: bump to 0.06.15 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/stress-ng/stress-ng.hash | 2 +- package/stress-ng/stress-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index d09edc0e2f..e735439a7e 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7af9759a37902ebf401f92fedeada0b82bcd1e3f4e9e10130177344f143470eb stress-ng-0.06.02.tar.gz +sha256 0e1d7733b35f594f7461dedbf836bd4966d0611da4cd4e85cde4804d2a425e6d stress-ng-0.06.15.tar.gz diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index e12895a676..b4d4699383 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRESS_NG_VERSION = 0.06.02 +STRESS_NG_VERSION = 0.06.15 STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng STRESS_NG_LICENSE = GPLv2+ STRESS_NG_LICENSE_FILES = COPYING From d8983d0c7604681577c7641c1fb198a7095ef037 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 7 Sep 2016 23:00:18 -0300 Subject: [PATCH 0178/3392] cifs-utils: bump to version 6.6 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/cifs-utils/cifs-utils.hash | 2 +- package/cifs-utils/cifs-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cifs-utils/cifs-utils.hash b/package/cifs-utils/cifs-utils.hash index c49ced4428..61ffbd9efb 100644 --- a/package/cifs-utils/cifs-utils.hash +++ b/package/cifs-utils/cifs-utils.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 e2776578b8267c6dc0862897f5e10f87f10f8337fca9ca6a9118f5eb30cf49f7 cifs-utils-6.5.tar.bz2 +sha256 d07152a807de6840566bbcc69a97ff6fa17fca4e09ceb4641d74882a83e67125 cifs-utils-6.6.tar.bz2 diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk index 6cd45e0cfb..fdb17790cf 100644 --- a/package/cifs-utils/cifs-utils.mk +++ b/package/cifs-utils/cifs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -CIFS_UTILS_VERSION = 6.5 +CIFS_UTILS_VERSION = 6.6 CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils CIFS_UTILS_LICENSE = GPLv3+ From aeaf66fc7a2be26bbc8bcb8a0c0243677bbcd3fb Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 8 Sep 2016 11:22:34 +0100 Subject: [PATCH 0179/3392] wireshark: bump version to 2.2.0 - Adapt current patch for 2.2.0. - Adapt gtk configure options for 2.2.0: - Instead of --enable-gtk3 or --enable-gtk2, now it uses --enable-gtk=[no/2/3/yes]. - Remove non-existing configure options: - --enable-usr-local: removed by https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=125989780ba8e658ad0d1f1c71ec01e6d36a2266 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- ...ot-assume-broken-inet_pton-in-case-.patch} | 21 +++++++++++-------- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 9 ++++---- 3 files changed, 18 insertions(+), 16 deletions(-) rename package/wireshark/{0001-configure-do-not-assume-broken-inet_pton-in-case-of-.patch => 0001-configure.ac-do-not-assume-broken-inet_pton-in-case-.patch} (53%) diff --git a/package/wireshark/0001-configure-do-not-assume-broken-inet_pton-in-case-of-.patch b/package/wireshark/0001-configure.ac-do-not-assume-broken-inet_pton-in-case-.patch similarity index 53% rename from package/wireshark/0001-configure-do-not-assume-broken-inet_pton-in-case-of-.patch rename to package/wireshark/0001-configure.ac-do-not-assume-broken-inet_pton-in-case-.patch index 4d1f680a51..1e44ad0942 100644 --- a/package/wireshark/0001-configure-do-not-assume-broken-inet_pton-in-case-of-.patch +++ b/package/wireshark/0001-configure.ac-do-not-assume-broken-inet_pton-in-case-.patch @@ -1,32 +1,35 @@ -From a0657feeb2b349ffda895a53e36ea5c992d871cf Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 31 Oct 2015 22:38:48 +0100 -Subject: [PATCH] configure: do not assume broken inet_pton in case of cross +From 25d313275e87dc236e86c0e713cad08ea64253f8 Mon Sep 17 00:00:00 2001 +From: Vicente Olivert Riera +Date: Thu, 8 Sep 2016 10:58:34 +0100 +Subject: [PATCH] configure.ac: do not assume broken inet_pton in case of cross compiling Patch configure.ac to not assume broken inet_pton in case of cross compiling. +[Vincent: adapt the patch for 2.2.0] + Signed-off-by: Peter Seiderer +Signed-off-by: Vicente Olivert Riera --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index aec0548..d640e0c 100644 +index c43e366..9672831 100644 --- a/configure.ac +++ b/configure.ac -@@ -2646,8 +2646,8 @@ int main() +@@ -2373,8 +2373,8 @@ int main() #endif }], [AC_MSG_RESULT(ok); have_inet_pton=yes], [AC_MSG_RESULT(broken); --have_inet_pton=no], [AC_MSG_RESULT(cross compiling, assume it is broken); +-have_inet_pton=no], [AC_MSG_RESULT([cross compiling, assume it is broken]); -have_inet_pton=no])], +have_inet_pton=no], [AC_MSG_RESULT([cross compiling, assume it is broken... not here]); +have_inet_pton=yes])], have_inet_pton=no) if test "$have_inet_pton" = no; then - INET_PTON_LO="inet_pton.lo" + AC_LIBOBJ(inet_pton) -- -2.1.4 +2.7.3 diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index fe4070bd52..73e57cd545 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,2 +1,2 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.0.5.txt -sha256 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b wireshark-2.0.5.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.0.txt +sha256 a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104 wireshark-2.2.0.tar.bz2 diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 42a5e74bc6..aa0c6d0b56 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.0.5 +WIRESHARK_VERSION = 2.2.0 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license @@ -20,7 +20,6 @@ WIRESHARK_AUTORECONF = YES # Work around it by pointing includedir at staging WIRESHARK_CONF_OPTS = \ --without-krb5 \ - --disable-usr-local \ --enable-static=no \ --with-libsmi=no \ --with-lua=no \ @@ -29,13 +28,13 @@ WIRESHARK_CONF_OPTS = \ # wireshark GUI options ifeq ($(BR2_PACKAGE_LIBGTK3),y) -WIRESHARK_CONF_OPTS += --with-gtk3=yes +WIRESHARK_CONF_OPTS += --with-gtk=3 WIRESHARK_DEPENDENCIES += libgtk3 else ifeq ($(BR2_PACKAGE_LIBGTK2),y) -WIRESHARK_CONF_OPTS += --with-gtk2=yes +WIRESHARK_CONF_OPTS += --with-gtk=2 WIRESHARK_DEPENDECIES += libgtk2 else -WIRESHARK_CONF_OPTS += --with-gtk3=no --with-gtk2=no +WIRESHARK_CONF_OPTS += --with-gtk=no endif # Qt4 needs accessibility, we don't support it From fc56a9ea3f4c4f468e4a7a25253afc01a885d820 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 8 Sep 2016 09:40:29 -0300 Subject: [PATCH 0180/3392] gnutls: bump to version 3.4.15 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- 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 e2c5fa1cda..89b0f4cd6d 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 35deddf2779b76ac11057de38bf380b8066c05de21b94263ad5b6dfa75dfbb23 gnutls-3.4.14.tar.xz +sha256 eb2a013905f5f2a0cbf7bcc1d20c85a50065063ee87bd33b496c4e19815e3498 gnutls-3.4.15.tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 429c1b2d5f..4e9a83d318 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.4 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).14 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).15 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) # README says that the core library is under LGPLv2.1+, but a few From 4e9292f6e4f27633453f1cc302cb4e4eebe0b387 Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Thu, 8 Sep 2016 14:43:43 +0200 Subject: [PATCH 0181/3392] package/fbterm: fix download site fbterm-1.7.0.tar.gz is no more accessible from http://fbterm.googlecode.com/files Signed-off-by: Julien BOIBESSOT Signed-off-by: Peter Korsgaard --- package/fbterm/fbterm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fbterm/fbterm.mk b/package/fbterm/fbterm.mk index 7a424a5e9b..be3cbe24fd 100644 --- a/package/fbterm/fbterm.mk +++ b/package/fbterm/fbterm.mk @@ -5,7 +5,7 @@ ################################################################################ FBTERM_VERSION = 1.7.0 -FBTERM_SITE = http://fbterm.googlecode.com/files +FBTERM_SITE = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm FBTERM_LICENSE = GPLv2+ FBTERM_LICENSE_FILES = COPYING FBTERM_DEPENDENCIES = fontconfig liberation From 53b7a77f4ccb959d8d8f055b1f98b1bd1c4253ec Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 8 Sep 2016 11:15:00 -0300 Subject: [PATCH 0182/3392] harfbuzz: bump to version 1.3.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 17f2fa67c4..7c3afc0c65 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.3.0.tar.bz2.sha256 -sha256 b04be31633efee2cae1d62d46434587302554fa837224845a62565ec68a0334d harfbuzz-1.3.0.tar.bz2 +# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.3.1.tar.bz2.sha256 +sha256 a242206dd119d5e6cc1b2253c116abbae03f9d930cb60b515fb0d248decf89a1 harfbuzz-1.3.1.tar.bz2 diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 8ba5e4d3e7..7ddd81b87e 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.3.0 +HARFBUZZ_VERSION = 1.3.1 HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 866722daaa32dd57215c8b8f3e6fdb1df120174c Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Wed, 7 Sep 2016 21:12:01 -0400 Subject: [PATCH 0183/3392] erlang-rebar: bump to version 2.6.4 Signed-off-by: Frank Hunleth Signed-off-by: Peter Korsgaard --- package/erlang-rebar/erlang-rebar.hash | 2 +- package/erlang-rebar/erlang-rebar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-rebar/erlang-rebar.hash b/package/erlang-rebar/erlang-rebar.hash index 029b52cf0d..27cc91affc 100644 --- a/package/erlang-rebar/erlang-rebar.hash +++ b/package/erlang-rebar/erlang-rebar.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 aed933d4e60c4f11e0771ccdb4434cccdb9a71cf8b1363d17aaf863988b3ff60 erlang-rebar-2.6.1.tar.gz +sha256 577246bafa2eb2b2c3f1d0c157408650446884555bf87901508ce71d5cc0bd07 erlang-rebar-2.6.4.tar.gz diff --git a/package/erlang-rebar/erlang-rebar.mk b/package/erlang-rebar/erlang-rebar.mk index 61904cc9e1..031ff47460 100644 --- a/package/erlang-rebar/erlang-rebar.mk +++ b/package/erlang-rebar/erlang-rebar.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_REBAR_VERSION = 2.6.1 +ERLANG_REBAR_VERSION = 2.6.4 # Upstream publishes a release, but we can not use it as it is a release of # a generated rebar script, when we want the sources. So we have to use the From 3ca860a95f1860c4b2e96fafe93b85030db15ed2 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 8 Sep 2016 17:07:30 +0100 Subject: [PATCH 0184/3392] glibc: fix MIPS and SPARC builds for glibc < 2.24 with recent binutils Backport two upstream patches to fix a build failure on MIPS and SPARC architectures when using recent binutils versions. It appears that on these architectures pt-vfork.S includes vfork.S (through the alpha version of pt-vfork.S) and that the __vfork aliases are not conditionalized on IS_IN (libc) like on other architectures. Therefore the aliases are also wrongly included in libpthread.so. The build failure looks like this: /br/output/build/glibc-2.22/build/nptl/libpthread.so:(*IND*+0x0): multiple definition of `vfork@GLIBC_2.0' /br/output/build/glibc-2.22/build/nptl/libpthread.so::(.text+0xeea0): first defined here This problem was reported in Debian here: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=827477 Upstream patches here: https://sourceware.org/git/?p=glibc.git;a=commit;h=43c2948756bb6e144c7b871e827bba37d61ad3a3 https://sourceware.org/git/?p=glibc.git;a=commit;h=b87c1ec3fa398646f042a68f0ce0f7d09c1348c7 I have tweaked them a little bit in order to not patch the ChangeLog file, otherwise it will fail. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- ...wrong-vfork-aliases-in-libpthread.so.patch | 76 +++++++++++ ...fixes-to-the-vfork-aliases-in-libpth.patch | 122 ++++++++++++++++++ ...wrong-vfork-aliases-in-libpthread.so.patch | 76 +++++++++++ ...fixes-to-the-vfork-aliases-in-libpth.patch | 122 ++++++++++++++++++ 4 files changed, 396 insertions(+) create mode 100644 package/glibc/2.22/0004-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch create mode 100644 package/glibc/2.22/0005-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch create mode 100644 package/glibc/2.23/0003-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch create mode 100644 package/glibc/2.23/0004-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch diff --git a/package/glibc/2.22/0004-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch b/package/glibc/2.22/0004-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch new file mode 100644 index 0000000000..740b3221c9 --- /dev/null +++ b/package/glibc/2.22/0004-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch @@ -0,0 +1,76 @@ +From 43c2948756bb6e144c7b871e827bba37d61ad3a3 Mon Sep 17 00:00:00 2001 +From: Aurelien Jarno +Date: Sat, 18 Jun 2016 19:11:23 +0200 +Subject: [PATCH] MIPS, SPARC: fix wrong vfork aliases in libpthread.so + +With recent binutils versions the GNU libc fails to build on at least +MISP and SPARC, with this kind of error: + + /home/aurel32/glibc/glibc-build/nptl/libpthread.so:(*IND*+0x0): multiple definition of `vfork@GLIBC_2.0' + /home/aurel32/glibc/glibc-build/nptl/libpthread.so::(.text+0xee50): first defined here + +It appears that on these architectures pt-vfork.S includes vfork.S +(through the alpha version of pt-vfork.S) and that the __vfork aliases +are not conditionalized on IS_IN (libc) like on other architectures. +Therefore the aliases are also wrongly included in libpthread.so. + +Fix this by properly conditionalizing the aliases like on other +architectures. + +Changelog: + * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Conditionalize + hidden_def, weak_alias and strong_alias on [IS_IN (libc)]. + * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise. + +[Vincent: do not patch ChangeLog] + +Signed-off-by: Vicente Olivert Riera +--- + sysdeps/unix/sysv/linux/mips/vfork.S | 2 ++ + sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 2 ++ + sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S +index 8c66151..c0c0ce6 100644 +--- a/sysdeps/unix/sysv/linux/mips/vfork.S ++++ b/sysdeps/unix/sysv/linux/mips/vfork.S +@@ -106,6 +106,8 @@ L(error): + #endif + END(__vfork) + ++#if IS_IN (libc) + libc_hidden_def(__vfork) + weak_alias (__vfork, vfork) + strong_alias (__vfork, __libc_vfork) ++#endif +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S +index dc32e0a..94f2c8d 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S +@@ -44,6 +44,8 @@ ENTRY(__vfork) + nop + END(__vfork) + ++#if IS_IN (libc) + libc_hidden_def (__vfork) + weak_alias (__vfork, vfork) + strong_alias (__vfork, __libc_vfork) ++#endif +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +index 05be3c2..a7479e9 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +@@ -44,6 +44,8 @@ ENTRY(__vfork) + nop + END(__vfork) + ++#if IS_IN (libc) + libc_hidden_def (__vfork) + weak_alias (__vfork, vfork) + strong_alias (__vfork, __libc_vfork) ++#endif +-- +2.7.3 + diff --git a/package/glibc/2.22/0005-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch b/package/glibc/2.22/0005-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch new file mode 100644 index 0000000000..3c53f6d050 --- /dev/null +++ b/package/glibc/2.22/0005-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch @@ -0,0 +1,122 @@ +From b87c1ec3fa398646f042a68f0ce0f7d09c1348c7 Mon Sep 17 00:00:00 2001 +From: Aurelien Jarno +Date: Tue, 21 Jun 2016 23:59:37 +0200 +Subject: [PATCH] MIPS, SPARC: more fixes to the vfork aliases in libpthread.so + +Commit 43c29487 tried to fix the vfork aliases in libpthread.so on MIPS +and SPARC, but failed to do it correctly, introducing an ABI change. + +This patch does the remaining changes needed to align the MIPS and SPARC +vfork implementations with the other architectures. That way the the +alpha version of pt-vfork.S works correctly for MIPS and SPARC. The +changes for alpha were done in 82aab97c. + +Changelog: + * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Rename into + __libc_vfork. + (__vfork) [IS_IN (libc)]: Remove alias. + (__libc_vfork) [IS_IN (libc)]: Define as an alias. + * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise. + +[Vincent: do not patch ChangeLog] + +Signed-off-by: Vicente Olivert Riera +--- + sysdeps/unix/sysv/linux/mips/vfork.S | 12 ++++++------ + sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 8 ++++---- + sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 8 ++++---- + 3 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S +index c0c0ce6..1867c86 100644 +--- a/sysdeps/unix/sysv/linux/mips/vfork.S ++++ b/sysdeps/unix/sysv/linux/mips/vfork.S +@@ -31,13 +31,13 @@ + LOCALSZ= 1 + FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK + GPOFF= FRAMESZ-(1*SZREG) +-NESTED(__vfork,FRAMESZ,sp) ++NESTED(__libc_vfork,FRAMESZ,sp) + #ifdef __PIC__ + SETUP_GP + #endif + PTR_SUBU sp, FRAMESZ + cfi_adjust_cfa_offset (FRAMESZ) +- SETUP_GP64_REG (a5, __vfork) ++ SETUP_GP64_REG (a5, __libc_vfork) + #ifdef __PIC__ + SAVE_GP (GPOFF) + #endif +@@ -104,10 +104,10 @@ L(error): + RESTORE_GP64_REG + j __syscall_error + #endif +- END(__vfork) ++ END(__libc_vfork) + + #if IS_IN (libc) +-libc_hidden_def(__vfork) +-weak_alias (__vfork, vfork) +-strong_alias (__vfork, __libc_vfork) ++weak_alias (__libc_vfork, vfork) ++strong_alias (__libc_vfork, __vfork) ++libc_hidden_def (__vfork) + #endif +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S +index 94f2c8d..0d0a3b5 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S +@@ -21,7 +21,7 @@ + + .text + .globl __syscall_error +-ENTRY(__vfork) ++ENTRY(__libc_vfork) + ld [%g7 + PID], %o5 + cmp %o5, 0 + bne 1f +@@ -42,10 +42,10 @@ ENTRY(__vfork) + st %o5, [%g7 + PID] + 1: retl + nop +-END(__vfork) ++END(__libc_vfork) + + #if IS_IN (libc) ++weak_alias (__libc_vfork, vfork) ++strong_alias (__libc_vfork, __vfork) + libc_hidden_def (__vfork) +-weak_alias (__vfork, vfork) +-strong_alias (__vfork, __libc_vfork) + #endif +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +index a7479e9..0818eba 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +@@ -21,7 +21,7 @@ + + .text + .globl __syscall_error +-ENTRY(__vfork) ++ENTRY(__libc_vfork) + ld [%g7 + PID], %o5 + sethi %hi(0x80000000), %o3 + cmp %o5, 0 +@@ -42,10 +42,10 @@ ENTRY(__vfork) + st %o5, [%g7 + PID] + 1: retl + nop +-END(__vfork) ++END(__libc_vfork) + + #if IS_IN (libc) ++weak_alias (__libc_vfork, vfork) ++strong_alias (__libc_vfork, __vfork) + libc_hidden_def (__vfork) +-weak_alias (__vfork, vfork) +-strong_alias (__vfork, __libc_vfork) + #endif +-- +2.7.3 + diff --git a/package/glibc/2.23/0003-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch b/package/glibc/2.23/0003-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch new file mode 100644 index 0000000000..740b3221c9 --- /dev/null +++ b/package/glibc/2.23/0003-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch @@ -0,0 +1,76 @@ +From 43c2948756bb6e144c7b871e827bba37d61ad3a3 Mon Sep 17 00:00:00 2001 +From: Aurelien Jarno +Date: Sat, 18 Jun 2016 19:11:23 +0200 +Subject: [PATCH] MIPS, SPARC: fix wrong vfork aliases in libpthread.so + +With recent binutils versions the GNU libc fails to build on at least +MISP and SPARC, with this kind of error: + + /home/aurel32/glibc/glibc-build/nptl/libpthread.so:(*IND*+0x0): multiple definition of `vfork@GLIBC_2.0' + /home/aurel32/glibc/glibc-build/nptl/libpthread.so::(.text+0xee50): first defined here + +It appears that on these architectures pt-vfork.S includes vfork.S +(through the alpha version of pt-vfork.S) and that the __vfork aliases +are not conditionalized on IS_IN (libc) like on other architectures. +Therefore the aliases are also wrongly included in libpthread.so. + +Fix this by properly conditionalizing the aliases like on other +architectures. + +Changelog: + * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Conditionalize + hidden_def, weak_alias and strong_alias on [IS_IN (libc)]. + * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise. + +[Vincent: do not patch ChangeLog] + +Signed-off-by: Vicente Olivert Riera +--- + sysdeps/unix/sysv/linux/mips/vfork.S | 2 ++ + sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 2 ++ + sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S +index 8c66151..c0c0ce6 100644 +--- a/sysdeps/unix/sysv/linux/mips/vfork.S ++++ b/sysdeps/unix/sysv/linux/mips/vfork.S +@@ -106,6 +106,8 @@ L(error): + #endif + END(__vfork) + ++#if IS_IN (libc) + libc_hidden_def(__vfork) + weak_alias (__vfork, vfork) + strong_alias (__vfork, __libc_vfork) ++#endif +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S +index dc32e0a..94f2c8d 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S +@@ -44,6 +44,8 @@ ENTRY(__vfork) + nop + END(__vfork) + ++#if IS_IN (libc) + libc_hidden_def (__vfork) + weak_alias (__vfork, vfork) + strong_alias (__vfork, __libc_vfork) ++#endif +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +index 05be3c2..a7479e9 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +@@ -44,6 +44,8 @@ ENTRY(__vfork) + nop + END(__vfork) + ++#if IS_IN (libc) + libc_hidden_def (__vfork) + weak_alias (__vfork, vfork) + strong_alias (__vfork, __libc_vfork) ++#endif +-- +2.7.3 + diff --git a/package/glibc/2.23/0004-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch b/package/glibc/2.23/0004-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch new file mode 100644 index 0000000000..3c53f6d050 --- /dev/null +++ b/package/glibc/2.23/0004-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch @@ -0,0 +1,122 @@ +From b87c1ec3fa398646f042a68f0ce0f7d09c1348c7 Mon Sep 17 00:00:00 2001 +From: Aurelien Jarno +Date: Tue, 21 Jun 2016 23:59:37 +0200 +Subject: [PATCH] MIPS, SPARC: more fixes to the vfork aliases in libpthread.so + +Commit 43c29487 tried to fix the vfork aliases in libpthread.so on MIPS +and SPARC, but failed to do it correctly, introducing an ABI change. + +This patch does the remaining changes needed to align the MIPS and SPARC +vfork implementations with the other architectures. That way the the +alpha version of pt-vfork.S works correctly for MIPS and SPARC. The +changes for alpha were done in 82aab97c. + +Changelog: + * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Rename into + __libc_vfork. + (__vfork) [IS_IN (libc)]: Remove alias. + (__libc_vfork) [IS_IN (libc)]: Define as an alias. + * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise. + +[Vincent: do not patch ChangeLog] + +Signed-off-by: Vicente Olivert Riera +--- + sysdeps/unix/sysv/linux/mips/vfork.S | 12 ++++++------ + sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 8 ++++---- + sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 8 ++++---- + 3 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S +index c0c0ce6..1867c86 100644 +--- a/sysdeps/unix/sysv/linux/mips/vfork.S ++++ b/sysdeps/unix/sysv/linux/mips/vfork.S +@@ -31,13 +31,13 @@ + LOCALSZ= 1 + FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK + GPOFF= FRAMESZ-(1*SZREG) +-NESTED(__vfork,FRAMESZ,sp) ++NESTED(__libc_vfork,FRAMESZ,sp) + #ifdef __PIC__ + SETUP_GP + #endif + PTR_SUBU sp, FRAMESZ + cfi_adjust_cfa_offset (FRAMESZ) +- SETUP_GP64_REG (a5, __vfork) ++ SETUP_GP64_REG (a5, __libc_vfork) + #ifdef __PIC__ + SAVE_GP (GPOFF) + #endif +@@ -104,10 +104,10 @@ L(error): + RESTORE_GP64_REG + j __syscall_error + #endif +- END(__vfork) ++ END(__libc_vfork) + + #if IS_IN (libc) +-libc_hidden_def(__vfork) +-weak_alias (__vfork, vfork) +-strong_alias (__vfork, __libc_vfork) ++weak_alias (__libc_vfork, vfork) ++strong_alias (__libc_vfork, __vfork) ++libc_hidden_def (__vfork) + #endif +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S +index 94f2c8d..0d0a3b5 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S +@@ -21,7 +21,7 @@ + + .text + .globl __syscall_error +-ENTRY(__vfork) ++ENTRY(__libc_vfork) + ld [%g7 + PID], %o5 + cmp %o5, 0 + bne 1f +@@ -42,10 +42,10 @@ ENTRY(__vfork) + st %o5, [%g7 + PID] + 1: retl + nop +-END(__vfork) ++END(__libc_vfork) + + #if IS_IN (libc) ++weak_alias (__libc_vfork, vfork) ++strong_alias (__libc_vfork, __vfork) + libc_hidden_def (__vfork) +-weak_alias (__vfork, vfork) +-strong_alias (__vfork, __libc_vfork) + #endif +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +index a7479e9..0818eba 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +@@ -21,7 +21,7 @@ + + .text + .globl __syscall_error +-ENTRY(__vfork) ++ENTRY(__libc_vfork) + ld [%g7 + PID], %o5 + sethi %hi(0x80000000), %o3 + cmp %o5, 0 +@@ -42,10 +42,10 @@ ENTRY(__vfork) + st %o5, [%g7 + PID] + 1: retl + nop +-END(__vfork) ++END(__libc_vfork) + + #if IS_IN (libc) ++weak_alias (__libc_vfork, vfork) ++strong_alias (__libc_vfork, __vfork) + libc_hidden_def (__vfork) +-weak_alias (__vfork, vfork) +-strong_alias (__vfork, __libc_vfork) + #endif +-- +2.7.3 + From 49d7c797f152685a7187acbcefd9636d112b33b6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 7 Sep 2016 22:17:24 -0300 Subject: [PATCH 0185/3392] binutils: bump default to version 2.26.x Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/binutils/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 6ef89a5a5c..2333a6e519 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -3,7 +3,7 @@ comment "Binutils Options" choice prompt "Binutils Version" depends on !BR2_arc - default BR2_BINUTILS_VERSION_2_25_X + default BR2_BINUTILS_VERSION_2_26_X help Select the version of binutils you wish to use. From ac1f324a1a90b1d7afdf139162f561b0f3835c46 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 7 Sep 2016 22:17:26 -0300 Subject: [PATCH 0186/3392] Config.in: Add BR2_DEPRECATED_SINCE_2016_11 In preparation for new deprecated features/symbols. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Config.in b/Config.in index 3f53f255de..fdc1ad0d1a 100644 --- a/Config.in +++ b/Config.in @@ -393,6 +393,10 @@ config BR2_DEPRECATED_SINCE_2016_08 bool default y +config BR2_DEPRECATED_SINCE_2016_11 + bool + default y + endif config BR2_ENABLE_DEBUG From 41c183eebcfecaddabfedfb6a07c331c74cc945f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 7 Sep 2016 22:17:27 -0300 Subject: [PATCH 0187/3392] binutils: deprecate 2.24.x Now that 2.26.x is stable and there's 2.25.x to fallback for whatever reason it makes no sense to keep two versions back from default. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/binutils/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 2333a6e519..6e3f82473f 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -8,6 +8,7 @@ choice Select the version of binutils you wish to use. config BR2_BINUTILS_VERSION_2_24_X + depends on BR2_DEPRECATED_SINCE_2016_11 # supported, but broken on Nios-II, Blackfin and powerpc64le depends on !BR2_nios2 && !BR2_powerpc64le && !BR2_bfin # Unsupported for MIPS R6 From 268e214b05dd7c35d57e71491e195ce4dcc78ded Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 8 Sep 2016 15:26:27 -0300 Subject: [PATCH 0188/3392] freetype: bump to version 2.7 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/freetype/freetype.hash | 2 +- package/freetype/freetype.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index 3d8c2259ac..d56742cb50 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0 freetype-2.6.5.tar.bz2 +sha256 d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48 freetype-2.7.tar.bz2 diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 78e81dd4a9..8a9a28553e 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.6.5 +FREETYPE_VERSION = 2.7 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES From 84c913035058e18cad9e95976233e193f0cf6b43 Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Thu, 8 Sep 2016 16:33:15 +0200 Subject: [PATCH 0189/3392] gcc/gcc-final: Disable libcilkrts when using static libs Disable libcilkrts when building static, as there is no static version: https://software.intel.com/en-us/articles/intel-cilk-plus-runtime-library-libcilkrts-can-only-be-linked-dynamically/ Fixes the following toolchain build error when building for i386 and BR2_STATIC_LIBS=y + BR2_TOOLCHAIN_BUILDROOT_CXX=y is set: ../../../libcilkrts/runtime/sysdep-unix.c:603:19: fatal error: dlfcn.h: No such file or directory Signed-off-by: Floris Bos Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-final/gcc-final.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index eea2f74bd7..36f185eccf 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -79,8 +79,9 @@ HOST_GCC_FINAL_CONF_OPTS += --disable-symvers endif # Disable shared libs like libstdc++ if we do static since it confuses linking +# In that case also disable libcilkrts as there is no static version ifeq ($(BR2_STATIC_LIBS),y) -HOST_GCC_FINAL_CONF_OPTS += --disable-shared +HOST_GCC_FINAL_CONF_OPTS += --disable-shared --disable-libcilkrts else HOST_GCC_FINAL_CONF_OPTS += --enable-shared endif From 84a24e736250914ca51e8590de6cf5c6b666bfdb Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Thu, 8 Sep 2016 22:01:17 +1200 Subject: [PATCH 0190/3392] syslog-ng: add optional support for libnet build If libnet is included pass --enable-spoof-source to configure otherwise pass --disable-spoof-source. This stops syslog-ng's configure from enabling address spoofing based on the build host having libnet installed. Fixes: http://autobuild.buildroot.net/results/71c733e4a7275f3a1b79cd19065d94e77af0309b http://autobuild.buildroot.net/results/d16ba0b9ef75d5a676a26db788be31556b69772a http://autobuild.buildroot.net/results/9659d1db1a128b269459fd9b8be797a9efbd35af Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/syslog-ng/syslog-ng.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index c11d3bde49..7e4d407617 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -69,6 +69,13 @@ ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) SYSLOG_NG_DEPENDENCIES += util-linux endif +ifeq ($(BR2_PACKAGE_LIBNET),y) +SYSLOG_NG_DEPENDENCIES += libnet +SYSLOG_NG_CONF_OPTS += --enable-spoof-source +else +SYSLOG_NG_CONF_OPTS += --disable-spoof-source +endif + ifeq ($(BR2_INIT_SYSTEMD),y) SYSLOG_NG_DEPENDENCIES += systemd SYSLOG_NG_CONF_OPTS += \ From 12169578f21c513ab23ff26ebcfc49841ce7e62f Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Thu, 8 Sep 2016 22:01:18 +1200 Subject: [PATCH 0191/3392] syslog-ng: Bump version to 3.7.3 Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 0213d2dadc..f1dcf5241d 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b1b3ccc0ce7f0d8bf15b23e59f2f4f5ded70eed410dfd27105219bc8856388a5 syslog-ng-3.7.2.tar.gz +sha256 49201dcfd59c8992936aa16c694f5e6593d505b44895f6c66b7d7f7895ce2c62 syslog-ng-3.7.3.tar.gz diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index 7e4d407617..b4fc24ba71 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSLOG_NG_VERSION = 3.7.2 +SYSLOG_NG_VERSION = 3.7.3 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) From 5c506fa737f174879f37bb73aa2033dddeba0ec3 Mon Sep 17 00:00:00 2001 From: Theo Debrouwere Date: Thu, 8 Sep 2016 09:53:09 +0200 Subject: [PATCH 0192/3392] package/php: explicitly disable phpdbg When building php, the package will also build/install phpdbg. This patch explicitly disables this behaviour. Signed-off-by: Theo Debrouwere Signed-off-by: Thomas Petazzoni --- package/php/php.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/php/php.mk b/package/php/php.mk index deaf56ef4f..7df10be971 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -19,6 +19,7 @@ PHP_CONF_OPTS = \ --disable-all \ --without-pear \ --with-config-file-path=/etc \ + --disable-phpdbg \ --disable-rpath PHP_CONF_ENV = \ ac_cv_func_strcasestr=yes \ From 031659024b3cf27bb68dc58d07519b563ef472a1 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 7 Sep 2016 16:54:47 +0100 Subject: [PATCH 0193/3392] util-linux: bump version to 2.28.2 --enable-findfs and --enable-lsblk configure options don't exist anymore. Now, findfs and lsblk are always built by default unless you pass --disable-all-programs to the configure script. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/util-linux/Config.in | 10 ---------- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 4 +--- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 657bcdd76d..b2307f4f4d 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -93,11 +93,6 @@ config BR2_PACKAGE_UTIL_LINUX_FDFORMAT help Low-level format a floppy disk -config BR2_PACKAGE_UTIL_LINUX_FINDFS - bool "findfs" - help - Find a filesystem by label or UUID - config BR2_PACKAGE_UTIL_LINUX_FSCK bool "fsck" help @@ -142,11 +137,6 @@ config BR2_PACKAGE_UTIL_LINUX_LOSETUP help Set up and control loop devices -config BR2_PACKAGE_UTIL_LINUX_LSBLK - bool "lsblk" - help - List block devices. - config BR2_PACKAGE_UTIL_LINUX_MESG bool "mesg" help diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 17094f4a7f..340ee943b7 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.28/sha256sums.asc -sha256 3ece4ea4a34ef786b68f5c415e848390424232abd1ee00f7ee5bddc30657b60f util-linux-2.28.1.tar.xz +sha256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd util-linux-2.28.2.tar.xz diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 3c8496a157..aa6f994a7b 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -5,7 +5,7 @@ ################################################################################ UTIL_LINUX_VERSION_MAJOR = 2.28 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -71,7 +71,6 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \ $(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \ $(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_FINDFS),--enable-findfs,--disable-findfs) \ $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \ $(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \ $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \ @@ -83,7 +82,6 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-runuser --enable-su --enable-sulogin,--disable-last --disable-login --disable-runuser --disable-su --disable-sulogin) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LSBLK),--enable-lsblk,--disable-lsblk) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \ From 524b6b85595274ca13bd7d01adb61ce2dddd786c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 8 Sep 2016 20:46:58 +0200 Subject: [PATCH 0194/3392] package/qemu: fix build of host variant The Qemu buildsystem expects that the cpp it is passed can be called like it were cc: it passes it the '-c' option, which is not allowed by cpp, but is allowed for cc. Fix that by overriding CPP when calling configure. Note: the target variant of Qemu does not build the affected parts (the PC-BIOS images). This is another problem that should be fixed separately. Signed-off-by: "Yann E. MORIN" Cc: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.mk | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 42dd9c2991..9815f76cf2 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -110,16 +110,19 @@ HOST_QEMU_OPTS += --enable-vde HOST_QEMU_DEPENDENCIES += host-vde2 endif +# Override CPP, as it expects to be able to call it like it'd +# call the compiler. define HOST_QEMU_CONFIGURE_CMDS - cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \ - --target-list="$(HOST_QEMU_TARGETS)" \ - --prefix="$(HOST_DIR)/usr" \ - --interp-prefix=$(STAGING_DIR) \ - --cc="$(HOSTCC)" \ - --host-cc="$(HOSTCC)" \ - --python=$(HOST_DIR)/usr/bin/python2 \ - --extra-cflags="$(HOST_CFLAGS)" \ - --extra-ldflags="$(HOST_LDFLAGS)" \ + cd $(@D); $(HOST_CONFIGURE_OPTS) CPP="$(HOSTCC) -E" \ + ./configure \ + --target-list="$(HOST_QEMU_TARGETS)" \ + --prefix="$(HOST_DIR)/usr" \ + --interp-prefix=$(STAGING_DIR) \ + --cc="$(HOSTCC)" \ + --host-cc="$(HOSTCC)" \ + --python=$(HOST_DIR)/usr/bin/python2 \ + --extra-cflags="$(HOST_CFLAGS)" \ + --extra-ldflags="$(HOST_LDFLAGS)" \ $(HOST_QEMU_OPTS) endef From 4338a319b72570e433fd7484f8a95e1e0e978941 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 8 Sep 2016 15:38:57 -0300 Subject: [PATCH 0195/3392] arch: remove support for sh64 It's been deprecated for quite some time now. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- .defconfig | 1 - arch/Config.in | 12 +----------- arch/Config.in.sh | 3 +-- linux/Config.in | 6 +++--- package/fdk-aac/Config.in | 4 ++-- package/gauche/Config.in | 2 +- package/gdb/Config.in | 4 ++-- package/libunwind/Config.in | 2 +- package/ruby/ruby.mk | 2 +- toolchain/toolchain-buildroot/Config.in | 4 ++-- 10 files changed, 14 insertions(+), 26 deletions(-) diff --git a/.defconfig b/.defconfig index 037647e223..7ab0c3fbf0 100644 --- a/.defconfig +++ b/.defconfig @@ -15,7 +15,6 @@ BR2_i386=y # BR2_nios2 is not set # BR2_powerpc is not set # BR2_sh is not set -# BR2_sh64 is not set # BR2_sparc is not set # BR2_sparc64 is not set # BR2_x86_64 is not set diff --git a/arch/Config.in b/arch/Config.in index 3caca158eb..df4db0b796 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -197,16 +197,6 @@ config BR2_sh http://www.hitachi.com/ http://en.wikipedia.org/wiki/SuperH -config BR2_sh64 - bool "SuperH64" - depends on BR2_DEPRECATED_SINCE_2015_05 - select BR2_ARCH_HAS_MMU_MANDATORY - help - SuperH64 (or SH) is a 64-bit reduced instruction set computer (RISC) - instruction set architecture (ISA) developed by Hitachi. - http://www.hitachi.com/ - http://en.wikipedia.org/wiki/SuperH - config BR2_sparc bool "SPARC" select BR2_ARCH_HAS_MMU_MANDATORY @@ -396,7 +386,7 @@ if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le source "arch/Config.in.powerpc" endif -if BR2_sh || BR2_sh64 +if BR2_sh source "arch/Config.in.sh" endif diff --git a/arch/Config.in.sh b/arch/Config.in.sh index 1bdea37cbc..4705212583 100644 --- a/arch/Config.in.sh +++ b/arch/Config.in.sh @@ -23,8 +23,7 @@ config BR2_ARCH default "sh4eb" if BR2_sh4eb default "sh4a" if BR2_sh4a default "sh4aeb" if BR2_sh4aeb - default "sh64" if BR2_sh64 config BR2_ENDIAN - default "LITTLE" if BR2_sh4 || BR2_sh4a || BR2_sh64 + default "LITTLE" if BR2_sh4 || BR2_sh4a default "BIG" if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb diff --git a/linux/Config.in b/linux/Config.in index 4b701a4a91..fd6b4b3d49 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -179,7 +179,7 @@ config BR2_LINUX_KERNEL_UIMAGE bool "uImage" depends on BR2_arc || BR2_arm || BR2_armeb || BR2_bfin || \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh || BR2_sh64 || BR2_mips || BR2_mipsel || \ + BR2_sh || BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el select BR2_LINUX_KERNEL_UBOOT_IMAGE @@ -198,7 +198,7 @@ config BR2_LINUX_KERNEL_ZIMAGE bool "zImage" depends on BR2_arm || BR2_armeb || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \ - BR2_sh || BR2_sh64 || BR2_xtensa + BR2_sh || BR2_xtensa config BR2_LINUX_KERNEL_ZIMAGE_EPAPR bool "zImage.epapr" @@ -235,7 +235,7 @@ config BR2_LINUX_KERNEL_LINUX_BIN config BR2_LINUX_KERNEL_VMLINUX_BIN bool "vmlinux.bin" - depends on BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64 + depends on BR2_mips || BR2_mipsel || BR2_sh config BR2_LINUX_KERNEL_VMLINUX bool "vmlinux" diff --git a/package/fdk-aac/Config.in b/package/fdk-aac/Config.in index 1ec59e1a88..9e18d22039 100644 --- a/package/fdk-aac/Config.in +++ b/package/fdk-aac/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_FDK_AAC # These are the architectures supported by FDK AAC depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_sh || BR2_sh64 + BR2_powerpc || BR2_sh help The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") @@ -17,4 +17,4 @@ comment "fdk-aac needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_sh || BR2_sh64 + BR2_powerpc || BR2_sh diff --git a/package/gauche/Config.in b/package/gauche/Config.in index 3ca012d3f8..c5f2a51948 100644 --- a/package/gauche/Config.in +++ b/package/gauche/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_GAUCHE_ARCH_SUPPORTS default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k || \ BR2_mips || BR2_mipsel || BR2_mips64 || \ BR2_mips64el || BR2_powerpc || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_sh || BR2_sh64 || BR2_x86_64 + BR2_powerpc64le || BR2_sh || BR2_x86_64 config BR2_PACKAGE_GAUCHE bool "gauche" diff --git a/package/gdb/Config.in b/package/gdb/Config.in index feab01da9e..809e02d076 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -40,10 +40,10 @@ config BR2_PACKAGE_GDB_DEBUGGER bool "full debugger" select BR2_PACKAGE_NCURSES depends on BR2_USE_WCHAR - depends on !BR2_sh && !BR2_sh64 && !BR2_microblaze + depends on !BR2_sh && !BR2_microblaze comment "full gdb on target needs a toolchain w/ wchar" - depends on !BR2_sh && !BR2_sh64 && !BR2_microblaze + depends on !BR2_sh && !BR2_microblaze depends on !BR2_USE_WCHAR if BR2_PACKAGE_GDB_DEBUGGER diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in index 04ab5a5c5c..5527a2bc21 100644 --- a/package/libunwind/Config.in +++ b/package/libunwind/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS default y if BR2_TOOLCHAIN_USES_GLIBC && \ (((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \ BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_powerpc || BR2_sh || BR2_sh64 || BR2_i386 || BR2_x86_64) + BR2_mips64el || BR2_powerpc || BR2_sh || BR2_i386 || BR2_x86_64) default y if BR2_TOOLCHAIN_USES_UCLIBC && \ (((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \ BR2_i386 || BR2_mips || BR2_mipsel || \ diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 3b8310c112..f3f80475b8 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -24,7 +24,7 @@ RUBY_CFLAGS = $(TARGET_CFLAGS) # With some SuperH toolchains (like Sourcery CodeBench 2012.09), ruby fails to # build with 'pcrel too far'. This seems to be caused by the -Os option we pass # by default. To fix the problem, use standard -O2 optimization instead. -ifeq ($(BR2_sh)$(BR2_sh64),y) +ifeq ($(BR2_sh),y) RUBY_CFLAGS += -O2 endif RUBY_CONF_ENV = CFLAGS="$(RUBY_CFLAGS)" diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 9fdfb4282f..8e275c22f2 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -48,8 +48,8 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC BR2_aarch64_be || BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || BR2_mips64el|| \ BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_sh || BR2_sh64 || BR2_sparc64 || \ - BR2_x86_64 || BR2_microblaze || BR2_nios2 + BR2_sh || BR2_sparc64 || BR2_x86_64 || \ + BR2_microblaze || BR2_nios2 depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS depends on !BR2_powerpc_SPE From 3d6c48436738b4dbedcfde74a65eace74e1b1c40 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 8 Sep 2016 15:38:58 -0300 Subject: [PATCH 0196/3392] Config.in: remove BR2_DEPRECATED_SINCE_2015_05 It's now unused. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- Config.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Config.in b/Config.in index fdc1ad0d1a..74d29b0770 100644 --- a/Config.in +++ b/Config.in @@ -369,10 +369,6 @@ config BR2_DEPRECATED if BR2_DEPRECATED -config BR2_DEPRECATED_SINCE_2015_05 - bool - default y - config BR2_DEPRECATED_SINCE_2015_08 bool default y From f617deaa903ac2453cb586bea40e5692a97d2b1b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 8 Sep 2016 15:38:59 -0300 Subject: [PATCH 0197/3392] webkit: remove deprecated package It's been deprecated for quite a while and it's now replaced by the more modern and up to date webkitgtk package. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 - .../0001-build-fix-for-32-bit-autotools.patch | 34 - .../0002-build-fix-for-gtklauncher.patch | 51 - package/webkit/0003-detect-harfbuzz-icu.patch | 28 - package/webkit/0004-disable-docrebase.patch | 27 - package/webkit/0005-disable-tests.patch | 80 - package/webkit/0006-execinfo_h.patch | 20 - package/webkit/0007-mips-dfg.patch | 1490 ----------------- package/webkit/0008-support-bison-3.0.patch | 22 - package/webkit/Config.in | 53 - package/webkit/webkit.hash | 2 - package/webkit/webkit.mk | 72 - 12 files changed, 1880 deletions(-) delete mode 100644 package/webkit/0001-build-fix-for-32-bit-autotools.patch delete mode 100644 package/webkit/0002-build-fix-for-gtklauncher.patch delete mode 100644 package/webkit/0003-detect-harfbuzz-icu.patch delete mode 100644 package/webkit/0004-disable-docrebase.patch delete mode 100644 package/webkit/0005-disable-tests.patch delete mode 100644 package/webkit/0006-execinfo_h.patch delete mode 100644 package/webkit/0007-mips-dfg.patch delete mode 100644 package/webkit/0008-support-bison-3.0.patch delete mode 100644 package/webkit/Config.in delete mode 100644 package/webkit/webkit.hash delete mode 100644 package/webkit/webkit.mk diff --git a/package/Config.in b/package/Config.in index 2b5a4d193a..aa2fc4bc36 100644 --- a/package/Config.in +++ b/package/Config.in @@ -994,7 +994,6 @@ menu "Graphics" source "package/tiff/Config.in" source "package/wayland/Config.in" source "package/wayland-protocols/Config.in" - source "package/webkit/Config.in" source "package/webkitgtk/Config.in" source "package/webkitgtk24/Config.in" source "package/webp/Config.in" diff --git a/package/webkit/0001-build-fix-for-32-bit-autotools.patch b/package/webkit/0001-build-fix-for-32-bit-autotools.patch deleted file mode 100644 index d7765ead0e..0000000000 --- a/package/webkit/0001-build-fix-for-32-bit-autotools.patch +++ /dev/null @@ -1,34 +0,0 @@ -Add missing symbol for WebCore::TextIterator::getLocationAndLengthFromRange - -Signed-off-by: Markos Chandras - -From f5bb58f9096061f00c948e668335811d364ba360 Mon Sep 17 00:00:00 2001 -From: "kov@webkit.org" -Date: Thu, 7 Feb 2013 13:48:46 +0000 -Subject: [PATCH] Unreviewed build fix after r141196 for 32 bits autotools. - -* Source/autotools/symbols.filter: restore 32 bits version of the -WebCore::TextIterator::getLocationAndLengthFromRange(WebCore::Node*, -WebCore::Range const*, unsigned int&, unsigned int&) symbol. - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@142105 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - ChangeLog | 8 ++++++++ - Source/autotools/symbols.filter | 1 + - 2 files changed, 9 insertions(+) - -diff --git a/Source/autotools/symbols.filter b/Source/autotools/symbols.filter -index 9d730b3..2edefaf 100644 ---- a/Source/autotools/symbols.filter -+++ b/Source/autotools/symbols.filter -@@ -57,6 +57,7 @@ _ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELj0EEE; - _ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELm0EEE; - _ZN7WebCore11MemoryCache14resourceForURLERKNS_4KURLE; - _ZN7WebCore12TextIterator26rangeFromLocationAndLengthEPNS_13ContainerNodeEiib; -+_ZN7WebCore12TextIterator29getLocationAndLengthFromRangeEPNS_4NodeEPKNS_5RangeERjS6_; - _ZN7WebCore12TextIterator29getLocationAndLengthFromRangeEPNS_4NodeEPKNS_5RangeERmS6_; - _ZN7WebCore12PrintContext20pageNumberForElementEPNS_7ElementERKNS_9FloatSizeE; - _ZN7WebCore13createWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_4NodeE; --- -1.8.3.2 - diff --git a/package/webkit/0002-build-fix-for-gtklauncher.patch b/package/webkit/0002-build-fix-for-gtklauncher.patch deleted file mode 100644 index 9a840b62fe..0000000000 --- a/package/webkit/0002-build-fix-for-gtklauncher.patch +++ /dev/null @@ -1,51 +0,0 @@ -Make gstreamer support conditional - -Signed-off-by: Markos Chandras - -From f1055f61bce46eccf8dc0aa017113a08d3d71944 Mon Sep 17 00:00:00 2001 -From: "commit-queue@webkit.org" - -Date: Fri, 15 Mar 2013 07:13:51 +0000 -Subject: [PATCH] Build fix for Tools/GtkLauncher/Programs_GtkLauncher-main.o - if gstreamer is not installed https://bugs.webkit.org/show_bug.cgi?id=112394 - -Patch by Tobias Mueller on 2013-03-15 -Reviewed by Philippe Normand. - -* GtkLauncher/main.c: -(main): Guard using the gstreamer function with #ifdef WTF_USE_GSTREAMER - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@145881 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Tools/ChangeLog | 10 ++++++++++ - Tools/GtkLauncher/main.c | 5 ++++- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/Tools/GtkLauncher/main.c b/Tools/GtkLauncher/main.c -index 32baf4a..84c8833 100644 ---- a/Tools/GtkLauncher/main.c -+++ b/Tools/GtkLauncher/main.c -@@ -28,7 +28,9 @@ - #include "autotoolsconfig.h" - #include "LauncherInspectorWindow.h" - #include -+#ifdef WTF_USE_GSTREAMER - #include -+#endif - #include - #include - #include -@@ -489,8 +491,9 @@ int main(int argc, char* argv[]) - GOptionContext *context = g_option_context_new(0); - g_option_context_add_main_entries(context, commandLineOptions, 0); - g_option_context_add_group(context, gtk_get_option_group(TRUE)); -+#ifdef WTF_USE_GSTREAMER - g_option_context_add_group(context, gst_init_get_option_group()); -- -+#endif - webkitSettings = webkit_web_settings_new(); - g_object_set(webkitSettings, "enable-developer-extras", TRUE, NULL); - if (!addWebSettingsGroupToContext(context, webkitSettings)) { --- -1.8.3.2 - diff --git a/package/webkit/0003-detect-harfbuzz-icu.patch b/package/webkit/0003-detect-harfbuzz-icu.patch deleted file mode 100644 index dc93c67e33..0000000000 --- a/package/webkit/0003-detect-harfbuzz-icu.patch +++ /dev/null @@ -1,28 +0,0 @@ -harfbuzz-icu detections based on the following upstream commits - -- 5f3ae29ffb29c499c1825578ba7f3ffcbf1aa8b9 -- ad2a23ec44b692bde43a13b658990770caa8dfc5 -- 22b4786377142424bfb6562ff029997acd0846d1 - -Signed-off-by: Markos Chandras - -Index: webkit-1.11.5/configure.ac -=================================================================== ---- webkit-1.11.5.orig/configure.ac -+++ webkit-1.11.5/configure.ac -@@ -938,6 +938,15 @@ PKG_CHECK_MODULES([FREETYPE], - freetype2 >= $FREETYPE2_REQUIRED_VERSION - harfbuzz]) - fi -+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library. -+# Since we support earlier HarfBuzz versions we keep this conditional for now. -+m4_define([harfbuzz_required_version], [0.9.7]) -+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then -+ PKG_CHECK_MODULES([HARFBUZZ_ICU], [harfbuzz-icu >= $harfbuzz_required_version]) -+ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" -+ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" -+fi -+ - AC_SUBST([FREETYPE_CFLAGS]) - AC_SUBST([FREETYPE_LIBS]) - diff --git a/package/webkit/0004-disable-docrebase.patch b/package/webkit/0004-disable-docrebase.patch deleted file mode 100644 index 2692d617a4..0000000000 --- a/package/webkit/0004-disable-docrebase.patch +++ /dev/null @@ -1,27 +0,0 @@ -This patch prevents documentation from being rebased or installed. This -prevents an error when gtk-doc --rebase is called. - -Signed-off-by: Spenser Gilliland -Signed-off-by: Markos Chandras - -Index: webkit-1.11.5/Tools/GNUmakefile.am -=================================================================== ---- webkit-1.11.5.orig/Tools/GNUmakefile.am -+++ webkit-1.11.5/Tools/GNUmakefile.am -@@ -308,6 +308,8 @@ EXTRA_DIST += \ - Tools/Scripts/webkit-build-directory \ - Tools/Scripts/webkitdirs.pm - -+if ENABLE_GTK_DOC -+ - docs: docs-build.stamp - .PHONY : docs - DISTCLEANFILES += docs-build.stamp -@@ -412,7 +414,6 @@ if ENABLE_WEBKIT2 - rm -rf $${installdir} - endif - --if ENABLE_GTK_DOC - all: docs-build.stamp - endif - diff --git a/package/webkit/0005-disable-tests.patch b/package/webkit/0005-disable-tests.patch deleted file mode 100644 index 6fa6daae6b..0000000000 --- a/package/webkit/0005-disable-tests.patch +++ /dev/null @@ -1,80 +0,0 @@ -This prevents the Webkit test suites from being built. - -Signed-off-by: Spenser Gilliland ----- -Index: webkit-1.9.6/GNUmakefile.am -=================================================================== ---- webkit-1.9.6.orig/GNUmakefile.am 2012-08-06 03:17:24.000000000 -0500 -+++ webkit-1.9.6/GNUmakefile.am 2013-05-28 10:08:53.645129501 -0500 -@@ -282,11 +282,14 @@ - include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am - - include Source/WebKit2/GNUmakefile.am --include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am - include Tools/MiniBrowser/gtk/GNUmakefile.am -+ -+if ENABLE_TESTS -+include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am - include Tools/WebKitTestRunner/GNUmakefile.am - include Source/ThirdParty/gtest/GNUmakefile.am - include Tools/TestWebKitAPI/GNUmakefile.am -+endif # ENABLE_TESTS - # [GTK] Refactor the translations now that we have webkit2 - # https://bugs.webkit.org/show_bug.cgi?id=55153 - -Index: webkit-1.9.6/Source/WebKit/gtk/GNUmakefile.am -=================================================================== ---- webkit-1.9.6.orig/Source/WebKit/gtk/GNUmakefile.am 2012-07-19 05:02:29.000000000 -0500 -+++ webkit-1.9.6/Source/WebKit/gtk/GNUmakefile.am 2013-05-28 10:09:49.277130516 -0500 -@@ -413,6 +413,7 @@ - dist_resources_DATA = \ - $(shell ls $(srcdir)/Source/WebKit/gtk/resources/*.html) - -+if ENABLE_TESTS - # Build unit tests - webkit_tests_cflags = \ - -fno-strict-aliasing \ -@@ -613,6 +614,8 @@ - Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd) - Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags) - -+endif # ENABLE_TESTS -+ - # Project-wide clean rules - # Files that will be cleaned - CLEANFILES += \ -Index: webkit-1.9.6/configure.ac -=================================================================== ---- webkit-1.9.6.orig/configure.ac 2012-08-06 08:45:10.000000000 -0500 -+++ webkit-1.9.6/configure.ac 2013-05-28 10:07:55.817128445 -0500 -@@ -516,6 +516,14 @@ - AC_SUBST(CAIRO_CFLAGS) - AC_SUBST(CAIRO_LIBS) - -+# check wheter to build tests -+AC_MSG_CHECKING([wheter to build tests]) -+AC_ARG_ENABLE(tests, -+ AC_HELP_STRING([--enable-tests], -+ [turn on tests [default=no]]), -+ [],[enable_debug="no"]) -+AC_MSG_RESULT([$enable_tests]) -+ - # check whether to build with debugging enabled - AC_MSG_CHECKING([whether to do a debug build]) - AC_ARG_ENABLE(debug, -@@ -1423,6 +1431,7 @@ - AM_CONDITIONAL([USE_FARSTREAM], [test "$have_farstream" = "yes"]) - - # WebKit feature conditionals -+AM_CONDITIONAL([ENABLE_TESTS],[test "$enable_tests" = "yes"]) - AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"]) - AM_CONDITIONAL([ENABLE_UNSTABLE_FEATURES],[test "$enable_unstable_features" = "yes"]) - AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"]) -@@ -1534,6 +1543,7 @@ - WebKit was configured with the following options: - - Build configuration: -+ Enable tests (slow) : $enable_tests - Enable debugging (slow) : $enable_debug - Compile with debug symbols (slow) : $enable_debug_symbols - Enable debug features (slow) : $enable_debug_features diff --git a/package/webkit/0006-execinfo_h.patch b/package/webkit/0006-execinfo_h.patch deleted file mode 100644 index f5508a1cb1..0000000000 --- a/package/webkit/0006-execinfo_h.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fixes uclibc build as uclibc does not include backtrace functionality - -Signed-of-by: Spenser Gilliland -Signed-of-by: Markos Chandras - -Index: webkit-1.11.5/Source/WTF/wtf/Assertions.cpp -=================================================================== ---- webkit-1.11.5.orig/Source/WTF/wtf/Assertions.cpp -+++ webkit-1.11.5/Source/WTF/wtf/Assertions.cpp -@@ -61,8 +61,10 @@ - #if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) - #include - #include -+#if !defined(__UCLIBC__) - #include - #endif -+#endif - - #if OS(ANDROID) - #include "android/log.h" diff --git a/package/webkit/0007-mips-dfg.patch b/package/webkit/0007-mips-dfg.patch deleted file mode 100644 index 39259514b9..0000000000 --- a/package/webkit/0007-mips-dfg.patch +++ /dev/null @@ -1,1490 +0,0 @@ -Upstream patch for DFG implementation for MIPS - -Signed-off-by: Markos Chandras - -From c921d19863ccf66bdd0ffa5d38eaf05efab6b136 Mon Sep 17 00:00:00 2001 -From: "commit-queue@webkit.org" - -Date: Mon, 18 Feb 2013 19:25:23 +0000 -Subject: [PATCH] MIPS DFG implementation. - https://bugs.webkit.org/show_bug.cgi?id=101328 - -Patch by Balazs Kilvady on 2013-02-18 -Reviewed by Oliver Hunt. - -DFG implementation for MIPS. - -Source/JavaScriptCore: - -* assembler/MIPSAssembler.h: -(JSC::MIPSAssembler::MIPSAssembler): -(JSC::MIPSAssembler::sllv): -(JSC::MIPSAssembler::movd): -(MIPSAssembler): -(JSC::MIPSAssembler::negd): -(JSC::MIPSAssembler::labelForWatchpoint): -(JSC::MIPSAssembler::label): -(JSC::MIPSAssembler::vmov): -(JSC::MIPSAssembler::linkDirectJump): -(JSC::MIPSAssembler::maxJumpReplacementSize): -(JSC::MIPSAssembler::revertJumpToMove): -(JSC::MIPSAssembler::replaceWithJump): -* assembler/MacroAssembler.h: -(MacroAssembler): -(JSC::MacroAssembler::poke): -* assembler/MacroAssemblerMIPS.h: -(JSC::MacroAssemblerMIPS::add32): -(MacroAssemblerMIPS): -(JSC::MacroAssemblerMIPS::and32): -(JSC::MacroAssemblerMIPS::lshift32): -(JSC::MacroAssemblerMIPS::mul32): -(JSC::MacroAssemblerMIPS::or32): -(JSC::MacroAssemblerMIPS::rshift32): -(JSC::MacroAssemblerMIPS::urshift32): -(JSC::MacroAssemblerMIPS::sub32): -(JSC::MacroAssemblerMIPS::xor32): -(JSC::MacroAssemblerMIPS::store32): -(JSC::MacroAssemblerMIPS::jump): -(JSC::MacroAssemblerMIPS::branchAdd32): -(JSC::MacroAssemblerMIPS::branchMul32): -(JSC::MacroAssemblerMIPS::branchSub32): -(JSC::MacroAssemblerMIPS::branchNeg32): -(JSC::MacroAssemblerMIPS::call): -(JSC::MacroAssemblerMIPS::loadDouble): -(JSC::MacroAssemblerMIPS::moveDouble): -(JSC::MacroAssemblerMIPS::swapDouble): -(JSC::MacroAssemblerMIPS::subDouble): -(JSC::MacroAssemblerMIPS::mulDouble): -(JSC::MacroAssemblerMIPS::divDouble): -(JSC::MacroAssemblerMIPS::negateDouble): -(JSC::MacroAssemblerMIPS::branchEqual): -(JSC::MacroAssemblerMIPS::branchNotEqual): -(JSC::MacroAssemblerMIPS::branchTruncateDoubleToInt32): -(JSC::MacroAssemblerMIPS::branchTruncateDoubleToUint32): -(JSC::MacroAssemblerMIPS::truncateDoubleToInt32): -(JSC::MacroAssemblerMIPS::truncateDoubleToUint32): -(JSC::MacroAssemblerMIPS::branchDoubleNonZero): -(JSC::MacroAssemblerMIPS::branchDoubleZeroOrNaN): -(JSC::MacroAssemblerMIPS::invert): -(JSC::MacroAssemblerMIPS::replaceWithJump): -(JSC::MacroAssemblerMIPS::maxJumpReplacementSize): -* dfg/DFGAssemblyHelpers.h: -(AssemblyHelpers): -(JSC::DFG::AssemblyHelpers::preserveReturnAddressAfterCall): -(JSC::DFG::AssemblyHelpers::restoreReturnAddressBeforeReturn): -(JSC::DFG::AssemblyHelpers::debugCall): -* dfg/DFGCCallHelpers.h: -(CCallHelpers): -(JSC::DFG::CCallHelpers::setupArguments): -(JSC::DFG::CCallHelpers::setupArgumentsWithExecState): -* dfg/DFGFPRInfo.h: -(DFG): -(FPRInfo): -(JSC::DFG::FPRInfo::toRegister): -(JSC::DFG::FPRInfo::toIndex): -(JSC::DFG::FPRInfo::debugName): -* dfg/DFGGPRInfo.h: -(DFG): -(GPRInfo): -(JSC::DFG::GPRInfo::toRegister): -(JSC::DFG::GPRInfo::toIndex): -(JSC::DFG::GPRInfo::debugName): -* dfg/DFGSpeculativeJIT.h: -(SpeculativeJIT): -* jit/JSInterfaceJIT.h: -(JSInterfaceJIT): -* runtime/JSGlobalData.h: -(JSC::ScratchBuffer::allocationSize): -(ScratchBuffer): - -Source/WTF: - -* wtf/Platform.h: - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@143247 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/JavaScriptCore/ChangeLog | 90 ++++ - Source/JavaScriptCore/assembler/MIPSAssembler.h | 109 ++++- - Source/JavaScriptCore/assembler/MacroAssembler.h | 7 + - .../JavaScriptCore/assembler/MacroAssemblerMIPS.h | 480 +++++++++++++++++++-- - Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h | 19 +- - Source/JavaScriptCore/dfg/DFGCCallHelpers.h | 92 ++-- - Source/JavaScriptCore/dfg/DFGFPRInfo.h | 68 +++ - Source/JavaScriptCore/dfg/DFGGPRInfo.h | 67 +++ - Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h | 4 +- - Source/JavaScriptCore/jit/JSInterfaceJIT.h | 4 + - Source/JavaScriptCore/runtime/JSGlobalData.h | 6 +- - Source/WTF/ChangeLog | 11 + - Source/WTF/wtf/Platform.h | 4 + - 13 files changed, 888 insertions(+), 73 deletions(-) - -diff --git a/Source/JavaScriptCore/assembler/MIPSAssembler.h b/Source/JavaScriptCore/assembler/MIPSAssembler.h -index 026f87e..7f553bb 100644 ---- a/Source/JavaScriptCore/assembler/MIPSAssembler.h -+++ b/Source/JavaScriptCore/assembler/MIPSAssembler.h -@@ -152,6 +152,8 @@ public: - typedef SegmentedVector Jumps; - - MIPSAssembler() -+ : m_indexOfLastWatchpoint(INT_MIN) -+ , m_indexOfTailOfLastWatchpoint(INT_MIN) - { - } - -@@ -325,7 +327,7 @@ public: - emitInst(0x00000000 | (rd << OP_SH_RD) | (rt << OP_SH_RT) | ((shamt & 0x1f) << OP_SH_SHAMT)); - } - -- void sllv(RegisterID rd, RegisterID rt, int rs) -+ void sllv(RegisterID rd, RegisterID rt, RegisterID rs) - { - emitInst(0x00000004 | (rd << OP_SH_RD) | (rt << OP_SH_RT) | (rs << OP_SH_RS)); - } -@@ -527,6 +529,16 @@ public: - emitInst(0x46200004 | (fd << OP_SH_FD) | (fs << OP_SH_FS)); - } - -+ void movd(FPRegisterID fd, FPRegisterID fs) -+ { -+ emitInst(0x46200006 | (fd << OP_SH_FD) | (fs << OP_SH_FS)); -+ } -+ -+ void negd(FPRegisterID fd, FPRegisterID fs) -+ { -+ emitInst(0x46200007 | (fd << OP_SH_FD) | (fs << OP_SH_FS)); -+ } -+ - void truncwd(FPRegisterID fd, FPRegisterID fs) - { - emitInst(0x4620000d | (fd << OP_SH_FD) | (fs << OP_SH_FS)); -@@ -619,9 +631,24 @@ public: - return m_buffer.label(); - } - -+ AssemblerLabel labelForWatchpoint() -+ { -+ AssemblerLabel result = m_buffer.label(); -+ if (static_cast(result.m_offset) != m_indexOfLastWatchpoint) -+ result = label(); -+ m_indexOfLastWatchpoint = result.m_offset; -+ m_indexOfTailOfLastWatchpoint = result.m_offset + maxJumpReplacementSize(); -+ return result; -+ } -+ - AssemblerLabel label() - { -- return m_buffer.label(); -+ AssemblerLabel result = m_buffer.label(); -+ while (UNLIKELY(static_cast(result.m_offset) < m_indexOfTailOfLastWatchpoint)) { -+ nop(); -+ result = m_buffer.label(); -+ } -+ return result; - } - - AssemblerLabel align(int alignment) -@@ -664,14 +691,24 @@ public: - // Assembly helpers for moving data between fp and registers. - void vmov(RegisterID rd1, RegisterID rd2, FPRegisterID rn) - { -+#if WTF_MIPS_ISA_REV(2) && WTF_MIPS_FP64 -+ mfc1(rd1, rn); -+ mfhc1(rd2, rn); -+#else - mfc1(rd1, rn); - mfc1(rd2, FPRegisterID(rn + 1)); -+#endif - } - - void vmov(FPRegisterID rd, RegisterID rn1, RegisterID rn2) - { -+#if WTF_MIPS_ISA_REV(2) && WTF_MIPS_FP64 -+ mtc1(rn1, rd); -+ mthc1(rn2, rd); -+#else - mtc1(rn1, rd); - mtc1(rn2, FPRegisterID(rd + 1)); -+#endif - } - - static unsigned getCallReturnOffset(AssemblerLabel call) -@@ -688,6 +725,35 @@ public: - // writable region of memory; to modify the code in an execute-only execuable - // pool the 'repatch' and 'relink' methods should be used. - -+ static size_t linkDirectJump(void* code, void* to) -+ { -+ MIPSWord* insn = reinterpret_cast(reinterpret_cast(code)); -+ size_t ops = 0; -+ int32_t slotAddr = reinterpret_cast(insn) + 4; -+ int32_t toAddr = reinterpret_cast(to); -+ -+ if ((slotAddr & 0xf0000000) != (toAddr & 0xf0000000)) { -+ // lui -+ *insn = 0x3c000000 | (MIPSRegisters::t9 << OP_SH_RT) | ((toAddr >> 16) & 0xffff); -+ ++insn; -+ // ori -+ *insn = 0x34000000 | (MIPSRegisters::t9 << OP_SH_RT) | (MIPSRegisters::t9 << OP_SH_RS) | (toAddr & 0xffff); -+ ++insn; -+ // jr -+ *insn = 0x00000008 | (MIPSRegisters::t9 << OP_SH_RS); -+ ++insn; -+ ops = 4 * sizeof(MIPSWord); -+ } else { -+ // j -+ *insn = 0x08000000 | ((toAddr & 0x0fffffff) >> 2); -+ ++insn; -+ ops = 2 * sizeof(MIPSWord); -+ } -+ // nop -+ *insn = 0x00000000; -+ return ops; -+ } -+ - void linkJump(AssemblerLabel from, AssemblerLabel to) - { - ASSERT(to.isSet()); -@@ -825,29 +891,36 @@ public: - #endif - } - -- static void revertJumpToMove(void* instructionStart, RegisterID rt, int imm) -+ static ptrdiff_t maxJumpReplacementSize() - { -- MIPSWord* insn = static_cast(instructionStart) + 1; -- ASSERT((*insn & 0xfc000000) == 0x34000000); -- *insn = (*insn & 0xfc1f0000) | (imm & 0xffff); -- cacheFlush(insn, sizeof(MIPSWord)); -+ return sizeof(MIPSWord) * 4; - } - -- static void replaceWithJump(void* instructionStart, void* to) -+ static void revertJumpToMove(void* instructionStart, RegisterID rt, int imm) - { -- MIPSWord* instruction = reinterpret_cast(instructionStart); -- intptr_t jumpTo = reinterpret_cast(to); -+ MIPSWord* insn = static_cast(instructionStart); -+ size_t codeSize = 2 * sizeof(MIPSWord); - - // lui -- instruction[0] = 0x3c000000 | (MIPSRegisters::t9 << OP_SH_RT) | ((jumpTo >> 16) & 0xffff); -+ *insn = 0x3c000000 | (rt << OP_SH_RT) | ((imm >> 16) & 0xffff); -+ ++insn; - // ori -- instruction[1] = 0x34000000 | (MIPSRegisters::t9 << OP_SH_RT) | (MIPSRegisters::t9 << OP_SH_RS) | (jumpTo & 0xffff); -- // jr -- instruction[2] = 0x00000008 | (MIPSRegisters::t9 << OP_SH_RS); -- // nop -- instruction[3] = 0x0; -+ *insn = 0x34000000 | (rt << OP_SH_RS) | (rt << OP_SH_RT) | (imm & 0xffff); -+ ++insn; -+ // if jr $t9 -+ if (*insn == 0x03200008) { -+ *insn = 0x00000000; -+ codeSize += sizeof(MIPSWord); -+ } -+ cacheFlush(insn, codeSize); -+ } - -- cacheFlush(instruction, sizeof(MIPSWord) * 4); -+ static void replaceWithJump(void* instructionStart, void* to) -+ { -+ ASSERT(!(bitwise_cast(instructionStart) & 3)); -+ ASSERT(!(bitwise_cast(to) & 3)); -+ size_t ops = linkDirectJump(instructionStart, to); -+ cacheFlush(instructionStart, ops); - } - - static void replaceWithLoad(void* instructionStart) -@@ -1023,6 +1096,8 @@ private: - - AssemblerBuffer m_buffer; - Jumps m_jumps; -+ int m_indexOfLastWatchpoint; -+ int m_indexOfTailOfLastWatchpoint; - }; - - } // namespace JSC -diff --git a/Source/JavaScriptCore/assembler/MacroAssembler.h b/Source/JavaScriptCore/assembler/MacroAssembler.h -index 60a93db..1f0c3de 100644 ---- a/Source/JavaScriptCore/assembler/MacroAssembler.h -+++ b/Source/JavaScriptCore/assembler/MacroAssembler.h -@@ -200,6 +200,13 @@ public: - } - #endif - -+#if CPU(MIPS) -+ void poke(FPRegisterID src, int index = 0) -+ { -+ ASSERT(!(index & 1)); -+ storeDouble(src, addressForPoke(index)); -+ } -+#endif - - // Backwards banches, these are currently all implemented using existing forwards branch mechanisms. - void branchPtr(RelationalCondition cond, RegisterID op1, TrustedImmPtr imm, Label target) -diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h b/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h -index 43ad434..4f14960 100644 ---- a/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h -+++ b/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h -@@ -114,6 +114,11 @@ public: - m_assembler.addu(dest, dest, src); - } - -+ void add32(RegisterID op1, RegisterID op2, RegisterID dest) -+ { -+ m_assembler.addu(dest, op1, op2); -+ } -+ - void add32(TrustedImm32 imm, RegisterID dest) - { - add32(imm, dest, dest); -@@ -267,6 +272,11 @@ public: - m_assembler.andInsn(dest, dest, src); - } - -+ void and32(RegisterID op1, RegisterID op2, RegisterID dest) -+ { -+ m_assembler.andInsn(dest, op1, op2); -+ } -+ - void and32(TrustedImm32 imm, RegisterID dest) - { - if (!imm.m_value && !m_fixedWidth) -@@ -283,9 +293,16 @@ public: - } - } - -- void lshift32(TrustedImm32 imm, RegisterID dest) -+ void and32(TrustedImm32 imm, RegisterID src, RegisterID dest) - { -- m_assembler.sll(dest, dest, imm.m_value); -+ if (!imm.m_value && !m_fixedWidth) -+ move(MIPSRegisters::zero, dest); -+ else if (imm.m_value > 0 && imm.m_value < 65535 && !m_fixedWidth) -+ m_assembler.andi(dest, src, imm.m_value); -+ else { -+ move(imm, immTempRegister); -+ m_assembler.andInsn(dest, src, immTempRegister); -+ } - } - - void lshift32(RegisterID shiftAmount, RegisterID dest) -@@ -293,11 +310,33 @@ public: - m_assembler.sllv(dest, dest, shiftAmount); - } - -+ void lshift32(RegisterID src, RegisterID shiftAmount, RegisterID dest) -+ { -+ m_assembler.sllv(dest, src, shiftAmount); -+ } -+ -+ void lshift32(TrustedImm32 imm, RegisterID dest) -+ { -+ move(imm, immTempRegister); -+ m_assembler.sllv(dest, dest, immTempRegister); -+ } -+ -+ void lshift32(RegisterID src, TrustedImm32 imm, RegisterID dest) -+ { -+ move(imm, immTempRegister); -+ m_assembler.sllv(dest, src, immTempRegister); -+ } -+ - void mul32(RegisterID src, RegisterID dest) - { - m_assembler.mul(dest, dest, src); - } - -+ void mul32(RegisterID op1, RegisterID op2, RegisterID dest) -+ { -+ m_assembler.mul(dest, op1, op2); -+ } -+ - void mul32(TrustedImm32 imm, RegisterID src, RegisterID dest) - { - if (!imm.m_value && !m_fixedWidth) -@@ -348,6 +387,24 @@ public: - m_assembler.orInsn(dest, dest, dataTempRegister); - } - -+ void or32(TrustedImm32 imm, RegisterID src, RegisterID dest) -+ { -+ if (!imm.m_value && !m_fixedWidth) -+ return; -+ -+ if (imm.m_value > 0 && imm.m_value < 65535 && !m_fixedWidth) { -+ m_assembler.ori(dest, src, imm.m_value); -+ return; -+ } -+ -+ /* -+ li dataTemp, imm -+ or dest, src, dataTemp -+ */ -+ move(imm, dataTempRegister); -+ m_assembler.orInsn(dest, src, dataTempRegister); -+ } -+ - void or32(RegisterID src, AbsoluteAddress dest) - { - load32(dest.m_ptr, dataTempRegister); -@@ -360,6 +417,11 @@ public: - m_assembler.srav(dest, dest, shiftAmount); - } - -+ void rshift32(RegisterID src, RegisterID shiftAmount, RegisterID dest) -+ { -+ m_assembler.srav(dest, src, shiftAmount); -+ } -+ - void rshift32(TrustedImm32 imm, RegisterID dest) - { - m_assembler.sra(dest, dest, imm.m_value); -@@ -375,16 +437,31 @@ public: - m_assembler.srlv(dest, dest, shiftAmount); - } - -+ void urshift32(RegisterID src, RegisterID shiftAmount, RegisterID dest) -+ { -+ m_assembler.srlv(dest, src, shiftAmount); -+ } -+ - void urshift32(TrustedImm32 imm, RegisterID dest) - { - m_assembler.srl(dest, dest, imm.m_value); - } - -+ void urshift32(RegisterID src, TrustedImm32 imm, RegisterID dest) -+ { -+ m_assembler.srl(dest, src, imm.m_value); -+ } -+ - void sub32(RegisterID src, RegisterID dest) - { - m_assembler.subu(dest, dest, src); - } - -+ void sub32(RegisterID op1, RegisterID op2, RegisterID dest) -+ { -+ m_assembler.subu(dest, op1, op2); -+ } -+ - void sub32(TrustedImm32 imm, RegisterID dest) - { - if (imm.m_value >= -32767 && imm.m_value <= 32768 -@@ -495,6 +572,11 @@ public: - m_assembler.xorInsn(dest, dest, src); - } - -+ void xor32(RegisterID op1, RegisterID op2, RegisterID dest) -+ { -+ m_assembler.xorInsn(dest, op1, op2); -+ } -+ - void xor32(TrustedImm32 imm, RegisterID dest) - { - if (imm.m_value == -1) { -@@ -510,6 +592,21 @@ public: - m_assembler.xorInsn(dest, dest, immTempRegister); - } - -+ void xor32(TrustedImm32 imm, RegisterID src, RegisterID dest) -+ { -+ if (imm.m_value == -1) { -+ m_assembler.nor(dest, src, MIPSRegisters::zero); -+ return; -+ } -+ -+ /* -+ li immTemp, imm -+ xor dest, dest, immTemp -+ */ -+ move(imm, immTempRegister); -+ m_assembler.xorInsn(dest, src, immTempRegister); -+ } -+ - void sqrtDouble(FPRegisterID src, FPRegisterID dst) - { - m_assembler.sqrtd(dst, src); -@@ -989,6 +1086,44 @@ public: - } - } - -+ void store32(TrustedImm32 imm, BaseIndex address) -+ { -+ if (address.offset >= -32768 && address.offset <= 32767 && !m_fixedWidth) { -+ /* -+ sll addrTemp, address.index, address.scale -+ addu addrTemp, addrTemp, address.base -+ sw src, address.offset(addrTemp) -+ */ -+ m_assembler.sll(addrTempRegister, address.index, address.scale); -+ m_assembler.addu(addrTempRegister, addrTempRegister, address.base); -+ if (!imm.m_value) -+ m_assembler.sw(MIPSRegisters::zero, addrTempRegister, address.offset); -+ else { -+ move(imm, immTempRegister); -+ m_assembler.sw(immTempRegister, addrTempRegister, address.offset); -+ } -+ } else { -+ /* -+ sll addrTemp, address.index, address.scale -+ addu addrTemp, addrTemp, address.base -+ lui immTemp, (address.offset + 0x8000) >> 16 -+ addu addrTemp, addrTemp, immTemp -+ sw src, (address.offset & 0xffff)(at) -+ */ -+ m_assembler.sll(addrTempRegister, address.index, address.scale); -+ m_assembler.addu(addrTempRegister, addrTempRegister, address.base); -+ m_assembler.lui(immTempRegister, (address.offset + 0x8000) >> 16); -+ m_assembler.addu(addrTempRegister, addrTempRegister, immTempRegister); -+ if (!imm.m_value && !m_fixedWidth) -+ m_assembler.sw(MIPSRegisters::zero, addrTempRegister, address.offset); -+ else { -+ move(imm, immTempRegister); -+ m_assembler.sw(immTempRegister, addrTempRegister, address.offset); -+ } -+ } -+ } -+ -+ - void store32(RegisterID src, const void* address) - { - /* -@@ -1336,6 +1471,15 @@ public: - m_fixedWidth = false; - } - -+ void jump(AbsoluteAddress address) -+ { -+ m_fixedWidth = true; -+ load32(address.m_ptr, MIPSRegisters::t9); -+ m_assembler.jr(MIPSRegisters::t9); -+ m_assembler.nop(); -+ m_fixedWidth = false; -+ } -+ - void moveDoubleToInts(FPRegisterID src, RegisterID dest1, RegisterID dest2) - { - m_assembler.vmov(dest1, dest2, src); -@@ -1404,6 +1548,53 @@ public: - return Jump(); - } - -+ Jump branchAdd32(ResultCondition cond, RegisterID op1, RegisterID op2, RegisterID dest) -+ { -+ ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); -+ if (cond == Overflow) { -+ /* -+ move dataTemp, op1 -+ xor cmpTemp, dataTemp, op2 -+ bltz cmpTemp, No_overflow # diff sign bit -> no overflow -+ addu dest, dataTemp, op2 -+ xor cmpTemp, dest, dataTemp -+ bgez cmpTemp, No_overflow # same sign big -> no overflow -+ nop -+ b Overflow -+ nop -+ nop -+ nop -+ nop -+ nop -+ No_overflow: -+ */ -+ move(op1, dataTempRegister); -+ m_assembler.xorInsn(cmpTempRegister, dataTempRegister, op2); -+ m_assembler.bltz(cmpTempRegister, 10); -+ m_assembler.addu(dest, dataTempRegister, op2); -+ m_assembler.xorInsn(cmpTempRegister, dest, dataTempRegister); -+ m_assembler.bgez(cmpTempRegister, 7); -+ m_assembler.nop(); -+ return jump(); -+ } -+ if (cond == Signed) { -+ add32(op1, op2, dest); -+ // Check if dest is negative. -+ m_assembler.slt(cmpTempRegister, dest, MIPSRegisters::zero); -+ return branchNotEqual(cmpTempRegister, MIPSRegisters::zero); -+ } -+ if (cond == Zero) { -+ add32(op1, op2, dest); -+ return branchEqual(dest, MIPSRegisters::zero); -+ } -+ if (cond == NonZero) { -+ add32(op1, op2, dest); -+ return branchNotEqual(dest, MIPSRegisters::zero); -+ } -+ ASSERT(0); -+ return Jump(); -+ } -+ - Jump branchAdd32(ResultCondition cond, TrustedImm32 imm, RegisterID dest) - { - move(imm, immTempRegister); -@@ -1417,6 +1608,111 @@ public: - return branchAdd32(cond, immTempRegister, dest); - } - -+ Jump branchAdd32(ResultCondition cond, TrustedImm32 imm, AbsoluteAddress dest) -+ { -+ ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); -+ if (cond == Overflow) { -+ /* -+ move dataTemp, dest -+ xori cmpTemp, dataTemp, imm -+ bltz cmpTemp, No_overflow # diff sign bit -> no overflow -+ addiu dataTemp, dataTemp, imm -+ move dest, dataTemp -+ xori cmpTemp, dataTemp, imm -+ bgez cmpTemp, No_overflow # same sign big -> no overflow -+ nop -+ b Overflow -+ nop -+ nop -+ nop -+ nop -+ nop -+ No_overflow: -+ */ -+ if (imm.m_value >= -32768 && imm.m_value <= 32767 && !m_fixedWidth) { -+ load32(dest.m_ptr, dataTempRegister); -+ m_assembler.xori(cmpTempRegister, dataTempRegister, imm.m_value); -+ m_assembler.bltz(cmpTempRegister, 10); -+ m_assembler.addiu(dataTempRegister, dataTempRegister, imm.m_value); -+ store32(dataTempRegister, dest.m_ptr); -+ m_assembler.xori(cmpTempRegister, dataTempRegister, imm.m_value); -+ m_assembler.bgez(cmpTempRegister, 7); -+ m_assembler.nop(); -+ } else { -+ load32(dest.m_ptr, dataTempRegister); -+ move(imm, immTempRegister); -+ m_assembler.xorInsn(cmpTempRegister, dataTempRegister, immTempRegister); -+ m_assembler.bltz(cmpTempRegister, 10); -+ m_assembler.addiu(dataTempRegister, dataTempRegister, immTempRegister); -+ store32(dataTempRegister, dest.m_ptr); -+ m_assembler.xori(cmpTempRegister, dataTempRegister, immTempRegister); -+ m_assembler.bgez(cmpTempRegister, 7); -+ m_assembler.nop(); -+ } -+ return jump(); -+ } -+ move(imm, immTempRegister); -+ load32(dest.m_ptr, dataTempRegister); -+ add32(immTempRegister, dataTempRegister); -+ store32(dataTempRegister, dest.m_ptr); -+ if (cond == Signed) { -+ // Check if dest is negative. -+ m_assembler.slt(cmpTempRegister, dataTempRegister, MIPSRegisters::zero); -+ return branchNotEqual(cmpTempRegister, MIPSRegisters::zero); -+ } -+ if (cond == Zero) -+ return branchEqual(dataTempRegister, MIPSRegisters::zero); -+ if (cond == NonZero) -+ return branchNotEqual(dataTempRegister, MIPSRegisters::zero); -+ ASSERT(0); -+ return Jump(); -+ } -+ -+ Jump branchMul32(ResultCondition cond, RegisterID src1, RegisterID src2, RegisterID dest) -+ { -+ ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); -+ if (cond == Overflow) { -+ /* -+ mult src, dest -+ mfhi dataTemp -+ mflo dest -+ sra addrTemp, dest, 31 -+ beq dataTemp, addrTemp, No_overflow # all sign bits (bit 63 to bit 31) are the same -> no overflow -+ nop -+ b Overflow -+ nop -+ nop -+ nop -+ nop -+ nop -+ No_overflow: -+ */ -+ m_assembler.mult(src1, src2); -+ m_assembler.mfhi(dataTempRegister); -+ m_assembler.mflo(dest); -+ m_assembler.sra(addrTempRegister, dest, 31); -+ m_assembler.beq(dataTempRegister, addrTempRegister, 7); -+ m_assembler.nop(); -+ return jump(); -+ } -+ if (cond == Signed) { -+ mul32(src1, src2, dest); -+ // Check if dest is negative. -+ m_assembler.slt(cmpTempRegister, dest, MIPSRegisters::zero); -+ return branchNotEqual(cmpTempRegister, MIPSRegisters::zero); -+ } -+ if (cond == Zero) { -+ mul32(src1, src2, dest); -+ return branchEqual(dest, MIPSRegisters::zero); -+ } -+ if (cond == NonZero) { -+ mul32(src1, src2, dest); -+ return branchNotEqual(dest, MIPSRegisters::zero); -+ } -+ ASSERT(0); -+ return Jump(); -+ } -+ - Jump branchMul32(ResultCondition cond, RegisterID src, RegisterID dest) - { - ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); -@@ -1465,8 +1761,7 @@ public: - Jump branchMul32(ResultCondition cond, TrustedImm32 imm, RegisterID src, RegisterID dest) - { - move(imm, immTempRegister); -- move(src, dest); -- return branchMul32(cond, immTempRegister, dest); -+ return branchMul32(cond, immTempRegister, src, dest); - } - - Jump branchSub32(ResultCondition cond, RegisterID src, RegisterID dest) -@@ -1525,8 +1820,60 @@ public: - Jump branchSub32(ResultCondition cond, RegisterID src, TrustedImm32 imm, RegisterID dest) - { - move(imm, immTempRegister); -- move(src, dest); -- return branchSub32(cond, immTempRegister, dest); -+ return branchSub32(cond, src, immTempRegister, dest); -+ } -+ -+ Jump branchSub32(ResultCondition cond, RegisterID op1, RegisterID op2, RegisterID dest) -+ { -+ ASSERT((cond == Overflow) || (cond == Signed) || (cond == Zero) || (cond == NonZero)); -+ if (cond == Overflow) { -+ /* -+ move dataTemp, op1 -+ xor cmpTemp, dataTemp, op2 -+ bgez cmpTemp, No_overflow # same sign bit -> no overflow -+ subu dest, dataTemp, op2 -+ xor cmpTemp, dest, dataTemp -+ bgez cmpTemp, No_overflow # same sign bit -> no overflow -+ nop -+ b Overflow -+ nop -+ nop -+ nop -+ nop -+ nop -+ No_overflow: -+ */ -+ move(op1, dataTempRegister); -+ m_assembler.xorInsn(cmpTempRegister, dataTempRegister, op2); -+ m_assembler.bgez(cmpTempRegister, 10); -+ m_assembler.subu(dest, dataTempRegister, op2); -+ m_assembler.xorInsn(cmpTempRegister, dest, dataTempRegister); -+ m_assembler.bgez(cmpTempRegister, 7); -+ m_assembler.nop(); -+ return jump(); -+ } -+ if (cond == Signed) { -+ sub32(op1, op2, dest); -+ // Check if dest is negative. -+ m_assembler.slt(cmpTempRegister, dest, MIPSRegisters::zero); -+ return branchNotEqual(cmpTempRegister, MIPSRegisters::zero); -+ } -+ if (cond == Zero) { -+ sub32(op1, op2, dest); -+ return branchEqual(dest, MIPSRegisters::zero); -+ } -+ if (cond == NonZero) { -+ sub32(op1, op2, dest); -+ return branchNotEqual(dest, MIPSRegisters::zero); -+ } -+ ASSERT(0); -+ return Jump(); -+ } -+ -+ Jump branchNeg32(ResultCondition cond, RegisterID srcDest) -+ { -+ m_assembler.li(dataTempRegister, -1); -+ return branchMul32(cond, dataTempRegister, srcDest); - } - - Jump branchOr32(ResultCondition cond, RegisterID src, RegisterID dest) -@@ -1578,7 +1925,8 @@ public: - - Call call(RegisterID target) - { -- m_assembler.jalr(target); -+ move(target, MIPSRegisters::t9); -+ m_assembler.jalr(MIPSRegisters::t9); - m_assembler.nop(); - return Call(m_assembler.label(), Call::None); - } -@@ -1822,7 +2170,7 @@ public: - lui immTemp, (address.offset + 0x8000) >> 16 - addu addrTemp, addrTemp, immTemp - lwc1 dest, (address.offset & 0xffff)(at) -- lwc1 dest+4, (address.offset & 0xffff + 4)(at) -+ lwc1 dest+1, (address.offset & 0xffff + 4)(at) - */ - m_assembler.sll(addrTempRegister, address.index, address.scale); - m_assembler.addu(addrTempRegister, addrTempRegister, address.base); -@@ -2009,6 +2357,19 @@ public: - #endif - } - -+ void moveDouble(FPRegisterID src, FPRegisterID dest) -+ { -+ if (src != dest || m_fixedWidth) -+ m_assembler.movd(dest, src); -+ } -+ -+ void swapDouble(FPRegisterID fr1, FPRegisterID fr2) -+ { -+ moveDouble(fr1, fpTempRegister); -+ moveDouble(fr2, fr1); -+ moveDouble(fpTempRegister, fr2); -+ } -+ - void addDouble(FPRegisterID src, FPRegisterID dest) - { - m_assembler.addd(dest, dest, src); -@@ -2036,6 +2397,11 @@ public: - m_assembler.subd(dest, dest, src); - } - -+ void subDouble(FPRegisterID op1, FPRegisterID op2, FPRegisterID dest) -+ { -+ m_assembler.subd(dest, op1, op2); -+ } -+ - void subDouble(Address src, FPRegisterID dest) - { - loadDouble(src, fpTempRegister); -@@ -2053,11 +2419,32 @@ public: - m_assembler.muld(dest, dest, fpTempRegister); - } - -+ void mulDouble(FPRegisterID op1, FPRegisterID op2, FPRegisterID dest) -+ { -+ m_assembler.muld(dest, op1, op2); -+ } -+ - void divDouble(FPRegisterID src, FPRegisterID dest) - { - m_assembler.divd(dest, dest, src); - } - -+ void divDouble(FPRegisterID op1, FPRegisterID op2, FPRegisterID dest) -+ { -+ m_assembler.divd(dest, op1, op2); -+ } -+ -+ void divDouble(Address src, FPRegisterID dest) -+ { -+ loadDouble(src, fpTempRegister); -+ m_assembler.divd(dest, dest, fpTempRegister); -+ } -+ -+ void negateDouble(FPRegisterID src, FPRegisterID dest) -+ { -+ m_assembler.negd(dest, src); -+ } -+ - void convertInt32ToDouble(RegisterID src, FPRegisterID dest) - { - m_assembler.mtc1(src, fpTempRegister); -@@ -2117,6 +2504,8 @@ public: - - Jump branchEqual(RegisterID rs, RegisterID rt) - { -+ m_assembler.nop(); -+ m_assembler.nop(); - m_assembler.appendJump(); - m_assembler.beq(rs, rt, 0); - m_assembler.nop(); -@@ -2126,6 +2515,8 @@ public: - - Jump branchNotEqual(RegisterID rs, RegisterID rt) - { -+ m_assembler.nop(); -+ m_assembler.nop(); - m_assembler.appendJump(); - m_assembler.bne(rs, rt, 0); - m_assembler.nop(); -@@ -2192,11 +2583,33 @@ public: - // If the result is not representable as a 32 bit value, branch. - // May also branch for some values that are representable in 32 bits - // (specifically, in this case, INT_MAX 0x7fffffff). -- Jump branchTruncateDoubleToInt32(FPRegisterID src, RegisterID dest) -+ enum BranchTruncateType { BranchIfTruncateFailed, BranchIfTruncateSuccessful }; -+ Jump branchTruncateDoubleToInt32(FPRegisterID src, RegisterID dest, BranchTruncateType branchType = BranchIfTruncateFailed) -+ { -+ m_assembler.truncwd(fpTempRegister, src); -+ m_assembler.mfc1(dest, fpTempRegister); -+ return branch32(branchType == BranchIfTruncateFailed ? Equal : NotEqual, dest, TrustedImm32(0x7fffffff)); -+ } -+ -+ Jump branchTruncateDoubleToUint32(FPRegisterID src, RegisterID dest, BranchTruncateType branchType = BranchIfTruncateFailed) -+ { -+ m_assembler.truncwd(fpTempRegister, src); -+ m_assembler.mfc1(dest, fpTempRegister); -+ return branch32(branchType == BranchIfTruncateFailed ? Equal : NotEqual, dest, TrustedImm32(0)); -+ } -+ -+ // Result is undefined if the value is outside of the integer range. -+ void truncateDoubleToInt32(FPRegisterID src, RegisterID dest) -+ { -+ m_assembler.truncwd(fpTempRegister, src); -+ m_assembler.mfc1(dest, fpTempRegister); -+ } -+ -+ // Result is undefined if src > 2^31 -+ void truncateDoubleToUint32(FPRegisterID src, RegisterID dest) - { - m_assembler.truncwd(fpTempRegister, src); - m_assembler.mfc1(dest, fpTempRegister); -- return branch32(Equal, dest, TrustedImm32(0x7fffffff)); - } - - // Convert 'src' to an integer, and places the resulting 'dest'. -@@ -2218,28 +2631,43 @@ public: - - Jump branchDoubleNonZero(FPRegisterID reg, FPRegisterID scratch) - { --#if WTF_MIPS_ISA_REV(2) && WTF_MIPS_FP64 -- m_assembler.mtc1(MIPSRegisters::zero, scratch); -- m_assembler.mthc1(MIPSRegisters::zero, scratch); --#else -- m_assembler.mtc1(MIPSRegisters::zero, scratch); -- m_assembler.mtc1(MIPSRegisters::zero, FPRegisterID(scratch + 1)); --#endif -+ m_assembler.vmov(scratch, MIPSRegisters::zero, MIPSRegisters::zero); - return branchDouble(DoubleNotEqual, reg, scratch); - } - - Jump branchDoubleZeroOrNaN(FPRegisterID reg, FPRegisterID scratch) - { --#if WTF_MIPS_ISA_REV(2) && WTF_MIPS_FP64 -- m_assembler.mtc1(MIPSRegisters::zero, scratch); -- m_assembler.mthc1(MIPSRegisters::zero, scratch); --#else -- m_assembler.mtc1(MIPSRegisters::zero, scratch); -- m_assembler.mtc1(MIPSRegisters::zero, FPRegisterID(scratch + 1)); --#endif -+ m_assembler.vmov(scratch, MIPSRegisters::zero, MIPSRegisters::zero); - return branchDouble(DoubleEqualOrUnordered, reg, scratch); - } - -+ // Invert a relational condition, e.g. == becomes !=, < becomes >=, etc. -+ static RelationalCondition invert(RelationalCondition cond) -+ { -+ RelationalCondition r; -+ if (cond == Equal) -+ r = NotEqual; -+ else if (cond == NotEqual) -+ r = Equal; -+ else if (cond == Above) -+ r = BelowOrEqual; -+ else if (cond == AboveOrEqual) -+ r = Below; -+ else if (cond == Below) -+ r = AboveOrEqual; -+ else if (cond == BelowOrEqual) -+ r = Above; -+ else if (cond == GreaterThan) -+ r = LessThanOrEqual; -+ else if (cond == GreaterThanOrEqual) -+ r = LessThan; -+ else if (cond == LessThan) -+ r = GreaterThanOrEqual; -+ else if (cond == LessThanOrEqual) -+ r = GreaterThan; -+ return r; -+ } -+ - void nop() - { - m_assembler.nop(); -@@ -2252,12 +2680,12 @@ public: - - static void replaceWithJump(CodeLocationLabel instructionStart, CodeLocationLabel destination) - { -- RELEASE_ASSERT_NOT_REACHED(); -+ MIPSAssembler::replaceWithJump(instructionStart.dataLocation(), destination.dataLocation()); - } - - static ptrdiff_t maxJumpReplacementSize() - { -- RELEASE_ASSERT_NOT_REACHED(); -+ MIPSAssembler::maxJumpReplacementSize(); - return 0; - } - -diff --git a/Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h b/Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h -index fa0f5e0..573d8dc 100644 ---- a/Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h -+++ b/Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h -@@ -93,6 +93,23 @@ public: - } - #endif - -+#if CPU(MIPS) -+ ALWAYS_INLINE void preserveReturnAddressAfterCall(RegisterID reg) -+ { -+ move(returnAddressRegister, reg); -+ } -+ -+ ALWAYS_INLINE void restoreReturnAddressBeforeReturn(RegisterID reg) -+ { -+ move(reg, returnAddressRegister); -+ } -+ -+ ALWAYS_INLINE void restoreReturnAddressBeforeReturn(Address address) -+ { -+ loadPtr(address, returnAddressRegister); -+ } -+#endif -+ - void emitGetFromCallFrameHeaderPtr(JSStack::CallFrameHeaderEntry entry, GPRReg to) - { - loadPtr(Address(GPRInfo::callFrameRegister, entry * sizeof(Register)), to); -@@ -193,7 +210,7 @@ public: - move(TrustedImmPtr(scratchBuffer->activeLengthPtr()), GPRInfo::regT0); - storePtr(TrustedImmPtr(scratchSize), GPRInfo::regT0); - --#if CPU(X86_64) || CPU(ARM) -+#if CPU(X86_64) || CPU(ARM) || CPU(MIPS) - move(TrustedImmPtr(buffer), GPRInfo::argumentGPR2); - move(TrustedImmPtr(argument), GPRInfo::argumentGPR1); - move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0); -diff --git a/Source/JavaScriptCore/dfg/DFGCCallHelpers.h b/Source/JavaScriptCore/dfg/DFGCCallHelpers.h -index 8adde05..3d99f6f 100644 ---- a/Source/JavaScriptCore/dfg/DFGCCallHelpers.h -+++ b/Source/JavaScriptCore/dfg/DFGCCallHelpers.h -@@ -576,6 +576,39 @@ public: - poke(GPRInfo::nonArgGPR0); - } - #endif // CPU(ARM_HARDFP) -+#elif CPU(MIPS) -+ ALWAYS_INLINE void setupArguments(FPRReg arg1) -+ { -+ moveDouble(arg1, FPRInfo::argumentFPR0); -+ } -+ -+ ALWAYS_INLINE void setupArguments(FPRReg arg1, FPRReg arg2) -+ { -+ if (arg2 != FPRInfo::argumentFPR0) { -+ moveDouble(arg1, FPRInfo::argumentFPR0); -+ moveDouble(arg2, FPRInfo::argumentFPR1); -+ } else if (arg1 != FPRInfo::argumentFPR1) { -+ moveDouble(arg2, FPRInfo::argumentFPR1); -+ moveDouble(arg1, FPRInfo::argumentFPR0); -+ } else { -+ // Swap arg1, arg2. -+ swapDouble(FPRInfo::argumentFPR0, FPRInfo::argumentFPR1); -+ } -+ } -+ -+ ALWAYS_INLINE void setupArgumentsWithExecState(FPRReg arg1, GPRReg arg2) -+ { -+ assembler().vmov(GPRInfo::argumentGPR2, GPRInfo::argumentGPR3, arg1); -+ move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0); -+ poke(arg2, 4); -+ } -+ -+ ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, FPRReg arg3) -+ { -+ setupStubArguments(arg1, arg2); -+ move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0); -+ poke(arg3, 4); -+ } - #else - #error "DFG JIT not supported on this platform." - #endif -@@ -803,119 +836,126 @@ public: - // These methods are suitable for any calling convention that provides for - // exactly 4 argument registers, e.g. ARMv7. - #if NUMBER_OF_ARGUMENT_REGISTERS == 4 -+ -+#if CPU(MIPS) -+#define POKE_ARGUMENT_OFFSET 4 -+#else -+#define POKE_ARGUMENT_OFFSET 0 -+#endif -+ - ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4) - { -- poke(arg4); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, GPRReg arg3, TrustedImm32 arg4) - { -- poke(arg4); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, TrustedImmPtr arg2, TrustedImm32 arg3, GPRReg arg4) - { -- poke(arg4); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, TrustedImmPtr arg2, TrustedImm32 arg3, GPRReg arg4, GPRReg arg5) - { -- poke(arg5, 1); -- poke(arg4); -+ poke(arg5, POKE_ARGUMENT_OFFSET + 1); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImm32 arg4) - { -- poke(arg4); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, TrustedImm32 arg2, GPRReg arg3, GPRReg arg4) - { -- poke(arg4); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, GPRReg arg3, TrustedImmPtr arg4) - { -- poke(arg4); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, GPRReg arg5) - { -- poke(arg5, 1); -- poke(arg4); -+ poke(arg5, POKE_ARGUMENT_OFFSET + 1); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4) - { -- poke(arg4); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, TrustedImmPtr arg4) - { -- poke(arg4); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, TrustedImm32 arg3, TrustedImmPtr arg4) - { -- poke(arg4); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4) - { -- poke(arg4); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, GPRReg arg5) - { -- poke(arg5, 1); -- poke(arg4); -+ poke(arg5, POKE_ARGUMENT_OFFSET + 1); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, TrustedImm32 arg5) - { -- poke(arg5, 1); -- poke(arg4); -+ poke(arg5, POKE_ARGUMENT_OFFSET + 1); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, TrustedImmPtr arg5) - { -- poke(arg5, 1); -- poke(arg4); -+ poke(arg5, POKE_ARGUMENT_OFFSET + 1); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, TrustedImm32 arg4, TrustedImm32 arg5) - { -- poke(arg5, 1); -- poke(arg4); -+ poke(arg5, POKE_ARGUMENT_OFFSET + 1); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, TrustedImm32 arg2, TrustedImm32 arg3, GPRReg arg4, GPRReg arg5) - { -- poke(arg5, 1); -- poke(arg4); -+ poke(arg5, POKE_ARGUMENT_OFFSET + 1); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - - ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, GPRReg arg5) - { -- poke(arg5, 1); -- poke(arg4); -+ poke(arg5, POKE_ARGUMENT_OFFSET + 1); -+ poke(arg4, POKE_ARGUMENT_OFFSET); - setupArgumentsWithExecState(arg1, arg2, arg3); - } - -diff --git a/Source/JavaScriptCore/dfg/DFGFPRInfo.h b/Source/JavaScriptCore/dfg/DFGFPRInfo.h -index 17aaa7d..e18ec06 100644 ---- a/Source/JavaScriptCore/dfg/DFGFPRInfo.h -+++ b/Source/JavaScriptCore/dfg/DFGFPRInfo.h -@@ -164,6 +164,74 @@ public: - - #endif - -+#if CPU(MIPS) -+ -+class FPRInfo { -+public: -+ typedef FPRReg RegisterType; -+ static const unsigned numberOfRegisters = 6; -+ -+ // Temporary registers. -+ static const FPRReg fpRegT0 = MIPSRegisters::f0; -+ static const FPRReg fpRegT1 = MIPSRegisters::f4; -+ static const FPRReg fpRegT2 = MIPSRegisters::f6; -+ static const FPRReg fpRegT3 = MIPSRegisters::f8; -+ static const FPRReg fpRegT4 = MIPSRegisters::f10; -+ static const FPRReg fpRegT5 = MIPSRegisters::f18; -+ -+ static const FPRReg returnValueFPR = MIPSRegisters::f0; -+ -+ static const FPRReg argumentFPR0 = MIPSRegisters::f12; -+ static const FPRReg argumentFPR1 = MIPSRegisters::f14; -+ -+ static FPRReg toRegister(unsigned index) -+ { -+ static const FPRReg registerForIndex[numberOfRegisters] = { -+ fpRegT0, fpRegT1, fpRegT2, fpRegT3, fpRegT4, fpRegT5 }; -+ -+ ASSERT(index < numberOfRegisters); -+ return registerForIndex[index]; -+ } -+ -+ static unsigned toIndex(FPRReg reg) -+ { -+ ASSERT(reg != InvalidFPRReg); -+ ASSERT(reg < 20); -+ static const unsigned indexForRegister[20] = { -+ 0, InvalidIndex, InvalidIndex, InvalidIndex, -+ 1, InvalidIndex, 2, InvalidIndex, -+ 3, InvalidIndex, 4, InvalidIndex, -+ InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, -+ InvalidIndex, InvalidIndex, 5, InvalidIndex, -+ }; -+ unsigned result = indexForRegister[reg]; -+ ASSERT(result != InvalidIndex); -+ return result; -+ } -+ -+ static const char* debugName(FPRReg reg) -+ { -+ ASSERT(reg != InvalidFPRReg); -+ ASSERT(reg < 32); -+ static const char* nameForRegister[32] = { -+ "f0", "f1", "f2", "f3", -+ "f4", "f5", "f6", "f7", -+ "f8", "f9", "f10", "f11", -+ "f12", "f13", "f14", "f15" -+ "f16", "f17", "f18", "f19" -+ "f20", "f21", "f22", "f23" -+ "f24", "f25", "f26", "f27" -+ "f28", "f29", "f30", "f31" -+ }; -+ return nameForRegister[reg]; -+ } -+private: -+ -+ static const unsigned InvalidIndex = 0xffffffff; -+}; -+ -+#endif -+ - typedef RegisterBank::iterator fpr_iterator; - - } } // namespace JSC::DFG -diff --git a/Source/JavaScriptCore/dfg/DFGGPRInfo.h b/Source/JavaScriptCore/dfg/DFGGPRInfo.h -index 3d07556..aa634cd 100644 ---- a/Source/JavaScriptCore/dfg/DFGGPRInfo.h -+++ b/Source/JavaScriptCore/dfg/DFGGPRInfo.h -@@ -461,6 +461,73 @@ private: - - #endif - -+#if CPU(MIPS) -+#define NUMBER_OF_ARGUMENT_REGISTERS 4 -+ -+class GPRInfo { -+public: -+ typedef GPRReg RegisterType; -+ static const unsigned numberOfRegisters = 6; -+ -+ // Temporary registers. -+ static const GPRReg regT0 = MIPSRegisters::v0; -+ static const GPRReg regT1 = MIPSRegisters::v1; -+ static const GPRReg regT2 = MIPSRegisters::t4; -+ static const GPRReg regT3 = MIPSRegisters::t5; -+ static const GPRReg regT4 = MIPSRegisters::t6; -+ static const GPRReg regT5 = MIPSRegisters::t7; -+ // These registers match the baseline JIT. -+ static const GPRReg cachedResultRegister = regT0; -+ static const GPRReg cachedResultRegister2 = regT1; -+ static const GPRReg callFrameRegister = MIPSRegisters::s0; -+ // These constants provide the names for the general purpose argument & return value registers. -+ static const GPRReg argumentGPR0 = MIPSRegisters::a0; -+ static const GPRReg argumentGPR1 = MIPSRegisters::a1; -+ static const GPRReg argumentGPR2 = MIPSRegisters::a2; -+ static const GPRReg argumentGPR3 = MIPSRegisters::a3; -+ static const GPRReg nonArgGPR0 = regT2; -+ static const GPRReg nonArgGPR1 = regT3; -+ static const GPRReg nonArgGPR2 = regT4; -+ static const GPRReg returnValueGPR = regT0; -+ static const GPRReg returnValueGPR2 = regT1; -+ static const GPRReg nonPreservedNonReturnGPR = regT5; -+ -+ static GPRReg toRegister(unsigned index) -+ { -+ ASSERT(index < numberOfRegisters); -+ static const GPRReg registerForIndex[numberOfRegisters] = { regT0, regT1, regT2, regT3, regT4, regT5 }; -+ return registerForIndex[index]; -+ } -+ -+ static unsigned toIndex(GPRReg reg) -+ { -+ ASSERT(reg != InvalidGPRReg); -+ ASSERT(reg < 16); -+ static const unsigned indexForRegister[16] = { InvalidIndex, InvalidIndex, 0, 1, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, InvalidIndex, 2, 3, 4, 5 }; -+ unsigned result = indexForRegister[reg]; -+ ASSERT(result != InvalidIndex); -+ return result; -+ } -+ -+ static const char* debugName(GPRReg reg) -+ { -+ ASSERT(reg != InvalidGPRReg); -+ ASSERT(reg < 16); -+ static const char* nameForRegister[16] = { -+ "zero", "at", "v0", "v1", -+ "a0", "a1", "a2", "a3", -+ "t0", "t1", "t2", "t3", -+ "t4", "t5", "t6", "t7" -+ }; -+ return nameForRegister[reg]; -+ } -+private: -+ -+ static const unsigned InvalidIndex = 0xffffffff; -+}; -+ -+#endif -+ - typedef RegisterBank::iterator gpr_iterator; - - } } // namespace JSC::DFG -diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h -index ea33f38..247274b 100644 ---- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h -+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h -@@ -1241,7 +1241,7 @@ public: - - // EncodedJSValue in JSVALUE32_64 is a 64-bit integer. When being compiled in ARM EABI, it must be aligned even-numbered register (r0, r2 or [sp]). - // To avoid assemblies from using wrong registers, let's occupy r1 or r3 with a dummy argument when necessary. --#if COMPILER_SUPPORTS(EABI) && CPU(ARM) -+#if (COMPILER_SUPPORTS(EABI) && CPU(ARM)) || CPU(MIPS) - #define EABI_32BIT_DUMMY_ARG TrustedImm32(0), - #else - #define EABI_32BIT_DUMMY_ARG -@@ -1691,7 +1691,7 @@ public: - } - #endif - --#if !defined(NDEBUG) && !CPU(ARM) -+#if !defined(NDEBUG) && !CPU(ARM) && !CPU(MIPS) - void prepareForExternalCall() - { - // We're about to call out to a "native" helper function. The helper -diff --git a/Source/JavaScriptCore/jit/JSInterfaceJIT.h b/Source/JavaScriptCore/jit/JSInterfaceJIT.h -index 7fdeaf0..48ad6b2 100644 ---- a/Source/JavaScriptCore/jit/JSInterfaceJIT.h -+++ b/Source/JavaScriptCore/jit/JSInterfaceJIT.h -@@ -125,6 +125,10 @@ namespace JSC { - static const RegisterID cachedResultRegister = MIPSRegisters::v0; - static const RegisterID firstArgumentRegister = MIPSRegisters::a0; - -+#if ENABLE(VALUE_PROFILER) -+ static const RegisterID bucketCounterRegister = MIPSRegisters::s3; -+#endif -+ - // regT0 must be v0 for returning a 32-bit value. - static const RegisterID regT0 = MIPSRegisters::v0; - -diff --git a/Source/JavaScriptCore/runtime/JSGlobalData.h b/Source/JavaScriptCore/runtime/JSGlobalData.h -index 5d47ab9..c02f336 100644 ---- a/Source/JavaScriptCore/runtime/JSGlobalData.h -+++ b/Source/JavaScriptCore/runtime/JSGlobalData.h -@@ -141,14 +141,18 @@ namespace JSC { - return result; - } - -- static size_t allocationSize(size_t bufferSize) { return sizeof(size_t) + bufferSize; } -+ static size_t allocationSize(size_t bufferSize) { return sizeof(ScratchBuffer) + bufferSize; } - void setActiveLength(size_t activeLength) { m_activeLength = activeLength; } - size_t activeLength() const { return m_activeLength; }; - size_t* activeLengthPtr() { return &m_activeLength; }; - void* dataBuffer() { return m_buffer; } - - size_t m_activeLength; -+#if CPU(MIPS) && (defined WTF_MIPS_ARCH_REV && WTF_MIPS_ARCH_REV == 2) -+ void* m_buffer[0] __attribute__((aligned(8))); -+#else - void* m_buffer[0]; -+#endif - }; - #if COMPILER(MSVC) - #pragma warning(pop) -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 1698247..2d90359 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -818,6 +818,10 @@ - #if CPU(ARM_TRADITIONAL) - #define ENABLE_DFG_JIT 1 - #endif -+/* Enable the DFG JIT on MIPS. */ -+#if CPU(MIPS) -+#define ENABLE_DFG_JIT 1 -+#endif - #endif - - /* If the jit is not available, enable the LLInt C Loop: */ --- -1.8.3.2 - diff --git a/package/webkit/0008-support-bison-3.0.patch b/package/webkit/0008-support-bison-3.0.patch deleted file mode 100644 index c081b207ee..0000000000 --- a/package/webkit/0008-support-bison-3.0.patch +++ /dev/null @@ -1,22 +0,0 @@ -ANGLE doesn't build with bison 3.0 - -Author: allan.jensen@digia.com -​https://bugs.webkit.org/show_bug.cgi?id=119798 -Reviewed by Antti Koivisto. -Make glslang.y compatible with bison 3.0, by using %lex-param -to set YYLEX_PARAM and getting rid of useless YYID macro. - -From upstream: http://trac.webkit.org/changeset/154109 -[Arnout: adapted to our older webkit version] -Signed-off-by: Arnout Vandecaeppelle (Essensium/Mind) ---- -Index: trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y -=================================================================== ---- trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y (revision 154108) -+++ trunk/Source/ThirdParty/ANGLE/src/compiler/glslang.y (revision 154109) -@@ -48,4 +48,5 @@ - %pure-parser - %parse-param {TParseContext* context} -+%lex-param {YYLEX_PARAM} - - %union { diff --git a/package/webkit/Config.in b/package/webkit/Config.in deleted file mode 100644 index c139f5212c..0000000000 --- a/package/webkit/Config.in +++ /dev/null @@ -1,53 +0,0 @@ -config BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS - bool - # ARM needs BLX, so v5t+ - default y if (BR2_arm || BR2_armeb) && !BR2_ARM_CPU_ARMV4 - default y if BR2_i386 || BR2_mips || BR2_mipsel || \ - BR2_sparc || BR2_x86_64 - depends on BR2_USE_MMU # libgail -> pango -> libglib2 - depends on BR2_DEPRECATED_SINCE_2015_08 - -# disabled on powerpc due to bug https://bugs.webkit.org/show_bug.cgi?id=113638 - -config BR2_PACKAGE_WEBKIT - bool "webkit" - depends on BR2_DEPRECATED_SINCE_2015_08 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # enchant -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # enchant -> libglib2; icu - depends on BR2_PACKAGE_LIBGTK2 - depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS - depends on !BR2_BINFMT_FLAT # icu - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_ENCHANT - select BR2_PACKAGE_HARFBUZZ - select BR2_PACKAGE_ICU - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBGAIL - select BR2_PACKAGE_LIBSECRET - select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_WEBP - select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_HAS_LIBGL - help - WebKit is an open source, standards compliant web browser engine. - - Note that WebKit does not build with a toolchain using the - old linuxthreads library. - - http://webkit.org/ - -comment "webkit needs libgtk2 and a toolchain w/ C++, wchar, threads" - depends on BR2_DEPRECATED_SINCE_2015_08 - depends on BR2_PACKAGE_WEBKIT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU diff --git a/package/webkit/webkit.hash b/package/webkit/webkit.hash deleted file mode 100644 index 59a974df8f..0000000000 --- a/package/webkit/webkit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 51f808c96f52729dde6fb2b58752a6f623aeea74ff1ac6d4a1658720c6206fbe webkitgtk-1.11.5.tar.xz diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk deleted file mode 100644 index bbde7f4a26..0000000000 --- a/package/webkit/webkit.mk +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# -# webkit -# -################################################################################ - -WEBKIT_VERSION = 1.11.5 -WEBKIT_SITE = http://www.webkitgtk.org/releases -WEBKIT_SOURCE = webkitgtk-$(WEBKIT_VERSION).tar.xz -WEBKIT_INSTALL_STAGING = YES -WEBKIT_DEPENDENCIES = host-ruby host-flex host-bison host-gperf enchant harfbuzz \ - icu jpeg libcurl libgail libsecret libsoup libxml2 libxslt libgtk2 sqlite webp - -WEBKIT_DEPENDENCIES += \ - $(if $(BR_PACKAGE_XLIB_LIBXCOMPOSITE),xlib_libXcomposite) \ - $(if $(BR_PACKAGE_XLIB_LIBXDAMAGE),xlib_libXdamage) - -# webkit-disable-tests.patch changes configure.ac therefore autoreconf required -WEBKIT_AUTORECONF = YES -WEBKIT_AUTORECONF_OPTS = -I $(@D)/Source/autotools - -# parallel make install deadlocks with make 3.81 -WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install -WEBKIT_INSTALL_TARGET_OPTS = -j1 DESTDIR=$(TARGET_DIR) install - -# Does not build and it's disabled by default -# in newer releases -define DISABLE_INDEXED_DATABASE - $(SED) '/ENABLE_INDEXED_DATABASE/s:1:0:' \ - $(@D)/Source/WebCore/GNUmakefile.features.am -endef - -WEBKIT_PRE_CONFIGURE_HOOKS += DISABLE_INDEXED_DATABASE - -# Give explicit path to icu-config, and silence gazillions of warnings -# with recent gcc versions. -WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config \ - CFLAGS="$(TARGET_CFLAGS) -Wno-cast-align -Wno-sign-compare" \ - CXXFLAGS="$(TARGET_CXXFLAGS) -Wno-cast-align -Wno-sign-compare" \ - AR_FLAGS="cru" - -WEBKIT_CONF_OPTS += \ - --enable-dependency-tracking \ - --with-gtk=2.0 \ - --disable-geolocation \ - --disable-webkit2 \ - --disable-glibtest \ - --disable-video \ - --disable-tests - -# Xorg Dependencies -WEBKIT_CONF_OPTS += --with-target=x11 -WEBKIT_DEPENDENCIES += xlib_libXt - -ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy) -WEBKIT_CONF_OPTS += --enable-gles2 -WEBKIT_DEPENDENCIES += libegl libgles -else -WEBKIT_CONF_OPTS += --disable-gles2 -endif - -# gles/egl support is prefered over opengl by webkit configure -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -WEBKIT_CONF_OPTS += --with-acceleration-backend=opengl -WEBKIT_DEPENDENCIES += libgl -else -# OpenGL/glx is auto-detected due to the presence of gl.h/glx.h, which is not -# enough, so disable glx and the use of the OpenGL acceleration backend here -WEBKIT_CONF_OPTS += --disable-glx --with-acceleration-backend=none -endif - -$(eval $(autotools-package)) From 9fd27816cb359696724dedc20141be50b10fea0e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 8 Sep 2016 15:39:00 -0300 Subject: [PATCH 0198/3392] libgail: remove deprecated package It's unused and has been deprecated for some time now. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 - .../libgail/0001-Relax-X11-dependencies.patch | 42 ------------------- package/libgail/Config.in | 31 -------------- package/libgail/libgail.hash | 2 - package/libgail/libgail.mk | 22 ---------- 5 files changed, 98 deletions(-) delete mode 100644 package/libgail/0001-Relax-X11-dependencies.patch delete mode 100644 package/libgail/Config.in delete mode 100644 package/libgail/libgail.hash delete mode 100644 package/libgail/libgail.mk diff --git a/package/Config.in b/package/Config.in index aa2fc4bc36..332f05d90d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -959,7 +959,6 @@ menu "Graphics" source "package/libfm-extra/Config.in" source "package/libfreeglut/Config.in" source "package/libfreeimage/Config.in" - source "package/libgail/Config.in" source "package/libgdiplus/Config.in" source "package/libgeotiff/Config.in" source "package/libglade/Config.in" diff --git a/package/libgail/0001-Relax-X11-dependencies.patch b/package/libgail/0001-Relax-X11-dependencies.patch deleted file mode 100644 index 97e56560d6..0000000000 --- a/package/libgail/0001-Relax-X11-dependencies.patch +++ /dev/null @@ -1,42 +0,0 @@ -From cca72c48b5643fa62e1d55b7b181e147f5ba7fe9 Mon Sep 17 00:00:00 2001 -From: Lionel Landwerlin -Date: Sun, 28 Mar 2010 21:47:38 +0200 -Subject: [PATCH] Relax X11 dependency - -Signed-off-by: Lionel Landwerlin ---- - configure.in | 4 +++- - gail/gailwindow.c | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 3801655..abaf417 100644 ---- a/configure.in -+++ b/configure.in -@@ -86,7 +86,9 @@ GTK_REQUIRED_VERSION=2.9.4 - PKG_CHECK_MODULES(DEP, $ATK_PACKAGES >= $ATK_REQUIRED_VERSION \ - $GTK_PACKAGES >= $GTK_REQUIRED_VERSION) - --if test "$gail_native_win32" != "yes"; then -+AC_ARG_ENABLE(x, [ --disable-x disable x11 backend ],x11_backend=no,x11_backend=yes) -+ -+if test "$gail_native_win32" != "yes" -a "$x11_backend" != "no"; then - - PKG_CHECK_MODULES(X, x11, :, [ - # pkg-config modules not found (only present since X11R7 aka Xorg); use -diff --git a/gail/gailwindow.c b/gail/gailwindow.c -index 616b25e..add454b 100644 ---- a/gail/gailwindow.c -+++ b/gail/gailwindow.c -@@ -1071,7 +1071,7 @@ gail_window_get_mdi_zorder (AtkComponent *component) - return get_window_zorder (widget->window); - } - --#elif defined (GDK_WINDOWING_WIN32) -+#elif defined (GDK_WINDOWING_WIN32) || defined (GDK_WINDOWING_DIRECTFB) - - static gint - gail_window_get_mdi_zorder (AtkComponent *component) --- -1.7.0.2 - diff --git a/package/libgail/Config.in b/package/libgail/Config.in deleted file mode 100644 index 821a922fa5..0000000000 --- a/package/libgail/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_LIBGAIL - bool "libgail" - depends on BR2_USE_WCHAR # pango -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2 - depends on BR2_USE_MMU # pango -> libglib2 - depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_PACKAGE_LIBGTK2 - depends on BR2_DEPRECATED_SINCE_2015_08 - select BR2_PACKAGE_PANGO - help - GAIL provides accessibility support for gtk+ and - libgnomecanvas by implementing AtkObjects for widgets in - gtk+ and libgnomecanvas. - - The GAIL library is a GTK+ module. For example, if the - module is loaded in a program which calls - gtk_widget_get_accessible() for a GtkEntry an instance of - GailEntry is returned. This module is normally used with the - atk-bridge GTK+ module from at-spi to allow an assistive - technology, e.g a screenreader, to query or drive the - program. - - http://developer.gnome.org/projects/gap - -comment "libgail needs a toolchain w/ C++, wchar, threads" - depends on BR2_PACKAGE_LIBGTK2 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_DEPRECATED_SINCE_2015_08 diff --git a/package/libgail/libgail.hash b/package/libgail/libgail.hash deleted file mode 100644 index 5cfd7525bd..0000000000 --- a/package/libgail/libgail.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gail/1.22/gail-1.22.3.sha256sum -sha256 03f03029277eb4f0e2c15a825fe716245d8647ede0435645475110289b059ae8 gail-1.22.3.tar.bz2 diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk deleted file mode 100644 index 4c5c8684e9..0000000000 --- a/package/libgail/libgail.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libgail -# -################################################################################ - -LIBGAIL_VERSION_MAJOR = 1.22 -LIBGAIL_VERSION = $(LIBGAIL_VERSION_MAJOR).3 -LIBGAIL_SOURCE = gail-$(LIBGAIL_VERSION).tar.bz2 -LIBGAIL_SITE = http://ftp.gnome.org/pub/gnome/sources/gail/$(LIBGAIL_VERSION_MAJOR) -LIBGAIL_AUTORECONF = YES -LIBGAIL_INSTALL_STAGING = YES -LIBGAIL_LICENSE = LGPLv2+ -LIBGAIL_LICENSE_FILES = COPYING - -ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y) -LIBGAIL_CONF_OPTS += --disable-x -endif - -LIBGAIL_DEPENDENCIES = host-pkgconf libgtk2 pango - -$(eval $(autotools-package)) From b2216c6bb472d9e91c3f4e3f974d7a7af759ed77 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 8 Sep 2016 15:39:02 -0300 Subject: [PATCH 0199/3392] Config.in: remove BR2_DEPRECATED_SINCE_2015_08 It's now unused. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- Config.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Config.in b/Config.in index 74d29b0770..6db36b926c 100644 --- a/Config.in +++ b/Config.in @@ -369,10 +369,6 @@ config BR2_DEPRECATED if BR2_DEPRECATED -config BR2_DEPRECATED_SINCE_2015_08 - bool - default y - config BR2_DEPRECATED_SINCE_2015_11 bool default y From d981c4b34a87db5833f42f050d7f548926994c98 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 8 Sep 2016 13:12:29 -0300 Subject: [PATCH 0200/3392] configs: Add support for warp7 board Add support for warp7, which is a board based on NXP i.MX7S processor. More information about warp7 can be found at: https://www.element14.com/community/docs/DOC-79058 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/warp7/genimage.cfg | 41 +++++++++++++++++ board/warp7/post-image.sh | 14 ++++++ board/warp7/readme.txt | 93 +++++++++++++++++++++++++++++++++++++++ configs/warp7_defconfig | 36 +++++++++++++++ 4 files changed, 184 insertions(+) create mode 100644 board/warp7/genimage.cfg create mode 100755 board/warp7/post-image.sh create mode 100644 board/warp7/readme.txt create mode 100644 configs/warp7_defconfig diff --git a/board/warp7/genimage.cfg b/board/warp7/genimage.cfg new file mode 100644 index 0000000000..6d963acd5d --- /dev/null +++ b/board/warp7/genimage.cfg @@ -0,0 +1,41 @@ +# Minimal eMMC image for the Warp board +# +# We mimic the .sdcard Freescale's image format for i.MX7S: +# * the eMMC card must have 1 kB free space at the beginning, +# * U-Boot is dumped as is, +# * a FAT partition at offset 8 MB is containing zImage and dtbs, +# * a single root filesystem partition is required (Ext4 in this case). +# + +image boot.vfat { + vfat { + files = { + "imx7s-warp.dtb", + "zImage" + } + } + size = 16M +} + +image emmc.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot.imx" + offset = 1024 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/warp7/post-image.sh b/board/warp7/post-image.sh new file mode 100755 index 0000000000..b4ac4608ff --- /dev/null +++ b/board/warp7/post-image.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/warp7/readme.txt b/board/warp7/readme.txt new file mode 100644 index 0000000000..3c765f5524 --- /dev/null +++ b/board/warp7/readme.txt @@ -0,0 +1,93 @@ +***************** +Warp i.MX7S board +***************** + +This file documents the Buildroot support for the Warp i.MX7S board. + +Build +===== + +First, configure Buildroot for the Warp i.MX7S board: + + make warp7_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - imx7s-warp.dtb + - rootfs.ext4 + - rootfs.tar + - emmc.img + - u-boot.imx + - zImage + +Flash the eMMC image +==================== + +In the U-Boot prompt lauch: + +=> ums 0 mmc 0 + +This will mount the eMMC content in the host PC as a mass storage device. + +To determine the device associated to the eMMC have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "emmc.img" image in the output/images/ +directory, ready to be dumped into the eMMC. Launch the following +command: + +sudo dd if=output/images/emmc.img of=/dev/ + +*** WARNING! This will destroy all the eMMC content. Use it with care! *** + +For details about the medium image layout, see the definition in +board/warp7/genimage.cfg. + +How to recover from a bad eMMC image +==================================== + +In case a bad U-Boot has been flashed to the eMMC and the board no +longer boots, it is possible to recover using the imx_usb_loader utility. + +Put the warp7 board in USB download mode by removing the CPU board +from the base board then putting switch 2 in the upper position. + +Connect a USB to serial adapter between the host PC and warp7 serial +USB port, and also a USB cable between the OTG warp7 port and the host +PC. + +Copy u-boot.imx to the imx_usb_loader folder. + +Load u-boot.imx via USB: + +$ sudo ./imx_usb u-boot.imx + +Then U-Boot should start and its messages will appear in the console program. + +Open a terminal program such as minicom. + +Use the default environment variables: + +=> env default -f -a +=> saveenv +=> ums 0 mmc 0 + +sudo dd if=output/images/emmc.img of=/dev/ + +Put warp7 back in eMMC boot mode by placing switch 2 in the lower position +and reboot the board. + +Boot the Warp i.MX7S board +========================== + +To boot your newly created system: +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig new file mode 100644 index 0000000000..0da34c324e --- /dev/null +++ b/configs/warp7_defconfig @@ -0,0 +1,36 @@ +# architecture +BR2_arm=y +BR2_cortex_a7=y + +# Linux headers same as kernel, a 4.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y + +# system +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Freescale/linux-fslc.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="efaf36531fe7b1fc15a48033e5972825c91f9fc6" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" + +# U-Boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="warp7" +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Freescale/u-boot-fslc.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="7a8868eb526b7c1d5dc274bc666bfaef9585ba7c" +BR2_TARGET_UBOOT_FORMAT_IMX=y + +# Filesystem +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/warp7/post-image.sh" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# required tools to create the eMMC image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From e14ae6f9e4058a136e153bb89669c1fc329a6376 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 8 Sep 2016 15:26:16 +0300 Subject: [PATCH 0201/3392] leveldb: fix static build Since version 1.19 Makefile variable names changed. Update the build command accordingly. While at it, remove variables that Makefile doesn't use anymore. This change means that the static library is always build, even when BR2_SHARED_LIBS=y, since the static library name is hard coded in leveldb Makefile. Fixes: http://autobuild.buildroot.net/results/00c/00c8c5a1d6001eaebfe2a9f848dd292c91bf6a79/ Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/leveldb/leveldb.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk index 2ce3e4ace4..ca2ed703a0 100644 --- a/package/leveldb/leveldb.mk +++ b/package/leveldb/leveldb.mk @@ -11,17 +11,9 @@ LEVELDB_LICENSE_FILES = LICENSE LEVELDB_INSTALL_STAGING = YES LEVELDB_DEPENDENCIES = snappy -# We will pass optimisation level via CFLAGS so remove leveldb default -LEVELDB_MAKE_ARGS += OPTIM= - -# Disable the static library for shared only build -ifeq ($(BR2_SHARED_LIBS),y) -LEVELDB_MAKE_ARGS += LIBRARY= -endif - # Disable the shared library for static only build ifeq ($(BR2_STATIC_LIBS),y) -LEVELDB_MAKE_ARGS += SHARED= +LEVELDB_MAKE_ARGS += SHARED_LIBS= SHARED_PROGRAMS= endif define LEVELDB_BUILD_CMDS From b43f50320dded7665510733c91f6c26ce53b82e8 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 8 Sep 2016 15:26:17 +0300 Subject: [PATCH 0202/3392] leveldb: fix staging and target installation The patch adding target/staging installation support needs variable names update to account for upstream changes in version 1.19. Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/leveldb/0002-Add-install-recipe.patch | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/package/leveldb/0002-Add-install-recipe.patch b/package/leveldb/0002-Add-install-recipe.patch index 8645a6464c..f65916f1eb 100644 --- a/package/leveldb/0002-Add-install-recipe.patch +++ b/package/leveldb/0002-Add-install-recipe.patch @@ -1,21 +1,23 @@ -From 818d59f093100d5f39db34d5686a9d983172d307 Mon Sep 17 00:00:00 2001 +From bf646b73391d3d2d0b9780a399dd24880c66b9ab Mon Sep 17 00:00:00 2001 From: Steve James Date: Sun, 5 Apr 2015 16:30:46 +0200 Subject: [PATCH 2/2] Add install recipe -Upstream-Status: Submitted [https://github.com/google/leveldb/pull/276] +Upstream-Status: Rejected [https://github.com/google/leveldb/pull/276] Signed-off-by: Steve James Signed-off-by: Thomas Petazzoni +[baruch: update for v1.19] +Signed-off-by: Baruch Siach --- - Makefile | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + Makefile | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) diff --git a/Makefile b/Makefile -index 2bd2cad..530f2c3 100644 +index 07a5a1ead6fd..c87023db527a 100644 --- a/Makefile +++ b/Makefile -@@ -412,3 +412,19 @@ else +@@ -412,3 +412,17 @@ $(SHARED_OUTDIR)/%.o: %.cc $(SHARED_OUTDIR)/%.o: %.c $(CC) $(CFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@ @@ -23,18 +25,16 @@ index 2bd2cad..530f2c3 100644 +INSTALL_ROOT = / +INSTALL_PREFIX= usr/local + -+install: $(SHARED) $(LIBRARY) ++install: all + install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb + install -D -m 0644 include/leveldb/*.h $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb + install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib -+ ifneq (,$(LIBRARY)) -+ install -m 0644 $(LIBRARY) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib -+ endif -+ ifneq (,$(SHARED)) -+ install -m 0755 $(SHARED3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib -+ ln -sf $(SHARED3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED1) -+ ln -sf $(SHARED3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED2) -+ endif ++ install -m 0644 $(STATIC_OUTDIR)/libleveldb.a $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib ++ifneq (,$(SHARED_LIBS)) ++ install -m 0755 $(SHARED_OUTDIR)/$(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib ++ ln -sf $(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED_LIB1) ++ ln -sf $(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED_LIB2) ++endif -- 2.1.0 From f4918b3a7424bedb0eddf56c713298a78c1160d2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Sep 2016 14:18:31 +0200 Subject: [PATCH 0203/3392] package/x11r7/xserver_xorg-server: glamor depends on libgl Fixes http://autobuild.buildroot.net/results/1f6/1f6131c25738577afd8e097d126e8166cbcfcdd8/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 85d7e98e9f..51c3efccc8 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -214,7 +214,7 @@ endif ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3 -ifeq ($(BR2_PACKAGE_LIBEPOXY),y) +ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yy) XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy XSERVER_XORG_SERVER_CONF_OPTS += --enable-glamor endif From 054dde0eab6e5c0db2cdcd61612360093ee908da Mon Sep 17 00:00:00 2001 From: Padraig James Connolly Date: Wed, 7 Sep 2016 11:41:32 +0100 Subject: [PATCH 0204/3392] configs/galileo: switch back to the original kernel repo This commit switches the galileo_defconfig to use the orignal Linux kernel repo, which was used prior to commit fc8cac962baf5668dbc623ae5d411b75f77d3384. Signed-off-by: Padraig Connolly [Thomas: improved commit log.] Signed-off-by: Thomas Petazzoni --- configs/galileo_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 4f63c230cd..f0c308a196 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -11,8 +11,8 @@ 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/padraigconnolly/Linux-x1000.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ceeb288e39a4ba10643dec9ffb91baabf313f7d1" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mdr78/Linux-x1000.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="0feded4f96ddca9816c6c1b8a4780cb4065747b9" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/intel/galileo/linux-3.14.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y From 80e85e9b478b382a4c3aee64c3bb1d7055aabac9 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 9 Sep 2016 13:07:21 +0200 Subject: [PATCH 0205/3392] luarocks: bump to version 2.4.0 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/luarocks/luarocks.hash | 2 +- package/luarocks/luarocks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index 4d9840a348..27507456bd 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 68e38feeb66052e29ad1935a71b875194ed8b9c67c2223af5f4d4e3e2464ed97 luarocks-2.3.0.tar.gz +sha256 44381c9128d036247d428531291d1ff9405ae1daa238581d3c15f96d899497c3 luarocks-2.4.0.tar.gz diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index eddd435409..4a5ae03c67 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 2.3.0 +LUAROCKS_VERSION = 2.4.0 LUAROCKS_SITE = http://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING From 663be5dbb7659334e9c9615ef3d91fedd66e67ec Mon Sep 17 00:00:00 2001 From: Julien Floret Date: Fri, 9 Sep 2016 14:05:43 +0200 Subject: [PATCH 0206/3392] smcroute: bump to version 2.1.1 Signed-off-by: Julien Floret Signed-off-by: Peter Korsgaard --- package/smcroute/smcroute.hash | 6 +++--- package/smcroute/smcroute.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/smcroute/smcroute.hash b/package/smcroute/smcroute.hash index b24228f620..e1483ec180 100644 --- a/package/smcroute/smcroute.hash +++ b/package/smcroute/smcroute.hash @@ -1,4 +1,4 @@ # Locally generated -sha256 66fd32dc66b5d32670918205a94c4f2ac8c56741486326922e4d1a92f628db48 smcroute-2.0.0.tar.xz -# From https://github.com/troglobit/smcroute/releases/download/2.0.0/smcroute-2.0.0.tar.xz.md5 -md5 cbf478e52ab9ae411adca41b9d22f68a smcroute-2.0.0.tar.xz +sha256 cf344922b4298b94e53fa2db8f2b064bece60f75926966f330437dfcbd76d425 smcroute-2.1.1.tar.xz +# From https://github.com/troglobit/smcroute/releases/download/2.1.1/smcroute-2.1.1.tar.xz.md5 +md5 cd9256577fe06beaf8da2eba1a02f953 smcroute-2.1.1.tar.xz diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk index 77e7e63195..a3d4bc4f17 100755 --- a/package/smcroute/smcroute.mk +++ b/package/smcroute/smcroute.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMCROUTE_VERSION = 2.0.0 +SMCROUTE_VERSION = 2.1.1 SMCROUTE_SOURCE = smcroute-$(SMCROUTE_VERSION).tar.xz SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) SMCROUTE_LICENSE = GPLv2+ From 5a5c001d29cdb92004945f220f559259f09a042d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Sep 2016 11:36:30 -0300 Subject: [PATCH 0207/3392] squid: bump to version 3.5.21 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 b25a0e0daa..30eed501bb 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.20.tar.xz.asc -md5 48fb18679a30606de98882528beab3a7 squid-3.5.20.tar.xz -sha1 2bb6d3568e7167c9b99fea092a97287d0e430863 squid-3.5.20.tar.xz +# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.21.tar.xz.asc +md5 e6745a6e4ac0b48b7283861f64a40ae5 squid-3.5.21.tar.xz +sha1 38c4f801a17e27ea530fef88c6ee24b42f08529c squid-3.5.21.tar.xz diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 7179b33b95..702b2207e7 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).20 +SQUID_VERSION = $(SQUID_VERSION_MAJOR).21 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR) SQUID_LICENSE = GPLv2+ From 139c7f980038d16787d9d35fdf500b4603d0dfa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 11 Sep 2016 09:12:40 +0200 Subject: [PATCH 0208/3392] package/libupnpp: bump to version 0.15.0 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/libupnpp/libupnpp.hash | 4 ++-- package/libupnpp/libupnpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libupnpp/libupnpp.hash b/package/libupnpp/libupnpp.hash index 685ccf4b86..4edc3b9294 100644 --- a/package/libupnpp/libupnpp.hash +++ b/package/libupnpp/libupnpp.hash @@ -1,2 +1,2 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.14.1.tar.gz.sha256 -sha256 ffb33379f3734419de683b0adca5228e802c64d3960681c15f3a8de7d7e315d1 libupnpp-0.14.1.tar.gz +# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.15.0.tar.gz.sha256 +sha256 5578389c1928a84cd8ec05c127321b44e2bfafaf3b02ebb8b1d10c10ae2b0aeb libupnpp-0.15.0.tar.gz diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk index 1525f8169b..7d21a88822 100644 --- a/package/libupnpp/libupnpp.mk +++ b/package/libupnpp/libupnpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNPP_VERSION = 0.14.1 +LIBUPNPP_VERSION = 0.15.0 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBUPNPP_LICENSE = GPLv2+ LIBUPNPP_LICENSE_FILES = COPYING From 57d0a568da4dd3e49c06af79a24ecaafaf14cbe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 11 Sep 2016 09:21:39 +0200 Subject: [PATCH 0209/3392] package/upmpdcli: bump to version 1.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream did not provide a hash file, so the hash was calculated manually. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/upmpdcli/upmpdcli.hash | 4 ++-- package/upmpdcli/upmpdcli.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index 27a75cc08c..7e23adcdd0 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,2 +1,2 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.1.3.tar.gz.sha256 -sha256 2df3e6593f18c097b6247fb8da919b94701bf083b219056b006d68e6dcef75b5 upmpdcli-1.1.3.tar.gz +# Manually calculated: +sha256 6a3ad211707d7eca287f7f64688ff2e569d50bc463aa2145b01c98252fe30955 upmpdcli-1.2.2.tar.gz diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 1a7c790c5c..a7b98c9715 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.1.3 +UPMPDCLI_VERSION = 1.2.2 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING From 6a35b6e3a56bbc5eed8eab9896be431bdf81e5e1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sat, 10 Sep 2016 08:51:44 -0300 Subject: [PATCH 0210/3392] linux-firmware: add bluetooth firmware for intel chips It probably makes no sense to try split them up by model since there aren't that big. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/linux-firmware/Config.in | 10 ++++++++++ package/linux-firmware/linux-firmware.mk | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index f56f31df67..79af71eeb1 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -26,6 +26,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RADEON endmenu # Video +menu "Bluetooth firmware" + +config BR2_PACKAGE_LINUX_FIRMWARE_IBT + bool "Intel Wireless Bluetooth" + help + Firmware files for Intel 3160/7260/7265/8260/8265 Wireless + bluetooth support. + +endmenu # Bluetooth + menu "WiFi firmware" config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 140184870b..5c80c1e571 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -19,6 +19,12 @@ LINUX_FIRMWARE_DIRS += radeon LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.radeon endif +# Intel Wireless Bluetooth +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IBT),y) +LINUX_FIRMWARE_FILES += intel/ibt-* +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ibt_firmware +endif + # rt2501/rt61 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y) LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin From f158f117d358e9d27c9bb6e7c5a350894b648060 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sat, 10 Sep 2016 08:51:45 -0300 Subject: [PATCH 0211/3392] linux-firmware: bump version Bump to the latest (as of this writing) linux-firmware git version. This adds support for newer iwlwifi firmware versions that are required for newer kernel series. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 5c80c1e571..8c983e4e34 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = b0668886def608d352cd0263a7ef04e64e25574a +LINUX_FIRMWARE_VERSION = c883a6b6186bb2415761d287cbac773062911212 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git LINUX_FIRMWARE_SITE_METHOD = git From 9f5802c16f0c1e13b97ae9a8a6385d3af57edbe2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 11 Sep 2016 14:38:52 +0200 Subject: [PATCH 0212/3392] linux/ext: fix Xenomai unmet dependencies Properly propagate the Xenomai dependencies to the corresponding kernel extension, to fix the following unmet dependencies: warning: (BR2_LINUX_KERNEL_EXT_XENOMAI) selects BR2_PACKAGE_XENOMAI which has unmet direct dependencies (BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS && BR2_TOOLCHAIN_HAS_THREADS && !BR2_TOOLCHAIN_USES_MUSL) While at it, move the comment lower, after the path option, so that the path option is properly indented in the menuconfig. Add markers to separate each extension. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- linux/Config.ext.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/linux/Config.ext.in b/linux/Config.ext.in index 755c23b70f..da1ebd26bc 100644 --- a/linux/Config.ext.in +++ b/linux/Config.ext.in @@ -1,11 +1,12 @@ menu "Linux Kernel Extensions" +#------------------------------------------------------------------------------- # Xenomai config BR2_LINUX_KERNEL_EXT_XENOMAI bool "Adeos/Xenomai Real-time patch" + depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_i386 || BR2_x86_64 || BR2_arm || \ - BR2_bfin || BR2_powerpc || BR2_sh4 + depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_XENOMAI help Xenomai is split in two parts: a kernel part and a userspace @@ -24,19 +25,19 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI Xenomai is know to support Blackfin, SH4, x86, ARM, NIOS2 and PowerPC architectures. -comment "xenomai needs a toolchain w/ threads" - depends on BR2_i386 || BR2_x86_64 || BR2_arm || \ - BR2_bfin || BR2_powerpc || BR2_sh4 - depends on !BR2_TOOLCHAIN_HAS_THREADS - config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH - depends on BR2_LINUX_KERNEL_EXT_XENOMAI string "Path for Adeos patch file" + depends on BR2_LINUX_KERNEL_EXT_XENOMAI help Optionally, explicitly specify the Adeos patch to use. Download it at http://download.gna.org/adeos/patches and verify that your kernel version in buildroot matches. +comment "xenomai needs a uClibc or glibc toolchain w/ threads" + depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL + +#------------------------------------------------------------------------------- # RTAI config BR2_LINUX_KERNEL_EXT_RTAI bool "RTAI Real-time patch" @@ -44,6 +45,7 @@ config BR2_LINUX_KERNEL_EXT_RTAI help RTAI Kernel part. +#------------------------------------------------------------------------------- # fbtft config BR2_LINUX_KERNEL_EXT_FBTFT bool "FB TFT drivers" From b8cc37fc7a9533e06c1fb0547be87875b8fd70fc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 11 Sep 2016 14:38:53 +0200 Subject: [PATCH 0213/3392] package/docker-engine: fix unmet dependencies Properly propagate dependencies from docker-containerd to fix the following unmet dependencies: warning: (BR2_PACKAGE_DOCKER_ENGINE_DAEMON) selects BR2_PACKAGE_DOCKER_CONTAINERD which has unmet direct dependencies (BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS && BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_MMU && BR2_USE_WCHAR) Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/docker-engine/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index a22786afaa..b9b9aac16b 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -13,6 +13,7 @@ if BR2_PACKAGE_DOCKER_ENGINE config BR2_PACKAGE_DOCKER_ENGINE_DAEMON bool "docker daemon" + depends on BR2_USE_MMU # docker-containerd depends on BR2_USE_WCHAR # docker-containerd select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency select BR2_PACKAGE_SQLITE # runtime dependency From 251b9142631bc9d574352e0bb9b595f9dc8fb6a4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 11 Sep 2016 14:38:54 +0200 Subject: [PATCH 0214/3392] package/weston: fix unmet dependencies Properly propagate dependencies from freerdp to fix the following unmet dependencies: warning: (BR2_PACKAGE_WESTON_RDP) selects BR2_PACKAGE_FREERDP which has unmet direct dependencies (BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && !BR2_STATIC_LIBS && BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_MMU && BR2_TOOLCHAIN_HAS_SYNC_4) Reorder deps to have architectures deps first. Remove "broken" dependency from comment; add missing ones. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/weston/Config.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index c1eb7dadb2..6baa24b81f 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -53,9 +53,10 @@ config BR2_PACKAGE_WESTON_FBDEV # FreeRDP needs threads and !static, already the case for weston config BR2_PACKAGE_WESTON_RDP bool "RDP compositor" - depends on BR2_USE_WCHAR # freerdp depends on BR2_USE_MMU # freerdp, libglib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_WCHAR # freerdp + depends on BR2_INSTALL_LIBSTDCPP # freerdp select BR2_PACKAGE_FREERDP select BR2_PACKAGE_WESTON_HAS_COMPOSITOR help @@ -71,10 +72,10 @@ config BR2_PACKAGE_WESTON_RDP so you may want to change them in a post-build script or a rootfs overlay. -comment "RDP compositor needs a toolchain w/ wchar" - depends on BROKEN # needs FreeRDP master +comment "RDP compositor needs a toolchain w/ wchar, C++" + depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP # rpi-userland is an EGL/GLES provider, so we can't select it config BR2_PACKAGE_WESTON_RPI From c9ea19e8fb4952db6748023f613ebb19f78fc036 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 11 Sep 2016 14:38:55 +0200 Subject: [PATCH 0215/3392] system: fix unmet dependencies Don't force remounting / read/write when using a customskeleton and systemd as init system, to fix the following unmet dependencies: warning: (BR2_INIT_SYSTEMD) selects BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW which has unmet direct dependencies (BR2_ROOTFS_SKELETON_DEFAULT) Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- system/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index 353421a9cf..77c665b173 100644 --- a/system/Config.in +++ b/system/Config.in @@ -127,7 +127,7 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD - select BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW + select BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW if BR2_ROOTFS_SKELETON_DEFAULT comment "systemd needs a glibc toolchain, headers >= 3.10" depends on !(BR2_TOOLCHAIN_USES_GLIBC \ From 3c590a3ec53ad690ae4d88f33cd8767fb9ee1037 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Sep 2016 12:20:54 -0300 Subject: [PATCH 0216/3392] linux-headers: remove deprecated versions Linux headers 3.19.x and 4.0.x have been deprecated for a while now, so it's time to remove them. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 20 ++++++++++++++++++++ package/linux-headers/Config.in.host | 10 ---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 60d414bea6..d7b996c0d7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,26 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_KERNEL_HEADERS_4_0 + bool "kernel headers version 4.0.x are no longer supported" + select BR2_KERNEL_HEADERS_3_18 + select BR2_LEGACY + help + Version 4.0.x of the Linux kernel headers have been deprecated + for more than four buildroot releases and are now removed. + As an alternative, version 3.18.x of the headers have been + automatically selected in your configuration. + +config BR2_KERNEL_HEADERS_3_19 + bool "kernel headers version 3.19.x are no longer supported" + select BR2_KERNEL_HEADERS_3_18 + select BR2_LEGACY + help + Version 3.19.x of the Linux kernel headers have been deprecated + for more than four buildroot releases and are now removed. + As an alternative, version 3.18.x of the headers have been + automatically selected in your configuration. + config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS bool "libevas-generic-loaders package removed" select BR2_LEGACY diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9d8f030bab..7fea748ce3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -56,16 +56,6 @@ choice depends on !BR2_nios2 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 - config BR2_KERNEL_HEADERS_3_19 - bool "Linux 3.19.x kernel headers" - depends on BR2_DEPRECATED_SINCE_2015_08 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 - - config BR2_KERNEL_HEADERS_4_0 - bool "Linux 4.0.x kernel headers" - depends on BR2_DEPRECATED_SINCE_2015_08 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - config BR2_KERNEL_HEADERS_4_1 bool "Linux 4.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 From a26aa9686ad457d208df3b85a39c9befa04caaa3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Sep 2016 12:20:55 -0300 Subject: [PATCH 0217/3392] legacy/kernel-headers: adjust recommended target Previously they were set at next available version, which is problematic since new syscalls can be introduced. So switch to lower available. There's a caveat for 3.1 and 3.0 headers though since there's no lower than 3.2, so keep it at 3.2 for those unfortunately. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index d7b996c0d7..8957be7cd7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -366,12 +366,12 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID config BR2_KERNEL_HEADERS_3_17 bool "kernel headers version 3.17.x are no longer supported" - select BR2_KERNEL_HEADERS_3_18 + select BR2_KERNEL_HEADERS_3_14 select BR2_LEGACY help Version 3.17.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.18.x of the headers have been + As an alternative, version 3.14.x of the headers have been automatically selected in your configuration. config BR2_GDB_VERSION_7_7 @@ -512,12 +512,12 @@ config BR2_PACKAGE_CUPS_PDFTOPS config BR2_KERNEL_HEADERS_3_16 bool "kernel headers version 3.16.x are no longer supported" - select BR2_KERNEL_HEADERS_3_18 + select BR2_KERNEL_HEADERS_3_14 select BR2_LEGACY help Version 3.16.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.18.x of the headers have been + As an alternative, version 3.14.x of the headers have been automatically selected in your configuration. config BR2_PACKAGE_PYTHON_PYXML @@ -728,32 +728,32 @@ config BR2_KERNEL_HEADERS_3_0 config BR2_KERNEL_HEADERS_3_11 bool "kernel headers version 3.11.x are no longer supported" - select BR2_KERNEL_HEADERS_3_12 + select BR2_KERNEL_HEADERS_3_10 select BR2_LEGACY help Version 3.11.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.12.x of the headers have been + As an alternative, version 3.10.x of the headers have been automatically selected in your configuration. config BR2_KERNEL_HEADERS_3_13 bool "kernel headers version 3.13.x are no longer supported" - select BR2_KERNEL_HEADERS_3_14 + select BR2_KERNEL_HEADERS_3_12 select BR2_LEGACY help Version 3.13.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.14.x of the headers have been + As an alternative, version 3.12.x of the headers have been automatically selected in your configuration. config BR2_KERNEL_HEADERS_3_15 bool "kernel headers version 3.15.x are no longer supported" - select BR2_KERNEL_HEADERS_3_18 + select BR2_KERNEL_HEADERS_3_14 select BR2_LEGACY help Version 3.15.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.18.x of the headers have been + As an alternative, version 3.14.x of the headers have been automatically selected in your configuration. config BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI @@ -1559,12 +1559,12 @@ config BR2_PACKAGE_LIBELF config BR2_KERNEL_HEADERS_3_8 bool "kernel headers version 3.8.x are no longer supported" - select BR2_KERNEL_HEADERS_3_10 + select BR2_KERNEL_HEADERS_3_4 select BR2_LEGACY help Version 3.8.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.10.x of the headers have been + As an alternative, version 3.4.x of the headers have been automatically selected in your configuration. config BR2_PACKAGE_GETTEXT_TOOLS @@ -1717,22 +1717,22 @@ config BR2_PACKAGE_EVTEST_CAPTURE config BR2_KERNEL_HEADERS_3_6 bool "kernel headers version 3.6.x are no longer supported" - select BR2_KERNEL_HEADERS_3_10 + select BR2_KERNEL_HEADERS_3_4 select BR2_LEGACY help Version 3.6.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.10.x of the headers have been + As an alternative, version 3.4.x of the headers have been automatically selected in your configuration. config BR2_KERNEL_HEADERS_3_7 bool "kernel headers version 3.7.x are no longer supported" - select BR2_KERNEL_HEADERS_3_10 + select BR2_KERNEL_HEADERS_3_4 select BR2_LEGACY help Version 3.7.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.10.x of the headers have been + As an alternative, version 3.4.x of the headers have been automatically selected in your configuration. config BR2_PACKAGE_VALA @@ -1905,22 +1905,22 @@ config BR2_KERNEL_HEADERS_3_1 config BR2_KERNEL_HEADERS_3_3 bool "kernel headers version 3.3.x are no longer supported" - select BR2_KERNEL_HEADERS_3_4 + select BR2_KERNEL_HEADERS_3_2 select BR2_LEGACY help Version 3.3.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.4.x of the headers have been + As an alternative, version 3.2.x of the headers have been automatically selected in your configuration. config BR2_KERNEL_HEADERS_3_5 bool "kernel headers version 3.5.x are no longer supported" - select BR2_KERNEL_HEADERS_3_10 + select BR2_KERNEL_HEADERS_3_4 select BR2_LEGACY help Version 3.5.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.10.x of the headers have been + As an alternative, version 3.4.x of the headers have been automatically selected in your configuration. config BR2_GDB_VERSION_7_2 From d9d0ba0d16875e494426518795afc6c38d6760ff Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 9 Sep 2016 08:38:29 +0200 Subject: [PATCH 0218/3392] package/libusb: bump version to 1.0.20, switch to Github This commit updates libusb to version 1.0.20, and adds a patch that should fix parallel make issues particular to this version and probably fixed in the next version. This commit also moves to using Github as the source for libusb. Signed-off-by: Jeroen Roovers Signed-off-by: Thomas Petazzoni --- package/libusb/0001-parallel-make.patch | 162 ++++++++++++++++++++++++ package/libusb/libusb.hash | 2 +- package/libusb/libusb.mk | 6 +- 3 files changed, 167 insertions(+), 3 deletions(-) create mode 100644 package/libusb/0001-parallel-make.patch diff --git a/package/libusb/0001-parallel-make.patch b/package/libusb/0001-parallel-make.patch new file mode 100644 index 0000000000..a326e99516 --- /dev/null +++ b/package/libusb/0001-parallel-make.patch @@ -0,0 +1,162 @@ +Fix parallel build + +This patch is a partial backport of +https://github.com/libusb/libusb/commit/3dc781ce3ecd0315cfc0b4fdcef9e062990f289b + +Signed-off-by: Jeroen Roovers + +--- a/configure.ac ++++ b/configure.ac +@@ -36,6 +36,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RU + + AC_PREREQ([2.50]) + AC_PROG_CC ++AC_PROG_CXX + LT_INIT + LT_LANG([Windows Resource]) + AC_C_INLINE +@@ -91,7 +92,6 @@ case $host in + ;; + *-haiku*) + AC_MSG_RESULT([Haiku]) +- AC_CONFIG_SUBDIRS([libusb/os/haiku]) + backend="haiku" + threads="posix" + ;; +@@ -193,6 +193,7 @@ AM_CONDITIONAL(OS_HAIKU, test "x$backend + AM_CONDITIONAL(THREADS_POSIX, test "x$threads" = xposix) + AM_CONDITIONAL(CREATE_IMPORT_LIB, test "x$create_import_lib" = "xyes") + AM_CONDITIONAL(USE_UDEV, test "x$enable_udev" = xyes) ++AM_CONDITIONAL(USE_USBDK, test "x$enable_usbdk" = xyes) + if test "$threads" = posix; then + AC_DEFINE(THREADS_POSIX, 1, [Use POSIX Threads]) + fi +--- a/libusb/Makefile.am ++++ b/libusb/Makefile.am +@@ -4,58 +4,66 @@ AUTOMAKE_OPTIONS = subdir-objects + + lib_LTLIBRARIES = libusb-1.0.la + +-POSIX_POLL_SRC = os/poll_posix.c +-LINUX_USBFS_SRC = os/linux_usbfs.c +-DARWIN_USB_SRC = os/darwin_usb.c ++POSIX_POLL_SRC = os/poll_posix.h os/poll_posix.c ++POSIX_THREADS_SRC = os/threads_posix.h os/threads_posix.c ++WINDOWS_POLL_SRC = os/poll_windows.h os/poll_windows.c ++WINDOWS_THREADS_SRC = os/threads_windows.h os/threads_windows.c ++LINUX_USBFS_SRC = os/linux_usbfs.h os/linux_usbfs.c ++DARWIN_USB_SRC = os/darwin_usb.h os/darwin_usb.c + OPENBSD_USB_SRC = os/openbsd_usb.c + NETBSD_USB_SRC = os/netbsd_usb.c +-WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def +-WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h +- +-DIST_SUBDIRS = +- +-EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \ +- $(NETBSD_USB_SRC) $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \ +- $(POSIX_POLL_SRC) \ +- os/threads_posix.c os/threads_windows.c \ ++WINDOWS_COMMON_SRC = os/windows_nt_common.h os/windows_nt_common.c \ ++ os/windows_common.h libusb-1.0.rc libusb-1.0.def ++WINDOWS_USB_SRC = os/windows_winusb.h os/windows_winusb.c ++WINDOWS_USBDK_SRC = os/windows_usbdk.h os/windows_usbdk.c ++WINCE_USB_SRC = os/wince_usb.h os/wince_usb.c ++HAIKU_USB_SRC = os/haiku_usb.h os/haiku_usb_backend.cpp \ ++ os/haiku_usb_raw.h os/haiku_usb_raw.cpp os/haiku_pollfs.cpp ++ ++EXTRA_DIST = $(POSIX_POLL_SRC) $(POSIX_THREADS_SRC) \ ++ $(WINDOWS_POLL_SRC) $(WINDOWS_THREADS_SRC) \ ++ $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) \ ++ $(OPENBSD_USB_SRC) $(NETBSD_USB_SRC) \ ++ $(WINDOWS_COMMON_SRC) $(WINDOWS_USB_SRC) $(WINDOWS_USBDK_SRC) \ ++ $(WINCE_USB_SRC) $(HAIKU_USB_SRC) \ + os/linux_udev.c os/linux_netlink.c + +-dist-hook: +- cp -r os/haiku $(distdir)/os/haiku +- rm -rf $(distdir)/os/haiku/autom4te.cache +- + if OS_LINUX + + if USE_UDEV +-OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \ +- os/linux_udev.c ++OS_SRC = $(LINUX_USBFS_SRC) os/linux_udev.c + else +-OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \ +- os/linux_netlink.c ++OS_SRC = $(LINUX_USBFS_SRC) os/linux_netlink.c + endif + + endif + + if OS_DARWIN +-OS_SRC = $(DARWIN_USB_SRC) $(POSIX_POLL_SRC) ++OS_SRC = $(DARWIN_USB_SRC) + AM_CFLAGS_EXT = -no-cpp-precomp + endif + + if OS_OPENBSD +-OS_SRC = $(OPENBSD_USB_SRC) $(POSIX_POLL_SRC) ++OS_SRC = $(OPENBSD_USB_SRC) + endif + + if OS_NETBSD +-OS_SRC = $(NETBSD_USB_SRC) $(POSIX_POLL_SRC) ++OS_SRC = $(NETBSD_USB_SRC) + endif + + if OS_HAIKU +-OS_SRC = $(POSIX_POLL_SRC) +-SUBDIRS = os/haiku ++noinst_LTLIBRARIES = libusb_haiku.la ++libusb_haiku_la_SOURCES = $(HAIKU_USB_SRC) ++libusb_1_0_la_LIBADD = libusb_haiku.la + endif + + if OS_WINDOWS +-OS_SRC = $(WINDOWS_USB_SRC) ++ ++if USE_USBDK ++OS_SRC = $(WINDOWS_USBDK_SRC) $(WINDOWS_COMMON_SRC) ++else ++OS_SRC = $(WINDOWS_USB_SRC) $(WINDOWS_COMMON_SRC) ++endif + + .rc.lo: + $(AM_V_GEN)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) -i $< -o $@ +@@ -69,22 +77,23 @@ if CREATE_IMPORT_LIB + $(AM_V_GEN)$(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $(srcdir)/libusb-1.0.def --dllname $@ --output-lib .libs/$@.a + endif + ++if OS_WINDOWS ++POLL_SRC = $(WINDOWS_POLL_SRC) ++else ++POLL_SRC = $(POSIX_POLL_SRC) ++endif ++ + if THREADS_POSIX +-THREADS_SRC = os/threads_posix.h os/threads_posix.c ++THREADS_SRC = $(POSIX_THREADS_SRC) + else +-THREADS_SRC = os/threads_windows.h os/threads_windows.c ++THREADS_SRC = $(WINDOWS_THREADS_SRC) + endif + + libusb_1_0_la_CFLAGS = $(AM_CFLAGS) + libusb_1_0_la_LDFLAGS = $(LTLDFLAGS) +-libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c strerror.c sync.c \ +- os/linux_usbfs.h os/darwin_usb.h os/windows_usb.h os/windows_common.h \ +- hotplug.h hotplug.c $(THREADS_SRC) $(OS_SRC) \ +- os/poll_posix.h os/poll_windows.h +- +-if OS_HAIKU +-libusb_1_0_la_LIBADD = os/haiku/libhaikuusb.la +-endif ++libusb_1_0_la_SOURCES = libusbi.h libusb.h version.h version_nano.h \ ++ core.c descriptor.c hotplug.h hotplug.c io.c strerror.c sync.c \ ++ $(POLL_SRC) $(THREADS_SRC) $(OS_SRC) + + hdrdir = $(includedir)/libusb-1.0 + hdr_HEADERS = libusb.h diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index 175273818e..c809896f7a 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 6c502c816002f90d4f76050a6429c3a7e0d84204222cbff2dce95dd773ba6840 libusb-1.0.19.tar.bz2 +sha256 cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff libusb-1.0.20.tar.bz2 diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index d24a6343eb..4d05feb801 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,13 +5,15 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).19 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).20 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 -LIBUSB_SITE = http://downloads.sourceforge.net/project/libusb/libusb-$(LIBUSB_VERSION_MAJOR)/libusb-$(LIBUSB_VERSION) +LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPLv2.1+ LIBUSB_LICENSE_FILES = COPYING LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES +# 0001-parallel-make.patch +LIBUSB_AUTORECONF = YES # Avoid the discovery of udev for the host variant HOST_LIBUSB_CONF_OPTS = --disable-udev From 7849020e03a5a3b429baa9257bc7e61e08f67250 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Sep 2016 16:42:04 -0300 Subject: [PATCH 0219/3392] wandboard: Use kernel version 4.7.3 Wandboard is well supported in the mainline kernel, so let's switch from the 3.14 vendor kernel to 4.7.3 mainline kernel version. As mainline use more dts files to support both B1 and C1 versions of the board, adjust the dts entries accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/wandboard_defconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index cd06f40b68..33b7f0dde0 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a9=y -# Linux headers same as kernel, a 3.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y +# Linux headers same as kernel, a 4.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_PACKAGE_HOST_GENIMAGE=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh" @@ -21,9 +21,9 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/wandboard/uboot-env.txt" BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x2000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/wandboard-org/linux" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e2213f9a98dd7413ee5a9ca40cf60e8cb8292f4a" -BR2_LINUX_KERNEL_DEFCONFIG="wandboard" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1" BR2_LINUX_KERNEL_INSTALL_TARGET=y From 9b15e3a2b755b1847b93b57d61858c99b7fbabae Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Sep 2016 16:42:05 -0300 Subject: [PATCH 0220/3392] wandboard: Use U-Boot 2016.07 Upgrade U-Boot version to 2016.07 and make proper use of U-Boot distro configuration features. Provide a boot.scr binary script that is one of the standard ways to pass a U-Boot script with distro features enabled. With this method the uboot-env.txt file is no longer needed, so it is removed. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/wandboard/boot.scr.txt | 7 +++++++ board/wandboard/genimage.cfg | 7 ------- board/wandboard/post-build.sh | 8 ++++++++ board/wandboard/uboot-env.txt | 28 ---------------------------- configs/wandboard_defconfig | 10 +++------- 5 files changed, 18 insertions(+), 42 deletions(-) create mode 100644 board/wandboard/boot.scr.txt create mode 100755 board/wandboard/post-build.sh delete mode 100644 board/wandboard/uboot-env.txt diff --git a/board/wandboard/boot.scr.txt b/board/wandboard/boot.scr.txt new file mode 100644 index 0000000000..7a8aa4bd54 --- /dev/null +++ b/board/wandboard/boot.scr.txt @@ -0,0 +1,7 @@ +setenv finduuid "part uuid mmc 0:1 uuid" +run finduuid +run findfdt +setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4" +load mmc 0:1 ${fdt_addr} boot/${fdtfile} +load mmc 0:1 ${loadaddr} boot/zImage +bootz ${loadaddr} - ${fdt_addr} diff --git a/board/wandboard/genimage.cfg b/board/wandboard/genimage.cfg index f5df1ff883..32c7c16c8d 100644 --- a/board/wandboard/genimage.cfg +++ b/board/wandboard/genimage.cfg @@ -23,13 +23,6 @@ image sdcard.img { offset = 70656 } - partition u-boot-env { - in-partition-table = "no" - image = "uboot-env.bin" - offset = 393216 - size = 8192 - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext2" diff --git a/board/wandboard/post-build.sh b/board/wandboard/post-build.sh new file mode 100755 index 0000000000..07c480e616 --- /dev/null +++ b/board/wandboard/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none \ +-n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr + +install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/board/wandboard/uboot-env.txt b/board/wandboard/uboot-env.txt deleted file mode 100644 index f8c4fc1391..0000000000 --- a/board/wandboard/uboot-env.txt +++ /dev/null @@ -1,28 +0,0 @@ -baudrate=115200 -boot_fdt=try -bootcmd=run findfdt; mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else run netboot; fi -bootdelay=3 -bootscript=echo Running bootscript from mmc ...; source -console=ttymxc0 -ethact=FEC -ethaddr=00:1f:7b:b2:05:ee -ethprime=FEC -loadaddr=0x12000000 -fdt_addr=0x18000000 -fdt_high=0xffffffff -fdtfile=undefined -findfdt=if test $board_rev = MX6Q ; then setenv fdtfile imx6q-wandboard.dtb; fi; if test $board_rev = MX6DL ; then setenv fdtfile imx6dl-wandboard.dtb; fi; if test $fdtfile = undefined; then echo WARNING: Could not determine dtb to use; fi; -loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /boot/${fdtfile} -loadbootscript=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script}; -loadimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} -mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}; run videoargs -videoargs=setenv nextcon 0; if hdmidet; then setenv bootargs ${bootargs} video=mxcfb${nextcon}:dev=hdmi,1280x720M@60,if=RGB24; setenv fbmen fbmem=28M; setexpr nextcon ${nextcon} + 1; else echo - no HDMI monitor;fi; i2c dev 1; if i2c probe 0x10; then setenv bootargs ${bootargs} video=mxcfb${nextcon}:dev=lcd,800x480@60,if=RGB666,bpp=32; if test 0 -eq ${nextcon}; then setenv fbmem fbmem=10M; else setenv fbmem ${fbmem},10M; fi; setexpr nextcon ${nextcon} + 1; else echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';fi; setenv bootargs ${bootargs} ${fbmem} -mmcboot=echo Booting from mmc ...; run mmcargs; if test ${boot_fdt} = yes || test ${boot_fdt} = try; then if run loadfdt; then bootz ${loadaddr} - ${fdt_addr}; else if test ${boot_fdt} = try; then bootz; else echo WARN: Cannot load the DT; fi; fi; else bootz; fi; -mmcdev=0 -mmcpart=1 -mmcroot=/dev/mmcblk2p1 rootwait rw -netargs=setenv bootargs console=${console},${baudrate} root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp -netboot=echo Booting from net ...; run netargs; if test ${ip_dyn} = yes; then setenv get_cmd dhcp; else setenv get_cmd tftp; fi; ${get_cmd} ${image}; if test ${boot_fdt} = yes || test ${boot_fdt} = try; then if ${get_cmd} ${fdt_addr} /boot/${fdtfile}; then bootz ${loadaddr} - ${fdt_addr}; else if test ${boot_fdt} = try; then bootz; else echo WARN: Cannot load the DT; fi; fi; else bootz; fi; -script=boot/boot.scr -image=boot/zImage -splashpos=m,m diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 33b7f0dde0..4795b128e5 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -4,21 +4,17 @@ BR2_cortex_a9=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_PACKAGE_HOST_GENIMAGE=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_USE_DEFCONFIG=y -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="wandboard" +BR2_TARGET_UBOOT_BOARDNAME="wandboard" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.07" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -BR2_TARGET_UBOOT_ENVIMAGE=y -BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/wandboard/uboot-env.txt" -BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x2000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y From fc431d2ed9167cbbb704cdaaaa766aa7fba26bb8 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Sep 2016 16:42:06 -0300 Subject: [PATCH 0221/3392] wandboard: Select required host tools for SD card generation Select the required host tools for proper SD card generation. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/wandboard_defconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 4795b128e5..67041a6179 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -3,7 +3,6 @@ BR2_cortex_a9=y # Linux headers same as kernel, a 4.7 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" -BR2_PACKAGE_HOST_GENIMAGE=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y @@ -23,3 +22,8 @@ BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1" BR2_LINUX_KERNEL_INSTALL_TARGET=y +# required tools to create the SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From 66c1d1dc169d11d7bcf8db115d6e6ea03ccb8d73 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 8 Sep 2016 18:13:37 -0300 Subject: [PATCH 0222/3392] gtest: fix URL in package description http://code.google.com/p/googletest redirects to https://github.com/google/googletest, now. Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/gtest/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gtest/Config.in b/package/gtest/Config.in index c07f13bf6f..355b736c60 100644 --- a/package/gtest/Config.in +++ b/package/gtest/Config.in @@ -19,7 +19,7 @@ config BR2_PACKAGE_GTEST This package allows running testsuites on the target which might be advantageous in certain cases. - http://code.google.com/p/googletest/ + https://github.com/google/googletest comment "gtest needs a toolchain w/ C++, wchar, threads" depends on BR2_USE_MMU From ec692f94984e10593dd154fc340299131b347b0f Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Thu, 8 Sep 2016 16:42:00 -0700 Subject: [PATCH 0223/3392] jemalloc: add a check for valgrind being configured as well jemalloc can be compiled with valgrind support being enabled to produce proper output, so when the valgrind package has been configured configure jemalloc appropriately. In addition, make sure to disable valgrind support unconditionally in the host variant of jemalloc. Signed-off-by: Charles Hardin Signed-off-by: Thomas Petazzoni --- package/jemalloc/jemalloc.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/jemalloc/jemalloc.mk b/package/jemalloc/jemalloc.mk index 7086dfa9cd..f1c9ffe622 100644 --- a/package/jemalloc/jemalloc.mk +++ b/package/jemalloc/jemalloc.mk @@ -11,5 +11,14 @@ JEMALLOC_LICENSE = BSD-2c JEMALLOC_LICENSE_FILES = COPYING JEMALLOC_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_VALGRIND),y) +JEMALLOC_DEPENDENCIES += valgrind +JEMALLOC_CONF_OPTS += --enable-valgrind +else +JEMALLOC_CONF_OPTS += --disable-valgrind +endif + +HOST_JEMALLOC_CONF_OPTS += --disable-valgrind + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From cb0a68c4fa4c2a6cd911f71543769991c2ca80a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Sun, 11 Sep 2016 17:49:00 +0200 Subject: [PATCH 0224/3392] openal: add upstream patch to fix FPU related build failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: http://autobuild.buildroot.net/results/b57/b5777a0ed33f6bb7a5fc0486ea21ecef58615dac/build-end.log Signed-off-by: André Hentschel [Thomas: - download patch directly from Github. - add reference to autobuilder failure.] Signed-off-by: Thomas Petazzoni --- package/openal/openal.hash | 1 + package/openal/openal.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/openal/openal.hash b/package/openal/openal.hash index 260f1b7807..a0ebbf0e38 100644 --- a/package/openal/openal.hash +++ b/package/openal/openal.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314 openal-soft-1.17.2.tar.bz2 +sha256 9c9040269376aba77b1277bbae0f055aee535e14ad4a3ab4e66e39830504e83f 27916ce3db023454a0295ee63ea196fbc246674c.patch diff --git a/package/openal/openal.mk b/package/openal/openal.mk index 2916aa607f..c9ca934e01 100644 --- a/package/openal/openal.mk +++ b/package/openal/openal.mk @@ -7,6 +7,8 @@ OPENAL_VERSION = 1.17.2 OPENAL_SOURCE = openal-soft-$(OPENAL_VERSION).tar.bz2 OPENAL_SITE = http://kcat.strangesoft.net/openal-releases +OPENAL_PATCH = \ + https://github.com/kcat/openal-soft/commit/27916ce3db023454a0295ee63ea196fbc246674c.patch OPENAL_LICENSE = LGPLv2+ OPENAL_LICENSE_FILES = COPYING OPENAL_INSTALL_STAGING = YES From 349ae0df0656dd103583126d682f89629a7351cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Sun, 11 Sep 2016 17:49:01 +0200 Subject: [PATCH 0225/3392] openal: use upstream patch to detect run-time NEON support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel [Thomas: download patches directly from Github.] Signed-off-by: Thomas Petazzoni --- package/openal/openal.hash | 2 ++ package/openal/openal.mk | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/openal/openal.hash b/package/openal/openal.hash index a0ebbf0e38..88556ba56e 100644 --- a/package/openal/openal.hash +++ b/package/openal/openal.hash @@ -1,3 +1,5 @@ # Locally calculated sha256 a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314 openal-soft-1.17.2.tar.bz2 sha256 9c9040269376aba77b1277bbae0f055aee535e14ad4a3ab4e66e39830504e83f 27916ce3db023454a0295ee63ea196fbc246674c.patch +sha256 4621f6b79d4bbac5ce423f227c92ad1e4f833d7e1f2ff1cc3b5f03721f75b933 a52cfc804813aef8e4b304e20cf843fa6907af6c.patch +sha256 f442da31b4001a5133f2762a5bc1e780b11d5e2d9f21b257f54695ee6d87d997 c3c283a0b5d0130afafaa2a5b6ce6fbc30b6e6a1.patch diff --git a/package/openal/openal.mk b/package/openal/openal.mk index c9ca934e01..71117faba9 100644 --- a/package/openal/openal.mk +++ b/package/openal/openal.mk @@ -8,7 +8,9 @@ OPENAL_VERSION = 1.17.2 OPENAL_SOURCE = openal-soft-$(OPENAL_VERSION).tar.bz2 OPENAL_SITE = http://kcat.strangesoft.net/openal-releases OPENAL_PATCH = \ - https://github.com/kcat/openal-soft/commit/27916ce3db023454a0295ee63ea196fbc246674c.patch + https://github.com/kcat/openal-soft/commit/27916ce3db023454a0295ee63ea196fbc246674c.patch \ + https://github.com/kcat/openal-soft/commit/a52cfc804813aef8e4b304e20cf843fa6907af6c.patch \ + https://github.com/kcat/openal-soft/commit/c3c283a0b5d0130afafaa2a5b6ce6fbc30b6e6a1.patch OPENAL_LICENSE = LGPLv2+ OPENAL_LICENSE_FILES = COPYING OPENAL_INSTALL_STAGING = YES From 7ede9ca16e1726dfca333feba8b92cae3d5acf95 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 8 Sep 2016 23:11:47 +0200 Subject: [PATCH 0226/3392] package/libssh: fix dependency on libgcrypt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since 2f89476 (package/libgpg-error: bump to version 1.23), libssh has inherited the dependency from libgcrypt (propagated from libgpg-error). However, since libssh can use either openssl or libgcrypt as a backend, the dependency should be relaxed when openssl is available. But the test is broken and inverted: it will make libssh unavailable as soon as openssl is enabled. This in itself is already incorrect, but that can cause further issues, as some packages (e.g. Kodi) will select (indirectly) openssl, and has an option to select libssh; enabling that option causes unmet direct dependencies of libssh: warning: (BR2_PACKAGE_KODI_LIBSSH) selects BR2_PACKAGE_LIBSSH which has unmet direct dependencies (BR2_USE_MMU && !BR2_STATIC_LIBS && BR2_TOOLCHAIN_HAS_THREADS && BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS && !BR2_PACKAGE_OPENSSL) Fix this dependency by doing what other similar packages do: select openssl if the other crypto backend (here libgcrypt) is not enabled. This also allows us to drop the propagated dependency on the arch condition. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Vicente Olivert Riera Cc: Jörg Krause Cc: Thomas Petazzoni Cc: Maxime Hadjinlian Cc: Romain Naour Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libssh/Config.in | 3 +-- package/libssh/libssh.mk | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/libssh/Config.in b/package/libssh/Config.in index 6029f459d3..3dbfa7d561 100644 --- a/package/libssh/Config.in +++ b/package/libssh/Config.in @@ -4,8 +4,7 @@ config BR2_PACKAGE_LIBSSH depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS # Either OpenSSL or libgcrypt are mandatory - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS && !BR2_PACKAGE_OPENSSL # libgcrypt - select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT help libssh is a multiplatform C library implementing the SSHv2 and SSHv1 protocol on client and server side. With libssh, diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 29bbf4e9f2..429e3c17c8 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -23,14 +23,14 @@ else LIBSSH_CONF_OPTS += -DWITH_ZLIB=OFF endif +# Dependency is either on libgcrypt or openssl, guaranteed in Config.in. +# Favour libgcrypt. ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSSH_CONF_OPTS += -DWITH_GCRYPT=ON LIBSSH_DEPENDENCIES += libgcrypt else LIBSSH_CONF_OPTS += -DWITH_GCRYPT=OFF -ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSSH_DEPENDENCIES += openssl endif -endif $(eval $(cmake-package)) From d8a2955a2b82d75f3684e846b0c2411294233eea Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 8 Sep 2016 23:11:48 +0200 Subject: [PATCH 0227/3392] package/libssh2: fix dependency on libgcrypt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since 2f89476 (package/libgpg-error: bump to version 1.23), libssh2 has inherited the dependency from libgcrypt (propagated from libgpg-error). However, since libssh2 can use either openssl or libgcrypt as a backend, the dependency should be relaxed when openssl is available. But the test is broken and inverted: it will make libssh unavailable as soon as openssl is enabled. Fix this dependenc byt doing what other similar packages do: select openssl if the other crypto backend (here libgcrypt) is not enabled. This also allows us to drop the propagated dependency on the arch condition. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Vicente Olivert Riera Cc: Jörg Krause Cc: Thomas Petazzoni Cc: Maxime Hadjinlian Cc: Romain Naour Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libssh2/Config.in | 3 +-- package/libssh2/libssh2.mk | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/libssh2/Config.in b/package/libssh2/Config.in index 0deb3bbcf1..2944624e0a 100644 --- a/package/libssh2/Config.in +++ b/package/libssh2/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBSSH2 bool "libssh2" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS && !BR2_PACKAGE_OPENSSL # libgcrypt - select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT help libssh2 is a client-side C library implementing the SSH2 protocol as defined by Internet Drafts: SECSH-TRANS(22), diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index 221fac473c..847c2f1b8e 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -11,8 +11,8 @@ LIBSSH2_LICENSE_FILES = COPYING LIBSSH2_INSTALL_STAGING = YES LIBSSH2_CONF_OPTS = --disable-examples-build -# libssh2 must use either libgcrypt or OpenSSL -# Only select openssl if libgcrypt is not selected +# Dependency is either on libgcrypt or openssl, guaranteed in Config.in. +# Favour libgcrypt. ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSSH2_DEPENDENCIES += libgcrypt LIBSSH2_CONF_OPTS += --with-libgcrypt \ From a5033dd7facaec3cd8d0d129b1f457a2f55f6d7e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 8 Sep 2016 21:49:22 +0200 Subject: [PATCH 0228/3392] binutils: fix makeinfo related issue The latest version of binutils, 2.27, added in commit b700157db40410907d6a07582eacbb5030fd919e, fails to build on systems that don't have makeinfo installed. This commit therefore applies the same fixup as the one used for binutils 2.26, which consists in touching all the .info files, so that they don't get rebuilt. Signed-off-by: Thomas Petazzoni --- package/binutils/binutils.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 71ea2b0be0..ad3a0d8623 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -33,10 +33,10 @@ BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo HOST_BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo endif -# The .info files in the 2.26 tarball have an incorrect timestamp, so -# binutils tries to re-generate them. In order to avoid the dependency -# on host-texinfo, we simply update the timestamps. -ifeq ($(BR2_BINUTILS_VERSION_2_26_X),y) +# The .info files in the >= 2.26 tarball have an incorrect timestamp, +# so binutils tries to re-generate them. In order to avoid the +# dependency on host-texinfo, we simply update the timestamps. +ifeq ($(BR2_BINUTILS_VERSION_2_26_X)$(BR2_BINUTILS_VERSION_2_27_X),y) define BINUTILS_FIXUP_INFO_TIMESTAMPS find $(@D) -name '*.info' -exec touch {} \; endef From f645f914ac026504bfe4f966bfe620cc3f91e04c Mon Sep 17 00:00:00 2001 From: Georges Savoundararadj Date: Wed, 7 Sep 2016 15:29:08 -0700 Subject: [PATCH 0229/3392] board/freescale: factorize genimage logic For the boards imx6ulevk, imx6sabresd, mx25pdk, mx51evk, mx53loco, warpboard: * Replace genimage.cfg with a common Freescale genimage template named genimage.cfg.template because they all use the same layout. The only difference comes from the device tree blobs. * Replace each post-image.sh script with a generic post-image.sh script which is able to generate the right genimage.cfg depending on: ** the image type (zImage or uImage) from BR2_LINUX_KERNEL_UIMAGE ** the device tree blobs from BR2_LINUX_KERNEL_INTREE_DTS_NAME ** the rootfs type (ext2, ext3 or ext4) from BR2_TARGET_ROOTFS_EXT2 * Fix the readme.txt files accordingly Signed-off-by: Georges Savoundararadj Cc: Fabio Estevam Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Yann E. MORIN [Thomas: remove handling of rootfs type, using rootfs.ext2 in all cases is fine, rootfs.ext3 and rootfs.ext4 are just symbolic links to it.] Signed-off-by: Thomas Petazzoni --- .../genimage.cfg.template} | 13 +++-- board/freescale/common/post-image.sh | 54 +++++++++++++++++++ board/freescale/imx25pdk/post-image.sh | 14 ----- board/freescale/imx25pdk/readme.txt | 2 +- board/freescale/imx51evk/genimage.cfg | 41 -------------- board/freescale/imx51evk/post-image.sh | 14 ----- board/freescale/imx51evk/readme.txt | 2 +- board/freescale/imx53loco/genimage.cfg | 42 --------------- board/freescale/imx53loco/post-image.sh | 14 ----- board/freescale/imx6ulevk/genimage.cfg | 41 -------------- board/freescale/imx6ulevk/post-image.sh | 14 ----- board/freescale/imx6ulevk/readme.txt | 2 +- board/freescale/imx7dsdb/genimage.cfg | 41 -------------- board/freescale/imx7dsdb/post-image.sh | 14 ----- board/freescale/imx7dsdb/readme.txt | 2 +- board/freescale/warpboard/genimage.cfg | 41 -------------- board/freescale/warpboard/post-image.sh | 14 ----- configs/freescale_imx6ulevk_defconfig | 2 +- configs/freescale_imx7dsabresd_defconfig | 2 +- configs/mx25pdk_defconfig | 2 +- configs/mx51evk_defconfig | 2 +- configs/mx53loco_defconfig | 2 +- configs/warpboard_defconfig | 2 +- 23 files changed, 70 insertions(+), 307 deletions(-) rename board/freescale/{imx25pdk/genimage.cfg => common/genimage.cfg.template} (58%) create mode 100755 board/freescale/common/post-image.sh delete mode 100755 board/freescale/imx25pdk/post-image.sh delete mode 100644 board/freescale/imx51evk/genimage.cfg delete mode 100755 board/freescale/imx51evk/post-image.sh delete mode 100644 board/freescale/imx53loco/genimage.cfg delete mode 100755 board/freescale/imx53loco/post-image.sh delete mode 100644 board/freescale/imx6ulevk/genimage.cfg delete mode 100755 board/freescale/imx6ulevk/post-image.sh delete mode 100644 board/freescale/imx7dsdb/genimage.cfg delete mode 100755 board/freescale/imx7dsdb/post-image.sh delete mode 100644 board/freescale/warpboard/genimage.cfg delete mode 100755 board/freescale/warpboard/post-image.sh diff --git a/board/freescale/imx25pdk/genimage.cfg b/board/freescale/common/genimage.cfg.template similarity index 58% rename from board/freescale/imx25pdk/genimage.cfg rename to board/freescale/common/genimage.cfg.template index 9386e3296f..acce058b2a 100644 --- a/board/freescale/imx25pdk/genimage.cfg +++ b/board/freescale/common/genimage.cfg.template @@ -1,17 +1,16 @@ -# Minimal SD card image for the Freescale's i.MX25 PDK board +# Minimal SD card image for the Freescale boards Template # -# We mimic the .sdcard Freescale's image format for i.MX25: +# We mimic the .sdcard Freescale's image format: # * the SD card must have 1 kB free space at the beginning, # * U-Boot is dumped as is, -# * a FAT partition at offset 8 MB is containing zImage and dtbs, -# * a single root filesystem partition is required (Ext4 in this case). +# * a FAT partition at offset 8 MB is containing zImage/uImage and DTB files +# * a single root filesystem partition is required (ext2, ext3 or ext4) # image boot.vfat { vfat { files = { - "imx25-pdk.dtb", - "zImage" + %FILES% } } size = 16M @@ -36,6 +35,6 @@ image sdcard.img { partition rootfs { partition-type = 0x83 - image = "rootfs.ext4" + image = "rootfs.ext2" } } diff --git a/board/freescale/common/post-image.sh b/board/freescale/common/post-image.sh new file mode 100755 index 0000000000..7d48550a5a --- /dev/null +++ b/board/freescale/common/post-image.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env bash + +# +# dtb_list extracts the list of DTB files from BR2_LINUX_KERNEL_INTREE_DTS_NAME +# in ${BR_CONFIG}, then prints the corresponding list of file names for the +# genimage configuration file +# +dtb_list() +{ + local DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" + + for dt in $DTB_LIST; do + echo -n "\"$dt.dtb\", " + done +} + +# +# linux_image extracts the Linux image format from BR2_LINUX_KERNEL_UIMAGE in +# ${BR_CONFIG}, then prints the corresponding file name for the genimage +# configuration file +# +linux_image() +{ + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + echo "\"uImage\"" + else + echo "\"zImage\"" + fi +} + +main() +{ + local FILES="$(dtb_list) $(linux_image)" + local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" + local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + + sed -e "s/%FILES%/${FILES}/" \ + board/freescale/common/genimage.cfg.template > ${GENIMAGE_CFG} + + rm -rf "${GENIMAGE_TMP}" + + genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + + rm -f ${GENIMAGE_CFG} + + exit $? +} + +main $@ diff --git a/board/freescale/imx25pdk/post-image.sh b/board/freescale/imx25pdk/post-image.sh deleted file mode 100755 index b4ac4608ff..0000000000 --- a/board/freescale/imx25pdk/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/freescale/imx25pdk/readme.txt b/board/freescale/imx25pdk/readme.txt index a154b995f6..df7c617264 100644 --- a/board/freescale/imx25pdk/readme.txt +++ b/board/freescale/imx25pdk/readme.txt @@ -40,7 +40,7 @@ command as root: *** WARNING! This will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/freescale/imx25pdk/genimage.cfg. +board/freescale/common/genimage.cfg.template. Boot the i.MX25 PDK board ========================= diff --git a/board/freescale/imx51evk/genimage.cfg b/board/freescale/imx51evk/genimage.cfg deleted file mode 100644 index a44ed300ba..0000000000 --- a/board/freescale/imx51evk/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# Minimal SD card image for the Freescale's i.MX51 EVK board -# -# We mimic the .sdcard Freescale's image format for i.MX51: -# * the microSD card must have 1 kB free space at the beginning, -# * U-Boot is dumped as is, -# * a FAT partition at offset 8 MB is containing zImage and dtbs, -# * a single root filesystem partition is required (Ext4 in this case). -# - -image boot.vfat { - vfat { - files = { - "imx51-babbage.dtb", - "zImage" - } - } - size = 16M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.imx" - offset = 1024 - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 8M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/freescale/imx51evk/post-image.sh b/board/freescale/imx51evk/post-image.sh deleted file mode 100755 index b4ac4608ff..0000000000 --- a/board/freescale/imx51evk/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/freescale/imx51evk/readme.txt b/board/freescale/imx51evk/readme.txt index 6639a92085..bf739fd659 100644 --- a/board/freescale/imx51evk/readme.txt +++ b/board/freescale/imx51evk/readme.txt @@ -40,7 +40,7 @@ command as root: *** WARNING! This will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/freescale/imx51evk/genimage.cfg. +board/freescale/common/genimage.cfg.template. Boot the i.MX51 EVK board ========================= diff --git a/board/freescale/imx53loco/genimage.cfg b/board/freescale/imx53loco/genimage.cfg deleted file mode 100644 index b56c1687ed..0000000000 --- a/board/freescale/imx53loco/genimage.cfg +++ /dev/null @@ -1,42 +0,0 @@ -# Minimal microSD card image for the Freescale's i.MX53 QSB board -# -# We mimic the .sdcard Freescale's image format for i.MX53: -# * the microSD card must have 1 kB free space at the beginning, -# * U-Boot is dumped as is, -# * a FAT partition at offset 8 MB is containing zImage and dtbs, -# * a single root filesystem partition is required (Ext4 in this case). -# - -image boot.vfat { - vfat { - files = { - "imx53-qsb.dtb", - "imx53-qsrb.dtb", - "zImage" - } - } - size = 16M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.imx" - offset = 1024 - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 8M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/freescale/imx53loco/post-image.sh b/board/freescale/imx53loco/post-image.sh deleted file mode 100755 index b4ac4608ff..0000000000 --- a/board/freescale/imx53loco/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/freescale/imx6ulevk/genimage.cfg b/board/freescale/imx6ulevk/genimage.cfg deleted file mode 100644 index b58193ae73..0000000000 --- a/board/freescale/imx6ulevk/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# Minimal microSD card image for the Freescale's i.MX6UL EVK board -# -# We mimic the .sdcard Freescale's image format for i.MX6UL: -# * the microSD card must have 1 kB free space at the beginning, -# * U-Boot is dumped as is, -# * a FAT partition at offset 8 MB is containing zImage and dtbs, -# * a single root filesystem partition is required (Ext4 in this case). -# - -image boot.vfat { - vfat { - files = { - "imx6ul-14x14-evk.dtb", - "zImage" - } - } - size = 16M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.imx" - offset = 1024 - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 8M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/freescale/imx6ulevk/post-image.sh b/board/freescale/imx6ulevk/post-image.sh deleted file mode 100755 index b4ac4608ff..0000000000 --- a/board/freescale/imx6ulevk/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/freescale/imx6ulevk/readme.txt b/board/freescale/imx6ulevk/readme.txt index 462715c18d..98de2775db 100644 --- a/board/freescale/imx6ulevk/readme.txt +++ b/board/freescale/imx6ulevk/readme.txt @@ -43,7 +43,7 @@ command as root: *** WARNING! This will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/freescale/imx6ulevk/genimage.cfg. +board/freescale/common/genimage.cfg.template. Boot the i.MX6UL EVK board ========================= diff --git a/board/freescale/imx7dsdb/genimage.cfg b/board/freescale/imx7dsdb/genimage.cfg deleted file mode 100644 index aa6ae9e21e..0000000000 --- a/board/freescale/imx7dsdb/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# Minimal microSD card image for the Freescale's i.MX7D SDB board -# -# We mimic the .sdcard Freescale's image format for i.MX7D: -# * the microSD card must have 1 kB free space at the beginning, -# * U-Boot is dumped as is, -# * a FAT partition at offset 8 MB is containing zImage and dtbs, -# * a single root filesystem partition is required (Ext4 in this case). -# - -image boot.vfat { - vfat { - files = { - "imx7d-sdb.dtb", - "zImage" - } - } - size = 16M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.imx" - offset = 1024 - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 8M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/freescale/imx7dsdb/post-image.sh b/board/freescale/imx7dsdb/post-image.sh deleted file mode 100755 index b4ac4608ff..0000000000 --- a/board/freescale/imx7dsdb/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/freescale/imx7dsdb/readme.txt b/board/freescale/imx7dsdb/readme.txt index c72e9a979d..9aeeb166d8 100644 --- a/board/freescale/imx7dsdb/readme.txt +++ b/board/freescale/imx7dsdb/readme.txt @@ -40,7 +40,7 @@ command as root: *** WARNING! This will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/freescale/imx7dsdb/genimage.cfg. +board/freescale/common/genimage.cfg.template. Boot the i.MX7D SDB board ========================= diff --git a/board/freescale/warpboard/genimage.cfg b/board/freescale/warpboard/genimage.cfg deleted file mode 100644 index a22aa2a080..0000000000 --- a/board/freescale/warpboard/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# Minimal SD card image for the Warp board -# -# We mimic the .sdcard Freescale's image format for i.MX6SL: -# * the microSD card must have 1 kB free space at the beginning, -# * U-Boot is dumped as is, -# * a FAT partition at offset 8 MB is containing zImage and dtbs, -# * a single root filesystem partition is required (Ext4 in this case). -# - -image boot.vfat { - vfat { - files = { - "imx6sl-warp.dtb", - "zImage" - } - } - size = 16M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.imx" - offset = 1024 - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 8M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/freescale/warpboard/post-image.sh b/board/freescale/warpboard/post-image.sh deleted file mode 100755 index b4ac4608ff..0000000000 --- a/board/freescale/warpboard/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/configs/freescale_imx6ulevk_defconfig b/configs/freescale_imx6ulevk_defconfig index 5a18c1d4e8..fb860b5607 100644 --- a/configs/freescale_imx6ulevk_defconfig +++ b/configs/freescale_imx6ulevk_defconfig @@ -31,6 +31,6 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # filesystem / image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/imx6ulevk/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 676804118f..311f8acaae 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -33,4 +33,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/imx7dsdb/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig index d682f0fa63..645fe8a13a 100644 --- a/configs/mx25pdk_defconfig +++ b/configs/mx25pdk_defconfig @@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/imx25pdk/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index bc72e06cba..1fca282536 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/imx51evk/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index 286b719e2f..94ac818d1b 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/imx53loco/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/warpboard_defconfig b/configs/warpboard_defconfig index 19425b3645..5e9c0514b7 100644 --- a/configs/warpboard_defconfig +++ b/configs/warpboard_defconfig @@ -42,7 +42,7 @@ BR2_PACKAGE_HOST_DFU_UTIL=y BR2_PACKAGE_HOST_IMX_USB_LOADER=y # Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/warpboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y From 9e768aa1dc6457752ab5e41c612feb8d62d0e11b Mon Sep 17 00:00:00 2001 From: Georges Savoundararadj Date: Wed, 7 Sep 2016 15:29:09 -0700 Subject: [PATCH 0230/3392] board/freescale: use the common genimage template The boards imx6dlsabreauto, imx6dlsabresd, imx6qsabreauto, imx6qsabresd, imx6sxsabresd were referring to board/freescale/create-boot-sd.sh for the sdcard image generation. This commit: * Removes board/freescale/create-boot-sd.sh * Uses the common Freescale genimage template instead. The offset of the first partition was 1MB in the script and is modified to 8MB in the template. * Fixes the readme.txt file accordingly Signed-off-by: Georges Savoundararadj Cc: Fabio Estevam Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- board/freescale/create-boot-sd.sh | 93 --------------------- board/freescale/imx6sabre/readme.txt | 10 ++- configs/freescale_imx6dlsabreauto_defconfig | 6 ++ configs/freescale_imx6dlsabresd_defconfig | 6 ++ configs/freescale_imx6qsabreauto_defconfig | 6 ++ configs/freescale_imx6qsabresd_defconfig | 6 ++ configs/freescale_imx6sxsabresd_defconfig | 6 ++ 7 files changed, 37 insertions(+), 96 deletions(-) delete mode 100755 board/freescale/create-boot-sd.sh diff --git a/board/freescale/create-boot-sd.sh b/board/freescale/create-boot-sd.sh deleted file mode 100755 index af45115c72..0000000000 --- a/board/freescale/create-boot-sd.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -set -u -set -e - -PROGNAME=$(basename $0) - -usage() -{ - echo "Create an SD card that boots on an i.MX53/6 board." - echo - echo "Note: all data on the the card will be completely deleted!" - echo "Use with care!" - echo "Superuser permissions may be required to write to the device." - echo - echo "Usage: ${PROGNAME} " - echo "Arguments:" - echo " The device to be written to" - echo - echo "Example: ${PROGNAME} /dev/mmcblk0" - echo -} - -if [ $# -ne 1 ]; then - usage - exit 1 -fi - -if [ $(id -u) -ne 0 ]; then - echo "${PROGNAME} must be run as root" - exit 1 -fi - -DEV=${1} - -# The partition name prefix depends on the device name: -# - /dev/sde -> /dev/sde1 -# - /dev/mmcblk0 -> /dev/mmcblk0p1 -if echo ${DEV}|grep -q mmcblk ; then - PART="p" -else - PART="" -fi - -PART1=${DEV}${PART}1 -PART2=${DEV}${PART}2 - -# Unmount the partitions if mounted -umount ${PART1} || true -umount ${PART2} || true - -# First, clear the card -dd if=/dev/zero of=${DEV} bs=1M count=20 - -sync - -# Partition the card. -# SD layout for i.MX6 boot: -# - Bootloader at offset 1024 -# - FAT partition starting at 1MB offset, containing uImage and *.dtb -# - ext2/3 partition formatted as ext2 or ext3, containing the root filesystem. -sfdisk ${DEV} < *** WARNING! The script will destroy all the card content. Use with care! *** - ./board/freescale/create-boot-sd.sh +For details about the medium image layout, see the definition in +board/freescale/common/genimage.cfg.template. Boot the SABRE board ==================== diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index a58ab5d01b..5a8d4ce3a7 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -23,8 +23,14 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" # filesystem +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y +# required tools to create the microSD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index ecb5f8b57f..c01bf7aa9c 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -23,8 +23,14 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" # filesystem +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y +# required tools to create the microSD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 6ed33ee7d2..b9a944618d 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -23,8 +23,14 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" # filesystem +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y +# required tools to create the microSD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index bd01f05e02..b7419b0752 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -23,8 +23,14 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" # filesystem +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y +# required tools to create the microSD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 2519f493eb..9f8df63d22 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -21,8 +21,14 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" # filesystem +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y +# required tools to create the microSD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" From 9bbe56324f20c3d47af68380498e227216253227 Mon Sep 17 00:00:00 2001 From: Georges Savoundararadj Date: Wed, 7 Sep 2016 15:29:10 -0700 Subject: [PATCH 0231/3392] imx6sololiteevk: use the common genimage template * Generate an sdcard image based on the common Freescale genimage template. Signed-off-by: Georges Savoundararadj Cc: Fabio Estevam Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- configs/freescale_imx6sololiteevk_defconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig index 18043e8f97..382775105a 100644 --- a/configs/freescale_imx6sololiteevk_defconfig +++ b/configs/freescale_imx6sololiteevk_defconfig @@ -20,8 +20,14 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk" # filesystem +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y +# required tools to create the microSD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6slevk" From 66ce1cde74b895cb8c63a0cf21b300409d5cb877 Mon Sep 17 00:00:00 2001 From: Georges Savoundararadj Date: Wed, 7 Sep 2016 15:29:11 -0700 Subject: [PATCH 0232/3392] imx6sololiteevk: use zImage U-Boot, with the default environment, is looking for a zImage. Signed-off-by: Georges Savoundararadj Cc: Fabio Estevam Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- configs/freescale_imx6sololiteevk_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig index 382775105a..fa83f0ca82 100644 --- a/configs/freescale_imx6sololiteevk_defconfig +++ b/configs/freescale_imx6sololiteevk_defconfig @@ -14,8 +14,6 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk" From 9a98a75693973d82c7bf3c0cfdc07342237b7f22 Mon Sep 17 00:00:00 2001 From: Georges Savoundararadj Date: Wed, 7 Sep 2016 15:29:12 -0700 Subject: [PATCH 0233/3392] imx6dlsabresd: use zImage U-Boot, with the default environment, is looking for a zImage. Signed-off-by: Georges Savoundararadj Cc: Fabio Estevam Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- configs/freescale_imx6dlsabresd_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index c01bf7aa9c..7e42faa698 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -17,8 +17,6 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" From 91ccf292c65ed3de21c0f26ca623860c96b137ad Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Thu, 1 Sep 2016 16:32:58 -0300 Subject: [PATCH 0234/3392] board/minnowboard-max: Add kernel options to support USB disks As reported by bug #9176 the current v4.6 kernel config (used by Minnowboard MAX and Turbot) does not support USB disks. Since this is a pretty essential functionality, it's desirable to have it, so let's add the required options. Kernel config linux-v3.8.config (currently used by the first generation Minnowboard) doesn't need this change. Signed-off-by: Ezequiel Garcia Signed-off-by: Thomas Petazzoni --- board/minnowboard/linux-4.6.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/minnowboard/linux-4.6.config b/board/minnowboard/linux-4.6.config index 3bc1ffdf08..fba48a163c 100644 --- a/board/minnowboard/linux-4.6.config +++ b/board/minnowboard/linux-4.6.config @@ -14,6 +14,7 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y +CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=y CONFIG_ATA=y CONFIG_SATA_AHCI=y @@ -45,7 +46,9 @@ CONFIG_SND_HDA_CODEC_HDMI=y # CONFIG_SND_SPI is not set # CONFIG_SND_USB is not set CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_XHCI_HCD=y +CONFIG_USB_STORAGE=y CONFIG_NOP_USB_XCEIV=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y From f6ab3e1e99aa0e8ff5fd4dcc7d12958c7aa25c2c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 11 Sep 2016 23:49:19 +0200 Subject: [PATCH 0235/3392] package/php-ssh2: fix kconfig circular deps after libssh2 fix After we simplified the libssh2 dependencies, the new dependencies were not propagated to the php-ssh2 package, causing circular dependencies: package/openssl/Config.in:1:error: recursive dependency detected! package/openssl/Config.in:1: symbol BR2_PACKAGE_OPENSSL is selected by BR2_PACKAGE_LIBSSH2 package/libssh2/Config.in:1: symbol BR2_PACKAGE_LIBSSH2 is selected by BR2_PACKAGE_PHP_SSH2 package/php-ssh2/Config.in:1: symbol BR2_PACKAGE_PHP_SSH2 depends on BR2_PACKAGE_OPENSSL Just drop the now-useless dependency inherited from libssh2: libssh2 now has no dependency. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/php-ssh2/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/php-ssh2/Config.in b/package/php-ssh2/Config.in index c795dd5277..b457900740 100644 --- a/package/php-ssh2/Config.in +++ b/package/php-ssh2/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PHP_SSH2 bool "php-ssh2" depends on BR2_PACKAGE_PHP - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS \ - && !BR2_PACKAGE_OPENSSL # libssh2, libgcrypt select BR2_PACKAGE_LIBSSH2 help PHP bindings for the libssh2 library. From d28aa481b3cea9cca4c7d259618235d63f62fd59 Mon Sep 17 00:00:00 2001 From: Theo Debrouwere Date: Mon, 12 Sep 2016 10:14:43 +0200 Subject: [PATCH 0236/3392] package/pugixml: Fix CMakelists.txt cxx_long_long_type bug. CMakelist.txt tries to enable the cxx_long_long_type option, even if the feature isn't available. (Which causes some builds to fail) The included patch checks if the option is present before applying it. The patch was backported from: https://github.com/zeux/pugixml/commit/4dbb5646196a4a3cc94097f1473ef11d1d44df11 Signed-off-by: Theo Debrouwere Signed-off-by: Thomas Petazzoni --- ...1-check-cxx_long_long_type-existence.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/pugixml/0001-check-cxx_long_long_type-existence.patch diff --git a/package/pugixml/0001-check-cxx_long_long_type-existence.patch b/package/pugixml/0001-check-cxx_long_long_type-existence.patch new file mode 100644 index 0000000000..a53c84a29a --- /dev/null +++ b/package/pugixml/0001-check-cxx_long_long_type-existence.patch @@ -0,0 +1,33 @@ +From 6cfd9c14ced26c8220f7f7ea99610cbdbfb9eba7 Mon Sep 17 00:00:00 2001 +From: Theo Debrouwere +Date: Mon, 12 Sep 2016 09:38:56 +0200 +Subject: [PATCH] Bugfix: check if cxx_long_long_type is present before + applying it. + +Check if cxx_long_long_type is present in the list of compiler features +before adding it as a target_compile_feature. + +Patch was backported from +https://github.com/zeux/pugixml/commit/4dbb5646196a4a3cc94097f1473ef11d1d44df11 + +Signed-off-by: Theo Debrouwere +--- + scripts/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 40a7ab0..6403753 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -26,7 +26,7 @@ else() + endif() + + # Enable C++11 long long for compilers that are capable of it +-if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) ++if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1 AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_long_long_type;") + target_compile_features(pugixml PUBLIC cxx_long_long_type) + endif() + +-- +2.9.3 + From 94a9102d24de1ccb8253aa65a9af02b1b4eca824 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Mon, 12 Sep 2016 09:19:03 +1200 Subject: [PATCH 0237/3392] micropython: add upstream patch to fix build failures This allows micropython to build with a host python version of 2.6. Fixes: http://autobuild.buildroot.net/results/212cee82cc9db81cf1524925d106e01fc1e62ce5 http://autobuild.buildroot.net/results/4f72a602702f4eac1fe8c4a385ebfeb6e1c50df2 Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/micropython/micropython.hash | 1 + package/micropython/micropython.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index a8ad2ba4d2..28c008d3b9 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,4 @@ #locally computed sha256 871378fcf1f1042c399896d5673da67d12e1fb36c2e706af289fc959bc8f7a57 micropython-v1.8.3.tar.gz sha256 ff3194ebecda99023d7c1bb94d32b31b9491e95a79958a25ffd05213c5553acc 8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch +sha256 ac19af8587211d7229074fefa1a3a3c0fe807babc7cf9ce53606f05958699448 a50b26e4b00ed094aa1ac74eac2fc2d8eb9ea1ed.patch diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 590956e846..2f47ad8996 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -9,7 +9,8 @@ MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION)) MICROPYTHON_LICENSE = MIT MICROPYTHON_LICENSE_FILES = LICENSE MICROPYTHON_DEPENDENCIES = host-pkgconf libffi -MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch +MICROPYTHON_PATCH = https://github.com/micropython/micropython/commit/8c6856d2e76c5865d9f30cad2c51615d4a1a1418.patch \ + https://github.com/micropython/micropython/commit/a50b26e4b00ed094aa1ac74eac2fc2d8eb9ea1ed.patch # Use fallback implementation for exception handling on architectures that don't # have explicit support. From 9af33ec869bafd250e58c86c13c370894508184a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Sep 2016 19:31:42 -0300 Subject: [PATCH 0238/3392] wandboard: Make explicit that a ext4 rootfs is used Make explicit that a ext4 rootfs is used. As explained by Thomas Petazzoni: "the ext4 filesystem is already used. Indeed, the ext4 image is a symlink to the ext2 image, and the ext2 image is in fact an ext4 image: -rw-r--r-- 1 thomas thomas 3763200 sept. 11 21:54 rootfs.ext2 lrwxrwxrwx 1 thomas thomas 11 sept. 11 21:54 rootfs.ext4 -> rootfs.ext2" Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/wandboard/genimage.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/wandboard/genimage.cfg b/board/wandboard/genimage.cfg index 32c7c16c8d..b23a91b0b8 100644 --- a/board/wandboard/genimage.cfg +++ b/board/wandboard/genimage.cfg @@ -2,7 +2,7 @@ # # The SD card must have at least 1 MB free at the beginning. # U-Boot and its environment are dumped as is. -# A single root filesystem partition is required (Ext2 in this case). +# A single root filesystem partition is required (Ext4 in this case). # # For details about the layout, see: # http://wiki.wandboard.org/index.php/Boot-process @@ -25,7 +25,7 @@ image sdcard.img { partition rootfs { partition-type = 0x83 - image = "rootfs.ext2" + image = "rootfs.ext4" size = 512M } } From ec63228bd53ffb21704dc7ec9a2dcee64506504f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 12 Sep 2016 15:34:35 +0100 Subject: [PATCH 0239/3392] vim: bump version to v8.0.0001 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index bb2d0139a4..bc4a08e9cf 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 7c90f16e1d1547a864f4419cd7d066ca4ce822de285b2a718f9274e5241fe2fd vim-v7.4.1902.tar.gz +sha256 9b4790dafc886537096a6e1953ee0424b8c308881b97151a7bfba1f9fd14e3f9 vim-v8.0.0001.tar.gz diff --git a/package/vim/vim.mk b/package/vim/vim.mk index c2f6cac79e..d55e905321 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = v7.4.1902 +VIM_VERSION = v8.0.0001 VIM_SITE = $(call github,vim,vim,$(VIM_VERSION)) # Win over busybox vi since vim is more feature-rich VIM_DEPENDENCIES = \ From f80e50d8a7ebcdaa8111963b6df0fe658ade6e5d Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Sun, 11 Sep 2016 18:04:26 -0700 Subject: [PATCH 0240/3392] syslinux: add patch to disable pie Ubuntu 16.10 has pie enable by default. This causes a build failure with syslinux. https://bugs.launchpad.net/ubuntu/+source/syslinux/+bug/1579023 Signed-off-by: Ryan Coe [Thomas: improve patch description.] Signed-off-by: Thomas Petazzoni --- boot/syslinux/0002-disable-pie.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 boot/syslinux/0002-disable-pie.patch diff --git a/boot/syslinux/0002-disable-pie.patch b/boot/syslinux/0002-disable-pie.patch new file mode 100644 index 0000000000..b31b622c41 --- /dev/null +++ b/boot/syslinux/0002-disable-pie.patch @@ -0,0 +1,22 @@ +Description: Disable PIE to avoid FTBFS on amd64 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1579023 +Author: Graham Inggs +Last-Update: 2016-05-06 + +gcc 6.x has PIE support enabled by default, which causes a build issue +with syslinux. This patch disables PIE support in the relevant +syslinux Makefile. + +Signed-off-by: Ryan Coe + +--- a/gpxe/src/Makefile ++++ b/gpxe/src/Makefile +@@ -4,7 +4,7 @@ + # + + CLEANUP := +-CFLAGS := ++CFLAGS := -fno-PIE + ASFLAGS := + LDFLAGS := + MAKEDEPS := Makefile From 218dfdd9038af882a02fe64f13a533c8ce75ddc1 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Mon, 12 Sep 2016 21:23:24 +0200 Subject: [PATCH 0241/3392] package/nginx-naxsi: add missing pcre dependency Fixes: http://autobuild.buildroot.net/results/9c7/9c7bad6831b09251af81e2bbfc595a241df87c70/ Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/nginx-naxsi/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in index 2f7c2da2a9..6c175eb75e 100644 --- a/package/nginx-naxsi/Config.in +++ b/package/nginx-naxsi/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NGINX_NAXSI bool "nginx-naxsi" + select BR2_PACKAGE_PCRE help NAXSI means Nginx Anti XSS & SQL Injection. From 7f111de1fbbc5d81c9c5981bd359b5d81c974d9b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 12 Sep 2016 14:03:40 -0300 Subject: [PATCH 0242/3392] boot/uboot: bump to version 2016.09 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index b024b66240..45d0586109 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -38,7 +38,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2016.07" + bool "2016.09" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -86,7 +86,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2016.07" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2016.09" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index cf27e90a57..6870d68023 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 974fb7225c0af6a721307631f66b81e20dbda82a4d7cc32aba2a625727231253 u-boot-2016.07.tar.bz2 +sha256 994e7b9e0e350d9f91f5892d5e5bff00d3714a4962f520f78a64a461ef950ba9 u-boot-2016.09.tar.bz2 From 3624a24f3c22954b95e0a77e70b8a4ce0b88a854 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 12 Sep 2016 14:03:41 -0300 Subject: [PATCH 0243/3392] uboot-tools: bump to version 2016.09 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- .../0002-tools-only-in-no-dot-config-targets.patch | 10 ++++++---- package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch b/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch index 795466f49e..c201bf749d 100644 --- a/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch +++ b/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch @@ -18,20 +18,22 @@ Based on Debian patch from u-boot-tools: http://ftp.de.debian.org/debian/pool/main/u/u-boot/u-boot_2014.10+dfsg1-2.1.debian.tar.xz Signed-off-by: Jörg Krause +[fabio: adapt it to 2016.09] +Signed-off-by: Fabio Estevam --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 954a865..3ab5958 100644 +index 1cf15ce..75e85eb 100644 --- a/Makefile +++ b/Makefile -@@ -424,7 +424,7 @@ timestamp_h := include/generated/timestamp_autogenerated.h +@@ -425,7 +425,7 @@ timestamp_h := include/generated/timestamp_autogenerated.h no-dot-config-targets := clean clobber mrproper distclean \ help %docs check% coccicheck \ -- ubootversion backup -+ ubootversion backup tools-only +- ubootversion backup tests ++ ubootversion backup tests tools-only config-targets := 0 mixed-targets := 0 diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index cf27e90a57..6870d68023 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 974fb7225c0af6a721307631f66b81e20dbda82a4d7cc32aba2a625727231253 u-boot-2016.07.tar.bz2 +sha256 994e7b9e0e350d9f91f5892d5e5bff00d3714a4962f520f78a64a461ef950ba9 u-boot-2016.09.tar.bz2 diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index e7826bde10..d2042bee23 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2016.07 +UBOOT_TOOLS_VERSION = 2016.09 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPLv2+ From 57e61a91531bf8ea696b5613bd8d846cc645a1d5 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Mon, 12 Sep 2016 21:23:22 +0200 Subject: [PATCH 0244/3392] package/urg: fix build Update select-h patch to also fix the C++ serial driver. Fixes: http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/ Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/urg/0001-select-h.patch | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/package/urg/0001-select-h.patch b/package/urg/0001-select-h.patch index 09d1530443..8de0a5b2ed 100644 --- a/package/urg/0001-select-h.patch +++ b/package/urg/0001-select-h.patch @@ -1,11 +1,28 @@ ---- urg-0.8.18/src/c/connection/serial_ctrl_lin.c 2010-11-22 01:48:01.000000000 +0000 -+++ urg-0.8.18.mod/src/c/connection/serial_ctrl_lin.c 2013-05-21 20:56:35.822025969 +0100 -@@ -17,7 +17,7 @@ - #include +Serial driver: add missing header to C and C++ serial driver + +Fixes: + http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/ + +Signed-off-by: Samuel Martin + +--- a/src/c/connection/serial_ctrl_lin.c 2016-09-11 15:49:42.599807053 +0200 ++++ b/src/c/connection/serial_ctrl_lin.c 2016-09-11 15:50:07.850700420 +0200 +@@ -18,6 +18,7 @@ #include #include -- + +#include //#include enum { +--- a/src/cpp/connection/SerialDevice_lin.cpp 2016-09-11 15:38:23.335547059 +0200 ++++ b/src/cpp/connection/SerialDevice_lin.cpp 2016-09-11 15:38:38.472741418 +0200 +@@ -13,7 +13,7 @@ + #include + #include + #include +- ++#include + + class RawSerialDevice + { From 5a7c9266c29a593daa9dd75dc960908f3d71992a Mon Sep 17 00:00:00 2001 From: Piotr Nakraszewicz Date: Mon, 12 Sep 2016 16:20:21 +0530 Subject: [PATCH 0245/3392] gst1-rtsp-server: new package Based on patch by Phil Edworthy: http://lists.busybox.net/pipermail/buildroot/2010-June/035777.html Cc: Thomas Petazzoni Cc: Peter Korsgaard Reviewed-by: Rahul Bedarkar Reviewed-by: Abhimanyu Vishwakarma Signed-off-by: Piotr Nakraszewicz Signed-off-by: Abhilash Tuse [Thomas: add host-pkgconf to the dependencies.] Signed-off-by: Thomas Petazzoni --- package/gstreamer1/Config.in | 1 + package/gstreamer1/gst1-rtsp-server/Config.in | 12 +++++++++ .../gst1-rtsp-server/gst1-rtsp-server.hash | 2 ++ .../gst1-rtsp-server/gst1-rtsp-server.mk | 27 +++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 package/gstreamer1/gst1-rtsp-server/Config.in create mode 100644 package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash create mode 100644 package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in index ea35ecc9aa..23862bd8cb 100644 --- a/package/gstreamer1/Config.in +++ b/package/gstreamer1/Config.in @@ -8,6 +8,7 @@ source "package/gstreamer1/gst1-plugins-bad/Config.in" source "package/gstreamer1/gst1-plugins-ugly/Config.in" source "package/gstreamer1/gst1-imx/Config.in" source "package/gstreamer1/gst1-libav/Config.in" +source "package/gstreamer1/gst1-rtsp-server/Config.in" source "package/gstreamer1/gst1-validate/Config.in" source "package/gstreamer1/gst-omx/Config.in" endif diff --git a/package/gstreamer1/gst1-rtsp-server/Config.in b/package/gstreamer1/gst1-rtsp-server/Config.in new file mode 100644 index 0000000000..5869952f58 --- /dev/null +++ b/package/gstreamer1/gst1-rtsp-server/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_GST1_RTSP_SERVER + bool "gst1-rtsp-server" + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP # runtime + select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP # runtime + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER # runtime + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP # runtime + help + RTSP server library based on GStreamer. + + http://gstreamer.freedesktop.org/ diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash new file mode 100644 index 0000000000..a30afbc1d3 --- /dev/null +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -0,0 +1,2 @@ +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.8.3.tar.xz.sha256sum +sha256 010f06800c1c957851d1352e5ec7a8ba3ce6a857fec1b8afc7d1a9e5f53288bf gst-rtsp-server-1.8.3.tar.xz diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk new file mode 100644 index 0000000000..458e3aff37 --- /dev/null +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# gst1-rtsp-server +# +################################################################################ + +GST1_RTSP_SERVER_VERSION = 1.8.3 +GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz +GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server +GST1_RTSP_SERVER_LICENSE = LGPLv2+ +GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB +GST1_RTSP_SERVER_INSTALL_STAGING = YES +GST1_RTSP_SERVER_DEPENDENCIES = \ + host-pkgconf \ + gstreamer1 \ + gst1-plugins-base \ + gst1-plugins-good + +ifeq ($(BR2_PACKAGE_LIBCGROUP),y) +GST1_RTSP_SERVER_DEPENDENCIES += libcgroup +endif + +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD),y) +GST1_RTSP_SERVER_DEPENDENCIES += gst1-plugins-bad +endif + +$(eval $(autotools-package)) From 5971ce316aa5f7113104550a1a393059397ccd0f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 12 Sep 2016 17:50:46 -0300 Subject: [PATCH 0246/3392] configs/imx6ulpico: Bump to U-Boot 2016.09 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6ulpico_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/imx6ulpico_defconfig b/configs/imx6ulpico_defconfig index 8406226f26..1b47eccff1 100644 --- a/configs/imx6ulpico_defconfig +++ b/configs/imx6ulpico_defconfig @@ -36,7 +36,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="pico-imx6ul" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09" BR2_TARGET_UBOOT_FORMAT_IMX=y # required tools to create the eMMC image From 5c97dcbc1f43e783af4f6200f65152a1b9a1851d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 12 Sep 2016 17:50:47 -0300 Subject: [PATCH 0247/3392] configs/wandboard: Bump to U-Boot 2016.09 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/wandboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 67041a6179..18d30d9525 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -10,7 +10,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="wandboard" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" From 51a7293bf96ece7efebcdcc2aa9cf476d451ff94 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 12 Sep 2016 17:50:48 -0300 Subject: [PATCH 0248/3392] configs/warp7: Use mainline U-Boot warp7 is well supported in mainline U-Boot 2016.09, so switch to this version. As the current supported kernel is based on a 4.1 kernel from NXP, use the "warp7_secure" U-Boot target as NXP kernel needs to boot in secure mode. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/warp7_defconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 0da34c324e..95508d6334 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -19,10 +19,9 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" # U-Boot BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="warp7" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Freescale/u-boot-fslc.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="7a8868eb526b7c1d5dc274bc666bfaef9585ba7c" +BR2_TARGET_UBOOT_BOARDNAME="warp7_secure" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09" BR2_TARGET_UBOOT_FORMAT_IMX=y # Filesystem From d3ac2bc616803b40efad1e620ffe09eb7f7d1565 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 12 Sep 2016 13:15:54 -0300 Subject: [PATCH 0249/3392] linux-headers: allow specifying 4.8 as kernel header version Even though 4.8 is not released yet, some people may want to build a system using the 4.8-rc kernel, and point to the kernel sources as the kernel headers to use for the toolchain. In order to make this possible, this commit adds support for specifying 4.8 as the kernel headers version, in both the internal and external toolchain logic. Signed-off-by: Fabio Estevam [Thomas: remove support for 4.8 headers selection, and rework commit log.] Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 4 ++++ toolchain/toolchain-common.in | 5 +++++ toolchain/toolchain-external/Config.in | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7fea748ce3..cbfaa262b8 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -106,6 +106,10 @@ choice This is used to hide/show some packages that have strict requirements on the version of kernel headers. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8 + bool "4.8.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7 bool "4.7.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 03fa880e21..b682e4d701 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -222,10 +222,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 default "4.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 default "4.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 default "4.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 63b77127fe..c3822edad5 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -794,6 +794,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8 + bool "4.8.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_7 bool "4.7.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 From 0f0183121d933cc38f78d1ded6c3a59907cc917c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 12 Sep 2016 13:15:55 -0300 Subject: [PATCH 0250/3392] mx6ulpico: Use kernel 4.8-rc5 With kernel 4.8-rc5 we no longer need to use the "CONFIG_SMP=n" workaround as the reboot issue has been fixed upstream by commit 059e232089e4 ("irqchip/gic: Allow self-SGIs for SMP on UP configurations") Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/technexion/imx6ulpico/linux.fragment | 1 - configs/imx6ulpico_defconfig | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/board/technexion/imx6ulpico/linux.fragment b/board/technexion/imx6ulpico/linux.fragment index 88e323e68e..892d0cb7b9 100644 --- a/board/technexion/imx6ulpico/linux.fragment +++ b/board/technexion/imx6ulpico/linux.fragment @@ -1,2 +1 @@ CONFIG_CFG80211_WEXT=y -CONFIG_SMP=n diff --git a/configs/imx6ulpico_defconfig b/configs/imx6ulpico_defconfig index 1b47eccff1..f984bf49d1 100644 --- a/configs/imx6ulpico_defconfig +++ b/configs/imx6ulpico_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc5" @@ -17,7 +17,7 @@ BR2_GLOBAL_PATCH_DIR="board/technexion/imx6ulpico/patches" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8-rc5" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/technexion/imx6ulpico/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y From bc5584fc90b491610aecec22102a772d0805ddf4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 12 Sep 2016 00:26:05 +0200 Subject: [PATCH 0251/3392] apache: add customization of MPM MPM can be selected between event, prefork or worker Set worker as the default one as it was before even if event MPM is better on system supporting thread safe polling Signed-off-by: Fabrice Fontaine Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/apache/Config.in | 28 ++++++++++++++++++++++++++++ package/apache/apache.mk | 10 +++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 0814a17f7e..511876d2eb 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -14,6 +14,34 @@ config BR2_PACKAGE_APACHE http://httpd.apache.org +if BR2_PACKAGE_APACHE + +choice + prompt "Multi-Processing Module (MPM)" + default BR2_PACKAGE_APACHE_MPM_WORKER + help + Select the Multi-Processing Module (MPM). + +config BR2_PACKAGE_APACHE_MPM_EVENT + bool "event" + help + A variant of the worker MPM with the goal of consuming threads + only for connections with active processing + +config BR2_PACKAGE_APACHE_MPM_PREFORK + bool "prefork" + help + Implements a non-threaded, pre-forking web server + +config BR2_PACKAGE_APACHE_MPM_WORKER + bool "worker" + help + Implements a hybrid multi-threaded multi-process web server + +endchoice + +endif + comment "apache needs a toolchain w/ dynamic library, threads" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/apache/apache.mk b/package/apache/apache.mk index e78545a076..e54b736090 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -20,6 +20,14 @@ APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config +ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) +APACHE_MPM = event +else ifeq ($(BR2_PACKAGE_APACHE_MPM_PREFORK),y) +APACHE_MPM = prefork +else ifeq ($(BR2_PACKAGE_APACHE_MPM_WORKER),y) +APACHE_MPM = worker +endif + APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ @@ -31,7 +39,7 @@ APACHE_CONF_OPTS = \ --enable-mime-magic \ --without-suexec-bin \ --enable-mods-shared=all \ - --with-mpm=worker \ + --with-mpm=$(APACHE_MPM) \ --disable-lua \ --disable-luajit From 27281b5caad935db9f9f897194dfa00565d9c500 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 13 Sep 2016 13:45:13 +0100 Subject: [PATCH 0252/3392] sqlite: bump version to 3140200 (3.14.2) Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.hash | 4 ++-- package/sqlite/sqlite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index b4db80d90b..308522bf7c 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,4 +1,4 @@ # From http://www.sqlite.org/download.html -sha1 f0ed10b416c467062c76b899f08c773c713fb8fd sqlite-autoconf-3140000.tar.gz +sha1 5d3a6bccd9154963641960db61df901a4e0b3ca0 sqlite-autoconf-3140200.tar.gz # Calculated based on the hash above -sha256 742db0ebbd9cc91ed6a41857f50aa9795fc859c994a256125135cd07f6cdfd76 sqlite-autoconf-3140000.tar.gz +sha256 644f0c127f7d0cbe8765b9bbdf9ed09d6a2f2b9dfba48ddfd8ca0a42fdb5b3fc sqlite-autoconf-3140200.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 9703f82de3..a8a36bbfaf 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3140000 +SQLITE_VERSION = 3140200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2016 SQLITE_LICENSE = Public domain From 8bee59bb8fbb1a8dcaac4f2b386b5013ac08f19d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 13 Sep 2016 09:20:37 +0200 Subject: [PATCH 0253/3392] configs/orangepipc: Use u-boot 2016.09 Among others, this adds support for the ethernet interface. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- configs/orangepipc_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepipc_defconfig b/configs/orangepipc_defconfig index 3683ad49bb..2e127d0ac4 100644 --- a/configs/orangepipc_defconfig +++ b/configs/orangepipc_defconfig @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From 327c985ce1b0e2809751abe612a03a1760b249aa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 13 Sep 2016 09:20:38 +0200 Subject: [PATCH 0254/3392] configs/orangepipc: Use Linux 4.7.3 There's now an sun8i-h3-orangepi-pc dts, so we can use that and drop the hack in the post-image script. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- board/orangepi/orangepipc/post-image.sh | 8 -------- configs/orangepipc_defconfig | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/board/orangepi/orangepipc/post-image.sh b/board/orangepi/orangepipc/post-image.sh index dbe1516696..359b4c9e7c 100755 --- a/board/orangepi/orangepipc/post-image.sh +++ b/board/orangepi/orangepipc/post-image.sh @@ -6,17 +6,9 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" rm -rf "${GENIMAGE_TMP}" -# As we now use the Linux v4.5-RC1 kernel no orangepi-pc dtb exists yet. -# However the orangepi-plus dtb has not much content, only mmc0 and uart -# which are equal to the pc version of the board, so we use it here. -mv ${BINARIES_DIR}/sun8i-h3-orangepi-plus.dtb ${BINARIES_DIR}/sun8i-h3-orangepi-pc.dtb - - genimage \ --rootpath "${TARGET_DIR}" \ --tmppath "${GENIMAGE_TMP}" \ --inputpath "${BINARIES_DIR}" \ --outputpath "${BINARIES_DIR}" \ --config "${GENIMAGE_CFG}" - -exit $? diff --git a/configs/orangepipc_defconfig b/configs/orangepipc_defconfig index 2e127d0ac4..1bea5413ea 100644 --- a/configs/orangepipc_defconfig +++ b/configs/orangepipc_defconfig @@ -1,17 +1,17 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepipc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepipc/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-plus" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set From 0d7383a0a7f5c69cb0e4a4eb0d32d2536cd7e0e8 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 12 Sep 2016 18:30:17 -0300 Subject: [PATCH 0255/3392] configs/wandboard: Remove BR2_LINUX_KERNEL_CUSTOM_GIT Now that we use a mainline kernel for wandboard, we no longer need to select BR2_LINUX_KERNEL_CUSTOM_GIT, so remove it. This fixes the following warning: make wandboard_defconfig /configs/wandboard_defconfig:19:warning: override: BR2_LINUX_KERNEL_CUSTOM_VERSION changes choice state # # configuration written to /home/fabio/buildroot/.config Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/wandboard_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 18d30d9525..4149ecf510 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -15,7 +15,6 @@ BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" From 9ecb1b858c1ed5b625ed942d32f040a67e8355d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 13 Sep 2016 15:35:02 +0200 Subject: [PATCH 0256/3392] package/libupnpp: add patch to fix build issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumping libupnpp to version 0.15.0 introduced a build error for some architectures: ``` ./libupnpp/workqueue.h:308:29: error: field 'res' has incomplete type std::future res; ^ ./libupnpp/workqueue.h: In member function 'bool WorkQueue::start(int, void* (*)(void*), void*)': ./libupnpp/workqueue.h:81:25: error: invalid use of incomplete type 'class std::packaged_task' w.res = task.get_future(); ``` The problem is that `std::future` is not available for all architectures, e.g. it is missing for ARMv5 (soft-float). libstdc++ enables `std::future` only if `ATOMIC_INT_LOCK_FREE > 1`, which according the the libstdc++ documentation means that operations on atomic ints are guaranteed to be lock-free. This check is not true for some target, e.g. the toolchain for the ARMv5 target defines: ``` $ echo | /usr/bin/arm-linux-g++ -dM -E - | grep ATOMIC_INT_LOCK_FREE #define __GCC_ATOMIC_INT_LOCK_FREE 1 ``` We add a patch from upstream which detects if `std::future` is available and opts-out the functionality for unsupported targets. Fixes: http://autobuild.buildroot.net/results/f8eb38ef79160e1f646dae0be19f27fae82a58bc http://autobuild.buildroot.net/results/158e0ceeff009146b78a0d2bb278c76479bafc34 http://autobuild.buildroot.net/results/1760cf53c77e16bb2b5bc795bd0ce5eb65f258f2 http://autobuild.buildroot.net/results/5b73e52495aa1bbb2c704492237da784b9d74bc2 http://autobuild.buildroot.net/results/6d922a1bbace024fcf040beb49bbb119036865ef http://autobuild.buildroot.net/results/bebb8983e7579ee4b4bcf18f037c7797ab86f8db http://autobuild.buildroot.net/results/0f1a5832ced2a6ec2e18f9f14197446fda6af692 http://autobuild.buildroot.net/results/94a9cc349f23a47246b06619a019bcb917493415 http://autobuild.buildroot.net/results/19fba094098af5c1ce1e1371e5e88393c4a6ac9c http://autobuild.buildroot.net/results/578935b5c04005d1f096059387d16911f953ec6f http://autobuild.buildroot.net/results/2ad698f1665b7b886141672181cb76ec3c40a743 and more... Note, that we enable autoreconf as the patch touches configure.ac. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- .../libupnpp/0001-Check-for-std-future.patch | 127 ++++++++++++++++++ package/libupnpp/libupnpp.mk | 2 + 2 files changed, 129 insertions(+) create mode 100644 package/libupnpp/0001-Check-for-std-future.patch diff --git a/package/libupnpp/0001-Check-for-std-future.patch b/package/libupnpp/0001-Check-for-std-future.patch new file mode 100644 index 0000000000..73193953d8 --- /dev/null +++ b/package/libupnpp/0001-Check-for-std-future.patch @@ -0,0 +1,127 @@ +From 3bfcb171026c4fd5c7caf807f79184a81c8af5b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Sun, 11 Sep 2016 21:09:22 +0200 +Subject: [PATCH] Check for std::future +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +std::future is not available for all architectures, e.g. it is missing +for ARMv5 (soft-float). + +The problem is that libstdc++ only enables `std::future` if +`ATOMIC_INT_LOCK_FREE > 1` which is not true for the ARMv5 target. + +As the future functionality is not used for much we just ifdef out the +parts from `std::future`. + +Upstream-status: https://github.com/medoc92/libupnpp/issues/8 + +This patch is squashed from two upstream commits: +1/ d3e3cada667cca5b70693b351e5865231275dd82 +2/ 90407dcc206987c8e58d61c64db539489f0717d2 + +Signed-off-by: Jörg Krause +--- + configure.ac | 17 +++++++++++++++++ + libupnpp/config.h.in | 3 +++ + libupnpp/workqueue.h | 14 +++++++++++++- + 3 files changed, 33 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 877a773..9ff2058 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -47,6 +47,23 @@ AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size]) + AC_CHECK_LIB([rt], [clock_gettime], [], []) + AC_CHECK_LIB([pthread], [pthread_create], [], []) + ++# Check that std::future is available. ++AC_LANG_PUSH([C++]) ++CXXFLAGS="-std=c++11 $CXXFLAGS" ++AC_MSG_CHECKING([whether std::future is available]) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ [[std::future f;]])], ++ [ AC_DEFINE([HAVE_STD_FUTURE], [1], ++ [Define to 1 if you have the `std::future`.]) ++ have_std_future=yes ++ ], ++ [ ++ have_std_future=no ++ ] ++) ++AC_MSG_RESULT([$have_std_future]) ++AC_LANG_POP ++ + # The 2 following checks for libthreadutil and libixml are normally + # unnecessary and even problematic. libupnpp does not use them directly, + # and they should be used automatically because libupnpp is linked with them. +diff --git a/libupnpp/config.h.in b/libupnpp/config.h.in +index 39fa410..4471855 100644 +--- a/libupnpp/config.h.in ++++ b/libupnpp/config.h.in +@@ -36,6 +36,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_STDLIB_H + ++/* Define to 1 if you have the `std::future`. */ ++#undef HAVE_STD_FUTURE ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_STRINGS_H + +diff --git a/libupnpp/workqueue.h b/libupnpp/workqueue.h +index 52a6138..9c0ec02 100644 +--- a/libupnpp/workqueue.h ++++ b/libupnpp/workqueue.h +@@ -18,7 +18,9 @@ + #define _WORKQUEUE_H_INCLUDED_ + + #include ++#if HAVE_STD_FUTURE + #include ++#endif + #include + #include + #include +@@ -76,10 +78,14 @@ public: + bool start(int nworkers, void *(workproc)(void *), void *arg) { + std::unique_lock lock(m_mutex); + for (int i = 0; i < nworkers; i++) { +- std::packaged_task task(workproc); + Worker w; ++#if HAVE_STD_FUTURE ++ std::packaged_task task(workproc); + w.res = task.get_future(); + w.thr = std::thread(std::move(task), arg); ++#else ++ w.thr = std::thread(workproc, arg); ++#endif + m_worker_threads.push_back(std::move(w)); + } + return true; +@@ -189,7 +195,11 @@ public: + // Workers return (void*)1 if ok + void *statusall = (void*)1; + while (!m_worker_threads.empty()) { ++#if HAVE_STD_FUTURE + void *status = m_worker_threads.front().res.get(); ++#else ++ void *status = (void*) 1; ++#endif + m_worker_threads.front().thr.join(); + if (status == (void *)0) { + statusall = status; +@@ -305,7 +315,9 @@ private: + + struct Worker { + std::thread thr; ++#if HAVE_STD_FUTURE + std::future res; ++#endif + }; + + // Configuration +-- +2.9.3 + diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk index 7d21a88822..ab1ce8b87d 100644 --- a/package/libupnpp/libupnpp.mk +++ b/package/libupnpp/libupnpp.mk @@ -10,6 +10,8 @@ LIBUPNPP_LICENSE = GPLv2+ LIBUPNPP_LICENSE_FILES = COPYING LIBUPNPP_INSTALL_STAGING = YES LIBUPNPP_DEPENDENCIES = expat libcurl libupnp +# touching configure.ac in 0001-Check-for-std-future.patch +LIBUPNPP_AUTORECONF = YES # configure script fails to link against the dependencies of libupnp # and libcurl causing detection to fail when statically linking From f4bf50f9829ab7bddda7a25ec1e8e8019e5c388d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Tue, 13 Sep 2016 21:06:24 +0200 Subject: [PATCH 0257/3392] openal: Use upstream patch to fix aarch64 build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/openal/openal.hash | 1 + package/openal/openal.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/openal/openal.hash b/package/openal/openal.hash index 88556ba56e..45f1421da0 100644 --- a/package/openal/openal.hash +++ b/package/openal/openal.hash @@ -3,3 +3,4 @@ sha256 a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314 openal-s sha256 9c9040269376aba77b1277bbae0f055aee535e14ad4a3ab4e66e39830504e83f 27916ce3db023454a0295ee63ea196fbc246674c.patch sha256 4621f6b79d4bbac5ce423f227c92ad1e4f833d7e1f2ff1cc3b5f03721f75b933 a52cfc804813aef8e4b304e20cf843fa6907af6c.patch sha256 f442da31b4001a5133f2762a5bc1e780b11d5e2d9f21b257f54695ee6d87d997 c3c283a0b5d0130afafaa2a5b6ce6fbc30b6e6a1.patch +sha256 3691c1a327b87d5fb487841459fd00d3baaa79808ecb5e3b33b349363663640f 46b3e1d08ca10e809eb2e20b6371812958b97e1f.patch diff --git a/package/openal/openal.mk b/package/openal/openal.mk index 71117faba9..356f2c1cf8 100644 --- a/package/openal/openal.mk +++ b/package/openal/openal.mk @@ -10,7 +10,8 @@ OPENAL_SITE = http://kcat.strangesoft.net/openal-releases OPENAL_PATCH = \ https://github.com/kcat/openal-soft/commit/27916ce3db023454a0295ee63ea196fbc246674c.patch \ https://github.com/kcat/openal-soft/commit/a52cfc804813aef8e4b304e20cf843fa6907af6c.patch \ - https://github.com/kcat/openal-soft/commit/c3c283a0b5d0130afafaa2a5b6ce6fbc30b6e6a1.patch + https://github.com/kcat/openal-soft/commit/c3c283a0b5d0130afafaa2a5b6ce6fbc30b6e6a1.patch \ + https://github.com/kcat/openal-soft/commit/46b3e1d08ca10e809eb2e20b6371812958b97e1f.patch OPENAL_LICENSE = LGPLv2+ OPENAL_LICENSE_FILES = COPYING OPENAL_INSTALL_STAGING = YES From b8c0c2ef3dea429f6b2c7d728f7c858312f171d5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 14 Sep 2016 11:46:01 +0200 Subject: [PATCH 0258/3392] Revert "package/urg: fix build" This reverts commit 57e61a91531bf8ea696b5613bd8d846cc645a1d5. The patch doesn't apply, and makes the urg package fail in all situations. Signed-off-by: Thomas Petazzoni --- package/urg/0001-select-h.patch | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/package/urg/0001-select-h.patch b/package/urg/0001-select-h.patch index 8de0a5b2ed..09d1530443 100644 --- a/package/urg/0001-select-h.patch +++ b/package/urg/0001-select-h.patch @@ -1,28 +1,11 @@ -Serial driver: add missing header to C and C++ serial driver - -Fixes: - http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/ - -Signed-off-by: Samuel Martin - ---- a/src/c/connection/serial_ctrl_lin.c 2016-09-11 15:49:42.599807053 +0200 -+++ b/src/c/connection/serial_ctrl_lin.c 2016-09-11 15:50:07.850700420 +0200 -@@ -18,6 +18,7 @@ +--- urg-0.8.18/src/c/connection/serial_ctrl_lin.c 2010-11-22 01:48:01.000000000 +0000 ++++ urg-0.8.18.mod/src/c/connection/serial_ctrl_lin.c 2013-05-21 20:56:35.822025969 +0100 +@@ -17,7 +17,7 @@ + #include #include #include - +- +#include //#include enum { ---- a/src/cpp/connection/SerialDevice_lin.cpp 2016-09-11 15:38:23.335547059 +0200 -+++ b/src/cpp/connection/SerialDevice_lin.cpp 2016-09-11 15:38:38.472741418 +0200 -@@ -13,7 +13,7 @@ - #include - #include - #include -- -+#include - - class RawSerialDevice - { From 9d26ac1e764921bdd90109381e38e328fa1bfa7e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 14 Sep 2016 10:00:26 -0300 Subject: [PATCH 0259/3392] wandboard: Remove unneeded return code There is no need to handle this return code, so just remove it. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- board/wandboard/post-image.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/board/wandboard/post-image.sh b/board/wandboard/post-image.sh index 11f58dbd02..18e76aa40d 100755 --- a/board/wandboard/post-image.sh +++ b/board/wandboard/post-image.sh @@ -13,5 +13,3 @@ genimage \ --outputpath "${BINARIES_DIR}" \ --config "${GENIMAGE_CFG}" -RET=${?} -exit ${RET} From ed5604ed9e378c3f8814d7f92ec66fd855b8245c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 14 Sep 2016 10:08:00 -0300 Subject: [PATCH 0260/3392] httping: bump to version 2.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/httping/httping.hash | 2 +- package/httping/httping.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/httping/httping.hash b/package/httping/httping.hash index 0368f75652..a50eedb744 100644 --- a/package/httping/httping.hash +++ b/package/httping/httping.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 dab59f02b08bfbbc978c005bb16d2db6fe21e1fc841fde96af3d497ddfc82084 httping-2.4.tgz +sha256 3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8 httping-2.5.tgz diff --git a/package/httping/httping.mk b/package/httping/httping.mk index 7e7609086e..3418ffa110 100644 --- a/package/httping/httping.mk +++ b/package/httping/httping.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTTPING_VERSION = 2.4 +HTTPING_VERSION = 2.5 HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz HTTPING_SITE = http://www.vanheusden.com/httping HTTPING_LICENSE = GPLv2 From 28dc7f4adc6e6c7a6d67fab99ef7cb68117b502f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 14 Sep 2016 09:52:24 +0100 Subject: [PATCH 0261/3392] libcurl: bump version to 7.50.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 2 +- package/libcurl/libcurl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index c2b4eccdb1..e2f2ecd109 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 0c72105df4e9575d68bcf43aea1751056c1d29b1040df6194a49c5ac08f8e233 curl-7.50.2.tar.bz2 +sha256 7b7347d976661d02c84a1f4d6daf40dee377efdc45b9e2c77dedb8acf140d8ec curl-7.50.3.tar.bz2 diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 00a61d278e..32a3022ca5 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.50.2 +LIBCURL_VERSION = 7.50.3 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = http://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From e8e8c0b0c3b1228b1f0df356d6b3a9b0452ae51e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 14 Sep 2016 07:04:21 -0300 Subject: [PATCH 0262/3392] pango: bump to version 1.40.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 036838cbd9..1ea9f6bdda 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-1.40.2.sha256sum -sha256 90582a02bc89318d205814fc097f2e9dd164d26da5f27c53ea42d583b34c3cd1 pango-1.40.2.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-1.40.3.sha256sum +sha256 abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3 pango-1.40.3.tar.xz diff --git a/package/pango/pango.mk b/package/pango/pango.mk index ba07aec245..b45bf9a949 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.40 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).2 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_AUTORECONF = YES From 5757aaf36da8a34d7ff2e31a8738a45ec72734af Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 14 Sep 2016 12:36:28 +0200 Subject: [PATCH 0263/3392] python-tornado: bump to version 4.4.1 Remove upstream patch. Signed-off-by: Peter Korsgaard --- ...ckports.ssl_match_hostname-on-Python.patch | 37 ------------------- package/python-tornado/python-tornado.hash | 6 +-- package/python-tornado/python-tornado.mk | 4 +- 3 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 package/python-tornado/0001-Don-t-require-backports.ssl_match_hostname-on-Python.patch diff --git a/package/python-tornado/0001-Don-t-require-backports.ssl_match_hostname-on-Python.patch b/package/python-tornado/0001-Don-t-require-backports.ssl_match_hostname-on-Python.patch deleted file mode 100644 index d5702e8da3..0000000000 --- a/package/python-tornado/0001-Don-t-require-backports.ssl_match_hostname-on-Python.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 785fe675d5602e51a559b06861d543c7d37a380c Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Wed, 4 May 2016 09:26:22 +0200 -Subject: [PATCH] Don't require backports.ssl_match_hostname on Python 2.7.9 - and newer - -As Python 3.2 support was dropped one can check 2.7.x dependency only. - -Tornado running on Python 2.7.9+ doesn't need this backported package, -but some Python packages like circus check package dependencies at -runtime and insist on having backports.ssl_match_hostname installed, -though they don't even use this particular feature. - -So checking for exact version makes life of package maintainer easier -especially on embedded Linux distributions like Buildroot. - -Signed-off-by: Yegor Yefremov ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index c13eeed..0c24e70 100644 ---- a/setup.py -+++ b/setup.py -@@ -129,7 +129,7 @@ if setuptools is not None: - if sys.version_info < (2, 7): - # Only needed indirectly, for singledispatch. - install_requires.append('ordereddict') -- if sys.version_info < (3, 2): -+ if sys.version_info < (2, 7, 9): - install_requires.append('backports.ssl_match_hostname') - if sys.version_info < (3, 4): - install_requires.append('singledispatch') --- -2.8.1 - diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash index e0f3c39a94..27385a56c2 100644 --- a/package/python-tornado/python-tornado.hash +++ b/package/python-tornado/python-tornado.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=c548d7b77a11d523c3d7255bd7fd6df8, sha256 locally computed -md5 d13a99dc0b60ba69f5f8ec1235e5b232 tornado-4.3.tar.gz -sha256 c9c2d32593d16eedf2cec1b6a41893626a2649b40b21ca9c4cac4243bde2efbf tornado-4.3.tar.gz +# md5 from https://pypi.python.org/pypi/tornado/json, sha256 locally computed +md5 fff8a7d7f580b04bacc2ffe7ddf41133 tornado-4.4.1.tar.gz +sha256 371d0cf3d56c47accc66116a77ad558d76eebaa8458a6b677af71ca606522146 tornado-4.4.1.tar.gz diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index 64809b7902..98d42b5a1b 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 4.3 +PYTHON_TORNADO_VERSION = 4.4.1 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://pypi.python.org/packages/source/t/tornado +PYTHON_TORNADO_SITE = https://pypi.python.org/packages/96/5d/ff472313e8f337d5acda5d56e6ea79a43583cc8771b34c85a1f458e197c3 PYTHON_TORNADO_LICENSE = Apache-2.0 PYTHON_TORNADO_SETUP_TYPE = setuptools From 96165841a7eab926765c10569fccf73a5fd9b9c8 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 14 Sep 2016 12:36:29 +0200 Subject: [PATCH 0264/3392] python-pyusb: bump to version 1.0.0 Remove dependency on Python 2 only. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-pyusb/Config.in | 2 -- package/python-pyusb/python-pyusb.hash | 5 +++-- package/python-pyusb/python-pyusb.mk | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pyusb/Config.in b/package/python-pyusb/Config.in index de5b487014..1f97979c71 100644 --- a/package/python-pyusb/Config.in +++ b/package/python-pyusb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYUSB bool "python-pyusb" - depends on BR2_PACKAGE_PYTHON depends on BR2_TOOLCHAIN_HAS_THREADS # libusb select BR2_PACKAGE_LIBUSB help @@ -10,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYUSB http://sourceforge.net/apps/trac/pyusb/ comment "python-pyusb needs a toolchain w/ threads" - depends on BR2_PACKAGE_PYTHON depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/python-pyusb/python-pyusb.hash b/package/python-pyusb/python-pyusb.hash index 3524ca969b..098d08f751 100644 --- a/package/python-pyusb/python-pyusb.hash +++ b/package/python-pyusb/python-pyusb.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 14ec66077bdcd6f1aa9e892a0a35a54bb3c1ec56aa740ead64349c18f0186d19 python-pyusb-1.0.0b2.tar.gz +# md5 from https://pypi.python.org/pypi/pyusb/json, sha256 locally computed +md5 c8a571bfdba778555156af3facaea6fc PyUSB-1.0.0.tar.gz +sha256 5b34ffa74ac34f330bff949c94ee00ec4a9d147234db17ee2eed2a67c0275368 PyUSB-1.0.0.tar.gz diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk index ae69026f4e..cfdef533a1 100644 --- a/package/python-pyusb/python-pyusb.mk +++ b/package/python-pyusb/python-pyusb.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_PYUSB_VERSION = 1.0.0b2 -PYTHON_PYUSB_SITE = $(call github,walac,pyusb,$(PYTHON_PYUSB_VERSION)) +PYTHON_PYUSB_VERSION = 1.0.0 +PYTHON_PYUSB_SOURCE = PyUSB-$(PYTHON_PYUSB_VERSION).tar.gz +PYTHON_PYUSB_SITE = https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d PYTHON_PYUSB_LICENSE = BSD-3c PYTHON_PYUSB_LICENSE_FILES = LICENSE PYTHON_PYUSB_SETUP_TYPE = distutils From f2d98f374434b7510c73cc9e90d9a045230e659e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 14 Sep 2016 09:49:07 -0300 Subject: [PATCH 0265/3392] configs: Add support for Solidrun's MX6 Cubox/Hummingboard Add support for Solidrun's MX6 Cubox/Hummingboard. For more information about these boards, please check: https://www.solid-run.com/freescale-imx6-family/hummingboard/ https://www.solid-run.com/freescale-imx6-family/cubox-i/ U-Boot is capable of detecting the version of the board in run-time and loads the correct dtb. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- board/solidrun/mx6cubox/boot.scr.txt | 7 +++++++ board/solidrun/mx6cubox/genimage.cfg | 29 +++++++++++++++++++++++++++ board/solidrun/mx6cubox/post-build.sh | 8 ++++++++ board/solidrun/mx6cubox/post-image.sh | 14 +++++++++++++ board/solidrun/mx6cubox/readme.txt | 18 +++++++++++++++++ configs/mx6cubox_defconfig | 28 ++++++++++++++++++++++++++ 6 files changed, 104 insertions(+) create mode 100644 board/solidrun/mx6cubox/boot.scr.txt create mode 100644 board/solidrun/mx6cubox/genimage.cfg create mode 100755 board/solidrun/mx6cubox/post-build.sh create mode 100755 board/solidrun/mx6cubox/post-image.sh create mode 100644 board/solidrun/mx6cubox/readme.txt create mode 100644 configs/mx6cubox_defconfig diff --git a/board/solidrun/mx6cubox/boot.scr.txt b/board/solidrun/mx6cubox/boot.scr.txt new file mode 100644 index 0000000000..7a8aa4bd54 --- /dev/null +++ b/board/solidrun/mx6cubox/boot.scr.txt @@ -0,0 +1,7 @@ +setenv finduuid "part uuid mmc 0:1 uuid" +run finduuid +run findfdt +setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4" +load mmc 0:1 ${fdt_addr} boot/${fdtfile} +load mmc 0:1 ${loadaddr} boot/zImage +bootz ${loadaddr} - ${fdt_addr} diff --git a/board/solidrun/mx6cubox/genimage.cfg b/board/solidrun/mx6cubox/genimage.cfg new file mode 100644 index 0000000000..490986ac86 --- /dev/null +++ b/board/solidrun/mx6cubox/genimage.cfg @@ -0,0 +1,29 @@ +# Minimal SD card image for the MX6 Cubox/Hummingboard +# +# U-Boot SPL and u-boot.img are flashed in the first 1MB raw partition. +# A single root filesystem partition is used (Ext4 in this case). +# + +image sdcard.img { + hdimage { + } + + partition spl { + in-partition-table = "no" + image = "SPL" + offset = 1K + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot.img" + offset = 69K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + size = 512M + } +} diff --git a/board/solidrun/mx6cubox/post-build.sh b/board/solidrun/mx6cubox/post-build.sh new file mode 100755 index 0000000000..07c480e616 --- /dev/null +++ b/board/solidrun/mx6cubox/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none \ +-n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr + +install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/board/solidrun/mx6cubox/post-image.sh b/board/solidrun/mx6cubox/post-image.sh new file mode 100755 index 0000000000..b4ac4608ff --- /dev/null +++ b/board/solidrun/mx6cubox/post-image.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/solidrun/mx6cubox/readme.txt b/board/solidrun/mx6cubox/readme.txt new file mode 100644 index 0000000000..630ab6c75e --- /dev/null +++ b/board/solidrun/mx6cubox/readme.txt @@ -0,0 +1,18 @@ +Solidrun's MX6 Cubox/Hummingboard + +https://www.solid-run.com/freescale-imx6-family/hummingboard/ + +https://www.solid-run.com/freescale-imx6-family/cubox-i/ + +To build a minimal support for these boards: + + $ make mx6cubox_defconfig + $ make + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on an SD card: + +dd if=output/images/sdcard.img of=/dev/ + +For details about the medium image layout, see the definition in +board/solidrun/mx6cubox/genimage.cfg. diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig new file mode 100644 index 0000000000..e27a2bbf9e --- /dev/null +++ b/configs/mx6cubox_defconfig @@ -0,0 +1,28 @@ +BR2_arm=y +BR2_cortex_a9=y +# Linux headers same as kernel, a 4.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/mx6cubox/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/solidrun/mx6cubox/post-image.sh" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx6cuboxi" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09" +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-cubox-i imx6dl-cubox-i imx6q-hummingboard imx6dl-hummingboard" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +# required tools to create the SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From b644b9c35b7933d59cc52f993cce5391b3d04376 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 14 Sep 2016 21:46:43 -0300 Subject: [PATCH 0266/3392] ccache: bump to version 3.3.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/ccache/ccache.hash | 4 ++-- package/ccache/ccache.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 03b8c26a5b..81e0550b8d 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,2 +1,2 @@ -# Verified key https://samba.org/ftp/ccache/ccache-3.3.tar.xz.asc - sha256 computed locally -sha256 d88e6f5f62f9ce5eeee673972a5731f76e22a5c708cfbc264ecd25a93fffba07 ccache-3.3.tar.xz +# Verified key https://samba.org/ftp/ccache/ccache-3.3.1.tar.xz.asc - sha256 computed locally +sha256 c6d87a49cc6d7639636d289ed9a5f560bc2acf7ab698fe8ee14e9c9f15ba41c6 ccache-3.3.1.tar.xz diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 06deb65a97..a93aabd692 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 3.3 +CCACHE_VERSION = 3.3.1 CCACHE_SITE = https://samba.org/ftp/ccache CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPLv3+, others From 9714c6d2eff0991ebe84436d79b769a09b47ae81 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 14 Sep 2016 21:46:56 -0300 Subject: [PATCH 0267/3392] libinput: bump to version 1.5.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libinput/libinput.hash | 4 ++-- package/libinput/libinput.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index 0cdcc387cc..10c5e9da78 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-August/030857.html -sha256 8c38826a785594811bef6a9daadbfa2e172e3f070f8863393d6fb7ca4c68e451 libinput-1.4.2.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031054.html +sha256 5a96559385ecfaa30f9e72ea89eb8ebbc97caf68e458f451f4ed62315311081c libinput-1.5.0.tar.xz diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index eb74e34cd8..2005c4759a 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.4.2 +LIBINPUT_VERSION = 1.5.0 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From 9294348f4d88076e0fc17ad308c7faeb93468994 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 15 Sep 2016 09:54:44 +0100 Subject: [PATCH 0268/3392] linux: bump default to version 4.7.4 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index fd6b4b3d49..ab4e138b8a 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.7.3)" + bool "Latest version (4.7.4)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.7.3" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.7.4" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From b171466c445dbdd39d5084dd4e4c138a7051d99a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 15 Sep 2016 10:58:28 +0200 Subject: [PATCH 0269/3392] toolchain-external: fix potential entire root filesystem removal This reverts commit a0aa7e0e1750f6ace2879ea8adb1425a41431b79 and reworks the code to fix a major and potentially catastrophic bug when the following conditions are met: - The user has selected a "known toolchain profile", such as a Linaro toolchain, a Sourcery CodeBench toolchain etc. People using "custom toolchain profile" are not affected. - The user has enabled BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED=y to indicate that the toolchain is already locally available (as opposed to having Buildroot download and extract the toolchain) - The user has left BR2_TOOLCHAIN_EXTERNAL_PATH empty, because his toolchain is directly available through the PATH environment variable. When BR2_TOOLCHAIN_EXTERNAL_PATH is non-empty, Buildroot will do something silly (remove the toolchain contents), but that are limited to the toolchain itself. When such conditions are met, Buildroot will run "rm -rf /*" due to TOOLCHAIN_EXTERNAL_INSTALL_DIR being empty. This bug does not exist in 2016.05, and appeared in 2016.08 due to commit a0aa7e0e1750f6ace2879ea8adb1425a41431b79. Commit a0aa7e0e1750f6ace2879ea8adb1425a41431b79 removed the assignment of TOOLCHAIN_EXTERNAL_SOURCE and TOOLCHAIN_EXTERNAL_SITE to empty, as part of a global cleanup to remove such assignments that supposedly had become unneeded following a fix of the package infrastructure (75630eba22b20d6140a5b58a6d1e35598fb3c0d3: core: do not attempt downloads with no _VERSION set). However, this causes TOOLCHAIN_EXTERNAL_SOURCE to be non-empty even for BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED=y configuration, with the following consequences: - Buildroot downloads the toolchain tarball (while we're saying the toolchain is already available). Not dramatic, but clearly buggy. - Buildroot registers a post-extract hook that moves the toolchain from its extract directory (output/build/toolchain-external-.../ to its final location in host/opt/ext-toolchain/). Before doing this, it removes everything in TOOLCHAIN_EXTERNAL_INSTALL_DIR (which should normally be host/opt/ext-toolchain/). Another mistake that caused the bug is commit b731dc7bfb9c8ce7be502711f0b44ccab5515f1d ("toolchain-external: make extraction idempotent"), which introduce the dangerous call "rm -rf $(var)/*", which can be catastrophic if by mistake $(var) is empty. Instead, this commit should have just used rm -rf $(var) to remove the directory instead: it would have failed without consequences if $(var) is empty, and the directory was anyway already re-created right after with a mkdir. To address this problem, we: - Revert commit a0aa7e0e1750f6ace2879ea8adb1425a41431b79, so that _SOURCE and _SITE are empty in the pre-installed toolchain case. - Rework the code to ensure that similar problems will no happen in the future, by: - Registering the TOOLCHAIN_EXTERNAL_MOVE hook only when BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y, since moving the toolchain is only needed when Buildroot downloaded the toolchain. - Introduce a variable TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR which is the path in which Buildroot installs external toolchains when it is in charge of downloading/extracting them. Then, the TOOLCHAIN_EXTERNAL_MOVE hook is changed to use this variable, which is guaranteed to be non-empty. - Replace the removal of the directory contents $(var)/* by removing the directory itself $(var). The directory was anyway already re-created if needed afterwards. Thanks to doing this, if $(var) ever becomes empty, we will do "rm -rf" which will fail and abort the build, and not the catastrophic "rm -rf /*". Reported-by: Mason Cc: Mason Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .../toolchain-external/toolchain-external.mk | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 8de324726e..ad258b86be 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -138,8 +138,10 @@ TOOLCHAIN_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS)) TOOLCHAIN_EXTERNAL_PREFIX = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) +TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR = $(HOST_DIR)/opt/ext-toolchain + ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) -TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(HOST_DIR)/opt/ext-toolchain +TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) else TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) endif @@ -454,21 +456,29 @@ TOOLCHAIN_EXTERNAL_ACTUAL_SOURCE_TARBALL ?= \ $(subst -i686-pc-linux-gnu.tar.bz2,.src.tar.bz2,$(subst -i686-pc-linux-gnu-i386-linux.tar.bz2,-i686-pc-linux-gnu.src.tar.bz2,$(TOOLCHAIN_EXTERNAL_SOURCE))) endif +# In fact, we don't need to download the toolchain, since it is already +# available on the system, so force the site and source to be empty so +# that nothing will be downloaded/extracted. +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED),y) +TOOLCHAIN_EXTERNAL_SITE = +TOOLCHAIN_EXTERNAL_SOURCE = +endif + TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES # Normal handling of downloaded toolchain tarball extraction. -ifneq ($(TOOLCHAIN_EXTERNAL_SOURCE),) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) TOOLCHAIN_EXTERNAL_EXCLUDES = usr/lib/locale/* # As a regular package, the toolchain gets extracted in $(@D), but # since it's actually a fairly special package, we need it to be moved -# into TOOLCHAIN_EXTERNAL_INSTALL_DIR. +# into TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR. define TOOLCHAIN_EXTERNAL_MOVE - rm -rf $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/* - mkdir -p $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) - mv $(@D)/* $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/ + rm -rf $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) + mkdir -p $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) + mv $(@D)/* $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)/ endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += \ TOOLCHAIN_EXTERNAL_MOVE From 114cec2bba5320889a0b9afbc26de78a10d33612 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 15 Sep 2016 09:54:43 +0100 Subject: [PATCH 0270/3392] linux-headers: bump 4.7.x series to 4.7.4 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cbfaa262b8..b68646790d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -243,5 +243,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.4.19" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 - default "4.7.3" if BR2_KERNEL_HEADERS_4_7 + default "4.7.4" if BR2_KERNEL_HEADERS_4_7 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 783c215c829a9ce4db4992d1f1434dc689f4b3e3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 15 Sep 2016 12:16:38 -0300 Subject: [PATCH 0271/3392] linux-headers: bump 3.{2, 14}.x and 4.4.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index b68646790d..09e187b869 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -229,18 +229,18 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.81" if BR2_KERNEL_HEADERS_3_2 + default "3.2.82" if BR2_KERNEL_HEADERS_3_2 default "3.4.112" if BR2_KERNEL_HEADERS_3_4 default "3.10.103" if BR2_KERNEL_HEADERS_3_10 default "3.12.63" if BR2_KERNEL_HEADERS_3_12 - default "3.14.77" if BR2_KERNEL_HEADERS_3_14 + default "3.14.79" if BR2_KERNEL_HEADERS_3_14 default "3.18.41" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.32" if BR2_KERNEL_HEADERS_4_1 default "4.2.8" if BR2_KERNEL_HEADERS_4_2 default "4.3.6" if BR2_KERNEL_HEADERS_4_3 - default "4.4.19" if BR2_KERNEL_HEADERS_4_4 + default "4.4.21" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.4" if BR2_KERNEL_HEADERS_4_7 From ad0162623327fadd65b50a6007a5dfc5c52bd0a1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 15 Sep 2016 14:56:53 -0300 Subject: [PATCH 0272/3392] linux-firmware: bump version And copy firmware for BCM43430 and BCM43438, hence rpi3 wifi support at last. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 8c983e4e34..d5a035eb65 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = c883a6b6186bb2415761d287cbac773062911212 +LINUX_FIRMWARE_VERSION = c4c07a8d1128d50a5c2885ceea1abbebaa82f820 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git LINUX_FIRMWARE_SITE_METHOD = git @@ -381,7 +381,8 @@ LINUX_FIRMWARE_FILES += \ brcm/brcmfmac43242a.bin brcm/brcmfmac43340-sdio.bin \ brcm/brcmfmac43362-sdio.bin brcm/brcmfmac43455-sdio.bin \ brcm/brcmfmac43569.bin brcm/brcmfmac43570-pcie.bin \ - brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin + brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin \ + brcm/brcmfmac43430-sdio.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif From a64621fb5135f7f2c91585c7823b4625ea223110 Mon Sep 17 00:00:00 2001 From: Rahul Jain Date: Fri, 16 Sep 2016 14:46:25 +0530 Subject: [PATCH 0273/3392] libubox: bump version Reviewed-by: Rahul Bedarkar Reviewed-by: Abhimanyu Vishwakarma Signed-off-by: Rahul Jain Signed-off-by: Thomas Petazzoni --- package/libubox/libubox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index 4c56951a3d..67451fed73 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUBOX_VERSION = e88d816d6e462180f0337565e04e36be58a63309 +LIBUBOX_VERSION = 290c64ef5b5c3e75be851594f269d6a9568e64e5 LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git LIBUBOX_LICENSE = LGPLv2.1, GPLv2, BSD-3c, MIT LIBUBOX_INSTALL_STAGING = YES From 4f1a59924013928ff0ad3ed8cc2253a7f3485368 Mon Sep 17 00:00:00 2001 From: Rahul Jain Date: Fri, 16 Sep 2016 14:46:26 +0530 Subject: [PATCH 0274/3392] libubox: update legal info Reviewed-by: Rahul Bedarkar Reviewed-by: Abhimanyu Vishwakarma Signed-off-by: Rahul Jain Signed-off-by: Thomas Petazzoni --- package/libubox/libubox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index 67451fed73..00392c3112 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -6,7 +6,7 @@ LIBUBOX_VERSION = 290c64ef5b5c3e75be851594f269d6a9568e64e5 LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git -LIBUBOX_LICENSE = LGPLv2.1, GPLv2, BSD-3c, MIT +LIBUBOX_LICENSE = ISC, BSD-3c LIBUBOX_INSTALL_STAGING = YES LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c) From c8252fdebb59424b2d4d65c9ea7ed2a6cd960e24 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 15 Sep 2016 15:57:02 +0530 Subject: [PATCH 0275/3392] util-linux: add optional dependency on readline fdisk and sfdisk tools can be built with readline support. This patch adds optional dependency on readline if it is already selected. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index aa6f994a7b..7b16ca40a2 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -146,6 +146,13 @@ else UTIL_LINUX_CONF_OPTS += --without-python endif +ifeq ($(BR2_PACKAGE_READLINE),y) +UTIL_LINUX_CONF_OPTS += --with-readline +UTIL_LINUX_DEPENDENCIES += readline +else +UTIL_LINUX_CONF_OPTS += --without-readline +endif + # Install PAM configuration files ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y) define UTIL_LINUX_INSTALL_PAMFILES From 8d9cad0d0585b99f804a1780d246b77825e20665 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 15 Sep 2016 15:57:03 +0530 Subject: [PATCH 0276/3392] util-linux: add optional dependency on audit login and hwclock can be built with audit support. This patch adds optional dependency on audit package if it is already selected. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 7b16ca40a2..82230bca77 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -153,6 +153,13 @@ else UTIL_LINUX_CONF_OPTS += --without-readline endif +ifeq ($(BR2_PACKAGE_AUDIT),y) +UTIL_LINUX_CONF_OPTS += --with-audit +UTIL_LINUX_DEPENDENCIES += audit +else +UTIL_LINUX_CONF_OPTS += --without-audit +endif + # Install PAM configuration files ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y) define UTIL_LINUX_INSTALL_PAMFILES From 2deb74c17e1bf7ef02bc23df637f74f7898bca6a Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 15 Sep 2016 15:57:04 +0530 Subject: [PATCH 0277/3392] audit: remove autoreconf Commit upstream 51925b7dd6d0("package/audit: Bump to version 2.6.5") removed patch 0002 as part of version bump. But forgot to disable autoreconf. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/audit/audit.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 06ec9595c0..11ee8dfdbc 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -8,8 +8,6 @@ AUDIT_VERSION = 2.6.5 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPLv2 AUDIT_LICENSE_FILES = COPYING -# 0002-Fix-usage-of-audit_status.feature_bitmap.patch -AUDIT_AUTORECONF = YES AUDIT_INSTALL_STAGING = YES From 6126e5c0d6a43481193a3741fa3308edf8b745ff Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 15 Sep 2016 15:57:05 +0530 Subject: [PATCH 0278/3392] audit: bump version to 2.6.7 Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/audit/audit.hash | 2 +- package/audit/audit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 2ce381fb9b..794a93a825 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,2 +1,2 @@ #Locally computed -sha256 d99339a63fc6efaaee89efe7fa0e0c395f661392a4ae5056b2c9d10c67ca63a1 audit-2.6.5.tar.gz +sha256 8923917332daa7833bbc0c1d9eb012167093fbad000da4a9630fb3356aff8cdc audit-2.6.7.tar.gz diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 11ee8dfdbc..713720806c 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 2.6.5 +AUDIT_VERSION = 2.6.7 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPLv2 AUDIT_LICENSE_FILES = COPYING From d1011f89a18b3cebc198e328b87f91707a8755af Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 15 Sep 2016 15:57:06 +0530 Subject: [PATCH 0279/3392] audit: update legal info Programs are released under GPLv2+. README file says libraries libaudit.* and libauparse.* are released under LGPL but there are two files auparse/strsplit.c and lib/strsplit.c which are released under GPLv2+ which makes both libraries GPL. Until we review situation with upstream, we simply mention "unclear (libraries)". Signed-off-by: Rahul Bedarkar [Thomas: add "unclear (libraries)" as suggested by Arnout.] Signed-off-by: Thomas Petazzoni --- package/audit/audit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/audit/audit.mk b/package/audit/audit.mk index 713720806c..0e5bd271da 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -6,7 +6,7 @@ AUDIT_VERSION = 2.6.7 AUDIT_SITE = http://people.redhat.com/sgrubb/audit -AUDIT_LICENSE = GPLv2 +AUDIT_LICENSE = GPLv2+ (programs), unclear (libraries) AUDIT_LICENSE_FILES = COPYING AUDIT_INSTALL_STAGING = YES From e0b38197e04f3404b94b270f852920b63a7b96e6 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 15 Sep 2016 16:03:53 +0530 Subject: [PATCH 0280/3392] libcap-ng: bump version to 0.7.8 Drop upstream patch Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- .../libcap-ng/0001-add-missing-include.patch | 22 ------------------- package/libcap-ng/libcap-ng.hash | 2 +- package/libcap-ng/libcap-ng.mk | 2 +- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 package/libcap-ng/0001-add-missing-include.patch diff --git a/package/libcap-ng/0001-add-missing-include.patch b/package/libcap-ng/0001-add-missing-include.patch deleted file mode 100644 index c30c40dc18..0000000000 --- a/package/libcap-ng/0001-add-missing-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -Add missing include - -This include is needed to get the pid_t definition, at least with the -musl C library. - -Patch inspired from Alpine Linux patch -http://git.alpinelinux.org/cgit/aports/tree/main/libcap-ng/fix-includes.patch. - -Signed-off-by: Thomas Petazzoni - -Index: b/utils/proc-llist.h -=================================================================== ---- a/utils/proc-llist.h -+++ b/utils/proc-llist.h -@@ -26,6 +26,7 @@ - - #include "config.h" - -+#include - - /* This is the node of the linked list. Any data elements that are per - * record goes here. */ diff --git a/package/libcap-ng/libcap-ng.hash b/package/libcap-ng/libcap-ng.hash index ecea6e8841..b433b75063 100644 --- a/package/libcap-ng/libcap-ng.hash +++ b/package/libcap-ng/libcap-ng.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 615549ce39b333f6b78baee0c0b4ef18bc726c6bf1cca123dfd89dd963f6d06b libcap-ng-0.7.7.tar.gz +sha256 c21af997445cd4107a55d386f955c5ea6f6e96ead693e9151277c0ab5f97d05f libcap-ng-0.7.8.tar.gz diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index d78f5dc660..34e0f2c551 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_NG_VERSION = 0.7.7 +LIBCAP_NG_VERSION = 0.7.8 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPLv2+ LGPLv2.1+ LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB From 9b0dc3515a7f15656f532e3e7df9acb347c8f4bd Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 15 Sep 2016 16:03:54 +0530 Subject: [PATCH 0281/3392] libcap-ng: annotate licenses with components libcap-ng.so library is released under LGPLv2.1+ and programs testcap, filecap, netcap and pscap are released under GPLv2+. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/libcap-ng/libcap-ng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 34e0f2c551..19cc27d56f 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -6,7 +6,7 @@ LIBCAP_NG_VERSION = 0.7.8 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng -LIBCAP_NG_LICENSE = GPLv2+ LGPLv2.1+ +LIBCAP_NG_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB LIBCAP_NG_INSTALL_STAGING = YES From c8301c4fe3aaed3c7df33ac1e8d7bf8dc0cf6c54 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Thu, 15 Sep 2016 06:40:04 +0200 Subject: [PATCH 0282/3392] package/urg: fix build caused by missing header inclusion Update select-h patch to also fix the C++ serial driver. Fixes: http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/ Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/urg/0001-select-h.patch | 38 ++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/package/urg/0001-select-h.patch b/package/urg/0001-select-h.patch index 09d1530443..1d09bb57b2 100644 --- a/package/urg/0001-select-h.patch +++ b/package/urg/0001-select-h.patch @@ -1,11 +1,39 @@ ---- urg-0.8.18/src/c/connection/serial_ctrl_lin.c 2010-11-22 01:48:01.000000000 +0000 -+++ urg-0.8.18.mod/src/c/connection/serial_ctrl_lin.c 2013-05-21 20:56:35.822025969 +0100 -@@ -17,7 +17,7 @@ - #include +From 08c7ebec7c58fbc9c1cc0542863b34119c75c91f Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Thu, 15 Sep 2016 06:19:57 +0200 +Subject: [PATCH] Serial driver: add missing header to C and C++ serial driver + +Fixes: + http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/ + +Signed-off-by: Samuel Martin +--- + src/c/connection/serial_ctrl_lin.c | 1 + + src/cpp/connection/SerialDevice_lin.cpp | 1 + + 2 files changed, 2 insertions(+) + +Index: b/src/c/connection/serial_ctrl_lin.c +=================================================================== +--- a/src/c/connection/serial_ctrl_lin.c ++++ b/src/c/connection/serial_ctrl_lin.c +@@ -18,6 +18,7 @@ #include #include -- + +#include //#include enum { +Index: b/src/cpp/connection/SerialDevice_lin.cpp +=================================================================== +--- a/src/cpp/connection/SerialDevice_lin.cpp ++++ b/src/cpp/connection/SerialDevice_lin.cpp +@@ -13,7 +13,7 @@ + #include + #include + #include +- ++#include + + class RawSerialDevice + { From e9ffb3b8f71f44703d09059363dce7e3d3ff2e7e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 14 Sep 2016 21:46:29 -0300 Subject: [PATCH 0283/3392] breakpad: enable for uClibc There's nothing holding it off for uClibc-based toolchains so enable it. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- Config.in | 3 ++- package/google-breakpad/Config.in | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Config.in b/Config.in index 6db36b926c..dcd15e883a 100644 --- a/Config.in +++ b/Config.in @@ -553,7 +553,8 @@ config BR2_GOOGLE_BREAKPAD_ENABLE bool "Enable google-breakpad support" select BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_WCHAR + depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS help This option will enable the use of google breakpad, a library diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 7b8eeb1a3e..fdaab7a665 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -6,7 +6,8 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS config BR2_PACKAGE_GOOGLE_BREAKPAD bool "google-breakpad" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_WCHAR + depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS help Google-Breakpad is a library and tool suite that allows you @@ -29,6 +30,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD http://code.google.com/p/google-breakpad/ -comment "google-breakpad requires a glibc toolchain w/ C++ enabled" +comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, C++ enabled" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) From b715991c2382a75d50f1472a4a556954d64eb382 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 17 Sep 2016 12:06:59 +0200 Subject: [PATCH 0284/3392] nginx-naxsi: clarify pcre dependency It is not directly obvious why we select pcre but not add it to the .mk file, so add a comment to clarify. Signed-off-by: Peter Korsgaard --- package/nginx-naxsi/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in index 6c175eb75e..5ae5497060 100644 --- a/package/nginx-naxsi/Config.in +++ b/package/nginx-naxsi/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NGINX_NAXSI bool "nginx-naxsi" + # uses pcre, so nginx needs to be built with pcre support select BR2_PACKAGE_PCRE help NAXSI means Nginx Anti XSS & SQL Injection. From 08b9e24eaa4e43cf2e808bb79cb4c44f27fc7f59 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 17 Sep 2016 00:28:46 +0530 Subject: [PATCH 0285/3392] blktrace: add dependency on NPTL blkiomon.c assumes that clock_nanosleep() is always available. But it is only available with NPTL. Since it unconditionally uses it, we add dependency on NPTL. Fixes: http://autobuild.buildroot.net/results/c87/c87cd4a7b0bed938506bcf7e88d4cda60e28e6e5/ Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/blktrace/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/blktrace/Config.in b/package/blktrace/Config.in index 38c0947e1c..684157c7eb 100644 --- a/package/blktrace/Config.in +++ b/package/blktrace/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_BLKTRACE bool "blktrace" depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep() select BR2_PACKAGE_LIBAIO help blktrace is a block layer IO tracing mechanism which provides @@ -8,3 +9,7 @@ config BR2_PACKAGE_BLKTRACE up to user space. http://git.kernel.dk/?p=blktrace.git;a=summary + +comment "blktrace needs a toolchain w/ NPTL" + depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL From c1d86b826bcba132a919bd5a3531d8ae05f4954a Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 17 Sep 2016 00:28:47 +0530 Subject: [PATCH 0286/3392] blktrace: needs MMU support iowatcher/main.c uses system() which uses fork(). Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/blktrace/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/blktrace/Config.in b/package/blktrace/Config.in index 684157c7eb..dedfa03f03 100644 --- a/package/blktrace/Config.in +++ b/package/blktrace/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_BLKTRACE bool "blktrace" depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep() + depends on BR2_USE_MMU # system() select BR2_PACKAGE_LIBAIO help blktrace is a block layer IO tracing mechanism which provides @@ -11,5 +12,6 @@ config BR2_PACKAGE_BLKTRACE http://git.kernel.dk/?p=blktrace.git;a=summary comment "blktrace needs a toolchain w/ NPTL" + depends on BR2_USE_MMU depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL From 341bc36d22f82ef3dcf4ec25d34aeb362c372b59 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Fri, 16 Sep 2016 19:18:32 +0200 Subject: [PATCH 0287/3392] configs: nitrogen*: enable VFP and NEON support Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- configs/nitrogen6sx_defconfig | 3 +++ configs/nitrogen6x_defconfig | 3 +++ configs/nitrogen7_defconfig | 1 + 3 files changed, 7 insertions(+) diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index bd92f55ee5..b317525e21 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -1,6 +1,9 @@ # architecture BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # system BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index 85acabe677..dc033dc20d 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -1,6 +1,9 @@ # architecture BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # system BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index a8f3b45d53..adce0fb462 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -1,6 +1,7 @@ # architecture BR2_arm=y BR2_cortex_a7=y +BR2_ARM_FPU_NEON_VFPV4=y # system BR2_TARGET_GENERIC_GETTY=y From defd94927c48064ec5fc76040925319b0526304c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 15 Sep 2016 08:39:56 +0200 Subject: [PATCH 0288/3392] package/libupnpp: add patch to get pkg-config file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apply a patch from upstream to install a pkg-config file for libupnpp. Fetch from: https://github.com/medoc92/libupnpp/commit/9f03bb0e7b47e2843edea6f25ed9eabbfb6412df Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- .../libupnpp/0002-Add-pkg-config-file.patch | 63 +++++++++++++++++++ package/libupnpp/libupnpp.mk | 4 +- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 package/libupnpp/0002-Add-pkg-config-file.patch diff --git a/package/libupnpp/0002-Add-pkg-config-file.patch b/package/libupnpp/0002-Add-pkg-config-file.patch new file mode 100644 index 0000000000..377b5e09a1 --- /dev/null +++ b/package/libupnpp/0002-Add-pkg-config-file.patch @@ -0,0 +1,63 @@ +From 22ec8e3a2b54a4e1fd1340a592f49829d6cde735 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Sun, 11 Sep 2016 22:26:33 +0200 +Subject: [PATCH] Add pkg-config file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add a pkg-config file. + +Fetched from: +https://github.com/medoc92/libupnpp/commit/9f03bb0e7b47e2843edea6f25ed9eabbfb6412df + +Signed-off-by: Jörg Krause +--- + Makefile.am | 3 +++ + configure.ac | 1 + + libupnpp.pc.in | 12 ++++++++++++ + 3 files changed, 16 insertions(+) + create mode 100644 libupnpp.pc.in + +diff --git a/Makefile.am b/Makefile.am +index 2d20b9b..39559e9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -112,3 +112,6 @@ nobase_include_HEADERS = \ + libupnpp_la_LDFLAGS = -version-info $(VERSION_INFO) + + libupnpp_la_LIBADD = $(LIBUPNPP_LIBS) ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = libupnpp.pc +diff --git a/configure.ac b/configure.ac +index 9ff2058..89525b3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -90,4 +90,5 @@ AC_SUBST(LIBUPNPP_LIBS) + AC_SUBST(VERSION_INFO) + + AC_CONFIG_FILES([Makefile]) ++AC_CONFIG_FILES([libupnpp.pc]) + AC_OUTPUT +diff --git a/libupnpp.pc.in b/libupnpp.pc.in +new file mode 100644 +index 0000000..90f4b2b +--- /dev/null ++++ b/libupnpp.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: @PACKAGE_NAME@ ++Description: C++ wrapper for libupnp ++Version: @PACKAGE_VERSION@ ++Requires: libcurl libupnp ++Libs: -L${libdir} -lupnpp ++Libs.private: -lexpat -lpthread -lrt ++Cflags: -I${includedir} +-- +2.9.3 + diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk index ab1ce8b87d..d712c214cf 100644 --- a/package/libupnpp/libupnpp.mk +++ b/package/libupnpp/libupnpp.mk @@ -10,7 +10,9 @@ LIBUPNPP_LICENSE = GPLv2+ LIBUPNPP_LICENSE_FILES = COPYING LIBUPNPP_INSTALL_STAGING = YES LIBUPNPP_DEPENDENCIES = expat libcurl libupnp -# touching configure.ac in 0001-Check-for-std-future.patch +# touching configure.ac in: +# 0001-Check-for-std-future.patch +# 0002-Add-pkg-config-file.patch LIBUPNPP_AUTORECONF = YES # configure script fails to link against the dependencies of libupnp From abd4d29c8bb230a7d91123e8162ec7606f917a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 15 Sep 2016 08:39:57 +0200 Subject: [PATCH 0289/3392] package/upmpdcli: requires GCC 4.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit upmpdcli now uses C++11 features, meaning the minimum usable GCC version is 4.7. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/upmpdcli/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/upmpdcli/Config.in b/package/upmpdcli/Config.in index e17330c8ed..b075d7a413 100644 --- a/package/upmpdcli/Config.in +++ b/package/upmpdcli/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_UPMPDCLI depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libupnpp -> libupnp - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 select BR2_PACKAGE_LIBMPDCLIENT select BR2_PACKAGE_LIBUPNPP help @@ -13,6 +13,6 @@ config BR2_PACKAGE_UPMPDCLI http://www.lesbonscomptes.com/upmpdcli/ -comment "upmpdcli needs a toolchain w/ C++, threads, gcc >= 4.6" +comment "upmpdcli needs a toolchain w/ C++, threads, gcc >= 4.7" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 From bf51bff13802b2802aa580e5723880b322b95e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 15 Sep 2016 08:39:58 +0200 Subject: [PATCH 0290/3392] package/upmpdcli: fix missing dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Starting with version 1.2 upmpdcli depends on libmicrohttpd and jsoncpp. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/upmpdcli/Config.in | 4 +++- package/upmpdcli/upmpdcli.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/upmpdcli/Config.in b/package/upmpdcli/Config.in index b075d7a413..48720347fd 100644 --- a/package/upmpdcli/Config.in +++ b/package/upmpdcli/Config.in @@ -2,8 +2,10 @@ config BR2_PACKAGE_UPMPDCLI bool "upmpdcli" depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libupnpp -> libupnp + depends on BR2_TOOLCHAIN_HAS_THREADS # libupnpp, libmicrohttpd depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + select BR2_PACKAGE_JSONCPP + select BR2_PACKAGE_LIBMICROHTTPD select BR2_PACKAGE_LIBMPDCLIENT select BR2_PACKAGE_LIBUPNPP help diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index a7b98c9715..85b78fe087 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -8,7 +8,7 @@ UPMPDCLI_VERSION = 1.2.2 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING -UPMPDCLI_DEPENDENCIES = libmpdclient libupnpp +UPMPDCLI_DEPENDENCIES = libmpdclient libupnpp libmicrohttpd jsoncpp ifeq ($(BR2_STATIC_LIBS),y) # Upmpdcli forgets to take the dependencies of libupnpp into From af4d2b27d61d2ef232da3371772d1b2f99d3d40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 15 Sep 2016 08:39:59 +0200 Subject: [PATCH 0291/3392] package/upmpdcli: add patch to fix jsoncpp detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Although jsoncpp is present, the build system of upmpdcli does not detect it. The default installation path for the header files of jsoncpp is {prefix}/json, but some systems (Debian) prefers to install the headers in {prefix}/jsoncpp/json. The build system only checks for the header files in {prefix}/jsoncpp/json, so jsoncpp is not found. This patch from upstream handles both cases now when checking for the jsoncpp library. The patch is squashed of two commits from upstream: 1/ aba96db0cfe8a2e5c825f4448c0ad184e21b50e1 2/ ce144f19a8c2e8c1e0ec3fe53699e874e5eb43fe Fixes: http://autobuild.buildroot.net/results/5bc6c558fccea0e1e1936894ce372f2b7b8ecac2 http://autobuild.buildroot.net/results/9c2d3892f17c240c44f7255d821d66acbed361f0 http://autobuild.buildroot.net/results/4d22729535ca4e6acbb48a25145611bb49c10149 http://autobuild.buildroot.net/results/fda321774c3eb225f966dd9f83def5329b703a03 http://autobuild.buildroot.net/results/f5eb306b0032e830f7f72ce80e318aa11774a5d1 .. and many more! Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- .../upmpdcli/0001-fix-jsoncpp-detection.patch | 90 +++++++++++++++++++ package/upmpdcli/upmpdcli.mk | 3 + 2 files changed, 93 insertions(+) create mode 100644 package/upmpdcli/0001-fix-jsoncpp-detection.patch diff --git a/package/upmpdcli/0001-fix-jsoncpp-detection.patch b/package/upmpdcli/0001-fix-jsoncpp-detection.patch new file mode 100644 index 0000000000..69a9a0ed4e --- /dev/null +++ b/package/upmpdcli/0001-fix-jsoncpp-detection.patch @@ -0,0 +1,90 @@ +From 25762953c019ca0c5a047a5fa28f1fe6c78c731a Mon Sep 17 00:00:00 2001 +From: Jean-Francois Dockes +Date: Sun, 11 Sep 2016 13:43:28 +0200 +Subject: [PATCH] fix jsoncpp detection +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The default installation path for the header files is {prefix}/json, but some +system prefers to install the headers in {prefix}/jsoncpp/json. + +This patch from upstream handles both cases now when checking for the jsoncpp +library. + +The patch is squashed of two commits from upstream: +1/ aba96db0cfe8a2e5c825f4448c0ad184e21b50e1 +2/ ce144f19a8c2e8c1e0ec3fe53699e874e5eb43fe + +Signed-off-by: Jörg Krause +--- + configure.ac | 8 +++++++- + src/config.h.in | 6 ++++++ + src/mediaserver/cdplugins/plgwithslave.cxx | 5 +++++ + 3 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f191ad7..108dcce 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -43,9 +43,15 @@ SCCTL_LIBS=$LIBS + AC_CHECK_LIB([microhttpd], [MHD_queue_response], [], []) + + AC_LANG_PUSH([C++]) ++ ++AC_CHECK_HEADERS(json/json.h jsoncpp/json/json.h) + LIBS="$LIBS -ljsoncpp" + AC_LINK_IFELSE([AC_LANG_PROGRAM( +- [#include ], [Json::Features dummy])], ++ [[#ifdef HAVE_JSONCPP_JSON_JSON_H ++ #include ++ #else ++ #include ++ #endif]], [Json::Features dummy])], + [HAVE_JSONCPP=1], + [AC_MSG_ERROR([libjsoncpp not found.])]) + AC_LANG_POP +diff --git a/src/config.h.in b/src/config.h.in +index 1350308..0a33e15 100644 +--- a/src/config.h.in ++++ b/src/config.h.in +@@ -3,6 +3,12 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_INTTYPES_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_JSONCPP_JSON_JSON_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_JSON_JSON_H ++ + /* Define to 1 if you have the `microhttpd' library (-lmicrohttpd). */ + #undef HAVE_LIBMICROHTTPD + +diff --git a/src/mediaserver/cdplugins/plgwithslave.cxx b/src/mediaserver/cdplugins/plgwithslave.cxx +index 04f0544..545805c 100644 +--- a/src/mediaserver/cdplugins/plgwithslave.cxx ++++ b/src/mediaserver/cdplugins/plgwithslave.cxx +@@ -14,6 +14,7 @@ + * Free Software Foundation, Inc., + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ ++#include "config.h" + + #include "plgwithslave.hxx" + +@@ -25,7 +26,11 @@ + #include + #include + #include ++#ifdef HAVE_JSONCPP_JSON_JSON_H + #include ++#else ++#include ++#endif + + #include "cmdtalk.h" + #include "pathut.h" +-- +2.9.3 + diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 85b78fe087..b70f413026 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -9,6 +9,9 @@ UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING UPMPDCLI_DEPENDENCIES = libmpdclient libupnpp libmicrohttpd jsoncpp +# touching configure.ac in +# 0001-fix-jsoncpp-detection.patch +UPMPDCLI_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) # Upmpdcli forgets to take the dependencies of libupnpp into From 56d878a92727ee8883975e1fead4e4d2206ff62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 15 Sep 2016 08:40:00 +0200 Subject: [PATCH 0292/3392] package/upmpdcli: add patch to use pkg-config for libupnpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building upmpdcli aborts because of an unsafe header inclusion of `/usr/include/libupnpp`. Using `{prefix}` to get the header path is wrong for cross-compilation. Instead of hard-coding the flags for libupnpp use pkg-config to get the correct ones. Note that this patch adds the host-pkgconfig dependency unconditionally and removes the necessity to pass the libupnpp manually to LIBS for a static build. Upstream-status: https://github.com/medoc92/upmpdcli/pull/49 Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- .../0002-use-pkg-config-for-libupnpp.patch | 66 +++++++++++++++++++ package/upmpdcli/upmpdcli.mk | 17 +---- 2 files changed, 69 insertions(+), 14 deletions(-) create mode 100644 package/upmpdcli/0002-use-pkg-config-for-libupnpp.patch diff --git a/package/upmpdcli/0002-use-pkg-config-for-libupnpp.patch b/package/upmpdcli/0002-use-pkg-config-for-libupnpp.patch new file mode 100644 index 0000000000..daef41525f --- /dev/null +++ b/package/upmpdcli/0002-use-pkg-config-for-libupnpp.patch @@ -0,0 +1,66 @@ +From 16bcaaee1c28b972e0cc6a542f511af44306ce6c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Wed, 14 Sep 2016 11:43:21 +0200 +Subject: [PATCH] Use pkg-config for libupnpp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use pkg-config for libupnpp to fix build issues when cross-compiling and +building upmpdcli statically. + +Building upmpdcli aborts because of an unsafe header inclusion of +`/usr/include/libupnpp`. Using `{prefix}` to get the header path is wrong for +cross-compilation. Instead of hard-coding the flags for libupnpp use pkg-config +to get the correct ones. + +Upstream-status: https://github.com/medoc92/upmpdcli/pull/49 + +Signed-off-by: Jörg Krause +--- + Makefile.am | 2 +- + configure.ac | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index d0c10a4..5c83aa1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,5 @@ + AM_CPPFLAGS = -DDEBUG -g -Wall \ +- -I${prefix}/include/libupnpp \ ++ $(upnpp_CFLAGS) \ + -I$(top_srcdir)/src \ + -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\" + +diff --git a/configure.ac b/configure.ac +index 108dcce..a165b5d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -35,10 +35,10 @@ dnl AC_CHECK_LIB([upnp], [UpnpInit], [], AC_MSG_ERROR([libupnp not found])) + dnl AC_CHECK_LIB([curl], [curl_easy_init], [],AC_MSG_ERROR([libcurl not found])) + dnl AC_CHECK_LIB([expat], [XML_ParserCreate], [],AC_MSG_ERROR([libexpat not found])) + +-AC_CHECK_LIB([upnpp], [getsyshwaddr], [], [AC_MSG_ERROR([libupnpp])]) ++PKG_CHECK_MODULES([upnpp], [libupnpp], [], [AC_MSG_ERROR([libupnpp])]) + AC_CHECK_LIB([mpdclient], [mpd_connection_new], [], + AC_MSG_ERROR([libmpdclient not found])) +-SCCTL_LIBS=$LIBS ++SCCTL_LIBS="$LIBS $upnpp_LIBS" + + AC_CHECK_LIB([microhttpd], [MHD_queue_response], [], []) + +@@ -56,8 +56,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( + [AC_MSG_ERROR([libjsoncpp not found.])]) + AC_LANG_POP + +-UPMPDCLI_LIBS=$LIBS +-echo "UPMPDCLI_LIBS=$LIBS" ++UPMPDCLI_LIBS="$LIBS $upnpp_LIBS" ++echo "UPMPDCLI_LIBS=$UPMPDCLI_LIBS" + + LIBS="" + +-- +2.9.3 + diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index b70f413026..3beda1bd00 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -8,23 +8,12 @@ UPMPDCLI_VERSION = 1.2.2 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING -UPMPDCLI_DEPENDENCIES = libmpdclient libupnpp libmicrohttpd jsoncpp -# touching configure.ac in +UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp +# touching configure.ac and Makefile.am in # 0001-fix-jsoncpp-detection.patch +# 0002-use-pkg-config-for-libupnpp.patch UPMPDCLI_AUTORECONF = YES -ifeq ($(BR2_STATIC_LIBS),y) -# Upmpdcli forgets to take the dependencies of libupnpp into -# consideration, breaking static linking, so help it. -# Libupnpp unfortunately doesn't provide a .pc file, so manually -# handle the dependencies here. -# The build system doesn't expand LIBS from the configure step, so -# manually pass it to make. -UPMPDCLI_DEPENDENCIES += host-pkgconf -UPMPDCLI_MAKE_OPTS = \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs expat libcurl libupnp`" -endif - # Upmpdcli only runs if user upmpdcli exists define UPMPDCLI_USERS upmpdcli -1 upmpdcli -1 * - - - Upmpdcli MPD UPnP Renderer Front-End From 41778d75c74b35b6263c1070cf7c4e519c920c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 15 Sep 2016 08:40:01 +0200 Subject: [PATCH 0293/3392] package/upmpdcli: add patch to fix include path of log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "log.{h,hxx}" header files are included from libupnpp. As we are using the pkg-config file of libupnpp to get the header include path, instead of the hardcoded `{prefix}/include/libupnpp` these files are not found. Upstream-status: https://github.com/medoc92/upmpdcli/issues/46 Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- ...ding-header-file-log.h-from-libupnpp.patch | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 package/upmpdcli/0003-Fix-including-header-file-log.h-from-libupnpp.patch diff --git a/package/upmpdcli/0003-Fix-including-header-file-log.h-from-libupnpp.patch b/package/upmpdcli/0003-Fix-including-header-file-log.h-from-libupnpp.patch new file mode 100644 index 0000000000..29e6492a30 --- /dev/null +++ b/package/upmpdcli/0003-Fix-including-header-file-log.h-from-libupnpp.patch @@ -0,0 +1,110 @@ +From 366e726821abce305ef2887effea443a24043511 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Wed, 14 Sep 2016 11:46:22 +0200 +Subject: [PATCH] Fix including header file log.h from libupnpp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The "log.{h,hxx}" header files are included from libupnpp. + +As we are using the pkg-config file of libupnpp to get the header include path, +instead of the hardcoded `{prefix}/include/libupnpp` these files are not found. + +Upstream-status: https://github.com/medoc92/upmpdcli/issues/46 + +Signed-off-by: Jörg Krause +--- + src/conftree.cpp | 2 +- + src/execmd.cpp | 4 ++-- + src/mediaserver/cdplugins/cmdtalk.cpp | 2 +- + src/mediaserver/cdplugins/plgwithslave.cxx | 2 +- + src/netcon.cpp | 4 ++-- + 5 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/conftree.cpp b/src/conftree.cpp +index 12eb4b5..8a79812 100644 +--- a/src/conftree.cpp ++++ b/src/conftree.cpp +@@ -42,7 +42,7 @@ + + #include "pathut.h" + #include "smallut.h" +-#include "log.h" ++#include "libupnpp/log.h" + + using namespace std; + +diff --git a/src/execmd.cpp b/src/execmd.cpp +index 0db9032..9bf2971 100644 +--- a/src/execmd.cpp ++++ b/src/execmd.cpp +@@ -53,7 +53,7 @@ + #include "netcon.h" + #include "closefrom.h" + #include "smallut.h" +-#include "log.h" ++#include "libupnpp/log.h" + + using namespace std; + +@@ -1135,7 +1135,7 @@ void ReExec::reexec() + #include + #include + +-#include "log.h" ++#include "libupnpp/log.h" + + #include "execmd.h" + #ifdef BUILDING_RECOLL +diff --git a/src/mediaserver/cdplugins/cmdtalk.cpp b/src/mediaserver/cdplugins/cmdtalk.cpp +index eddd68f..e19f7ea 100644 +--- a/src/mediaserver/cdplugins/cmdtalk.cpp ++++ b/src/mediaserver/cdplugins/cmdtalk.cpp +@@ -24,7 +24,7 @@ + + #include "smallut.h" + #include "execmd.h" +-#include "log.h" ++#include "libupnpp/log.h" + + using namespace std; + +diff --git a/src/mediaserver/cdplugins/plgwithslave.cxx b/src/mediaserver/cdplugins/plgwithslave.cxx +index 545805c..1ad44ef 100644 +--- a/src/mediaserver/cdplugins/plgwithslave.cxx ++++ b/src/mediaserver/cdplugins/plgwithslave.cxx +@@ -35,7 +35,7 @@ + #include "cmdtalk.h" + #include "pathut.h" + #include "smallut.h" +-#include "log.hxx" ++#include "libupnpp/log.hxx" + #include "main.hxx" + #include "conftree.h" + +diff --git a/src/netcon.cpp b/src/netcon.cpp +index 5674cf3..193d1cd 100644 +--- a/src/netcon.cpp ++++ b/src/netcon.cpp +@@ -47,7 +47,7 @@ + + #include + +-#include "log.h" ++#include "libupnpp/log.h" + + using namespace std; + +@@ -1031,7 +1031,7 @@ NetconServLis::checkperms(void *cl, int) + #include + #include + +-#include "log.h" ++#include "libupnpp/log.h" + + #include "netcon.h" + +-- +2.9.3 + From 82cc7ecf9f4626eb5458bc476cd3f0a1ae312e94 Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Sat, 17 Sep 2016 20:59:24 +0900 Subject: [PATCH 0294/3392] php: bump to 7.0.11 Signed-off-by: Tatsuyuki Ishi 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 6e146f8169..0092095009 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 970c322ba3e472cb0264b8ba9d4d92e87918da5d0cca53c4aba2a70545b8626d php-7.0.9.tar.xz +sha256 d4cccea8da1d27c11b89386f8b8e95692ad3356610d571253d00ca67d524c735 php-7.0.11.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index 7df10be971..083b451d64 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.0.9 +PHP_VERSION = 7.0.11 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 85a8766a7b32b704f9e109fa6cac45715059d140 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 17 Sep 2016 13:58:22 +0200 Subject: [PATCH 0295/3392] package/{mesa3d, mesa3d-headers}: bump version to 12.0.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 4 ++-- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 4b6842e03d..3080afe4e6 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 = 12.0.2 +MESA3D_HEADERS_VERSION = 12.0.3 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 65c59a5868..09923fdffe 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,2 +1,2 @@ -# From https://cgit.freedesktop.org/mesa/mesa/plain/docs/relnotes/12.0.2.html -sha256 d957a5cc371dcd7ff2aa0d87492f263aece46f79352f4520039b58b1f32552cb mesa-12.0.2.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2016-September/000236.html +sha256 1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1 mesa-12.0.3.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 12ceee84c1..fbc0aff222 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 = 12.0.2 +MESA3D_VERSION = 12.0.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos From 16dbd226ce5b045813181b3cc28d6845f8d7a893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Thu, 15 Sep 2016 18:27:48 +0200 Subject: [PATCH 0296/3392] openal: Disable build also for examples and tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: http://autobuild.buildroot.net/results/a11eab534b8642077705d891329c1fd40d394419 Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/openal/openal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openal/openal.mk b/package/openal/openal.mk index 356f2c1cf8..63841047db 100644 --- a/package/openal/openal.mk +++ b/package/openal/openal.mk @@ -16,8 +16,8 @@ OPENAL_LICENSE = LGPLv2+ OPENAL_LICENSE_FILES = COPYING OPENAL_INSTALL_STAGING = YES -# We don't need the utilities, Distros don't ship them either -OPENAL_CONF_OPTS += -DALSOFT_UTILS=OFF +# We don't need examples, tests and utilities, Distros don't ship them either +OPENAL_CONF_OPTS += -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),y) OPENAL_CONF_OPTS += -DEXTRA_LIBS=atomic From a7af6d621b821f5273ba36afaf7fef6ffde24eab Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Thu, 15 Sep 2016 16:04:41 +0200 Subject: [PATCH 0297/3392] package/autoconf-archive: bump to version 2016.03.20 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/autoconf-archive/autoconf-archive.hash | 2 +- package/autoconf-archive/autoconf-archive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/autoconf-archive/autoconf-archive.hash b/package/autoconf-archive/autoconf-archive.hash index 5576566870..6982a4dd67 100644 --- a/package/autoconf-archive/autoconf-archive.hash +++ b/package/autoconf-archive/autoconf-archive.hash @@ -1,2 +1,2 @@ # Computed locally -sha256 7c0467a5dbd2340153bca5a477bd92fbc951d9ee3cbed92f16f6bf08ac0c350a autoconf-archive-2015.09.25.tar.xz +sha256 88fb2efff640eddd28a52ae550ff5561bca3bd2bba09e1d7b0580e719875e437 autoconf-archive-2016.03.20.tar.xz diff --git a/package/autoconf-archive/autoconf-archive.mk b/package/autoconf-archive/autoconf-archive.mk index 98acba3e41..86956eb672 100644 --- a/package/autoconf-archive/autoconf-archive.mk +++ b/package/autoconf-archive/autoconf-archive.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_ARCHIVE_VERSION = 2015.09.25 +AUTOCONF_ARCHIVE_VERSION = 2016.03.20 AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive AUTOCONF_ARCHIVE_LICENSE = GPLv3+ with exception From 4b81badbcc0b25678ac6627548160702731cf393 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 14 Sep 2016 00:35:17 +0200 Subject: [PATCH 0298/3392] infra/pkg-kconfig: Be sure to reconfigure the package on foo-reconfigure Currently, calling foo-reconfigure for a kconfig-based package will not re-trigger the configuration (kconfig-wise) step for the package. This can be problematic when using an override-srcdir suring development and the content of the veride-srcdir changes (e.g. on a rebase, a merge, or during a bisect). This is because the configuration (kconfig-wise) of the package is not done in the _CONFIGURE_CMDS block, but as a separate action that is not part of any step [0]. So, be sure to remove the stamp file .stamp_kconfig_fixup_done during the foo-clean-for-reconfigure rule, so that the configuration is applied again with the new source tree. We use another rule, foo-clean-kconfig-for-reconfigure, because we do not want to override the default foo-clean-for-reconfigure rule, and we have no way to add conditional commands to it. [0] The reasons it was not done are not entirely clear in my head, but IIRC that was not working at the time we tried with Thomas DS. Reported-by: Vivien Didelot Signed-off-by: "Yann E. MORIN" Cc: Vivien Didelot Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Tested-by: Vivien Didelot Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pkg-kconfig.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index b0f51789c3..ce9bf33299 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -118,6 +118,12 @@ $$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config # Before running configure, the configuration file should be present and fixed $$($(2)_TARGET_CONFIGURE): $$($(2)_DIR)/.stamp_kconfig_fixup_done +# Force olddefconfig again on -reconfigure +$(1)-clean-for-reconfigure: $(1)-clean-kconfig-for-reconfigure + +$(1)-clean-kconfig-for-reconfigure: + rm -f $$($(2)_DIR)/.stamp_kconfig_fixup_done + # Only enable the foo-*config targets when the package is actually enabled. # Note: the variable $(2)_KCONFIG_VAR is not related to the kconfig # infrastructure, but defined by pkg-generic.mk. The generic infrastructure is From bbbc8b5de32965aaf9fa01d4fabc461dd65f6c3a Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 13 Sep 2016 21:45:33 +0200 Subject: [PATCH 0299/3392] pkg-kconfig: support alternative .config location Kconfig clones, such as openconf used by xvisor [1], do not look for .config at the root of the build directory, but in a subdirectory (e.g. build/openconf). This patch introduces a new Makefile variable named $(2)_KCONFIG_DOTCONFIG, which contains the path to .config relative to the source directory of the package. It defaults to .config and can be overridden in the package Makefile. It also creates the full directory hierarchy where the .config file is stored, in case it does not exist (e.g. in xvisor). This allows the use of the kconfig-package infrastructure with packages relying on such clones. [1] https://github.com/xvisor/xvisor/tree/master/tools/openconf Signed-off-by: Eric Le Bihan Reviewed-by: "Yann E. MORIN" [Thomas: use "install -D" instead of "mkdir + cp", as suggested by Yann.] Signed-off-by: Thomas Petazzoni --- package/pkg-kconfig.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index ce9bf33299..215f01b430 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -36,6 +36,7 @@ $(2)_KCONFIG_EDITORS ?= menuconfig $(2)_KCONFIG_OPTS ?= $(2)_KCONFIG_FIXUP_CMDS ?= $(2)_KCONFIG_FRAGMENT_FILES ?= +$(2)_KCONFIG_DOTCONFIG ?= .config # The config file as well as the fragments could be in-tree, so before # depending on them the package should be extracted (and patched) first. @@ -91,10 +92,10 @@ endef # fragments are merged together to .config, after the package has been patched. # Since the file could be a defconfig file it needs to be expanded to a # full .config first. -$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES) +$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES) $$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \ $$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \ - cp $$($(2)_KCONFIG_FILE) $$(@)) + $$(INSTALL) -m 0644 -D $$($(2)_KCONFIG_FILE) $$(@)) $$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \ $$(@) $$($(2)_KCONFIG_FRAGMENT_FILES) $$($(2)_REGEN_DOT_CONFIG) @@ -102,7 +103,7 @@ $$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES) # If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is # already implied, but if we only have a _KCONFIG_DEFCONFIG we have to add # it explicitly. It doesn't hurt to always have it though. -$$($(2)_DIR)/.config: | $(1)-patch +$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): | $(1)-patch # In order to get a usable, consistent configuration, some fixup may be needed. # The exact rules are specified by the package .mk file. @@ -112,7 +113,7 @@ define $(2)_FIXUP_DOT_CONFIG $$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done endef -$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config +$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_FIXUP_DOT_CONFIG) # Before running configure, the configuration file should be present and fixed @@ -208,8 +209,8 @@ $(1)-update-config: $(1)-check-configuration-done echo "Unable to perform $(1)-update-config when fragment files are set"; exit 1) @$$(if $$($(2)_KCONFIG_DEFCONFIG), \ echo "Unable to perform $(1)-update-config when using a defconfig rule"; exit 1) - cp -f $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE) - touch --reference $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE) + cp -f $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FILE) + touch --reference $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FILE) # Note: make sure the timestamp of the stored configuration is not newer than # the .config to avoid a useless rebuild. Note that, contrary to @@ -221,7 +222,7 @@ $(1)-update-defconfig: $(1)-savedefconfig @$$(if $$($(2)_KCONFIG_DEFCONFIG), \ echo "Unable to perform $(1)-update-defconfig when using a defconfig rule"; exit 1) cp -f $$($(2)_DIR)/defconfig $$($(2)_KCONFIG_FILE) - touch --reference $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE) + touch --reference $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FILE) endif # package enabled From 4309092e34586274f58599e006725b70ead53d9c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 17 Sep 2016 14:45:36 +0200 Subject: [PATCH 0300/3392] docs/manual: update pkg-kconfig doc about _KCONFIG_DOTCONFIG Content provided by Yann E. Morin. Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-kconfig.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt index 3290024b09..d4d8630a79 100644 --- a/docs/manual/adding-packages-kconfig.txt +++ b/docs/manual/adding-packages-kconfig.txt @@ -75,3 +75,9 @@ be set to suit the needs of the package under consideration: configuration file after copying it or running a kconfig editor. Such commands may be needed to ensure a configuration consistent with other configuration of Buildroot, for example. By default, empty. + +* +FOO_KCONFIG_DOTCONFIG+: path (with filename) of the +.config+ file, + relative to the package source tree. The default, +.config+, should + be well suited for all packages that use the standard kconfig + infrastructure as inherited from the Linux kernel; some packages use + a derivative of kconfig that use a different location. From e23ddf0c13e6d3b054782b86188396a0c2add1a5 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Tue, 13 Sep 2016 21:45:34 +0200 Subject: [PATCH 0301/3392] xvisor: new package This new package provides Xvisor, an open-source type-1 hypervisor, which aims at providing a monolithic, light-weight, portable, and flexible virtualization solution. Signed-off-by: Eric Le Bihan [Thomas: - use MKIMAGE_ARCH instead of BR2_ARCH when calling mkimage - use $(MKIMAGE) - license is GPLv2+.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...1-Makefile-Fix-oldconfig-make-target.patch | 30 ++++++++ .../0002-openconf-do-not-check-stdin.patch | 58 +++++++++++++++ package/xvisor/Config.in | 58 +++++++++++++++ package/xvisor/xvisor.hash | 2 + package/xvisor/xvisor.mk | 72 +++++++++++++++++++ 6 files changed, 221 insertions(+) create mode 100644 package/xvisor/0001-Makefile-Fix-oldconfig-make-target.patch create mode 100644 package/xvisor/0002-openconf-do-not-check-stdin.patch create mode 100644 package/xvisor/Config.in create mode 100644 package/xvisor/xvisor.hash create mode 100644 package/xvisor/xvisor.mk diff --git a/package/Config.in b/package/Config.in index 332f05d90d..d571b899cc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1732,6 +1732,7 @@ menu "System tools" source "package/unscd/Config.in" source "package/util-linux/Config.in" source "package/xen/Config.in" + source "package/xvisor/Config.in" endmenu menu "Text editors and viewers" diff --git a/package/xvisor/0001-Makefile-Fix-oldconfig-make-target.patch b/package/xvisor/0001-Makefile-Fix-oldconfig-make-target.patch new file mode 100644 index 0000000000..f056625470 --- /dev/null +++ b/package/xvisor/0001-Makefile-Fix-oldconfig-make-target.patch @@ -0,0 +1,30 @@ +From 99bbdc042ee4c92a13edcfeaf336aa755a199d0f Mon Sep 17 00:00:00 2001 +From: Anup Patel +Date: Sun, 11 Sep 2016 19:53:40 +0530 +Subject: [PATCH] Makefile: Fix oldconfig make target + +Use "-s" instead of "-o" option of "openconf/conf" tool because +the "-o" option does not generate all required openconf files. + +Signed-off-by: Anup Patel +Signed-off-by: Eric Le Bihan +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 149a682..e05e801 100644 +--- a/Makefile ++++ b/Makefile +@@ -434,7 +434,7 @@ menuconfig: + oldconfig: + $(V)mkdir -p $(OPENCONF_TMPDIR) + $(V)$(MAKE) -C tools/openconf oldconfig +- ./tools/openconf/conf -o $(OPENCONF_INPUT) ++ ./tools/openconf/conf -s $(OPENCONF_INPUT) + + # Rule for "make savedefconfig" + .PHONY: savedefconfig +-- +2.4.11 + diff --git a/package/xvisor/0002-openconf-do-not-check-stdin.patch b/package/xvisor/0002-openconf-do-not-check-stdin.patch new file mode 100644 index 0000000000..34b350de42 --- /dev/null +++ b/package/xvisor/0002-openconf-do-not-check-stdin.patch @@ -0,0 +1,58 @@ +From 6b49c1dbe0ac43e39eec97a7e79cf5fb995747dc Mon Sep 17 00:00:00 2001 +From: Eric Le Bihan +Date: Mon, 12 Sep 2016 21:49:55 +0530 +Subject: [PATCH] openconf: do not check stdin + +Do not check if stdin is redirected when ask_silent is true, so the +`yes` program can be used to answer the questions about new values. + +Example: + + yes "" | make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- oldconfig + +Signed-off-by: Eric Le Bihan +Signed-off-by: Anup Patel +--- + tools/openconf/conf.c | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/tools/openconf/conf.c b/tools/openconf/conf.c +index a428058..711cf0b 100644 +--- a/tools/openconf/conf.c ++++ b/tools/openconf/conf.c +@@ -65,16 +65,6 @@ static void strip(char *str) + *p-- = 0; + } + +-static void check_stdin(void) +-{ +- if (!valid_stdin) { +- printf("aborted!\n\n"); +- printf("Console input/output is redirected. "); +- printf("Run 'make oldconfig' to update configuration.\n\n"); +- exit(1); +- } +-} +- + static int conf_askvalue(struct symbol *sym, const char *def) + { + char *ret; +@@ -100,7 +90,6 @@ static int conf_askvalue(struct symbol *sym, const char *def) + printf("%s\n", def); + return 0; + } +- check_stdin(); + case ask_all: + fflush(stdout); + ret = fgets(line, 128, stdin); +@@ -306,7 +295,6 @@ static int conf_choice(struct menu *menu) + printf("%d\n", cnt); + break; + } +- check_stdin(); + case ask_all: + fflush(stdout); + ret = fgets(line, 128, stdin); +-- +2.4.11 + diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in new file mode 100644 index 0000000000..f450f6fd43 --- /dev/null +++ b/package/xvisor/Config.in @@ -0,0 +1,58 @@ +menuconfig BR2_PACKAGE_XVISOR + bool "xvisor" + depends on BR2_USE_MMU + depends on BR2_arm || BR2_aarch64 || BR2_x86_64 + depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV7M + help + Xvisor is an open-source type-1 hypervisor, which aims at providing + a monolithic, light-weight, portable, and flexible virtualization + solution. + + http://www.xhypervisor.org/ + +if BR2_PACKAGE_XVISOR + +choice + prompt "Xvisor configuration" + default BR2_PACKAGE_XVISOR_USE_DEFCONFIG + +config BR2_PACKAGE_XVISOR_USE_DEFCONFIG + bool "Using an in-tree defconfig file" + +config BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG + bool "Using a custom (def)config file" + +endchoice + +config BR2_PACKAGE_XVISOR_DEFCONFIG + string "Defconfig name" + depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG + default "generic-v5" if BR2_ARM_CPU_ARMV5 + default "generic-v6" if BR2_ARM_CPU_ARMV6 + default "generic-v7" if BR2_ARM_CPU_ARMV7A + default "generic-v8" if BR2_AARCH64 + default "x86_64_generic" if BR2_x86_64 + help + Name of the Xvisor defconfig file to use, without the + trailing -defconfig. The defconfig is located in + arch//configs in the source tree. + +config BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE + string "Configuration file path" + depends on BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG + help + Path to the Xvisor configuration file + +config BR2_PACKAGE_XVISOR_CREATE_UBOOT_IMAGE + bool "Create U-Boot image of Xvisor" + depends on BR2_arm + select BR2_PACKAGE_HOST_UBOOT_TOOLS + help + Create an image file of Xvisor loadable from Das U-Boot. + +config BR2_PACKAGE_XVISOR_BUILD_TEST_DTB + bool "Build test device-tree blobs" + help + Build test device-tree blobs for popular boards. + +endif diff --git a/package/xvisor/xvisor.hash b/package/xvisor/xvisor.hash new file mode 100644 index 0000000000..13335beb6d --- /dev/null +++ b/package/xvisor/xvisor.hash @@ -0,0 +1,2 @@ +# Locally generated +sha256 9347080c3481fb8586d196dd51a580a57084bfea1bc425e89f7fa0da7170708a xvisor-0.2.8.tar.gz diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk new file mode 100644 index 0000000000..a9a5dbfaec --- /dev/null +++ b/package/xvisor/xvisor.mk @@ -0,0 +1,72 @@ +################################################################################ +# +# xvisor +# +################################################################################ + +XVISOR_VERSION = 0.2.8 +XVISOR_SITE = http://www.xhypervisor.org/tarball +XVISOR_LICENSE = GPLv2+ +XVISOR_LICENSE_FILES = COPYING +XVISOR_INSTALL_IMAGES = YES +XVISOR_INSTALL_TARGET = NO + +XVISOR_MAKE_TARGETS = all + +ifeq ($(BR2_PACKAGE_XVISOR_BUILD_TEST_DTB),y) +XVISOR_MAKE_TARGETS += dtbs +endif + +XVISOR_KCONFIG_DOTCONFIG = build/openconf/.config + +ifeq ($(BR2_PACKAGE_XVISOR_USE_DEFCONFIG),y) +XVISOR_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_PACKAGE_XVISOR_DEFCONFIG))-defconfig +else ifeq ($(BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG),y) +XVISOR_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE)) +endif +XVISOR_KCONFIG_EDITORS = menuconfig + +XVISOR_MAKE_ENV = \ + ARCH=$(if $(BR2_x86_64),x86,$(BR2_ARCH)) \ + CROSS_COMPILE=$(TARGET_CROSS) + +XVISOR_MAKE_OPTS = $(if $(VERBOSE),VERBOSE=1) + +define XVISOR_BUILD_CMDS + $(TARGET_MAKE_ENV) $(XVISOR_MAKE_ENV) $(MAKE) $(XVISOR_MAKE_OPTS) \ + -C $(@D) $(XVISOR_MAKE_TARGETS) +endef + +define XVISOR_INSTALL_IMAGES_CMDS + $(INSTALL) -m 0644 -D $(@D)/build/vmm.bin $(BINARIES_DIR)/vmm.bin +endef + +ifeq ($(BR2_PACKAGE_XVISOR_CREATE_UBOOT_IMAGE),y) +XVISOR_DEPENDENCIES += host-uboot-tools +define XVISOR_CREATE_UBOOT_IMAGE + $(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux -T kernel -C none \ + -a 0x00008000 -e 0x00008000 \ + -n Xvisor -d $(BINARIES_DIR)/vmm.bin $(BINARIES_DIR)/uvmm.bin +endef +endif + +XVISOR_POST_INSTALL_IMAGES_HOOKS += XVISOR_CREATE_UBOOT_IMAGE + +# Checks to give errors that the user can understand +ifeq ($(BR_BUILDING),y) + +ifeq ($(BR2_PACKAGE_XVISOR_USE_DEFCONFIG),y) +ifeq ($(call qstrip,$(BR2_PACKAGE_XVISOR_DEFCONFIG)),) +$(error No Xvisor defconfig name specified, check your BR2_PACKAGE_XVISOR_DEFCONFIG setting) +endif +endif + +ifeq ($(BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG),y) +ifeq ($(BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE),) +$(error No Xvisor configuration file specified, check your BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE setting) +endif +endif + +endif + +$(eval $(kconfig-package)) From ce29aaf030bdb82c5eec5ab8deafad6a863a3331 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 13 Sep 2016 13:45:03 -0700 Subject: [PATCH 0302/3392] xen: remove -Werror when building host tools Signed-off-by: Alistair Francis Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- ...ove-hardcoded-strict-Werror-checking.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/xen/0001-Remove-hardcoded-strict-Werror-checking.patch diff --git a/package/xen/0001-Remove-hardcoded-strict-Werror-checking.patch b/package/xen/0001-Remove-hardcoded-strict-Werror-checking.patch new file mode 100644 index 0000000000..ca772ddfb1 --- /dev/null +++ b/package/xen/0001-Remove-hardcoded-strict-Werror-checking.patch @@ -0,0 +1,26 @@ +From 234847440a5d3cf95540ea79f7a08d50cccfef73 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Tue, 13 Sep 2016 10:48:31 -0700 +Subject: [PATCH] Remove hardcoded strict -Werror checking + +Signed-off-by: Alistair Francis +--- + Config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Config.mk b/Config.mk +index bd991c6..e7ac662 100644 +--- a/Config.mk ++++ b/Config.mk +@@ -36,7 +36,7 @@ CONFIG_$(XEN_OS) := y + SHELL ?= /bin/sh + + # Tools to run on system hosting the build +-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer ++HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer + HOSTCFLAGS += -fno-strict-aliasing + + DISTDIR ?= $(XEN_ROOT)/dist +-- +2.7.4 + From c2d80a8c5d8b97cdc84c297a3d2d6896fff6560b Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 12 Sep 2016 23:59:19 +0200 Subject: [PATCH 0303/3392] core: don't build host-cmake if it is available on the build host Currently all cmake packages depend on host-cmake. Unfortunately host-cmake takes a long time to configure and build: almost 7 minutes on a dual-core i5 with SSD. The time does not change even with ccache enabled. Indeed, building host-cmake is avoidable if it is already installed on the build host: CMake is supposed to be quite portable, and the only patch in Buildroot for the CMake package seems to only affect target-cmake. Thus we automatically skip building host-cmake and use the one on the system if: - cmake is available on the system and - it is recent enough. First, we leverage the existing infrastructure in support/dependencies/dependencies.mk to find out whether there's a suitable cmake executable on the system. Its path can be passed in the BR2_CMAKE environment variable, otherwise it defaults to "cmake". If it is enabled, found and suitable then we set BR2_CMAKE_HOST_DEPENDENCY to empty; otherwise we set BR2_CMAKE_HOST_DEPENDENCY to 'host-cmake' and override BR2_CMAKE with "$(HOST_DIR)/usr/bin/cmake" to revert to using our own cmake (the old behaviour). Then in pkg-cmake.mk we replace the hard-coded dependency on host-cmake to using the BR2_CMAKE_HOST_DEPENDENCY variable, and we use $(BR2_CMAKE) instead of $(HOST_DIR)/usr/bin/cmake. Unlike what we do for host-tar and host-xzcat, for host-cmake we do not add host-cmake to DEPENDENCIES_HOST_PREREQ. If we did, host-cmake would be a dependency for _any_ package when it's not installed on the host, even when no cmake package is selected. Cmake versions older than 3.0 are affected by the bug described and fixed in Buildroot in ef2c1970e4bf ("cmake: add patch to fix Qt mkspecs detection"). The bug was fixed in upstream CMake in version 3.0 [0]. Amongst all the cmake packages currently in Buildroot, the currently highest version mentioned in cmake_minimum_required() is 3.1 (grantlee and opencv3). Thus we use 3.1 as the lowest required cmake for now, until a package is bumped, or a new package added, with a higher required version. [0] https://cmake.org/gitweb?p=cmake.git;h=e8b8b37ef6fef094940d3384df5a1d421b9fa568 Signed-off-by: Luca Ceresoli Cc: Samuel Martin Cc: Davide Viti Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Reviewed-by: Romain Naour Tested-by: Romain Naour [yann.morin.1998@free.fr: - simplify logic in check-host-cmake.mk; - set and use BR2_CMAKE_HOST_DEPENDENCY, drop USE_SYSTEM_CMAKE; - bump to cmake 3.1 for grantlee and opencv; ] Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/pkg-cmake.mk | 6 ++-- support/dependencies/check-host-cmake.mk | 18 +++++++++++ support/dependencies/check-host-cmake.sh | 39 ++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 support/dependencies/check-host-cmake.mk create mode 100755 support/dependencies/check-host-cmake.sh diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 4c6dc62270..aca9e61e04 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -85,7 +85,7 @@ define $(2)_CONFIGURE_CMDS cd $$($$(PKG)_BUILDDIR) && \ rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ - $$($$(PKG)_CONF_ENV) $$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ -DCMAKE_BUILD_TYPE=$$(if $$(BR2_ENABLE_DEBUG),RelWithDebInfo,Release) \ -DCMAKE_INSTALL_PREFIX="/usr" \ @@ -110,7 +110,7 @@ define $(2)_CONFIGURE_CMDS cd $$($$(PKG)_BUILDDIR) && \ rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ - $$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ + $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ @@ -146,7 +146,7 @@ endif # primitives to find {C,LD}FLAGS, add it to the dependency list. $(2)_DEPENDENCIES += host-pkgconf -$(2)_DEPENDENCIES += host-cmake +$(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) # # Build step. Only define it if not already defined by the package .mk diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk new file mode 100644 index 0000000000..8002278a3b --- /dev/null +++ b/support/dependencies/check-host-cmake.mk @@ -0,0 +1,18 @@ +# Versions before 3.0 are affected by the bug described in +# https://git.busybox.net/buildroot/commit/?id=ef2c1970e4bff3be3992014070392b0e6bc28bd2 +# and fixed in upstream CMake in version 3.0: +# https://cmake.org/gitweb?p=cmake.git;h=e8b8b37ef6fef094940d3384df5a1d421b9fa568 +# +# Set this to either 3.0 or higher, depending on the highest minimum +# version required by any of the packages bundled in Buildroot. If a +# package is bumped or a new one added, and it requires a higher +# version, our cmake infra will catch it and whine. +# +BR2_CMAKE_VERSION_MIN = 3.1 + +BR2_CMAKE ?= cmake +ifeq ($(call suitable-host-package,cmake,\ + $(BR2_CMAKE) $(BR2_CMAKE_VERSION_MIN)),) +BR2_CMAKE = $(HOST_DIR)/usr/bin/cmake +BR2_CMAKE_HOST_DEPENDENCY = host-cmake +endif diff --git a/support/dependencies/check-host-cmake.sh b/support/dependencies/check-host-cmake.sh new file mode 100755 index 0000000000..9b63b0648d --- /dev/null +++ b/support/dependencies/check-host-cmake.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +candidate="${1}" +version_min="${2}" + +major_min="${version_min%.*}" +minor_min="${version_min#*.}" + +cmake=`which ${candidate}` +if [ ! -x "${cmake}" ]; then + # echo nothing: no suitable cmake found + exit 1 +fi + +# Extract version X.Y from versions in the form X.Y or X.Y.Z +# with X, Y and Z numbers with one or more digits each, e.g. +# 3.2 -> 3.2 +# 3.2.3 -> 3.2 +# 3.2.42 -> 3.2 +# 3.10 -> 3.10 +# 3.10.4 -> 3.10 +# 3.10.42 -> 3.10 +version="$(${cmake} --version \ + |sed -r -e '/.* ([[:digit:]]+\.[[:digit:]]+).*$/!d;' \ + -e 's//\1/' + )" +major="${version%.*}" +minor="${version#*.}" + +if [ ${major} -gt ${major_min} ]; then + echo "${cmake}" +else + if [ ${major} -eq ${major_min} -a ${minor} -ge ${minor_min} ]; then + echo "${cmake}" + else + # echo nothing: no suitable cmake found + exit 1 + fi +fi From e76b4fd103cd18c374ea7aa1e7f2e76ab02c00ca Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 11 Sep 2016 15:55:46 +0200 Subject: [PATCH 0304/3392] core: distclean is a noconfig target When the .config contains invalid configuration *(e.g. two providers for a same virtual package), it is not possible to run "make distclean" because the .config file is sourced and packages interpreted in this case. Add distclean to the noconfig list, so that we can run it in all cases. However, this meand that DL_DIR is no longer set, and thus the default download location never removed. We fix that by always removing the download location, so that if it is the one configured we still remove it (no change) and if it is not the one configured, we remove an non-existing location and leave the user's location intact (no change either). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index dfef02189b..92feff3123 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlo noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \ defconfig %_defconfig allyesconfig allnoconfig silentoldconfig release \ randpackageconfig allyespackageconfig allnopackageconfig \ - print-version olddefconfig + print-version olddefconfig distclean # Some global targets do not trigger a build, but are used to collect # metadata, or do various checks. When such targets are triggered, @@ -905,13 +905,10 @@ clean: $(LEGAL_INFO_DIR) $(GRAPHS_DIR) distclean: clean -ifeq ($(DL_DIR),$(TOPDIR)/dl) - rm -rf $(DL_DIR) -endif ifeq ($(O),output) rm -rf $(O) endif - rm -rf $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \ + rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \ $(CONFIG_DIR)/.auto.deps $(BR2_EXTERNAL_FILE) help: From 87b73f50a3df962e2b07a966557f888dec89c2cc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 7 Sep 2016 23:08:40 +0200 Subject: [PATCH 0305/3392] package/efl: add OpenGL/OpenGLES support Allow to enable graphic acceleration using OpenGL or OpenGLES with efl libraries. The full OpenGL option depend on X11, because full OpenGL means GLX, which means X11. Also select efl xlib support when full OpenGL is selected. Enable OpenGL ES when EGL API is enabled, otherwise the build fail with this error: configure: error: OpenGL ES requires EGL, please add --enable-egl to your configure options to switch to EGL + OpenGL ES. With the upcomming Wayland support in EFL Buildroot packaging, OpenGL ES support is recommended. Signed-off-by: Romain Naour [Thomas: - use a single ifeq/else ifeq/else ifeq/endif block - remove the "default" for the choice, move the "none" choice at the end, and simply rely on the first choice having its dependencies met being automatically enable by kconfig. So OpenGL first, then OpenGLES, and then none.] Signed-off-by: Thomas Petazzoni --- package/efl/Config.in | 28 ++++++++++++++++++++++++++++ package/efl/efl.mk | 15 ++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 1cc681c242..fa6d7617e5 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -155,6 +155,34 @@ config BR2_PACKAGE_EFL_X_XLIB select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XPROTO_GLPROTO +choice + bool "OpenGL support" + help + libevas can be configured to use HW acceleration with OpenGL or + OpenGL ES. + +config BR2_PACKAGE_EFL_OPENGL + bool "OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_EFL_X_XLIB + +comment "OpenGL support needs X11 and an OpenGL provider" + depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 + +config BR2_PACKAGE_EFL_OPENGLES + bool "OpenGL ES (w/ EGL)" + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGLES + +comment "OpenGL ES support needs an OpenGL ES w/ EGL provider" + depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL + +config BR2_PACKAGE_EFL_OPENGL_NONE + bool "none" + +endchoice # OpenGL support + comment "libevas loaders" config BR2_PACKAGE_EFL_PNG diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 83588c1688..853c9dcb56 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -28,7 +28,6 @@ EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ # --disable-sdl: disable sdl2 support. # --disable-spectre: disable spectre image loader. # --disable-xinput22: disable X11 XInput v2.2+ support. -# --with-opengl=none: disable opengl support. # --with-doxygen: disable doxygen documentation EFL_CONF_OPTS = \ --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ @@ -43,8 +42,7 @@ EFL_CONF_OPTS = \ --disable-sdl \ --disable-spectre \ --disable-xinput22 \ - --with-doxygen=no \ - --with-opengl=none + --with-doxygen=no # Disable untested configuration warning. ifeq ($(BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG),) @@ -182,6 +180,17 @@ else EFL_CONF_OPTS += --with-x11=none endif +ifeq ($(BR2_PACKAGE_EFL_OPENGL),y) +EFL_CONF_OPTS += --with-opengl=full +EFL_DEPENDENCIES += libgl +# OpenGL ES requires EGL +else ifeq ($(BR2_PACKAGE_EFL_OPENGLES),y) +EFL_CONF_OPTS += --with-opengl=es --enable-egl +EFL_DEPENDENCIES += libegl libgles +else ifeq ($(BR2_PACKAGE_EFL_OPENGL_NONE),y) +EFL_CONF_OPTS += --with-opengl=none +endif + # Loaders that need external dependencies needs to be --enable-XXX=yes # otherwise the default is '=static'. # All other loaders are statically built-in From 373c24cd1bb98a8b826b92034f7cb39780719625 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 7 Sep 2016 23:08:41 +0200 Subject: [PATCH 0306/3392] package/efl: enable elput support Signed-off-by: Romain Naour [Thomas: - add --disable-elput in the !BR2_PACKAGE_EFL_ELPUT case - add missing dependency on libxkbcomm] Signed-off-by: Thomas Petazzoni --- package/efl/Config.in | 10 ++++++++++ package/efl/efl.mk | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/package/efl/Config.in b/package/efl/Config.in index fa6d7617e5..f963ade8e5 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -183,6 +183,16 @@ config BR2_PACKAGE_EFL_OPENGL_NONE endchoice # OpenGL support +config BR2_PACKAGE_EFL_ELPUT + bool "Elput" + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + help + The elput library is an efl abstraction for the libinput library + which can be used by various other subsystems (ecore_fb, + ecore_drm, etc) to handle interfacing with libinput without + having to duplicate the code in each subsystem. + comment "libevas loaders" config BR2_PACKAGE_EFL_PNG diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 853c9dcb56..80387393fe 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -152,6 +152,13 @@ else EFL_CONF_OPTS += --disable-wayland endif +ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) +EFL_CONF_OPTS += --enable-elput +EFL_DEPENDENCIES += libinput libxkbcommon +else +EFL_CONF_OPTS += --disable-elput +endif + ifeq ($(BR2_PACKAGE_EFL_FB),y) EFL_CONF_OPTS += --enable-fb else From fad58cefa4a392b52eafe46a773f8cbfb8aadb43 Mon Sep 17 00:00:00 2001 From: Petr Kulhavy Date: Fri, 2 Sep 2016 14:26:26 +0200 Subject: [PATCH 0307/3392] boot/uboot: allow to build multiple U-Boot images Sometimes it is desired to build multiple U-boot images. E.g. one to save into flash memory and one for serial load. So far this was not possible. This change allows to select any combination of the target formats. They are all copied to the image folder. Signed-off-by: Petr Kulhavy [Thomas: - Handle the BR2_TARGET_UBOOT_FORMAT_BIN, which wasn't handled, and therefore u-boot.bin was not copied when BR2_TARGET_UBOOT_FORMAT_BIN=y. - Rename UBOOT_BIN to UBOOT_BINS, since it can now contain multiple values.] Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 19 ++++---- boot/uboot/uboot.mk | 102 ++++++++++++++++++++++++++++--------------- 2 files changed, 77 insertions(+), 44 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 45d0586109..f6d30d9fc4 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -137,9 +137,7 @@ config BR2_TARGET_UBOOT_NEEDS_DTC Select this option if your U-Boot board configuration requires the Device Tree compiler to be available. -choice - prompt "U-Boot binary format" - default BR2_TARGET_UBOOT_FORMAT_BIN +menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS bool "u-boot.ais" @@ -150,6 +148,7 @@ config BR2_TARGET_UBOOT_FORMAT_AIS config BR2_TARGET_UBOOT_FORMAT_BIN bool "u-boot.bin" + default y config BR2_TARGET_UBOOT_FORMAT_DTB_IMG bool "u-boot-dtb.img" @@ -252,19 +251,21 @@ config BR2_TARGET_UBOOT_FORMAT_CUSTOM help On some platforms, the standard U-Boot binary is not called u-boot.bin, but u-boot.bin. If this is your case, - you should select this option and specify the correct name + you should select this option and specify the correct name(s) in BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME. -endchoice - config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME - string "U-Boot binary format: custom name" + string "U-Boot binary format: custom names" depends on BR2_TARGET_UBOOT_FORMAT_CUSTOM help - Specify the correct name of the output binary created by - U-Boot, if it is not one of the default names. For example: + In case the U-Boot binary for the target platform is not among + the default names, one or more custom names can be listed here. + Use space to separate multiple names. + Example: u-boot_magic.bin +endmenu + config BR2_TARGET_UBOOT_OMAP_IFT depends on BR2_TARGET_UBOOT_FORMAT_BIN depends on BR2_arm || BR2_armeb diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 7c3512ad41..7379a4d139 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -36,48 +36,78 @@ BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE) endif endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_BIN),y) +UBOOT_BINS += u-boot.bin +endif + ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y) -UBOOT_BIN = u-boot +UBOOT_BINS += u-boot # To make elf usable for debuging on ARC use special target ifeq ($(BR2_arc),y) -UBOOT_MAKE_TARGET = mdbtrick +UBOOT_MAKE_TARGET += mdbtrick +endif +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y) +UBOOT_BINS += u-boot.kwb +UBOOT_MAKE_TARGET += u-boot.kwb +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y) +UBOOT_BINS += u-boot.ais +UBOOT_MAKE_TARGET += u-boot.ais +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y) +UBOOT_BINS += u-boot.ldr +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y) +UBOOT_BINS += u-boot-nand.bin +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_IMG),y) +UBOOT_BINS += u-boot-dtb.img +UBOOT_MAKE_TARGET += all u-boot-dtb.img +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y) +UBOOT_BINS += u-boot.img +UBOOT_MAKE_TARGET += u-boot.img endif -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y) -UBOOT_BIN = u-boot.kwb -UBOOT_MAKE_TARGET = $(UBOOT_BIN) -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y) -UBOOT_BIN = u-boot.ais -UBOOT_MAKE_TARGET = $(UBOOT_BIN) -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y) -UBOOT_BIN = u-boot.ldr -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y) -UBOOT_BIN = u-boot-nand.bin -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_IMG),y) -UBOOT_BIN = u-boot-dtb.img -UBOOT_MAKE_TARGET = all $(UBOOT_BIN) -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y) -UBOOT_BIN = u-boot.img -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y) -UBOOT_BIN = u-boot.imx -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y) -UBOOT_BIN = u-boot.sb -UBOOT_MAKE_TARGET = $(UBOOT_BIN) + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y) +UBOOT_BINS += u-boot.imx +UBOOT_MAKE_TARGET += u-boot.imx +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y) +UBOOT_BINS += u-boot.sb +UBOOT_MAKE_TARGET += u-boot.sb # mxsimage needs OpenSSL UBOOT_DEPENDENCIES += host-elftosb host-openssl -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SD),y) +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_SD),y) # BootStream (.sb) is generated by U-Boot, we convert it to SD format -UBOOT_BIN = u-boot.sd -UBOOT_MAKE_TARGET = u-boot.sb +UBOOT_BINS += u-boot.sd +UBOOT_MAKE_TARGET += u-boot.sb UBOOT_DEPENDENCIES += host-elftosb host-openssl -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND),y) -UBOOT_BIN = u-boot.nand -UBOOT_MAKE_TARGET = u-boot.sb +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND),y) +UBOOT_BINS += u-boot.nand +UBOOT_MAKE_TARGET += u-boot.sb UBOOT_DEPENDENCIES += host-elftosb host-openssl -else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y) -UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME)) -else -UBOOT_BIN = u-boot.bin -UBOOT_BIN_IFT = $(UBOOT_BIN).ift +endif + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y) +UBOOT_BINS += $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME)) +endif + +ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y) +UBOOT_BINS += u-boot.bin +UBOOT_BIN_IFT = u-boot.bin.ift endif # The kernel calls AArch64 'arm64', but U-Boot calls it just 'arm', so @@ -166,9 +196,11 @@ define UBOOT_BUILD_OMAP_IFT endef define UBOOT_INSTALL_IMAGES_CMDS - cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/ + $(foreach f,$(UBOOT_BINS), \ + cp -dpf $(@D)/$(f) $(BINARIES_DIR)/ + ) $(if $(BR2_TARGET_UBOOT_FORMAT_NAND), - cp -dpf $(@D)/$(UBOOT_MAKE_TARGET) $(BINARIES_DIR)) + cp -dpf $(@D)/u-boot.sb $(BINARIES_DIR)) $(if $(BR2_TARGET_UBOOT_SPL), $(foreach f,$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)), \ cp -dpf $(@D)/$(f) $(BINARIES_DIR)/ From 999c7048c1733e0ff3d7479f125e183c848a41af Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Sat, 17 Sep 2016 18:41:40 +0300 Subject: [PATCH 0308/3392] toolchain: Bump ARC tools to arc-2016.09-eng013 As described at: 4520524ba055706236db9f00dd79f1b2e2e87fde this commit continues a series of updates of ARC tools. This time we're updating tools to arc-2016.09-eng013. This engenering build contains some important GCC updatesthat fixes some failures for ARC, such as: http://autobuild.buildroot.net/results/f80/f80ad8a07d9d58b46592c2c99b227197b0f808d3// http://autobuild.buildroot.net/results/e59/e59e6592fc697cceda359e421387dd905ff04701// http://autobuild.buildroot.net/results/521/52157aa2b5d75b5338f3bde7ae5beb3d300283d3// We still keep GDB as it is of arc-2016.03 release because there're some issues we'd like to resolve before releasing it to wider audience. So again note this is next engineering builds of arc-2016.09 series and it might have all kinds of breakages, please don't use it for production builds. Signed-off-by: Vlad Zakharov Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 2 +- .../0300-ld-makefile.patch | 0 .../0301-check-ldrunpath-length.patch | 0 .../0500-add-sysroot-fix-from-bug-3049.patch | 0 .../0600-poison-system-directories.patch | 0 package/binutils/binutils.hash | 2 +- package/binutils/binutils.mk | 2 +- package/gcc/Config.in.host | 2 +- .../301-missing-execinfo_h.patch | 0 .../860-cilk-wchar.patch | 0 .../940-uclinux-enable-threads.patch | 0 package/gcc/gcc.hash | 2 +- 12 files changed, 5 insertions(+), 5 deletions(-) rename package/binutils/{arc-2016.09-eng011 => arc-2016.09-eng013}/0300-ld-makefile.patch (100%) rename package/binutils/{arc-2016.09-eng011 => arc-2016.09-eng013}/0301-check-ldrunpath-length.patch (100%) rename package/binutils/{arc-2016.09-eng011 => arc-2016.09-eng013}/0500-add-sysroot-fix-from-bug-3049.patch (100%) rename package/binutils/{arc-2016.09-eng011 => arc-2016.09-eng013}/0600-poison-system-directories.patch (100%) rename package/gcc/{arc-2016.09-eng011 => arc-2016.09-eng013}/301-missing-execinfo_h.patch (100%) rename package/gcc/{arc-2016.09-eng011 => arc-2016.09-eng013}/860-cilk-wchar.patch (100%) rename package/gcc/{arc-2016.09-eng011 => arc-2016.09-eng013}/940-uclinux-enable-threads.patch (100%) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 6e3f82473f..51ee2cc46a 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -32,7 +32,7 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2016.09-eng011" if BR2_arc + default "arc-2016.09-eng013" if BR2_arc default "2.24" if BR2_BINUTILS_VERSION_2_24_X default "2.25.1" if BR2_BINUTILS_VERSION_2_25_X default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X diff --git a/package/binutils/arc-2016.09-eng011/0300-ld-makefile.patch b/package/binutils/arc-2016.09-eng013/0300-ld-makefile.patch similarity index 100% rename from package/binutils/arc-2016.09-eng011/0300-ld-makefile.patch rename to package/binutils/arc-2016.09-eng013/0300-ld-makefile.patch diff --git a/package/binutils/arc-2016.09-eng011/0301-check-ldrunpath-length.patch b/package/binutils/arc-2016.09-eng013/0301-check-ldrunpath-length.patch similarity index 100% rename from package/binutils/arc-2016.09-eng011/0301-check-ldrunpath-length.patch rename to package/binutils/arc-2016.09-eng013/0301-check-ldrunpath-length.patch diff --git a/package/binutils/arc-2016.09-eng011/0500-add-sysroot-fix-from-bug-3049.patch b/package/binutils/arc-2016.09-eng013/0500-add-sysroot-fix-from-bug-3049.patch similarity index 100% rename from package/binutils/arc-2016.09-eng011/0500-add-sysroot-fix-from-bug-3049.patch rename to package/binutils/arc-2016.09-eng013/0500-add-sysroot-fix-from-bug-3049.patch diff --git a/package/binutils/arc-2016.09-eng011/0600-poison-system-directories.patch b/package/binutils/arc-2016.09-eng013/0600-poison-system-directories.patch similarity index 100% rename from package/binutils/arc-2016.09-eng011/0600-poison-system-directories.patch rename to package/binutils/arc-2016.09-eng013/0600-poison-system-directories.patch diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 645bad1d7b..42e7452852 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -5,4 +5,4 @@ sha512 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322 sha512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb binutils-2.27.tar.bz2 # Locally calculated (fetched from Github) -sha512 829e14152dbd18bad36d7e161bdde52e92e8b439ab9fbc18655172f0e2fae954885286e77ceaab9e13b68f3ca19506068c3b1808a2e88f12ad6674d421519b64 binutils-arc-2016.09-eng011.tar.gz +sha512 acd7a5086ec386a3a5038df10daf0cbba42024bb8679e2f4b65389e7a4316709fd04d7b9729874f1bb28199a8eb22e36820558bc0f23ff6d20d7fc98e0f549fb binutils-arc-2016.09-eng013.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index ad3a0d8623..1f9a356e86 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,7 +9,7 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2016.09-eng011 +BINUTILS_VERSION = arc-2016.09-eng013 else BINUTILS_VERSION = 2.25.1 endif diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index d470710542..134b16ce17 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -121,7 +121,7 @@ config BR2_GCC_VERSION default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.4.0" if BR2_GCC_VERSION_5_X default "6.2.0" if BR2_GCC_VERSION_6_X - default "arc-2016.09-eng011" if BR2_GCC_VERSION_4_8_ARC + default "arc-2016.09-eng013" if BR2_GCC_VERSION_4_8_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS string "Additional gcc options" diff --git a/package/gcc/arc-2016.09-eng011/301-missing-execinfo_h.patch b/package/gcc/arc-2016.09-eng013/301-missing-execinfo_h.patch similarity index 100% rename from package/gcc/arc-2016.09-eng011/301-missing-execinfo_h.patch rename to package/gcc/arc-2016.09-eng013/301-missing-execinfo_h.patch diff --git a/package/gcc/arc-2016.09-eng011/860-cilk-wchar.patch b/package/gcc/arc-2016.09-eng013/860-cilk-wchar.patch similarity index 100% rename from package/gcc/arc-2016.09-eng011/860-cilk-wchar.patch rename to package/gcc/arc-2016.09-eng013/860-cilk-wchar.patch diff --git a/package/gcc/arc-2016.09-eng011/940-uclinux-enable-threads.patch b/package/gcc/arc-2016.09-eng013/940-uclinux-enable-threads.patch similarity index 100% rename from package/gcc/arc-2016.09-eng011/940-uclinux-enable-threads.patch rename to package/gcc/arc-2016.09-eng013/940-uclinux-enable-threads.patch diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index e55adf0b7c..48565629a8 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -12,4 +12,4 @@ sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d sha512 1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a83ce1cd4cdd2d1cb0b3e3c34e9b7ae1b2ab83dfc649ee817ab05247c76198 gcc-6.2.0.tar.bz2 # Locally calculated (fetched from Github) -sha512 5fa11058adc0fc3d33bb860151660101bc20c7147cd92bc235057cd722e7fdb923ac0bdf27b09499b8587abb0c420867229bd782bc10bee0c76116c099b5a76c gcc-arc-2016.09-eng011.tar.gz +sha512 9b916c2e3c595c0f085d45c09fdf1612c9dfc2a42006699c9af1c73b542ab73bfeb15ff0fbe0a87214156b3f6a146883f1e02e387b2c31701c34de221aa97327 gcc-arc-2016.09-eng013.tar.gz From c6f63fca0e62860b1240e039a79ce02fd0f0f9db Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 17 Sep 2016 18:41:19 +0200 Subject: [PATCH 0309/3392] olimex_a20_olinuxino_lime: bump u-boot to 2016.09 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- 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 b3a85036d4..97c1cede09 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -34,7 +34,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="2016.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y From 01e807f0d8dd411643e4f0939a5b8623bfbe9518 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 30 Aug 2016 11:29:37 +0200 Subject: [PATCH 0310/3392] package/systemd: fix build with old toolchains Toolchains using glibc-2.18 or older do not define O_TMPFILE, which causes build failures on some archs. systemd has a definition for O_TMPFILE if it is missing, but only defines it for i386 or x86_64. Furthermore, the header defining it is not included everywhere O_TMPFILE is used. Fix that with three patches backported from upstream: - include the needed header where it is needed (he!), - define O_TMPFILE for all archs, according to linux-4.8rc3, - no longer guard against undefined O_TMPFILE in fileio. Upstream merge commit: https://github.com/systemd/systemd/commit/4a13100c6a5a0a4b793e90bd43d21c3696c42d46 Fixes: http://autobuild.buildroot.net/results/b0067e72ffcbbe1db9ef49ab297cece951345aeb/ Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...rt-raw-needs-missing.h-for-O_TMPFILE.patch | 31 +++++++++ ...-missing-definitions-for-__O_TMPFILE.patch | 63 ++++++++++++++++++ ...-fileio-we-always-have-O_TMPFILE-now.patch | 65 +++++++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch create mode 100644 package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch create mode 100644 package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch diff --git a/package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch b/package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch new file mode 100644 index 0000000000..bded6bc5d4 --- /dev/null +++ b/package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch @@ -0,0 +1,31 @@ +From 4a6d35237f96d07f3a783c874933f87bf14f93e0 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 28 Aug 2016 16:26:04 +0200 +Subject: [PATCH] importd/export-raw: needs missing.h for O_TMPFILE + +O_TMPFILE may be missing from the system headers, so use our fallback +definition. + +Signed-off-by: "Yann E. MORIN" +--- +Backported from upstream: + https://github.com/systemd/systemd/commit/4a6d35237f96d07f3a783c874933f87bf14f93e0 +--- + src/import/export-raw.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/import/export-raw.c b/src/import/export-raw.c +index db06e11..6136b67 100644 +--- a/src/import/export-raw.c ++++ b/src/import/export-raw.c +@@ -34,6 +34,7 @@ + #include "fd-util.h" + #include "fileio.h" + #include "import-common.h" ++#include "missing.h" + #include "ratelimit.h" + #include "string-util.h" + #include "util.h" +-- +2.7.4 + diff --git a/package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch b/package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch new file mode 100644 index 0000000000..1c5ca05c97 --- /dev/null +++ b/package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch @@ -0,0 +1,63 @@ +From daad709a7c13c0fac73e407528f96cc876c09629 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 28 Aug 2016 17:26:42 +0200 +Subject: [PATCH] missing.h: add missing definitions for __O_TMPFILE + +Currently, a missing __O_TMPFILE was only defined for i386 and x86_64, +leaving any other architectures with an "old" toolchain fail miserably +at build time: + src/import/export-raw.c: In function 'reflink_snapshot': + src/import/export-raw.c:271:26: error: 'O_TMPFILE' undeclared (first use in this function) + new_fd = open(d, O_TMPFILE|O_CLOEXEC|O_NOCTTY|O_RDWR, 0600); + ^ + +__O_TMPFILE (and O_TMPFILE) are available since glibc 2.19. However, a +lot of existing toolchains are still using glibc-2.18, and some even +before that, and it is not really possible to update those toolchains. + +Instead of defining it only for i386 and x86_64, define __O_TMPFILE +with the specific values for those archs where it is different from the +generic value. Use the values as found in the Linux kernel (v4.8-rc3, +current as of time of commit). + +Signed-off-by: "Yann E. MORIN" +--- +Backported from upstream: + https://github.com/systemd/systemd/commit/daad709a7c13c0fac73e407528f96cc876c09629 +--- + src/basic/missing.h | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +diff --git a/src/basic/missing.h b/src/basic/missing.h +index f8e0966..13ff51c 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -537,12 +537,21 @@ struct btrfs_ioctl_quota_ctl_args { + # define DRM_IOCTL_DROP_MASTER _IO('d', 0x1f) + #endif + +-#if defined(__i386__) || defined(__x86_64__) +- +-/* The precise definition of __O_TMPFILE is arch specific, so let's +- * just define this on x86 where we know the value. */ ++/* The precise definition of __O_TMPFILE is arch specific; use the ++ * values defined by the kernel (note: some are hexa, some are octal, ++ * duplicated as-is from the kernel definitions): ++ * - alpha, parisc, sparc: each has a specific value; ++ * - others: they use the "generic" value. ++ */ + + #ifndef __O_TMPFILE ++#if defined(__alpha__) ++#define __O_TMPFILE 0100000000 ++#elif defined(__parisc__) || defined(__hppa__) ++#define __O_TMPFILE 0400000000 ++#elif defined(__sparc__) || defined(__sparc64__) ++#define __O_TMPFILE 0x2000000 ++#else + #define __O_TMPFILE 020000000 + #endif + +-- +2.7.4 + diff --git a/package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch b/package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch new file mode 100644 index 0000000000..e0e7209e60 --- /dev/null +++ b/package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch @@ -0,0 +1,65 @@ +From 1d9ed171788821c21ca900a921833a8e41bf22f3 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Mon, 29 Aug 2016 12:34:50 +0200 +Subject: [PATCH] basic/fileio: we always have O_TMPFILE now + +fileio makes use of O_TMPFILE when it is available. + +We now always have O_TMPFILE, defined in missing.h if missing +from the toolchain headers. + +Have fileio include missing.h and drop the guards around the +use of O_TMPFILE. + +Signed-off-by: "Yann E. MORIN" +--- +Backported from upstream: + https://github.com/systemd/systemd/commit/1d9ed171788821c21ca900a921833a8e41bf22f3 +--- + src/basic/fileio.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/basic/fileio.c b/src/basic/fileio.c +index d642f3d..a5920e7 100644 +--- a/src/basic/fileio.c ++++ b/src/basic/fileio.c +@@ -37,6 +37,7 @@ + #include "hexdecoct.h" + #include "log.h" + #include "macro.h" ++#include "missing.h" + #include "parse-util.h" + #include "path-util.h" + #include "random-util.h" +@@ -1280,12 +1281,10 @@ int open_tmpfile_unlinkable(const char *directory, int flags) { + + /* Returns an unlinked temporary file that cannot be linked into the file system anymore */ + +-#ifdef O_TMPFILE + /* Try O_TMPFILE first, if it is supported */ + fd = open(directory, flags|O_TMPFILE|O_EXCL, S_IRUSR|S_IWUSR); + if (fd >= 0) + return fd; +-#endif + + /* Fall back to unguessable name + unlinking */ + p = strjoina(directory, "/systemd-tmp-XXXXXX"); +@@ -1313,7 +1312,6 @@ int open_tmpfile_linkable(const char *target, int flags, char **ret_path) { + * which case "ret_path" will be returned as NULL. If not possible a the tempoary path name used is returned in + * "ret_path". Use link_tmpfile() below to rename the result after writing the file in full. */ + +-#ifdef O_TMPFILE + { + _cleanup_free_ char *dn = NULL; + +@@ -1329,7 +1327,6 @@ int open_tmpfile_linkable(const char *target, int flags, char **ret_path) { + + log_debug_errno(errno, "Failed to use O_TMPFILE on %s: %m", dn); + } +-#endif + + r = tempfn_random(target, NULL, &tmp); + if (r < 0) +-- +2.7.4 + From 105a8c156c4818f121169996f5fbe6ebd46e0068 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 29 Aug 2016 17:53:58 +0200 Subject: [PATCH 0311/3392] toolchain/wrapper: display options leading to a paranoid failure Current, we only display the path that causes the paranoid failure. This is sufficient, as we can fail only for -I and -L options, and it is thus easy to infer from the path, which option is the culprit. However, we're soon to add a new test for the -isystem option, and then when a failure occurs, we would not know whether it was because of -I or -isystem. Being able to differentiate both can be hugely useful to track down the root cause for the unsafe path. Add two new arguments to the check_unsafe_path() function: one with the current-or-previous argument, one to specify whether it has the path in it or not. Print that in the error message, instead of just the path. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-wrapper.c | 37 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 887058f699..6259dacd07 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -80,7 +80,21 @@ static char *predef_args[] = { #endif }; -static void check_unsafe_path(const char *path, int paranoid) +/* Check if path is unsafe for cross-compilation. Unsafe paths are those + * pointing to the standard native include or library paths. + * + * We print the arguments leading to the failure. For some options, gcc + * accepts the path to be concatenated to the argument (e.g. -I/foo/bar) + * or separated (e.g. -I /foo/bar). In the first case, we need only print + * the argument as it already contains the path (arg_has_path), while in + * the second case we need to print both (!arg_has_path). + * + * If paranoid, exit in error instead of just printing a warning. + */ +static void check_unsafe_path(const char *arg, + const char *path, + int paranoid, + int arg_has_path) { char **c; static char *unsafe_paths[] = { @@ -88,14 +102,17 @@ static void check_unsafe_path(const char *path, int paranoid) }; for (c = unsafe_paths; *c != NULL; c++) { - if (!strncmp(path, *c, strlen(*c))) { - fprintf(stderr, "%s: %s: unsafe header/library path used in cross-compilation: '%s'\n", - program_invocation_short_name, - paranoid ? "ERROR" : "WARNING", path); - if (paranoid) - exit(1); + if (strncmp(path, *c, strlen(*c))) continue; - } + fprintf(stderr, + "%s: %s: unsafe header/library path used in cross-compilation: '%s%s%s'\n", + program_invocation_short_name, + paranoid ? "ERROR" : "WARNING", + arg, + arg_has_path ? "" : "' '", /* close single-quote, space, open single-quote */ + arg_has_path ? "" : path); /* so that arg and path are properly quoted. */ + if (paranoid) + exit(1); } } @@ -237,9 +254,9 @@ int main(int argc, char **argv) i++; if (i == argc) continue; - check_unsafe_path(argv[i], paranoid); + check_unsafe_path(argv[i-1], argv[i], paranoid, 0); } else { - check_unsafe_path(argv[i] + 2, paranoid); + check_unsafe_path(argv[i], argv[i] + 2, paranoid, 1); } } From 61cb120ee5795dd4fc9c5a42400fb879c9329ad9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 29 Aug 2016 17:53:59 +0200 Subject: [PATCH 0312/3392] toolchain/wrapper: extend paranoid check to -isystem Some packages, like libbsd, use -isystem flags to provide so-called overrides to the system include files. In this particular case, this is used in a .pc file, then used by antoher package; pkgconf does not mangle this path; and eventually that other package ends up using /usr/include/bsd to search for headers. Our current toolchain wrapper is limited to looking for -I and -L, so the paranoid check does not kick in. Furthermore, as noticed by Arnout, there might be a bunch of other so-unsafe options: -isysroot, -imultilib, -iquote, -idirafter, -iprefix, -iwithprefix, -iwithprefixbefore; even -B and --sysroot are unsafe. Extend the paranoid check to be able to check any arbitrary number of potentially unsafe options: - add a list of options to check for, each with their length, - iterate over this list until we find a matching unsafe option. Compared to previously, the list of options include -I and -L (which we already had) extended with -idirafter, -iquote and -isystem, but leaving all the others noticed by Arnout away, until we have a reason for handling them. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-wrapper.c | 53 ++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 6259dacd07..925d01394c 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -80,6 +80,26 @@ static char *predef_args[] = { #endif }; +struct unsafe_opt_s { + const char *arg; + size_t len; +}; + +/* Unsafe options are options that specify a potentialy unsafe path, + * that will be checked by check_unsafe_path(), below. + * + * sizeof() on a string literal includes the terminating \0. + */ +#define UNSAFE_OPT(o) { #o, sizeof(#o)-1 } +static const struct unsafe_opt_s unsafe_opts[] = { + UNSAFE_OPT(-I), + UNSAFE_OPT(-idirafter), + UNSAFE_OPT(-iquote), + UNSAFE_OPT(-isystem), + UNSAFE_OPT(-L), + { NULL, 0 }, +}; + /* Check if path is unsafe for cross-compilation. Unsafe paths are those * pointing to the standard native include or library paths. * @@ -239,24 +259,23 @@ int main(int argc, char **argv) /* Check for unsafe library and header paths */ for (i = 1; i < argc; i++) { - - /* Skip options that do not start with -I and -L */ - if (strncmp(argv[i], "-I", 2) && strncmp(argv[i], "-L", 2)) - continue; - - /* We handle two cases: first the case where -I/-L and - * the path are separated by one space and therefore - * visible as two separate options, and then the case - * where they are stuck together forming one single - * option. - */ - if (argv[i][2] == '\0') { - i++; - if (i == argc) + const struct unsafe_opt_s *opt; + for (opt=unsafe_opts; opt->arg; opt++ ) { + /* Skip any non-unsafe option. */ + if (strncmp(argv[i], opt->arg, opt->len)) continue; - check_unsafe_path(argv[i-1], argv[i], paranoid, 0); - } else { - check_unsafe_path(argv[i], argv[i] + 2, paranoid, 1); + + /* Handle both cases: + * - path is a separate argument, + * - path is concatenated with option. + */ + if (argv[i][opt->len] == '\0') { + i++; + if (i == argc) + break; + check_unsafe_path(argv[i-1], argv[i], paranoid, 0); + } else + check_unsafe_path(argv[i], argv[i] + opt->len, paranoid, 1); } } From 37bfd19e65db3742b64783cc57d7394960956735 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Sat, 17 Sep 2016 22:31:21 -0400 Subject: [PATCH 0313/3392] python-daemon: bump to version 2.1.1 Bump to the latest version, to get python3 support. Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- package/python-daemon/Config.in | 1 - package/python-daemon/python-daemon.hash | 5 +++-- package/python-daemon/python-daemon.mk | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-daemon/Config.in b/package/python-daemon/Config.in index b3cc8a2d3e..8b6dcc05ed 100644 --- a/package/python-daemon/Config.in +++ b/package/python-daemon/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_DAEMON bool "python-daemon" - depends on BR2_PACKAGE_PYTHON help Library to implement a well-behaved Unix daemon process. diff --git a/package/python-daemon/python-daemon.hash b/package/python-daemon/python-daemon.hash index 5b3a4d2b51..12977b5795 100644 --- a/package/python-daemon/python-daemon.hash +++ b/package/python-daemon/python-daemon.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 1406962e48ce03642c6057f40f9ffd49493792a7b34357fe9e264708748c83c0 python-daemon-1.5.5.tar.gz +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=72e2acf2c3d69c7fa75a6625d06adfd0, sha256 locally computed +md5 72e2acf2c3d69c7fa75a6625d06adfd0 python-daemon-2.1.1.tar.gz +sha256 58a8c187ee37c3a28913bef00f83240c9ecd4a59dce09a24d92f5c941606689f python-daemon-2.1.1.tar.gz diff --git a/package/python-daemon/python-daemon.mk b/package/python-daemon/python-daemon.mk index b8b80baa7d..e85be9a97a 100644 --- a/package/python-daemon/python-daemon.mk +++ b/package/python-daemon/python-daemon.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DAEMON_VERSION = 1.5.5 +PYTHON_DAEMON_VERSION = 2.1.1 PYTHON_DAEMON_SITE = https://pypi.python.org/packages/source/p/python-daemon -PYTHON_DAEMON_LICENSE = Python-2.0 (library), GPLv2+ (test) -PYTHON_DAEMON_LICENSE_FILES = LICENSE.PSF-2 LICENSE.GPL-2 +PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPLv3+ (test, build) +PYTHON_DAEMON_LICENSE_FILES = LICENSE.ASF-2 LICENSE.GPL-3 PYTHON_DAEMON_SETUP_TYPE = setuptools $(eval $(python-package)) From a39e210244e4c7bf4ac8a511e10227490b6a65f3 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 17 Sep 2016 23:55:09 +0200 Subject: [PATCH 0314/3392] package/efl: bump to 1.18.1 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 81727a2d9c..37354fbf09 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,2 +1,2 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.0.tar.xz.sha256 -sha256 06a0bbf5c28f96731b115b0adfa11374d07beb983ae4612ed25b34f4ab5cbf9e efl-1.18.0.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.1.tar.xz.sha256 +sha256 0c6bd150d8e838f849effd462d91d86255e3aaade47a6077d0aa80d2b8e9d222 efl-1.18.1.tar.xz diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 80387393fe..949da2dd4d 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.18.0 +EFL_VERSION = 1.18.1 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+ From 55a86aa6367e66ce1d8f210ea42b544cf9269c53 Mon Sep 17 00:00:00 2001 From: Stefan Nickl Date: Sun, 18 Sep 2016 10:00:41 +0200 Subject: [PATCH 0315/3392] linux-firmware: add option for Marvell usb8801 firmware Signed-off-by: Stefan Nickl Signed-off-by: Thomas Petazzoni --- package/linux-firmware/Config.in | 5 +++++ package/linux-firmware/linux-firmware.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 79af71eeb1..23738cef78 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -171,6 +171,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797 help Firmware files for the Marvell Wifi-Ex 8797 module on USB. +config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801 + bool "Marvell Wifi-Ex 8801 USB" + help + Firmware files for the Marvell Wifi-Ex 8801 module on USB. + config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887 bool "Marvell Wifi-Ex 8887 SDIO" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index d5a035eb65..8d8b7b2da1 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -147,6 +147,12 @@ LINUX_FIRMWARE_FILES += mrvl/usb8797_uapsta.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell endif +# usb8801 +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801),y) +LINUX_FIRMWARE_FILES += mrvl/usb8801_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 From 57cc20810a8ff6d40566a3527a0634cab44ad2b1 Mon Sep 17 00:00:00 2001 From: Mathieu Audat Date: Sat, 17 Sep 2016 16:23:23 -0400 Subject: [PATCH 0316/3392] ts4900-fpga: add ts4900-fpga package This package is responsible from downloading and deploying bitstream for TS-4900's FPGA. It implements clocks, UART MUX, and GPIOs. One of these GPIOs is used to enable the wifi module. It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. Signed-off-by: Mathieu Audat [Thomas: - Use "config" instead of "menuconfig" since there's a single option and no sub-options. - Add BR2_arm dependency, since it's only used on a specific i.MX6 platform. - Implement TS4900_FPGA_EXTRACT_CMDS that copy the file to the package build directory $(@D) - Change the install command to copy from $(@D) instead of from $(DL_DIR) - Change the install command to remove the 'mkdir -p $(TARGET_DIR)/boot' and instead just use the -D option of the install program that creates the destination directory if it doesn't exist.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/ts4900-fpga/Config.in | 12 ++++++++++++ package/ts4900-fpga/ts4900-fpga.hash | 5 +++++ package/ts4900-fpga/ts4900-fpga.mk | 24 ++++++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 package/ts4900-fpga/Config.in create mode 100644 package/ts4900-fpga/ts4900-fpga.hash create mode 100644 package/ts4900-fpga/ts4900-fpga.mk diff --git a/package/Config.in b/package/Config.in index d571b899cc..e30ce22e5b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -333,6 +333,7 @@ menu "Firmware" source "package/linux-firmware/Config.in" source "package/rpi-firmware/Config.in" source "package/sunxi-boards/Config.in" + source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" source "package/wilc1000-firmware/Config.in" source "package/zd1211-firmware/Config.in" diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in new file mode 100644 index 0000000000..7910631bc0 --- /dev/null +++ b/package/ts4900-fpga/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TS4900_FPGA + bool "ts4900-fpga" + depends on BR2_arm + help + TS-4900's FPGA implements clocks, UART MUX, and GPIOs. One of these + GPIOs is used to enable the wifi module. + + It is loaded by U-Boot during the boot sequence, the default U-boot + script expects to find it in the /boot folder. + + http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash new file mode 100644 index 0000000000..2147aeb3c2 --- /dev/null +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -0,0 +1,5 @@ +# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 +md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin + +# Locally calculated +sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk new file mode 100644 index 0000000000..e0d351fad9 --- /dev/null +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# ts4900-fpga +# +################################################################################ + +TS4900_FPGA_VERSION = 20150930 +TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin +TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +# No license file provided, Yocto recipe from the vendor claims MIT. +# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 + +TS4900_FPGA_INSTALL_IMAGES = NO +TS4900_FPGA_INSTALL_TARGET = YES + +define TS4900_FPGA_EXTRACT_CMDS + cp $(DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) +endef + +define TS4900_FPGA_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(@D)/$(TS4900_FPGA_SOURCE) $(TARGET_DIR)/boot/ts4900-fpga.bin +endef + +$(eval $(generic-package)) From 3138ab3fee7b0251e3cb3fba9a373bd3cf9d6424 Mon Sep 17 00:00:00 2001 From: Mathieu Audat Date: Sat, 17 Sep 2016 16:23:24 -0400 Subject: [PATCH 0317/3392] configs: add defconfig for TS-4900 The TS-4900 uses a custom Linux 4.X from Technologic Systems: https://github.com/embeddedarm/linux-3.10.17-imx6/tree/imx_4.1.15_1.0.0_ga Indeed, it is not supported by mainline Linux but this work is ongoing. This patch is inspired by a previous work for the TS-4800. A post image script is provided to generate an image that can be directly written to an SD card. It also adds an fpga wifi module. Signed-off-by: Mathieu Audat Signed-off-by: Thomas Petazzoni --- board/technologic/ts4900/genimage.cfg | 10 +++++ board/technologic/ts4900/post-image.sh | 17 +++++++++ board/technologic/ts4900/readme.txt | 52 ++++++++++++++++++++++++++ configs/ts4900_defconfig | 17 +++++++++ 4 files changed, 96 insertions(+) create mode 100644 board/technologic/ts4900/genimage.cfg create mode 100755 board/technologic/ts4900/post-image.sh create mode 100644 board/technologic/ts4900/readme.txt create mode 100644 configs/ts4900_defconfig diff --git a/board/technologic/ts4900/genimage.cfg b/board/technologic/ts4900/genimage.cfg new file mode 100644 index 0000000000..7e580eb27b --- /dev/null +++ b/board/technologic/ts4900/genimage.cfg @@ -0,0 +1,10 @@ +image sdcard.img { + hdimage { + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + size = 256M + } +} diff --git a/board/technologic/ts4900/post-image.sh b/board/technologic/ts4900/post-image.sh new file mode 100755 index 0000000000..1e90cded72 --- /dev/null +++ b/board/technologic/ts4900/post-image.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# +# Copyright (C) 2015-2016 Savoir-Faire Linux +# Post image generation script. + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG=$BOARD_DIR/genimage.cfg +GENIMAGE_TMP=$BUILD_DIR/.genimage_tmp + +rm -rf $GENIMAGE_TMP + +${HOST_DIR}/usr/bin/genimage \ + --config ${GENIMAGE_CFG} \ + --rootpath $TARGET_DIR \ + --tmppath $GENIMAGE_TMP \ + --inputpath $BINARIES_DIR \ + --outputpath $BINARIES_DIR diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt new file mode 100644 index 0000000000..679454fdeb --- /dev/null +++ b/board/technologic/ts4900/readme.txt @@ -0,0 +1,52 @@ +Technologic Systems TS-4900 +=========================== + +This document explains how to set up a basic Buildroot system for the +Technologic Systems TS-4900 System on Module. + +The TS-4900 is a TS-SOCKET macrocontroller board based on the +Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at +1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express +Bus, high speed USB host and device (OTG), and microSD card. +More details on the board here: + http://wiki.embeddedarm.com/wiki/TS-4900 + +The TS-4900 is not currently supported by mainline Linux, so a +Technologic Systems Linux is used based on Linux 4.1. +The default U-boot configuration flashed scans the SD card to find the +0x83 partition type, corresponding to the rootfs. Then it will load +both uImage and dts from the /boot directory. +To build the default configuration you only have to: + + $ make ts4900_defconfig + $ make + +The output looks like: +output/images/ +├── imx6q-ts4900.dtb +├── rootfs.ext2 +├── rootfs.tar +├── sdcard.img +└── uImage + +Since both the uImage and the dts are contained in the /boot +directory, the provided post-image script generates an image file +containing only one partition for the rootfs: + + $ fdisk output/images/sdcard.img + Device Boot Start End Blocks Id System +output/images/sdcard.img1 1 524288 262144 83 Linux + +This image can be directly written to an SD card. + + $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0 + +In order to test the image on TS-4900 board, a TS baseboard, such as +the TS-9xxx series, is needed to provide power, console header, RJ45 +connector etc. + +The bootloader comes pre-flashed on the board on an SPI flash. Since +updating the bootloader is risky and not trivial, it is not included +in the Buildroot defconfig. Refer to +http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +U-Boot config to use and how to flash it. diff --git a/configs/ts4900_defconfig b/configs/ts4900_defconfig new file mode 100644 index 0000000000..7d5d02be0c --- /dev/null +++ b/configs/ts4900_defconfig @@ -0,0 +1,17 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/technologic/ts4900/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/embeddedarm/linux-3.10.17-imx6.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="70d1e85a22879e27cc9e36384438d5a9793e44b0" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-ts4900" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_TS4900_FPGA=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_PACKAGE_HOST_GENIMAGE=y From d0d9ba275a89cf3c71eda822d5ebf30c348ec6c7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 31 Aug 2016 22:38:28 +0200 Subject: [PATCH 0318/3392] python: do not use hg or svn when available During the execution of its configure script, Python tries to find an available "hg" and "svn" installation, and if available, will try to use them to get information from the version control system. To do this, it tries to communicate over the network, potentially over ports that are blocked, causing the build to halt. This was reported by a user as part of bug #7802. To solve this, we simply make the Python script use /bin/false as the "hg" and "svn" programs. Fixes bug #7802 for the python package. Signed-off-by: Thomas Petazzoni --- package/python/python.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/python/python.mk b/package/python/python.mk index 9026703520..cc65376837 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -39,8 +39,12 @@ HOST_PYTHON_CONF_OPTS += \ # Make sure that LD_LIBRARY_PATH overrides -rpath. # This is needed because libpython may be installed at the same time that # python is called. +# Make python believe we don't have 'hg' and 'svn', so that it doesn't +# try to communicate over the network during the build. HOST_PYTHON_CONF_ENV += \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" + LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ + ac_cv_prog_HAS_HG=/bin/false \ + ac_cv_prog_SVNVERSION=/bin/false # Building host python in parallel sometimes triggers a "Bus error" # during the execution of "./python setup.py build" in the @@ -126,11 +130,15 @@ else PYTHON_CONF_OPTS += --disable-ossaudiodev endif +# Make python believe we don't have 'hg' and 'svn', so that it doesn't +# try to communicate over the network during the build. PYTHON_CONF_ENV += \ ac_cv_have_long_long_format=yes \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=yes \ - ac_cv_working_tzset=yes + ac_cv_working_tzset=yes \ + ac_cv_prog_HAS_HG=/bin/false \ + ac_cv_prog_SVNVERSION=/bin/false PYTHON_CONF_OPTS += \ --without-cxx-main \ From 4f76d86d998e7a13e7bfa32238bcd217fbc96a42 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 31 Aug 2016 22:38:29 +0200 Subject: [PATCH 0319/3392] python3: do not use hg when available During the execution of its configure script, Python 3 tries to find an available "hg" installation, and if available, will try to use it to get information from the version control system. To do this, it tries to communicate over the network, potentially over ports that are blocked, causing the build to halt. This was reported by a user as part of bug 7802. To solve this, we simply make the Python script use /bin/false as the "hg" program. Fixes bug #7802 for the python3 package. Signed-off-by: Thomas Petazzoni --- package/python3/python3.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 34e1297563..393b9fb2ac 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -41,8 +41,11 @@ HOST_PYTHON3_CONF_OPTS += \ # Make sure that LD_LIBRARY_PATH overrides -rpath. # This is needed because libpython may be installed at the same time that # python is called. +# Make python believe we don't have 'hg', so that it doesn't try to +# communicate over the network during the build. HOST_PYTHON3_CONF_ENV += \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" + LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ + ac_cv_prog_HAS_HG=/bin/false PYTHON3_DEPENDENCIES = host-python3 libffi @@ -110,11 +113,14 @@ else PYTHON3_CONF_OPTS += --disable-ossaudiodev endif +# Make python believe we don't have 'hg', so that it doesn't try to +# communicate over the network during the build. PYTHON3_CONF_ENV += \ ac_cv_have_long_long_format=yes \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=yes \ - ac_cv_working_tzset=yes + ac_cv_working_tzset=yes \ + ac_cv_prog_HAS_HG=/bin/false # uClibc is known to have a broken wcsftime() implementation, so tell # Python 3 to fall back to strftime() instead. From a2f8d497274badaca510a8160aa0da06be1f94c1 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 Aug 2016 00:33:55 +0200 Subject: [PATCH 0320/3392] package/cryptsetup: move depends on above select Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/cryptsetup/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in index 80671ee8ca..cd95956856 100644 --- a/package/cryptsetup/Config.in +++ b/package/cryptsetup/Config.in @@ -1,14 +1,14 @@ config BR2_PACKAGE_CRYPTSETUP bool "cryptsetup" + depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 + depends on BR2_USE_MMU # lvm2 + depends on !BR2_STATIC_LIBS # lvm2 + depends on BR2_USE_WCHAR # util-linux select BR2_PACKAGE_POPT select BR2_PACKAGE_LVM2 select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 - depends on BR2_USE_MMU # lvm2 - depends on !BR2_STATIC_LIBS # lvm2 - depends on BR2_USE_WCHAR # util-linux help This tool helps manipulate dm-crypt and luks partitions for on-disk encryption. From 1e03cc2290f98fc7434254d2abd9afd504de8360 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 2 May 2016 22:25:44 +0200 Subject: [PATCH 0321/3392] raspberrypi3: fix serial console (load pi3-miniuart-bt overlay) - enable BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS in raspberrypi3_defconfig - add copy of rpi-firmware/overlays directory to boot partition in genimage-raspberrypi3.cfg - enhance post-image.sh script to add 'dtoverlay=pi3-miniuart-bt' on request - add BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" in raspberrypi3_defconfig Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- board/raspberrypi/genimage-raspberrypi3.cfg | 1 + board/raspberrypi/post-image.sh | 13 +++++++++++++ board/raspberrypi/readme.txt | 8 +++++++- configs/raspberrypi3_defconfig | 3 ++- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/board/raspberrypi/genimage-raspberrypi3.cfg b/board/raspberrypi/genimage-raspberrypi3.cfg index 7ba89c5548..baab0c4cc1 100644 --- a/board/raspberrypi/genimage-raspberrypi3.cfg +++ b/board/raspberrypi/genimage-raspberrypi3.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "kernel-marked/zImage" } } diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index 73ffd658e7..c00975288c 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -5,6 +5,19 @@ BOARD_NAME="$(basename ${BOARD_DIR})" GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" +case "${2}" in + --add-pi3-miniuart-bt-overlay) + if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then + echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)." + cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt" + +# fixes rpi3 ttyAMA0 serial console +dtoverlay=pi3-miniuart-bt +__EOF__ + fi + ;; +esac + # Mark the kernel as DT-enabled mkdir -p "${BINARIES_DIR}/kernel-marked" ${HOST_DIR}/usr/bin/mkknlimg "${BINARIES_DIR}/zImage" \ diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index a170f8f91c..03178ff95f 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -60,7 +60,8 @@ After building, you should obtain this tree: | +-- cmdline.txt | +-- config.txt | +-- fixup.dat - | `-- start.elf + | +-- start.elf + | `-- overlays/ [3] +-- sdcard.img `-- zImage @@ -69,6 +70,11 @@ After building, you should obtain this tree: [2] This is the mkknlimg DT-marked kernel. +[3] Only for the Raspberry Pi 3 Model (overlay pi3-miniuart-bt is needed + to enable the RPi3 serial console otherwise occupied by the bluetooth + chip). Alternative would be to disable the serial console in cmdline.txt + and /etc/inittab. + How to write the SD card ======================== diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 4eb5333fa9..8600cd8c36 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b" BR2_PACKAGE_RPI_FIRMWARE=y -# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set +BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y # Required tools to create the SD image BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -34,3 +34,4 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" From cd741df4bb8d0497c57f77c691ce6faa4c9a3934 Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Wed, 14 Sep 2016 00:03:50 +0200 Subject: [PATCH 0322/3392] package/mysql: add MYSQL_SOCKET variable Add MYSQL_SOCKET variable with MySQL socket location Signed-off-by: Floris Bos Signed-off-by: Thomas Petazzoni --- package/mysql/S97mysqld | 2 +- package/mysql/mysql.mk | 4 ++++ package/mysql/mysqld.service | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/mysql/S97mysqld b/package/mysql/S97mysqld index 1d87e68d96..5a660e9424 100644 --- a/package/mysql/S97mysqld +++ b/package/mysql/S97mysqld @@ -9,7 +9,7 @@ case "$1" in # mysqld runs as user mysql, but /run is only writable by root # so create a subdirectory for mysql. - install -d -o mysql -g root -m 0700 /run/mysql + install -d -o mysql -g root -m 0755 /run/mysql # We don't use start-stop-daemon because mysqld has # its own wrapper script. diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk index 534bd97d25..7af47113e1 100644 --- a/package/mysql/mysql.mk +++ b/package/mysql/mysql.mk @@ -14,6 +14,9 @@ MYSQL_AUTORECONF = YES MYSQL_LICENSE = GPLv2 MYSQL_LICENSE_FILES = README COPYING +# Unix socket. This variable can also be consulted by other buildroot packages +MYSQL_SOCKET = /run/mysql/mysql.sock + MYSQL_CONF_ENV = \ ac_cv_sys_restartable_syscalls=yes \ ac_cv_path_PS=/bin/ps \ @@ -31,6 +34,7 @@ MYSQL_CONF_OPTS = \ --without-readline \ --with-low-memory \ --enable-thread-safe-client \ + --with-unix-socket-path=$(MYSQL_SOCKET) \ --disable-mysql-maintainer-mode # host-mysql only installs what is needed to build mysql, i.e. the diff --git a/package/mysql/mysqld.service b/package/mysql/mysqld.service index 2ded9c2728..c9e5e42f71 100644 --- a/package/mysql/mysqld.service +++ b/package/mysql/mysqld.service @@ -5,6 +5,9 @@ Description=MySQL database server ExecStartPre=/bin/sh -c 'test -d /var/mysql/mysql || mysql_install_db --user=mysql --ldata=/var/mysql' ExecStart=/usr/bin/mysqld_safe Restart=always +User=mysql +RuntimeDirectory=mysql +RuntimeDirectoryMode=0755 [Install] WantedBy=multi-user.target From 411cb66acdca6bf74db52e652788f61c6d978c01 Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Wed, 14 Sep 2016 00:03:51 +0200 Subject: [PATCH 0323/3392] package/php: set MySQL socket path Set the PHP default MySQL socket path to match what the mysql package is using. Signed-off-by: Floris Bos Signed-off-by: Thomas Petazzoni --- package/php/php.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/php/php.mk b/package/php/php.mk index 083b451d64..b1b19ada7c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -211,6 +211,11 @@ PHP_DEPENDENCIES += unixodbc endif endif +ifneq ($(BR2_PACKAGE_PHP_EXT_MYSQLI)$(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),) +# Set default MySQL unix socket to what the MySQL server is using by default +PHP_CONF_OPTS += --with-mysql-sock=$(MYSQL_SOCKET) +endif + define PHP_DISABLE_PCRE_JIT $(SED) '/^#define SUPPORT_JIT/d' $(@D)/ext/pcre/pcrelib/config.h endef From ddcb1e4e92a426b935aa169466658d2041b9ebcf Mon Sep 17 00:00:00 2001 From: Cyril Bur Date: Thu, 18 Aug 2016 09:02:36 +1000 Subject: [PATCH 0324/3392] package/kvm-unit-tests: new package The unit tests are tiny guest operating systems that generally execute only tens of lines of C and assembler test code in order to obtain its PASS/FAIL result. Unit tests provide KVM and virt hardware functional testing by targeting the features through minimal implementations of their use per the hardware specification. The simplicity of unit tests make them easy to verify they are correct, easy to maintain, and easy to use in timing measurements. Unit tests are also often used for quick and dirty bug reproducers. The reproducers may then be kept as regression tests. It's strongly encouraged that patches implementing new KVM features are submitted with accompanying unit tests. Signed-off-by: Cyril Bur [Thomas: - order architecture dependencies in Config.in alphabetically. - rewrap Config.in help text, lines were too long - add an empty line between the package description and the upstream project URL in the Config.in help text - don't make KVM_UNIT_TESTS_ARCH default to $(ARCH). This was not correct for i386 for example. Instead, just handle the few architectures that the package supports. - remove useless double quotes in variable definitions. - remove --prefix="$(TARGET_DIR)" from CONF_OPTS. It was installing everything in /share/ and not /usr/share/, and setting the prefix to TARGET_DIR at configure time is not good. Instead, pass DESTDIR at installation time.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/kvm-unit-tests/Config.in | 21 ++++++++++ package/kvm-unit-tests/kvm-unit-tests.mk | 49 ++++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 package/kvm-unit-tests/Config.in create mode 100644 package/kvm-unit-tests/kvm-unit-tests.mk diff --git a/package/Config.in b/package/Config.in index e30ce22e5b..78573f0143 100644 --- a/package/Config.in +++ b/package/Config.in @@ -82,6 +82,7 @@ menu "Debugging, profiling and benchmark" source "package/kexec/Config.in" source "package/kexec-lite/Config.in" source "package/ktap/Config.in" + source "package/kvm-unit-tests/Config.in" source "package/kyua/Config.in" source "package/latencytop/Config.in" source "package/lmbench/Config.in" diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in new file mode 100644 index 0000000000..f77189601d --- /dev/null +++ b/package/kvm-unit-tests/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_KVM_UNIT_TESTS + bool "kvm-unit-tests" + depends on BR2_arm || BR2_i386 || BR2_powerpc64 || \ + BR2_powerpc64le || BR2_x86_64 + help + kvm-unit-tests is a project as old as KVM. As its name + suggests, it's purpose is to provide unit tests for KVM. The + unit tests are tiny guest operating systems that generally + execute only tens of lines of C and assembler test code in + order to obtain its PASS/FAIL result. Unit tests provide KVM + and virt hardware functional testing by targeting the + features through minimal implementations of their use per + the hardware specification. The simplicity of unit tests + make them easy to verify they are correct, easy to maintain, + and easy to use in timing measurements. Unit tests are also + often used for quick and dirty bug reproducers. The + reproducers may then be kept as regression tests. It's + strongly encouraged that patches implementing new KVM + features are submitted with accompanying unit tests. + + http://www.linux-kvm.org/page/KVM-unit-tests diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk new file mode 100644 index 0000000000..989d398529 --- /dev/null +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# kvm-unit-tests +# +################################################################################ + +KVM_UNIT_TESTS_VERSION = 682187afcc998bc3dd25061e98b43792cc340b33 +KVM_UNIT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/scm/virt/kvm/kvm-unit-tests.git +KVM_UNIT_TESTS_SITE_METHOD = git +KVM_UNIT_TESTS_LICENSE = LGPLv2 +KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT + +ifeq ($(BR2_arm),y) +KVM_UNIT_TESTS_ARCH = arm +else ifeq ($(BR2_i386),y) +KVM_UNIT_TESTS_ARCH = i386 +else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) +KVM_UNIT_TESTS_ARCH = ppc64 +else ifeq ($(BR2_x86_64),y) +KVM_UNIT_TESTS_ARCH = x86_84 +endif + +ifeq ($(BR2_ENDIAN),"LITTLE") +KVM_UNIT_TESTS_ENDIAN = little +else +KVM_UNIT_TESTS_ENDIAN = big +endif + +KVM_UNIT_TESTS_CONF_OPTS =\ + --arch="$(KERNEL_ARCH)" \ + --cross-prefix="$(TARGET_CROSS)" \ + --endian="$(KVM_UNIT_TESTS_ENDIAN)" + +define KVM_UNIT_TESTS_CONFIGURE_CMDS + cd $(@D) && ./configure $(KVM_UNIT_TESTS_CONF_OPTS) +endef + +define KVM_UNIT_TESTS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) standalone +endef + +define KVM_UNIT_TESTS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + DESTDIR=$(TARGET_DIR)/usr/share/kvm-unit-tests/ \ + install +endef + +# Does use configure script but not an autotools one +$(eval $(generic-package)) From 0bb3983c9b612e861f43bc9f6470fc7c5b9adbbc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 19 Sep 2016 16:50:46 +0200 Subject: [PATCH 0325/3392] google-breakpad: needs thread support When google-breakpad was enabled in uClibc configurations, the dependency on threads was forgotten. Fixes: http://autobuild.buildroot.net/results/6e6bc845314100f2deb8ed06d2a6373ccf715ffe/ Signed-off-by: Thomas Petazzoni --- Config.in | 1 + package/google-breakpad/Config.in | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Config.in b/Config.in index dcd15e883a..8d37c93806 100644 --- a/Config.in +++ b/Config.in @@ -554,6 +554,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE select BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS help diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index fdaab7a665..c800974dbc 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD bool "google-breakpad" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS help @@ -30,7 +31,8 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD http://code.google.com/p/google-breakpad/ -comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, C++ enabled" +comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++ enabled" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) From eddb1bde5f7ec8a6b5650b43dcbc85d5aa1f917d Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 18 Sep 2016 22:11:41 +1200 Subject: [PATCH 0326/3392] util-linux: add -lcurses to LIBS when static linking When linking statically with -lreadline we also need to specify -lcurses. We were already passing LIBS=-intl to fix gettext related issues, so we refactor how LIBS is passed so that several values can be passed. It is worth mentioning that: 1. Passing LIBS= at configure time is not sufficient, because the configure script does LIBS="" at its end. So in order for the LIBS value to also be effective during the build, it needs to be passed in MAKE_OPTS as well. 2. LIBS=-lintl was only passed at build time (it was not needed for any of the configure tests). However, LIBS=-lncurses is needed both at configure time (for configure tests) and at build time. Therefore, the new variable UTIL_LINUX_LIBS gets passed as the LIBS value at both configure time and build time. Fixes: http://autobuild.buildroot.net/results/70e0a273e699c73c6b2ab2a19c8f7ebb1ddee6cde http://autobuild.buildroot.net/results/6a7faf8adbffd9437c0117b9f0e89684c24dad23 Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 82230bca77..82a726e939 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -49,13 +49,20 @@ endif ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) UTIL_LINUX_DEPENDENCIES += gettext -UTIL_LINUX_MAKE_OPTS += LIBS=-lintl +UTIL_LINUX_LIBS += -lintl endif ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) UTIL_LINUX_DEPENDENCIES += libcap-ng endif +# Unfortunately, the util-linux does LIBS="" at the end of its +# configure script. So we have to pass the proper LIBS value when +# calling the configure script to make configure tests pass properly, +# and then pass it again at build time. +UTIL_LINUX_CONF_ENV += LIBS="$(UTIL_LINUX_LIBS)" +UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS)" + # Used by cramfs utils UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) @@ -148,6 +155,7 @@ endif ifeq ($(BR2_PACKAGE_READLINE),y) UTIL_LINUX_CONF_OPTS += --with-readline +UTIL_LINUX_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) UTIL_LINUX_DEPENDENCIES += readline else UTIL_LINUX_CONF_OPTS += --without-readline From a81d1cda3f77ce4f6a5b423815e3b7488ba681be Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 18 Sep 2016 10:29:58 +0300 Subject: [PATCH 0327/3392] sam-ba: correct license The sam-ba binary is distributed under a proprietary license. TCL and some applets code is under a BSD-2c like license, while some other applets are under BSD-4c. Also correct license files. Cc: Ludovic Desroches Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/sam-ba/sam-ba.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk index aede615a3f..7fc65c01a9 100644 --- a/package/sam-ba/sam-ba.mk +++ b/package/sam-ba/sam-ba.mk @@ -7,8 +7,10 @@ SAM_BA_SITE = http://www.atmel.com/dyn/resources/prod_documents SAM_BA_VERSION = 2.16 SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION)_linux.zip -SAM_BA_LICENSE = BSD-like (partly binary-only) -SAM_BA_LICENSE_FILES = doc/readme.txt +SAM_BA_LICENSE = SAM-BA license (sam-ba executable), \ + BSD-2c like, BSD-4c (TCL and applets code) +SAM_BA_LICENSE_FILES = doc/license.txt tcl_lib/boards.tcl \ + applets/sam4c/libraries/libchip_sam4c/include/sam4c/sam4c32e-1.h define HOST_SAM_BA_EXTRACT_CMDS $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE) From 10c4d27aef4dca01572cfc8146cbfd194a1a85e4 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Mon, 19 Sep 2016 17:12:05 +0300 Subject: [PATCH 0328/3392] linux: use INSTALL_MOD_STRIP=1 to strip modules We used to do a special handling of Linux kernel modules when stripping target binaries because there's some special precious data in modules that we must keep for them to properly operate. This is for example true for stack unwinding data etc. It turned out there're cases when our existing "strip --strip-unneeded" doesn't work well. For example this removes .debug_frame section used by Linux on ARC for stack unwinding, refer to [1] and [2] for more details. Now Linux kernel may strip modules as a part of "modules_install" target if INSTALL_MOD_STRIP=1 is passed in command line. And so we'll do allowing kernel decide how to strip modules in the best way. Still note as of today Linux kernel strips modules uniformly for all arches with "strip" command, so this commit alone doesn't solve mentioned problem but it opens a possibility to add later a patch to the kernel which will strip modules for ARC differently - and that's our plan for mainline kernel. [1] https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/issues/86 [2] http://lists.busybox.net/pipermail/buildroot/2016-September/172161.html Signed-off-by: Alexey Brodkin Cc: Vineet Gupta Cc: Peter Korsgaard Cc: Thomas Petazzoni Cc: Daniel Mentz Signed-off-by: Thomas Petazzoni --- Makefile | 3 --- linux/linux.mk | 4 ++++ package/Makefile.in | 3 --- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 92feff3123..5e4daefae7 100644 --- a/Makefile +++ b/Makefile @@ -631,9 +631,6 @@ endif rm -rf $(TARGET_DIR)/usr/share/gtk-doc -rmdir $(TARGET_DIR)/usr/share 2>/dev/null $(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true - if test -d $(TARGET_DIR)/lib/modules; then \ - find $(TARGET_DIR)/lib/modules -type f -name '*.ko' -print0 | \ - xargs -0 -r $(KSTRIPCMD); fi # See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads # besides the one in which crash occurred; or SIGTRAP kills my program when diff --git a/linux/linux.mk b/linux/linux.mk index 6e41a920a1..5cbb5e5f19 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -384,6 +384,10 @@ define LINUX_INSTALL_IMAGES_CMDS $(call LINUX_INSTALL_DTB,$(BINARIES_DIR)) endef +ifeq ($(BR2_STRIP_strip),y) +LINUX_MAKE_FLAGS += INSTALL_MOD_STRIP=1 +endif + define LINUX_INSTALL_TARGET_CMDS $(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET) # Install modules and remove symbolic links pointing to build diff --git a/package/Makefile.in b/package/Makefile.in index afd5d3a59b..83c9a894e8 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -203,16 +203,13 @@ TARGET_OBJDUMP = $(TARGET_CROSS)objdump ifeq ($(BR2_STRIP_strip),y) STRIP_STRIP_DEBUG := --strip-debug -STRIP_STRIP_UNNEEDED := --strip-unneeded STRIP_STRIP_ALL := --strip-all TARGET_STRIP = $(TARGET_CROSS)strip STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note -KSTRIPCMD = $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) endif ifeq ($(BR2_STRIP_none),y) TARGET_STRIP = true STRIPCMD = $(TARGET_STRIP) -KSTRIPCMD = $(TARGET_STRIP) endif INSTALL := $(shell which install || type -p install) FLEX := $(shell which flex || type -p flex) From 5676a2deea896f38123b99781da0a612865adeb0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 19 Sep 2016 19:31:52 +0200 Subject: [PATCH 0329/3392] package/Makefile.in: remove unused STRIP_STRIP_ALL variable This variable has been unused for a long time, so we can get rid of its definition. Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 83c9a894e8..b4a4c60649 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -203,7 +203,6 @@ TARGET_OBJDUMP = $(TARGET_CROSS)objdump ifeq ($(BR2_STRIP_strip),y) STRIP_STRIP_DEBUG := --strip-debug -STRIP_STRIP_ALL := --strip-all TARGET_STRIP = $(TARGET_CROSS)strip STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note endif From d4db4277ffbd1fae478ba748c626eddc7c220e67 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 4 Sep 2016 16:17:46 +0200 Subject: [PATCH 0330/3392] manual: get rid of the lists of packages We currently have four lists of packages in the manual: - the non-virtual target packages, - the virtual target packages, - the host packages, - the deprecated features. Those list take more than half of the manual. They do not serve much purpose except to show off. After the recent discussion on the list [0], remove them all. We can now get rid of our biggish and complex generating script (and its companion library kconfiglib). [0] http://lists.busybox.net/pipermail/buildroot/2016-September/171199.html Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Arnout Vandecappelle Cc: Samuel Martin Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-virtual.txt | 6 - docs/manual/appendix.txt | 37 - docs/manual/manual.mk | 24 - support/scripts/gen-manual-lists.py | 513 ---- support/scripts/kconfiglib.py | 3541 ----------------------- support/scripts/readme.kconfiglib | 30 - 6 files changed, 4151 deletions(-) delete mode 100644 support/scripts/gen-manual-lists.py delete mode 100644 support/scripts/kconfiglib.py delete mode 100644 support/scripts/readme.kconfiglib diff --git a/docs/manual/adding-packages-virtual.txt b/docs/manual/adding-packages-virtual.txt index a5f17a262a..6326bb5455 100644 --- a/docs/manual/adding-packages-virtual.txt +++ b/docs/manual/adding-packages-virtual.txt @@ -83,9 +83,6 @@ On line 3, we select +BR2_PACKAGE_HAS_SOMETHING_VIRTUAL+, and on line 11, we set the value of +BR2_PACKAGE_PROVIDES_SOMETHING_VIRTUAL+ to the name of the provider, but only if it is selected. -See xref:virtual-package-list[] for the symbols to select if you implement -a new provider for an existing virtual package. - ==== Provider's +.mk+ file The +.mk+ file should also declare an additional variable @@ -99,9 +96,6 @@ packages it is an implementation of: Of course, do not forget to add the proper build and runtime dependencies for this package! -See xref:virtual-package-list[] for the names of virtual packages to provide -if you implement a new provider for an existing virtual package. - ==== Notes on depending on a virtual package When adding a package that requires a certain +FEATURE+ provided by a virtual diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt index 87a20bd866..03dbbd1134 100644 --- a/docs/manual/appendix.txt +++ b/docs/manual/appendix.txt @@ -3,40 +3,3 @@ include::makedev-syntax.txt[] include::makeusers-syntax.txt[] - - -// Automatically generated lists: - -[[package-list]] -== List of target packages available in Buildroot - -include::package-list.txt[] - -[[virtual-package-list]] -== List of virtual packages - -These are the virtual packages known to +Buildroot+, with the -corresponding symbols and providers. - -include::virtual-package-list.txt[] - -[[host-package-list]] -== List of host utilities available in Buildroot - -The following packages are all available in the menu +Host utilities+. - -include::host-package-list.txt[] - -[[deprecated-list]] -== Deprecated features - -The following features are marked as _deprecated_ in Buildroot due to -them being either too old or unmaintained. They will be removed at -some point, so stop using them. -Each deprecated symbol in kconfig depends on a symbol -+BR2_DEPRECATED_SINCE_xxxx_xx+, which provides an indication of when -the feature can be removed: features will not be removed within the -year following deprecation. For example, a symbol depending on -+BR2_DEPRECATED_SINCE_2013_05+ can be removed from 2014.05 onwards. - -include::deprecated-list.txt[] diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk index b26f912341..1d03b213db 100644 --- a/docs/manual/manual.mk +++ b/docs/manual/manual.mk @@ -7,28 +7,4 @@ MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)) MANUAL_RESOURCES = $(TOPDIR)/docs/images -# Ensure the kconfig snippet is generated (for MANUAL_GEN_LISTS, below): -MANUAL_DEPENDENCIES += prepare-kconfig - -# Our manual needs to generate lists -define MANUAL_GEN_LISTS - $(Q)$(call MESSAGE,"Updating the manual lists...") - $(Q)$(COMMON_CONFIG_ENV) \ - BR2_DEFCONFIG="" \ - TOPDIR=$(TOPDIR) \ - O=$(@D) \ - python -B $(TOPDIR)/support/scripts/gen-manual-lists.py -endef -MANUAL_POST_RSYNC_HOOKS += MANUAL_GEN_LISTS - -# Our list-generating script requires argparse -define MANUAL_CHECK_LISTS_DEPS - $(Q)if ! python -c "import argparse" >/dev/null 2>&1 ; then \ - echo "You need python with argparse on your host to generate" \ - "the list of packages in the manual"; \ - exit 1; \ - fi -endef -MANUAL_CHECK_DEPENDENCIES_HOOKS += MANUAL_CHECK_LISTS_DEPS - $(eval $(call asciidoc-document)) diff --git a/support/scripts/gen-manual-lists.py b/support/scripts/gen-manual-lists.py deleted file mode 100644 index d231eda1fc..0000000000 --- a/support/scripts/gen-manual-lists.py +++ /dev/null @@ -1,513 +0,0 @@ -## gen-manual-lists.py -## -## This script generates the following Buildroot manual appendices: -## - the package tables (one for the target, the other for host tools); -## - the deprecated items. -## -## Author(s): -## - Samuel Martin -## -## Copyright (C) 2013 Samuel Martin -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -## - -from __future__ import print_function -from __future__ import unicode_literals - -import os -import re -import sys -import datetime -from argparse import ArgumentParser - -try: - import kconfiglib -except ImportError: - message = """ -Could not find the module 'kconfiglib' in the PYTHONPATH: -""" - message += "\n".join([" {0}".format(path) for path in sys.path]) - message += """ - -Make sure the Kconfiglib directory is in the PYTHONPATH, then relaunch the -script. - -You can get kconfiglib from: - https://github.com/ulfalizer/Kconfiglib - - -""" - sys.stderr.write(message) - raise - - -def get_symbol_subset(root, filter_func): - """ Return a generator of kconfig items. - - :param root_item: Root item of the generated subset of items - :param filter_func: Filter function - - """ - if hasattr(root, "get_items"): - get_items = root.get_items - elif hasattr(root, "get_top_level_items"): - get_items = root.get_top_level_items - else: - message = "The symbol does not contain any subset of symbols" - raise Exception(message) - for item in get_items(): - if item.is_symbol(): - if not filter_func(item): - continue - yield item - elif item.is_menu() or item.is_choice(): - for i in get_symbol_subset(item, filter_func): - yield i - - -def get_symbol_parents(item, root=None, enable_choice=False): - """ Return the list of the item's parents. The last item of the list is - the closest parent, the first the furthest. - - :param item: Item from which the parent list is generated - :param root: Root item stopping the search (not included in the - parent list) - :param enable_choice: Flag enabling choices to appear in the parent list - - """ - parent = item.get_parent() - parents = [] - while parent and parent != root: - if parent.is_menu(): - parents.append(parent.get_title()) - elif enable_choice and parent.is_choice(): - parents.append(parent.get_prompts()[0]) - parent = parent.get_parent() - if isinstance(root, kconfiglib.Menu) or \ - (enable_choice and isinstance(root, kconfiglib.Choice)): - parents.append("") # Dummy empty parent to get a leading arrow -> - parents.reverse() - return parents - - -def format_asciidoc_table(root, get_label_func, filter_func=lambda x: True, - format_func=lambda x: x, - enable_choice=False, sorted=True, - item_label=None): - """ Return the asciidoc formatted table of the items and their location. - - :param root: Root item of the item subset - :param get_label_func: Item's label getter function - :param filter_func: Filter function to apply on the item subset - :param format_func: Function to format a symbol and the table header - :param enable_choice: Enable choices to appear as part of the item's - location - :param sorted: Flag to alphabetically sort the table - - """ - - lines = [] - for item in get_symbol_subset(root, filter_func): - lines.append(format_func(what="symbol", symbol=item, root=root, - get_label_func=get_label_func, - enable_choice=enable_choice)) - if sorted: - lines.sort(key=lambda x: x.lower()) - table = ":halign: center\n\n" - width, columns = format_func(what="layout") - table = "[width=\"{0}\",cols=\"{1}\",options=\"header\"]\n".format(width, columns) - table += "|===================================================\n" - table += format_func(what="header", header=item_label, root=root) - table += "\n" + "".join(lines) + "\n" - table += "|===================================================\n" - return table - - -class Buildroot: - """ Buildroot configuration object. - - """ - root_config = "Config.in" - package_dirname = "package" - package_prefixes = ["BR2_PACKAGE_", "BR2_PACKAGE_HOST_"] - re_pkg_prefix = re.compile(r"^(" + "|".join(package_prefixes) + ").*") - deprecated_symbol = "BR2_DEPRECATED" - list_in = """\ -// -// Automatically generated list for Buildroot manual. -// - -{table} -""" - - list_info = { - 'target-packages': { - 'filename': "package-list", - 'root_menu': "Target packages", - 'filter': "_is_real_package", - 'format': "_format_symbol_prompt_location", - 'sorted': True, - }, - 'host-packages': { - 'filename': "host-package-list", - 'root_menu': "Host utilities", - 'filter': "_is_real_package", - 'format': "_format_symbol_prompt", - 'sorted': True, - }, - 'virtual-packages': { - 'filename': "virtual-package-list", - 'root_menu': "Target packages", - 'filter': "_is_virtual_package", - 'format': "_format_symbol_virtual", - 'sorted': True, - }, - 'deprecated': { - 'filename': "deprecated-list", - 'root_menu': None, - 'filter': "_is_deprecated_feature", - 'format': "_format_symbol_prompt_location", - 'sorted': False, - }, - } - - def __init__(self): - self.base_dir = os.environ.get("TOPDIR") - self.output_dir = os.environ.get("O") - self.package_dir = os.path.join(self.base_dir, self.package_dirname) - self.config = kconfiglib.Config(os.path.join(self.base_dir, - self.root_config), - self.base_dir) - self._deprecated = self.config.get_symbol(self.deprecated_symbol) - - self.gen_date = datetime.datetime.utcnow() - self.br_version_full = os.environ.get("BR2_VERSION_FULL") - if self.br_version_full and self.br_version_full.endswith("-git"): - self.br_version_full = self.br_version_full[:-4] - if not self.br_version_full: - self.br_version_full = "undefined" - - def _get_package_symbols(self, package_name): - """ Return a tuple containing the target and host package symbol. - - """ - symbols = re.sub("[-+.]", "_", package_name) - symbols = symbols.upper() - symbols = tuple([prefix + symbols for prefix in self.package_prefixes]) - return symbols - - def _is_deprecated(self, symbol): - """ Return True if the symbol is marked as deprecated, otherwise False. - - """ - # This also catches BR2_DEPRECATED_SINCE_xxxx_xx - return bool([ symbol for x in symbol.get_referenced_symbols() - if x.get_name().startswith(self._deprecated.get_name()) ]) - - def _is_package(self, symbol, type='real'): - """ Return True if the symbol is a package or a host package, otherwise - False. - - :param symbol: The symbol to check - :param type: Limit to 'real' or 'virtual' types of packages, - with 'real' being the default. - Note: only 'real' is (implictly) handled for now - - """ - if not symbol.is_symbol(): - return False - if type == 'real' and not symbol.get_prompts(): - return False - if type == 'virtual' and symbol.get_prompts(): - return False - if not self.re_pkg_prefix.match(symbol.get_name()): - return False - pkg_name = self._get_pkg_name(symbol) - - pattern = "^(HOST_)?" + pkg_name + "$" - pattern = re.sub("_", ".", pattern) - pattern = re.compile(pattern, re.IGNORECASE) - # Here, we cannot just check for the location of the Config.in because - # of the "virtual" package. - # - # So, to check that a symbol is a package (not a package option or - # anything else), we check for the existence of the package *.mk file. - # - # By the way, to actually check for a package, we should grep all *.mk - # files for the following regex: - # "\$\(eval \$\((host-)?(generic|autotools|cmake)-package\)\)" - # - # Implementation details: - # - # * The package list is generated from the *.mk file existence, the - # first time this function is called. Despite the memory consumption, - # this list is stored because the execution time of this script is - # noticeably shorter than rescanning the package sub-tree for each - # symbol. - if not hasattr(self, "_package_list"): - pkg_list = [] - for _, _, files in os.walk(self.package_dir): - for file_ in (f for f in files if f.endswith(".mk")): - pkg_list.append(re.sub(r"(.*?)\.mk", r"\1", file_)) - setattr(self, "_package_list", pkg_list) - for pkg in getattr(self, "_package_list"): - if type == 'real': - if pattern.match(pkg) and not self._exists_virt_symbol(pkg): - return True - if type == 'virtual': - if pattern.match('has_' + pkg): - return True - return False - - def _is_real_package(self, symbol): - return self._is_package(symbol, 'real') - - def _is_virtual_package(self, symbol): - return self._is_package(symbol, 'virtual') - - def _is_deprecated_feature(self, symbol): - return symbol.get_prompts() and self._is_deprecated(symbol) - - def _exists_virt_symbol(self, pkg_name): - """ Return True if a symbol exists that defines the package as - a virtual package, False otherwise - - :param pkg_name: The name of the package, for which to check if - a symbol exists defining it as a virtual package - - """ - virt_pattern = "BR2_PACKAGE_HAS_" + pkg_name + "$" - virt_pattern = re.sub("_", ".", virt_pattern) - virt_pattern = re.compile(virt_pattern, re.IGNORECASE) - for sym in self.config: - if virt_pattern.match(sym.get_name()): - return True - return False - - def _get_pkg_name(self, symbol): - """ Return the package name of the specified symbol. - - :param symbol: The symbol to get the package name of - - """ - - return re.sub("BR2_PACKAGE_(HOST_)?(.*)", r"\2", symbol.get_name()) - - def _get_symbol_label(self, symbol, mark_deprecated=True): - """ Return the label (a.k.a. prompt text) of the symbol. - - :param symbol: The symbol - :param mark_deprecated: Append a 'deprecated' to the label - - """ - label = symbol.get_prompts()[0] - if self._is_deprecated(symbol) and mark_deprecated: - label += " *(deprecated)*" - return label - - def _format_symbol_prompt(self, what=None, symbol=None, root=None, - enable_choice=False, header=None, - get_label_func=lambda x: x): - if what == "layout": - return ( "30%", "^1" ) - - if what == "header": - return "| {0:<40}\n".format(header) - - if what == "symbol": - return "| {0:<40}\n".format(get_label_func(symbol)) - - message = "Invalid argument 'what': '%s'\n" % str(what) - message += "Allowed values are: 'layout', 'header' and 'symbol'" - raise Exception(message) - - def _format_symbol_prompt_location(self, what=None, symbol=None, root=None, - enable_choice=False, header=None, - get_label_func=lambda x: x): - if what == "layout": - return ( "100%", "^1,4" ) - - if what == "header": - if hasattr(root, "get_title"): - loc_label = get_symbol_parents(root, None, enable_choice=enable_choice) - loc_label += [root.get_title(), "..."] - else: - loc_label = ["Location"] - return "| {0:<40} <| {1}\n".format(header, " -> ".join(loc_label)) - - if what == "symbol": - parents = get_symbol_parents(symbol, root, enable_choice) - return "| {0:<40} <| {1}\n".format(get_label_func(symbol), - " -> ".join(parents)) - - message = "Invalid argument 'what': '%s'\n" % str(what) - message += "Allowed values are: 'layout', 'header' and 'symbol'" - raise Exception(message) - - def _format_symbol_virtual(self, what=None, symbol=None, root=None, - enable_choice=False, header=None, - get_label_func=lambda x: "?"): - def _symbol_is_legacy(symbol): - selects = [ s.get_name() for s in symbol.get_selected_symbols() ] - return ("BR2_LEGACY" in selects) - - def _get_parent_package(sym): - if self._is_real_package(sym): - return None - # Trim the symbol name from its last component (separated with - # underscores), until we either find a symbol which is a real - # package, or until we have no component (i.e. just 'BR2') - name = sym.get_name() - while name != "BR2": - name = name.rsplit("_", 1)[0] - s = self.config.get_symbol(name) - if s is None: - continue - if self._is_real_package(s): - return s - return None - - def _get_providers(symbol): - providers = list() - for sym in self.config: - if not sym.is_symbol(): - continue - if _symbol_is_legacy(sym): - continue - selects = sym.get_selected_symbols() - if not selects: - continue - for s in selects: - if s == symbol: - if sym.get_prompts(): - l = self._get_symbol_label(sym,False) - parent_pkg = _get_parent_package(sym) - if parent_pkg is not None: - l = self._get_symbol_label(parent_pkg, False) \ - + " (w/ " + l + ")" - providers.append(l) - else: - providers.extend(_get_providers(sym)) - return providers - - if what == "layout": - return ( "100%", "^1,4,4" ) - - if what == "header": - return "| {0:<20} <| {1:<32} <| Providers\n".format("Virtual packages", "Symbols") - - if what == "symbol": - pkg = re.sub(r"^BR2_PACKAGE_HAS_(.+)$", r"\1", symbol.get_name()) - providers = _get_providers(symbol) - - return "| {0:<20} <| {1:<32} <| {2}\n".format(pkg.lower(), - '+' + symbol.get_name() + '+', - ", ".join(providers)) - - message = "Invalid argument 'what': '%s'\n" % str(what) - message += "Allowed values are: 'layout', 'header' and 'symbol'" - raise Exception(message) - - - def print_list(self, list_type, enable_choice=True, enable_deprecated=True, - dry_run=False, output=None): - """ Print the requested list. If not dry run, then the list is - automatically written in its own file. - - :param list_type: The list type to be generated - :param enable_choice: Flag enabling choices to appear in the list - :param enable_deprecated: Flag enabling deprecated items to appear in - the package lists - :param dry_run: Dry run (print the list in stdout instead of - writing the list file - - """ - def _get_menu(title): - """ Return the first symbol menu matching the given title. - - """ - menus = self.config.get_menus() - menu = [m for m in menus if m.get_title().lower() == title.lower()] - if not menu: - message = "No such menu: '{0}'".format(title) - raise Exception(message) - return menu[0] - - list_config = self.list_info[list_type] - root_title = list_config.get('root_menu') - if root_title: - root_item = _get_menu(root_title) - else: - root_item = self.config - filter_ = getattr(self, list_config.get('filter')) - filter_func = lambda x: filter_(x) - format_func = getattr(self, list_config.get('format')) - if not enable_deprecated and list_type != "deprecated": - filter_func = lambda x: filter_(x) and not self._is_deprecated(x) - mark_depr = list_type != "deprecated" - get_label = lambda x: self._get_symbol_label(x, mark_depr) - item_label = "Features" if list_type == "deprecated" else "Packages" - - table = format_asciidoc_table(root_item, get_label, - filter_func=filter_func, - format_func=format_func, - enable_choice=enable_choice, - sorted=list_config.get('sorted'), - item_label=item_label) - - content = self.list_in.format(table=table) - - if dry_run: - print(content) - return - - if not output: - output_dir = self.output_dir - if not output_dir: - print("Warning: Undefined output directory.") - print("\tUse source directory as output location.") - output_dir = self.base_dir - output = os.path.join(output_dir, - list_config.get('filename') + ".txt") - if not os.path.exists(os.path.dirname(output)): - os.makedirs(os.path.dirname(output)) - print("Writing the {0} list in:\n\t{1}".format(list_type, output)) - with open(output, 'w') as fout: - fout.write(content) - - -if __name__ == '__main__': - list_types = ['target-packages', 'host-packages', 'virtual-packages', 'deprecated'] - parser = ArgumentParser() - parser.add_argument("list_type", nargs="?", choices=list_types, - help="""\ -Generate the given list (generate all lists if unspecified)""") - parser.add_argument("-n", "--dry-run", dest="dry_run", action='store_true', - help="Output the generated list to stdout") - parser.add_argument("--output-target", dest="output_target", - help="Output target package file") - parser.add_argument("--output-host", dest="output_host", - help="Output host package file") - parser.add_argument("--output-virtual", dest="output_virtual", - help="Output virtual package file") - parser.add_argument("--output-deprecated", dest="output_deprecated", - help="Output deprecated file") - args = parser.parse_args() - lists = [args.list_type] if args.list_type else list_types - buildroot = Buildroot() - for list_name in lists: - output = getattr(args, "output_" + list_name.split("-", 1)[0]) - buildroot.print_list(list_name, dry_run=args.dry_run, output=output) diff --git a/support/scripts/kconfiglib.py b/support/scripts/kconfiglib.py deleted file mode 100644 index 0a688b54c8..0000000000 --- a/support/scripts/kconfiglib.py +++ /dev/null @@ -1,3541 +0,0 @@ -# This is Kconfiglib, a Python library for scripting, debugging, and extracting -# information from Kconfig-based configuration systems. To view the -# documentation, run -# -# $ pydoc kconfiglib -# -# or, if you prefer HTML, -# -# $ pydoc -w kconfiglib -# -# The examples/ subdirectory contains examples, to be run with e.g. -# -# $ make scriptconfig SCRIPT=Kconfiglib/examples/print_tree.py -# -# Look in testsuite.py for the test suite. - -""" -Kconfiglib is a Python library for scripting and extracting information from -Kconfig-based configuration systems. Features include the following: - - - Symbol values and properties can be looked up and values assigned - programmatically. - - .config files can be read and written. - - Expressions can be evaluated in the context of a Kconfig configuration. - - Relations between symbols can be quickly determined, such as finding all - symbols that reference a particular symbol. - - Highly compatible with the scripts/kconfig/*conf utilities. The test suite - automatically compares outputs between Kconfiglib and the C implementation - for a large number of cases. - -For the Linux kernel, scripts are run using - - $ make scriptconfig [ARCH=] SCRIPT= [SCRIPT_ARG=] - -Using the 'scriptconfig' target ensures that required environment variables -(SRCARCH, ARCH, srctree, KERNELVERSION, etc.) are set up correctly. - -Scripts receive the name of the Kconfig file to load in sys.argv[1]. As of -Linux 4.1.0-rc5, this is always "Kconfig" from the kernel top-level directory. -If an argument is provided with SCRIPT_ARG, it appears as sys.argv[2]. - -To get an interactive Python prompt with Kconfiglib preloaded and a Config -object 'c' created, run - - $ make iscriptconfig [ARCH=] - -Kconfiglib currently uses Python 2. For (i)scriptconfig, the Python interpreter -to use can be passed in PYTHONCMD. It defaults to 'python', but PyPy works too -and might be faster for long-running jobs. - -The examples/ directory contains short example scripts, which can be run with -e.g. - - $ make scriptconfig SCRIPT=Kconfiglib/examples/print_tree.py - -or - - $ make scriptconfig SCRIPT=Kconfiglib/examples/help_grep.py SCRIPT_ARG=kernel - -testsuite.py contains the test suite. See the top of the script for how to run -it. - -Credits: Written by Ulf "Ulfalizer" Magnusson - -Send bug reports, suggestions and other feedback to ulfalizer a.t Google's -email service. Don't wrestle with internal APIs. Tell me what you need and I -might add it in a safe way as a client API instead.""" - -import os -import re -import sys - -# File layout: -# -# Public classes -# Public functions -# Internal classes -# Internal functions -# Internal global constants - -# -# Public classes -# - -class Config(object): - - """Represents a Kconfig configuration, e.g. for i386 or ARM. This is the - set of symbols and other items appearing in the configuration together with - their values. Creating any number of Config objects -- including for - different architectures -- is safe; Kconfiglib has no global state.""" - - # - # Public interface - # - - def __init__(self, filename = "Kconfig", base_dir = None, - print_warnings = True, print_undef_assign = False): - """Creates a new Config object, representing a Kconfig configuration. - Raises Kconfig_Syntax_Error on syntax errors. - - filename (default: "Kconfig") -- The base Kconfig file of the - configuration. For the Linux kernel, you'll probably want - "Kconfig" from the top-level directory, as environment - variables will make sure the right Kconfig is included from - there (arch//Kconfig). If you are using - kconfiglib via 'make scriptconfig', the filename of the base - base Kconfig file will be in sys.argv[1]. - - base_dir (default: None) -- The base directory relative to which - 'source' statements within Kconfig files will work. For the - Linux kernel this should be the top-level directory of the - kernel tree. $-references to existing environment variables - will be expanded. - - If None (the default), the environment variable 'srctree' will - be used if set, and the current directory otherwise. 'srctree' - is set by the Linux makefiles to the top-level kernel - directory. A default of "." would not work with an alternative - build directory. - - print_warnings (default: True) -- Set to True if warnings related to - this configuration should be printed to stderr. This can - be changed later with Config.set_print_warnings(). It is - provided as a constructor argument since warnings might - be generated during parsing. - - print_undef_assign (default: False) -- Set to True if informational - messages related to assignments to undefined symbols - should be printed to stderr for this configuration. - Can be changed later with - Config.set_print_undef_assign().""" - - # The set of all symbols, indexed by name (a string) - self.syms = {} - - # Python 2/3 compatibility hack. This is the only one needed. - if sys.version_info[0] >= 3: - self.syms_iter = self.syms.values - else: - self.syms_iter = self.syms.itervalues - - # The set of all defined symbols in the configuration in the order they - # appear in the Kconfig files. This excludes the special symbols n, m, - # and y as well as symbols that are referenced but never defined. - self.kconfig_syms = [] - - # The set of all named choices (yes, choices can have names), indexed - # by name (a string) - self.named_choices = {} - - def register_special_symbol(type_, name, val): - sym = Symbol() - sym.is_special_ = True - sym.is_defined_ = True - sym.config = self - sym.name = name - sym.type = type_ - sym.cached_val = val - self.syms[name] = sym - return sym - - # The special symbols n, m and y, used as shorthand for "n", "m" and - # "y" - self.n = register_special_symbol(TRISTATE, "n", "n") - self.m = register_special_symbol(TRISTATE, "m", "m") - self.y = register_special_symbol(TRISTATE, "y", "y") - - # DEFCONFIG_LIST uses this - register_special_symbol(STRING, "UNAME_RELEASE", os.uname()[2]) - - # The symbol with "option defconfig_list" set, containing a list of - # default .config files - self.defconfig_sym = None - - # See Symbol.get_(src)arch() - self.arch = os.environ.get("ARCH") - self.srcarch = os.environ.get("SRCARCH") - - # See Config.__init__(). We need this for get_defconfig_filename(). - self.srctree = os.environ.get("srctree") - if self.srctree is None: - self.srctree = "." - - self.filename = filename - if base_dir is None: - self.base_dir = self.srctree - else: - self.base_dir = os.path.expandvars(base_dir) - - # The 'mainmenu' text - self.mainmenu_text = None - - # The filename of the most recently loaded .config file - self.config_filename = None - - # The textual header of the most recently loaded .config, uncommented - self.config_header = None - - self.print_warnings = print_warnings - self.print_undef_assign = print_undef_assign - - # Lists containing all choices, menus and comments in the configuration - - self.choices = [] - self.menus = [] - self.comments = [] - - # For parsing routines that stop when finding a line belonging to a - # different construct, these holds that line and the tokenized version - # of that line. The purpose is to avoid having to re-tokenize the line, - # which is inefficient and causes problems when recording references to - # symbols. - self.end_line = None - self.end_line_tokens = None - - # See the comment in _parse_expr(). - self.parse_expr_cur_sym_or_choice = None - self.parse_expr_line = None - self.parse_expr_filename = None - self.parse_expr_linenr = None - self.parse_expr_transform_m = None - - # Parse the Kconfig files - self.top_block = self._parse_file(filename, None, None, None) - - # Build Symbol.dep for all symbols - self._build_dep() - - def load_config(self, filename, replace = True): - """Loads symbol values from a file in the familiar .config format. - Equivalent to calling Symbol.set_user_value() to set each of the - values. - - "# CONFIG_FOO is not set" within a .config file is treated specially - and sets the user value of FOO to 'n'. The C implementation works - the same way. - - filename -- The .config file to load. $-references to environment - variables will be expanded. For scripts to work even - when an alternative build directory is used with the - Linux kernel, you need to refer to the top-level kernel - directory with "$srctree". - - replace (default: True) -- True if the configuration should replace - the old configuration; False if it should add to it.""" - - # Put this first so that a missing file doesn't screw up our state - filename = os.path.expandvars(filename) - line_feeder = _FileFeed(filename) - - self.config_filename = filename - - # - # Read header - # - - def is_header_line(line): - return line is not None and line.startswith("#") and \ - not _unset_re_match(line) - - self.config_header = None - - line = line_feeder.peek_next() - if is_header_line(line): - self.config_header = "" - while is_header_line(line_feeder.peek_next()): - self.config_header += line_feeder.get_next()[1:] - # Remove trailing newline - if self.config_header.endswith("\n"): - self.config_header = self.config_header[:-1] - - # - # Read assignments. Hotspot for some workloads. - # - - def warn_override(filename, linenr, name, old_user_val, new_user_val): - self._warn('overriding the value of {0}. ' - 'Old value: "{1}", new value: "{2}".' - .format(name, old_user_val, new_user_val), - filename, linenr) - - # Invalidate everything to keep things simple. It might be possible to - # improve performance for the case where multiple configurations are - # loaded by only invalidating a symbol (and its dependent symbols) if - # the new user value differs from the old. One complication would be - # that symbols not mentioned in the .config must lose their user value - # when replace = True, which is the usual case. - if replace: - self.unset_user_values() - else: - self._invalidate_all() - - while 1: - line = line_feeder.get_next() - if line is None: - return - - line = line.rstrip() - - set_match = _set_re_match(line) - if set_match: - name, val = set_match.groups() - - if val.startswith(('"', "'")): - if len(val) < 2 or val[-1] != val[0]: - _parse_error(line, "malformed string literal", - line_feeder.get_filename(), - line_feeder.get_linenr()) - # Strip quotes and remove escapings. The unescaping - # producedure should be safe since " can only appear as \" - # inside the string. - val = val[1:-1].replace('\\"', '"').replace("\\\\", "\\") - - if name in self.syms: - sym = self.syms[name] - if sym.user_val is not None: - warn_override(line_feeder.get_filename(), - line_feeder.get_linenr(), - name, sym.user_val, val) - - if sym.is_choice_symbol_: - user_mode = sym.parent.user_mode - if user_mode is not None and user_mode != val: - self._warn("assignment to {0} changes mode of containing " - 'choice from "{1}" to "{2}".' - .format(name, val, user_mode), - line_feeder.get_filename(), - line_feeder.get_linenr()) - - sym._set_user_value_no_invalidate(val, True) - else: - if self.print_undef_assign: - _stderr_msg('note: attempt to assign the value "{0}" to the ' - "undefined symbol {1}.".format(val, name), - line_feeder.get_filename(), - line_feeder.get_linenr()) - else: - unset_match = _unset_re_match(line) - if unset_match: - name = unset_match.group(1) - if name in self.syms: - sym = self.syms[name] - if sym.user_val is not None: - warn_override(line_feeder.get_filename(), - line_feeder.get_linenr(), - name, sym.user_val, "n") - - sym._set_user_value_no_invalidate("n", True) - - def write_config(self, filename, header = None): - """Writes out symbol values in the familiar .config format. - - Kconfiglib makes sure the format matches what the C implementation - would generate, down to whitespace. This eases testing. - - filename -- The filename under which to save the configuration. - - header (default: None) -- A textual header that will appear at the - beginning of the file, with each line commented out - automatically. None means no header.""" - - # already_written is set when _make_conf() is called on a symbol, so - # that symbols defined in multiple locations only get one entry in the - # .config. We need to reset it prior to writing out a new .config. - for sym in self.syms_iter(): - sym.already_written = False - - with open(filename, "w") as f: - # Write header - if header is not None: - f.write(_comment(header)) - f.write("\n") - - # Write configuration. - - # Passing a list around to all the nodes and appending to it to - # avoid copying was surprisingly a lot slower with PyPy, and about - # as fast with Python. Passing the file around was slower too. Been - # a while since I last measured though. - - f.write("\n".join(_make_block_conf(self.top_block))) - f.write("\n") - - def get_kconfig_filename(self): - """Returns the name of the (base) kconfig file this configuration was - loaded from.""" - return self.filename - - def get_arch(self): - """Returns the value the environment variable ARCH had at the time the - Config instance was created, or None if ARCH was not set. For the - kernel, this corresponds to the architecture being built for, with - values such as "i386" or "mips".""" - return self.arch - - def get_srcarch(self): - """Returns the value the environment variable SRCARCH had at the time - the Config instance was created, or None if SRCARCH was not set. For - the kernel, this corresponds to the particular arch/ subdirectory - containing architecture-specific code.""" - return self.srcarch - - def get_srctree(self): - """Returns the value the environment variable srctree had at the time - the Config instance was created, or None if srctree was not defined. - This variable points to the source directory and is used when building - in a separate directory.""" - return self.srctree - - def get_config_filename(self): - """Returns the filename of the most recently loaded configuration file, - or None if no configuration has been loaded.""" - return self.config_filename - - def get_mainmenu_text(self): - """Returns the text of the 'mainmenu' statement (with $-references to - symbols replaced by symbol values), or None if the configuration has no - 'mainmenu' statement.""" - return None if self.mainmenu_text is None else \ - self._expand_sym_refs(self.mainmenu_text) - - def get_defconfig_filename(self): - """Returns the name of the defconfig file, which is the first existing - file in the list given in a symbol having 'option defconfig_list' set. - $-references to symbols will be expanded ("$FOO bar" -> "foo bar" if - FOO has the value "foo"). Returns None in case of no defconfig file. - Setting 'option defconfig_list' on multiple symbols currently results - in undefined behavior. - - If the environment variable 'srctree' was set when the Config was - created, get_defconfig_filename() will first look relative to that - directory before looking in the current directory; see - Config.__init__(). - - WARNING: A wart here is that scripts/kconfig/Makefile sometimes uses the - --defconfig= option when calling the C implementation of e.g. - 'make defconfig'. This option overrides the 'option defconfig_list' - symbol, meaning the result from get_defconfig_filename() might not - match what 'make defconfig' would use. That probably ought to be worked - around somehow, so that this function always gives the "expected" - result.""" - if self.defconfig_sym is None: - return None - for filename, cond_expr in self.defconfig_sym.def_exprs: - if self._eval_expr(cond_expr) == "y": - filename = self._expand_sym_refs(filename) - # We first look in $srctree. os.path.join() won't work here as - # an absolute path in filename would override $srctree. - srctree_filename = os.path.normpath(self.srctree + "/" + filename) - if os.path.exists(srctree_filename): - return srctree_filename - if os.path.exists(filename): - return filename - return None - - def get_symbol(self, name): - """Returns the symbol with name 'name', or None if no such symbol - appears in the configuration. An alternative shorthand is conf[name], - where conf is a Config instance, though that will instead raise - KeyError if the symbol does not exist.""" - return self.syms.get(name) - - def get_top_level_items(self): - """Returns a list containing the items (symbols, menus, choice - statements and comments) at the top level of the configuration -- that - is, all items that do not appear within a menu or choice. The items - appear in the same order as within the configuration.""" - return self.top_block - - def get_symbols(self, all_symbols = True): - """Returns a list of symbols from the configuration. An alternative for - iterating over all defined symbols (in the order of definition) is - - for sym in config: - ... - - which relies on Config implementing __iter__() and is equivalent to - - for sym in config.get_symbols(False): - ... - - all_symbols (default: True) -- If True, all symbols -- including special - and undefined symbols -- will be included in the result, in - an undefined order. If False, only symbols actually defined - and not merely referred to in the configuration will be - included in the result, and will appear in the order that - they are defined within the Kconfig configuration files.""" - return self.syms.values() if all_symbols else self.kconfig_syms - - def get_choices(self): - """Returns a list containing all choice statements in the - configuration, in the order they appear in the Kconfig files.""" - return self.choices - - def get_menus(self): - """Returns a list containing all menus in the configuration, in the - order they appear in the Kconfig files.""" - return self.menus - - def get_comments(self): - """Returns a list containing all comments in the configuration, in the - order they appear in the Kconfig files.""" - return self.comments - - def eval(self, s): - """Returns the value of the expression 's' -- where 's' is represented - as a string -- in the context of the configuration. Raises - Kconfig_Syntax_Error if syntax errors are detected in 's'. - - For example, if FOO and BAR are tristate symbols at least one of which - has the value "y", then config.eval("y && (FOO || BAR)") => "y" - - This function always yields a tristate value. To get the value of - non-bool, non-tristate symbols, use Symbol.get_value(). - - The result of this function is consistent with how evaluation works for - conditional expressions in the configuration as well as in the C - implementation. "m" and m are rewritten as '"m" && MODULES' and 'm && - MODULES', respectively, and a result of "m" will get promoted to "y" if - we're running without modules. - - Syntax checking is somewhat lax, partly to be compatible with lax - parsing in the C implementation.""" - return self._eval_expr(self._parse_expr(self._tokenize(s, True), # Feed - None, # Current symbol or choice - s)) # line - - def get_config_header(self): - """Returns the (uncommented) textual header of the .config file most - recently loaded with load_config(). Returns None if no .config file has - been loaded or if the most recently loaded .config file has no header. - The header comprises all lines up to but not including the first line - that either - - 1. Does not start with "#" - 2. Has the form "# CONFIG_FOO is not set." - """ - return self.config_header - - def get_base_dir(self): - """Returns the base directory relative to which 'source' statements - will work, passed as an argument to Config.__init__().""" - return self.base_dir - - def set_print_warnings(self, print_warnings): - """Determines whether warnings related to this configuration (for - things like attempting to assign illegal values to symbols with - Symbol.set_user_value()) should be printed to stderr. - - print_warnings -- True if warnings should be printed.""" - self.print_warnings = print_warnings - - def set_print_undef_assign(self, print_undef_assign): - """Determines whether informational messages related to assignments to - undefined symbols should be printed to stderr for this configuration. - - print_undef_assign -- If True, such messages will be printed.""" - self.print_undef_assign = print_undef_assign - - def __getitem__(self, key): - """Returns the symbol with name 'name'. Raises KeyError if the symbol - does not appear in the configuration.""" - return self.syms[key] - - def __iter__(self): - """Convenience function for iterating over the set of all defined - symbols in the configuration, used like - - for sym in conf: - ... - - The iteration happens in the order of definition within the Kconfig - configuration files. Symbols only referred to but not defined will not - be included, nor will the special symbols n, m, and y. If you want to - include such symbols as well, see config.get_symbols().""" - return iter(self.kconfig_syms) - - def unset_user_values(self): - """Resets the values of all symbols, as if Config.load_config() or - Symbol.set_user_value() had never been called.""" - for sym in self.syms_iter(): - sym._unset_user_value_no_recursive_invalidate() - - def __str__(self): - """Returns a string containing various information about the Config.""" - return _sep_lines("Configuration", - "File : " + self.filename, - "Base directory : " + self.base_dir, - "Value of $ARCH at creation time : " + - ("(not set)" if self.arch is None else self.arch), - "Value of $SRCARCH at creation time : " + - ("(not set)" if self.srcarch is None else self.srcarch), - "Source tree (derived from $srctree;", - "defaults to '.' if $srctree isn't set) : " + self.srctree, - "Most recently loaded .config : " + - ("(no .config loaded)" if self.config_filename is None else - self.config_filename), - "Print warnings : " + - bool_str[self.print_warnings], - "Print assignments to undefined symbols : " + - bool_str[self.print_undef_assign]) - - # - # Private methods - # - - def _invalidate_all(self): - for sym in self.syms_iter(): - sym._invalidate() - - def _tokenize(self, s, for_eval = False, filename = None, linenr = None): - """Returns a _Feed instance containing tokens derived from the string - 's'. Registers any new symbols encountered (via _sym_lookup()). - - (I experimented with a pure regular expression implementation, but it - came out slower, less readable, and wouldn't have been as flexible.) - - for_eval -- True when parsing an expression for a call to - Config.eval(), in which case we should not treat the first - token specially nor register new symbols.""" - - # lstrip() would work here too, but removing the '\n' at the end leads - # to earlier termination in the 'while' loop below, saving lots of - # calls - s = s.strip() - if s == "" or s[0] == "#": - return _Feed([]) - - if for_eval: - i = 0 # The current index in the string being tokenized - previous = None # The previous token seen - tokens = [] - else: - # The initial word on a line is parsed specially. Let - # command_chars = [A-Za-z0-9_]. Then - # - leading non-command_chars characters on the line are ignored, and - # - the first token consists the following one or more command_chars - # characters. - # This is why things like "----help--" are accepted. - - initial_token_match = _initial_token_re_match(s) - if initial_token_match is None: - return _Feed([]) - # The current index in the string being tokenized - i = initial_token_match.end() - - keyword = _get_keyword(initial_token_match.group(1)) - if keyword is None: - # We expect a keyword as the first token - _tokenization_error(s, filename, linenr) - if keyword == T_HELP: - # Avoid junk after "help", e.g. "---", being registered as a - # symbol - return _Feed([T_HELP]) - tokens = [keyword] - previous = keyword - - # _tokenize() is a hotspot during parsing, and this speeds things up a - # bit - strlen = len(s) - append = tokens.append - - # Main tokenization loop. (Handles tokens past the first one.) - while i < strlen: - # Test for an identifier/keyword preceded by whitespace first; this - # is the most common case. - id_keyword_match = _id_keyword_re_match(s, i) - if id_keyword_match: - # We have an identifier or keyword. The above also stripped any - # whitespace for us. - name = id_keyword_match.group(1) - # Jump past it - i = id_keyword_match.end() - - # Keyword? - keyword = _get_keyword(name) - if keyword is not None: - append(keyword) - # What would ordinarily be considered a name is treated as a - # string after certain tokens. - elif previous in string_lex: - append(name) - else: - # We're dealing with a symbol. _sym_lookup() will take care - # of allocating a new Symbol instance if it's the first - # time we see it. - sym = self._sym_lookup(name, not for_eval) - - if previous == T_CONFIG or previous == T_MENUCONFIG: - # If the previous token is T_(MENU)CONFIG - # ("(menu)config"), we're tokenizing the first line of - # a symbol definition, and should remember this as a - # location where the symbol is defined. - sym.def_locations.append((filename, linenr)) - else: - # Otherwise, it's a reference to the symbol - sym.ref_locations.append((filename, linenr)) - - append(sym) - - else: - # This restrips whitespace that could have been stripped in the - # regex above, but it's worth it since identifiers/keywords are - # more common - s = s[i:].lstrip() - if s == "": - break - c = s[0] - i = 1 - - # String literal (constant symbol) - if c == '"' or c == "'": - if "\\" in s: - # Slow path: This could probably be sped up, but it's a - # very unusual case anyway. - quote = c - val = "" - while 1: - if i >= len(s): - _tokenization_error(s, filename, linenr) - c = s[i] - if c == quote: - break - if c == "\\": - if i + 1 >= len(s): - _tokenization_error(s, filename, linenr) - val += s[i + 1] - i += 2 - else: - val += c - i += 1 - i += 1 - append(val) - else: - # Fast path: If the string contains no backslashes (almost - # always) we can simply look for the matching quote. - end = s.find(c, i) - if end == -1: - _tokenization_error(s, filename, linenr) - append(s[i:end]) - i = end + 1 - - elif c == "&": - # Invalid characters are ignored - if i >= len(s) or s[i] != "&": continue - append(T_AND) - i += 1 - - elif c == "|": - # Invalid characters are ignored - if i >= len(s) or s[i] != "|": continue - append(T_OR) - i += 1 - - elif c == "!": - if i < len(s) and s[i] == "=": - append(T_UNEQUAL) - i += 1 - else: - append(T_NOT) - - elif c == "=": append(T_EQUAL) - elif c == "(": append(T_OPEN_PAREN) - elif c == ")": append(T_CLOSE_PAREN) - elif c == "#": break # Comment - - else: continue # Invalid characters are ignored - - previous = tokens[-1] - - return _Feed(tokens) - - # - # Parsing - # - - # Expression grammar: - # - # -> - # '=' - # '!=' - # '(' ')' - # '!' - # '&&' - # '||' - - def _parse_expr(self, feed, cur_sym_or_choice, line, filename = None, - linenr = None, transform_m = True): - """Parse an expression from the tokens in 'feed' using a simple - top-down approach. The result has the form (, ). - - feed -- _Feed instance containing the tokens for the expression. - - cur_sym_or_choice -- The symbol or choice currently being parsed, or - None if we're not parsing a symbol or choice. - Used for recording references to symbols. - - line -- The line containing the expression being parsed. - - filename (default: None) -- The file containing the expression. - - linenr (default: None) -- The line number containing the expression. - - transform_m (default: False) -- Determines if 'm' should be rewritten to - 'm && MODULES' -- see - parse_val_and_cond().""" - - # Use instance variables to avoid having to pass these as arguments - # through the top-down parser in _parse_expr_2(), which is tedious and - # obfuscates the code. A profiler run shows no noticeable performance - # difference. - self.parse_expr_cur_sym_or_choice = cur_sym_or_choice - self.parse_expr_line = line - self.parse_expr_filename = filename - self.parse_expr_linenr = linenr - self.parse_expr_transform_m = transform_m - - return self._parse_expr_2(feed) - - def _parse_expr_2(self, feed): - or_terms = [self._parse_or_term(feed)] - # Keep parsing additional terms while the lookahead is '||' - while feed.check(T_OR): - or_terms.append(self._parse_or_term(feed)) - return or_terms[0] if len(or_terms) == 1 else (OR, or_terms) - - def _parse_or_term(self, feed): - and_terms = [self._parse_factor(feed)] - # Keep parsing additional terms while the lookahead is '&&' - while feed.check(T_AND): - and_terms.append(self._parse_factor(feed)) - return and_terms[0] if len(and_terms) == 1 else (AND, and_terms) - - def _parse_factor(self, feed): - if feed.check(T_OPEN_PAREN): - expr_parse = self._parse_expr_2(feed) - - if not feed.check(T_CLOSE_PAREN): - _parse_error(self.parse_expr_line, - "missing end parenthesis.", - self.parse_expr_filename, - self.parse_expr_linenr) - - return expr_parse - - if feed.check(T_NOT): - return (NOT, self._parse_factor(feed)) - - sym_or_string = feed.get_next() - - if not isinstance(sym_or_string, (Symbol, str)): - _parse_error(self.parse_expr_line, - "malformed expression.", - self.parse_expr_filename, - self.parse_expr_linenr) - - if self.parse_expr_cur_sym_or_choice is not None and \ - isinstance(sym_or_string, Symbol): - self.parse_expr_cur_sym_or_choice.referenced_syms.add(sym_or_string) - - next_token = feed.peek_next() - - # For conditional expressions ('depends on ', '... if ', - # etc.), "m" and m are rewritten to "m" && MODULES. - if next_token != T_EQUAL and next_token != T_UNEQUAL: - if self.parse_expr_transform_m and (sym_or_string is self.m or - sym_or_string == "m"): - return (AND, ["m", self._sym_lookup("MODULES")]) - return sym_or_string - - relation = EQUAL if (feed.get_next() == T_EQUAL) else UNEQUAL - sym_or_string_2 = feed.get_next() - - if self.parse_expr_cur_sym_or_choice is not None and \ - isinstance(sym_or_string_2, Symbol): - self.parse_expr_cur_sym_or_choice.referenced_syms.add(sym_or_string_2) - - if sym_or_string is self.m: - sym_or_string = "m" - if sym_or_string_2 is self.m: - sym_or_string_2 = "m" - - return (relation, sym_or_string, sym_or_string_2) - - def _parse_file(self, filename, parent, deps, visible_if_deps, res = None): - """Parses the Kconfig file 'filename'. Returns a list with the Items in - the file. See _parse_block() for the meaning of the parameters.""" - return self._parse_block(_FileFeed(filename), None, parent, deps, - visible_if_deps, res) - - def _parse_block(self, line_feeder, end_marker, parent, deps, - visible_if_deps = None, res = None): - """Parses a block, which is the contents of either a file or an if, - menu, or choice statement. Returns a list with the Items in the block. - - end_marker -- The token that ends the block, e.g. T_ENDIF ("endif") for - if's. None for files. - - parent -- The enclosing menu, choice or if, or None if we're at the top - level. - - deps -- Dependencies from enclosing menus, choices and if's. - - visible_if_deps (default: None) -- 'visible if' dependencies from - enclosing menus. - - res (default: None) -- The list to add items to. If None, a new list is - created to hold the items.""" - - block = [] if res is None else res - - while 1: - # Do we already have a tokenized line that we determined wasn't - # part of whatever we were parsing earlier? See comment in - # Config.__init__(). - if self.end_line is not None: - line = self.end_line - tokens = self.end_line_tokens - tokens.go_to_start() - - self.end_line = None - self.end_line_tokens = None - else: - line = line_feeder.get_next() - if line is None: - if end_marker is not None: - raise Kconfig_Syntax_Error( - "Unexpected end of file {0}." - .format(line_feeder.get_filename())) - return block - - tokens = self._tokenize(line, False, - line_feeder.get_filename(), - line_feeder.get_linenr()) - - t0 = tokens.get_next() - if t0 is None: - continue - - # Cases are ordered roughly by frequency, which speeds things up a - # bit - - if t0 == T_CONFIG or t0 == T_MENUCONFIG: - # The tokenizer will automatically allocate a new Symbol object - # for any new names it encounters, so we don't need to worry - # about that here. - sym = tokens.get_next() - - # Symbols defined in multiple places get the parent of their - # first definition. However, for symbols whose parents are choice - # statements, the choice statement takes precedence. - if not sym.is_defined_ or isinstance(parent, Choice): - sym.parent = parent - - sym.is_defined_ = True - - self.kconfig_syms.append(sym) - block.append(sym) - - self._parse_properties(line_feeder, sym, deps, visible_if_deps) - - elif t0 == T_SOURCE: - kconfig_file = tokens.get_next() - exp_kconfig_file = self._expand_sym_refs(kconfig_file) - f = os.path.join(self.base_dir, exp_kconfig_file) - - if not os.path.exists(f): - raise IOError('{0}:{1}: sourced file "{2}" (expands to ' - '"{3}") not found. Perhaps base_dir ' - '(argument to Config.__init__(), currently ' - '"{4}") is set to the wrong value.' - .format(line_feeder.get_filename(), - line_feeder.get_linenr(), - kconfig_file, exp_kconfig_file, - self.base_dir)) - - # Add items to the same block - self._parse_file(f, parent, deps, visible_if_deps, block) - - elif t0 == end_marker: - # We have reached the end of the block - return block - - elif t0 == T_IF: - # If statements are treated as syntactic sugar for adding - # dependencies to enclosed items and do not have an explicit - # object representation. - - dep_expr = self._parse_expr(tokens, None, line, - line_feeder.get_filename(), - line_feeder.get_linenr()) - self._parse_block(line_feeder, - T_ENDIF, - parent, - _make_and(dep_expr, deps), - visible_if_deps, - block) # Add items to the same block - - elif t0 == T_COMMENT: - comment = Comment() - - comment.config = self - comment.parent = parent - comment.filename = line_feeder.get_filename() - comment.linenr = line_feeder.get_linenr() - comment.text = tokens.get_next() - - self.comments.append(comment) - block.append(comment) - - self._parse_properties(line_feeder, comment, deps, visible_if_deps) - - elif t0 == T_MENU: - menu = Menu() - - menu.config = self - menu.parent = parent - menu.filename = line_feeder.get_filename() - menu.linenr = line_feeder.get_linenr() - menu.title = tokens.get_next() - - self.menus.append(menu) - block.append(menu) - - # Parse properties and contents - self._parse_properties(line_feeder, menu, deps, visible_if_deps) - menu.block = self._parse_block(line_feeder, - T_ENDMENU, - menu, - menu.dep_expr, - _make_and(visible_if_deps, - menu.visible_if_expr)) - - elif t0 == T_CHOICE: - name = tokens.get_next() - if name is None: - choice = Choice() - self.choices.append(choice) - else: - # Named choice - choice = self.named_choices.get(name) - if choice is None: - choice = Choice() - choice.name = name - self.named_choices[name] = choice - self.choices.append(choice) - - choice.config = self - choice.parent = parent - - choice.def_locations.append((line_feeder.get_filename(), - line_feeder.get_linenr())) - - # Parse properties and contents - self._parse_properties(line_feeder, choice, deps, visible_if_deps) - choice.block = self._parse_block(line_feeder, - T_ENDCHOICE, - choice, - deps, - visible_if_deps) - - choice._determine_actual_symbols() - - # If no type is set for the choice, its type is that of the first - # choice item - if choice.type == UNKNOWN: - for item in choice.get_symbols(): - if item.type != UNKNOWN: - choice.type = item.type - break - - # Each choice item of UNKNOWN type gets the type of the choice - for item in choice.get_symbols(): - if item.type == UNKNOWN: - item.type = choice.type - - block.append(choice) - - elif t0 == T_MAINMENU: - text = tokens.get_next() - - if self.mainmenu_text is not None: - self._warn("overriding 'mainmenu' text. " - 'Old value: "{0}", new value: "{1}".' - .format(self.mainmenu_text, text), - line_feeder.get_filename(), - line_feeder.get_linenr()) - - self.mainmenu_text = text - - else: - _parse_error(line, "unrecognized construct.", - line_feeder.get_filename(), - line_feeder.get_linenr()) - - def _parse_properties(self, line_feeder, stmt, deps, visible_if_deps): - """Parsing of properties for symbols, menus, choices, and comments.""" - - def parse_val_and_cond(tokens, line, filename, linenr): - """Parses ' if ' constructs, where the 'if' part is - optional. Returns a tuple containing the parsed expressions, with - None as the second element if the 'if' part is missing.""" - val = self._parse_expr(tokens, stmt, line, filename, linenr, False) - if tokens.check(T_IF): - return (val, self._parse_expr(tokens, stmt, line, filename, linenr)) - return (val, None) - - # In case the symbol is defined in multiple locations, we need to - # remember what prompts, defaults, and selects are new for this - # definition, as "depends on" should only apply to the local - # definition. - new_prompt = None - new_def_exprs = [] - new_selects = [] - - # Dependencies from 'depends on' statements - depends_on_expr = None - - while 1: - line = line_feeder.get_next() - if line is None: - break - - filename = line_feeder.get_filename() - linenr = line_feeder.get_linenr() - - tokens = self._tokenize(line, False, filename, linenr) - - t0 = tokens.get_next() - if t0 is None: - continue - - # Cases are ordered roughly by frequency, which speeds things up a - # bit - - if t0 == T_DEPENDS: - if not tokens.check(T_ON): - _parse_error(line, 'expected "on" after "depends".', filename, linenr) - - parsed_deps = self._parse_expr(tokens, stmt, line, filename, linenr) - - if isinstance(stmt, (Menu, Comment)): - stmt.dep_expr = _make_and(stmt.dep_expr, parsed_deps) - else: - depends_on_expr = _make_and(depends_on_expr, parsed_deps) - - elif t0 == T_HELP: - # Find first non-blank (not all-space) line and get its - # indentation - - line_feeder.remove_blank() - line = line_feeder.get_next() - if line is None: - stmt.help = "" - break - - indent = _indentation(line) - if indent == 0: - # If the first non-empty lines has zero indent, there is no - # help text - stmt.help = "" - line_feeder.go_back() - break - - # The help text goes on till the first non-empty line with less - # indent - help_lines = [_deindent(line, indent)] - while 1: - line = line_feeder.get_next() - if line is None or \ - (not line.isspace() and _indentation(line) < indent): - stmt.help = "".join(help_lines) - break - help_lines.append(_deindent(line, indent)) - - if line is None: - break - - line_feeder.go_back() - - elif t0 == T_SELECT: - target = tokens.get_next() - - stmt.referenced_syms.add(target) - stmt.selected_syms.add(target) - - if tokens.check(T_IF): - new_selects.append((target, - self._parse_expr(tokens, stmt, line, filename, linenr))) - else: - new_selects.append((target, None)) - - elif t0 in (T_BOOL, T_TRISTATE, T_INT, T_HEX, T_STRING): - stmt.type = token_to_type[t0] - if len(tokens) > 1: - new_prompt = parse_val_and_cond(tokens, line, filename, linenr) - - elif t0 == T_DEFAULT: - new_def_exprs.append(parse_val_and_cond(tokens, line, filename, linenr)) - - elif t0 == T_DEF_BOOL: - stmt.type = BOOL - if len(tokens) > 1: - new_def_exprs.append(parse_val_and_cond(tokens, line, filename, linenr)) - - elif t0 == T_PROMPT: - # 'prompt' properties override each other within a single - # definition of a symbol, but additional prompts can be added - # by defining the symbol multiple times; hence 'new_prompt' - # instead of 'prompt'. - new_prompt = parse_val_and_cond(tokens, line, filename, linenr) - - elif t0 == T_RANGE: - lower = tokens.get_next() - upper = tokens.get_next() - stmt.referenced_syms.add(lower) - stmt.referenced_syms.add(upper) - - if tokens.check(T_IF): - stmt.ranges.append((lower, upper, - self._parse_expr(tokens, stmt, line, filename, linenr))) - else: - stmt.ranges.append((lower, upper, None)) - - elif t0 == T_DEF_TRISTATE: - stmt.type = TRISTATE - if len(tokens) > 1: - new_def_exprs.append(parse_val_and_cond(tokens, line, filename, linenr)) - - elif t0 == T_OPTION: - if tokens.check(T_ENV) and tokens.check(T_EQUAL): - env_var = tokens.get_next() - - stmt.is_special_ = True - stmt.is_from_env = True - - if env_var not in os.environ: - self._warn("The symbol {0} references the " - "non-existent environment variable {1} and " - "will get the empty string as its value. " - "If you're using kconfiglib via " - "'make (i)scriptconfig', it should have " - "set up the environment correctly for you. " - "If you still got this message, that " - "might be an error, and you should email " - "ulfalizer a.t Google's email service.""" - .format(stmt.name, env_var), - filename, linenr) - - stmt.cached_val = "" - else: - stmt.cached_val = os.environ[env_var] - - elif tokens.check(T_DEFCONFIG_LIST): - self.defconfig_sym = stmt - - elif tokens.check(T_MODULES): - # To reduce warning spam, only warn if 'option modules' is - # set on some symbol that isn't MODULES, which should be - # safe. I haven't run into any projects that make use - # modules besides the kernel yet, and there it's likely to - # keep being called "MODULES". - if stmt.name != "MODULES": - self._warn("the 'modules' option is not supported. " - "Let me know if this is a problem for you; " - "it shouldn't be that hard to implement. " - "(Note that modules are still supported -- " - "Kconfiglib just assumes the symbol name " - "MODULES, like older versions of the C " - "implementation did when 'option modules' " - "wasn't used.)", - filename, linenr) - - elif tokens.check(T_ALLNOCONFIG_Y): - if not isinstance(stmt, Symbol): - _parse_error(line, - "the 'allnoconfig_y' option is only valid for symbols.", - filename, - linenr) - stmt.allnoconfig_y = True - - else: - _parse_error(line, "unrecognized option.", filename, linenr) - - elif t0 == T_VISIBLE: - if not tokens.check(T_IF): - _parse_error(line, 'expected "if" after "visible".', filename, linenr) - if not isinstance(stmt, Menu): - _parse_error(line, - "'visible if' is only valid for menus.", - filename, - linenr) - - parsed_deps = self._parse_expr(tokens, stmt, line, filename, linenr) - stmt.visible_if_expr = _make_and(stmt.visible_if_expr, parsed_deps) - - elif t0 == T_OPTIONAL: - if not isinstance(stmt, Choice): - _parse_error(line, - '"optional" is only valid for choices.', - filename, - linenr) - stmt.optional = True - - else: - # See comment in Config.__init__() - self.end_line = line - self.end_line_tokens = tokens - break - - # Propagate dependencies from enclosing menus and if's. - - # For menus and comments.. - if isinstance(stmt, (Menu, Comment)): - stmt.orig_deps = stmt.dep_expr - stmt.deps_from_containing = deps - stmt.dep_expr = _make_and(stmt.dep_expr, deps) - - stmt.all_referenced_syms = \ - stmt.referenced_syms | _get_expr_syms(deps) - - # For symbols and choices.. - else: - - # See comment for 'menu_dep' - stmt.menu_dep = depends_on_expr - - # Propagate dependencies specified with 'depends on' to any new - # default expressions, prompts, and selections. ("New" since a - # symbol might be defined in multiple places and the dependencies - # should only apply to the local definition.) - - new_def_exprs = [(val_expr, _make_and(cond_expr, depends_on_expr)) - for val_expr, cond_expr in new_def_exprs] - - new_selects = [(target, _make_and(cond_expr, depends_on_expr)) - for target, cond_expr in new_selects] - - if new_prompt is not None: - prompt, cond_expr = new_prompt - - # 'visible if' dependencies from enclosing menus get propagated - # to prompts - if visible_if_deps is not None: - cond_expr = _make_and(cond_expr, visible_if_deps) - - new_prompt = (prompt, _make_and(cond_expr, depends_on_expr)) - - # We save the original expressions -- before any menu and if - # conditions have been propagated -- so these can be retrieved - # later. - - stmt.orig_def_exprs.extend(new_def_exprs) - if new_prompt is not None: - stmt.orig_prompts.append(new_prompt) - - # Only symbols can select - if isinstance(stmt, Symbol): - stmt.orig_selects.extend(new_selects) - - # Save dependencies from enclosing menus and if's - stmt.deps_from_containing = deps - - # The set of symbols referenced directly by the symbol/choice plus - # all symbols referenced by enclosing menus and if's. - stmt.all_referenced_syms = \ - stmt.referenced_syms | _get_expr_syms(deps) - - # Propagate dependencies from enclosing menus and if's - - stmt.def_exprs.extend([(val_expr, _make_and(cond_expr, deps)) - for val_expr, cond_expr in new_def_exprs]) - - for target, cond in new_selects: - target.rev_dep = _make_or(target.rev_dep, - _make_and(stmt, - _make_and(cond, deps))) - - if new_prompt is not None: - prompt, cond_expr = new_prompt - stmt.prompts.append((prompt, _make_and(cond_expr, deps))) - - # - # Symbol table manipulation - # - - def _sym_lookup(self, name, add_sym_if_not_exists = True): - """Fetches the symbol 'name' from the symbol table, optionally adding - it if it does not exist (this is usually what we want).""" - if name in self.syms: - return self.syms[name] - - new_sym = Symbol() - new_sym.config = self - new_sym.name = name - - if add_sym_if_not_exists: - self.syms[name] = new_sym - else: - # This warning is generated while evaluating an expression - # containing undefined symbols using Config.eval() - self._warn("no symbol {0} in configuration".format(name)) - - return new_sym - - # - # Evaluation of symbols and expressions - # - - def _eval_expr(self, expr): - """Evaluates an expression and returns one of the tristate values "n", - "m" or "y".""" - res = self._eval_expr_2(expr) - - # Promote "m" to "y" if we're running without modules. Internally, "m" - # is often rewritten to "m" && MODULES by both the C implementation and - # kconfiglib, which takes care of cases where "m" should be false if - # we're running without modules. - if res == "m" and not self._has_modules(): - return "y" - - return res - - def _eval_expr_2(self, expr): - if expr is None: - return "y" - - if isinstance(expr, Symbol): - # Non-bool/tristate symbols are always "n" in a tristate sense, - # regardless of their value - if expr.type != BOOL and expr.type != TRISTATE: - return "n" - return expr.get_value() - - if isinstance(expr, str): - return expr if (expr == "y" or expr == "m") else "n" - - first_expr = expr[0] - - if first_expr == AND: - res = "y" - for subexpr in expr[1]: - ev = self._eval_expr_2(subexpr) - # Return immediately upon discovering an "n" term - if ev == "n": - return "n" - if ev == "m": - res = "m" - # 'res' is either "m" or "y" here; we already handled the - # short-circuiting "n" case in the loop. - return res - - if first_expr == OR: - res = "n" - for subexpr in expr[1]: - ev = self._eval_expr_2(subexpr) - # Return immediately upon discovering a "y" term - if ev == "y": - return "y" - if ev == "m": - res = "m" - # 'res' is either "n" or "m" here; we already handled the - # short-circuiting "y" case in the loop. - return res - - if first_expr == NOT: - ev = self._eval_expr_2(expr[1]) - if ev == "y": - return "n" - return "y" if (ev == "n") else "m" - - if first_expr == EQUAL: - return "y" if (_str_val(expr[1]) == _str_val(expr[2])) else "n" - - if first_expr == UNEQUAL: - return "y" if (_str_val(expr[1]) != _str_val(expr[2])) else "n" - - _internal_error("Internal error while evaluating expression: " - "unknown operation {0}.".format(first_expr)) - - def _eval_min(self, e1, e2): - """Returns the minimum value of the two expressions. Equates None with - 'y'.""" - e1_eval = self._eval_expr(e1) - e2_eval = self._eval_expr(e2) - return e1_eval if tri_less(e1_eval, e2_eval) else e2_eval - - def _eval_max(self, e1, e2): - """Returns the maximum value of the two expressions. Equates None with - 'y'.""" - e1_eval = self._eval_expr(e1) - e2_eval = self._eval_expr(e2) - return e1_eval if tri_greater(e1_eval, e2_eval) else e2_eval - - # - # Methods related to the MODULES symbol - # - - def _has_modules(self): - modules_sym = self.syms.get("MODULES") - return (modules_sym is not None) and (modules_sym.get_value() == "y") - - # - # Dependency tracking - # - - def _build_dep(self): - """Populates the Symbol.dep sets, linking the symbol to the symbols - that immediately depend on it in the sense that changing the value of - the symbol might affect the values of those other symbols. This is used - for caching/invalidation purposes. The calculated sets might be larger - than necessary as we don't do any complicated analysis of the - expressions.""" - - # Adds 'sym' as a directly dependent symbol to all symbols that appear - # in the expression 'e' - def add_expr_deps(e, sym): - for s in _get_expr_syms(e): - s.dep.add(sym) - - # The directly dependent symbols of a symbol are: - # - Any symbols whose prompts, default values, rev_dep (select - # condition), or ranges depend on the symbol - # - Any symbols that belong to the same choice statement as the symbol - # (these won't be included in 'dep' as that makes the dependency - # graph unwieldy, but Symbol._get_dependent() will include them) - # - Any symbols in a choice statement that depends on the symbol - for sym in self.syms_iter(): - for _, e in sym.prompts: - add_expr_deps(e, sym) - - for v, e in sym.def_exprs: - add_expr_deps(v, sym) - add_expr_deps(e, sym) - - add_expr_deps(sym.rev_dep, sym) - - for l, u, e in sym.ranges: - add_expr_deps(l, sym) - add_expr_deps(u, sym) - add_expr_deps(e, sym) - - if sym.is_choice_symbol_: - choice = sym.parent - for _, e in choice.prompts: - add_expr_deps(e, sym) - for _, e in choice.def_exprs: - add_expr_deps(e, sym) - - def _expr_val_str(self, expr, no_value_str = "(none)", get_val_instead_of_eval = False): - # Since values are valid expressions, _expr_to_str() will get a nice - # string representation for those as well. - - if expr is None: - return no_value_str - - if get_val_instead_of_eval: - if isinstance(expr, str): - return _expr_to_str(expr) - val = expr.get_value() - else: - val = self._eval_expr(expr) - - return "{0} (value: {1})".format(_expr_to_str(expr), _expr_to_str(val)) - - def _expand_sym_refs(self, s): - """Expands $-references to symbols in 's' to symbol values, or to the - empty string for undefined symbols.""" - - while 1: - sym_ref_match = _sym_ref_re_search(s) - if sym_ref_match is None: - return s - - sym_name = sym_ref_match.group(0)[1:] - sym = self.syms.get(sym_name) - expansion = "" if sym is None else sym.get_value() - - s = s[:sym_ref_match.start()] + \ - expansion + \ - s[sym_ref_match.end():] - - def _get_sym_or_choice_str(self, sc): - """Symbols and choices have many properties in common, so we factor out - common __str__() stuff here. "sc" is short for "symbol or choice".""" - - # As we deal a lot with string representations here, use some - # convenient shorthand: - s = _expr_to_str - - # - # Common symbol/choice properties - # - - user_val_str = "(no user value)" if sc.user_val is None else s(sc.user_val) - - # Build prompts string - if sc.prompts == []: - prompts_str = " (no prompts)" - else: - prompts_str_rows = [] - for prompt, cond_expr in sc.orig_prompts: - if cond_expr is None: - prompts_str_rows.append(' "{0}"'.format(prompt)) - else: - prompts_str_rows.append(' "{0}" if {1}' - .format(prompt, self._expr_val_str(cond_expr))) - prompts_str = "\n".join(prompts_str_rows) - - # Build locations string - if sc.def_locations == []: - locations_str = "(no locations)" - else: - locations_str = " ".join(["{0}:{1}".format(filename, linenr) for - (filename, linenr) in sc.def_locations]) - - # Build additional-dependencies-from-menus-and-if's string - additional_deps_str = " " + self._expr_val_str(sc.deps_from_containing, - "(no additional dependencies)") - - # - # Symbol-specific stuff - # - - if isinstance(sc, Symbol): - # Build ranges string - if isinstance(sc, Symbol): - if sc.ranges == []: - ranges_str = " (no ranges)" - else: - ranges_str_rows = [] - for l, u, cond_expr in sc.ranges: - if cond_expr is None: - ranges_str_rows.append(" [{0}, {1}]".format(s(l), s(u))) - else: - ranges_str_rows.append(" [{0}, {1}] if {2}" - .format(s(l), s(u), self._expr_val_str(cond_expr))) - ranges_str = "\n".join(ranges_str_rows) - - # Build default values string - if sc.def_exprs == []: - defaults_str = " (no default values)" - else: - defaults_str_rows = [] - for val_expr, cond_expr in sc.orig_def_exprs: - row_str = " " + self._expr_val_str(val_expr, "(none)", sc.type == STRING) - defaults_str_rows.append(row_str) - defaults_str_rows.append(" Condition: " + self._expr_val_str(cond_expr)) - defaults_str = "\n".join(defaults_str_rows) - - # Build selects string - if sc.orig_selects == []: - selects_str = " (no selects)" - else: - selects_str_rows = [] - for target, cond_expr in sc.orig_selects: - if cond_expr is None: - selects_str_rows.append(" {0}".format(target.name)) - else: - selects_str_rows.append(" {0} if ".format(target.name) + - self._expr_val_str(cond_expr)) - selects_str = "\n".join(selects_str_rows) - - res = _sep_lines("Symbol " + - ("(no name)" if sc.name is None else sc.name), - "Type : " + typename[sc.type], - "Value : " + s(sc.get_value()), - "User value : " + user_val_str, - "Visibility : " + s(sc.get_visibility()), - "Is choice item : " + bool_str[sc.is_choice_symbol_], - "Is defined : " + bool_str[sc.is_defined_], - "Is from env. : " + bool_str[sc.is_from_env], - "Is special : " + bool_str[sc.is_special_] + "\n") - if sc.ranges != []: - res += _sep_lines("Ranges:", - ranges_str + "\n") - res += _sep_lines("Prompts:", - prompts_str, - "Default values:", - defaults_str, - "Selects:", - selects_str, - "Reverse (select-related) dependencies:", - " (no reverse dependencies)" if sc.rev_dep == "n" - else " " + self._expr_val_str(sc.rev_dep), - "Additional dependencies from enclosing menus and if's:", - additional_deps_str, - "Locations: " + locations_str) - - return res - - # - # Choice-specific stuff - # - - # Build selected symbol string - sel = sc.get_selection() - sel_str = "(no selection)" if sel is None else sel.name - - # Build default values string - if sc.def_exprs == []: - defaults_str = " (no default values)" - else: - defaults_str_rows = [] - for sym, cond_expr in sc.orig_def_exprs: - if cond_expr is None: - defaults_str_rows.append(" {0}".format(sym.name)) - else: - defaults_str_rows.append(" {0} if ".format(sym.name) + - self._expr_val_str(cond_expr)) - defaults_str = "\n".join(defaults_str_rows) - - # Build contained symbols string - names = [sym.name for sym in sc.get_symbols()] - syms_string = "(empty)" if names == [] else " ".join(names) - - return _sep_lines("Choice", - "Name (for named choices): " + - ("(no name)" if sc.name is None else sc.name), - "Type : " + typename[sc.type], - "Selected symbol : " + sel_str, - "User value : " + user_val_str, - "Mode : " + s(sc.get_mode()), - "Visibility : " + s(sc.get_visibility()), - "Optional : " + bool_str[sc.optional], - "Prompts:", - prompts_str, - "Defaults:", - defaults_str, - "Choice symbols:", - " " + syms_string, - "Additional dependencies from enclosing menus and if's:", - additional_deps_str, - "Locations: " + locations_str) - - def _expr_depends_on(self, expr, sym): - """Reimplementation of expr_depends_symbol() from mconf.c. Used to - determine if a submenu should be implicitly created, which influences what - items inside choice statements are considered choice items.""" - if expr is None: - return False - - def rec(expr): - if isinstance(expr, str): - return False - if isinstance(expr, Symbol): - return expr is sym - - e0 = expr[0] - if e0 == EQUAL or e0 == UNEQUAL: - return self._eq_to_sym(expr) is sym - if e0 == AND: - for and_expr in expr[1]: - if rec(and_expr): - return True - return False - - return rec(expr) - - def _eq_to_sym(self, eq): - """_expr_depends_on() helper. For (in)equalities of the form sym = y/m - or sym != n, returns sym. For other (in)equalities, returns None.""" - relation, left, right = eq - left = self._transform_n_m_y(left) - right = self._transform_n_m_y(right) - - # Make sure the symbol (if any) appears to the left - if not isinstance(left, Symbol): - left, right = right, left - if not isinstance(left, Symbol): - return None - if (relation == EQUAL and (right == "y" or right == "m")) or \ - (relation == UNEQUAL and right == "n"): - return left - return None - - def _transform_n_m_y(self, item): - """_eq_to_sym() helper. Translates the symbols n, m, and y to their - string equivalents.""" - if item is self.n: - return "n" - if item is self.m: - return "m" - if item is self.y: - return "y" - return item - - def _warn(self, msg, filename = None, linenr = None): - """For printing warnings to stderr.""" - if self.print_warnings: - _stderr_msg("warning: " + msg, filename, linenr) - -class Item(object): - - """Base class for symbols and other Kconfig constructs. Subclasses are - Symbol, Choice, Menu, and Comment.""" - - def is_symbol(self): - """Returns True if the item is a symbol. Short for - isinstance(item, kconfiglib.Symbol).""" - return isinstance(self, Symbol) - - def is_choice(self): - """Returns True if the item is a choice. Short for - isinstance(item, kconfiglib.Choice).""" - return isinstance(self, Choice) - - def is_menu(self): - """Returns True if the item is a menu. Short for - isinstance(item, kconfiglib.Menu).""" - return isinstance(self, Menu) - - def is_comment(self): - """Returns True if the item is a comment. Short for - isinstance(item, kconfiglib.Comment).""" - return isinstance(self, Comment) - -class Symbol(Item): - - """Represents a configuration symbol - e.g. FOO for - - config FOO - ...""" - - # - # Public interface - # - - def get_value(self): - """Calculate and return the value of the symbol. See also - Symbol.set_user_value().""" - - if self.cached_val is not None: - return self.cached_val - - self.write_to_conf = False - - # As a quirk of Kconfig, undefined symbols get their name as their - # value. This is why things like "FOO = bar" work for seeing if FOO has - # the value "bar". - if self.type == UNKNOWN: - self.cached_val = self.name - return self.name - - new_val = default_value[self.type] - - vis = _get_visibility(self) - - if self.type == BOOL or self.type == TRISTATE: - # The visibility and mode (modules-only or single-selection) of - # choice items will be taken into account in _get_visibility() - if self.is_choice_symbol_: - if vis != "n": - choice = self.parent - mode = choice.get_mode() - - self.write_to_conf = (mode != "n") - - if mode == "y": - new_val = "y" if (choice.get_selection() is self) else "n" - elif mode == "m": - if self.user_val == "m" or self.user_val == "y": - new_val = "m" - - else: - # If the symbol is visible and has a user value, use that. - # Otherwise, look at defaults. - use_defaults = True - - if vis != "n": - self.write_to_conf = True - if self.user_val is not None: - new_val = self.config._eval_min(self.user_val, vis) - use_defaults = False - - if use_defaults: - for val_expr, cond_expr in self.def_exprs: - cond_eval = self.config._eval_expr(cond_expr) - if cond_eval != "n": - self.write_to_conf = True - new_val = self.config._eval_min(val_expr, cond_eval) - break - - # Reverse (select-related) dependencies take precedence - rev_dep_val = self.config._eval_expr(self.rev_dep) - if rev_dep_val != "n": - self.write_to_conf = True - new_val = self.config._eval_max(new_val, rev_dep_val) - - # Promote "m" to "y" for booleans - if new_val == "m" and self.type == BOOL: - new_val = "y" - - elif self.type == STRING: - use_defaults = True - - if vis != "n": - self.write_to_conf = True - if self.user_val is not None: - new_val = self.user_val - use_defaults = False - - if use_defaults: - for val_expr, cond_expr in self.def_exprs: - if self.config._eval_expr(cond_expr) != "n": - self.write_to_conf = True - new_val = _str_val(val_expr) - break - - elif self.type == HEX or self.type == INT: - has_active_range = False - low = None - high = None - use_defaults = True - - base = 16 if self.type == HEX else 10 - - for(l, h, cond_expr) in self.ranges: - if self.config._eval_expr(cond_expr) != "n": - has_active_range = True - - low_str = _str_val(l) - high_str = _str_val(h) - low = int(low_str, base) if \ - _is_base_n(low_str, base) else 0 - high = int(high_str, base) if \ - _is_base_n(high_str, base) else 0 - - break - - if vis != "n": - self.write_to_conf = True - - if self.user_val is not None and \ - _is_base_n(self.user_val, base) and \ - (not has_active_range or - low <= int(self.user_val, base) <= high): - - # If the user value is OK, it is stored in exactly the same - # form as specified in the assignment (with or without - # "0x", etc). - - use_defaults = False - new_val = self.user_val - - if use_defaults: - for val_expr, cond_expr in self.def_exprs: - if self.config._eval_expr(cond_expr) != "n": - self.write_to_conf = True - - # If the default value is OK, it is stored in exactly - # the same form as specified. Otherwise, it is clamped - # to the range, and the output has "0x" as appropriate - # for the type. - - new_val = _str_val(val_expr) - - if _is_base_n(new_val, base): - new_val_num = int(new_val, base) - if has_active_range: - clamped_val = None - - if new_val_num < low: - clamped_val = low - elif new_val_num > high: - clamped_val = high - - if clamped_val is not None: - new_val = (hex(clamped_val) if \ - self.type == HEX else str(clamped_val)) - - break - else: # For the for loop - # If no user value or default kicks in but the hex/int has - # an active range, then the low end of the range is used, - # provided it's > 0, with "0x" prepended as appropriate. - if has_active_range and low > 0: - new_val = (hex(low) if self.type == HEX else str(low)) - - self.cached_val = new_val - return new_val - - def set_user_value(self, v): - """Sets the user value of the symbol. - - Equal in effect to assigning the value to the symbol within a .config - file. Use get_lower/upper_bound() or get_assignable_values() to find - the range of currently assignable values for bool and tristate symbols; - setting values outside this range will cause the user value to differ - from the result of Symbol.get_value() (be truncated). Values that are - invalid for the type (such as a_bool.set_user_value("foo")) are - ignored, and a warning is emitted if an attempt is made to assign such - a value. - - For any type of symbol, is_modifiable() can be used to check if a user - value will currently have any effect on the symbol, as determined by - its visibility and range of assignable values. Any value that is valid - for the type (bool, tristate, etc.) will end up being reflected in - get_user_value() though, and might have an effect later if conditions - change. To get rid of the user value, use unset_user_value(). - - Any symbols dependent on the symbol are (recursively) invalidated, so - things will just work with regards to dependencies. - - v -- The user value to give to the symbol.""" - self._set_user_value_no_invalidate(v, False) - - # There might be something more efficient you could do here, but play - # it safe. - if self.name == "MODULES": - self.config._invalidate_all() - return - - self._invalidate() - self._invalidate_dependent() - - def unset_user_value(self): - """Resets the user value of the symbol, as if the symbol had never - gotten a user value via Config.load_config() or - Symbol.set_user_value().""" - self._unset_user_value_no_recursive_invalidate() - self._invalidate_dependent() - - def get_user_value(self): - """Returns the value assigned to the symbol in a .config or via - Symbol.set_user_value() (provided the value was valid for the type of the - symbol). Returns None in case of no user value.""" - return self.user_val - - def get_name(self): - """Returns the name of the symbol.""" - return self.name - - def get_prompts(self): - """Returns a list of prompts defined for the symbol, in the order they - appear in the configuration files. Returns the empty list for symbols - with no prompt. - - This list will have a single entry for the vast majority of symbols - having prompts, but having multiple prompts for a single symbol is - possible through having multiple 'config' entries for it.""" - return [prompt for prompt, _ in self.orig_prompts] - - def get_upper_bound(self): - """For string/hex/int symbols and for bool and tristate symbols that - cannot be modified (see is_modifiable()), returns None. - - Otherwise, returns the highest value the symbol can be set to with - Symbol.set_user_value() (that will not be truncated): one of "m" or "y", - arranged from lowest to highest. This corresponds to the highest value - the symbol could be given in e.g. the 'make menuconfig' interface. - - See also the tri_less*() and tri_greater*() functions, which could come - in handy.""" - if self.type != BOOL and self.type != TRISTATE: - return None - rev_dep = self.config._eval_expr(self.rev_dep) - # A bool selected to "m" gets promoted to "y" - if self.type == BOOL and rev_dep == "m": - rev_dep = "y" - vis = _get_visibility(self) - if (tri_to_int[vis] - tri_to_int[rev_dep]) > 0: - return vis - return None - - def get_lower_bound(self): - """For string/hex/int symbols and for bool and tristate symbols that - cannot be modified (see is_modifiable()), returns None. - - Otherwise, returns the lowest value the symbol can be set to with - Symbol.set_user_value() (that will not be truncated): one of "n" or "m", - arranged from lowest to highest. This corresponds to the lowest value - the symbol could be given in e.g. the 'make menuconfig' interface. - - See also the tri_less*() and tri_greater*() functions, which could come - in handy.""" - if self.type != BOOL and self.type != TRISTATE: - return None - rev_dep = self.config._eval_expr(self.rev_dep) - # A bool selected to "m" gets promoted to "y" - if self.type == BOOL and rev_dep == "m": - rev_dep = "y" - if (tri_to_int[_get_visibility(self)] - tri_to_int[rev_dep]) > 0: - return rev_dep - return None - - def get_assignable_values(self): - """For string/hex/int symbols and for bool and tristate symbols that - cannot be modified (see is_modifiable()), returns the empty list. - - Otherwise, returns a list containing the user values that can be - assigned to the symbol (that won't be truncated). Usage example: - - if "m" in sym.get_assignable_values(): - sym.set_user_value("m") - - This is basically a more convenient interface to - get_lower/upper_bound() when wanting to test if a particular tristate - value can be assigned.""" - if self.type != BOOL and self.type != TRISTATE: - return [] - rev_dep = self.config._eval_expr(self.rev_dep) - # A bool selected to "m" gets promoted to "y" - if self.type == BOOL and rev_dep == "m": - rev_dep = "y" - res = ["n", "m", "y"][tri_to_int[rev_dep] : - tri_to_int[_get_visibility(self)] + 1] - return res if len(res) > 1 else [] - - def get_type(self): - """Returns the type of the symbol: one of UNKNOWN, BOOL, TRISTATE, - STRING, HEX, or INT. These are defined at the top level of the module, - so you'd do something like - - if sym.get_type() == kconfiglib.STRING: - ...""" - return self.type - - def get_visibility(self): - """Returns the visibility of the symbol: one of "n", "m" or "y". For - bool and tristate symbols, this is an upper bound on the value users - can set for the symbol. For other types of symbols, a visibility of "n" - means the user value will be ignored. A visibility of "n" corresponds - to not being visible in the 'make *config' interfaces. - - Example (assuming we're running with modules enabled -- i.e., MODULES - set to 'y'): - - # Assume this has been assigned 'n' - config N_SYM - tristate "N_SYM" - - # Assume this has been assigned 'm' - config M_SYM - tristate "M_SYM" - - # Has visibility 'n' - config A - tristate "A" - depends on N_SYM - - # Has visibility 'm' - config B - tristate "B" - depends on M_SYM - - # Has visibility 'y' - config C - tristate "C" - - # Has no prompt, and hence visibility 'n' - config D - tristate - - Having visibility be tri-valued ensures that e.g. a symbol cannot be - set to "y" by the user if it depends on a symbol with value "m", which - wouldn't be safe. - - You should probably look at get_lower/upper_bound(), - get_assignable_values() and is_modifiable() before using this.""" - return _get_visibility(self) - - def get_parent(self): - """Returns the menu or choice statement that contains the symbol, or - None if the symbol is at the top level. Note that if statements are - treated as syntactic and do not have an explicit class - representation.""" - return self.parent - - def get_referenced_symbols(self, refs_from_enclosing = False): - """Returns the set() of all symbols referenced by this symbol. For - example, the symbol defined by - - config FOO - bool - prompt "foo" if A && B - default C if D - depends on E - select F if G - - references the symbols A through G. - - refs_from_enclosing (default: False) -- If True, the symbols - referenced by enclosing menus and if's will be - included in the result.""" - return self.all_referenced_syms if refs_from_enclosing else self.referenced_syms - - def get_selected_symbols(self): - """Returns the set() of all symbols X for which this symbol has a - 'select X' or 'select X if Y' (regardless of whether Y is satisfied or - not). This is a subset of the symbols returned by - get_referenced_symbols().""" - return self.selected_syms - - def get_help(self): - """Returns the help text of the symbol, or None if the symbol has no - help text.""" - return self.help - - def get_config(self): - """Returns the Config instance this symbol is from.""" - return self.config - - def get_def_locations(self): - """Returns a list of (filename, linenr) tuples, where filename (string) - and linenr (int) represent a location where the symbol is defined. For - the vast majority of symbols this list will only contain one element. - For the following Kconfig, FOO would get two entries: the lines marked - with *. - - config FOO * - bool "foo prompt 1" - - config FOO * - bool "foo prompt 2" - """ - return self.def_locations - - def get_ref_locations(self): - """Returns a list of (filename, linenr) tuples, where filename (string) - and linenr (int) represent a location where the symbol is referenced in - the configuration. For example, the lines marked by * would be included - for FOO below: - - config A - bool - default BAR || FOO * - - config B - tristate - depends on FOO * - default m if FOO * - - if FOO * - config A - bool "A" - endif - - config FOO (definition not included) - bool - """ - return self.ref_locations - - def is_modifiable(self): - """Returns True if the value of the symbol could be modified by calling - Symbol.set_user_value(). - - For bools and tristates, this corresponds to the symbol being visible - in the 'make menuconfig' interface and not already being pinned to a - specific value (e.g. because it is selected by another symbol). - - For strings and numbers, this corresponds to just being visible. (See - Symbol.get_visibility().)""" - if self.is_special_: - return False - if self.type == BOOL or self.type == TRISTATE: - rev_dep = self.config._eval_expr(self.rev_dep) - # A bool selected to "m" gets promoted to "y" - if self.type == BOOL and rev_dep == "m": - rev_dep = "y" - return (tri_to_int[_get_visibility(self)] - - tri_to_int[rev_dep]) > 0 - return _get_visibility(self) != "n" - - def is_defined(self): - """Returns False if the symbol is referred to in the Kconfig but never - actually defined.""" - return self.is_defined_ - - def is_special(self): - """Returns True if the symbol is one of the special symbols n, m, y, or - UNAME_RELEASE, or gets its value from the environment.""" - return self.is_special_ - - def is_from_environment(self): - """Returns True if the symbol gets its value from the environment.""" - return self.is_from_env - - def has_ranges(self): - """Returns True if the symbol is of type INT or HEX and has ranges that - limit what values it can take on.""" - return self.ranges != [] - - def is_choice_symbol(self): - """Returns True if the symbol is in a choice statement and is an actual - choice symbol (see Choice.get_symbols()).""" - return self.is_choice_symbol_ - - def is_choice_selection(self): - """Returns True if the symbol is contained in a choice statement and is - the selected item. Equivalent to - 'sym.is_choice_symbol() and sym.get_parent().get_selection() is sym'.""" - return self.is_choice_symbol_ and self.parent.get_selection() is self - - def is_allnoconfig_y(self): - """Returns True if the symbol has the 'allnoconfig_y' option set.""" - return self.allnoconfig_y - - def __str__(self): - """Returns a string containing various information about the symbol.""" - return self.config._get_sym_or_choice_str(self) - - # - # Private methods - # - - def __init__(self): - """Symbol constructor -- not intended to be called directly by - kconfiglib clients.""" - - self.prompts = [] - self.cached_visibility = None - - self.config = None - - self.parent = None - self.name = None - self.type = UNKNOWN - - self.def_exprs = [] - self.ranges = [] - self.rev_dep = "n" - - # The prompt, default value and select conditions without any - # dependencies from menus or if's propagated to them - - self.orig_prompts = [] - self.orig_def_exprs = [] - self.orig_selects = [] - - # Dependencies inherited from containing menus and if's - self.deps_from_containing = None - - self.help = None - - # The set of symbols referenced by this symbol (see - # get_referenced_symbols()) - self.referenced_syms = set() - - # The set of symbols selected by this symbol (see - # get_selected_symbols()) - self.selected_syms = set() - - # Like 'referenced_syms', but includes symbols from - # dependencies inherited from enclosing menus and if's - self.all_referenced_syms = set() - - # This is set to True for "actual" choice symbols. See - # Choice._determine_actual_symbols(). The trailing underscore avoids a - # collision with is_choice_symbol(). - self.is_choice_symbol_ = False - - # This records only dependencies specified with 'depends on'. Needed - # when determining actual choice items (hrrrr...). See also - # Choice._determine_actual_symbols(). - self.menu_dep = None - - # See Symbol.get_ref/def_locations(). - self.def_locations = [] - self.ref_locations = [] - - self.user_val = None - - # Flags - - # Should the symbol get an entry in .config? - self.write_to_conf = False - - # Caches the calculated value - self.cached_val = None - - # Populated in Config._build_dep() after parsing. Links the symbol to - # the symbols that immediately depend on it (in a caching/invalidation - # sense). The total set of dependent symbols for the symbol (the - # transitive closure) is calculated on an as-needed basis in - # _get_dependent(). - self.dep = set() - - # Caches the total list of dependent symbols. Calculated in - # _get_dependent(). - self.cached_deps = None - - # Does the symbol have an entry in the Kconfig file? The trailing - # underscore avoids a collision with is_defined(). - self.is_defined_ = False - - # Does the symbol get its value in some special way, e.g. from the - # environment or by being one of the special symbols n, m, and y? If - # so, the value is stored in self.cached_val, which is never - # invalidated. The trailing underscore avoids a collision with - # is_special(). - self.is_special_ = False - - # Does the symbol get its value from the environment? - self.is_from_env = False - - # Does the symbol have the 'allnoconfig_y' option set? - self.allnoconfig_y = False - - def _invalidate(self): - if self.is_special_: - return - - if self.is_choice_symbol_: - self.parent._invalidate() - - self.cached_val = None - self.cached_visibility = None - self.write_to_conf = False - - def _invalidate_dependent(self): - for sym in self._get_dependent(): - sym._invalidate() - - def _set_user_value_no_invalidate(self, v, suppress_load_warnings): - """Like set_user_value(), but does not invalidate any symbols. - - suppress_load_warnings -- - some warnings are annoying when loading a .config that can be helpful - when manually invoking set_user_value(). This flag is set to True to - suppress such warnings. - - Perhaps this could be made optional for load_config() instead.""" - - if self.is_special_: - if self.is_from_env: - self.config._warn('attempt to assign the value "{0}" to the ' - 'symbol {1}, which gets its value from the ' - 'environment. Assignment ignored.' - .format(v, self.name)) - else: - self.config._warn('attempt to assign the value "{0}" to the ' - 'special symbol {1}. Assignment ignored.' - .format(v, self.name)) - return - - if not self.is_defined_: - filename, linenr = self.ref_locations[0] - if self.config.print_undef_assign: - _stderr_msg('note: attempt to assign the value "{0}" to {1}, ' - "which is referenced at {2}:{3} but never " - "defined. Assignment ignored." - .format(v, self.name, filename, linenr)) - return - - # Check if the value is valid for our type - if not ((self.type == BOOL and (v == "y" or v == "n") ) or - (self.type == TRISTATE and (v == "y" or v == "m" or - v == "n") ) or - (self.type == STRING ) or - (self.type == INT and _is_base_n(v, 10) ) or - (self.type == HEX and _is_base_n(v, 16) )): - self.config._warn('the value "{0}" is invalid for {1}, which has type {2}. ' - "Assignment ignored." - .format(v, self.name, typename[self.type])) - return - - if self.prompts == [] and not suppress_load_warnings: - self.config._warn('assigning "{0}" to the symbol {1} which ' - 'lacks prompts and thus has visibility "n". ' - 'The assignment will have no effect.' - .format(v, self.name)) - - self.user_val = v - - if self.is_choice_symbol_ and (self.type == BOOL or - self.type == TRISTATE): - choice = self.parent - if v == "y": - choice.user_val = self - choice.user_mode = "y" - elif v == "m": - choice.user_val = None - choice.user_mode = "m" - - def _unset_user_value_no_recursive_invalidate(self): - self._invalidate() - self.user_val = None - - if self.is_choice_symbol_: - self.parent._unset_user_value() - - def _make_conf(self): - if self.already_written: - return [] - - self.already_written = True - - # Note: write_to_conf is determined in get_value() - val = self.get_value() - if not self.write_to_conf: - return [] - - if self.type == BOOL or self.type == TRISTATE: - if val == "m" or val == "y": - return ["CONFIG_{0}={1}".format(self.name, val)] - return ["# CONFIG_{0} is not set".format(self.name)] - - elif self.type == STRING: - # Escape \ and " - return ['CONFIG_{0}="{1}"' - .format(self.name, - val.replace("\\", "\\\\").replace('"', '\\"'))] - - elif self.type == INT or self.type == HEX: - return ["CONFIG_{0}={1}".format(self.name, val)] - - else: - _internal_error('Internal error while creating .config: unknown type "{0}".' - .format(self.type)) - - def _get_dependent(self): - """Returns the set of symbols that should be invalidated if the value - of the symbol changes, because they might be affected by the change. - Note that this is an internal API -- it's probably of limited - usefulness to clients.""" - if self.cached_deps is not None: - return self.cached_deps - - res = set() - - self._add_dependent_ignore_siblings(res) - if self.is_choice_symbol_: - for s in self.parent.get_symbols(): - if s is not self: - res.add(s) - s._add_dependent_ignore_siblings(res) - - self.cached_deps = res - return res - - def _add_dependent_ignore_siblings(self, to): - """Calculating dependencies gets a bit tricky for choice items as they - all depend on each other, potentially leading to infinite recursion. - This helper function calculates dependencies ignoring the other symbols - in the choice. It also works fine for symbols that are not choice - items.""" - for s in self.dep: - to.add(s) - to |= s._get_dependent() - - def _has_auto_menu_dep_on(self, on): - """See Choice._determine_actual_symbols().""" - if not isinstance(self.parent, Choice): - _internal_error("Attempt to determine auto menu dependency for symbol ouside of choice.") - - if self.prompts == []: - # If we have no prompt, use the menu dependencies instead (what was - # specified with 'depends on') - return self.menu_dep is not None and \ - self.config._expr_depends_on(self.menu_dep, on) - - for _, cond_expr in self.prompts: - if self.config._expr_depends_on(cond_expr, on): - return True - - return False - -class Menu(Item): - - """Represents a menu statement.""" - - # - # Public interface - # - - def get_config(self): - """Return the Config instance this menu is from.""" - return self.config - - def get_visibility(self): - """Returns the visibility of the menu. This also affects the visibility - of subitems. See also Symbol.get_visibility().""" - return self.config._eval_expr(self.dep_expr) - - def get_visible_if_visibility(self): - """Returns the visibility the menu gets from its 'visible if' - condition. "y" if the menu has no 'visible if' condition.""" - return self.config._eval_expr(self.visible_if_expr) - - def get_items(self, recursive = False): - """Returns a list containing the items (symbols, menus, choice - statements and comments) in in the menu, in the same order that the - items appear within the menu. - - recursive (default: False) -- True if items contained in items within - the menu should be included - recursively (preorder).""" - - if not recursive: - return self.block - - res = [] - for item in self.block: - res.append(item) - if isinstance(item, Menu): - res.extend(item.get_items(True)) - elif isinstance(item, Choice): - res.extend(item.get_items()) - return res - - def get_symbols(self, recursive = False): - """Returns a list containing the symbols in the menu, in the same order - that they appear within the menu. - - recursive (default: False) -- True if symbols contained in items within - the menu should be included - recursively.""" - - return [item for item in self.get_items(recursive) if isinstance(item, Symbol)] - - def get_title(self): - """Returns the title text of the menu.""" - return self.title - - def get_parent(self): - """Returns the menu or choice statement that contains the menu, or - None if the menu is at the top level. Note that if statements are - treated as syntactic sugar and do not have an explicit class - representation.""" - return self.parent - - def get_referenced_symbols(self, refs_from_enclosing = False): - """See Symbol.get_referenced_symbols().""" - return self.all_referenced_syms if refs_from_enclosing else self.referenced_syms - - def get_location(self): - """Returns the location of the menu as a (filename, linenr) tuple, - where filename is a string and linenr an int.""" - return (self.filename, self.linenr) - - def __str__(self): - """Returns a string containing various information about the menu.""" - depends_on_str = self.config._expr_val_str(self.orig_deps, - "(no dependencies)") - visible_if_str = self.config._expr_val_str(self.visible_if_expr, - "(no dependencies)") - - additional_deps_str = " " + self.config._expr_val_str(self.deps_from_containing, - "(no additional dependencies)") - - return _sep_lines("Menu", - "Title : " + self.title, - "'depends on' dependencies : " + depends_on_str, - "'visible if' dependencies : " + visible_if_str, - "Additional dependencies from enclosing menus and if's:", - additional_deps_str, - "Location: {0}:{1}".format(self.filename, self.linenr)) - - # - # Private methods - # - - def __init__(self): - """Menu constructor -- not intended to be called directly by - kconfiglib clients.""" - - self.config = None - - self.parent = None - self.title = None - self.block = None - self.dep_expr = None - - # Dependency expression without dependencies from enclosing menus and - # if's propagated - self.orig_deps = None - - # Dependencies inherited from containing menus and if's - self.deps_from_containing = None - - # The 'visible if' expression - self.visible_if_expr = None - - # The set of symbols referenced by this menu (see - # get_referenced_symbols()) - self.referenced_syms = set() - - # Like 'referenced_syms', but includes symbols from - # dependencies inherited from enclosing menus and if's - self.all_referenced_syms = None - - self.filename = None - self.linenr = None - - def _make_conf(self): - item_conf = _make_block_conf(self.block) - - if self.config._eval_expr(self.dep_expr) != "n" and \ - self.config._eval_expr(self.visible_if_expr) != "n": - return ["\n#\n# {0}\n#".format(self.title)] + item_conf - return item_conf - -class Choice(Item): - - """Represents a choice statement. A choice can be in one of three modes: - - "n" - The choice is not visible and no symbols can be selected. - - "m" - Any number of symbols can be set to "m". The rest will be "n". This - is safe since potentially conflicting options don't actually get - compiled into the kernel simultaneously with "m". - - "y" - One symbol will be "y" while the rest are "n". - - Only tristate choices can be in "m" mode, and the visibility of the choice - is an upper bound on the mode, so that e.g. a choice that depends on a - symbol with value "m" will be in "m" mode. - - The mode changes automatically when a value is assigned to a symbol within - the choice. - - See Symbol.get_visibility() too.""" - - # - # Public interface - # - - def get_selection(self): - """Returns the symbol selected (either by the user or through - defaults), or None if either no symbol is selected or the mode is not - "y".""" - if self.cached_selection is not None: - if self.cached_selection == NO_SELECTION: - return None - return self.cached_selection - - if self.get_mode() != "y": - return self._cache_ret(None) - - # User choice available? - if self.user_val is not None and _get_visibility(self.user_val) == "y": - return self._cache_ret(self.user_val) - - if self.optional: - return self._cache_ret(None) - - return self._cache_ret(self.get_selection_from_defaults()) - - def get_selection_from_defaults(self): - """Like Choice.get_selection(), but acts as if no symbol has been - selected by the user and no 'optional' flag is in effect.""" - - if self.actual_symbols == []: - return None - - for symbol, cond_expr in self.def_exprs: - if self.config._eval_expr(cond_expr) != "n": - chosen_symbol = symbol - break - else: - chosen_symbol = self.actual_symbols[0] - - # Is the chosen symbol visible? - if _get_visibility(chosen_symbol) != "n": - return chosen_symbol - # Otherwise, pick the first visible symbol - for sym in self.actual_symbols: - if _get_visibility(sym) != "n": - return sym - return None - - def get_user_selection(self): - """If the choice is in "y" mode and has a user-selected symbol, returns - that symbol. Otherwise, returns None.""" - return self.user_val - - def get_config(self): - """Returns the Config instance this choice is from.""" - return self.config - - def get_name(self): - """For named choices, returns the name. Returns None for unnamed - choices. No named choices appear anywhere in the kernel Kconfig files - as of Linux 3.7.0-rc8.""" - return self.name - - def get_prompts(self): - """Returns a list of prompts defined for the choice, in the order they - appear in the configuration files. Returns the empty list for choices - with no prompt. - - This list will have a single entry for the vast majority of choices - having prompts, but having multiple prompts for a single choice is - possible through having multiple 'choice' entries for it (though I'm - not sure if that ever happens in practice).""" - return [prompt for prompt, _ in self.orig_prompts] - - def get_help(self): - """Returns the help text of the choice, or None if the choice has no - help text.""" - return self.help - - def get_type(self): - """Returns the type of the choice. See Symbol.get_type().""" - return self.type - - def get_items(self): - """Gets all items contained in the choice in the same order as within - the configuration ("items" instead of "symbols" since choices and - comments might appear within choices. This only happens in one place as - of Linux 3.7.0-rc8, in drivers/usb/gadget/Kconfig).""" - return self.block - - def get_symbols(self): - """Returns a list containing the choice's symbols. - - A quirk (perhaps a bug) of Kconfig is that you can put items within a - choice that will not be considered members of the choice insofar as - selection is concerned. This happens for example if one symbol within a - choice 'depends on' the symbol preceding it, or if you put non-symbol - items within choices. - - As of Linux 3.7.0-rc8, this seems to be used intentionally in one - place: drivers/usb/gadget/Kconfig. - - This function returns the "proper" symbols of the choice in the order - they appear in the choice, excluding such items. If you want all items - in the choice, use get_items().""" - return self.actual_symbols - - def get_parent(self): - """Returns the menu or choice statement that contains the choice, or - None if the choice is at the top level. Note that if statements are - treated as syntactic sugar and do not have an explicit class - representation.""" - return self.parent - - def get_referenced_symbols(self, refs_from_enclosing = False): - """See Symbol.get_referenced_symbols().""" - return self.all_referenced_syms if refs_from_enclosing else self.referenced_syms - - def get_def_locations(self): - """Returns a list of (filename, linenr) tuples, where filename (string) - and linenr (int) represent a location where the choice is defined. For - the vast majority of choices (all of them as of Linux 3.7.0-rc8) this - list will only contain one element, but its possible for named choices - to be defined in multiple locations.""" - return self.def_locations - - def get_visibility(self): - """Returns the visibility of the choice statement: one of "n", "m" or - "y". This acts as an upper limit on the mode of the choice (though bool - choices can only have the mode "y"). See the class documentation for an - explanation of modes.""" - return _get_visibility(self) - - def get_mode(self): - """Returns the mode of the choice. See the class documentation for - an explanation of modes.""" - minimum_mode = "n" if self.optional else "m" - mode = self.user_mode if self.user_mode is not None else minimum_mode - mode = self.config._eval_min(mode, _get_visibility(self)) - - # Promote "m" to "y" for boolean choices - if mode == "m" and self.type == BOOL: - return "y" - - return mode - - def is_optional(self): - """Returns True if the choice has the 'optional' flag set (and so will - default to "n" mode).""" - return self.optional - - def __str__(self): - """Returns a string containing various information about the choice - statement.""" - return self.config._get_sym_or_choice_str(self) - - # - # Private methods - # - - def __init__(self): - """Choice constructor -- not intended to be called directly by - kconfiglib clients.""" - - self.prompts = [] - self.cached_visibility = None - - self.config = None - - self.parent = None - self.name = None # Yes, choices can be named - self.type = UNKNOWN - self.def_exprs = [] - self.help = None - self.optional = False - self.block = None - - # The prompts and default values without any dependencies from - # enclosing menus or if's propagated - - self.orig_prompts = [] - self.orig_def_exprs = [] - - # Dependencies inherited from containing menus and if's - self.deps_from_containing = None - - # We need to filter out symbols that appear within the choice block but - # are not considered choice items (see - # Choice._determine_actual_symbols()) This list holds the "actual" choice - # items. - self.actual_symbols = [] - - # The set of symbols referenced by this choice (see - # get_referenced_symbols()) - self.referenced_syms = set() - - # Like 'referenced_syms', but includes symbols from - # dependencies inherited from enclosing menus and if's - self.all_referenced_syms = set() - - # See Choice.get_def_locations() - self.def_locations = [] - - self.user_val = None - self.user_mode = None - - self.cached_selection = None - - def _determine_actual_symbols(self): - """If a symbol's visibility depends on the preceding symbol within a - choice, it is no longer viewed as a choice item. (This is quite - possibly a bug, but some things consciously use it... ugh. It stems - from automatic submenu creation.) In addition, it's possible to have - choices and comments within choices, and those shouldn't be considered - choice items either. Only drivers/usb/gadget/Kconfig seems to depend on - any of this. This method computes the "actual" items in the choice and - sets the is_choice_symbol_ flag on them (retrieved via - is_choice_symbol()). - - Don't let this scare you: an earlier version simply checked for a - sequence of symbols where all symbols after the first appeared in the - 'depends on' expression of the first, and that worked fine. The added - complexity is to be future-proof in the event that - drivers/usb/gadget/Kconfig turns even more sinister. It might very well - be overkilling things (especially if that file is refactored ;).""" - - # Items might depend on each other in a tree structure, so we need a - # stack to keep track of the current tentative parent - stack = [] - - for item in self.block: - if not isinstance(item, Symbol): - stack = [] - continue - - while stack != []: - if item._has_auto_menu_dep_on(stack[-1]): - # The item should not be viewed as a choice item, so don't - # set item.is_choice_symbol_. - stack.append(item) - break - else: - stack.pop() - else: - item.is_choice_symbol_ = True - self.actual_symbols.append(item) - stack.append(item) - - def _cache_ret(self, selection): - # As None is used to indicate the lack of a cached value we can't use - # that to cache the fact that the choice has no selection. Instead, we - # use the symbolic constant NO_SELECTION. - if selection is None: - self.cached_selection = NO_SELECTION - else: - self.cached_selection = selection - - return selection - - def _invalidate(self): - self.cached_selection = None - self.cached_visibility = None - - def _unset_user_value(self): - self._invalidate() - self.user_val = None - self.user_mode = None - - def _make_conf(self): - return _make_block_conf(self.block) - -class Comment(Item): - - """Represents a comment statement.""" - - # - # Public interface - # - - def get_config(self): - """Returns the Config instance this comment is from.""" - return self.config - - def get_visibility(self): - """Returns the visibility of the comment. See also - Symbol.get_visibility().""" - return self.config._eval_expr(self.dep_expr) - - def get_text(self): - """Returns the text of the comment.""" - return self.text - - def get_parent(self): - """Returns the menu or choice statement that contains the comment, or - None if the comment is at the top level. Note that if statements are - treated as syntactic sugar and do not have an explicit class - representation.""" - return self.parent - - def get_referenced_symbols(self, refs_from_enclosing = False): - """See Symbol.get_referenced_symbols().""" - return self.all_referenced_syms if refs_from_enclosing else self.referenced_syms - - def get_location(self): - """Returns the location of the comment as a (filename, linenr) tuple, - where filename is a string and linenr an int.""" - return (self.filename, self.linenr) - - def __str__(self): - """Returns a string containing various information about the comment.""" - dep_str = self.config._expr_val_str(self.orig_deps, "(no dependencies)") - - additional_deps_str = " " + self.config._expr_val_str(self.deps_from_containing, - "(no additional dependencies)") - - return _sep_lines("Comment", - "Text: " + str(self.text), - "Dependencies: " + dep_str, - "Additional dependencies from enclosing menus and if's:", - additional_deps_str, - "Location: {0}:{1}".format(self.filename, self.linenr)) - - # - # Private methods - # - - def __init__(self): - """Comment constructor -- not intended to be called directly by - kconfiglib clients.""" - - self.config = None - - self.parent = None - self.text = None - self.dep_expr = None - - # Dependency expression without dependencies from enclosing menus and - # if's propagated - self.orig_deps = None - - # Dependencies inherited from containing menus and if's - self.deps_from_containing = None - - # The set of symbols referenced by this comment (see - # get_referenced_symbols()) - self.referenced_syms = set() - - # Like 'referenced_syms', but includes symbols from - # dependencies inherited from enclosing menus and if's - self.all_referenced_syms = None - - self.filename = None - self.linenr = None - - def _make_conf(self): - if self.config._eval_expr(self.dep_expr) != "n": - return ["\n#\n# {0}\n#".format(self.text)] - return [] - -class Kconfig_Syntax_Error(Exception): - """Exception raised for syntax errors.""" - pass - -class Internal_Error(Exception): - """Exception raised for internal errors.""" - pass - -# -# Public functions -# - -def tri_less(v1, v2): - """Returns True if the tristate v1 is less than the tristate v2, where "n", - "m" and "y" are ordered from lowest to highest.""" - return tri_to_int[v1] < tri_to_int[v2] - -def tri_less_eq(v1, v2): - """Returns True if the tristate v1 is less than or equal to the tristate - v2, where "n", "m" and "y" are ordered from lowest to highest.""" - return tri_to_int[v1] <= tri_to_int[v2] - -def tri_greater(v1, v2): - """Returns True if the tristate v1 is greater than the tristate v2, where - "n", "m" and "y" are ordered from lowest to highest.""" - return tri_to_int[v1] > tri_to_int[v2] - -def tri_greater_eq(v1, v2): - """Returns True if the tristate v1 is greater than or equal to the tristate - v2, where "n", "m" and "y" are ordered from lowest to highest.""" - return tri_to_int[v1] >= tri_to_int[v2] - -# -# Internal classes -# - -class _Feed(object): - - """Class for working with sequences in a stream-like fashion; handy for tokens.""" - - def __init__(self, items): - self.items = items - self.length = len(self.items) - self.i = 0 - - def get_next(self): - if self.i >= self.length: - return None - - item = self.items[self.i] - self.i += 1 - return item - - def peek_next(self): - return None if self.i >= self.length else self.items[self.i] - - def check(self, token): - """Check if the next token is 'token'. If so, remove it from the token - feed and return True. Otherwise, leave it in and return False.""" - if self.i < self.length and self.items[self.i] == token: - self.i += 1 - return True - return False - - def go_back(self): - if self.i <= 0: - _internal_error("Attempt to move back in Feed while already at the beginning.") - self.i -= 1 - - def go_to_start(self): - self.i = 0 - - def __len__(self): - return self.length - -class _FileFeed(_Feed): - - """_Feed subclass that feeds lines from a file. Joins any line ending in - \\ with the following line. Keeps track of the filename and current line - number.""" - - def __init__(self, filename): - self.filename = _clean_up_path(filename) - _Feed.__init__(self, _get_lines(filename)) - - def remove_blank(self): - """Removes lines until the first non-blank (not all-space) line.""" - while self.i < self.length and self.items[self.i].isspace(): - self.i += 1 - - def get_filename(self): - return self.filename - - def get_linenr(self): - return self.i - -# -# Internal functions -# - -def _get_visibility(sc): - """Symbols and Choices have a "visibility" that acts as an upper bound on - the values a user can set for them, corresponding to the visibility in e.g. - 'make menuconfig'. This function calculates the visibility for the Symbol - or Choice 'sc' -- the logic is nearly identical.""" - if sc.cached_visibility is None: - vis = "n" - for _, cond_expr in sc.prompts: - vis = sc.config._eval_max(vis, cond_expr) - - if isinstance(sc, Symbol) and sc.is_choice_symbol_: - vis = sc.config._eval_min(vis, _get_visibility(sc.parent)) - - # Promote "m" to "y" if we're dealing with a non-tristate - if vis == "m" and sc.type != TRISTATE: - vis = "y" - - sc.cached_visibility = vis - - return sc.cached_visibility - -def _make_and(e1, e2): - """Constructs an AND (&&) expression. Performs trivial simplification. - Nones equate to 'y'. - - Note: returns None if e1 == e2 == None.""" - if e1 == "n" or e2 == "n": - return "n" - if e1 is None or e1 == "y": - return e2 - if e2 is None or e2 == "y": - return e1 - - # Prefer to merge/update argument list if possible instead of creating - # a new AND node - - if isinstance(e1, tuple) and e1[0] == AND: - if isinstance(e2, tuple) and e2[0] == AND: - return (AND, e1[1] + e2[1]) - return (AND, e1[1] + [e2]) - - if isinstance(e2, tuple) and e2[0] == AND: - return (AND, e2[1] + [e1]) - - return (AND, [e1, e2]) - -def _make_or(e1, e2): - """Constructs an OR (||) expression. Performs trivial simplification and - avoids Nones. Nones equate to 'y', which is usually what we want, but needs - to be kept in mind.""" - - # Perform trivial simplification and avoid None's (which - # correspond to y's) - if e1 is None or e2 is None or e1 == "y" or e2 == "y": - return "y" - if e1 == "n": - return e2 - if e2 == "n": - return e1 - - # Prefer to merge/update argument list if possible instead of creating - # a new OR node - - if isinstance(e1, tuple) and e1[0] == OR: - if isinstance(e2, tuple) and e2[0] == OR: - return (OR, e1[1] + e2[1]) - return (OR, e1[1] + [e2]) - - if isinstance(e2, tuple) and e2[0] == OR: - return (OR, e2[1] + [e1]) - - return (OR, [e1, e2]) - -def _get_expr_syms(expr): - """Returns the set() of symbols appearing in expr.""" - res = set() - if expr is None: - return res - - def rec(expr): - if isinstance(expr, Symbol): - res.add(expr) - return - if isinstance(expr, str): - return - - e0 = expr[0] - if e0 == AND or e0 == OR: - for term in expr[1]: - rec(term) - elif e0 == NOT: - rec(expr[1]) - elif e0 == EQUAL or e0 == UNEQUAL: - _, v1, v2 = expr - if isinstance(v1, Symbol): - res.add(v1) - if isinstance(v2, Symbol): - res.add(v2) - else: - _internal_error("Internal error while fetching symbols from an " - "expression with token stream {0}.".format(expr)) - - rec(expr) - return res - -def _str_val(obj): - """Returns the value of obj as a string. If obj is not a string (constant - symbol), it must be a Symbol.""" - return obj if isinstance(obj, str) else obj.get_value() - -def _make_block_conf(block): - """Returns a list of .config strings for a block (list) of items.""" - - # Collect the substrings in a list and later use join() instead of += to - # build the final .config contents. With older Python versions, this yields - # linear instead of quadratic complexity. - strings = [] - for item in block: - strings.extend(item._make_conf()) - return strings - -def _sym_str_string(sym_or_str): - if isinstance(sym_or_str, str): - return '"' + sym_or_str + '"' - return sym_or_str.name - -def _intersperse(lst, op): - """_expr_to_str() helper. Gets the string representation of each expression in lst - and produces a list where op has been inserted between the elements.""" - if lst == []: - return "" - - res = [] - - def handle_sub_expr(expr): - no_parens = isinstance(expr, (str, Symbol)) or \ - expr[0] in (EQUAL, UNEQUAL) or \ - precedence[op] <= precedence[expr[0]] - if not no_parens: - res.append("(") - res.extend(_expr_to_str_rec(expr)) - if not no_parens: - res.append(")") - - op_str = op_to_str[op] - - handle_sub_expr(lst[0]) - for expr in lst[1:]: - res.append(op_str) - handle_sub_expr(expr) - - return res - -def _expr_to_str_rec(expr): - if expr is None: - return [""] - - if isinstance(expr, (Symbol, str)): - return [_sym_str_string(expr)] - - e0 = expr[0] - - if e0 == AND or e0 == OR: - return _intersperse(expr[1], expr[0]) - - if e0 == NOT: - need_parens = not isinstance(expr[1], (str, Symbol)) - - res = ["!"] - if need_parens: - res.append("(") - res.extend(_expr_to_str_rec(expr[1])) - if need_parens: - res.append(")") - return res - - if e0 == EQUAL or e0 == UNEQUAL: - return [_sym_str_string(expr[1]), - op_to_str[expr[0]], - _sym_str_string(expr[2])] - -def _expr_to_str(expr): - return "".join(_expr_to_str_rec(expr)) - -def _indentation(line): - """Returns the length of the line's leading whitespace, treating tab stops - as being spaced 8 characters apart.""" - line = line.expandtabs() - return len(line) - len(line.lstrip()) - -def _deindent(line, indent): - """Deindent 'line' by 'indent' spaces.""" - line = line.expandtabs() - if len(line) <= indent: - return line - return line[indent:] - -def _is_base_n(s, n): - try: - int(s, n) - return True - except ValueError: - return False - -def _sep_lines(*args): - """Returns a string comprised of all arguments, with newlines inserted - between them.""" - return "\n".join(args) - -def _comment(s): - """Returns a new string with "#" inserted before each line in 's'.""" - if not s: - return "#" - res = "".join(["#" + line for line in s.splitlines(True)]) - if s.endswith("\n"): - return res + "#" - return res - -def _get_lines(filename): - """Returns a list of lines from 'filename', joining any line ending in \\ - with the following line.""" - with open(filename, "r") as f: - lines = [] - accum = "" - for line in f: - if line.endswith("\\\n"): - accum += line[:-2] - else: - lines.append(accum + line) - accum = "" - return lines - -def _clean_up_path(path): - """Strips an initial "./" and any trailing slashes from 'path'.""" - if path.startswith("./"): - path = path[2:] - return path.rstrip("/") - -def _stderr_msg(msg, filename, linenr): - if filename is not None: - sys.stderr.write("{0}:{1}: ".format(_clean_up_path(filename), linenr)) - sys.stderr.write(msg + "\n") - -def _tokenization_error(s, filename, linenr): - loc = "" if filename is None else "{0}:{1}: ".format(filename, linenr) - raise Kconfig_Syntax_Error("{0}Couldn't tokenize '{1}'" - .format(loc, s.strip())) - -def _parse_error(s, msg, filename, linenr): - loc = "" if filename is None else "{0}:{1}: ".format(filename, linenr) - raise Kconfig_Syntax_Error("{0}Couldn't parse '{1}'{2}" - .format(loc, s.strip(), - "." if msg is None else ": " + msg)) - -def _internal_error(msg): - raise Internal_Error(msg + - "\nSorry! You may want to send an email to ulfalizer a.t Google's " \ - "email service to tell me about this. Include the message above " \ - "and the stack trace and describe what you were doing.") - -# -# Internal global constants -# - -# Tokens -(T_AND, T_OR, T_NOT, - T_OPEN_PAREN, T_CLOSE_PAREN, - T_EQUAL, T_UNEQUAL, - T_MAINMENU, T_MENU, T_ENDMENU, - T_SOURCE, T_CHOICE, T_ENDCHOICE, - T_COMMENT, T_CONFIG, T_MENUCONFIG, - T_HELP, T_IF, T_ENDIF, T_DEPENDS, T_ON, - T_OPTIONAL, T_PROMPT, T_DEFAULT, - T_BOOL, T_TRISTATE, T_HEX, T_INT, T_STRING, - T_DEF_BOOL, T_DEF_TRISTATE, - T_SELECT, T_RANGE, T_OPTION, T_ALLNOCONFIG_Y, T_ENV, - T_DEFCONFIG_LIST, T_MODULES, T_VISIBLE) = range(39) - -# The leading underscore before the function assignments below prevent pydoc -# from listing them. The constants could be hidden too, but they're fairly -# obviously internal anyway, so don't bother spamming the code. - -# Keyword to token map. Note that the get() method is assigned directly as a -# small optimization. -_get_keyword = { "mainmenu" : T_MAINMENU, - "menu" : T_MENU, - "endmenu" : T_ENDMENU, - "endif" : T_ENDIF, - "endchoice" : T_ENDCHOICE, - "source" : T_SOURCE, - "choice" : T_CHOICE, - "config" : T_CONFIG, - "comment" : T_COMMENT, - "menuconfig" : T_MENUCONFIG, - "help" : T_HELP, - "if" : T_IF, - "depends" : T_DEPENDS, - "on" : T_ON, - "optional" : T_OPTIONAL, - "prompt" : T_PROMPT, - "default" : T_DEFAULT, - "bool" : T_BOOL, - "boolean" : T_BOOL, - "tristate" : T_TRISTATE, - "int" : T_INT, - "hex" : T_HEX, - "def_bool" : T_DEF_BOOL, - "def_tristate" : T_DEF_TRISTATE, - "string" : T_STRING, - "select" : T_SELECT, - "range" : T_RANGE, - "option" : T_OPTION, - "allnoconfig_y" : T_ALLNOCONFIG_Y, - "env" : T_ENV, - "defconfig_list" : T_DEFCONFIG_LIST, - "modules" : T_MODULES, - "visible" : T_VISIBLE }.get - -# Strings to use for True and False -bool_str = { False : "false", True : "true" } - -# Tokens after which identifier-like lexemes are treated as strings. T_CHOICE -# is included to avoid symbols being registered for named choices. -string_lex = frozenset((T_BOOL, T_TRISTATE, T_INT, T_HEX, T_STRING, T_CHOICE, - T_PROMPT, T_MENU, T_COMMENT, T_SOURCE, T_MAINMENU)) - -# Matches the initial token on a line; see _tokenize(). -_initial_token_re_match = re.compile(r"[^\w]*(\w+)").match - -# Matches an identifier/keyword optionally preceded by whitespace -_id_keyword_re_match = re.compile(r"\s*([\w./-]+)").match - -# Regular expressions for parsing .config files -_set_re_match = re.compile(r"CONFIG_(\w+)=(.*)").match -_unset_re_match = re.compile(r"# CONFIG_(\w+) is not set").match - -# Regular expression for finding $-references to symbols in strings -_sym_ref_re_search = re.compile(r"\$[A-Za-z0-9_]+").search - -# Integers representing symbol types -UNKNOWN, BOOL, TRISTATE, STRING, HEX, INT = range(6) - -# Strings to use for types -typename = { UNKNOWN : "unknown", BOOL : "bool", TRISTATE : "tristate", - STRING : "string", HEX : "hex", INT : "int" } - -# Token to type mapping -token_to_type = { T_BOOL : BOOL, T_TRISTATE : TRISTATE, T_STRING : STRING, - T_INT : INT, T_HEX : HEX } - -# Default values for symbols of different types (the value the symbol gets if -# it is not assigned a user value and none of its 'default' clauses kick in) -default_value = { BOOL : "n", TRISTATE : "n", STRING : "", INT : "", HEX : "" } - -# Indicates that no item is selected in a choice statement -NO_SELECTION = 0 - -# Integers representing expression types -AND, OR, NOT, EQUAL, UNEQUAL = range(5) - -# Map from tristate values to integers -tri_to_int = { "n" : 0, "m" : 1, "y" : 2 } - -# Printing-related stuff - -op_to_str = { AND : " && ", OR : " || ", EQUAL : " = ", UNEQUAL : " != " } -precedence = { OR : 0, AND : 1, NOT : 2 } diff --git a/support/scripts/readme.kconfiglib b/support/scripts/readme.kconfiglib deleted file mode 100644 index 4b653b8446..0000000000 --- a/support/scripts/readme.kconfiglib +++ /dev/null @@ -1,30 +0,0 @@ -Readme -====== - -Kconfiglib ----------- - -This python module, developped by Ulf Magnusson and released under the ISC -license, is fetched from: - -https://github.com/ulfalizer/Kconfiglib -commit: a95f477eafc0b6708c3ce671fce7302ecec4f789 - -Kconfiglib license -~~~~~~~~~~~~~~~~~~ - -License (ISC) - -Copyright (c) 2011-2013, Ulf Magnusson - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. From 6e742002d0c3205e4cebb28760f27abda53cf0ad Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 20 Sep 2016 11:43:51 +0200 Subject: [PATCH 0331/3392] python-lxml: bump to version 3.6.4 Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index 4cace8e02b..656c01f3aa 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 9c74ca28a7f0c30dca8872281b3c47705e21217c8bc63912d95c9e2a7cac6bdf lxml-3.6.0.tgz +sha256 61d5d3e00b5821e6cda099b3b4ccfea4527bf7c595e0fb3a7a760490cedd6172 lxml-3.6.4.tgz diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 039fadd1c6..b117ec8dc9 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_LXML_VERSION = 3.6.0 +PYTHON_LXML_VERSION = 3.6.4 PYTHON_LXML_SITE = http://lxml.de/files PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tgz From ced87ef097a737018be1e248ecfb069d37eaacfb Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 20 Sep 2016 11:43:52 +0200 Subject: [PATCH 0332/3392] python-netifaces: bump to version 0.10.5 Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-netifaces/python-netifaces.hash | 6 +++--- package/python-netifaces/python-netifaces.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-netifaces/python-netifaces.hash b/package/python-netifaces/python-netifaces.hash index aebfdf6694..6f3e358b08 100644 --- a/package/python-netifaces/python-netifaces.hash +++ b/package/python-netifaces/python-netifaces.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=36da76e2cfadd24cc7510c2c0012eb1e, sha256 locally computed -md5 36da76e2cfadd24cc7510c2c0012eb1e netifaces-0.10.4.tar.gz -sha256 9656a169cb83da34d732b0eb72b39373d48774aee009a3d1272b7ea2ce109cde netifaces-0.10.4.tar.gz +# md5 from https://pypi.python.org/pypi/netifaces/json, sha256 locally computed +md5 5b4d1f1310ed279e6df27ef3a9b71519 netifaces-0.10.5.tar.gz +sha256 59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b netifaces-0.10.5.tar.gz diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk index 2c51ce0689..3e01c24805 100644 --- a/package/python-netifaces/python-netifaces.mk +++ b/package/python-netifaces/python-netifaces.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_NETIFACES_VERSION = 0.10.4 +PYTHON_NETIFACES_VERSION = 0.10.5 PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz -PYTHON_NETIFACES_SITE = https://pypi.python.org/packages/source/n/netifaces +PYTHON_NETIFACES_SITE = https://pypi.python.org/packages/a7/4c/8e0771a59fd6e55aac993a7cc1b6a0db993f299514c464ae6a1ecf83b31d PYTHON_NETIFACES_LICENSE = MIT PYTHON_NETIFACES_LICENSE_FILES = README.rst PYTHON_NETIFACES_SETUP_TYPE = setuptools From 9e895b44b8135952518df47010930b7cdd253737 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 20 Sep 2016 11:43:53 +0200 Subject: [PATCH 0333/3392] python-cffi: bump to version 1.8.3 Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-cffi/python-cffi.hash | 7 +++---- package/python-cffi/python-cffi.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-cffi/python-cffi.hash b/package/python-cffi/python-cffi.hash index 125c93e893..39065bcd0c 100644 --- a/package/python-cffi/python-cffi.hash +++ b/package/python-cffi/python-cffi.hash @@ -1,4 +1,3 @@ -# From https://pypi.python.org/pypi?:action=show_md5&digest=2fae9160991afefb20ff0fbde3b14faf -md5 2fae9160991afefb20ff0fbde3b14faf cffi-1.6.0.tar.gz -# Calculated based on the hash above -sha256 a7f75c4ef2362c0a0e54657add0a6c509fecbfa3b3807bc0925f5cb1c9f927db cffi-1.6.0.tar.gz +# md5 from https://pypi.python.org/pypi/cffi/json, sha256 locally computed +md5 c8e877fe0426a99d0cf5872cf2f95b27 cffi-1.8.3.tar.gz +sha256 c321bd46faa7847261b89c0469569530cad5a41976bb6dba8202c0159f476568 cffi-1.8.3.tar.gz diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index 3c2d534955..d34869561b 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CFFI_VERSION = 1.6.0 +PYTHON_CFFI_VERSION = 1.8.3 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://pypi.python.org/packages/b6/98/11feff87072e2e640fb8320712b781eccdef05d588618915236b32289d5a +PYTHON_CFFI_SITE = https://pypi.python.org/packages/0a/f3/686af8873b70028fccf67b15c78fd4e4667a3da995007afc71e786d61b0a PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi PYTHON_CFFI_LICENSE = MIT From eb0863636041cebbcd1dfa24a94886503dd19b36 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Fri, 2 Sep 2016 11:21:03 -0300 Subject: [PATCH 0334/3392] supertuxkart: Constrain to x86 architecture Our build system has detected that angelscript can't be cross-compiled properly. This has been also reported to supertuxkart [1], and although the developers were open to take patches fixing STK embedded angelscript, it was pointed out that non-x86 architectures were not officially supported and of little interest [2]. Hence, let's constrain the package selection and the host architecture to x86. [1] https://github.com/supertuxkart/stk-code/issues/2569 [2] https://github.com/supertuxkart/stk-code/pull/2195 Fixes: http://autobuild.buildroot.net/results/655/655f046b3bb5f7a4ea492328b608e409d6769689/ Signed-off-by: Ezequiel Garcia Signed-off-by: Peter Korsgaard --- package/supertuxkart/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index a1f7074eb7..4919b50a2b 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_SUPERTUXKART bool "supertuxkart" + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP # openal depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal @@ -25,6 +27,8 @@ config BR2_PACKAGE_SUPERTUXKART http://supertuxkart.sourceforge.net/Main_Page comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NPTL, C++" + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_XORG7 From d8a19c5e4969a5d6485d3704cc72310989109150 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 20 Sep 2016 09:41:26 +0200 Subject: [PATCH 0335/3392] python-psutil: bump to version 4.3.1 Signed-off-by: Peter Korsgaard --- package/python-psutil/python-psutil.hash | 4 ++-- package/python-psutil/python-psutil.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index 007b7c501a..ead2d9c5ba 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/psutil/json, sha256 locally computed -md5 ca97cf5f09c07b075a12a68b9d44a67d psutil-4.3.0.tar.gz -sha256 86197ae5978f216d33bfff4383d5cc0b80f079d09cf45a2a406d1abb5d0299f0 psutil-4.3.0.tar.gz +md5 199a366dba829c88bddaf5b41d19ddc0 psutil-4.3.1.tar.gz +sha256 38f74182fb9e15cafd0cdf0821098a95cc17301807aed25634a18b66537ba51b psutil-4.3.1.tar.gz diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 85882adc68..1032318813 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 4.3.0 +PYTHON_PSUTIL_VERSION = 4.3.1 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/22/a8/6ab3f0b3b74a36104785808ec874d24203c6a511ffd2732dd215cf32d689 +PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/78/cc/f267a1371f229bf16db6a4e604428c3b032b823b83155bd33cef45e49a53 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3c PYTHON_PSUTIL_LICENSE_FILES = LICENSE From c4f453fd7e84617bd2082ebff0cdb526b6afd952 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 19 Sep 2016 16:45:02 -0300 Subject: [PATCH 0336/3392] configs/warp7: Add Wifi support Warp7 has a BRCM43430 Wifi chipset. Add support for it. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- board/warp7/linux.fragment | 2 + board/warp7/readme.txt | 11 +++++ .../lib/firmware/brcm/brcmfmac43430-sdio.txt | 42 +++++++++++++++++++ configs/warp7_defconfig | 13 ++++++ 4 files changed, 68 insertions(+) create mode 100644 board/warp7/linux.fragment create mode 100644 board/warp7/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt diff --git a/board/warp7/linux.fragment b/board/warp7/linux.fragment new file mode 100644 index 0000000000..00f74cbdd6 --- /dev/null +++ b/board/warp7/linux.fragment @@ -0,0 +1,2 @@ +CONFIG_CFG80211_WEXT=y +CONFIG_BRCMFMAC=m diff --git a/board/warp7/readme.txt b/board/warp7/readme.txt index 3c765f5524..00325e72aa 100644 --- a/board/warp7/readme.txt +++ b/board/warp7/readme.txt @@ -90,4 +90,15 @@ To boot your newly created system: emulator at 115200 bps, 8n1; - power on the board. +Using Wifi +========== + +# modprobe brcmfmac +# iwconfig wlan0 essid ACCESSPOINTNAME +# wpa_passphrase ACCESSPOINTNAME > /etc/wpa.conf +(enter the wifi password and press enter) +# wpa_supplicant -Dwext -iwlan0 -c /etc/wpa.conf & +# udhcpc -i wlan0 +# ping buildroot.org + Enjoy! diff --git a/board/warp7/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt b/board/warp7/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt new file mode 100644 index 0000000000..a1dc203529 --- /dev/null +++ b/board/warp7/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.txt @@ -0,0 +1,42 @@ +# 2.4 GHz, 20 MHz BW mode +manfid=0x2d0 +prodid=0x0726 +vendid=0x14e4 +devid=0x43e2 +boardtype=0x0726 +boardrev=0x1202 +boardnum=22 +macaddr=00:90:4c:c5:12:38 +sromrev=11 +boardflags=0x00404201 +boardflags3=0x08000000 +xtalfreq=37400 +nocrc=1 +ag0=0 +aa2g=1 +ccode=ALL +#pa0itssit=0x20 +extpagain2g=0 +pa2ga0=-168,7161,-820 +AvVmid_c0=0x0,0xc8 +cckpwroffset0=5 +maxp2ga0=90 +#txpwrbckof=6 +cckbw202gpo=0 +legofdmbw202gpo=0x66111111 +mcsbw202gpo=0x77711111 +propbw202gpo=0xdd +ofdmdigfilttype=18 +ofdmdigfilttypebe=18 +papdmode=1 +papdvalidtest=1 +pacalidx2g=48 +papdepsoffset=-22 +papdendidx=58 +il0macaddr=00:90:4c:c5:12:38 +wl0id=0x431b +#muxenab=0x10 +#BT COEX deferral limit setting +#btc_params 8 45000 +#btc_params 10 20000 +#spurconfig=0x3 diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 95508d6334..967df8ef58 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -8,12 +8,16 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +# rootfs overlay +BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" + # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Freescale/linux-fslc.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="efaf36531fe7b1fc15a48033e5972825c91f9fc6" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/warp7/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" @@ -24,6 +28,15 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09" BR2_TARGET_UBOOT_FORMAT_IMX=y +# wifi firmware for brcm43430 +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y + +# wireless packages +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y + # Filesystem BR2_ROOTFS_POST_IMAGE_SCRIPT="board/warp7/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y From 010588c1e169843bdca35c71789a16d0b6829bcb Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 17 Jul 2016 14:50:37 +0200 Subject: [PATCH 0337/3392] aufs: new kernel extension Signed-off-by: Christian Stewart [Atul: - Removed the duplicate conditional block. - Updated the license to GPLv2. - Removed the visibilty of package from menuconfig. - Removed dependencies. - Removed the comment. - Changed the name of variable from BR2_PACKAGE_AUFS_STANDALONE_VERSION to BR2_LINUX_KERNEL_EXT_AUFS_VERSION. - Removed the AUFS_INSTALL_STAGING and AUFS_INSTALL_TARGET variables. - Removed the BR2_PACKAGE_AUFS_3X and BR2_PACKAGE_AUFS_4X variables.] Signed-off-by: Atul Singh [yann.morin.1998@free.fr: - do not fail on version check if aufs ext is disabled - check for empty version - squash aufs package and linux extension in one patch - fail if the kernel already has aufs support - simplify handling of version] Signed-off-by: Yann E. MORIN [Thomas: - Fix the apply patch logic, it was using a non-existent AUFS_VERSION_MAJOR variable. BR2_PACKAGE_AUFS_SERIES is used instead.] Signed-off-by: Thomas Petazzoni --- linux/Config.ext.in | 52 +++++++++++++++++++++++++++++++++++++++++ linux/linux-ext-aufs.mk | 21 +++++++++++++++++ package/Config.in | 1 + package/aufs/Config.in | 16 +++++++++++++ package/aufs/aufs.mk | 22 +++++++++++++++++ 5 files changed, 112 insertions(+) create mode 100644 linux/linux-ext-aufs.mk create mode 100644 package/aufs/Config.in create mode 100644 package/aufs/aufs.mk diff --git a/linux/Config.ext.in b/linux/Config.ext.in index da1ebd26bc..5d5e7efbca 100644 --- a/linux/Config.ext.in +++ b/linux/Config.ext.in @@ -66,4 +66,56 @@ config BR2_LINUX_KERNEL_EXT_FBTFT https://github.com/notro/fbtft +# aufs-standalone +config BR2_LINUX_KERNEL_EXT_AUFS + bool "Aufs Filesystem Module patch" + select BR2_PACKAGE_AUFS + help + Aufs is split in two parts: a kernel part and a userspace + part. Enabling this option automatically selects the aufs + standalone (module) package and patches the Linux kernel + built by Buildroot with the aufs kernel part (ie fs/aufs). + + It is important to use the correct branch of aufs-standalone. + +if BR2_LINUX_KERNEL_EXT_AUFS + +choice + bool "aufs-standalone series" + help + Select the major series of this version. This must match the + major version of your kernel (e.g. for kernels 3.x, select + aufs3.x; for kernels 4.x, select aufs4.x). + + Note: neither aufs1.x nor aufs2.x (both for kernels older than + 3.x) are supported. + +config BR2_LINUX_KERNEL_EXT_AUFS_SERIES_3 + bool "aufs3.x" + +config BR2_LINUX_KERNEL_EXT_AUFS_SERIES_4 + bool "aufs4.x" + +endchoice + +config BR2_LINUX_KERNEL_EXT_AUFS_SERIES + int + default 3 if BR2_LINUX_KERNEL_EXT_AUFS_SERIES_3 + default 4 if BR2_LINUX_KERNEL_EXT_AUFS_SERIES_4 + +config BR2_LINUX_KERNEL_EXT_AUFS_VERSION + string "aufs-standalone version" + default "" + help + The version you choose must match that of your kernel. Usually, + the sha1 of the cset you want to use; avoid using a branch name + as this yields non-reproducible builds. + + See the following resources to see what versions are available: + + For aufs3.x: https://sourceforge.net/p/aufs/aufs3-standalone/ref/master/branches/ + For aufs4.x: https://github.com/sfjro/aufs4-standalone/branches/all + +endif # aufs + endmenu diff --git a/linux/linux-ext-aufs.mk b/linux/linux-ext-aufs.mk new file mode 100644 index 0000000000..fb2f3560a7 --- /dev/null +++ b/linux/linux-ext-aufs.mk @@ -0,0 +1,21 @@ +################################################################################ +# Linux Aufs extensions +# +# Patch the linux kernel with aufs extension +################################################################################ + +LINUX_EXTENSIONS += aufs + +define AUFS_PREPARE_KERNEL + if test -d $(@D)/fs/aufs/; then \ + echo "Your kernel already supports AUFS."; \ + exit 1; \ + fi + $(APPLY_PATCHES) $(@D) $(AUFS_DIR) \ + aufs$(BR2_PACKAGE_AUFS_SERIES)-kbuild.patch \ + aufs$(BR2_PACKAGE_AUFS_SERIES)-base.patch \ + aufs$(BR2_PACKAGE_AUFS_SERIES)-mmap.patch \ + aufs$(BR2_PACKAGE_AUFS_SERIES)-standalone.patch + cp -r $(AUFS_DIR)/fs/aufs/ $(@D)/fs/ + cp $(AUFS_DIR)/include/uapi/linux/aufs_type.h $(@D)/include/uapi/linux/ +endef diff --git a/package/Config.in b/package/Config.in index 78573f0143..78381441a5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -148,6 +148,7 @@ menu "Development tools" endmenu menu "Filesystem and flash utilities" + source "package/aufs/Config.in" source "package/autofs/Config.in" source "package/btrfs-progs/Config.in" source "package/cifs-utils/Config.in" diff --git a/package/aufs/Config.in b/package/aufs/Config.in new file mode 100644 index 0000000000..cc5ff365fe --- /dev/null +++ b/package/aufs/Config.in @@ -0,0 +1,16 @@ +# Automatically selected by the corresponding linux extension +config BR2_PACKAGE_AUFS + bool + +if BR2_PACKAGE_AUFS + +# Both come from the selection of the linux extension. +config BR2_PACKAGE_AUFS_SERIES + int + default BR2_LINUX_KERNEL_EXT_AUFS_SERIES + +config BR2_PACKAGE_AUFS_VERSION + string + default BR2_LINUX_KERNEL_EXT_AUFS_VERSION + +endif diff --git a/package/aufs/aufs.mk b/package/aufs/aufs.mk new file mode 100644 index 0000000000..1ba5508ac3 --- /dev/null +++ b/package/aufs/aufs.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# aufs +# +################################################################################ + +AUFS_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_VERSION)) +AUFS_LICENSE = GPLv2 +AUFS_LICENSE_FILES = COPYING + +ifeq ($(BR2_PACKAGE_AUFS_SERIES),3) +AUFS_SITE = http://git.code.sf.net/p/aufs/aufs3-standalone +AUFS_SITE_METHOD = git +else ifeq ($(BR2_PACKAGE_AUFS_SERIES),4) +AUFS_SITE = $(call github,sfjro,aufs4-standalone,$(AUFS_VERSION)) +endif + +ifeq ($(BR_BUILDING):$(BR2_PACKAGE_AUFS):$(AUFS_VERSION),y:y:) +$(error No aufs version specified) +endif + +$(eval $(generic-package)) From bdef0f00f9783f50785357313ffe7eae08be4cd3 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 17 Jul 2016 14:50:39 +0200 Subject: [PATCH 0338/3392] aufs-util: new package Signed-off-by: Christian Stewart [Atul: - Updated the default to empty. - Updated the license to GPLv2. - Used patches instead of SED commands. - CC and LD are replaced by TARGET_CC and TARGET_LD.] Signed-off-by: Atul Singh [yann.morin.1998@free.fr: - drop the headers_install command - instead, instruct the kernel to install them - add patches 0002..0004 - properly build the host tools - don't depend on the aufs extension, for kernel already patched - fix comment] Signed-off-by: Yann E. MORIN [Thomas: - Remove the patch 0004-no-override-readdir64.patch, since it no longer applies to the latest version of aufs-util. Instead, add a post-patch hook that tweaks the Makefile to remove the problematic rdu64.o from the build process. - Use directly the kernel headers from the kernel source tree, rather than having to install them. This only requires a minor trick to define "__user" to empty.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + .../aufs-util/0001-remove-user-settings.patch | 16 +++++ package/aufs-util/0002-no-check-ver.patch | 24 ++++++++ package/aufs-util/0003-no-strip-lib.patch | 18 ++++++ package/aufs-util/Config.in | 35 +++++++++++ package/aufs-util/aufs-util.mk | 59 +++++++++++++++++++ 6 files changed, 153 insertions(+) create mode 100644 package/aufs-util/0001-remove-user-settings.patch create mode 100644 package/aufs-util/0002-no-check-ver.patch create mode 100644 package/aufs-util/0003-no-strip-lib.patch create mode 100644 package/aufs-util/Config.in create mode 100644 package/aufs-util/aufs-util.mk diff --git a/package/Config.in b/package/Config.in index 78381441a5..3d624ccaa1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -149,6 +149,7 @@ endmenu menu "Filesystem and flash utilities" source "package/aufs/Config.in" + source "package/aufs-util/Config.in" source "package/autofs/Config.in" source "package/btrfs-progs/Config.in" source "package/cifs-utils/Config.in" diff --git a/package/aufs-util/0001-remove-user-settings.patch b/package/aufs-util/0001-remove-user-settings.patch new file mode 100644 index 0000000000..7eebc95dd4 --- /dev/null +++ b/package/aufs-util/0001-remove-user-settings.patch @@ -0,0 +1,16 @@ +install: drop setting ownership + +Signed-off-by: "Yann E. MORIN" + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -21,7 +21,7 @@ + override CPPFLAGS += -DAUFHSM_CMD=\"/usr/bin/aufhsm\" + override CFLAGS += -O -Wall + INSTALL ?= install +-Install = ${INSTALL} -o root -g root -p ++Install = ${INSTALL} -p + ManDir = /usr/share/man + + # diff --git a/package/aufs-util/0002-no-check-ver.patch b/package/aufs-util/0002-no-check-ver.patch new file mode 100644 index 0000000000..5fe692072f --- /dev/null +++ b/package/aufs-util/0002-no-check-ver.patch @@ -0,0 +1,24 @@ +Makefile: do not check version + +The aufs-util package tries to ensure that its version is compatible +with the one in the running kernel. However, this test is flawed: the +version string in the aufs4x branch for aufs-util is aufs3.x, so it does +not match the version in the kernel when it is aufs4.x. + +Disengage this check, ion the assumption the user knows what he is +doing. + +Signed-off-by: "Yann E. MORIN" + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -62,7 +62,7 @@ + $(foreach v, CPPFLAGS CFLAGS INSTALL Install ManDir LibUtilHdr, \ + $(eval MAKE += ${v}="$${${v}}")) + +-all: ver_test ${Man} ${Bin} ${Etc} ++all: ${Man} ${Bin} ${Etc} + ${MAKE} -C libau $@ + ln -sf ./libau/libau*.so . + $(call MakeFHSM, $@) diff --git a/package/aufs-util/0003-no-strip-lib.patch b/package/aufs-util/0003-no-strip-lib.patch new file mode 100644 index 0000000000..15830503b5 --- /dev/null +++ b/package/aufs-util/0003-no-strip-lib.patch @@ -0,0 +1,18 @@ +install: do not strip libs when installing + +We want unstripped binaries in staging; stripping is done by Buildroot +as a whole in target-finalize if needed, anyway. + +Signed-off-by: "Yann E. MORIN" + +diff --git a/libau/Makefile b/libau/Makefile +--- a/libau/Makefile ++++ b/libau/Makefile +@@ -37,7 +37,6 @@ + ln -sf $< $@ + ${LibSo}.${LibSoMajor}: ${LibSo}.${LibSoMajor}.${LibSoMinor} + ln -sf $< $@ +-${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDFLAGS += -s + ${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDLIBS += -ldl -lpthread + ${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj} + ${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} ${LDFLAGS} \ diff --git a/package/aufs-util/Config.in b/package/aufs-util/Config.in new file mode 100644 index 0000000000..93999fb606 --- /dev/null +++ b/package/aufs-util/Config.in @@ -0,0 +1,35 @@ +comment "aufs-util needs a linux kernel and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_AUFS_UTIL + bool "aufs-util" + depends on BR2_USE_MMU + depends on BR2_LINUX_KERNEL + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Aufs command line utilities. + + Needs a kernel with aufs support. A kernel + extension package is available. + + http://sourceforge.net/p/aufs/aufs-util/ + +if BR2_PACKAGE_AUFS_UTIL + +config BR2_PACKAGE_AUFS_UTIL_VERSION + string "aufs-util version" + default "" + help + The version you choose must match that of the aufs support + in your kernel. Usually, this is aufs3.x for 3.x kernels and + aufs4.x for 4.x kernels. + + Usually, the sha1 of the cset you want to use; avoid using a + branch name as this yields non-reproducible builds. + + See the following resources to see what versions are available: + + https://sourceforge.net/p/aufs/aufs-util/ci/master/tree/ + +endif diff --git a/package/aufs-util/aufs-util.mk b/package/aufs-util/aufs-util.mk new file mode 100644 index 0000000000..0ea9ee5955 --- /dev/null +++ b/package/aufs-util/aufs-util.mk @@ -0,0 +1,59 @@ +################################################################################ +# +# aufs-util +# +################################################################################ + +# linux-headers +AUFS_UTIL_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_UTIL_VERSION)) +AUFS_UTIL_SITE = http://git.code.sf.net/p/aufs/aufs-util +AUFS_UTIL_SITE_METHOD = git +AUFS_UTIL_LICENSE = GPLv2 +AUFS_UTIL_LICENSE_FILES = COPYING + +AUFS_UTIL_DEPENDENCIES = linux + +# Building aufs-util requires access to the kernel headers of aufs, +# which are only available in the kernel build directory, which is why +# we add -I$(LINUX_DIR)/include/uapi. These headers have not been +# prepared for usage by userspace, so to workaround this we have to +# defined the "__user" macro as empty. +AUFS_UTIL_HOST_CPPFLAGS = \ + $(HOST_CPPFLAGS) \ + -I$(LINUX_DIR)/include/uapi \ + -D__user= + +AUFS_UTIL_CPPFLAGS = \ + $(TARGET_CPPFLAGS) \ + -I$(LINUX_DIR)/include/uapi \ + -D__user= + +# rdu64 is supposed to provide the LFS variant of readdir(), +# readdir64(). However, because Buildroot is always LFS-enabled, +# readdir() is always the LFS variant. Drop rdu64 from the build, as +# it causes build failures due to multiple implementations of +# readdir64(). +define AUFS_UTIL_REMOVE_RDU64 + $(SED) 's% rdu64.o%%' $(@D)/libau/Makefile +endef + +AUFS_UTIL_POST_PATCH_HOOKS += AUFS_UTIL_REMOVE_RDU64 + +# First, we build the host tools, needed to build the target tools. +define AUFS_UTIL_BUILD_CMDS + $(MAKE) -C $(@D) \ + $(HOST_CONFIGURE_OPTS) \ + CPPFLAGS="$(AUFS_UTIL_HOST_CPPFLAGS)" \ + HOSTCC="$(HOSTCC)" HOSTLD="$(HOSTLD)" \ + INSTALL="$(INSTALL)" c2sh c2tmac + $(MAKE1) -C $(@D) \ + $(TARGET_CONFIGURE_OPTS) \ + CPPFLAGS="$(AUFS_UTIL_CPPFLAGS)" \ + INSTALL="$(INSTALL)" all +endef + +define AUFS_UTIL_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D) INSTALL="$(INSTALL)" DESTDIR="$(TARGET_DIR)" install +endef + +$(eval $(generic-package)) From 33bf5e436ae687116149f8b8c3d339df25f90448 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 17 Jul 2016 18:27:54 +0200 Subject: [PATCH 0339/3392] package/mesa3d: provides libgl not only with DRI drivers This patch is a follow-up for https://github.com/buildroot/buildroot/commit/999d4a263118ab8581190d3e3c8bdc471896628f libGL.so and support files are not only available with DRI drivers but also with Gallium drivers, in fact mesa3d can be built without any driver enabled - unless X.org is disabled it will provide libGL.so. Tested using this defconfig: BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_KODI=y BR2_PACKAGE_KODI_VISUALISATION_WAVEFORHUE=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_XORG7=y Fixes http://autobuild.buildroot.net/results/d97/d97a80e6de066a7dea08b284eab24fc44b11d661/ kodi-visualisation-waveforhue detects OpenGL installed by mesa3d but the kodi package itself does not select libglew before because mesa3d was not listed as a provider for libgl in the buildroot build system. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d/Config.in | 9 ++++----- package/mesa3d/mesa3d.mk | 9 +++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 6f60ee1b34..738ca7a7b1 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -6,6 +6,7 @@ menuconfig BR2_PACKAGE_MESA3D depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7 @@ -28,15 +29,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER config BR2_PACKAGE_MESA3D_DRI_DRIVER select BR2_PACKAGE_MESA3D_DRIVER - select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO bool -config BR2_PACKAGE_PROVIDES_LIBGL - default "mesa3d" if BR2_PACKAGE_MESA3D_DRI_DRIVER && \ - BR2_PACKAGE_XORG7 - config BR2_PACKAGE_MESA3D_DRIVER bool @@ -164,6 +160,9 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES endif # BR2_PACKAGE_MESA3D_DRIVER +config BR2_PACKAGE_PROVIDES_LIBGL + default "mesa3d" if BR2_PACKAGE_XORG7 + config BR2_PACKAGE_PROVIDES_LIBEGL default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index fbc0aff222..a5380a72a5 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -109,10 +109,6 @@ endif ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) MESA3D_DEPENDENCIES += xlib_libXxf86vm endif -# libGL is only provided for a full xorg stack -ifeq ($(BR2_PACKAGE_XORG7),y) -MESA3D_PROVIDES += libgl -endif MESA3D_CONF_OPTS += \ --enable-shared-glapi \ --enable-driglx-direct \ @@ -135,6 +131,11 @@ MESA3D_CONF_OPTS += --enable-opengl --enable-dri # we do not need libva support in mesa3d, therefore disable this option MESA3D_CONF_OPTS += --disable-va +# libGL is only provided for a full xorg stack +ifeq ($(BR2_PACKAGE_XORG7),y) +MESA3D_PROVIDES += libgl +endif + ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) MESA3D_PROVIDES += libegl ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) From 42cdaaf945df203364cbb5be5f856636f9764260 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 17 Jul 2016 18:27:55 +0200 Subject: [PATCH 0340/3392] package/mesa3d: add support for Intel Vulkan driver The Vulkan intel driver depends on the i965 dri driver: https://cgit.freedesktop.org/mesa/mesa/tree/configure.ac?h=12.0#n1653 and a sha1 implementation: https://cgit.freedesktop.org/mesa/mesa/tree/configure.ac?h=12.0#n1656 The Vulkan driver needs linux/memfd.h https://cgit.freedesktop.org/mesa/mesa/tree/src/intel/vulkan/anv_allocator.c?h=12.0#n30 which is not available in kernel headers older than 3.18: https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/include/uapi/linux/memfd.h?id=refs/tags/v3.18.36 The Vulkan driver makes use of ifunc https://cgit.freedesktop.org/mesa/mesa/tree/src/intel/vulkan/anv_entrypoints_gen.py?h=12.0#n287 which is not available on uClibc: https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/config.gcc;h=82cc9a9959b5ab57c0b8779e054b80cdb95f169b;hb=gcc-6-branch#l1485 https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e6cdd6b1755033e8f416efaa4334d1294c0a43c6 The Vulkan driver makes use of static_assert https://cgit.freedesktop.org/mesa/mesa/tree/src/intel/vulkan/anv_private.h?h=12.0#n153 Compiling the Vulkan driver with uClibc and musl fails, therefore this driver is glibc-only. Although the configure script does not check for dri3 support if the Intel Vulkan driver is enabled it needs it nonetheless: https://cgit.freedesktop.org/mesa/mesa/tree/src/intel/vulkan/anv_wsi_x11.c?h=12.0#n682 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d/Config.in | 29 ++++++++++++++++++++++++++++- package/mesa3d/mesa3d.mk | 10 ++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 738ca7a7b1..bbab95373f 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_MESA3D if BR2_PACKAGE_MESA3D -# inform the .mk file of gallium or dri driver selection +# inform the .mk file of gallium, dri or vulkan driver selection config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_MESA3D_DRIVER bool @@ -33,6 +33,10 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO bool +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER + bool + select BR2_PACKAGE_MESA3D_DRIVER + config BR2_PACKAGE_MESA3D_DRIVER bool @@ -132,6 +136,29 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON help Legacy Radeon driver for R100 series GPUs. +comment "Vulkan drivers" + +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL + bool "Vulkan Intel driver" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # memfd.h + depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert + depends on BR2_PACKAGE_XORG7 # xproto_dri3proto + # We need a SHA1 implementation. If either openssl or + # libgcrypt are already part of the build, we'll use one of + # them, otherwise, use the small libsha1 library. + select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + select BR2_PACKAGE_XPROTO_DRI3PROTO + help + Vulkan driver for Intel hardware from Ivy Bridge onward. + +comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= 3.18" + depends on BR2_i386 || BR2_x86_64 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7 + comment "Off-screen Rendering" config BR2_PACKAGE_MESA3D_OSMESA diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index a5380a72a5..1aa82d860b 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -86,6 +86,8 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon +# Vulkan Drivers +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) MESA3D_CONF_OPTS += \ @@ -115,6 +117,14 @@ MESA3D_CONF_OPTS += \ --with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) endif +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) +MESA3D_CONF_OPTS += \ + --without-vulkan-drivers +else +MESA3D_CONF_OPTS += \ + --with-vulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) +endif + # APIs ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) From 32ff9de23e9c6deabee572eee845642671e53a65 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Tue, 20 Sep 2016 19:30:14 +0530 Subject: [PATCH 0341/3392] ushare: fix build with NLS support Add patch to fix build errors when NLS support is enabled. Fixes: http://autobuild.buildroot.net/results/19d/19d67dd43e5a313c77e4be97ecb9811ffa52f797/ Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- ...fig-h-before-checking-for-CONFIG-NLS.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch diff --git a/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch b/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch new file mode 100644 index 0000000000..e97c3deabc --- /dev/null +++ b/package/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch @@ -0,0 +1,42 @@ +ushare.c: include config.h before checking for CONFIG_NLS + +When NLS support is enabled, we get following build errors: + + ushare.c: In function 'setup_i18n': + ushare.c:745:3: warning: implicit declaration of function 'setlocale' [-Wimplicit-function-declaration] + setlocale (LC_ALL, ""); + ^ + ushare.c:745:14: error: 'LC_ALL' undeclared (first use in this function) + setlocale (LC_ALL, ""); + ^ + ushare.c:745:14: note: each undeclared identifier is reported only once for each function it appears in + make[2]: *** [ushare.o] Error 1 + +When NLS support is enabled, configure script creates macro in config.h. +We check for CONFIG_NLS before including config.h which results in above +build errors as locale.h doesn't get included. + +This patch fixes above build error by including config.h before we check for +CONFIG_NLS. + +This build error is detected by Buildroot autobuilder +http://autobuild.buildroot.net/results/19d/19d67dd43e5a313c77e4be97ecb9811ffa52f797/ + +Signed-off-by: Rahul Bedarkar + +--- ushare-1.1a/src/ushare.c.old 2016-09-20 19:04:00.915239326 +0530 ++++ ushare-1.1a/src/ushare.c 2016-09-20 19:04:24.707239276 +0530 +@@ -56,11 +56,12 @@ + #include + #include + ++#include "config.h" ++ + #if (defined(HAVE_SETLOCALE) && defined(CONFIG_NLS)) + # include + #endif + +-#include "config.h" + #include "ushare.h" + #include "services.h" + #include "http.h" From 4c7c010f9fae01399070844991252d3f5b9aae5f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Sep 2016 12:01:30 -0300 Subject: [PATCH 0342/3392] libglib2: bump to version 2.50.0 It now requires util-linux libmount so add the dependency/select. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libglib2/Config.in | 2 ++ package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 84ee816a89..80c7d6749b 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_ZLIB depends on BR2_USE_WCHAR # gettext depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 35728e2e33..3bc4021477 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,2 +1,2 @@ -# https://download.gnome.org/sources/glib/2.48/glib-2.48.2.sha256sum -sha256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 glib-2.48.2.tar.xz +# https://download.gnome.org/sources/glib/2.50/glib-2.50.0.sha256sum +sha256 830b551fa626bda06e12729205b3c5bb0d82b924a8cf64d948945878f01b7d70 glib-2.50.0.tar.xz diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 6b1a387946..5bc6ed5f6d 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.48 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 +LIBGLIB2_VERSION_MAJOR = 2.50 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPLv2+ @@ -102,7 +102,7 @@ HOST_LIBGLIB2_CONF_OPTS = \ LIBGLIB2_DEPENDENCIES = \ host-pkgconf host-libglib2 host-gettext \ - libffi pcre zlib $(if $(BR2_NEEDS_GETTEXT),gettext) + libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext) HOST_LIBGLIB2_DEPENDENCIES = \ host-gettext host-libffi host-pcre host-pkgconf host-zlib From 8cbf5557f84bfd2395fba26891e45cc9b36adf8a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Sep 2016 12:01:31 -0300 Subject: [PATCH 0343/3392] glib-networking: bump to version 2.50.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/glib-networking/glib-networking.hash | 4 ++-- package/glib-networking/glib-networking.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index a495af149d..bbcecb7ad2 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.48/glib-networking-2.48.2.sha256sum -sha256 925c0c49d6b2b8b5695f2e33cd952d1dbb7d18d3f2f796413577719315bb3a84 glib-networking-2.48.2.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.50/glib-networking-2.50.0.sha256sum +sha256 3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee glib-networking-2.50.0.tar.xz diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index b6e40f84c3..d3077e9a9b 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -4,8 +4,8 @@ # ################################################################################ -GLIB_NETWORKING_VERSION_MAJOR = 2.48 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).2 +GLIB_NETWORKING_VERSION_MAJOR = 2.50 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES From 2799e38fdab59dbaffbda100462b99f6055fb0a5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Sep 2016 12:01:32 -0300 Subject: [PATCH 0344/3392] gvfs: bump to version 1.30.0 Disable admin since it requires polkit-gobject + libcap. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gvfs/gvfs.hash | 4 ++-- package/gvfs/gvfs.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index 440671f79c..9c534875c2 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.28/gvfs-1.28.3.sha256sum -sha256 458c4cb68570f6ef4a9e152995c62d0057c3e0a07ed64d84c7200cdd22f0bd17 gvfs-1.28.3.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.30/gvfs-1.30.0.sha256sum +sha256 2285d387213eef528f09df4b113d9d2e54ce7108c50587355d07f2a885840da4 gvfs-1.30.0.tar.xz diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index e2947fd735..50a2fa216b 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -4,8 +4,8 @@ # ################################################################################ -GVFS_VERSION_MAJOR = 1.28 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).3 +GVFS_VERSION_MAJOR = 1.30 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).0 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES @@ -20,6 +20,7 @@ GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-con # Most of these are missing library support GVFS_CONF_OPTS = \ --disable-afc \ + --disable-admin \ --disable-bash-completion \ --disable-cdda \ --disable-gconf \ From a557b95f98ff24073b0fa9deddafc09365194613 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Sep 2016 12:01:33 -0300 Subject: [PATCH 0345/3392] libsoup: bump to version 2.56.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libsoup/libsoup.hash | 4 ++-- package/libsoup/libsoup.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 45cee4216d..b42cf2f711 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.54/libsoup-2.54.1.sha256sum -sha256 47b42c232034734d66e5f093025843a5d8cc4b2357c011085a2fd04ef02dd633 libsoup-2.54.1.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.56/libsoup-2.56.0.sha256sum +sha256 d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5 libsoup-2.56.0.tar.xz diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 5f5156b6e8..f6e92f8a3b 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSOUP_VERSION_MAJOR = 2.54 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).1 +LIBSOUP_VERSION_MAJOR = 2.56 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPLv2+ From 05a155972d82568381346989b17b71de1de0aafc Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Sep 2016 12:01:34 -0300 Subject: [PATCH 0346/3392] gdk-pixbuf: bump to version 2.36.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- 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 e73170cfe6..e5a8958d92 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.34/gdk-pixbuf-2.34.0.sha256sum -sha256 d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 gdk-pixbuf-2.34.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.0.sha256sum +sha256 85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c gdk-pixbuf-2.36.0.tar.xz diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 36eed60a35..6d1a84d181 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDK_PIXBUF_VERSION_MAJOR = 2.34 +GDK_PIXBUF_VERSION_MAJOR = 2.36 GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).0 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) From 6f349980d407340e1f66bf9f11fb28e4ff4b4515 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Sep 2016 12:01:35 -0300 Subject: [PATCH 0347/3392] atk: bump to version 2.22.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/atk/atk.hash | 4 ++-- package/atk/atk.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/atk/atk.hash b/package/atk/atk.hash index 7178ccc81c..12c98706dd 100644 --- a/package/atk/atk.hash +++ b/package/atk/atk.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.20/atk-2.20.0.sha256sum -sha256 493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0 atk-2.20.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.22/atk-2.22.0.sha256sum +sha256 d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6 atk-2.22.0.tar.xz diff --git a/package/atk/atk.mk b/package/atk/atk.mk index 663d13ae5f..90d329ae23 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.20 +ATK_VERSION_MAJOR = 2.22 ATK_VERSION = $(ATK_VERSION_MAJOR).0 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) From 4bacd75457c443157b6c59199025eb0cc23ab63c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Sep 2016 12:01:36 -0300 Subject: [PATCH 0348/3392] vala: bump to version 0.34.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index 4a4a41c8dc..b8d47a6f70 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,2 +1,2 @@ -# From https://download.gnome.org/sources/vala/0.32/vala-0.32.1.sha256sum -sha256 dd0d47e548a34cfb1e4b04149acd082a86414c49057ffb79902eb9a508a161a9 vala-0.32.1.tar.xz +# From https://download.gnome.org/sources/vala/0.34/vala-0.34.0.sha256sum +sha256 5d59e1ad4c59debc83687b593345a3cf9ef2e9020354145e59a188de4348f455 vala-0.34.0.tar.xz diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 4cdc0d71a8..2a4d25799f 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -4,8 +4,8 @@ # ################################################################################ -VALA_VERSION_MAJOR = 0.32 -VALA_VERSION = $(VALA_VERSION_MAJOR).1 +VALA_VERSION_MAJOR = 0.34 +VALA_VERSION = $(VALA_VERSION_MAJOR).0 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPLv2.1+ From 250ed6568a4fb340e41ebe26a96b87ae2a951e51 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Tue, 20 Sep 2016 23:03:34 +0530 Subject: [PATCH 0349/3392] uclibc: add upstream patch to fix glog build on bfin glog has been failing on bfin because of issue in uclibc which is now fixed in upstream. Fixes: http://autobuild.buildroot.net/results/a10/a10ed48e6eb8411a3d8372f57c05fd11130da0e0/ Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- ...-.h-avoid-void-pointer-s-subtraction.patch | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 package/uclibc/0004-elf-fdpic-dsbt-.h-avoid-void-pointer-s-subtraction.patch diff --git a/package/uclibc/0004-elf-fdpic-dsbt-.h-avoid-void-pointer-s-subtraction.patch b/package/uclibc/0004-elf-fdpic-dsbt-.h-avoid-void-pointer-s-subtraction.patch new file mode 100644 index 0000000000..8c1c882cce --- /dev/null +++ b/package/uclibc/0004-elf-fdpic-dsbt-.h-avoid-void-pointer-s-subtraction.patch @@ -0,0 +1,70 @@ +From 2c242092372e9f7f62b881e81e8e798475e0cbb3 Mon Sep 17 00:00:00 2001 +From: Rahul Bedarkar +Date: Sun, 18 Sep 2016 13:15:38 +0530 +Subject: [PATCH] elf-{fdpic, dsbt}.h: avoid void pointer's subtraction + +elf-fdpic.h or elf-dsbt.h is included by link.h. When C++ program +includes , we get following build failure. + +../usr/include/bits/elf-fdpic.h: In function 'void* __reloc_pointer(void*, const elf32_fdpic_loadmap*)': +../usr/include/bits/elf-fdpic.h:95: error: invalid use of 'void' + +void pointer addition and subtraction is not allowed in C++ as it has +undetermined size, however in C with language extension it is possible +because sizeof void is treated as one byte. + +Instead of performing subtraction on void pointers, typecast it to char* +first. + +This build failure is detected by Buildroot autobuilder. +http://autobuild.buildroot.net/results/a10/a10ed48e6eb8411a3d8372f57c05fd11130da0e0/ + +Signed-off-by: Rahul Bedarkar +--- + libc/sysdeps/linux/bfin/bits/elf-fdpic.h | 2 +- + libc/sysdeps/linux/c6x/bits/elf-dsbt.h | 2 +- + libc/sysdeps/linux/frv/bits/elf-fdpic.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libc/sysdeps/linux/bfin/bits/elf-fdpic.h b/libc/sysdeps/linux/bfin/bits/elf-fdpic.h +index dddf82c..9fcf93f 100644 +--- a/libc/sysdeps/linux/bfin/bits/elf-fdpic.h ++++ b/libc/sysdeps/linux/bfin/bits/elf-fdpic.h +@@ -91,7 +91,7 @@ __reloc_pointer (void *p, + /* This should be computed as part of the pointer comparison + above, but we want to use the carry in the comparison, so we + can't convert it to an integer type beforehand. */ +- unsigned long offset = p - (void*)map->segs[c].p_vaddr; ++ unsigned long offset = (char*)p - (char*)map->segs[c].p_vaddr; + /* We only check for one-past-the-end for the last segment, + assumed to be the data segment, because other cases are + ambiguous in the absence of padding between segments, and +diff --git a/libc/sysdeps/linux/c6x/bits/elf-dsbt.h b/libc/sysdeps/linux/c6x/bits/elf-dsbt.h +index a4e3e7d..0e82ec7 100644 +--- a/libc/sysdeps/linux/c6x/bits/elf-dsbt.h ++++ b/libc/sysdeps/linux/c6x/bits/elf-dsbt.h +@@ -94,7 +94,7 @@ __reloc_pointer (void *p, + + for (c = 0; c < map->nsegs; c++) + { +- unsigned long offset = p - (void*)map->segs[c].p_vaddr; ++ unsigned long offset = (char*)p - (char*)map->segs[c].p_vaddr; + /* We only check for one-past-the-end for the second segment, + assumed to be the data segment, because other cases are + ambiguous in the absence of padding between segments, and +diff --git a/libc/sysdeps/linux/frv/bits/elf-fdpic.h b/libc/sysdeps/linux/frv/bits/elf-fdpic.h +index dddf82c..9fcf93f 100644 +--- a/libc/sysdeps/linux/frv/bits/elf-fdpic.h ++++ b/libc/sysdeps/linux/frv/bits/elf-fdpic.h +@@ -91,7 +91,7 @@ __reloc_pointer (void *p, + /* This should be computed as part of the pointer comparison + above, but we want to use the carry in the comparison, so we + can't convert it to an integer type beforehand. */ +- unsigned long offset = p - (void*)map->segs[c].p_vaddr; ++ unsigned long offset = (char*)p - (char*)map->segs[c].p_vaddr; + /* We only check for one-past-the-end for the last segment, + assumed to be the data segment, because other cases are + ambiguous in the absence of padding between segments, and +-- +2.6.2 + From ec1cbd8ea74d5dd039f7787abbac07cdce0edf9c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 Aug 2016 22:18:53 +0200 Subject: [PATCH 0350/3392] package/socat: fix build issue Fix two build issue when socat is build with musl: - Set NETDB_INTERNAL locally since it's not provided by musl - remove if_tun.h kernel header Fixes: http://autobuild.buildroot.net/results/029/02977d3844ef62b1e9cbfbab244593632757c5e2 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../0003-compat-set-NETDB_INTERNAL.patch | 35 +++++++ ...io-tun-remove-if_tun.h-kernel-header.patch | 91 +++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 package/socat/0003-compat-set-NETDB_INTERNAL.patch create mode 100644 package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch diff --git a/package/socat/0003-compat-set-NETDB_INTERNAL.patch b/package/socat/0003-compat-set-NETDB_INTERNAL.patch new file mode 100644 index 0000000000..da31073ba5 --- /dev/null +++ b/package/socat/0003-compat-set-NETDB_INTERNAL.patch @@ -0,0 +1,35 @@ +From e7804d1750652e39c7a5803d360b29b2637a695f Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 28 Aug 2016 21:04:01 +0200 +Subject: [PATCH] compat: set NETDB_INTERNAL + +Musl doesn't provide NETDB_INTERNAL which is defined in resolv/netdb.h +in Glibc [1]. + +Set NETDB_INTERNAL to -1 locally if not already defined. +Based on [2]. + +[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/netdb.h;h=3aba530932c7a62a4f23e3193e9186da677f552b;hb=fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2#l74 +[2] http://git.alpinelinux.org/cgit/aports/tree/main/socat/netdb-internal.patch?id=5a45173b50892cb634197c30b3506ebff98d3b7d + +Signed-off-by: Romain Naour +--- + compat.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/compat.h b/compat.h +index 19a929f..4f5ee6d 100644 +--- a/compat.h ++++ b/compat.h +@@ -666,6 +666,8 @@ typedef int sig_atomic_t; + + #if !defined(NETDB_INTERNAL) && defined(h_NETDB_INTERNAL) + # define NETDB_INTERNAL h_NETDB_INTERNAL ++#elif !defined(NETDB_INTERNAL) ++# define NETDB_INTERNAL (-1) + #endif + + #ifndef INET_ADDRSTRLEN +-- +2.5.5 + diff --git a/package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch b/package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch new file mode 100644 index 0000000000..7704123f30 --- /dev/null +++ b/package/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch @@ -0,0 +1,91 @@ +From 1c141194e3587cc8124e5f4512dc3030e5a104b1 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 28 Aug 2016 22:06:09 +0200 +Subject: [PATCH] xio-tun: remove if_tun.h kernel header + +xio-tun mixes userspace and kernel headers. + +http://wiki.musl-libc.org/wiki/FAQ#Q:_why_am_i_getting_.22error:_redefinition_of_struct_ethhdr.2Ftcphdr.2Fetc.22_.3F + +Signed-off-by: Romain Naour +--- + config.h.in | 3 --- + configure.in | 8 +------- + sysincludes.h | 3 --- + xio-tun.c | 6 ++++++ + 4 files changed, 7 insertions(+), 13 deletions(-) + +diff --git a/config.h.in b/config.h.in +index 9058bf8..ed0962c 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -258,9 +258,6 @@ + /* Define if you have the header file. */ + #undef HAVE_LINUX_ERRQUEUE_H + +-/* Define if you have the header file. */ +-#undef HAVE_LINUX_IF_TUN_H +- + /* Define if you have the header file. */ + #undef HAVE_NETPACKET_PACKET_H + +diff --git a/configure.in b/configure.in +index 1d2e76f..27bb3d5 100644 +--- a/configure.in ++++ b/configure.in +@@ -78,7 +78,7 @@ AC_CHECK_HEADERS(arpa/nameser.h) + + AC_HEADER_RESOLV() + +-AC_CHECK_HEADERS(termios.h linux/if_tun.h) ++AC_CHECK_HEADERS(termios.h) + AC_CHECK_HEADERS(net/if_dl.h) + AC_CHECK_HEADERS(linux/types.h) + AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include +@@ -680,12 +680,6 @@ AC_ARG_ENABLE(tun, [ --disable-tun disable TUN/TAP support], + esac], + [AC_MSG_RESULT(yes); WITH_TUN=1 ]) + +-# +-if ! test "$ac_cv_header_linux_if_tun_h" = 'yes'; then +- AC_MSG_WARN(include file linux/if_tun.h not found, disabling TUN) +- WITH_TUN= +-fi +-# + if test -n "$WITH_TUN"; then + AC_DEFINE(WITH_TUN) + fi +diff --git a/sysincludes.h b/sysincludes.h +index 98dff77..28067f4 100644 +--- a/sysincludes.h ++++ b/sysincludes.h +@@ -142,9 +142,6 @@ + #if HAVE_NETINET_IF_ETHER_H + #include + #endif +-#if HAVE_LINUX_IF_TUN_H +-#include +-#endif + + #if HAVE_TERMIOS_H && _WITH_TERMIOS + #include +diff --git a/xio-tun.c b/xio-tun.c +index 0628d27..f965a7e 100644 +--- a/xio-tun.c ++++ b/xio-tun.c +@@ -14,6 +14,12 @@ + + #include "xio-tun.h" + ++/* TUNSETIFF flags from if_tun.h kernel header */ ++#define IFF_TUN 0x0001 ++#define IFF_TAP 0x0002 ++#define IFF_NO_PI 0x1000 ++ ++#define TUNSETIFF _IOW('T', 202, int) + + static int xioopen_tun(int argc, const char *argv[], struct opt *opts, int xioflags, xiofile_t *fd, unsigned groups, int dummy1, int dummy2, int dummy3); + +-- +2.5.5 + From 463f1fe0d4d88700f257dec126b35ca5b457463b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Tue, 23 Aug 2016 11:26:06 +0200 Subject: [PATCH 0351/3392] python-pyqt5: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Vögele Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + .../0001-configure-skip-qtdetail.patch | 29 +++++++ package/python-pyqt5/Config.in | 17 ++++ package/python-pyqt5/python-pyqt5.hash | 3 + package/python-pyqt5/python-pyqt5.mk | 79 +++++++++++++++++++ 5 files changed, 129 insertions(+) create mode 100644 package/python-pyqt5/0001-configure-skip-qtdetail.patch create mode 100644 package/python-pyqt5/Config.in create mode 100644 package/python-pyqt5/python-pyqt5.hash create mode 100644 package/python-pyqt5/python-pyqt5.mk diff --git a/package/Config.in b/package/Config.in index 3d624ccaa1..a9f6bc7173 100644 --- a/package/Config.in +++ b/package/Config.in @@ -739,6 +739,7 @@ menu "External python modules" source "package/python-pyparted/Config.in" source "package/python-pypcap/Config.in" source "package/python-pyqt/Config.in" + source "package/python-pyqt5/Config.in" source "package/python-pyratemp/Config.in" source "package/python-pyro/Config.in" source "package/python-pyroute2/Config.in" diff --git a/package/python-pyqt5/0001-configure-skip-qtdetail.patch b/package/python-pyqt5/0001-configure-skip-qtdetail.patch new file mode 100644 index 0000000000..2e7b331ed6 --- /dev/null +++ b/package/python-pyqt5/0001-configure-skip-qtdetail.patch @@ -0,0 +1,29 @@ +Do not run qtdetail + +qtdetail is a tool that generates qtdetail.out. Since this program is +cross-compiled, it's not possible to run it on the host. + +Consequently, python-pyqt5.mk generates the qtdetail.out file before +calling configure.py. + +Therefore, this patch makes sure that the pre-generated qtdetail.out +file is kept, and that qtdetail is not executed. + +Signed-off-by: Gwenhael Goavec-Merou +Signed-off-by: Sergey Kostanbaev +--- +Index: PyQt5_gpl-5.7/configure.py +=================================================================== +--- PyQt5_gpl-5.7.orig/configure.py ++++ PyQt5_gpl-5.7/configure.py +@@ -672,10 +672,6 @@ int main(int argc, char **argv) + if cmd is None: + error("Failed to determine the detail of your Qt installation. Try again using the --verbose flag to see more detail about the problem.") + +- # Create the output file, first making sure it doesn't exist. +- remove_file(out_file) +- run_command(cmd, verbose) +- + if not os.access(out_file, os.F_OK): + error("%s failed to create %s. Make sure your Qt installation is correct." % (cmd, out_file)) + diff --git a/package/python-pyqt5/Config.in b/package/python-pyqt5/Config.in new file mode 100644 index 0000000000..319525aa98 --- /dev/null +++ b/package/python-pyqt5/Config.in @@ -0,0 +1,17 @@ +comment "python-pyqt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + +config BR2_PACKAGE_PYTHON_PYQT5 + bool "python-pyqt5" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR # qt5 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 + depends on !BR2_STATIC_LIBS # qt5 + depends on !BR2_PACKAGE_QT # qt5 + select BR2_PACKAGE_QT5 + select BR2_PACKAGE_PYTHON_SIP + help + Python bindings for Qt 5 + + http://www.riverbankcomputing.com/software/pyqt/ diff --git a/package/python-pyqt5/python-pyqt5.hash b/package/python-pyqt5/python-pyqt5.hash new file mode 100644 index 0000000000..2a7d05b49a --- /dev/null +++ b/package/python-pyqt5/python-pyqt5.hash @@ -0,0 +1,3 @@ +# md5 from http://http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7, sha256 locally computed +md5 e3dc21f31fd714659f0688e1eb31bacf PyQt5_gpl-5.7.tar.gz +sha256 892693ba5f79989abb2061dad2d5c4e6f127e9dd3240f73f8220c7152cd35b05 PyQt5_gpl-5.7.tar.gz diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk new file mode 100644 index 0000000000..e58ee5ad93 --- /dev/null +++ b/package/python-pyqt5/python-pyqt5.mk @@ -0,0 +1,79 @@ +################################################################################ +# +# python-pyqt5 +# +################################################################################ + +PYTHON_PYQT5_VERSION = 5.7 +PYTHON_PYQT5_SOURCE = PyQt5_gpl-$(PYTHON_PYQT5_VERSION).tar.gz +PYTHON_PYQT5_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$(PYTHON_PYQT5_VERSION) +PYTHON_PYQT5_LICENSE = GPLv3 +PYTHON_PYQT5_LICENSE_FILES = LICENSE + +PYTHON_PYQT5_DEPENDENCIES = python-sip host-python-sip qt5base + +ifeq ($(BR2_PACKAGE_PYTHON),y) +PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR) +PYTHON_PYQT5_RM_PORT_BASE = port_v3 +else ifeq ($(BR2_PACKAGE_PYTHON3),y) +PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR) +PYTHON_PYQT5_RM_PORT_BASE = port_v2 +endif + +PYTHON_PYQT5_QTDETAIL_LICENSE = Open Source + +PYTHON_PYQT5_QTDETAIL_TYPE = shared + +# Turn off features that aren't available in current qt configuration +PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL) +PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL) +PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL) + +define PYTHON_PYQT5_QTDETAIL + echo $(1) >> $(2)/qtdetail.out +endef + +# Since we can't run generate qtdetail.out by running qtdetail on target device +# we must generate the configuration. +define PYTHON_PYQT5_GENERATE_QTDETAIL + $(RM) -f $(1)/qtdetail.out + $(call PYTHON_PYQT5_QTDETAIL,$(PYTHON_PYQT5_QTDETAIL_LICENSE),$(1)) + $(call PYTHON_PYQT5_QTDETAIL,$(PYTHON_PYQT5_QTDETAIL_TYPE),$(1)) + $(foreach f,$(PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES), + $(call PYTHON_PYQT5_QTDETAIL,$(f),$(1)) \ + ) +endef + +PYTHON_PYQT5_CONF_OPTS = \ + --bindir $(TARGET_DIR)/usr/bin \ + --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ + --qmake $(HOST_DIR)/usr/bin/qmake \ + --sysroot $(STAGING_DIR)/usr \ + -w --confirm-license \ + --no-designer-plugin \ + --no-docstrings \ + --no-sip-files + +define PYTHON_PYQT5_CONFIGURE_CMDS + $(call PYTHON_PYQT5_GENERATE_QTDETAIL,$(@D)) + (cd $(@D); \ + $(TARGET_MAKE_ENV) \ + $(TARGET_CONFIGURE_OPTS) \ + $(HOST_DIR)/usr/bin/python configure.py \ + $(PYTHON_PYQT5_CONF_OPTS) \ + ) +endef + +define PYTHON_PYQT5_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +# __init__.py is needed to import PyQt5 +# __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set +define PYTHON_PYQT5_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install + touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/__init__.py + $(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/uic/$(PYTHON_PYQT5_RM_PORT_BASE) +endef + +$(eval $(generic-package)) From c464f960047c549141c2f0c2178b9bea4b142133 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 23 Aug 2016 18:26:35 +0200 Subject: [PATCH 0352/3392] package/nvidia-driver: update version This new version brings in support for egl-wayland, the EGL extensions aimed at making it possible to implement Wayland servers and clients. As such, nvidia-driver becomes the second EGL implementation in Buildroot that can act as a libegl provider with egl-wayland extensions. In this version, it becomes possible to use our kernel-module infra, with just a little few minor tricks: we need just specify the Linux source and build trees (they are the same for us) and the list of modules to build. We still need a little patch against the Kbuild files. We also get rid of the LIBS_NO_VERSION trick and always use complete filenames, as more libs are now packaged with different version in their filenames, and even some with no version at all. When installing libs, we switch from a shell loop to a make foreach loop, which is easier to handle. It has the side-effect (and advantage) of displaying the install commands for each library, rather than a single biggish one, so it is easier to see what goes wrong. This also means that an error in each phase of the install (the copy of the files then each symlink) can be caught more easily (it was not previously): each sequence is now its own make command; we need not use "|| exit 1" after each command, even in a if block, because the if blocks returns with the exit code of the last command in it; e.g. if an ln fails, the if-block in which it is enclosed will return the exit code of ln, and make will catch it. Similarly for the X driver modules and each of the programs installed: we now can catch any failure in the isntall of those. All of this somewhat simplifies the .mk. It is a little bit longer, but the structure is saner and more explicit. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/nvidia-driver/0001-use-LDFLAGS.patch | 48 +++++ package/nvidia-driver/Config.in | 6 +- package/nvidia-driver/nvidia-driver.hash | 4 +- package/nvidia-driver/nvidia-driver.mk | 204 ++++++++++--------- 4 files changed, 161 insertions(+), 101 deletions(-) create mode 100644 package/nvidia-driver/0001-use-LDFLAGS.patch diff --git a/package/nvidia-driver/0001-use-LDFLAGS.patch b/package/nvidia-driver/0001-use-LDFLAGS.patch new file mode 100644 index 0000000000..7b7df80988 --- /dev/null +++ b/package/nvidia-driver/0001-use-LDFLAGS.patch @@ -0,0 +1,48 @@ +kernel: use LDFLAGS when linking modules + +Currently, linking module objects is simply using $(LD), assuming that +the default emulation is correct for the current architecture. + +However, that might not be the case when the toolchain default is not +the same as the current arch. For example, if the toolchain defaults to +i386 and is capable of x86_64, and we're targetting x86_64 (or the +opposite), the link would fail because the ld emulation is incorrect: + + .../i686-pc-linux-gnu-ld: Relocatable linking with relocations from + format elf64-x86-64 (.../nvidia-driver-370.23/kernel/nvidia/nv-frontend.o) + to format elf32-i386 (.../nvidia-driver-370.23/kernel/nvidia/nv-interface.o) + is not supported + +Add use of $(LDFLAGS) when doing the link, as the kernel provides the +proper emulation in those. + +Signed-off-by: "Yann E. MORIN" + +--- +Issue reported upstream: + https://devtalk.nvidia.com/default/topic/958653/ + +diff -durN nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild +--- nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild 2016-08-09 01:57:50.000000000 +0200 ++++ nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild 2016-08-20 12:25:02.780233423 +0200 +@@ -87,7 +87,7 @@ + always += $(NVIDIA_INTERFACE) + + $(obj)/$(NVIDIA_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_OBJECTS)) +- $(LD) -r -o $@ $^ ++ $(LD) $(LDFLAGS) -r -o $@ $^ + + + # +diff -durN nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild +--- nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2016-08-09 01:43:19.000000000 +0200 ++++ nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2016-08-20 12:25:39.596772662 +0200 +@@ -70,7 +70,7 @@ + always += $(NVIDIA_MODESET_INTERFACE) + + $(obj)/$(NVIDIA_MODESET_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_MODESET_OBJECTS)) +- $(LD) -r -o $@ $^ ++ $(LD) $(LDFLAGS) -r -o $@ $^ + + # + # Register the conftests needed by nvidia-modeset.ko diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index 04499f6334..1105ec63b6 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -22,10 +22,11 @@ config BR2_PACKAGE_NVIDIA_DRIVER_XORG default y depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR select BR2_PACKAGE_MESA3D_HEADERS - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBX11 # runtime + select BR2_PACKAGE_XLIB_LIBXEXT # runtime select BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_HAS_LIBEGL_WAYLAND select BR2_PACKAGE_HAS_LIBGLES if BR2_PACKAGE_NVIDIA_DRIVER_XORG @@ -62,7 +63,6 @@ config BR2_PACKAGE_NVIDIA_DRIVER_OPENCL config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS bool "CUDA MPS server and control" - depends on BR2_x86_64 help Say 'y' here if you need to run more than one program doing CUDA at the same time. The MPS server will be diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash index ba2f5554bf..9427ffba44 100644 --- a/package/nvidia-driver/nvidia-driver.hash +++ b/package/nvidia-driver/nvidia-driver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d3a2842cbfb1163e20c658fbfaf5a235d5c9f035cd2d657f15df8a14b3fe80b1 NVIDIA-Linux-x86-358.16.run -sha256 a942cdb29ed715ff1ce25beb06b6c2490126b98ef8bee5d9973967b557596bf2 NVIDIA-Linux-x86_64-358.16.run +sha256 38cb22fa85ef74ea960d3e5d644838cd961984ffc32bb0d052414cc7fa32e315 NVIDIA-Linux-x86-367.35.run +sha256 d2df3fcb1a145984b9de4f2f38a90e353469e9d12279cf5e2c67c553b112d075 NVIDIA-Linux-x86_64-367.35.run diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index 7e670206e0..c1fc9863bb 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -NVIDIA_DRIVER_VERSION = 358.16 +NVIDIA_DRIVER_VERSION = 367.35 NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) NVIDIA_DRIVER_SITE = ftp://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run @@ -20,25 +20,56 @@ ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_XORG),y) # are build dependencies of packages that depend on nvidia-driver, so # they should be built prior to those packages, and the only simple # way to do so is to make nvidia-driver depend on them. -NVIDIA_DRIVER_DEPENDENCIES = mesa3d-headers xlib_libX11 xlib_libXext +NVIDIA_DRIVER_DEPENDENCIES = mesa3d-headers NVIDIA_DRIVER_PROVIDES = libgl libegl libgles -# We have two variables that contains a list of libraries to install: -# NVIDIA_DRIVER_LIBS -# contains the libraries whose filename end up in .so.$(VERSION); rather -# than duplicate the version string for all of them, we just store their -# basename, and append the version string below. -# NVIDIA_DRIVER_LIBS_NO_VERSION -# contains all libraries the do not use the NVidia version; since there -# is currently only one such library, we store its full name. +# libGL.so.$(NVIDIA_DRIVER_VERSION) is the legacy libGL.so library; it +# has been replaced with libGL.so.1.0.0. Installing both is technically +# possible, but great care must be taken to ensure they do not conflict, +# so that EGL still works. The legacy library exposes an NVidia-specific +# API, so it should not be needed, except for legacy, binary-only +# applications (in other words: we don't care). +# +# libGL.so.1.0.0 is the new vendor-neutral library, aimed at replacing +# the old libGL.so.$(NVIDIA_DRIVER_VERSION) library. The latter contains +# NVidia extensions (which is deemed bad now), while the former follows +# the newly-introduced vendor-neutral "dispatching" API/ABI: +# https://github.com/aritger/linux-opengl-abi-proposal/blob/master/linux-opengl-abi-proposal.txt +# However, this is not very usefull to us, as we don't support multiple +# GL providers at the same time on the system, which this proposal is +# aimed at supporting. +# +# So we only install the legacy library for now. +NVIDIA_DRIVER_LIBS_GL = \ + libGLX.so.0 \ + libGL.so.$(NVIDIA_DRIVER_VERSION) \ + libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ + +NVIDIA_DRIVER_LIBS_EGL = \ + libEGL.so.1 \ + libGLdispatch.so.0 \ + libEGL_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ + +NVIDIA_DRIVER_LIBS_GLES = \ + libGLESv1_CM.so.1 \ + libGLESv2.so.2 \ + libGLESv1_CM_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ + libGLESv2_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ + +NVIDIA_DRIVER_LIBS_MISC = \ + libnvidia-eglcore.so.$(NVIDIA_DRIVER_VERSION) \ + libnvidia-egl-wayland.so.$(NVIDIA_DRIVER_VERSION) \ + libnvidia-glcore.so.$(NVIDIA_DRIVER_VERSION) \ + libnvidia-glsi.so.$(NVIDIA_DRIVER_VERSION) \ + tls/libnvidia-tls.so.$(NVIDIA_DRIVER_VERSION) \ + libvdpau_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ + libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION) \ -# Each line corresponds to a specific set of libraries NVIDIA_DRIVER_LIBS = \ - libEGL libGLESv1_CM libGLESv2 libGL \ - libnvidia-glcore libnvidia-eglcore libnvidia-glsi \ - tls/libnvidia-tls \ - libvdpau libvdpau_nvidia \ - libnvidia-ml + $(NVIDIA_DRIVER_LIBS_GL) \ + $(NVIDIA_DRIVER_LIBS_EGL) \ + $(NVIDIA_DRIVER_LIBS_GLES) \ + $(NVIDIA_DRIVER_LIBS_MISC) \ # Install the gl.pc file define NVIDIA_DRIVER_INSTALL_GL_DEV @@ -54,110 +85,91 @@ endef # on using those libraries (e.g. if the user has such an agreement, or # wants to run a third-party program developped under such an agreement). ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_PRIVATE_LIBS),y) -NVIDIA_DRIVER_LIBS += libnvidia-ifr libnvidia-fbc +NVIDIA_DRIVER_LIBS += \ + libnvidia-ifr.so.$(NVIDIA_DRIVER_VERSION) \ + libnvidia-fbc.so.$(NVIDIA_DRIVER_VERSION) endif # We refer to the destination path; the origin file has no directory component -NVIDIA_DRIVER_X_MODS = drivers/nvidia_drv.so \ +NVIDIA_DRIVER_X_MODS = \ + drivers/nvidia_drv.so \ extensions/libglx.so.$(NVIDIA_DRIVER_VERSION) \ libnvidia-wfb.so.$(NVIDIA_DRIVER_VERSION) endif # X drivers ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA),y) -NVIDIA_DRIVER_LIBS += libcuda libnvidia-compiler libnvcuvid libnvidia-encode +NVIDIA_DRIVER_LIBS += \ + libcuda.so.$(NVIDIA_DRIVER_VERSION) \ + libnvidia-compiler.so.$(NVIDIA_DRIVER_VERSION) \ + libnvcuvid.so.$(NVIDIA_DRIVER_VERSION) \ + libnvidia-fatbinaryloader.so.$(NVIDIA_DRIVER_VERSION) \ + libnvidia-ptxjitcompiler.so.$(NVIDIA_DRIVER_VERSION) \ + libnvidia-encode.so.$(NVIDIA_DRIVER_VERSION) ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS),y) NVIDIA_DRIVER_PROGS = nvidia-cuda-mps-control nvidia-cuda-mps-server endif endif ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_OPENCL),y) -NVIDIA_DRIVER_LIBS_NO_VERSION += libOpenCL.so.1.0.0 -NVIDIA_DRIVER_LIBS += libnvidia-opencl +NVIDIA_DRIVER_LIBS += \ + libOpenCL.so.1.0.0 \ + libnvidia-opencl.so.$(NVIDIA_DRIVER_VERSION) +endif + +# Build and install the kernel modules if needed +ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_MODULE),y) + +NVIDIA_DRIVER_MODULES = nvidia nvidia-modeset nvidia-drm +ifeq ($(BR2_x86_64),y) +NVIDIA_DRIVER_MODULES += nvidia-uvm endif +# They can't do everything like everyone. They need those variables, +# because they don't recognise the usual variables set by the kernel +# build system. We also need to tell them what modules to build. +NVIDIA_DRIVER_MODULE_MAKE_OPTS = \ + NV_KERNEL_SOURCES="$(LINUX_DIR)" \ + NV_KERNEL_OUTPUT="$(LINUX_DIR)" \ + NV_KERNEL_MODULES="$(NVIDIA_DRIVER_MODULES)" + +NVIDIA_DRIVER_MODULE_SUBDIRS = kernel + +$(eval $(kernel-module)) + +endif # BR2_PACKAGE_NVIDIA_DRIVER_MODULE == y + # The downloaded archive is in fact an auto-extract script. So, it can run # virtually everywhere, and it is fine enough to provide useful options. # Except it can't extract into an existing (even empty) directory. define NVIDIA_DRIVER_EXTRACT_CMDS $(SHELL) $(DL_DIR)/$(NVIDIA_DRIVER_SOURCE) --extract-only --target \ $(@D)/tmp-extract + chmod u+w -R $(@D) mv $(@D)/tmp-extract/* $(@D)/tmp-extract/.manifest $(@D) rm -rf $(@D)/tmp-extract endef -# Build and install the kernel modules if needed -ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_MODULE),y) - -NVIDIA_DRIVER_DEPENDENCIES += linux - -# NVidia uses the legacy naming scheme for the x86 architecture, when i386 -# and x86_64 were still considered two separate architectures in the Linux -# kernel. -NVIDIA_DRIVER_ARCH = $(if $(BR2_i386),i386,$(BR2_ARCH)) - -NVIDIA_DRIVER_MOD_DIRS = kernel -NVIDIA_DRIVER_MOD_FILES = kernel/nvidia.ko -# nvidia-uvm.ko only available for x86_64 -ifeq ($(BR2_x86_64)$(BR2_PACKAGE_NVIDIA_DRIVER_CUDA),yy) -NVIDIA_DRIVER_MOD_DIRS += kernel/uvm -NVIDIA_DRIVER_MOD_FILES += kernel/uvm/nvidia-uvm.ko -endif - -# We can not use '$(MAKE) -C $(@D)/$${dir}' because NVidia's uses its own -# Makefile to build a kernel module, which includes a lot of assumptions -# on where to find its own sub-Makefile fragments, and fails if make is -# not run from the directory where the module's source files are. Hence -# our little trick to cd in there first. -# That's also the reason why we do not use LINUX_MAKE_FLAGS or the other -# linux-specific variables, since NVidia's Makefile does not understand -# them. -define NVIDIA_DRIVER_BUILD_CMDS - for dir in $(NVIDIA_DRIVER_MOD_DIRS); do \ - (cd $(@D)/$${dir} && \ - $(MAKE) SYSSRC="$(LINUX_DIR)" SYSOUT="$(LINUX_DIR)" \ - CC="$(TARGET_CC)" LD="$(TARGET_LD)" HOSTCC="$(HOSTCC)" \ - ARCH=$(NVIDIA_DRIVER_ARCH) module) || exit 1; \ - done -endef - -# We do not use module-install because NVidia's Makefile requires root. -# Also, we do not install it in the expected location (in nvidia/ rather -# than in kernel/drivers/video/) -define NVIDIA_DRIVER_INSTALL_KERNEL_MODULE - for mod in $(NVIDIA_DRIVER_MOD_FILES); do \ - $(INSTALL) -D -m 0644 $(@D)/$${mod} \ - $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/nvidia/$${mod##*/} \ - || exit 1; \ - done - $(HOST_DIR)/sbin/depmod -a -b $(TARGET_DIR) $(LINUX_VERSION_PROBED) -endef - -endif # BR2_PACKAGE_NVIDIA_DRIVER_MODULE == y - # Helper to install libraries # $1: destination directory (target or staging) # -# For all libraries that need it, we append the NVidia version string. -# Then for all libraries, we install them and create a symlink using -# their SONAME, so we can link to them at runtime; we also create the -# no-version symlink, so we can link to them at build time. +# For all libraries, we install them and create a symlink using +# their SONAME, so we can link to them at runtime; we also create +# the no-version symlink, so we can link to them at build time. define NVIDIA_DRIVER_INSTALL_LIBS - for libpath in $(addsuffix .so.$(NVIDIA_DRIVER_VERSION),$(NVIDIA_DRIVER_LIBS)) \ - $(NVIDIA_DRIVER_LIBS_NO_VERSION); \ - do \ - libname="$${libpath##*/}"; \ - $(INSTALL) -D -m 0644 $(@D)/$${libpath} $(1)/usr/lib/$${libname}; \ - libsoname="$$( $(TARGET_READELF) -d "$(@D)/$${libpath}" \ + $(foreach lib,$(NVIDIA_DRIVER_LIBS),\ + $(INSTALL) -D -m 0644 $(@D)/$(lib) $(1)/usr/lib/$(notdir $(lib)) + libsoname="$$( $(TARGET_READELF) -d "$(@D)/$(lib)" \ |sed -r -e '/.*\(SONAME\).*\[(.*)\]$$/!d; s//\1/;' )"; \ - if [ -n "$${libsoname}" -a "$${libsoname}" != "$${libname}" ]; then \ - ln -sf $${libname} $(1)/usr/lib/$${libsoname}; \ - fi; \ - baseso="$${libname/.so*}.so"; \ - if [ -n "$${baseso}" -a "$${baseso}" != "$${libname}" ]; then \ - ln -sf $${libname} $(1)/usr/lib/$${baseso}; \ - fi; \ - done + if [ -n "$${libsoname}" -a "$${libsoname}" != "$(notdir $(lib))" ]; then \ + ln -sf $(notdir $(lib)) \ + $(1)/usr/lib/$${libsoname}; \ + fi + baseso=$(firstword $(subst .,$(space),$(notdir $(lib)))).so; \ + if [ -n "$${baseso}" -a "$${baseso}" != "$(notdir $(lib))" ]; then \ + ln -sf $(notdir $(lib)) $(1)/usr/lib/$${baseso}; \ + fi + ) endef # For staging, install libraries and development files @@ -169,14 +181,14 @@ endef # For target, install libraries and X.org modules define NVIDIA_DRIVER_INSTALL_TARGET_CMDS $(call NVIDIA_DRIVER_INSTALL_LIBS,$(TARGET_DIR)) - for m in $(NVIDIA_DRIVER_X_MODS); do \ - $(INSTALL) -D -m 0644 $(@D)/$${m##*/} \ - $(TARGET_DIR)/usr/lib/xorg/modules/$${m}; \ - done - for p in $(NVIDIA_DRIVER_PROGS); do \ - $(INSTALL) -D -m 0755 $(@D)/$${p} \ - $(TARGET_DIR)/usr/bin/$${p}; \ - done + $(foreach m,$(NVIDIA_DRIVER_X_MODS), \ + $(INSTALL) -D -m 0644 $(@D)/$(notdir $(m)) \ + $(TARGET_DIR)/usr/lib/xorg/modules/$(m) + ) + $(foreach p,$(NVIDIA_DRIVER_PROGS), \ + $(INSTALL) -D -m 0755 $(@D)/$(p) \ + $(TARGET_DIR)/usr/bin/$(p) + ) $(NVIDIA_DRIVER_INSTALL_KERNEL_MODULE) endef From 50332a530b1b87095f6f3bffb3db2c1b4187fe49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 11 Aug 2016 15:25:38 +0200 Subject: [PATCH 0353/3392] gcc: rename option for ARC gcc The ARC gcc version is now based on gcc 6.x and no longer gcc 4.8.x, which makes the option BR2_GCC_VERSION_4_8_ARC a bit irrelevant, as is the prompt of this option. This commit therefore renames this option to BR2_GCC_VERSION_ARC, and adjust its prompt as well. Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 8 ++++++++ package/gcc/Config.in.host | 10 +++++----- package/gcc/gcc-initial/gcc-initial.mk | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 8957be7cd7..59147180c4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_GCC_VERSION_4_8_ARC + bool "gcc arc option renamed" + select BR2_LEGACY + select BR2_GCC_VERSION_ARC + help + The option that selects the gcc version for the ARC + architecture has been renamed to BR2_GCC_VERSION_ARC. + config BR2_KERNEL_HEADERS_4_0 bool "kernel headers version 4.0.x are no longer supported" select BR2_KERNEL_HEADERS_3_18 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 134b16ce17..3460fdd3a1 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -8,7 +8,7 @@ config BR2_GCC_SUPPORTS_GRAPHITE choice prompt "GCC compiler Version" - default BR2_GCC_VERSION_4_8_ARC if BR2_arc + default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_4_9_X help Select the version of gcc you wish to use. @@ -56,12 +56,12 @@ choice select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - config BR2_GCC_VERSION_4_8_ARC - bool "gcc 4.8-arc" + config BR2_GCC_VERSION_ARC + bool "gcc arc (6.x)" # Only supported architecture depends on BR2_arc select BR2_GCC_NEEDS_MPC - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 config BR2_GCC_VERSION_4_9_X @@ -121,7 +121,7 @@ config BR2_GCC_VERSION default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.4.0" if BR2_GCC_VERSION_5_X default "6.2.0" if BR2_GCC_VERSION_6_X - default "arc-2016.09-eng013" if BR2_GCC_VERSION_4_8_ARC + default "arc-2016.09-eng013" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS string "Additional gcc options" diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index 1e58d8b5f7..aa88a6808f 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -29,7 +29,7 @@ HOST_GCC_INITIAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK # available (--with-newlib is passed, and therefore inhibit_libc is # defined), it tries to use the C library for the libgmon # library. Since it's not needed in gcc-initial, we disabled it here. -ifeq ($(BR2_GCC_VERSION_4_8_ARC),y) +ifeq ($(BR2_GCC_VERSION_ARC),y) define HOST_GCC_INITIAL_DISABLE_LIBGMON $(SED) 's/crtbeginS.o libgmon.a crtg.o/crtbeginS.o crtg.o/' \ $(@D)/libgcc/config.host From 2c83114ffecf311f8e523255320365a1eb0850db Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Sep 2016 17:27:43 -0300 Subject: [PATCH 0354/3392] util-linux: enable libmount for host variant It's a necessary dependency to build the new host-libglib2. libblkd is an indirect dependency for libmount. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 82a726e939..f648155445 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -117,13 +117,14 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl) -# In the host version of util-linux, we so far only require libuuid, -# and none of the util-linux utilities, so we disable all of them, unless -# BR2_PACKAGE_HOST_UTIL_LINUX is set +# In the host version of util-linux, we only require libuuid and +# libmount (plus libblkid as an indirect dependency of libmount). +# So disable all of the programs, unless BR2_PACKAGE_HOST_UTIL_LINUX is set HOST_UTIL_LINUX_CONF_OPTS += \ + --enable-libblkid \ + --enable-libmount \ --enable-libuuid \ - --disable-libblkid --disable-libmount \ --without-ncurses ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) From 71c5a81c96873c056cb2c54580e3ba2db528ca8a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Sep 2016 17:27:44 -0300 Subject: [PATCH 0355/3392] libglib2: add host-util-linux for host variant It's required now, fixes: http://autobuild.buildroot.net/results/e81/e81f98561867d370115a019284682c0611796978/ Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libglib2/libglib2.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 5bc6ed5f6d..f199a4aa2d 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -105,7 +105,12 @@ LIBGLIB2_DEPENDENCIES = \ libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext) HOST_LIBGLIB2_DEPENDENCIES = \ - host-gettext host-libffi host-pcre host-pkgconf host-zlib + host-gettext \ + host-libffi \ + host-pcre \ + host-pkgconf \ + host-util-linux \ + host-zlib LIBGLIB2_CONF_OPTS = \ --with-pcre=system From 5743830844e6ce6a633205ad22218034c787f9fb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 21 Sep 2016 08:43:04 +0200 Subject: [PATCH 0356/3392] e2fsprogs: fix linking against librt Our previous patch to link against librt to access clock_gettime() was merged upstreamed... but it lacked a crucial part which makes the whole thing useless: $(CLOCK_GETTIME_LIB) is always empty from a make point of view. This commit adds a patch to e2fsprogs to fix the problem. Fixes: http://autobuild.buildroot.net/results/41ea60bebfc741604a5499df74363b498ad77a48/ Signed-off-by: Thomas Petazzoni --- ...-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch diff --git a/package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch b/package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch new file mode 100644 index 0000000000..bd86c4e21a --- /dev/null +++ b/package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch @@ -0,0 +1,35 @@ +From b5baf15b36107925186d89af9097b4b8e2d7cad6 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 21 Sep 2016 08:38:21 +0200 +Subject: [PATCH] MCONFIG.in: handle CLOCK_GETTIME_LIB + +Commit 62bc243f1bfe623312a350e4cd0d2e17a69aac45 ("fuse2fs: might need +librt") added a check for the clock_gettime() to verify whether linking +with the librt library is needed or not to use this function. + +However, this commit forgot the change in MCONFIG.in that allows to +define the make variable CLOCK_GETTIME_LIB from the CLOCK_GETTIME_LIB +variable substituted by the configure script. Due to this, from a make +perspective $(CLOCK_GETTIME_LIB) is always empty, and we get link +failure on platforms where clock_gettime() is available in librt. + +Signed-off-by: Thomas Petazzoni +--- + MCONFIG.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/MCONFIG.in b/MCONFIG.in +index e82963d..9ba9ce2 100644 +--- a/MCONFIG.in ++++ b/MCONFIG.in +@@ -125,6 +125,7 @@ LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@STATIC_LIB_EXT@ + LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID) + LIBINTL = @LIBINTL@ + SYSLIBS = @LIBS@ ++CLOCK_GETTIME_LIB = @CLOCK_GETTIME_LIB@ + DEPLIBSS = $(LIB)/libss@LIB_EXT@ + DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ + DEPLIBUUID = @DEPLIBUUID@ +-- +2.7.4 + From e6ee58de3ed5cba52418785f41e1bea91c1d2ab8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 20 Sep 2016 19:25:42 +0200 Subject: [PATCH 0357/3392] gcc: switch to gcc 5.x as the default gcc 4.9.4 was the last release of the 4.9.x branch, and the gcc developes will now only be maintaining gcc 5.x and 6.x: https://gcc.gnu.org/ml/gcc-announce/2016/msg00002.html Therefore, it is time to use gcc 5.x as the default version in Buildroot. We have been having toolchains in the autobuilders with gcc 5.x for a while, so the vast majority of the problems should have already been solved. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gcc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 3460fdd3a1..6ecc2f0c0a 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -9,7 +9,7 @@ config BR2_GCC_SUPPORTS_GRAPHITE choice prompt "GCC compiler Version" default BR2_GCC_VERSION_ARC if BR2_arc - default BR2_GCC_VERSION_4_9_X + default BR2_GCC_VERSION_5_X help Select the version of gcc you wish to use. From 183d9b654c72d82dea254d9c434e69ddfab76658 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 12 Sep 2016 22:54:52 +0200 Subject: [PATCH 0358/3392] support/scripts/get-developers: add new script This script, and its companion library, is more-or-less Buildroot's equivalent to the kernel get_maintainer.pl script: it allows to get the list of developers to whom a set of patches should be sent to. To do so, it first relies on a text file, named DEVELOPERS, at the root of the Buildroot source tree (added in a followup commit) to list the developers and the files they are interested in. The DEVELOPERS file's format is simple: N: Firstname Lastname F: path/to/file F: path/to/another/file This allows to associate developers with the files they are looking after, be they related to a package, a defconfig, a filesystem image, a package infrastructure, the documentation, or anything else. When a directory is given, the tool assumes that the developer handles all files and subdirectories in this directory. For example "package/qt5/" can be used for the developers looking after all the Qt5 packages. Conventional shell patterns can be used, so "package/python-*" can be used for the developers who want to look after all packages matching "python-*". A few files are recognized specially: - .mk files are parsed, and if they contain $(eval $(-package)), the developer is assumed to be looking after the corresponding package. This way, autobuilder failures for this package can be reported directly to this developer. - arch/Config.in. files are recognized as "the developer is looking after the architecture". In this case, get-developer parses the arch/Config.in. to get the list of possible BR2_ARCH values. This way, autobuilder failures for this package can be reported directly to this developer. - pkg/pkg-.mk are recognized as "the developer is looking after the package infrastructure. In this case, any patch that adds or touches a .mk file that uses this infrastructure will be sent to this developer. Examples of usage: $ ./support/scripts/get-developers 0001-ffmpeg-fix-bfin-build.patch git send-email--to buildroot@buildroot.org --to "Luca Ceresoli " --to "Bernd Kuhls " $ ./support/scripts/get-developers -p imx-lib Arnout Vandecappelle Gary Bisson $ ./support/scripts/get-developers -a bfin Waldemar Brodkorb Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- support/scripts/get-developers | 83 ++++++++++++ support/scripts/getdeveloperlib.py | 201 +++++++++++++++++++++++++++++ 2 files changed, 284 insertions(+) create mode 100755 support/scripts/get-developers create mode 100644 support/scripts/getdeveloperlib.py diff --git a/support/scripts/get-developers b/support/scripts/get-developers new file mode 100755 index 0000000000..f73512f17a --- /dev/null +++ b/support/scripts/get-developers @@ -0,0 +1,83 @@ +#!/usr/bin/env python + +import argparse +import getdeveloperlib + +def parse_args(): + parser = argparse.ArgumentParser() + parser.add_argument('patches', metavar='P', type=str, nargs='*', + help='list of patches') + parser.add_argument('-a', dest='architecture', action='store', + help='find developers in charge of this architecture') + parser.add_argument('-p', dest='package', action='store', + help='find developers in charge of this package') + parser.add_argument('-c', dest='check', action='store_const', + const=True, help='list files not handled by any developer') + return parser.parse_args() + +def __main__(): + devs = getdeveloperlib.parse_developers() + if devs is None: + sys.exit(1) + args = parse_args() + + # Check that only one action is given + action = 0 + if args.architecture is not None: + action += 1 + if args.package is not None: + action += 1 + if args.check: + action += 1 + if len(args.patches) != 0: + action += 1 + if action > 1: + print("Cannot do more than one action") + return + if action == 0: + print("No action specified") + return + + # Handle the check action + if args.check: + files = getdeveloperlib.check_developers(devs) + for f in files: + print f + + # Handle the architecture action + if args.architecture is not None: + for dev in devs: + if args.architecture in dev.architectures: + print(dev.name) + return + + # Handle the package action + if args.package is not None: + for dev in devs: + if args.package in dev.packages: + print(dev.name) + return + + # Handle the patches action + if len(args.patches) != 0: + (files, infras) = getdeveloperlib.analyze_patches(args.patches) + matching_devs = set() + for dev in devs: + # See if we have developers matching by package name + for f in files: + if dev.hasfile(f): + matching_devs.add(dev.name) + # See if we have developers matching by package infra + for i in infras: + if i in dev.infras: + matching_devs.add(dev.name) + + result = "--to buildroot@buildroot.org" + for dev in matching_devs: + result += " --to \"%s\"" % dev + + if result != "": + print("git send-email %s" % result) + +__main__() + diff --git a/support/scripts/getdeveloperlib.py b/support/scripts/getdeveloperlib.py new file mode 100644 index 0000000000..7b390417fc --- /dev/null +++ b/support/scripts/getdeveloperlib.py @@ -0,0 +1,201 @@ +import sys +import os +import re +import argparse +import glob +import subprocess + +# +# Patch parsing functions +# + +FIND_INFRA_IN_PATCH = re.compile("^\+\$\(eval \$\((host-)?([^-]*)-package\)\)$") + +def analyze_patch(patch): + """Parse one patch and return the list of files modified, added or + removed by the patch.""" + files = set() + infras = set() + with open(patch, "r") as f: + for line in f: + # If the patch is adding a package, find which infra it is + m = FIND_INFRA_IN_PATCH.match(line) + if m: + infras.add(m.group(2)) + if not line.startswith("+++ "): + continue + line.strip() + fname = line[line.find("/") + 1 : ].strip() + if fname == "dev/null": + continue + files.add(fname) + return (files, infras) + +FIND_INFRA_IN_MK = re.compile("^\$\(eval \$\((host-)?([^-]*)-package\)\)$") + +def fname_get_package_infra(fname): + """Checks whether the file name passed as argument is a Buildroot .mk + file describing a package, and find the infrastructure it's using.""" + if not fname.endswith(".mk"): + return None + + if not os.path.exists(fname): + return None + + with open(fname, "r") as f: + for l in f: + l = l.strip() + m = FIND_INFRA_IN_MK.match(l) + if m: + return m.group(2) + return None + +def get_infras(files): + """Search in the list of files for .mk files, and collect the package + infrastructures used by those .mk files.""" + infras = set() + for fname in files: + infra = fname_get_package_infra(fname) + if infra: + infras.add(infra) + return infras + +def analyze_patches(patches): + """Parse a list of patches and returns the list of files modified, + added or removed by the patches, as well as the list of package + infrastructures used by those patches (if any)""" + allfiles = set() + allinfras = set() + for patch in patches: + (files, infras) = analyze_patch(patch) + allfiles = allfiles | files + allinfras = allinfras | infras + allinfras = allinfras | get_infras(allfiles) + return (allfiles, allinfras) + +# +# DEVELOPERS file parsing functions +# + +class Developer: + def __init__(self, name, files): + self.name = name + self.files = files + self.packages = parse_developer_packages(files) + self.architectures = parse_developer_architectures(files) + self.infras = parse_developer_infras(files) + + def hasfile(self, f): + f = os.path.abspath(f) + for fs in self.files: + if f.startswith(fs): + return True + return False + +def parse_developer_packages(fnames): + """Given a list of file patterns, travel through the Buildroot source + tree to find which packages are implemented by those file + patterns, and return a list of those packages.""" + packages = set() + for fname in fnames: + for root, dirs, files in os.walk(fname): + for f in files: + path = os.path.join(root, f) + if fname_get_package_infra(path): + pkg = os.path.splitext(f)[0] + packages.add(pkg) + return packages + +def parse_arches_from_config_in(fname): + """Given a path to an arch/Config.in.* file, parse it to get the list + of BR2_ARCH values for this architecture.""" + arches = set() + with open(fname, "r") as f: + parsing_arches = False + for l in f: + l = l.strip() + if l == "config BR2_ARCH": + parsing_arches = True + continue + if parsing_arches: + m = re.match("^\s*default \"([^\"]*)\".*", l) + if m: + arches.add(m.group(1)) + else: + parsing_arches = False + return arches + +def parse_developer_architectures(fnames): + """Given a list of file names, find the ones starting by + 'arch/Config.in.', and use that to determine the architecture a + developer is working on.""" + arches = set() + for fname in fnames: + if not re.match("^.*/arch/Config\.in\..*$", fname): + continue + arches = arches | parse_arches_from_config_in(fname) + return arches + +def parse_developer_infras(fnames): + infras = set() + for fname in fnames: + m = re.match("^package/pkg-([^.]*).mk$", fname) + if m: + infras.add(m.group(1)) + return infras + +def parse_developers(basepath=None): + """Parse the DEVELOPERS file and return a list of Developer objects.""" + developers = [] + linen = 0 + if basepath == None: + basepath = os.getcwd() + with open(os.path.join(basepath, "DEVELOPERS"), "r") as f: + files = [] + name = None + for l in f: + l = l.strip() + if l.startswith("#"): + continue + elif l.startswith("N:"): + if name is not None or len(files) != 0: + print("Syntax error in DEVELOPERS file, line %d" % linen) + name = l[2:].strip() + elif l.startswith("F:"): + fname = l[2:].strip() + dev_files = glob.glob(os.path.join(basepath, fname)) + if len(dev_files) == 0: + print("WARNING: '%s' doesn't match any file" % fname) + files += dev_files + elif l == "": + if not name: + continue + developers.append(Developer(name, files)) + files = [] + name = None + else: + print("Syntax error in DEVELOPERS file, line %d: '%s'" % (linen, l)) + return None + linen += 1 + # handle last developer + if name is not None: + developers.append(Developer(name, files)) + return developers + +def check_developers(developers, basepath=None): + """Look at the list of files versioned in Buildroot, and returns the + list of files that are not handled by any developer""" + if basepath == None: + basepath = os.getcwd() + cmd = ["git", "--git-dir", os.path.join(basepath, ".git"), "ls-files"] + files = subprocess.check_output(cmd).strip().split("\n") + unhandled_files = [] + for f in files: + handled = False + for d in developers: + if d.hasfile(os.path.join(basepath, f)): + handled = True + break + if not handled: + unhandled_files.append(f) + return unhandled_files From fe29fa86fa9424788c16cbeadd751191ed59e8a3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 12 Sep 2016 22:54:53 +0200 Subject: [PATCH 0359/3392] DEVELOPERS: add initial list of Buildroot developers This is an initial list of Buildroot developers. It has been created semi-automatically by parsing the Git history, and finding the authors of commits with a title like ": new package". Some additional manual tweaking has been done (merging multiple entries corresponding to the same person, adding some more entries, etc.). Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1581 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1581 insertions(+) create mode 100644 DEVELOPERS diff --git a/DEVELOPERS b/DEVELOPERS new file mode 100644 index 0000000000..605af965b2 --- /dev/null +++ b/DEVELOPERS @@ -0,0 +1,1581 @@ +# Syntax: +# +# N: Firstname Lastname +# F: file pattern or directory +# F: file pattern or directory +# +# The "F" entries can be: +# +# - A directory, in which case all patches touching any file in this +# directory or its subdirectories will be CC'ed to the developer. +# - A pattern, in which case the pattern will be expanded, and then +# all files/directories (and their subdirectories) will be +# considered when matching against a patch +# +# Notes: +# +# - When a developer adds an "arch/Config.in." file to its list +# of files, he is considered a developer of this architecture. He +# will receive e-mail notifications about build failures occuring on +# this architecture. Not more than one e-mail per day is sent. +# - When a developer adds a directory that contains one or several +# packages, this developer will be notified when build failures +# occur. Not more than one e-mail per day is sent. +# - When a developer adds an "package/pkg-.mk" file to its list +# of files, he is considered interested by this package +# infrastructure, and will be CC'ed on all patches that add or +# modify packages that use this infrastructure. + +N: Adam Duskett +F: package/nginx-naxsi/ + +N: Alex Suykov +F: package/vboot-utils/ + +N: Alexander Clouter +F: package/odhcp6c/ + +N: Alexander Dahl +F: package/fastd/ +F: package/libuecc/ +F: package/putty/ + +N: Alexander Lukichev +F: package/openpgm/ + +N: Alexander Varnin +F: package/liblog4c-localtime/ + +N: Alexandre Belloni +F: package/tz/ + +N: Alistair Francis +F: package/xen/ + +N: Alvaro G. M +F: package/dcron/ +F: package/libxmlrpc/ +F: package/python-docopt/ + +N: Anders Darander +F: package/ktap/ + +N: André Hentschel +F: package/openal/ +F: package/p7zip/ +F: package/wine/ + +N: Andrew Ruder +F: package/expect/ + +N: Andy Kennedy +F: package/libunwind/ + +N: Angelo Compagnucci +F: package/mono/ +F: package/mono-gtksharp3/ +F: package/monolite/ +F: package/python-can/ +F: package/python-pillow/ +F: package/python-pydal/ +F: package/python-web2py/ +F: package/sysdig/ + +N: Anthony Viallard +F: package/gnuplot/ + +N: Antoine Ténart +F: package/wf111/ + +N: ARC Maintainers +F: arch/Config.in.arc + +N: Ariel D'Alessandro +F: package/axfsutils/ +F: package/mali-t76x/ + +N: Arnaud Aujon +F: package/espeak/ + +N: Arnout Vandecappelle +F: package/freescale-imx/firmware-imx/ +F: package/freescale-imx/imx-lib/ +F: package/gstreamer/gst-fsl-plugins/ +F: package/owfs/ +F: package/python-bottle/ +F: package/sqlcipher/ +F: package/stress/ + +N: Assaf Inbal +F: package/lbase64/ +F: package/luabitop/ +F: package/luacrypto/ +F: package/luaexpatutils/ +F: package/luaposix/ +F: package/luasec/ +F: package/lua-ev/ +F: package/orbit/ + +N: Bartosz Golaszewski +F: package/autoconf-archive/ +F: package/doxygen/ +F: package/libserialport/ +F: package/libsigrok/ +F: package/libsigrokdecode/ +F: package/libzip/ +F: package/pulseview/ +F: package/sigrok-cli/ + +N: Baruch Siach +F: package/ebtables/ +F: package/openipmi/ + +N: Ben Boeckel +F: package/taskd/ + +N: Benjamin Kamath +F: package/lapack/ + +N: Bernd Kuhls +F: package/apache/ +F: package/apr/ +F: package/apr-util/ +F: package/clamav/ +F: package/dovecot/ +F: package/dovecot-pigeonhole/ +F: package/dtv-scan-tables/ +F: package/eudev/ +F: package/exim/ +F: package/fetchmail/ +F: package/freeswitch/ +F: package/ffmpeg/ +F: package/giflib/ +F: package/glmark2/ +F: package/jsoncpp/ +F: package/kodi* +F: package/lame/ +F: package/leafnode2/ +F: package/libaacs/ +F: package/libasplib/ +F: package/libass/ +F: package/libbdplus/ +F: package/libbluray/ +F: package/libbroadvoice/ +F: package/libcdio/ +F: package/libcec/ +F: package/libcodec2/ +F: package/libcrossguid/ +F: package/libdcadec/ +F: package/libdrm/ +F: package/libdvbcsa/ +F: package/libdvdcss/ +F: package/libdvdnav/ +F: package/libdvdread/ +F: package/libebur128/ +F: package/libfreeglut/ +F: package/libg7221/ +F: package/libglew/ +F: package/libglfw/ +F: package/libglu/ +F: package/libhdhomerun/ +F: package/libilbc/ +F: package/libldns/ +F: package/libmicrohttpd/ +F: package/libminiupnpc/ +F: package/libnatpmp/ +F: package/libogg/ +F: package/libopenh264/ +F: package/libpciaccess/ +F: package/libplatform/ +F: package/libsidplay2/ +F: package/libsilk/ +F: package/libsndfile/ +F: package/libsoil/ +F: package/libsoundtouch/ +F: package/libsquish/ +F: package/liburiparser/ +F: package/libva/ +F: package/libva-intel-driver/ +F: package/libvorbis/ +F: package/libvpx/ +F: package/libyuv/ +F: package/mesa3d/ +F: package/minidlna/ +F: package/mjpg-streamer/ +F: package/mplayer/ +F: package/perl-crypt-openssl-random/ +F: package/perl-crypt-openssl-rsa/ +F: package/perl-db-file/ +F: package/perl-digest-sha1/ +F: package/perl-encode-detect/ +F: package/perl-encode-locale/ +F: package/perl-file-listing/ +F: package/perl-html-parser/ +F: package/perl-html-tagset/ +F: package/perl-http-cookies/ +F: package/perl-http-daemon/ +F: package/perl-http-date/ +F: package/perl-http-message/ +F: package/perl-http-negotiate/ +F: package/perl-io-html/ +F: package/perl-lwp-mediatypes/ +F: package/perl-mail-dkim/ +F: package/perl-mailtools/ +F: package/perl-mime-base64/ +F: package/perl-net-dns/ +F: package/perl-net-http/ +F: package/perl-netaddr-ip/ +F: package/perl-time-hires/ +F: package/perl-timedate/ +F: package/perl-uri/ +F: package/perl-www-robotrules/ +F: package/pixman/ +F: package/pound/ +F: package/pure-ftpd/ +F: package/python-mako/ +F: package/rtmpdump/ +F: package/softether/ +F: package/taglib/ +F: package/tinyxml2/ +F: package/tor/ +F: package/transmission/ +F: package/tvheadend/ +F: package/unixodbc/ +F: package/vlc/ +F: package/vnstat/ +F: package/x11r7/ +F: package/x264/ +F: package/x265/ +F: package/znc/ + +N: Bimal Jacob +F: package/nginx-upload/ + +N: Bogdan Radulescu +F: package/iftop/ +F: package/ncdu/ + +N: Bryan Brinsko +F: package/pps-tools/ + +N: Carlo Caione +F: package/sunxi-boards/ + +N: Carlos Santos +F: package/gmock/ +F: package/gtest/ +F: package/libpam-radius-auth/ +F: package/libpam-tacplus/ +F: package/perl-file-util/ +F: package/util-linux/ + +N: Carsten Schoenert +F: package/dvbsnoop/ +F: package/libdvbsi/ +F: package/libsvg/ +F: package/libsvg-cairo/ + +N: Chris Packham +F: package/eventlog/ +F: package/micropython/ +F: package/micropython-lib/ +F: package/syslog-ng/ + +N: Christian Stewart +F: package/batman-adv/ +F: package/docker-containerd/ +F: package/docker-engine/ +F: package/mosh/ +F: package/rtl8821au/ +F: package/runc/ + +N: Christophe Vu-Brugier +F: package/drbd-utils/ +F: package/iotop/ +F: package/python-configshell-fb/ +F: package/python-rtslib-fb/ +F: package/python-urwid/ +F: package/targetcli-fb/ + +N: Clayton Shotwell +F: package/audit/ +F: package/cpio/ + +N: Clayton Shotwell +F: package/checkpolicy/ +F: package/libcgroup/ +F: package/libee/ +F: package/libestr/ +F: package/liblogging/ +F: package/libselinux/ +F: package/libsemanage/ +F: package/libsepol/ +F: package/sepolgen/ +F: package/ustr/ + +N: Cédric Chépied +F: package/znc/ + +N: Dagg Stompler +F: package/libamcodec/ +F: package/odroid-mali/ +F: package/odroid-scripts/ + +N: Damien Lanson +F: package/libvdpau/ +F: package/log4cpp/ + +N: Daniel Nyström +F: package/e2tools/ +F: package/fbgrab/ + +N: Daniel Price +F: package/nodejs/ +F: package/redis/ + +N: Daniel Sangue +F: package/libftdi1/ + +N: Danomi Manchego +F: package/cjson/ +F: package/jq/ +F: package/ljsyscall/ +F: package/lua-cjson/ +F: package/luaexpat/ +F: package/xinetd/ + +N: Dave Skok +F: package/ola/ + +N: David Bachelart +F: package/ccrypt/ +F: package/dos2unix/ +F: package/ipmiutil/ +F: package/python-daemon/ + +N: David Bender +F: package/benejson/ +F: package/cgic/ +F: package/freeradius-client/ +F: package/openldap/ + +N: David du Colombier <0intro@gmail.com> +F: package/x264/ + +N: Davide Viti +F: package/flann/ +F: package/python-paho-mqtt/ +F: package/qhull/ +F: package/tcllib/ + +N: Denis Bodor +F: package/libstrophe/ + +N: Dimitrios Siganos +F: package/wireless-regdb/ + +N: Dominik Faessler +F: package/logsurfer/ +F: package/python-id3/ + +N: Doug Kehn +F: package/nss-pam-ldapd/ +F: package/sp-oops-extract/ +F: package/unscd/ + +N: Ed Swierk +F: package/xxhash/ + +N: Eric Le Bihan +F: package/adwaita-icon-theme/ +F: package/eudev/ +F: package/hicolor-icon-theme/ +F: package/jemalloc/ +F: package/ninja/ +F: package/smack/ + +N: Eric Limpens +F: package/pifmrds/ +F: package/ympd/ + +N: Erico Nunes +F: package/acpica/ +F: package/acpitool/ +F: package/efibootmgr/ +F: package/efivar/ +F: package/spi-tools/ +F: package/xdotool/ + +N: Erik Stromdahl +F: package/mxsldr/ + +N: Ernesto L. Williams Jr +F: package/szip/ + +N: Evan Zelkowitz +F: package/sdl_gfx/ + +N: Ezequiel Garcia +F: arch/Config.in.nios2 +F: package/fio/ +F: package/iptraf-ng/ +F: package/jimtcl/ +F: package/nodm/ +F: package/openbox/ +F: package/supertuxkart/ + +N: Fabio Estevam +F: configs/freescale_imx* + +N: Fabio Porcedda +F: package/netsurf-buildsystem/ + +N: Fabrice Fontaine +F: package/domoticz/ +F: package/openzwave/ + +N: Fabrice Fontaine +F: package/alljoyn/ +F: package/alljoyn-base/ +F: package/alljoyn-tcl/ +F: package/alljoyn-tcl-base/ +F: package/gtksourceview/ +F: package/gupnp-dlna/ +F: package/gupnp-tools/ +F: package/igd2-for-linux/ +F: package/minissdpd/ +F: package/tinycbor/ +F: package/tinydtls/ + +N: Floris Bos +F: package/ipmitool/ +F: package/odhcploc/ + +N: Francisco Gonzalez +F: package/ser2net/ + +N: Francois Perrad +F: board/olimex/a20_olinuxino +F: configs/olimex_a20_olinuxino_* +F: package/4th/ +F: package/botan/ +F: package/cosmo/ +F: package/dado/ +F: package/ficl/ +F: package/gdbm/ +F: package/libtomcrypt/ +F: package/libtommath/ +F: package/libump/ +F: package/linenoise/ +F: package/ljlinenoise/ +F: package/lpeg/ +F: package/lpty/ +F: package/lrandom/ +F: package/lsqlite3/ +F: package/lua* +F: package/lunit/ +F: package/lzlib/ +F: package/moarvm/ +F: package/perl* +F: package/pkg-perl.mk +F: package/pkg-luarocks.mk +F: package/qemu/ +F: package/tekui/ +F: support/scripts/scancpan + +N: Frank Hunleth +F: package/am335x-pru-package/ +F: package/libdmtx/ +F: package/libsodium/ +F: package/python-cherrypy/ +F: package/sane-backends/ +F: package/ucl/ +F: package/upx/ +F: package/zxing-cpp/ + +N: Gary Bisson +F: board/boundarydevices/ +F: configs/nitrogen* +F: package/freescale-imx/ +F: package/gstreamer1/gst1-imx/ +F: package/libimxvpuapi/ +F: package/sshpass/ + +N: Geoff Levand +F: package/flannel/ + +N: Geoffrey Ragot +F: package/python-pycli/ +F: package/python-pyyaml/ + +N: Gilles Talis +F: package/fdk-aac/ +F: package/httping/ +F: package/iozone/ +F: package/ocrad/ +F: package/webp/ + +N: Gregory Dymarek +F: package/ding-libs/ +F: package/gengetopt/ +F: package/janus-gateway/ +F: package/libnice/ +F: package/libsrtp/ +F: package/libwebsock/ +F: package/sofia-sip/ + +N: Gregory Hermant +F: package/bcusdk/ +F: package/dfu-util/ +F: package/libpthsem/ +F: package/linknx/ +F: package/snowball-hdmiservice/ +F: package/ux500-firmware/ + +N: Guillaume Gardet +F: package/c-icap/ +F: package/c-icap-modules/ +F: package/sdl2/ + +N: Guillaume William Brs +F: package/liquid-dsp/ + +N: Gustavo Zacarias +F: arch/Config.in.powerpc +F: board/qemu/ +F: configs/qemu_* +F: package/argp-standalone/ +F: package/arptables/ +F: package/audiofile/ +F: package/autossh/ +F: package/bitstream-vera/ +F: package/blktrace/ +F: package/bmon/ +F: package/btrfs-progs/ +F: package/c-ares/ +F: package/cantarell/ +F: package/check/ +F: package/collectd/ +F: package/comix-cursors/ +F: package/connman-gtk/ +F: package/conntrack-tools/ +F: package/cppdb/ +F: package/crda/ +F: package/cryptodev-linux/ +F: package/dbus-cpp/ +F: package/debianutils/ +F: package/dt/ +F: package/exfat/ +F: package/exfat-utils/ +F: package/f2fs-tools/ +F: package/faad2/ +F: package/fping/ +F: package/ftop/ +F: package/gcr/ +F: package/geoip/ +F: package/gpsd/ +F: package/granite/ +F: package/graphite2/ +F: package/gsettings-desktop-schemas/ +F: package/hans/ +F: package/haveged/ +F: package/heimdal/ +F: package/hostapd/ +F: package/ifupdown/ +F: package/inconsolata/ +F: package/iodine/ +F: package/iperf3/ +F: package/ipset/ +F: package/iw/ +F: package/jhead/ +F: package/jquery-keyboard/ +F: package/kompexsqlite/ +F: package/kvmtool/ +F: package/lame/ +F: package/lft/ +F: package/libao/ +F: package/libcroco/ +F: package/libcue/ +F: package/libcuefile/ +F: package/libepoxy/ +F: package/libgee/ +F: package/libglib2/ +F: package/libgtk2/ +F: package/libgtk3/ +F: package/libmcrypt/ +F: package/libmemcached/ +F: package/libmhash/ +F: package/libmnl/ +F: package/libmng/ +F: package/libmpdclient/ +F: package/libnetfilter_acct/ +F: package/libnetfilter_conntrack/ +F: package/libnetfilter_cthelper/ +F: package/libnetfilter_cttimeout/ +F: package/libnetfilter_log/ +F: package/libnetfilter_queue/ +F: package/libnfnetlink/ +F: package/libnl/ +F: package/liboping/ +F: package/libreplaygain/ +F: package/libsamplerate/ +F: package/libtorrent/ +F: package/libuv/ +F: package/lksctp-tools/ +F: package/lshw/ +F: package/lz4/ +F: package/lzip/ +F: package/mbedtls/ +F: package/mcrypt/ +F: package/memcached/ +F: package/minizip/ +F: package/mpd/ +F: package/mpv/ +F: package/mtr/ +F: package/musepack/ +F: package/ncmpc/ +F: package/net-tools/ +F: package/netstat-nat/ +F: package/nettle/ +F: package/nfacct/ +F: package/nftables/ +F: package/nload/ +F: package/nmap/ +F: package/noip/ +F: package/norm/ +F: package/obsidian-cursors/ +F: package/ocf-linux/ +F: package/opencore-amr/ +F: package/openswan/ +F: package/opusfile/ +F: package/p11-kit/ +F: package/p910nd/ +F: package/pax-utils/ +F: package/procrank_linux/ +F: package/php-* +F: package/pkgconf/ +F: package/privoxy/ +F: package/protobuf-c/ +F: package/ptpd/ +F: package/ptpd2/ +F: package/pwgen/ +F: package/ramspeed/ +F: package/rng-tools/ +F: package/rtorrent/ +F: package/samba4/ +F: package/sbc/ +F: package/snmppp/ +F: package/sox/ +F: package/spidev_test/ +F: package/squid/ +F: package/start-stop-daemon/ +F: package/swig/ +F: package/thrift/ +F: package/twolame/ +F: package/ulogd/ +F: package/unionfs/ +F: package/unrar/ +F: package/ushare/ +F: package/vala/ +F: package/vorbis-tools/ +F: package/wavpack/ +F: package/wayland-protocols/ +F: package/webkitgtk/ +F: package/webkitgtk24/ +F: package/whois/ +F: package/wireshark/ +F: package/wpan-tools/ +F: package/x11r7/xdriver_xf86-video-qxl/ +F: package/xtables-addons/ +F: package/zd1211-firmware/ + +N: Gwenhael Goavec-Merou +F: package/gnuradio/ +F: package/gr-osmosdr/ +F: package/libusbgx/ +F: package/python-cheetah/ +F: package/python-markdown/ +F: package/python-pyqt/ +F: package/python-sip/ + +N: Henrique Camargo +F: package/json-glib/ + +N: Hiroshi Kawashima +F: package/gauche/ +F: package/gmrender-resurrect/ +F: package/squeezelite/ + +N: Ian Haylock +F: package/python-rpi-gpio/ + +N: Ignacy Gawędzki +F: package/angularjs/ + +N: James Knight +F: package/atkmm/ +F: package/cairomm/ +F: package/google-material-design-icons/ +F: package/glibmm/ +F: package/gtkmm3/ +F: package/libpqxx/ +F: package/pangomm/ +F: package/yad/ + +N: Jan Pedersen +F: package/zip/ + +N: Jan Viktorin +F: package/python-pexpect/ +F: package/python-ptyprocess/ +F: package/zynq-boot-bin/ + +N: Jarkko Sakkinen +F: package/quota/ + +N: Jason Pruitt +F: package/librtlsdr/ + +N: Jens Rosenboom +F: package/sl/ + +N: Jens Zettelmeyer +F: package/batctl/ + +N: Jeremy Rosen +F: package/fxload/ + +N: Joel Stanley +F: package/pdbg/ + +N: Johan Derycke +F: package/python-libconfig/ + +N: Johan Oudinet +F: package/ejabberd/ +F: package/erlang-goldrush/ +F: package/erlang-lager/ +F: package/erlang-p1-cache-tab/ +F: package/erlang-p1-iconv/ +F: package/erlang-p1-sip/ +F: package/erlang-p1-stringprep/ +F: package/erlang-p1-stun/ +F: package/erlang-p1-tls/ +F: package/erlang-p1-utils/ +F: package/erlang-p1-xml/ +F: package/erlang-p1-yaml/ +F: package/erlang-p1-zlib/ + +N: John Stile +F: package/dhcpcd/ + +N: Jonathan Ben Avraham +F: arch/Config.in.xtensa +F: package/autofs/ +F: package/dawgdic/ +F: package/libphidget/ +F: package/phidgetwebservice/ +F: package/rapidxml/ +F: package/sphinxbase/ + +N: Jonathan Liu +F: package/python-meld3/ +F: package/supervisor/ + +N: Joris Lijssens +F: package/emlog/ +F: package/libcoap/ +F: package/libnet/ +F: package/libuio/ +F: package/netsniff-ng/ +F: package/rabbitmq-c/ + +N: Juha Rantanen +F: package/acsccid/ + +N: Julian Lunz +F: package/freerdp/ + +N: Julian Scheel +F: package/bitstream/ +F: package/cbootimage/ +F: package/cryptopp/ +F: package/dvblast/ +F: package/tegrarcm/ + +N: Julien Boibessot +F: board/armadeus/ +F: configs/armadeus* +F: package/gpm/ +F: package/lbreakout2/ +F: package/libcddb/ +F: package/libmodbus/ +F: package/ltris/ +F: package/opentyrian/ +F: package/pygame/ +F: package/smtools3/ + +N: Julien Corjon +F: package/qt5/ + +N: Julien Floret +F: package/lldpd/ + +N: Justin Maggard +F: package/dtach/ + +N: Jérôme Oufella +F: package/libdri2/ +F: package/qt-webkit-kiosk/ + +N: Jérôme Pouiller +F: package/apitrace/ +F: package/freescale-imx/gpu-amd-bin-mx51/ +F: package/freescale-imx/libz160/ +F: package/lxc/ +F: package/strongswan/ +F: package/wmctrl/ +F: package/x11r7/xdriver_xf86-video-imx/ +F: package/x11r7/xdriver_xf86-video-imx-viv/ + +N: Jörg Krause +F: package/libshout/ +F: package/libupnpp/ +F: package/luv/ +F: package/luvi/ +F: package/mp4v2/ +F: package/shairport-sync/ +F: package/swupdate/ +F: package/upmpdcli/ +F: package/wavemon/ + +N: Karoly Kasza +F: package/irqbalance/ +F: package/openvmtools/ + +N: Kelvin Cheung +F: package/cpuload/ +F: package/bwm-ng/ +F: package/ramsmp/ + +N: Laurent Cans +F: package/aircrack-ng/ + +N: Lee Jones +F: boot/afboot-stm32/ + +N: Lionel Orry +F: package/mongrel2/ + +N: Lothar Felten +F: package/ti-sgx-demos/ +F: package/ti-sgx-km/ +F: package/ti-sgx-um/ + +N: Luca Ceresoli +F: package/agentpp/ +F: package/exim/ +F: package/libpjsip/ +F: package/qpid-proton/ +F: package/rtl8188eu/ +F: package/stm32flash/ +F: package/unzip/ +F: support/legal-info/ + +N: Lucas De Marchi +F: package/fswebcam/ + +N: Ludovic Desroches +F: board/atmel/ +F: configs/at91* +F: configs/atmel_* +F: package/fb-test-app/ +F: package/python-json-schema-validator/ +F: package/python-keyring/ +F: package/python-simplejson/ +F: package/python-versiontools/ +F: package/wilc1000-firmware/ + +N: Mamatha Inamdar +F: package/nvme/ + +N: Manuel Vögele +F: package/python-requests-toolbelt/ + +N: Marcin Bis +F: package/bluez5_utils/ +F: package/cc-tool/ +F: package/ecryptfs-utils/ + +N: Marcin Niestroj +F: package/argparse/ +F: package/rs485conf/ +F: package/turbolua/ + +N: Marek Belisko +F: package/libatasmart/ +F: package/polkit/ +F: package/sg3_utils/ +F: package/udisks/ + +N: Markos Chandras +F: package/harfbuzz/ +F: package/libsecret/ + +N: Martin Bark +F: package/ca-certificates/ + +N: Martin Hicks +F: package/cryptsetup/ + +N: Matt Weber +F: package/bc/ +F: package/eigen/ +F: package/fmc/ +F: package/fmlib/ +F: package/igmpproxy/ +F: package/iputils/ +F: package/omniorb/ +F: package/python-ipy/ +F: package/python-posix-ipc/ +F: package/python-pypcap/ +F: package/python-pyrex/ +F: package/raptor/ +F: package/setools/ +F: package/simicsfs/ +F: package/smcroute/ +F: package/tclap/ + +N: Mauro Condarelli +F: package/mc/ +F: package/python-autobahn/ +F: package/python-cbor/ +F: package/python-characteristic/ +F: package/python-click/ +F: package/python-crossbar/ +F: package/python-lmdb/ +F: package/python-mistune/ +F: package/python-netaddr/ +F: package/python-pyasn-modules/ +F: package/python-pygments/ +F: package/python-pynacl/ +F: package/python-pytrie/ +F: package/python-service-identity/ +F: package/python-setproctitle/ +F: package/python-shutilwhich/ +F: package/python-treq/ +F: package/python-txaio/ +F: package/python-ujson/ +F: package/python-wsaccel/ + +N: Max Filippov +F: arch/Config.in.xtensa + +N: Maxime Hadjinlian +F: package/babeld/ +F: package/dante/ +F: package/faifa/ +F: package/initscripts/ +F: package/intel-microcode/ +F: package/iucode-tool/ +F: package/jasper/ +F: package/kodi/ +F: package/libass/ +F: package/libbluray/ +F: package/libcdio/ +F: package/libcofi/ +F: package/libenca/ +F: package/libmodplug/ +F: package/libnfs/ +F: package/libplist/ +F: package/libshairplay/ +F: package/linux-zigbee/ +F: package/netcat-openbsd/ +F: package/open-plc-utils/ +F: package/rpi-firmware/ +F: package/rpi-userland/ +F: package/rtmpdump/ +F: package/skeleton/ +F: package/systemd/ +F: package/systemd-bootchart/ +F: package/tinyalsa/ +F: package/tinyxml/ + +N: Maxime Ripard +F: package/kmsxx/ + +N: Michael Rommel +F: package/aiccu/ +F: package/knock/ +F: package/python-crc16/ +F: package/python-pyzmq/ + +N: Michael Trimarchi +F: package/python-spidev/ + +N: Mikhail Boiko +F: package/libfribidi/ + +N: Morgan Delestre +F: package/monkey/ + +N: Murat Demirten +F: package/jpeg-turbo/ +F: package/libgeotiff/ + +N: Nathan Lynch +F: package/chrony/ + +N: Nathaniel Roach +F: package/bandwidthd/ +F: package/libgudev/ + +N: Naumann Andreas +F: package/evemu/ +F: package/libevdev/ + +N: Nicolas Serafini +F: package/exiv2/ +F: package/nvidia-tegra23/nvidia-tegra23-binaries/ +F: package/nvidia-tegra23/nvidia-tegra23-codecs/ + +N: Nimai Mahajan +F: package/libucl/ + +N: Niranjan Reddy +F: package/cgroupfs-mount/ + +N: Noé Rubinstein +F: package/tpm-tools/ +F: package/trousers/ + +N: Olaf Rempel +F: package/ctorrent/ + +N: Oli Vogt +F: package/python-django/ +F: package/python-flup/ + +N: Olivier Schonken +F: package/ijs/ +F: package/poppler/ +F: package/qpdf/ +F: package/openjpeg/ + +N: Olivier Singla +F: package/shellinabox/ + +N: Parnell Springmeyer +F: package/scrypt/ + +N: Pascal Huerst +F: package/google-breakpad/ + +N: Patrick Gerber +F: package/yavta/ + +N: Patrick Ziegler +F: package/aespipe/ +F: package/libqmi/ + +N: Paul Cercueil +F: package/libiio/ + +N: Paul Cercueil +F: package/lightning/ + +N: Pedro Aguilar +F: package/libunistring/ + +N: Peter Korsgaard +F: package/flickcurl/ +F: package/libfastjson/ +F: package/lzop/ +F: package/python-alsaaudio/ +F: package/python-enum/ +F: package/python-enum34/ +F: package/python-ipaddr/ +F: package/python-pam/ +F: package/python-psutil/ +F: package/triggerhappy/ +F: package/wpa_supplicant/ + +N: Peter Seiderer +F: package/assimp/ +F: package/bcm2835/ +F: package/dejavu/ +F: package/dillo/ +F: package/edid-decode/ +F: package/ghostscript-fonts/ +F: package/gstreamer1/gst1-validate/ +F: package/log4cplus/ +F: package/postgresql/ +F: package/qt5/qt53d/ +F: package/qt5/qt5quickcontrols2/ +F: package/qt5/qt5tools/ +F: package/racehound/ +F: package/wiringpi/ + +N: Peter Thompson +F: package/sdl2_gfx/ +F: package/sdl2_image/ +F: package/sdl2_ttf/ + +N: Petr Vorel +F: package/linux-backports/ + +N: Phil Eichinger +F: package/libqrencode/ +F: package/psplash/ +F: package/sispmctl/ +F: package/zsh/ + +N: Philipp Claves +F: package/libassuan/ +F: package/libgpgme/ + +N: Philippe Proulx +F: package/python-ipython/ + +N: Pierre Floury +F: package/trace-cmd/ + +N: Pieter De Gendt +F: package/libvips/ + +N: Pieterjan Camerlynck +F: package/libdvbpsi/ +F: package/mraa/ + +N: Qais Yousef +F: package/bellagio/ + +N: Rahul Bedarkar +F: package/cxxtest/ +F: package/gflags/ +F: package/glog/ +F: package/gssdp/ +F: package/gupnp/ +F: package/gupnp-av/ + +N: Renaud Aubin +F: package/libhttpparser/ + +N: Rhys Williams +F: package/lirc-tools/ + +N: Richard Braun +F: package/curlftpfs/ + +N: Richard Braun +F: package/tzdata/ + +N: Rico Bachmann +F: package/apr-util/ +F: package/subversion/ + +N: Rodrigo Rebello +F: package/chocolate-doom/ +F: package/irssi/ +F: package/vnstat/ + +N: Romain Naour +F: package/bullet/ +F: package/efl/ +F: package/elementary/ +F: package/enlightenment/ +F: package/expedite/ +F: package/iqvlinux/ +F: package/libevas-generic-loaders/ +F: package/liblinear/ +F: package/mcelog/ +F: package/openpowerlink/ +F: package/stress-ng/ +F: package/terminology/ +F: package/xenomai/ + +N: Ryan Barnett +F: package/atftp/ +F: package/miraclecast/ +F: package/python-pyasn/ +F: package/python-pycrypto/ +F: package/python-pysnmp/ +F: package/python-pysnmp-apps/ +F: package/python-pysnmp-mibs/ +F: package/python-tornado/ + +N: Ryan Wilkins +F: package/biosdevname/ + +N: Rémi Rérolle +F: package/libfreeimage/ + +N: Sagaert Johan +F: package/git/ +F: package/gsl/ +F: package/jquery-mobile/ +F: package/libgsasl/ +F: package/qdecoder/ +F: package/qlibc/ + +N: Sam Bobroff +F: package/librtas/ + +N: Samuel Martin +F: package/armadillo/ +F: package/canfestival/ +F: package/clapack/ +F: package/cwiid/ +F: package/flite/ +F: package/nginx/ +F: package/openobex/ +F: package/python-numpy/ +F: package/scrub/ +F: package/urg/ +F: package/ussp-push/ + +N: Santosh Multhalli +F: package/valijson/ + +N: Scott Fan +F: package/libssh/ +F: package/x11r7/xdriver_xf86-video-fbturbo/ + +N: Sebastien Bourdelin +F: package/atf/ +F: package/cppunit/ +F: package/kyua/ +F: package/lutok/ +F: package/yaml-cpp/ + +N: Sergio Prado +F: package/libgdiplus/ +F: package/mongodb/ +F: package/stella/ +F: package/tunctl/ +F: package/ubus/ + +N: Simon Dawson +F: boot/at91bootstrap3/ +F: package/cppzmq/ +F: package/czmq/ +F: package/filemq/ +F: package/googlefontdirectory/ +F: package/jansson/ +F: package/jquery-ui/ +F: package/jquery-ui-themes/ +F: package/json-javascript/ +F: package/lcdapi/ +F: package/libfreefare/ +F: package/libjson/ +F: package/libnfc/ +F: package/libnfc/ +F: package/libserial/ +F: package/libsigsegv/ +F: package/macchanger/ +F: package/minicom/ +F: package/minidlna/ +F: package/msgpack/ +F: package/nanocom/ +F: package/neard/ +F: package/neardal/ +F: package/owl-linux/ +F: package/python-nfc/ +F: package/rapidjson/ +F: package/sconeserver/ +F: package/sound-theme-borealis/ +F: package/sound-theme-freedesktop/ +F: package/vlc/ +F: package/wvdial/ +F: package/wvstreams/ +F: package/xscreensaver/ +F: package/zmqpp/ +F: package/zyre/ + +N: Spenser Gilliland +F: arch/Config.in.microblaze +F: package/a10disp/ +F: package/glmark2/ +F: package/libvpx/ +F: package/mesa3d-demos/ +F: package/sunxi-mali/ +F: package/ti-gfx/ + +N: Stefan Fröberg +F: package/elfutils/ +F: package/libtasn1/ +F: package/proxychains-ng/ +F: package/yasm/ + +N: Stephan Hoffmann +F: package/cache-calibrator/ +F: package/gtest/ +F: package/mtdev/ +F: package/mtdev2tuio/ +F: package/qtuio/ + +N: Steve Calfee +F: package/python-pymysql/ +F: package/python-pyratemp/ + +N: Steve James +F: package/leveldb/ +F: package/libcli/ + +N: Steve Kenton +F: package/dvdauthor/ +F: package/dvdrw-tools/ +F: package/memtest86/ +F: package/mjpegtools/ +F: package/tovid/ +F: package/xorriso/ + +N: Steve Thomas +F: package/cloog/ +F: package/isl/ + +N: Steven Noonan +F: package/hwloc/ +F: package/powertop/ + +N: Sven Neumann +F: package/gstreamer1/gst1-libav/ + +N: Sven Neumann +F: package/glib-networking/ +F: package/libmms/ +F: package/orc/ + +N: Sébastien Szymanski +F: package/mmc-utils/ +F: package/python-flask-jsonrpc/ +F: package/python-flask-login/ + +N: Thierry Bultel +F: package/mpd-mpc/ + +N: Thijs Vermeir +F: package/ranger/ +F: package/x265/ + +N: Thomas Claveirole +F: package/fcgiwrap/ + +N: Thomas Davis +F: package/civetweb/ + +N: Thomas De Schampheleire +F: package/libpfm4/ +F: package/mkpasswd/ +F: package/zeromq/ + +N: Thomas Petazzoni +F: arch/Config.in.arm +F: boot/boot-wrapper-aarch64/ +F: boot/grub2/ +F: boot/gummiboot/ +F: package/android-tools/ +F: package/b43-firmware/ +F: package/b43-fwcutter/ +F: package/c-periphery/ +F: package/cdrkit/ +F: package/cifs-utils/ +F: package/cloop/ +F: package/cmake/ +F: package/cramfs/ +F: package/dmidecode/ +F: package/flashrom/ +F: package/gcc/gcc-final/ +F: package/gcc/gcc-initial/ +F: package/genext2fs/ +F: package/genromfs/ +F: package/getent/ +F: package/gnu-efi/ +F: package/heirloom-mailx/ +F: package/hiawatha/ +F: package/igh-ethercat/ +F: package/intltool/ +F: package/libcap/ +F: package/libffi/ +F: package/libsha1/ +F: package/libtirpc/ +F: package/liburcu/ +F: package/libxkbcommon/ +F: package/libxml-parser-perl/ +F: package/localedef/ +F: package/log4cxx/ +F: package/lttng-babeltrace/ +F: package/lttng-libust/ +F: package/lttng-modules/ +F: package/lttng-tools/ +F: package/monit/ +F: package/mpdecimal/ +F: package/msmtp/ +F: package/musl/ +F: package/ne10/ +F: package/pkg-python.mk +F: package/pkg-autotools.mk +F: package/pkg-generic.mk +F: package/polarssl/ +F: package/python/ +F: package/python3/ +F: package/python-mad/ +F: package/python-serial/ +F: package/qextserialport/ +F: package/rpcbind/ +F: package/rt-tests/ +F: package/sam-ba/ +F: package/scons/ +F: package/squashfs/ +F: package/wayland/ +F: package/weston/ +F: toolchain/ + +N: Tiago Brusamarello +F: package/aer-inject/ + +N: Tom Sparks +F: package/ibrcommon/ +F: package/ibrdtn/ +F: package/ibrdtn-tools/ +F: package/ibrdtnd/ + +N: Tzu-Jung Lee +F: package/dropwatch/ +F: package/tstools/ + +N: Vanya Sergeev +F: package/lua-periphery/ + +N: Vicente Olivert Riera +F: arch/Config.in.mips +F: package/gnupg2/ +F: package/hidapi/ +F: package/libfm/ +F: package/libfm-extra/ +F: package/libksba/ +F: package/menu-cache/ +F: package/openblas/ +F: package/openmpi/ +F: package/pinentry/ +F: package/trinity/ + +N: Vincent Stehlé +F: package/i7z/ +F: package/msr-tools/ + +N: Vinicius Tinti +F: package/python-thrift/ + +N: Volkov Viacheslav +F: package/rfkill/ +F: package/v4l2grab/ +F: package/zbar/ + +N: Wade Berrier +F: package/ngrep/ + +N: Waldemar Brodkorb +F: arch/Config.in.bfin +F: arch/Config.in.sparc +F: arch/Config.in.m68k + +N: Waldemar Rymarkiewicz +F: package/ccid/ +F: package/pcsc-lite/ + +N: Will Newton +F: package/enchant/ +F: package/erlang/ +F: package/libmicrohttpd/ +F: package/sysprof/ +F: package/time/ + +N: Will Newton +F: package/numactl/ + +N: Will Wagner +F: package/yaffs2utils/ + +N: Wojciech M. Zabolotny +F: package/avrdude/ +F: package/jack2/ +F: package/python-msgpack/ +F: package/python-pyusb/ + +N: Wojciech Niziński +F: package/fwup/ + +N: Yann E. MORIN +F: package/cegui06/ +F: package/celt051/ +F: package/dtc/ +F: package/dtv-scan-tables/ +F: package/dvb-apps/ +F: package/keyutils/ +F: package/libbsd/ +F: package/libedit/ +F: package/libinput/ +F: package/libiscsi/ +F: package/libseccomp/ +F: package/mesa3d-headers/ +F: package/mke2img/ +F: package/nut/ +F: package/omxplayer/ +F: package/python-pyparsing/ +F: package/pkg-download.mk +F: package/slirp/ +F: package/snappy/ +F: package/spice/ +F: package/spice-protocol/ +F: package/tmux/ +F: package/tvheadend/ +F: package/usbredir/ +F: package/vde2/ +F: package/w_scan/ +F: support/download/ + +N: Yegor Yefremov +F: package/acl/ +F: package/attr/ +F: package/bluez_utils/ +F: package/boost/ +F: package/bootstrap/ +F: package/cannelloni/ +F: package/circus/ +F: package/feh/ +F: package/giblib/ +F: package/imlib2/ +F: package/jquery-datetimepicker/ +F: package/jquery-sidebar/ +F: package/kmod/ +F: package/libical/ +F: package/libmbim/ +F: package/libndp/ +F: package/libnftnl/ +F: package/libsoc/ +F: package/libsocketcan/ +F: package/libubox/ +F: package/libuci/ +F: package/linux-firmware/ +F: package/modem-manager/ +F: package/nuttcp/ +F: package/parted/ +F: package/python* +F: package/socketcand/ +F: package/qt5/qt5serialbus/ +F: package/sdparm/ +F: package/ti-utils/ +F: package/x11r7/xapp_xconsole/ +F: package/x11r7/xapp_xinput-calibrator/ +F: package/zlog/ +F: support/scripts/scanpypi + +N: Zoltan Gyarmati +F: package/crudini/ +F: package/grantlee/ +F: package/python-configobj/ +F: package/python-iniparse/ +F: package/qjson/ +F: package/quazip/ +F: package/tinc/ From 6017cb8fbd6ea24911fe156c37366ca67278f77f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 12 Sep 2016 22:54:54 +0200 Subject: [PATCH 0360/3392] docs/manual: update contribute.txt to cover get-developers This commit updates the contribute.txt part of the manual to tell people to use get-developers to get the appropriate "git send-email" command when sending patches. [Peter: use --cc instead of --to as suggested by Yann/Arnout] Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- docs/manual/contribute.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 1b1f4de196..d4ec2e1184 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -283,10 +283,18 @@ automatically adding the +Signed-off-by+ line. Once patch files are generated, you can review/edit the commit message before submitting them, using your favorite text editor. -Lastly, send/submit your patch set to the Buildroot mailing list: +Buildroot provides a handy tool to know to whom your patches should be +sent, called +get-developers+. This tool reads your patches and +outputs the appropriate +git send-email+ command to use: --------------------- -$ git send-email --to buildroot@buildroot.org outgoing/* +$ ./support/scripts/get-developers outgoing/* +--------------------- + +Use the output of +get-developers+ to send your patches: + +--------------------- +$ git send-email --to buildroot@buildroot.org --cc bob --cc alice outgoing/* --------------------- Note that +git+ should be configured to use your mail account. From 589cbc61b0913891fd00019365e52b9e50ff7250 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 12 Sep 2016 22:54:55 +0200 Subject: [PATCH 0361/3392] docs/manual: add new section about the DEVELOPERS file and get-developer [Peter: tweak wording and add xref as suggested by Arnout] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- docs/manual/contribute.txt | 11 +++++++-- docs/manual/developers.txt | 46 ++++++++++++++++++++++++++++++++++++++ docs/manual/manual.txt | 2 ++ 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 docs/manual/developers.txt diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index d4ec2e1184..c2c8a90170 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -258,6 +258,12 @@ removed, preferably with the upstream commit ID. Also any other required changes should be explained explicitly, like configure options that no longer exist or are no longer needed. +If you are interested in getting notified of build failures and of +further changes in the packages you added or modified, please add +yourself to the DEVELOPERS file. This should be done in a separate +patch of the series. See xref:DEVELOPERS[the DEVELOPERS file] for more +information. + ==== Preparing a patch series Starting from the changes committed in your local git view, _rebase_ @@ -284,8 +290,9 @@ Once patch files are generated, you can review/edit the commit message before submitting them, using your favorite text editor. Buildroot provides a handy tool to know to whom your patches should be -sent, called +get-developers+. This tool reads your patches and -outputs the appropriate +git send-email+ command to use: +sent, called +get-developers+ (see xref:DEVELOPERS[] for more +information). This tool reads your patches and outputs the appropriate ++git send-email+ command to use: --------------------- $ ./support/scripts/get-developers outgoing/* diff --git a/docs/manual/developers.txt b/docs/manual/developers.txt new file mode 100644 index 0000000000..ea1f894f20 --- /dev/null +++ b/docs/manual/developers.txt @@ -0,0 +1,46 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +[[DEVELOPERS]] +== DEVELOPERS file and get-developers + +The main Buildroot directory contains a file named +DEVELOPERS+ that +list the developers involved with various areas of Buildroot. Thanks to +this file, the +get-developer+ tool allows to: + +- Calculate the list of developers to whom patches should be sent, by + parsing the patches and matching the modified files with the + relevant developers. See xref:submitting-patches[] for details. + +- Find which developers are taking care of a given architecture or + package, so that they can be notified when a build failure occurs on + this architecture or package. This is done in interaction with + Buildroot's autobuild infrastructure. + +We ask developers adding new packages, new boards, or generally new +functionality in Buildroot, to register themselves in the +DEVELOPERS+ +file. As an example, we expect a developer contributing a new package +to include in his patch the appropriate modification to the ++DEVELOPERS+ file. + +The +DEVELOPERS+ file format is documented in detail inside the file +itself. + +The +get-developer+ tool, located in +support/scripts+ allows to use +the +DEVELOPERS+ file for various tasks: + +- When passing one or several patches as command line argument, + +get-developer+ will return the appropriate +git send-email+ + command. + +- When using the +-a + command line option, +get-developer+ will + return the list of developers in charge of the given architecture. + +- When using the +-p + command line option, +get-developer+ + will return the list of developers in charge of the given package. + +- When using the +-c+ command line option, +get-developer+ will look + at all files under version control in the Buildroot repository, and + list the ones that are not handled by any developer. The purpose of + this option is to help completing the +DEVELOPERS+ file. + diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt index 3c531e3738..7630ea6c72 100644 --- a/docs/manual/manual.txt +++ b/docs/manual/manual.txt @@ -64,6 +64,8 @@ include::debugging-buildroot.txt[] include::contribute.txt[] +include::developers.txt[] + = Appendix include::appendix.txt[] From 2655d676f0151f6cfd36c42435cf84926c209e24 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Sun, 31 Jul 2016 14:45:50 +0200 Subject: [PATCH 0362/3392] shapelib: new package Signed-off-by: Zoltan Gyarmati [Thomas: - adjust the license: it's MIT or LGPLv2, add web/license.html to the license files - rewrap Config.in help text - add entry to the DEVELOPERS file.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/shapelib/Config.in | 9 +++++++++ package/shapelib/shapelib.hash | 2 ++ package/shapelib/shapelib.mk | 25 +++++++++++++++++++++++++ 5 files changed, 38 insertions(+) create mode 100644 package/shapelib/Config.in create mode 100644 package/shapelib/shapelib.hash create mode 100644 package/shapelib/shapelib.mk diff --git a/DEVELOPERS b/DEVELOPERS index 605af965b2..8205a82f56 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1578,4 +1578,5 @@ F: package/python-configobj/ F: package/python-iniparse/ F: package/qjson/ F: package/quazip/ +F: package/shapelib/ F: package/tinc/ diff --git a/package/Config.in b/package/Config.in index a9f6bc7173..dd220e8b5d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1338,6 +1338,7 @@ endif source "package/protobuf-c/Config.in" source "package/qhull/Config.in" source "package/qlibc/Config.in" + source "package/shapelib/Config.in" source "package/sphinxbase/Config.in" source "package/startup-notification/Config.in" source "package/tinycbor/Config.in" diff --git a/package/shapelib/Config.in b/package/shapelib/Config.in new file mode 100644 index 0000000000..aa2297b277 --- /dev/null +++ b/package/shapelib/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_SHAPELIB + bool "shapelib" + help + The Shapefile C Library provides the ability to write simple + C programs for reading, writing and updating (to a limited + extent) ESRI Shapefiles, and the associated attribute file + (.dbf). + + http://shapelib.maptools.org/ diff --git a/package/shapelib/shapelib.hash b/package/shapelib/shapelib.hash new file mode 100644 index 0000000000..f3f812ebf9 --- /dev/null +++ b/package/shapelib/shapelib.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f shapelib-1.3.0.tar.gz diff --git a/package/shapelib/shapelib.mk b/package/shapelib/shapelib.mk new file mode 100644 index 0000000000..1e9c16f336 --- /dev/null +++ b/package/shapelib/shapelib.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# shapelib +# +################################################################################ + +SHAPELIB_VERSION = 1.3.0 +SHAPELIB_SITE = http://download.osgeo.org/shapelib +SHAPELIB_LICENSE = MIT or LGPLv2 +SHAPELIB_LICENSE_FILES = web/license.html LICENSE.LGPL +SHAPELIB_INSTALL_STAGING = YES + +define SHAPELIB_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define SHAPELIB_INSTALL_STAGING_CMDS + $(MAKE) -C $(@D) PREFIX=$(STAGING_DIR)/usr/ lib_install +endef + +define SHAPELIB_INSTALL_TARGET_CMDS + $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR)/usr/ bin_install +endef + +$(eval $(generic-package)) From 813016df77ba77dbdff5ab9c8244ed622cfa2fed Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 21 Sep 2016 14:34:07 +0200 Subject: [PATCH 0363/3392] docs/manual: fix packages having a subdirectory efl and matchbox no longer have a subdirectory containing multiple packages, so they are no longer good examples of that. Mention qt5 and gstreamer instead. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-directory.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index dc66f0099d..a74761cda8 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -7,7 +7,7 @@ First of all, create a directory under the +package+ directory for your software, for example +libfoo+. Some packages have been grouped by topic in a sub-directory: -+x11r7+, +efl+ and +matchbox+. If your package fits in ++x11r7+, +qt5+ and +gstreamer+. If your package fits in one of these categories, then create your package directory in these. New subdirectories are discouraged, however. From ab930190d7754b7f5fdda115b2069d00f1320861 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 20 Sep 2016 15:01:13 +0200 Subject: [PATCH 0364/3392] python-psutil: not available on musl Fixes: http://autobuild.buildroot.net/results/365/365c2f0b32ae3cb1d6d4d8f0145500dfadd05c59/ http://autobuild.buildroot.org/results/140/140d0ec9d94f75453c4c82e18803c8d7bffcf6be/ And many more. The sysinfo structure definition in linux/sysinfo.h (which gets indirectly included from linux/kernel.h) conflicts with the definition in sys/sysinfo.h when building against the musl C library, leading to build failures: arm-linux-gcc -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes \ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -fPIC -DPSUTIL_VERSION=430 \ -c psutil/_psutil_linux.c -o build/temp.linux-x86_64-3.5/psutil/_psutil_linux.o In file included from /home/buildroot/build/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/kernel.h:4:0, from /home/buildroot/build/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/ethtool.h:16, from psutil/_psutil_linux.c:35: /home/buildroot/build/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' struct sysinfo { ^ In file included from psutil/_psutil_linux.c:21:0: /home/buildroot/build/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here The suggested solution by the musl developers is to duplicate the needed structures and defines inline instead of including the kernel headers, which is unlikely to be acceptable upstream - So instead mark python-psutil (and its reverse dependencies) as unavailable on musl. Signed-off-by: Peter Korsgaard --- package/circus/Config.in | 5 +++-- package/python-crossbar/Config.in | 5 +++-- package/python-psutil/Config.in | 5 +++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/circus/Config.in b/package/circus/Config.in index e696f251df..3df41f5f23 100644 --- a/package/circus/Config.in +++ b/package/circus/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_CIRCUS depends on BR2_USE_WCHAR # pyzmq -> zeromq depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq + depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil select BR2_PACKAGE_PYTHON_IOWAIT # runtime select BR2_PACKAGE_PYTHON_PSUTIL # runtime select BR2_PACKAGE_PYTHON_PYZMQ # runtime @@ -15,7 +16,7 @@ config BR2_PACKAGE_CIRCUS https://circus.readthedocs.org/en/latest/ -comment "circus needs Python and a toolchain w/ C++, wchar, threads" +comment "circus needs Python and a uClibc or glibc toolchain w/ C++, wchar, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL \ !(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in index be8332515e..7ef1aadbc9 100644 --- a/package/python-crossbar/Config.in +++ b/package/python-crossbar/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar" + depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil # All the following dependencies are runtime dependencies select BR2_PACKAGE_PYTHON_AUTOBAHN select BR2_PACKAGE_PYTHON_CBOR @@ -39,5 +40,5 @@ config BR2_PACKAGE_PYTHON_CROSSBAR https://pypi.python.org/pypi/crossbar -comment "python-crossbar needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "python-crossbar needs a uClibc or glibc toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/python-psutil/Config.in b/package/python-psutil/Config.in index c64eeeed64..0b1333cf5c 100644 --- a/package/python-psutil/Config.in +++ b/package/python-psutil/Config.in @@ -1,8 +1,13 @@ config BR2_PACKAGE_PYTHON_PSUTIL bool "python-psutil" + # sys/sysinfo.h conflict with kernel headers + depends on !BR2_TOOLCHAIN_USES_MUSL help psutil is a cross-platform library for retrieving information on running processes and system utilization (CPU, memory, disks, network) in Python. https://pypi.python.org/pypi/psutil + +comment "python-psutil needs a uClibc or glibc toolchain" + depends BR2_TOOLCHAIN_USES_MUSL From d2bb5e52793de32b46f3232b9dd2919cc08d6ae4 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Wed, 21 Sep 2016 21:48:28 +0530 Subject: [PATCH 0365/3392] circus, python-psutil: fix syntax in Config.in After commit ab930190d775 ("python-psutil: not available on musl") we are getting following error when we set defconfig package/python-psutil/Config.in:14: syntax error package/python-psutil/Config.in:13: invalid option package/circus/Config.in:21: syntax error package/circus/Config.in:20: invalid option Fixes: ab930190d775 ("python-psutil: not available on musl") Signed-off-by: Rahul Bedarkar Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/circus/Config.in | 2 +- package/python-psutil/Config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/circus/Config.in b/package/circus/Config.in index 3df41f5f23..94c59a4f91 100644 --- a/package/circus/Config.in +++ b/package/circus/Config.in @@ -18,5 +18,5 @@ config BR2_PACKAGE_CIRCUS comment "circus needs Python and a uClibc or glibc toolchain w/ C++, wchar, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL || \ !(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) diff --git a/package/python-psutil/Config.in b/package/python-psutil/Config.in index 0b1333cf5c..1aec35d274 100644 --- a/package/python-psutil/Config.in +++ b/package/python-psutil/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_PYTHON_PSUTIL https://pypi.python.org/pypi/psutil comment "python-psutil needs a uClibc or glibc toolchain" - depends BR2_TOOLCHAIN_USES_MUSL + depends on BR2_TOOLCHAIN_USES_MUSL From c2c4b4a3c16e03ea4be7a62c58c5114f5a6df1ea Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Wed, 21 Sep 2016 22:43:11 +0530 Subject: [PATCH 0366/3392] trinity: needs MMU support Fixes: http://autobuild.buildroot.net/results/2fc/2fca707deb6fda2da83ab817f8e594f76415d997/ Cc: Vicente Olivert Riera Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/trinity/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/trinity/Config.in b/package/trinity/Config.in index 5c4c7c801d..2495e5d473 100644 --- a/package/trinity/Config.in +++ b/package/trinity/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_TRINITY bool "trinity" + depends on BR2_USE_MMU # fork() depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \ BR2_powerpc64le || BR2_sparc || BR2_x86_64 From 688cff67b82db71e482f32edf12133e75aa4b264 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 21 Sep 2016 15:40:43 +0200 Subject: [PATCH 0367/3392] python-docutils: new package Host variant is needed for building python-daemon package. Signed-off-by: Yegor Yefremov [Thomas: improve license description.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-docutils/Config.in | 9 +++++++++ package/python-docutils/python-docutils.hash | 3 +++ package/python-docutils/python-docutils.mk | 15 +++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-docutils/Config.in create mode 100644 package/python-docutils/python-docutils.hash create mode 100644 package/python-docutils/python-docutils.mk diff --git a/package/Config.in b/package/Config.in index dd220e8b5d..9ca6c15220 100644 --- a/package/Config.in +++ b/package/Config.in @@ -669,6 +669,7 @@ menu "External python modules" source "package/python-dicttoxml/Config.in" source "package/python-django/Config.in" source "package/python-docopt/Config.in" + source "package/python-docutils/Config.in" source "package/python-dominate/Config.in" source "package/python-dpkt/Config.in" source "package/python-ecdsa/Config.in" diff --git a/package/python-docutils/Config.in b/package/python-docutils/Config.in new file mode 100644 index 0000000000..e7bf7e6321 --- /dev/null +++ b/package/python-docutils/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_DOCUTILS + bool "python-docutils" + help + Docutils is a modular system for processing documentation + into useful formats, such as HTML, XML, and LaTeX. For input + Docutils supports reStructuredText, an easy-to-read, + what-you-see-is-what-you-get plaintext markup syntax. + + http://docutils.sourceforge.net/ diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash new file mode 100644 index 0000000000..9d45058f1a --- /dev/null +++ b/package/python-docutils/python-docutils.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed +md5 4622263b62c5c771c03502afa3157768 docutils-0.12.tar.gz +sha256 c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa docutils-0.12.tar.gz diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk new file mode 100644 index 0000000000..a67d89fad1 --- /dev/null +++ b/package/python-docutils/python-docutils.mk @@ -0,0 +1,15 @@ +############################################################# +# +# python-docutils +# +############################################################# + +PYTHON_DOCUTILS_VERSION = 0.12 +PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz +PYTHON_DOCUTILS_SITE = https://pypi.python.org/packages/37/38/ceda70135b9144d84884ae2fc5886c6baac4edea39550f28bcd144c1234d +PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2c, GPLv3 (emacs mode), other +PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt +PYTHON_DOCUTILS_SETUP_TYPE = distutils + +$(eval $(python-package)) +$(eval $(host-python-package)) From 9953d5e3110b5915d155a606ba38538c68f2161f Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 21 Sep 2016 15:40:44 +0200 Subject: [PATCH 0368/3392] python-daemon: add missing dependencies python-daemon package mentions python-docutils in both setup_requires and instal_requires fields. So add related dependencies. Fixes: http://autobuild.buildroot.net/results/0c3/0c3866038f7c40888e5e440f7a720fc614a6b1ba/ http://autobuild.buildroot.net/results/5d8/5d817bddeff5bb49ed31c6a1d111974c358ef96c/ and many more. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-daemon/Config.in | 1 + package/python-daemon/python-daemon.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/python-daemon/Config.in b/package/python-daemon/Config.in index 8b6dcc05ed..21f4407452 100644 --- a/package/python-daemon/Config.in +++ b/package/python-daemon/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_DAEMON bool "python-daemon" + select BR2_PACKAGE_PYTHON_DOCUTILS # runtime help Library to implement a well-behaved Unix daemon process. diff --git a/package/python-daemon/python-daemon.mk b/package/python-daemon/python-daemon.mk index e85be9a97a..648d549ca8 100644 --- a/package/python-daemon/python-daemon.mk +++ b/package/python-daemon/python-daemon.mk @@ -9,5 +9,6 @@ PYTHON_DAEMON_SITE = https://pypi.python.org/packages/source/p/python-daemon PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPLv3+ (test, build) PYTHON_DAEMON_LICENSE_FILES = LICENSE.ASF-2 LICENSE.GPL-3 PYTHON_DAEMON_SETUP_TYPE = setuptools +PYTHON_DAEMON_DEPENDENCIES = host-python-docutils $(eval $(python-package)) From 528ca1e6bff9734bc216dda590ab1e470d7d693d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 21 Sep 2016 12:19:21 +0200 Subject: [PATCH 0369/3392] DEVELOPERS: fix removed packages or inexisting packages elementary, libevas-generic-loaders and smtools3 no longer exist. pygame doesn't exist, it's named python-pygame. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 8205a82f56..52ed83f953 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -812,8 +812,7 @@ F: package/libcddb/ F: package/libmodbus/ F: package/ltris/ F: package/opentyrian/ -F: package/pygame/ -F: package/smtools3/ +F: package/python-pygame/ N: Julien Corjon F: package/qt5/ @@ -1182,11 +1181,9 @@ F: package/vnstat/ N: Romain Naour F: package/bullet/ F: package/efl/ -F: package/elementary/ F: package/enlightenment/ F: package/expedite/ F: package/iqvlinux/ -F: package/libevas-generic-loaders/ F: package/liblinear/ F: package/mcelog/ F: package/openpowerlink/ From b67c5075c4eab859d11e72553fa19b299d77fa17 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Wed, 21 Sep 2016 21:53:29 +0200 Subject: [PATCH 0370/3392] DEVELOPERS: update my entry list Signed-off-by: Samuel Martin Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 52ed83f953..9a4a3364c0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1225,7 +1225,10 @@ F: package/clapack/ F: package/cwiid/ F: package/flite/ F: package/nginx/ +F: package/opencv/ +F: package/opencv3/ F: package/openobex/ +F: package/pkg-cmake.mk F: package/python-numpy/ F: package/scrub/ F: package/urg/ From 0cd90001039c474319c00c0c0726f69816bc2188 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 21 Sep 2016 22:21:35 +0200 Subject: [PATCH 0371/3392] evemu: bump version to 2.5.0 See [1] for details. [1] https://lists.freedesktop.org/archives/input-tools/2016-September/001330.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/evemu/evemu.hash | 4 ++-- package/evemu/evemu.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/evemu/evemu.hash b/package/evemu/evemu.hash index 1264bedcf3..5e653f7d59 100644 --- a/package/evemu/evemu.hash +++ b/package/evemu/evemu.hash @@ -1,2 +1,2 @@ -# Hash from https://lists.freedesktop.org/archives/input-tools/2016-April/001274.html -sha256 0706ea5a830203f9cdb30c0e10c8c41d2427128ba9041543a5ae157fa3b4a30e evemu-2.4.0.tar.xz +# Hash from https://lists.freedesktop.org/archives/input-tools/2016-September/001330.html +sha256 541cc138f0215b7d0cd4ad5e6bb1402518ffc5e31294c36bb67b4ff1791bb27f evemu-2.5.0.tar.xz diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk index 992a1f72d7..4f59789a08 100644 --- a/package/evemu/evemu.mk +++ b/package/evemu/evemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -EVEMU_VERSION = 2.4.0 +EVEMU_VERSION = 2.5.0 EVEMU_SITE = http://www.freedesktop.org/software/evemu EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz EVEMU_LICENSE = LGPLv3 (library), GPLv3 (tools) From 3d0ade55428a47a52656eec965dd7b8a81894073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 21 Sep 2016 22:21:07 +0200 Subject: [PATCH 0372/3392] package/libxslt: fix bfin compile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: http://autobuild.buildroot.org/results/df4/df4bf247c92847024dff88ce58a5f47343f06258/ http://autobuild.buildroot.org/results/b33/b33f34dc23f7429928d7d0b1478e71d8e7fffed2/ http://autobuild.buildroot.org/results/cad/cad02570ec039511b9495e82d98439e9f0724b37/ And many more. A GCC bug is triggered when the compiler is run with an optimization level '-Os/-O2/-O3' for the Blackfin architecture: ``` error: unable to find a register to spill in class 'CCREGS' ``` Workaround this bug by forcing an optimization level of '-O1' when building libxslt for the Blackfin architecture. See GCC bug report: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77311 [Peter: add reference to autobuilders failures] Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/libxslt/libxslt.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 868ba6a10f..d89dde8d00 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -19,6 +19,12 @@ LIBXSLT_CONF_OPTS = \ LIBXSLT_CONFIG_SCRIPTS = xslt-config LIBXSLT_DEPENDENCIES = libxml2 +# GCC bug with Os/O2/O3, PR77311 +# error: unable to find a register to spill in class 'CCREGS' +ifeq ($(BR2_bfin),y) +LIBXSLT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1" +endif + # If we have enabled libgcrypt then use it, else disable crypto support. ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBXSLT_DEPENDENCIES += libgcrypt From ec166411e258b45e2902270199cb7af7e67e7edc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 21 Sep 2016 23:06:11 +0200 Subject: [PATCH 0373/3392] CHANGES: fix typo in 2016.08 release line Signed-off-by: Peter Korsgaard --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 97749ca866..b4bd5feaea 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -2016.08, Released Septermber 1st, 2016 +2016.08, Released September 1st, 2016 Minor fixes. From ef803279452e5cfe86a7118eafd390f612cbe7ff Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 21 Sep 2016 23:24:31 +0200 Subject: [PATCH 0374/3392] docs: website: update for 2016.08.1 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index 6380d9a933..9ce62c860a 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
Download
-

Latest stable release: 2016.08

+

Latest stable release: 2016.08.1

- +
- +
-

buildroot-2016.08.tar.gz

-

PGP signature

+

buildroot-2016.08.1.tar.gz

+

PGP signature

- +
- +
-

buildroot-2016.08.tar.bz2

-

PGP signature

+

buildroot-2016.08.1.tar.bz2

+

PGP signature

8------------------------- In file included from XXX/output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.2.1/bits/stl_algo.h:59:0, from XXX/output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.2.1/algorithm:62, from XXX/output/host/usr/arc-buildroot-linux-uclibc/sysroot/usr/include/qt5/QtCore/qglobal.h:88, from XXX/output/host/usr/arc-buildroot-linux-uclibc/sysroot/usr/include/qt5/QtCore/qpair.h:37, from qmediametadata.h:37, from qmediametadata.cpp:28: XXX/output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.2.1/cstdlib:75:25: fatal error: stdlib.h: No such file or directory #include_next ^ compilation terminated. ---------------------------->8------------------------- That happens because qmake trying to play smart passes some include paths in Makefile with "-isystem" prefix. Which in some cases lead to build failure well described in [1]. A little bit more details below on what really happens: 1. In "configure" script Qt determines default include paths of the toolchain and stores them in DEFAULT_INCDIRS variable, see [2]. 2. On qmake execution when it creates Makefile out of .pro-file it parses headers in INCLUDEPATH variable and if a path matches one in DEFAULT_INCDIRS then in CXXFLAGS that path is written with $QMAKE_CFLAGS_ISYSTEM prefix, otherwise non-matching include path ends up in CXXFLAGS with normal "-I" prefix. 3. By default for gcc "QMAKE_CFLAGS_ISYSTEM = -isystem", see [3]. 4. gcc fails to find stdlib.h, again refer to Jörg's explanation in [1]. What we do here we force set QMAKE_CFLAGS_ISYSTEM to "" and so qmake won't use "-isystem" any longer instead expected "-I" will be used for all headers, see [4]. That fixes building of Qt5Webkit on ARM with gcc 6.x and a number of autobuilder failures for ARC (the an arch that uses gcc 6 by default) like: http://autobuild.buildroot.net/results/56a/56a6700774af692e7f5a99b452b15e4e8592310f http://autobuild.buildroot.net/results/697/697412b29bf031bf8f246cc3af97ebcbf6bf6d1b [1] https://git.buildroot.net/buildroot/commit/?id=e79272fa7ff3d66c18de3514b912cd9d68d121a4 [2] http://code.qt.io/cgit/qt/qtbase.git/tree/configure?h=5.6.1#n3660 [3] http://code.qt.io/cgit/qt/qtbase.git/tree/mkspecs/common/gcc-base.conf?h=5.6.1#n47 [4] http://code.qt.io/cgit/qt/qtbase.git/tree/qmake/generators/unix/unixmake2.cpp?&h=5.6.1#n193 Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Peter Seiderer Cc: Julien Corjon Cc: "Yann E. MORIN" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qmake.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf index 2152d3c7a4..49cf898316 100644 --- a/package/qt5/qt5base/qmake.conf +++ b/package/qt5/qt5base/qmake.conf @@ -19,6 +19,7 @@ QMAKE_CXXFLAGS_RELEASE += -O3 CONFIG += nostrip QMAKE_LIBS += -lrt -lpthread -ldl +QMAKE_CFLAGS_ISYSTEM = include(../common/linux_device_post.conf) load(qt_config) From 4ca6a5ed570efbb2dc5027877413eadbd638b4be Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 5 Oct 2016 07:14:36 -0300 Subject: [PATCH 0510/3392] wireshark: security bump to version 2.2.1 Fixes: wnpa-sec-2016-56 - The Bluetooth L2CAP dissector could crash. wnpa-sec-2016-57 - The NCP dissector could crash. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 73e57cd545..21c003ffc2 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,2 +1,2 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.0.txt -sha256 a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104 wireshark-2.2.0.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.1.txt +sha256 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 wireshark-2.2.1.tar.bz2 diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index aa0c6d0b56..8dc72da940 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.0 +WIRESHARK_VERSION = 2.2.1 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 1ebf524b5b731cf8fd1cd1c4b9df94e263d2eab2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 5 Oct 2016 07:39:32 -0300 Subject: [PATCH 0511/3392] ethtool: bump to version 4.8 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 73a25edc11..7deb92adae 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 e90589a9349d008cce8c0510ac4e8878efdc0ddb1b732a9a4cc333b101313415 ethtool-4.6.tar.xz +sha256 403dfe288e2d8031eab0be3f5d0ca9128e120d61c52c3dc434474fa026eb4a43 ethtool-4.8.tar.xz diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index fb751a4260..bb3ed926a7 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 4.6 +ETHTOOL_VERSION = 4.8 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPLv2 From 73bb46024a64d9d1e5428c4bb479b7b6eecf8159 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 5 Oct 2016 08:28:00 -0300 Subject: [PATCH 0512/3392] strace: bump to version 4.14 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 5 +---- package/strace/strace.mk | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 6c09cca3bc..383a266148 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,2 @@ -# From http://sourceforge.net/projects/strace/files/strace/4.13/ -md5 4b78c7febdd24c79d5147824d1a080a3 strace-4.13.tar.xz -sha1 7e1fc622e2b166cb74799a14c23d6bfde9ddbc3c strace-4.13.tar.xz # Locally computed -sha256 d48f732576c91ece36a5843d63f9be054c40ef59f1e4773986042636861625d7 strace-4.13.tar.xz +sha256 5bed5110b243dce6864bedba269446c18c8c63f553cdd7fd4f808d89a764712f strace-4.14.tar.xz diff --git a/package/strace/strace.mk b/package/strace/strace.mk index b060137ae0..385c0029cc 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 4.13 +STRACE_VERSION = 4.14 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION) STRACE_LICENSE = BSD-3c From d2ff818bc56e4f61f953936653f12990a0716737 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Wed, 5 Oct 2016 17:01:23 +0200 Subject: [PATCH 0513/3392] fakeroot: fix spurious message "undefined symbol" Since the glibc 2.24-3, and this commit: https://sourceware.org/git/?p=glibc.git;a=commit;h=80f87443eed17838fe453f1f5406ccf5d3698c25 fakeroot will print spurious message about symbols not being found. [...] dlsym(acl_get_fd): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_fd dlsym(acl_get_file): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_file dlsym(acl_set_fd): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_set_fd dlsym(acl_set_file): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_set_file dlsym(acl_get_fd): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_fd dlsym(acl_get_file): /usr/lib/libfakeroot/libfakeroot.so: undefined symbol: acl_get_file [...] It doesn't seem to impair the behavior of fakeroot, it's simply annoying for the user. Debian (which is the creator of fakeroot) has a patch which is a workaround: simply don't display the message. Note if you wish to bump fakeroot: A new version is available but the release tarball doesn't include the 'configure' and 'Makefile' pre-generated. This means that if we were to bump, the package would need to run its own 'bootstrap' script which will add dependencies to host-{automake,autoconf,...} which would be annoying (since almost every build runs fakeroot). Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/fakeroot/0001-hide-dlsym-error.patch | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/fakeroot/0001-hide-dlsym-error.patch diff --git a/package/fakeroot/0001-hide-dlsym-error.patch b/package/fakeroot/0001-hide-dlsym-error.patch new file mode 100644 index 0000000000..2c61fab248 --- /dev/null +++ b/package/fakeroot/0001-hide-dlsym-error.patch @@ -0,0 +1,34 @@ +Description: Hide error from dlsym() + dlsym(), starting in glibc 2.24 actually reports errors. In our case, + we try to get ACL functions which are not in the glibc. This causes + failures in test suites, so hide those messages for non-debugging + purposes for now. It also makes the build logs annoying to read. +Author: Julian Andres Klode +Origin: vendor +Bug-Debian: https://bugs.debian.org/830912 +Forwarded: no +Last-Update: 2016-08-12 + +Signed-off-by: Maxime Hadjinlian + +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -256,10 +256,16 @@ void load_library_symbols(void){ + /* clear dlerror() just in case dlsym() legitimately returns NULL */ + msg = dlerror(); + *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); ++ + if ( (msg = dlerror()) != NULL){ +- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); +-/* abort ();*/ ++#ifdef LIBFAKEROOT_DEBUGGING ++ if (fakeroot_debug) { ++ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); ++/* abort ();*/ ++ } ++#endif + } ++ + } + } + From 6d2335305caf37ed801b58cacb250599e087a155 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 4 Oct 2016 18:01:14 +0200 Subject: [PATCH 0514/3392] package/linux-tools: add gpio Signed-off-by: Marcin Niestroj Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/linux-tools/Config.in | 12 +++++++++++ package/linux-tools/linux-tool-gpio.mk | 28 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 package/linux-tools/linux-tool-gpio.mk diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index 61c196f912..bd07509f0f 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -20,6 +20,18 @@ comment "cpupower needs a toolchain w/ wchar" depends on !BR2_bfin depends on !BR2_USE_WCHAR && BR2_NEEDS_GETTEXT +config BR2_PACKAGE_LINUX_TOOLS_GPIO + bool "gpio" + select BR2_PACKAGE_LINUX_TOOLS + help + gpio is a collection of tools to get information about, + control and monitor gpios present on system. + + These tools use new gpio ABI which will deprecate sysfs gpio + interface in the future. + + These tools are available only from kernel version 4.8. + config BR2_PACKAGE_LINUX_TOOLS_PERF bool "perf" select BR2_PACKAGE_LINUX_TOOLS diff --git a/package/linux-tools/linux-tool-gpio.mk b/package/linux-tools/linux-tool-gpio.mk new file mode 100644 index 0000000000..ba75ab4c3f --- /dev/null +++ b/package/linux-tools/linux-tool-gpio.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# gpio +# +################################################################################ + +LINUX_TOOLS += gpio + +GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) + +define GPIO_BUILD_CMDS + $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ + echo "Your kernel version is too old and does not have the gpio tools." ; \ + echo "At least kernel 4.8 must be used." ; \ + exit 1 ; \ + fi + + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(GPIO_MAKE_OPTS) \ + gpio +endef + +define GPIO_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(GPIO_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) \ + gpio_install +endef From 3afc4de8823d63ca8fc860c5ad1dab97e62e160f Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 4 Oct 2016 18:01:39 +0200 Subject: [PATCH 0515/3392] package/linux-tools: add iio Signed-off-by: Marcin Niestroj Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/linux-tools/Config.in | 9 +++++++++ package/linux-tools/linux-tool-iio.mk | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 package/linux-tools/linux-tool-iio.mk diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index bd07509f0f..db9ed9f19b 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -32,6 +32,15 @@ config BR2_PACKAGE_LINUX_TOOLS_GPIO These tools are available only from kernel version 4.8. +config BR2_PACKAGE_LINUX_TOOLS_IIO + bool "iio" + select BR2_PACKAGE_LINUX_TOOLS + help + iio is a collection of tools to get information about, + control and monitor iio devices present on system. + + These tools are available only from kernel version 4.7. + config BR2_PACKAGE_LINUX_TOOLS_PERF bool "perf" select BR2_PACKAGE_LINUX_TOOLS diff --git a/package/linux-tools/linux-tool-iio.mk b/package/linux-tools/linux-tool-iio.mk new file mode 100644 index 0000000000..60d6249d2f --- /dev/null +++ b/package/linux-tools/linux-tool-iio.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# iio +# +################################################################################ + +LINUX_TOOLS += iio + +IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) + +define IIO_BUILD_CMDS + $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ + echo "Your kernel version is too old and does not have install section in the iio tools." ; \ + echo "At least kernel 4.7 must be used." ; \ + exit 1 ; \ + fi + + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/iio \ + $(IIO_MAKE_OPTS) +endef + +define IIO_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/iio \ + $(IIO_MAKE_OPTS) \ + INSTALL_ROOT=$(TARGET_DIR) \ + install +endef From 76cd20c98069704ef1bb7c3493ec6fdbf97d9994 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:21 +0200 Subject: [PATCH 0516/3392] package/python-argh: bump version to 0.26.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-argh/python-argh.hash | 7 +++---- package/python-argh/python-argh.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-argh/python-argh.hash b/package/python-argh/python-argh.hash index 9e2e0684c9..6f19de10be 100644 --- a/package/python-argh/python-argh.hash +++ b/package/python-argh/python-argh.hash @@ -1,4 +1,3 @@ -# md5 from https://pypi.python.org/pypi/argh/json -md5 5a97ce2ae74bbe3b63194906213f1184 argh-0.26.1.tar.gz -# sha256 calculated by scanpypi -sha256 06a7442cb9130fb8806fe336000fcf20edf1f2f8ad205e7b62cec118505510db argh-0.26.1.tar.gz +# md5 from https://pypi.python.org/pypi/argh/json, sha256 locally computed +md5 edda25f3f0164a963dd89c0e3c619973 argh-0.26.2.tar.gz +sha256 e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65 argh-0.26.2.tar.gz diff --git a/package/python-argh/python-argh.mk b/package/python-argh/python-argh.mk index 4b09e68dd5..bc5d7133a1 100644 --- a/package/python-argh/python-argh.mk +++ b/package/python-argh/python-argh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ARGH_VERSION = 0.26.1 +PYTHON_ARGH_VERSION = 0.26.2 PYTHON_ARGH_SOURCE = argh-$(PYTHON_ARGH_VERSION).tar.gz -PYTHON_ARGH_SITE = https://pypi.python.org/packages/14/7f/794a7f4a48cba505a4b4c714f81fed844a3a5f7340b171f448711439b09e +PYTHON_ARGH_SITE = https://pypi.python.org/packages/e3/75/1183b5d1663a66aebb2c184e0398724b624cecd4f4b679cb6e25de97ed15 PYTHON_ARGH_SETUP_TYPE = setuptools PYTHON_ARGH_LICENSE = LGPLv3+ PYTHON_ARGH_LICENSE_FILES = README.rst From a0b5dac328d57e98160e343858fe2caf9a72a82c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:22 +0200 Subject: [PATCH 0517/3392] package/python-autobahn: bump version to 0.16.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-autobahn/python-autobahn.hash | 6 +++--- package/python-autobahn/python-autobahn.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 1ee1e0e208..cae9160ef8 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi/autobahn/json, sha256 locally computed. -md5 576b63ce7fa7846f64650263842b712b autobahn-0.14.1.tar.gz -sha256 c1695e139e36daeaad9cb788dd3f9b907a3fd83b67884424e59b3e07032956e0 autobahn-0.14.1.tar.gz +# md5 from https://pypi.python.org/pypi/autobahn/json, sha256 locally computed +md5 9850702d0078c5a4aa17170afe2f233c autobahn-0.16.0.tar.gz +sha256 a1dcb4315a0914da56ec484659816de72dfad229be4ac19fa61bbc0111ada884 autobahn-0.16.0.tar.gz diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index 2cc2e5d2a8..a5e9aeea77 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 0.14.1 +PYTHON_AUTOBAHN_VERSION = 0.16.0 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://pypi.python.org/packages/e3/37/1297551d3066ec9b013dd3a1a7e2cca85900d3fe95194779370e8e7a7af7 +PYTHON_AUTOBAHN_SITE = https://pypi.python.org/packages/68/37/2523309412f0fb93a7784c65e5c5639b4b5d7a84f91374ad6c3c2d5af60b PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_SETUP_TYPE = setuptools From 7d8d0447e9d83702d1c4c8a26018e114f4288483 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:23 +0200 Subject: [PATCH 0518/3392] package/python-beautifulsoup4: bump version to 4.5.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-beautifulsoup4/python-beautifulsoup4.hash | 7 +++---- package/python-beautifulsoup4/python-beautifulsoup4.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.hash b/package/python-beautifulsoup4/python-beautifulsoup4.hash index 885c26675d..c86879fc9d 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.hash +++ b/package/python-beautifulsoup4/python-beautifulsoup4.hash @@ -1,4 +1,3 @@ -# md5 from https://pypi.python.org/pypi/beautifulsoup4/json -md5 8fbd9a7cac0704645fa20d1419036815 beautifulsoup4-4.4.1.tar.gz -# sha256 calculated by scanpypi -sha256 87d4013d0625d4789a4f56b8d79a04d5ce6db1152bb65f1d39744f7709a366b4 beautifulsoup4-4.4.1.tar.gz +# md5 from https://pypi.python.org/pypi/beautifulsoup4/json, sha256 locally computed +md5 994abd90e691beaf7d42c00ffb2f3a67 beautifulsoup4-4.5.1.tar.gz +sha256 3c9474036afda9136aac6463def733f81017bf9ef3510d25634f335b0c87f5e1 beautifulsoup4-4.5.1.tar.gz diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.mk b/package/python-beautifulsoup4/python-beautifulsoup4.mk index 58481b9794..e2fa9b3c8f 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.mk +++ b/package/python-beautifulsoup4/python-beautifulsoup4.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BEAUTIFULSOUP4_VERSION = 4.4.1 +PYTHON_BEAUTIFULSOUP4_VERSION = 4.5.1 PYTHON_BEAUTIFULSOUP4_SOURCE = beautifulsoup4-$(PYTHON_BEAUTIFULSOUP4_VERSION).tar.gz -PYTHON_BEAUTIFULSOUP4_SITE = https://pypi.python.org/packages/source/b/beautifulsoup4 +PYTHON_BEAUTIFULSOUP4_SITE = https://pypi.python.org/packages/86/ea/8e9fbce5c8405b9614f1fd304f7109d9169a3516a493ce4f7f77c39435b7 PYTHON_BEAUTIFULSOUP4_SETUP_TYPE = setuptools PYTHON_BEAUTIFULSOUP4_LICENSE = MIT PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = COPYING.txt From 5f48be594e962cd7a07e36607c29162605e6a1a6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:24 +0200 Subject: [PATCH 0519/3392] package/python-bottle: bump version to 0.12.9 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-bottle/python-bottle.hash | 7 +++---- package/python-bottle/python-bottle.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-bottle/python-bottle.hash b/package/python-bottle/python-bottle.hash index 8c7d4281b1..5a589f1e6b 100644 --- a/package/python-bottle/python-bottle.hash +++ b/package/python-bottle/python-bottle.hash @@ -1,4 +1,3 @@ -# From https://pypi.python.org/pypi/bottle/0.12.7 -md5 ed0b83c9dbbdbde784e7c652d61c59f4 bottle-0.12.7.tar.gz -# Calculated based on the hash above -sha256 e3ea2191f06ca51af45bf6ca41ed2d1b2d809ceda0876466879fe205be7b2073 bottle-0.12.7.tar.gz +# md5 from https://pypi.python.org/pypi/bottle/json, sha256 locally computed +md5 f5850258a86224a791171e8ecbb66d99 bottle-0.12.9.tar.gz +sha256 fe0a24b59385596d02df7ae7845fe7d7135eea73799d03348aeb9f3771500051 bottle-0.12.9.tar.gz diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk index 441419ec81..ec0939890d 100644 --- a/package/python-bottle/python-bottle.mk +++ b/package/python-bottle/python-bottle.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_BOTTLE_VERSION = 0.12.7 +PYTHON_BOTTLE_VERSION = 0.12.9 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz PYTHON_BOTTLE_SITE = http://pypi.python.org/packages/source/b/bottle PYTHON_BOTTLE_LICENSE = MIT From 97562dd098f2e977a81ebd08a81caf8f6946bdcf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:25 +0200 Subject: [PATCH 0520/3392] package/python-certifi: bump version to 2016.9.26 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-certifi/python-certifi.hash | 6 +++--- package/python-certifi/python-certifi.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index ade4db38c3..443cc6d3a2 100644 --- a/package/python-certifi/python-certifi.hash +++ b/package/python-certifi/python-certifi.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=5d672aa766e1f773c75cfeccd02d3650, sha256 locally computed -md5 5d672aa766e1f773c75cfeccd02d3650 certifi-2016.2.28.tar.gz -sha256 5e8eccf95924658c97b990b50552addb64f55e1e3dfe4880456ac1f287dc79d0 certifi-2016.2.28.tar.gz +# md5 from https://pypi.python.org/pypi/certifi/json, sha256 locally computed +md5 baa81e951a29958563689d868ef1064d certifi-2016.9.26.tar.gz +sha256 8275aef1bbeaf05c53715bfc5d8569bd1e04ca1e8e69608cc52bcaac2604eb19 certifi-2016.9.26.tar.gz diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 84db8ffebc..f69e7c18db 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2016.2.28 +PYTHON_CERTIFI_VERSION = 2016.9.26 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://pypi.python.org/packages/source/c/certifi +PYTHON_CERTIFI_SITE = https://pypi.python.org/packages/4f/75/e1bc6e363a2c76f8d7e754c27c437dbe4086414e1d6d2f6b2a3e7846f22b PYTHON_CERTIFI_SETUP_TYPE = setuptools PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE From a2ab057d31419a305c443230d91fc9084ac8453b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:26 +0200 Subject: [PATCH 0521/3392] package/python-configobj: bump version to 5.0.6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-configobj/python-configobj.hash | 7 +++---- package/python-configobj/python-configobj.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-configobj/python-configobj.hash b/package/python-configobj/python-configobj.hash index e4f5c6ca3d..d43c453796 100644 --- a/package/python-configobj/python-configobj.hash +++ b/package/python-configobj/python-configobj.hash @@ -1,4 +1,3 @@ -# From https://pypi.python.org/pypi/configobj/4.7.2 -md5 201dbaa732a9049c839f9bb6c27fc7b5 configobj-4.7.2.tar.gz -# Calculated based on the hash above -sha256 515ff923462592e8321df8b48c47e3428f8d406ee22b8de77bef969d1af11171 configobj-4.7.2.tar.gz +# md5 from https://pypi.python.org/pypi/configobj/json, sha256 locally computed +md5 e472a3a1c2a67bb0ec9b5d54c13a47d6 configobj-5.0.6.tar.gz +sha256 a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902 configobj-5.0.6.tar.gz diff --git a/package/python-configobj/python-configobj.mk b/package/python-configobj/python-configobj.mk index 5211b1d323..d9591d5be3 100644 --- a/package/python-configobj/python-configobj.mk +++ b/package/python-configobj/python-configobj.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CONFIGOBJ_VERSION = 4.7.2 +PYTHON_CONFIGOBJ_VERSION = 5.0.6 PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz -PYTHON_CONFIGOBJ_SITE = http://pypi.python.org/packages/source/c/configobj +PYTHON_CONFIGOBJ_SITE = https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab PYTHON_CONFIGOBJ_LICENSE = BSD-3c # License only mentioned in the source PYTHON_CONFIGOBJ_SETUP_TYPE = distutils From b0b2d247266728972d1a0b681e81fa5f0d60ccb6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:27 +0200 Subject: [PATCH 0522/3392] package/python-cryptography: bump version to 1.5.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-cryptography/python-cryptography.hash | 7 +++---- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 3f8f61b282..60fe3eb8fa 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,4 +1,3 @@ -# From https://pypi.python.org/pypi?:action=show_md5&digest=defd153ed901089f5aeac6eb066d5ef7 -md5 defd153ed901089f5aeac6eb066d5ef7 cryptography-1.3.4.tar.gz -# Calculated based on the hash above -sha256 423ff890c01be7c70dbfeaa967eeef5146f1a43a5f810ffdc07b178e48a105a9 cryptography-1.3.4.tar.gz +# md5 from https://pypi.python.org/pypi/cryptography/json, sha256 locally computed +md5 f977a6ddb38b071213c0157fc77c62ab cryptography-1.5.2.tar.gz +sha256 eb8875736734e8e870b09be43b17f40472dc189b1c422a952fa8580768204832 cryptography-1.5.2.tar.gz diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index fe392f975c..75e6bb364b 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 1.3.4 +PYTHON_CRYPTOGRAPHY_VERSION = 1.5.2 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://pypi.python.org/packages/f8/70/d7bd5c9c764732d5876ad34293e1ca55b2305a73ae6fcf1312202d1a798e +PYTHON_CRYPTOGRAPHY_SITE = https://pypi.python.org/packages/03/1a/60984cb85cc38c4ebdfca27b32a6df6f1914959d8790f5a349608c78be61 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3c PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From 6791d0a291a29d7b95d257bc7fb23acf43e8cffa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:28 +0200 Subject: [PATCH 0523/3392] package/python-dataproperty: bump version to 0.9.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-dataproperty/python-dataproperty.hash | 7 +++---- package/python-dataproperty/python-dataproperty.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-dataproperty/python-dataproperty.hash b/package/python-dataproperty/python-dataproperty.hash index 916352ed49..dc075b9b76 100644 --- a/package/python-dataproperty/python-dataproperty.hash +++ b/package/python-dataproperty/python-dataproperty.hash @@ -1,4 +1,3 @@ -# md5 from https://pypi.python.org/pypi/dataproperty/json -md5 7ad4dabb5469bb3f150dd1018680119c DataProperty-0.7.1.tar.gz -# sha256 calculated by scanpypi -sha256 2d53019e6ca7b95511ec733ea57dc108d916d2dd0818d88d1b7c0e06854a2d2e DataProperty-0.7.1.tar.gz +# md5 from https://pypi.python.org/pypi/dataproperty/json, sha256 locally computed +md5 9d910f0994b892df260977146f9a2bd1 DataProperty-0.9.0.tar.gz +sha256 02ab30a4873eeb1c538cc54552c9f9ef226b3243b7546e8317c583550960319d DataProperty-0.9.0.tar.gz diff --git a/package/python-dataproperty/python-dataproperty.mk b/package/python-dataproperty/python-dataproperty.mk index 927fa69df9..727b8c7cb9 100644 --- a/package/python-dataproperty/python-dataproperty.mk +++ b/package/python-dataproperty/python-dataproperty.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 0.7.1 +PYTHON_DATAPROPERTY_VERSION = 0.9.0 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://pypi.python.org/packages/1f/64/b17e5ab3935484869cc3e8ec06ede0c94a296b4955c947d1dfe4460955f9 +PYTHON_DATAPROPERTY_SITE = https://pypi.python.org/packages/d4/7a/8a214fc3c6eb2aeb42282a25355296f391cdcfd6c6b51c80bd644ce6b229 PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE From 2f8c6b3154318c3d664b62ab9fe13bfe24411174 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:29 +0200 Subject: [PATCH 0524/3392] package/python-django: bump version to 1.10.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-django/python-django.hash | 5 +++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index f51c9b4741..38b303bbf6 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,2 +1,3 @@ -# sha256 from https://www.djangoproject.com/m/pgp/Django-1.7.3.checksum.txt -sha256 f226fb8aa438456968d403f6739de1cf2dad128db86f66ee2b41dfebe3645c5b Django-1.7.3.tar.gz +# md5 from https://pypi.python.org/pypi/django/json, sha256 locally computed +md5 5342e77374b2acd2eafa86d2bb68f8c9 Django-1.10.2.tar.gz +sha256 e127f12a0bfb34843b6e8c82f91e26fff6445a7ca91d222c0794174cf97cbce1 Django-1.10.2.tar.gz diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index b67bce4504..2a502314c6 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 1.7.3 +PYTHON_DJANGO_VERSION = 1.10.2 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://pypi.python.org/packages/source/D/Django +PYTHON_DJANGO_SITE = https://pypi.python.org/packages/57/9e/59444485f092b6ed4f1931e7d2e13b67fdab967c041d02f58a0d1dab8c23 PYTHON_DJANGO_LICENSE = BSD-3c PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_SETUP_TYPE = setuptools From 4f968aa6f839390d70c81ca487827cc24e690cb6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:30 +0200 Subject: [PATCH 0525/3392] package/python-flask-jsonrpc: bump version to 0.3.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-flask-jsonrpc/python-flask-jsonrpc.hash | 6 +++--- package/python-flask-jsonrpc/python-flask-jsonrpc.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-flask-jsonrpc/python-flask-jsonrpc.hash b/package/python-flask-jsonrpc/python-flask-jsonrpc.hash index 8b91af7017..a25fbb7294 100644 --- a/package/python-flask-jsonrpc/python-flask-jsonrpc.hash +++ b/package/python-flask-jsonrpc/python-flask-jsonrpc.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi/Flask-JSONRPC/0.3, sha256 locally computed: -md5 a5beca4c3a882315f9b81acb57e83c68 Flask-JSONRPC-0.3.tar.gz -sha256 5baf70bf9cf955e95c02316982026a122b89a5f4c78c5b26f9f476abdb3e13bc Flask-JSONRPC-0.3.tar.gz +# md5 from https://pypi.python.org/pypi/flask-jsonrpc/json, sha256 locally computed +md5 5c0592f53b2f18e34d5be435acee8842 Flask-JSONRPC-0.3.1.tar.gz +sha256 4d0cc9c20874093306af91f5a48009fb8659a041428dcdb11703598ffbbc97d0 Flask-JSONRPC-0.3.1.tar.gz diff --git a/package/python-flask-jsonrpc/python-flask-jsonrpc.mk b/package/python-flask-jsonrpc/python-flask-jsonrpc.mk index 624322ed79..ade39e1b3e 100644 --- a/package/python-flask-jsonrpc/python-flask-jsonrpc.mk +++ b/package/python-flask-jsonrpc/python-flask-jsonrpc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_JSONRPC_VERSION = 0.3 +PYTHON_FLASK_JSONRPC_VERSION = 0.3.1 PYTHON_FLASK_JSONRPC_SOURCE = Flask-JSONRPC-$(PYTHON_FLASK_JSONRPC_VERSION).tar.gz -PYTHON_FLASK_JSONRPC_SITE = http://pypi.python.org/packages/source/F/Flask-JSONRPC +PYTHON_FLASK_JSONRPC_SITE = https://pypi.python.org/packages/cb/1f/e6d66e8498609ba04bac76155b2ea884df95531e93501bf4ef009d40a83c PYTHON_FLASK_JSONRPC_LICENSE = BSD-3c PYTHON_FLASK_JSONRPC_LICENSE_FILES = setup.py PYTHON_FLASK_JSONRPC_SETUP_TYPE = setuptools From 663686da65a531433cba025d7e833d9c05f2afff Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:31 +0200 Subject: [PATCH 0526/3392] package/python-flask: bump version to 0.11.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-flask/python-flask.hash | 6 +++--- package/python-flask/python-flask.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-flask/python-flask.hash b/package/python-flask/python-flask.hash index 1432c55596..01ccc6e292 100644 --- a/package/python-flask/python-flask.hash +++ b/package/python-flask/python-flask.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=89fbdcb04b7b96c5b24625ae299cf48b, sha256 locally computed -md5 89fbdcb04b7b96c5b24625ae299cf48b Flask-0.11.tar.gz -sha256 29a7405a7f0de178232fe48cd9b2a2403083bf03bd34eabe12168863d4cdb493 Flask-0.11.tar.gz +# md5 from https://pypi.python.org/pypi/flask/json, sha256 locally computed +md5 d2af95d8fe79cf7da099f062dd122a08 Flask-0.11.1.tar.gz +sha256 b4713f2bfb9ebc2966b8a49903ae0d3984781d5c878591cf2f7b484d28756b0e Flask-0.11.1.tar.gz diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk index db4ba74229..204eba0af4 100644 --- a/package/python-flask/python-flask.mk +++ b/package/python-flask/python-flask.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_VERSION = 0.11 +PYTHON_FLASK_VERSION = 0.11.1 PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz -PYTHON_FLASK_SITE = https://pypi.python.org/packages/dc/ca/c0ed9cc90c079085c698e284b672edbc1ffd6866b1830574095cbc5b7752 +PYTHON_FLASK_SITE = https://pypi.python.org/packages/55/8a/78e165d30f0c8bb5d57c429a30ee5749825ed461ad6c959688872643ffb3 PYTHON_FLASK_SETUP_TYPE = setuptools PYTHON_FLASK_LICENSE = BSD-3c PYTHON_FLASK_LICENSE_FILES = LICENSE From 0f0416cd3f90553e1094af6c1475a74087225a82 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:32 +0200 Subject: [PATCH 0527/3392] package/python-html5lib: bump version to 1.0b10 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-html5lib/python-html5lib.hash | 6 +++--- package/python-html5lib/python-html5lib.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-html5lib/python-html5lib.hash b/package/python-html5lib/python-html5lib.hash index 0ec712a1e5..7ea082fa70 100644 --- a/package/python-html5lib/python-html5lib.hash +++ b/package/python-html5lib/python-html5lib.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=ef43cb05e9e799f25d65d1135838a96f, sha256 locally computed -md5 ef43cb05e9e799f25d65d1135838a96f html5lib-0.9999999.tar.gz -sha256 2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868 html5lib-0.9999999.tar.gz +# md5 from https://pypi.python.org/pypi/html5lib/json, sha256 locally computed +md5 5ada1243b7a863624b2f35245b2186e9 html5lib-1.0b10.tar.gz +sha256 0d5fd54d5b2b79b876007a70c033a4023577768d18022c15681c00561432a0f9 html5lib-1.0b10.tar.gz diff --git a/package/python-html5lib/python-html5lib.mk b/package/python-html5lib/python-html5lib.mk index 93eef9a617..38affcbb4e 100644 --- a/package/python-html5lib/python-html5lib.mk +++ b/package/python-html5lib/python-html5lib.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_HTML5LIB_VERSION = 0.9999999 +PYTHON_HTML5LIB_VERSION = 1.0b10 PYTHON_HTML5LIB_SOURCE = html5lib-$(PYTHON_HTML5LIB_VERSION).tar.gz -PYTHON_HTML5LIB_SITE = https://pypi.python.org/packages/source/h/html5lib +PYTHON_HTML5LIB_SITE = https://pypi.python.org/packages/97/16/982214624095c1420c75f3bd295d9e658794aafb95fc075823de107e0ae4 PYTHON_HTML5LIB_LICENSE = MIT PYTHON_HTML5LIB_LICENSE_FILES = LICENSE -PYTHON_HTML5LIB_SETUP_TYPE = distutils +PYTHON_HTML5LIB_SETUP_TYPE = setuptools $(eval $(python-package)) From 81cd9a46991bd5cdfe4e8f1fe40f3838b8033f7a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:33 +0200 Subject: [PATCH 0528/3392] package/python-ipaddress: bump version to 1.0.17 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-ipaddress/python-ipaddress.hash | 6 +++--- package/python-ipaddress/python-ipaddress.mk | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-ipaddress/python-ipaddress.hash b/package/python-ipaddress/python-ipaddress.hash index 21bc37318a..a7c3803fd8 100644 --- a/package/python-ipaddress/python-ipaddress.hash +++ b/package/python-ipaddress/python-ipaddress.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=12915e923b738107e47827478d553ba1, sha256 locally computed -md5 12915e923b738107e47827478d553ba1 ipaddress-1.0.15.tar.gz -sha256 af6c85cfc9cdb12b861655e6b9f2f59618bf3088cbde858727b2c0a98e9f6636 ipaddress-1.0.15.tar.gz +# md5 from https://pypi.python.org/pypi/ipaddress/json, sha256 locally computed +md5 8bbf0326719fafb1f453921ef96729fe ipaddress-1.0.17.tar.gz +sha256 3a21c5a15f433710aaa26f1ae174b615973a25182006ae7f9c26de151cd51716 ipaddress-1.0.17.tar.gz diff --git a/package/python-ipaddress/python-ipaddress.mk b/package/python-ipaddress/python-ipaddress.mk index 8019aa8a88..5ff70d48e0 100644 --- a/package/python-ipaddress/python-ipaddress.mk +++ b/package/python-ipaddress/python-ipaddress.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_IPADDRESS_VERSION = 1.0.15 +PYTHON_IPADDRESS_VERSION = 1.0.17 PYTHON_IPADDRESS_SOURCE = ipaddress-$(PYTHON_IPADDRESS_VERSION).tar.gz -PYTHON_IPADDRESS_SITE = https://pypi.python.org/packages/source/i/ipaddress +PYTHON_IPADDRESS_SITE = https://pypi.python.org/packages/bb/26/3b64955ff73f9e3155079b9ed31812afdfa5333b5c76387454d651ef593a PYTHON_IPADDRESS_LICENSE = Python software foundation license +PYTHON_IPADDRESS_LICENSE_FILES = LICENSE PYTHON_IPADDRESS_SETUP_TYPE = setuptools $(eval $(python-package)) From 9f8d9c04c1d980c1c2e1455cd48687278fd44e86 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:34 +0200 Subject: [PATCH 0529/3392] package/python-ipy: bump version to 0.83, switch upstream to python.org Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-ipy/python-ipy.hash | 5 +++-- package/python-ipy/python-ipy.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/python-ipy/python-ipy.hash b/package/python-ipy/python-ipy.hash index 171dbdbd08..ed93448b1d 100644 --- a/package/python-ipy/python-ipy.hash +++ b/package/python-ipy/python-ipy.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 edaaa5344893437aa6c1eb9c4ca966eb4b8c071761793839c7b4fc2a837fbeec python-ipy-IPy-0.82a.tar.gz +# md5 from https://pypi.python.org/pypi/ipy/json, sha256 locally computed +md5 7b8c6eb4111b15aea31b67108e769712 IPy-0.83.tar.gz +sha256 61da5a532b159b387176f6eabf11946e7458b6df8fb8b91ff1d345ca7a6edab8 IPy-0.83.tar.gz diff --git a/package/python-ipy/python-ipy.mk b/package/python-ipy/python-ipy.mk index 6773aafe44..ec0d0d7f39 100644 --- a/package/python-ipy/python-ipy.mk +++ b/package/python-ipy/python-ipy.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_IPY_VERSION = IPy-0.82a -PYTHON_IPY_SITE = $(call github,haypo,python-ipy,$(PYTHON_IPY_VERSION)) +PYTHON_IPY_VERSION = 0.83 +PYTHON_IPY_SOURCE = IPy-$(PYTHON_IPY_VERSION).tar.gz +PYTHON_IPY_SITE = https://pypi.python.org/packages/88/28/79162bfc351a3f1ab44d663ab3f03fb495806fdb592170990a1568ffbf63 PYTHON_IPY_LICENSE = BSD-3c PYTHON_IPY_LICENSE_FILES = COPYING PYTHON_IPY_SETUP_TYPE = distutils From 36f095890107e1c8e60092b009ee3e793d75f14a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:35 +0200 Subject: [PATCH 0530/3392] package/python-json-schema-validator: bump version to 2.4.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../python-json-schema-validator.hash | 5 +++-- .../python-json-schema-validator.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-json-schema-validator/python-json-schema-validator.hash b/package/python-json-schema-validator/python-json-schema-validator.hash index 96f5d89505..7360abab9a 100644 --- a/package/python-json-schema-validator/python-json-schema-validator.hash +++ b/package/python-json-schema-validator/python-json-schema-validator.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 316befb9a6d981dff465f5243e423a3027b27775f7649510ce23fde300dde9b7 json-schema-validator-2.3.tar.gz +# md5 from https://pypi.python.org/pypi/json-schema-validator/json, sha256 locally computed +md5 7691b41739faaa8b0965279e72889932 json-schema-validator-2.4.1.tar.gz +sha256 1562a21d83e56231cef09b9aa2c06e8f845974bd26f24be293de6cab9a2fac91 json-schema-validator-2.4.1.tar.gz diff --git a/package/python-json-schema-validator/python-json-schema-validator.mk b/package/python-json-schema-validator/python-json-schema-validator.mk index 0ff5554b74..1456c349eb 100644 --- a/package/python-json-schema-validator/python-json-schema-validator.mk +++ b/package/python-json-schema-validator/python-json-schema-validator.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JSON_SCHEMA_VALIDATOR_VERSION = 2.3 +PYTHON_JSON_SCHEMA_VALIDATOR_VERSION = 2.4.1 PYTHON_JSON_SCHEMA_VALIDATOR_SOURCE = json-schema-validator-$(PYTHON_JSON_SCHEMA_VALIDATOR_VERSION).tar.gz -PYTHON_JSON_SCHEMA_VALIDATOR_SITE = http://pypi.python.org/packages/source/j/json-schema-validator +PYTHON_JSON_SCHEMA_VALIDATOR_SITE = https://pypi.python.org/packages/70/46/ba39cb7efad1898cfc89bf3588b8612f24d128f1c25b761994f524a59cef PYTHON_JSON_SCHEMA_VALIDATOR_LICENSE = LGPLv3 PYTHON_JSON_SCHEMA_VALIDATOR_SETUP_TYPE = setuptools PYTHON_JSON_SCHEMA_VALIDATOR_DEPENDENCIES = python-versiontools From c382cbe7b602b432d2595587b5c58a9dc3afa221 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:36 +0200 Subject: [PATCH 0531/3392] package/python-markdown: bump version to 2.6.7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-markdown/python-markdown.hash | 5 +++-- package/python-markdown/python-markdown.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-markdown/python-markdown.hash b/package/python-markdown/python-markdown.hash index f1ffaaefd3..d30faaedda 100644 --- a/package/python-markdown/python-markdown.hash +++ b/package/python-markdown/python-markdown.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 284e97e56db9ada03ede9c0ed2870ca6590ce7869f3119104d53510debf1533d Markdown-2.5.2.tar.gz +# md5 from https://pypi.python.org/pypi/markdown/json, sha256 locally computed +md5 a06f1c5d462b32e0e8da014e9eebb0d9 Markdown-2.6.7.tar.gz +sha256 daebf24846efa7ff269cfde8c41a48bb2303920c7b2c7c5e04fa82e6282d05c0 Markdown-2.6.7.tar.gz diff --git a/package/python-markdown/python-markdown.mk b/package/python-markdown/python-markdown.mk index 3b2217ecaa..fb87ada759 100644 --- a/package/python-markdown/python-markdown.mk +++ b/package/python-markdown/python-markdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN_VERSION = 2.5.2 +PYTHON_MARKDOWN_VERSION = 2.6.7 PYTHON_MARKDOWN_SOURCE = Markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz -PYTHON_MARKDOWN_SITE = http://pypi.python.org/packages/source/M/Markdown +PYTHON_MARKDOWN_SITE = https://pypi.python.org/packages/d4/32/642bd580c577af37b00a1eb59b0eaa996f2d11dfe394f3dd0c7a8a2de81a PYTHON_MARKDOWN_LICENSE = BSD-3c PYTHON_MARKDOWN_LICENSE_FILES = LICENSE.md PYTHON_MARKDOWN_SETUP_TYPE = distutils From bdd6903dbc3b76bca1991a98e90cbf7cbff15f92 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:37 +0200 Subject: [PATCH 0532/3392] package/python-mistune: bump version to 0.7.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-mistune/python-mistune.hash | 6 +++--- package/python-mistune/python-mistune.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-mistune/python-mistune.hash b/package/python-mistune/python-mistune.hash index 85096069c6..cfc6a25e2c 100644 --- a/package/python-mistune/python-mistune.hash +++ b/package/python-mistune/python-mistune.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=ed9ac03c99261bd1803e44ddaa4f87cb, sha256 locally computed. -md5 ed9ac03c99261bd1803e44ddaa4f87cb mistune-0.7.2.tar.gz -sha256 626f2516adcde4af608eaf83635ff20ff7e577c1898ad4d0f0fcd8c094399840 mistune-0.7.2.tar.gz +# md5 from https://pypi.python.org/pypi/mistune/json, sha256 locally computed +md5 4eba50bd121b83716fa4be6a4049004b mistune-0.7.3.tar.gz +sha256 21d0e869df3b9189f248e022f1c9763cf9069e1a2f00676f1f1852bd7f98b713 mistune-0.7.3.tar.gz diff --git a/package/python-mistune/python-mistune.mk b/package/python-mistune/python-mistune.mk index f0301a7ecf..91e97e8635 100644 --- a/package/python-mistune/python-mistune.mk +++ b/package/python-mistune/python-mistune.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MISTUNE_VERSION = 0.7.2 +PYTHON_MISTUNE_VERSION = 0.7.3 PYTHON_MISTUNE_SOURCE = mistune-$(PYTHON_MISTUNE_VERSION).tar.gz -PYTHON_MISTUNE_SITE = http://pypi.python.org/packages/source/m/mistune +PYTHON_MISTUNE_SITE = https://pypi.python.org/packages/88/1e/be99791262b3a794332fda598a07c2749a433b9378586361ba9d8e824607 PYTHON_MISTUNE_LICENSE = BSD-3c PYTHON_MISTUNE_LICENSE_FILES = LICENSE PYTHON_MISTUNE_SETUP_TYPE = setuptools From d4a5426784c178ff75b35aef39e3b1ee5b303b91 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:38 +0200 Subject: [PATCH 0533/3392] package/python-paho-mqtt: bump version to 1.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-paho-mqtt/python-paho-mqtt.hash | 6 +++--- package/python-paho-mqtt/python-paho-mqtt.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-paho-mqtt/python-paho-mqtt.hash b/package/python-paho-mqtt/python-paho-mqtt.hash index 52729ccd34..6cb3cc2bf0 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.hash +++ b/package/python-paho-mqtt/python-paho-mqtt.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=a6407b74eb5e5411e157be1de5c11366, sha256 locally computed -md5 a6407b74eb5e5411e157be1de5c11366 paho-mqtt-1.1.tar.gz -sha256 0f7a629efe6e3a2c61b59d3550aa9f2c4529b5689a65fde45e6f1ac36b9a261e paho-mqtt-1.1.tar.gz +# md5 from https://pypi.python.org/pypi/paho-mqtt/json, sha256 locally computed +md5 241150b3fcb920ddca4d33181f3238b1 paho-mqtt-1.2.tar.gz +sha256 9100a6aa706ab699d414ec02705a21eb66f436184691d0bf1f2a85a6213c6c1f paho-mqtt-1.2.tar.gz diff --git a/package/python-paho-mqtt/python-paho-mqtt.mk b/package/python-paho-mqtt/python-paho-mqtt.mk index 01da2b3d77..d783a9cb0d 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.mk +++ b/package/python-paho-mqtt/python-paho-mqtt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PAHO_MQTT_VERSION = 1.1 +PYTHON_PAHO_MQTT_VERSION = 1.2 PYTHON_PAHO_MQTT_SOURCE = paho-mqtt-$(PYTHON_PAHO_MQTT_VERSION).tar.gz -PYTHON_PAHO_MQTT_SITE = https://pypi.python.org/packages/source/p/paho-mqtt +PYTHON_PAHO_MQTT_SITE = https://pypi.python.org/packages/82/d9/7064d3a0a1d62756a1a809c85b99f864c641b66de84c15458f72193b7708 PYTHON_PAHO_MQTT_LICENSE = EPLv1.0 or EDLv1.0 PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt edl-v10 epl-v10 PYTHON_PAHO_MQTT_SETUP_TYPE = distutils From 8816ba2e6c064ff673e082ef5c2289552e77b372 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:39 +0200 Subject: [PATCH 0534/3392] package/python-paramiko: bump version to 2.0.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-paramiko/python-paramiko.hash | 7 +++---- package/python-paramiko/python-paramiko.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index 29af27d1f4..f2aedc7a21 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,4 +1,3 @@ -# md5 from https://pypi.python.org/pypi/paramiko/json -md5 7e1203f5ffeb7d2bc2bffc4feb804216 paramiko-1.16.0.tar.gz -# sha256 calculated by scanpypi -sha256 3297ebd3cd072f573772f7c7426939a443c62c458d54bb632ff30fd6ecf96892 paramiko-1.16.0.tar.gz +# md5 from https://pypi.python.org/pypi/paramiko/json, sha256 locally computed +md5 6312aee79892801cf5a624eb4f8fd864 paramiko-2.0.2.tar.gz +sha256 411bf90fa22b078a923ff19ef9772c1115a0953702db93549a2848acefd141dc paramiko-2.0.2.tar.gz diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index 52822bb298..e616049e14 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 1.16.0 +PYTHON_PARAMIKO_VERSION = 2.0.2 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://pypi.python.org/packages/source/p/paramiko +PYTHON_PARAMIKO_SITE = https://pypi.python.org/packages/6b/4e/971b8c917456a2ec9666311f7e695493002a64022397cd668150b5efd2a8 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPLv2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE From d0593caf62041542c2a3bfcff15bb1a2ce347d05 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:40 +0200 Subject: [PATCH 0535/3392] package/python-pathvalidate: bump version to 0.7.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pathvalidate/python-pathvalidate.hash | 7 +++---- package/python-pathvalidate/python-pathvalidate.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-pathvalidate/python-pathvalidate.hash b/package/python-pathvalidate/python-pathvalidate.hash index 90208f4365..3a1bc1d54d 100644 --- a/package/python-pathvalidate/python-pathvalidate.hash +++ b/package/python-pathvalidate/python-pathvalidate.hash @@ -1,4 +1,3 @@ -# md5 from https://pypi.python.org/pypi/pathvalidate/json -md5 d3d89abc6c053b4182be29c23beccf26 pathvalidate-0.4.2.tar.gz -# sha256 calculated locally -sha256 4316cf5f862b70efd7792b98f46871592b80924840da69a28df1921d7702fcf9 pathvalidate-0.4.2.tar.gz +# md5 from https://pypi.python.org/pypi/pathvalidate/json, sha256 locally computed +md5 1ea321c363fb5f55451473071db30d28 pathvalidate-0.7.1.tar.gz +sha256 4d701cfc8b380ed39252e29ce972a54dd18ce1dbe5cd8758162480d8bd673e5d pathvalidate-0.7.1.tar.gz diff --git a/package/python-pathvalidate/python-pathvalidate.mk b/package/python-pathvalidate/python-pathvalidate.mk index 0c7cc76d98..843b207ce2 100644 --- a/package/python-pathvalidate/python-pathvalidate.mk +++ b/package/python-pathvalidate/python-pathvalidate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHVALIDATE_VERSION = 0.4.2 +PYTHON_PATHVALIDATE_VERSION = 0.7.1 PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz -PYTHON_PATHVALIDATE_SITE = https://pypi.python.org/packages/fd/b9/726269557d5846f253f7ecec483d801582a27b77852a76e2dc9c61dba2b6 +PYTHON_PATHVALIDATE_SITE = https://pypi.python.org/packages/85/39/94b634c076dc3192455b1c0a8d15061eeeffd65a9d267d2b9de237b159a2 PYTHON_PATHVALIDATE_SETUP_TYPE = setuptools PYTHON_PATHVALIDATE_LICENSE = MIT PYTHON_PATHVALIDATE_LICENSE_FILES = LICENSE From f39c415576c5a178b2d4cca6ef518922278eb004 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:41 +0200 Subject: [PATCH 0536/3392] package/python-posix-ipc: bump version to 1.0.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-posix-ipc/python-posix-ipc.hash | 5 +++-- package/python-posix-ipc/python-posix-ipc.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-posix-ipc/python-posix-ipc.hash b/package/python-posix-ipc/python-posix-ipc.hash index 95ef4da6b2..196f186de1 100644 --- a/package/python-posix-ipc/python-posix-ipc.hash +++ b/package/python-posix-ipc/python-posix-ipc.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 24e092ba995122869a2fca46a2579b1b2824cfdcb2ecc6938e2923a120460646 posix_ipc-0.9.6.tar.gz +# md5 from https://pypi.python.org/pypi/posix-ipc/json, sha256 locally computed +md5 85607a392087715ac3a3c7ded2492d06 posix_ipc-1.0.0.tar.gz +sha256 9c93070374ca672725575e5c9874930c8cde69367fb90378b2255e048e31efcb posix_ipc-1.0.0.tar.gz diff --git a/package/python-posix-ipc/python-posix-ipc.mk b/package/python-posix-ipc/python-posix-ipc.mk index 5fa7471eba..79165375f9 100644 --- a/package/python-posix-ipc/python-posix-ipc.mk +++ b/package/python-posix-ipc/python-posix-ipc.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_POSIX_IPC_VERSION = 0.9.6 +PYTHON_POSIX_IPC_VERSION = 1.0.0 PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz -PYTHON_POSIX_IPC_SITE = http://semanchuk.com/philip/posix_ipc +PYTHON_POSIX_IPC_SITE = https://pypi.python.org/packages/f0/e6/bff62b62b2e75f695b737695951b7a4c1c6595369268a37868f5c34e1c12 PYTHON_POSIX_IPC_LICENSE = BSD-3c PYTHON_POSIX_IPC_LICENSE_FILES = LICENSE PYTHON_POSIX_IPC_SETUP_TYPE = distutils From dd3ae278b816aea858c5207c204b4f41c13b3923 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:42 +0200 Subject: [PATCH 0537/3392] package/python-prompt-toolkit: bump version to 1.0.7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-prompt-toolkit/python-prompt-toolkit.hash | 6 +++--- package/python-prompt-toolkit/python-prompt-toolkit.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index f33e99a3f7..0211a96fae 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.hash +++ b/package/python-prompt-toolkit/python-prompt-toolkit.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi/prompt_toolkit/json, sha256 locally computed -md5 6c4133d099603f496c761491043bf0ef prompt_toolkit-1.0.3.tar.gz -sha256 805e026f0cbad27467e93f9dd3e3777718d401a62788c1e84ca038e967ad8ba2 prompt_toolkit-1.0.3.tar.gz +# md5 from https://pypi.python.org/pypi/prompt-toolkit/json, sha256 locally computed +md5 f74cd8ac84176fac1cdb136843ccb0d6 prompt_toolkit-1.0.7.tar.gz +sha256 ef0b8188179fe7d052161ed274b43e18f5a680ff84d01462293b327e1668d2ef prompt_toolkit-1.0.7.tar.gz diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.mk b/package/python-prompt-toolkit/python-prompt-toolkit.mk index 634f20eaa2..7e85dcd221 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.mk +++ b/package/python-prompt-toolkit/python-prompt-toolkit.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROMPT_TOOLKIT_VERSION = 1.0.3 +PYTHON_PROMPT_TOOLKIT_VERSION = 1.0.7 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://pypi.python.org/packages/8d/de/412f23919929c01e6b55183e124623f705e4b91796d3d2dce2cb53d595ad +PYTHON_PROMPT_TOOLKIT_SITE = https://pypi.python.org/packages/dd/55/2fb4883d2b21d072204fd21ca5e6040faa253135554590d0b67380669176 PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3c PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE From 1b46805c08e6fcc8acc408f522048baa46589b82 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:43 +0200 Subject: [PATCH 0538/3392] package/python-pygments: bump version to 2.1.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pygments/python-pygments.hash | 6 +++--- package/python-pygments/python-pygments.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index bb954dd551..2af1597fe8 100644 --- a/package/python-pygments/python-pygments.hash +++ b/package/python-pygments/python-pygments.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=84533d22f72de894f6d3907c3ca9eddf, sha256 locally computed. -md5 84533d22f72de894f6d3907c3ca9eddf Pygments-2.1.tar.gz -sha256 13a0ef5fafd7b16cf995bc28fe7aab0780dab1b2fda0fc89e033709af8b8a47b Pygments-2.1.tar.gz +# md5 from https://pypi.python.org/pypi/pygments/json, sha256 locally computed +md5 ed3fba2467c8afcda4d317e4ef2c6150 Pygments-2.1.3.tar.gz +sha256 88e4c8a91b2af5962bfa5ea2447ec6dd357018e86e94c7d14bd8cacbc5b55d81 Pygments-2.1.3.tar.gz diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index eafd77590b..16ed90dc37 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.1 +PYTHON_PYGMENTS_VERSION = 2.1.3 PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = http://pypi.python.org/packages/source/P/Pygments +PYTHON_PYGMENTS_SITE = https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504 PYTHON_PYGMENTS_LICENSE = BSD-2c PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_SETUP_TYPE = setuptools From 925e3284cff4fb4ab71efebdd8a0ef6649ed9a3e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:44 +0200 Subject: [PATCH 0539/3392] package/python-pymysql: bump version to 0.7.9 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pymysql/python-pymysql.hash | 7 +++---- package/python-pymysql/python-pymysql.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-pymysql/python-pymysql.hash b/package/python-pymysql/python-pymysql.hash index fc7e5e3ece..9e058abf30 100644 --- a/package/python-pymysql/python-pymysql.hash +++ b/package/python-pymysql/python-pymysql.hash @@ -1,4 +1,3 @@ -#md5 from https://pypi.python.org/pypi?:action=show_md5&digest=6d757cda8bfbd312714207f7c0bef5c7 -md5 6d757cda8bfbd312714207f7c0bef5c7 PyMySQL-0.7.2.tar.gz -# Locally calculated: -sha256 bd7acb4990dbf097fae3417641f93e25c690e01ed25c3ed32ea638d6c3ac04ba PyMySQL-0.7.2.tar.gz +# md5 from https://pypi.python.org/pypi/pymysql/json, sha256 locally computed +md5 bf82311ac2df4c43adad003a8c805b90 PyMySQL-0.7.9.tar.gz +sha256 2331f82b7b85d407c8d9d7a8d7901a6abbeb420533e5d5d64ded5009b5c6dcc3 PyMySQL-0.7.9.tar.gz diff --git a/package/python-pymysql/python-pymysql.mk b/package/python-pymysql/python-pymysql.mk index e58ff7e8bf..94a93a26cf 100644 --- a/package/python-pymysql/python-pymysql.mk +++ b/package/python-pymysql/python-pymysql.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMYSQL_VERSION = 0.7.2 +PYTHON_PYMYSQL_VERSION = 0.7.9 PYTHON_PYMYSQL_SOURCE = PyMySQL-$(PYTHON_PYMYSQL_VERSION).tar.gz -PYTHON_PYMYSQL_SITE = https://pypi.python.org/packages/source/P/PyMySQL +PYTHON_PYMYSQL_SITE = https://pypi.python.org/packages/a4/c4/c15457f261fda9839637de044eca9b6da8f55503183fe887523801b85701 PYTHON_PYMYSQL_LICENSE = MIT PYTHON_PYMYSQL_LICENSE_FILES = LICENSE PYTHON_PYMYSQL_SETUP_TYPE = setuptools From 678b9a6d0e78ceb8712e0f7b2c77e5623e28c80f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:45 +0200 Subject: [PATCH 0540/3392] package/python-pyparsing: bump version to 2.1.9 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pyparsing/python-pyparsing.hash | 6 +++--- package/python-pyparsing/python-pyparsing.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash index 93a08458df..6cf686a809 100644 --- a/package/python-pyparsing/python-pyparsing.hash +++ b/package/python-pyparsing/python-pyparsing.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi/pyparsing/2.0.3, sha256 locally computed -md5 0fe479be09fc2cf005f753d3acc35939 pyparsing-2.0.3.tar.gz -sha256 06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f pyparsing-2.0.3.tar.gz +# md5 from https://pypi.python.org/pypi/pyparsing/json, sha256 locally computed +md5 ee943c354eac79526533c58342f322c7 pyparsing-2.1.9.tar.gz +sha256 93326f5490bcfe7069806ff342692e75f72529cfa82f20683b5fceeb5d4a7fc2 pyparsing-2.1.9.tar.gz diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk index ad066b8f9e..652345d300 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 2.0.3 +PYTHON_PYPARSING_VERSION = 2.1.9 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://pypi.python.org/packages/source/p/pyparsing +PYTHON_PYPARSING_SITE = https://pypi.python.org/packages/87/ee/6f3a94d834c82a5c1a74f2fc77775ff05b5fbbf7d97f844e6fff5e2ff94b PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE -PYTHON_PYPARSING_SETUP_TYPE = distutils +PYTHON_PYPARSING_SETUP_TYPE = setuptools $(eval $(python-package)) From df9203648790b779b0f7d433fbb7ec67de3d556c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:46 +0200 Subject: [PATCH 0541/3392] package/python-pyroute2: bump version to 0.4.8 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pyroute2/python-pyroute2.hash | 6 +++--- package/python-pyroute2/python-pyroute2.mk | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/python-pyroute2/python-pyroute2.hash b/package/python-pyroute2/python-pyroute2.hash index df9ff02cce..ff680fc235 100644 --- a/package/python-pyroute2/python-pyroute2.hash +++ b/package/python-pyroute2/python-pyroute2.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=459b4020073b767cc129e360dabbd2d7, sha256 locally computed -md5 459b4020073b767cc129e360dabbd2d7 pyroute2-0.3.20.tar.gz -sha256 ed28856753b941d4277b2f14b89c9edec35be4c97e1831f900fe4ce6fc12161b pyroute2-0.3.20.tar.gz +# md5 from https://pypi.python.org/pypi/pyroute2/json, sha256 locally computed +md5 317303ba8a5e3d55b4f918fd1b7e186d pyroute2-0.4.8.tar.gz +sha256 a59907d2c5756f188b5f8aa48e3060e31c6f40e076f8143b99240fe0108a48d6 pyroute2-0.4.8.tar.gz diff --git a/package/python-pyroute2/python-pyroute2.mk b/package/python-pyroute2/python-pyroute2.mk index 2e9e0ddff4..5ea4f54576 100644 --- a/package/python-pyroute2/python-pyroute2.mk +++ b/package/python-pyroute2/python-pyroute2.mk @@ -1,12 +1,12 @@ -############################################################# +################################################################################ # # python-pyroute2 # -############################################################# +################################################################################ -PYTHON_PYROUTE2_VERSION = 0.3.20 +PYTHON_PYROUTE2_VERSION = 0.4.8 PYTHON_PYROUTE2_SOURCE = pyroute2-$(PYTHON_PYROUTE2_VERSION).tar.gz -PYTHON_PYROUTE2_SITE = https://pypi.python.org/packages/source/p/pyroute2 +PYTHON_PYROUTE2_SITE = https://pypi.python.org/packages/fb/c1/2cbd9d3f91c663be7168ee2d8d6e919006ffeef57cac76bdd9e6cba7f468 PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPLv2+ PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache.v2 LICENSE.GPL.v2 README.license.md PYTHON_PYROUTE2_SETUP_TYPE = distutils From 6f85e6e6a94235f634be854b2afda27c17c647f5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:47 +0200 Subject: [PATCH 0542/3392] package/python-pysnmp-apps: bump version to 0.4.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pysnmp-apps/python-pysnmp-apps.hash | 5 +++-- package/python-pysnmp-apps/python-pysnmp-apps.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/python-pysnmp-apps/python-pysnmp-apps.hash b/package/python-pysnmp-apps/python-pysnmp-apps.hash index cb57c8d8cc..2b865cbce9 100644 --- a/package/python-pysnmp-apps/python-pysnmp-apps.hash +++ b/package/python-pysnmp-apps/python-pysnmp-apps.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 e073732ed34777bdeb018dcd8b3fa51bc85956da80b92da401a4436ee72350e0 pysnmp-apps-0.3.3.tar.gz +# md5 from https://pypi.python.org/pypi/pysnmp-apps/json, sha256 locally computed +md5 7fc08e2d81a77d558b38be5e49ff833e pysnmp-apps-0.4.1.tar.gz +sha256 57accb8c2fcb255b4da85af07ef9cd6a266dc5143b2834419ec8a39a879edeb7 pysnmp-apps-0.4.1.tar.gz diff --git a/package/python-pysnmp-apps/python-pysnmp-apps.mk b/package/python-pysnmp-apps/python-pysnmp-apps.mk index d6e9db2d79..a055442d9e 100644 --- a/package/python-pysnmp-apps/python-pysnmp-apps.mk +++ b/package/python-pysnmp-apps/python-pysnmp-apps.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYSNMP_APPS_VERSION = 0.3.3 +PYTHON_PYSNMP_APPS_VERSION = 0.4.1 PYTHON_PYSNMP_APPS_SOURCE = pysnmp-apps-$(PYTHON_PYSNMP_APPS_VERSION).tar.gz PYTHON_PYSNMP_APPS_SITE = https://pypi.python.org/packages/source/p/pysnmp-apps PYTHON_PYSNMP_APPS_SETUP_TYPE = setuptools From 7fd6ca2e968d374e753dc9f2aee43673fca8e692 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Oct 2016 23:11:48 +0200 Subject: [PATCH 0543/3392] package/python-requests: bump version to 2.11.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-requests/python-requests.hash | 6 +++--- package/python-requests/python-requests.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index b567fe6adc..e441c00825 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=0b7f480d19012ec52bab78292efd976d, sha256 locally computed -md5 0b7f480d19012ec52bab78292efd976d requests-2.9.1.tar.gz -sha256 c577815dd00f1394203fc44eb979724b098f88264a9ef898ee45b8e5e9cf587f requests-2.9.1.tar.gz +# md5 from https://pypi.python.org/pypi/requests/json, sha256 locally computed +md5 ad5f9c47b5c5dfdb28363ad7546b0763 requests-2.11.1.tar.gz +sha256 5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133 requests-2.11.1.tar.gz diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 8cda2c5148..49980bf9bc 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.9.1 +PYTHON_REQUESTS_VERSION = 2.11.1 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = http://pypi.python.org/packages/source/r/requests +PYTHON_REQUESTS_SITE = https://pypi.python.org/packages/2e/ad/e627446492cc374c284e82381215dcd9a0a87c4f6e90e9789afefe6da0ad PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE From 2b9bbb537e2fefe0e437dfab5a8b085bc7c98699 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 4 Oct 2016 10:06:04 -0300 Subject: [PATCH 0544/3392] imx6ulpico/readme: Update the image layout file As we are using the common image layout now, update the readme.txt file accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/technexion/imx6ulpico/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/technexion/imx6ulpico/readme.txt b/board/technexion/imx6ulpico/readme.txt index ff78412ebd..a7c3a445d0 100644 --- a/board/technexion/imx6ulpico/readme.txt +++ b/board/technexion/imx6ulpico/readme.txt @@ -46,7 +46,7 @@ command as root: *** WARNING! This will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/technexion/imx6ulpico/genimage.cfg. +board/freescale/common/genimage.cfg.template. Boot the i.MX6UL Pico board ========================= From 4a21ba0b921f180e1b1c5f912d733a19ade748b9 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Mon, 3 Oct 2016 09:48:31 +0200 Subject: [PATCH 0545/3392] board: add support for liteBoard Board support package includes: * Buildroot defconfig * Mainline Linux kernel v4.8 with board support patches * Mainline U-Boot v2016.09 with board support patches * genimage config to create sdcard image * Board readme.txt Signed-off-by: Marcin Niestroj Reviewed-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/grinn/liteboard/genimage.cfg | 48 ++ ...ts-imx6ul-Add-DTS-for-liteSOM-module.patch | 112 ++++ ...ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch | 195 ++++++ ...1-ARM-imx6ul-Add-support-for-liteSOM.patch | 311 +++++++++ ...-liteboard-Add-support-for-liteBoard.patch | 621 ++++++++++++++++++ board/grinn/liteboard/post-image.sh | 14 + board/grinn/liteboard/readme.txt | 45 ++ configs/grinn_liteboard_defconfig | 26 + 8 files changed, 1372 insertions(+) create mode 100644 board/grinn/liteboard/genimage.cfg create mode 100644 board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch create mode 100644 board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch create mode 100644 board/grinn/liteboard/patches/uboot/0001-ARM-imx6ul-Add-support-for-liteSOM.patch create mode 100644 board/grinn/liteboard/patches/uboot/0002-board-liteboard-Add-support-for-liteBoard.patch create mode 100755 board/grinn/liteboard/post-image.sh create mode 100644 board/grinn/liteboard/readme.txt create mode 100644 configs/grinn_liteboard_defconfig diff --git a/board/grinn/liteboard/genimage.cfg b/board/grinn/liteboard/genimage.cfg new file mode 100644 index 0000000000..cbce2db585 --- /dev/null +++ b/board/grinn/liteboard/genimage.cfg @@ -0,0 +1,48 @@ +# Minimal microSD card image for Grinn's liteBoard +# +# We mimic the .sdcard Freescale's image format for i.MX6UL: +# * the microSD card must have 1 kB free space at the beginning, +# * SPL is dumped as is, +# * U-Boot is dumped at 69K offset, as configured in SPL +# * a FAT partition at offset 8 MB is containing zImage and dtbs, +# * a single root filesystem partition is required (Ext4 in this case). +# + +image boot.vfat { + vfat { + files = { + "imx6ul-liteboard.dtb", + "zImage" + } + } + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition SPL { + in-partition-table = "no" + image = "SPL" + offset = 1K + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot.img" + offset = 69K + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch b/board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch new file mode 100644 index 0000000000..0f124b24da --- /dev/null +++ b/board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch @@ -0,0 +1,112 @@ +From 35d7c23bde44d18205a2730df9acf75d83220c3a Mon Sep 17 00:00:00 2001 +From: Marcin Niestroj +Date: Wed, 7 Sep 2016 15:10:45 +0200 +Subject: [PATCH 1/2] ARM: dts: imx6ul: Add DTS for liteSOM module + +This is a SOM (System on Module), so it will be part of another boards. +Hence, this is a "dtsi" file that will be included from another device +tree files. + +Hardware specification: + * Freescale i.MX6UL SoC + * up to 512 MB RAM + * eMMC on uSDHC2 + +Signed-off-by: Marcin Niestroj +Reviewed-by: Fabio Estevam +--- + arch/arm/boot/dts/imx6ul-litesom.dtsi | 82 +++++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) + create mode 100644 arch/arm/boot/dts/imx6ul-litesom.dtsi + +diff --git a/arch/arm/boot/dts/imx6ul-litesom.dtsi b/arch/arm/boot/dts/imx6ul-litesom.dtsi +new file mode 100644 +index 0000000..461292d +--- /dev/null ++++ b/arch/arm/boot/dts/imx6ul-litesom.dtsi +@@ -0,0 +1,82 @@ ++/* ++ * Copyright 2016 Grinn ++ * ++ * Author: Marcin Niestroj ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * version 2 as published by the Free Software Foundation. ++ * ++ * This file is distributed in the hope that it will be useful ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++#include "imx6ul.dtsi" ++ ++/ { ++ model = "Grinn i.MX6UL liteSOM"; ++ compatible = "grinn,imx6ul-litesom", "fsl,imx6ul"; ++ ++ memory { ++ reg = <0x80000000 0x20000000>; ++ }; ++}; ++ ++&iomuxc { ++ pinctrl_usdhc2: usdhc2grp { ++ fsl,pins = < ++ MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10069 ++ MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 ++ MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 ++ MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 ++ MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 ++ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 ++ MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 ++ MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 ++ MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 ++ MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 ++ MX6UL_PAD_NAND_ALE__USDHC2_RESET_B 0x17059 ++ >; ++ }; ++}; ++ ++&usdhc2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usdhc2>; ++ no-1-8-v; ++ non-removable; ++ keep-power-in-suspend; ++ wakeup-source; ++ bus-width = <8>; ++ status = "okay"; ++}; +-- +2.10.0 + diff --git a/board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch b/board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch new file mode 100644 index 0000000000..3455cbbbf3 --- /dev/null +++ b/board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch @@ -0,0 +1,195 @@ +From 58669b4a74343673c6e75c5312e87b24634773fb Mon Sep 17 00:00:00 2001 +From: Marcin Niestroj +Date: Wed, 7 Sep 2016 15:10:53 +0200 +Subject: [PATCH 2/2] ARM: dts: imx6ul: Add DTS for liteBoard + +liteBoard is a development board which uses liteSOM as its base. + +Hardware specification: + * liteSOM (i.MX6UL, DRAM, eMMC) + * Ethernet PHY (id 0) + * USB host (usb_otg1) + * MicroSD slot (uSDHC1) + +Signed-off-by: Marcin Niestroj +Reviewed-by: Fabio Estevam +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/imx6ul-liteboard.dts | 153 +++++++++++++++++++++++++++++++++ + 2 files changed, 154 insertions(+) + create mode 100644 arch/arm/boot/dts/imx6ul-liteboard.dts + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index faacd52..b149313 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -407,6 +407,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ + imx6sx-sdb.dtb + dtb-$(CONFIG_SOC_IMX6UL) += \ + imx6ul-14x14-evk.dtb \ ++ imx6ul-liteboard.dtb \ + imx6ul-pico-hobbit.dtb \ + imx6ul-tx6ul-0010.dtb \ + imx6ul-tx6ul-0011.dtb \ +diff --git a/arch/arm/boot/dts/imx6ul-liteboard.dts b/arch/arm/boot/dts/imx6ul-liteboard.dts +new file mode 100644 +index 0000000..f2e04f2 +--- /dev/null ++++ b/arch/arm/boot/dts/imx6ul-liteboard.dts +@@ -0,0 +1,153 @@ ++/* ++ * Copyright 2016 Grinn ++ * ++ * Author: Marcin Niestroj ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * version 2 as published by the Free Software Foundation. ++ * ++ * This file is distributed in the hope that it will be useful ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/dts-v1/; ++ ++#include "imx6ul-litesom.dtsi" ++ ++/ { ++ model = "Grinn i.MX6UL liteBoard"; ++ compatible = "grinn,imx6ul-liteboard", "grinn,imx6ul-litesom", ++ "fsl,imx6ul"; ++ ++ chosen { ++ stdout-path = &uart1; ++ }; ++ ++ regulators { ++ compatible = "simple-bus"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ reg_usb_otg1_vbus: usb_otg1_regulator { ++ compatible = "regulator-fixed"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usb_otg1_vbus>; ++ regulator-name = "usb_otg1_vbus"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ gpio = <&gpio2 8 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++}; ++ ++&iomuxc { ++ pinctrl_enet1: enet1grp { ++ fsl,pins = < ++ MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0 ++ MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0 ++ MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x1b0b0 ++ MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x1b0b0 ++ MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0 ++ MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0 ++ MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0 ++ MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0 ++ MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0 ++ MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031 ++ >; ++ }; ++ ++ pinctrl_uart1: uart1grp { ++ fsl,pins = < ++ MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1 ++ MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1 ++ >; ++ }; ++ ++ pinctrl_usdhc1: usdhc1grp { ++ fsl,pins = < ++ MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x17059 ++ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 ++ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10071 ++ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x17059 ++ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x17059 ++ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x17059 ++ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059 ++ >; ++ }; ++ ++ pinctrl_usb_otg1_vbus: usb_otg1_vbus { ++ fsl,pins = < ++ MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x79 ++ >; ++ }; ++}; ++ ++&fec1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_enet1>; ++ phy-mode = "rmii"; ++ phy-handle = <ðphy0>; ++ status = "okay"; ++ ++ mdio { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ ethphy0: ethernet-phy@0 { ++ reg = <0>; ++ }; ++ }; ++}; ++ ++&uart1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_uart1>; ++ status = "okay"; ++}; ++ ++&usbotg1 { ++ vbus-supply = <®_usb_otg1_vbus>; ++ dr_mode = "host"; ++ status = "okay"; ++}; ++ ++&usdhc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usdhc1>; ++ cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; ++ no-1-8-v; ++ keep-power-in-suspend; ++ wakeup-source; ++ status = "okay"; ++}; +-- +2.10.0 + diff --git a/board/grinn/liteboard/patches/uboot/0001-ARM-imx6ul-Add-support-for-liteSOM.patch b/board/grinn/liteboard/patches/uboot/0001-ARM-imx6ul-Add-support-for-liteSOM.patch new file mode 100644 index 0000000000..6810b98efb --- /dev/null +++ b/board/grinn/liteboard/patches/uboot/0001-ARM-imx6ul-Add-support-for-liteSOM.patch @@ -0,0 +1,311 @@ +From 0f6c7b874d2cc1d0ba500190f4c3d16eabb5d711 Mon Sep 17 00:00:00 2001 +From: Marcin Niestroj +Date: Tue, 5 Jul 2016 14:59:28 +0200 +Subject: [PATCH 1/2] ARM: imx6ul: Add support for liteSOM + +liteSOM is a System On Module (http://grinn-global.com/litesom/). It +can't exists on its own, but will be used as part of other boards. + +Hardware specification: + * NXP i.MX6UL processor + * 256M or 512M DDR3 memory + * optional eMMC (uSDHC2) + +Here we treat SOM similar to SOC, so we place it inside arch/arm/mach-* +directory and make it possible to reuse initialization code (i.e. DDR, +eMMC init) for all boards that use it. + +Signed-off-by: Marcin Niestroj +--- + arch/arm/Kconfig | 2 + + arch/arm/Makefile | 1 + + arch/arm/mach-litesom/Kconfig | 6 + + arch/arm/mach-litesom/Makefile | 6 + + arch/arm/mach-litesom/include/mach/litesom.h | 16 +++ + arch/arm/mach-litesom/litesom.c | 200 +++++++++++++++++++++++++++ + 6 files changed, 231 insertions(+) + create mode 100644 arch/arm/mach-litesom/Kconfig + create mode 100644 arch/arm/mach-litesom/Makefile + create mode 100644 arch/arm/mach-litesom/include/mach/litesom.h + create mode 100644 arch/arm/mach-litesom/litesom.c + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index e63309a..bf5ac39 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -917,6 +917,8 @@ source "arch/arm/mach-keystone/Kconfig" + + source "arch/arm/mach-kirkwood/Kconfig" + ++source "arch/arm/mach-litesom/Kconfig" ++ + source "arch/arm/mach-mvebu/Kconfig" + + source "arch/arm/cpu/armv7/mx7/Kconfig" +diff --git a/arch/arm/Makefile b/arch/arm/Makefile +index 42093c2..3e804d7 100644 +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile +@@ -58,6 +58,7 @@ machine-$(CONFIG_ARCH_HIGHBANK) += highbank + machine-$(CONFIG_ARCH_KEYSTONE) += keystone + # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD + machine-$(CONFIG_KIRKWOOD) += kirkwood ++machine-$(CONFIG_LITESOM) += litesom + machine-$(CONFIG_ARCH_MESON) += meson + machine-$(CONFIG_ARCH_MVEBU) += mvebu + # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA +diff --git a/arch/arm/mach-litesom/Kconfig b/arch/arm/mach-litesom/Kconfig +new file mode 100644 +index 0000000..9b7f36d +--- /dev/null ++++ b/arch/arm/mach-litesom/Kconfig +@@ -0,0 +1,6 @@ ++config LITESOM ++ bool ++ select MX6UL ++ select DM ++ select DM_THERMAL ++ select SUPPORT_SPL +diff --git a/arch/arm/mach-litesom/Makefile b/arch/arm/mach-litesom/Makefile +new file mode 100644 +index 0000000..b15eb64 +--- /dev/null ++++ b/arch/arm/mach-litesom/Makefile +@@ -0,0 +1,6 @@ ++# (C) Copyright 2016 Grinn ++# ++# SPDX-License-Identifier: GPL-2.0+ ++# ++ ++obj-y := litesom.o +diff --git a/arch/arm/mach-litesom/include/mach/litesom.h b/arch/arm/mach-litesom/include/mach/litesom.h +new file mode 100644 +index 0000000..6833949 +--- /dev/null ++++ b/arch/arm/mach-litesom/include/mach/litesom.h +@@ -0,0 +1,16 @@ ++/* ++ * Copyright (C) 2016 Grinn ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#ifndef __ARCH_ARM_MACH_LITESOM_SOM_H__ ++#define __ARCH_ARM_MACH_LITESOM_SOM_H__ ++ ++int litesom_mmc_init(bd_t *bis); ++ ++#ifdef CONFIG_SPL_BUILD ++void litesom_init_f(void); ++#endif ++ ++#endif +diff --git a/arch/arm/mach-litesom/litesom.c b/arch/arm/mach-litesom/litesom.c +new file mode 100644 +index 0000000..ac2eccf +--- /dev/null ++++ b/arch/arm/mach-litesom/litesom.c +@@ -0,0 +1,200 @@ ++/* ++ * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. ++ * Copyright (C) 2016 Grinn ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++DECLARE_GLOBAL_DATA_PTR; ++ ++#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ ++ PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ ++ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) ++ ++int dram_init(void) ++{ ++ gd->ram_size = imx_ddr_size(); ++ ++ return 0; ++} ++ ++static iomux_v3_cfg_t const emmc_pads[] = { ++ MX6_PAD_NAND_RE_B__USDHC2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_NAND_WE_B__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_NAND_DATA00__USDHC2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_NAND_DATA01__USDHC2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_NAND_DATA02__USDHC2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_NAND_DATA03__USDHC2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_NAND_DATA04__USDHC2_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_NAND_DATA05__USDHC2_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_NAND_DATA06__USDHC2_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_NAND_DATA07__USDHC2_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ ++ /* RST_B */ ++ MX6_PAD_NAND_ALE__GPIO4_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL), ++}; ++ ++#ifdef CONFIG_FSL_ESDHC ++static struct fsl_esdhc_cfg emmc_cfg = {USDHC2_BASE_ADDR, 0, 8}; ++ ++#define EMMC_PWR_GPIO IMX_GPIO_NR(4, 10) ++ ++int litesom_mmc_init(bd_t *bis) ++{ ++ int ret; ++ ++ /* eMMC */ ++ imx_iomux_v3_setup_multiple_pads(emmc_pads, ARRAY_SIZE(emmc_pads)); ++ gpio_direction_output(EMMC_PWR_GPIO, 0); ++ udelay(500); ++ gpio_direction_output(EMMC_PWR_GPIO, 1); ++ emmc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); ++ ++ ret = fsl_esdhc_initialize(bis, &emmc_cfg); ++ if (ret) { ++ printf("Warning: failed to initialize mmc dev 1 (eMMC)\n"); ++ return ret; ++ } ++ ++ return 0; ++} ++#endif ++ ++#ifdef CONFIG_SPL_BUILD ++#include ++#include ++#include ++ ++ ++static struct mx6ul_iomux_grp_regs mx6_grp_ioregs = { ++ .grp_addds = 0x00000030, ++ .grp_ddrmode_ctl = 0x00020000, ++ .grp_b0ds = 0x00000030, ++ .grp_ctlds = 0x00000030, ++ .grp_b1ds = 0x00000030, ++ .grp_ddrpke = 0x00000000, ++ .grp_ddrmode = 0x00020000, ++ .grp_ddr_type = 0x000c0000, ++}; ++ ++static struct mx6ul_iomux_ddr_regs mx6_ddr_ioregs = { ++ .dram_dqm0 = 0x00000030, ++ .dram_dqm1 = 0x00000030, ++ .dram_ras = 0x00000030, ++ .dram_cas = 0x00000030, ++ .dram_odt0 = 0x00000030, ++ .dram_odt1 = 0x00000030, ++ .dram_sdba2 = 0x00000000, ++ .dram_sdclk_0 = 0x00000030, ++ .dram_sdqs0 = 0x00000030, ++ .dram_sdqs1 = 0x00000030, ++ .dram_reset = 0x00000030, ++}; ++ ++static struct mx6_mmdc_calibration mx6_mmcd_calib = { ++ .p0_mpwldectrl0 = 0x00000000, ++ .p0_mpdgctrl0 = 0x41570155, ++ .p0_mprddlctl = 0x4040474A, ++ .p0_mpwrdlctl = 0x40405550, ++}; ++ ++struct mx6_ddr_sysinfo ddr_sysinfo = { ++ .dsize = 0, ++ .cs_density = 20, ++ .ncs = 1, ++ .cs1_mirror = 0, ++ .rtt_wr = 2, ++ .rtt_nom = 1, /* RTT_Nom = RZQ/2 */ ++ .walat = 0, /* Write additional latency */ ++ .ralat = 5, /* Read additional latency */ ++ .mif3_mode = 3, /* Command prediction working mode */ ++ .bi_on = 1, /* Bank interleaving enabled */ ++ .sde_to_rst = 0x10, /* 14 cycles, 200us (JEDEC default) */ ++ .rst_to_cke = 0x23, /* 33 cycles, 500us (JEDEC default) */ ++ .ddr_type = DDR_TYPE_DDR3, ++ .refsel = 0, /* Refresh cycles at 64KHz */ ++ .refr = 1, /* 2 refresh commands per refresh cycle */ ++}; ++ ++static struct mx6_ddr3_cfg mem_ddr = { ++ .mem_speed = 800, ++ .density = 4, ++ .width = 16, ++ .banks = 8, ++ .rowaddr = 15, ++ .coladdr = 10, ++ .pagesz = 2, ++ .trcd = 1375, ++ .trcmin = 4875, ++ .trasmin = 3500, ++}; ++ ++static void ccgr_init(void) ++{ ++ struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; ++ ++ writel(0xFFFFFFFF, &ccm->CCGR0); ++ writel(0xFFFFFFFF, &ccm->CCGR1); ++ writel(0xFFFFFFFF, &ccm->CCGR2); ++ writel(0xFFFFFFFF, &ccm->CCGR3); ++ writel(0xFFFFFFFF, &ccm->CCGR4); ++ writel(0xFFFFFFFF, &ccm->CCGR5); ++ writel(0xFFFFFFFF, &ccm->CCGR6); ++ writel(0xFFFFFFFF, &ccm->CCGR7); ++} ++ ++static void spl_dram_init(void) ++{ ++ unsigned long ram_size; ++ ++ mx6ul_dram_iocfg(mem_ddr.width, &mx6_ddr_ioregs, &mx6_grp_ioregs); ++ mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr); ++ ++ /* ++ * Get actual RAM size, so we can adjust DDR row size for <512M ++ * memories ++ */ ++ ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, SZ_512M); ++ if (ram_size < SZ_512M) { ++ mem_ddr.rowaddr = 14; ++ mx6_dram_cfg(&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr); ++ } ++} ++ ++void litesom_init_f(void) ++{ ++ ccgr_init(); ++ ++ /* setup AIPS and disable watchdog */ ++ arch_cpu_init(); ++ ++#ifdef CONFIG_BOARD_EARLY_INIT_F ++ board_early_init_f(); ++#endif ++ ++ /* setup GP timer */ ++ timer_init(); ++ ++ /* UART clocks enabled and gd valid - init serial console */ ++ preloader_console_init(); ++ ++ /* DDR initialization */ ++ spl_dram_init(); ++} ++#endif +-- +2.10.0 + diff --git a/board/grinn/liteboard/patches/uboot/0002-board-liteboard-Add-support-for-liteBoard.patch b/board/grinn/liteboard/patches/uboot/0002-board-liteboard-Add-support-for-liteBoard.patch new file mode 100644 index 0000000000..85c2df8850 --- /dev/null +++ b/board/grinn/liteboard/patches/uboot/0002-board-liteboard-Add-support-for-liteBoard.patch @@ -0,0 +1,621 @@ +From 31fcf28e63781d2de1bc0f5f2bce1e72cac4961e Mon Sep 17 00:00:00 2001 +From: Marcin Niestroj +Date: Fri, 16 Sep 2016 14:44:27 +0200 +Subject: [PATCH 2/2] board/liteboard: Add support for liteBoard + +liteBoard is a development board which uses liteSOM as its base. + +Hardware specification: + * liteSOM (i.MX6UL, DRAM, eMMC) + * Ethernet PHY (id 0) + * USB host (usb_otg1) + * MicroSD slot (uSDHC1) + +Signed-off-by: Marcin Niestroj +--- + arch/arm/cpu/armv7/mx6/Kconfig | 5 + + board/grinn/liteboard/Kconfig | 12 ++ + board/grinn/liteboard/MAINTAINERS | 6 + + board/grinn/liteboard/Makefile | 6 + + board/grinn/liteboard/README | 31 +++++ + board/grinn/liteboard/board.c | 270 ++++++++++++++++++++++++++++++++++++++ + configs/liteboard_defconfig | 22 ++++ + include/configs/liteboard.h | 174 ++++++++++++++++++++++++ + 8 files changed, 526 insertions(+) + create mode 100644 board/grinn/liteboard/Kconfig + create mode 100644 board/grinn/liteboard/MAINTAINERS + create mode 100644 board/grinn/liteboard/Makefile + create mode 100644 board/grinn/liteboard/README + create mode 100644 board/grinn/liteboard/board.c + create mode 100644 configs/liteboard_defconfig + create mode 100644 include/configs/liteboard.h + +diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig +index 4214ab5..e24d0a1 100644 +--- a/arch/arm/cpu/armv7/mx6/Kconfig ++++ b/arch/arm/cpu/armv7/mx6/Kconfig +@@ -144,6 +144,10 @@ config TARGET_PICO_IMX6UL + bool "PICO-IMX6UL-EMMC" + select MX6UL + ++config TARGET_LITEBOARD ++ bool "Grinn liteBoard (i.MX6UL)" ++ select LITESOM ++ + config TARGET_PLATINUM_PICON + bool "platinum-picon" + select SUPPORT_SPL +@@ -222,6 +226,7 @@ source "board/freescale/mx6slevk/Kconfig" + source "board/freescale/mx6sxsabresd/Kconfig" + source "board/freescale/mx6sxsabreauto/Kconfig" + source "board/freescale/mx6ul_14x14_evk/Kconfig" ++source "board/grinn/liteboard/Kconfig" + source "board/phytec/pcm058/Kconfig" + source "board/gateworks/gw_ventana/Kconfig" + source "board/kosagi/novena/Kconfig" +diff --git a/board/grinn/liteboard/Kconfig b/board/grinn/liteboard/Kconfig +new file mode 100644 +index 0000000..e035872 +--- /dev/null ++++ b/board/grinn/liteboard/Kconfig +@@ -0,0 +1,12 @@ ++if TARGET_LITEBOARD ++ ++config SYS_BOARD ++ default "liteboard" ++ ++config SYS_VENDOR ++ default "grinn" ++ ++config SYS_CONFIG_NAME ++ default "liteboard" ++ ++endif +diff --git a/board/grinn/liteboard/MAINTAINERS b/board/grinn/liteboard/MAINTAINERS +new file mode 100644 +index 0000000..b4474f1 +--- /dev/null ++++ b/board/grinn/liteboard/MAINTAINERS +@@ -0,0 +1,6 @@ ++LITEBOARD ++M: Marcin Niestroj ++S: Maintained ++F: board/grinn/liteboard/ ++F: include/configs/liteboard.h ++F: configs/liteboard_defconfig +diff --git a/board/grinn/liteboard/Makefile b/board/grinn/liteboard/Makefile +new file mode 100644 +index 0000000..e2492d6 +--- /dev/null ++++ b/board/grinn/liteboard/Makefile +@@ -0,0 +1,6 @@ ++# (C) Copyright 2016 Grinn ++# ++# SPDX-License-Identifier: GPL-2.0+ ++# ++ ++obj-y := board.o +diff --git a/board/grinn/liteboard/README b/board/grinn/liteboard/README +new file mode 100644 +index 0000000..bee0394 +--- /dev/null ++++ b/board/grinn/liteboard/README +@@ -0,0 +1,31 @@ ++How to use U-Boot on Grinn's liteBoard ++-------------------------------------- ++ ++- Build U-Boot for liteBoard: ++ ++$ make mrproper ++$ make liteboard_defconfig ++$ make ++ ++This will generate the SPL image called SPL and the u-boot.img. ++ ++- Flash the SPL image into the micro SD card: ++ ++sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync ++ ++- Flash the u-boot.img image into the micro SD card: ++ ++sudo dd if=u-boot.img of=/dev/mmcblk0 bs=1k seek=69; sync ++ ++- Jumper settings: ++ ++S1: 0 1 0 1 1 1 ++ ++where 0 means bottom position and 1 means top position (from the ++switch label numbers reference). ++ ++- Insert the micro SD card in the board. ++ ++- Connect USB cable between liteBoard and the PC for the power and console. ++ ++- U-Boot messages should come up. +diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c +new file mode 100644 +index 0000000..89d525a +--- /dev/null ++++ b/board/grinn/liteboard/board.c +@@ -0,0 +1,270 @@ ++/* ++ * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. ++ * Copyright (C) 2016 Grinn ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++DECLARE_GLOBAL_DATA_PTR; ++ ++#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ ++ PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ ++ PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) ++ ++#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ ++ PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ ++ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) ++ ++#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \ ++ PAD_CTL_SPEED_HIGH | \ ++ PAD_CTL_DSE_48ohm | PAD_CTL_SRE_FAST) ++ ++#define MDIO_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \ ++ PAD_CTL_DSE_48ohm | PAD_CTL_SRE_FAST | PAD_CTL_ODE) ++ ++#define ENET_CLK_PAD_CTRL (PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) ++ ++static iomux_v3_cfg_t const uart1_pads[] = { ++ MX6_PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), ++ MX6_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), ++}; ++ ++static iomux_v3_cfg_t const sd_pads[] = { ++ MX6_PAD_SD1_CLK__USDHC1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD1_CMD__USDHC1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD1_DATA0__USDHC1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD1_DATA1__USDHC1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD1_DATA2__USDHC1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD1_DATA3__USDHC1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ ++ /* CD */ ++ MX6_PAD_UART1_RTS_B__GPIO1_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL), ++}; ++ ++#ifdef CONFIG_FEC_MXC ++static iomux_v3_cfg_t const fec1_pads[] = { ++ MX6_PAD_GPIO1_IO06__ENET1_MDIO | MUX_PAD_CTRL(MDIO_PAD_CTRL), ++ MX6_PAD_GPIO1_IO07__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_ENET1_TX_EN__ENET1_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL), ++ MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_ENET1_RX_ER__ENET1_RX_ER | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_ENET1_RX_EN__ENET1_RX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL), ++}; ++ ++static void setup_iomux_fec(void) ++{ ++ imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads)); ++} ++#endif ++ ++static void setup_iomux_uart(void) ++{ ++ imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); ++} ++ ++#ifdef CONFIG_FSL_ESDHC ++static struct fsl_esdhc_cfg sd_cfg = {USDHC1_BASE_ADDR, 0, 4}; ++ ++#define SD_CD_GPIO IMX_GPIO_NR(1, 19) ++ ++static int mmc_get_env_devno(void) ++{ ++ u32 soc_sbmr = readl(SRC_BASE_ADDR + 0x4); ++ int dev_no; ++ u32 bootsel; ++ ++ bootsel = (soc_sbmr & 0x000000FF) >> 6; ++ ++ /* If not boot from sd/mmc, use default value */ ++ if (bootsel != 1) ++ return CONFIG_SYS_MMC_ENV_DEV; ++ ++ /* BOOT_CFG2[3] and BOOT_CFG2[4] */ ++ dev_no = (soc_sbmr & 0x00001800) >> 11; ++ ++ return dev_no; ++} ++ ++int board_mmc_getcd(struct mmc *mmc) ++{ ++ struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; ++ int ret = 0; ++ ++ switch (cfg->esdhc_base) { ++ case USDHC1_BASE_ADDR: ++ ret = !gpio_get_value(SD_CD_GPIO); ++ break; ++ case USDHC2_BASE_ADDR: ++ ret = 1; ++ break; ++ } ++ ++ return ret; ++} ++ ++int board_mmc_init(bd_t *bis) ++{ ++ int ret; ++ ++ /* SD */ ++ imx_iomux_v3_setup_multiple_pads(sd_pads, ARRAY_SIZE(sd_pads)); ++ gpio_direction_input(SD_CD_GPIO); ++ sd_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); ++ ++ ret = fsl_esdhc_initialize(bis, &sd_cfg); ++ if (ret) { ++ printf("Warning: failed to initialize mmc dev 0 (SD)\n"); ++ return ret; ++ } ++ ++ return litesom_mmc_init(bis); ++} ++ ++static int check_mmc_autodetect(void) ++{ ++ char *autodetect_str = getenv("mmcautodetect"); ++ ++ if ((autodetect_str != NULL) && ++ (strcmp(autodetect_str, "yes") == 0)) { ++ return 1; ++ } ++ ++ return 0; ++} ++ ++void board_late_mmc_init(void) ++{ ++ char cmd[32]; ++ char mmcblk[32]; ++ u32 dev_no = mmc_get_env_devno(); ++ ++ if (!check_mmc_autodetect()) ++ return; ++ ++ setenv_ulong("mmcdev", dev_no); ++ ++ /* Set mmcblk env */ ++ sprintf(mmcblk, "/dev/mmcblk%dp2 rootwait rw", ++ dev_no); ++ setenv("mmcroot", mmcblk); ++ ++ sprintf(cmd, "mmc dev %d", dev_no); ++ run_command(cmd, 0); ++} ++#endif ++ ++#ifdef CONFIG_FEC_MXC ++int board_eth_init(bd_t *bis) ++{ ++ setup_iomux_fec(); ++ ++ return fecmxc_initialize(bis); ++} ++ ++static int setup_fec(void) ++{ ++ struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; ++ int ret; ++ ++ /* Use 50M anatop loopback REF_CLK1 for ENET1, clear gpr1[13], ++ set gpr1[17]*/ ++ clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC1_MASK, ++ IOMUX_GPR1_FEC1_CLOCK_MUX1_SEL_MASK); ++ ++ ret = enable_fec_anatop_clock(0, ENET_50MHZ); ++ if (ret) ++ return ret; ++ ++ enable_enet_clk(1); ++ ++ return 0; ++} ++#endif ++ ++#ifdef CONFIG_USB_EHCI_MX6 ++int board_usb_phy_mode(int port) ++{ ++ return USB_INIT_HOST; ++} ++#endif ++ ++int board_early_init_f(void) ++{ ++ setup_iomux_uart(); ++ ++ return 0; ++} ++ ++int board_init(void) ++{ ++ /* Address of boot parameters */ ++ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; ++ ++#ifdef CONFIG_FEC_MXC ++ setup_fec(); ++#endif ++ ++ return 0; ++} ++ ++#ifdef CONFIG_CMD_BMODE ++static const struct boot_mode board_boot_modes[] = { ++ /* 4 bit bus width */ ++ {"sd", MAKE_CFGVAL(0x42, 0x20, 0x00, 0x00)}, ++ {"emmc", MAKE_CFGVAL(0x40, 0x28, 0x00, 0x00)}, ++ {NULL, 0}, ++}; ++#endif ++ ++int board_late_init(void) ++{ ++#ifdef CONFIG_CMD_BMODE ++ add_board_boot_modes(board_boot_modes); ++#endif ++ ++#ifdef CONFIG_ENV_IS_IN_MMC ++ board_late_mmc_init(); ++#endif ++ ++ return 0; ++} ++ ++int checkboard(void) ++{ ++ puts("Board: Grinn liteBoard\n"); ++ ++ return 0; ++} ++ ++#ifdef CONFIG_SPL_BUILD ++void board_init_f(ulong dummy) ++{ ++ litesom_init_f(); ++} ++#endif +diff --git a/configs/liteboard_defconfig b/configs/liteboard_defconfig +new file mode 100644 +index 0000000..f853461 +--- /dev/null ++++ b/configs/liteboard_defconfig +@@ -0,0 +1,22 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_MX6=y ++CONFIG_TARGET_LITEBOARD=y ++CONFIG_SPL=y ++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg" ++CONFIG_BOOTDELAY=1 ++CONFIG_HUSH_PARSER=y ++CONFIG_CMD_BOOTZ=y ++# CONFIG_CMD_IMLS is not set ++CONFIG_CMD_MEMTEST=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_PING=y ++CONFIG_CMD_CACHE=y ++CONFIG_CMD_EXT2=y ++CONFIG_CMD_EXT4=y ++CONFIG_CMD_EXT4_WRITE=y ++CONFIG_CMD_FAT=y ++CONFIG_CMD_FS_GENERIC=y ++CONFIG_OF_LIBFDT=y +diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h +new file mode 100644 +index 0000000..19b961f +--- /dev/null ++++ b/include/configs/liteboard.h +@@ -0,0 +1,174 @@ ++/* ++ * Copyright (C) 2015 Freescale Semiconductor, Inc. ++ * Copyright (C) 2016 Grinn ++ * ++ * Configuration settings for the Grinn liteBoard (i.MX6UL). ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++#ifndef __LITEBOARD_CONFIG_H ++#define __LITEBOARD_CONFIG_H ++ ++#include ++#include ++#include "mx6_common.h" ++ ++/* SPL options */ ++#define CONFIG_SPL_LIBCOMMON_SUPPORT ++#define CONFIG_SPL_MMC_SUPPORT ++#include "imx6_spl.h" ++ ++/* Size of malloc() pool */ ++#define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) ++ ++#define CONFIG_BOARD_EARLY_INIT_F ++#define CONFIG_BOARD_LATE_INIT ++ ++#define CONFIG_MXC_UART ++#define CONFIG_MXC_UART_BASE UART1_BASE ++ ++/* MMC Configs */ ++#ifdef CONFIG_FSL_USDHC ++#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR ++#endif ++ ++#define CONFIG_DEFAULT_FDT_FILE "imx6ul-liteboard.dtb" ++ ++#define CONFIG_SYS_MMC_IMG_LOAD_PART 1 ++ ++#define CONFIG_EXTRA_ENV_SETTINGS \ ++ "script=boot.scr\0" \ ++ "image=zImage\0" \ ++ "console=ttymxc0\0" \ ++ "fdt_high=0xffffffff\0" \ ++ "initrd_high=0xffffffff\0" \ ++ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ ++ "fdt_addr=0x83000000\0" \ ++ "boot_fdt=try\0" \ ++ "ip_dyn=yes\0" \ ++ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ ++ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ ++ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ ++ "mmcautodetect=yes\0" \ ++ "mmcargs=setenv bootargs console=${console},${baudrate} " \ ++ "root=${mmcroot}\0" \ ++ "loadbootscript=" \ ++ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ ++ "bootscript=echo Running bootscript from mmc ...; " \ ++ "source\0" \ ++ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "mmcboot=echo Booting from mmc ...; " \ ++ "run mmcargs; " \ ++ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ ++ "if run loadfdt; then " \ ++ "bootz ${loadaddr} - ${fdt_addr}; " \ ++ "else " \ ++ "if test ${boot_fdt} = try; then " \ ++ "bootz; " \ ++ "else " \ ++ "echo WARN: Cannot load the DT; " \ ++ "fi; " \ ++ "fi; " \ ++ "else " \ ++ "bootz; " \ ++ "fi;\0" \ ++ "netargs=setenv bootargs console=${console},${baudrate} " \ ++ "root=/dev/nfs " \ ++ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ ++ "netboot=echo Booting from net ...; " \ ++ "run netargs; " \ ++ "if test ${ip_dyn} = yes; then " \ ++ "setenv get_cmd dhcp; " \ ++ "else " \ ++ "setenv get_cmd tftp; " \ ++ "fi; " \ ++ "${get_cmd} ${image}; " \ ++ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "bootz ${loadaddr} - ${fdt_addr}; " \ ++ "else " \ ++ "if test ${boot_fdt} = try; then " \ ++ "bootz; " \ ++ "else " \ ++ "echo WARN: Cannot load the DT; " \ ++ "fi; " \ ++ "fi; " \ ++ "else " \ ++ "bootz; " \ ++ "fi;\0" ++ ++#define CONFIG_BOOTCOMMAND \ ++ "mmc dev ${mmcdev};" \ ++ "if mmc rescan; then " \ ++ "if run loadbootscript; then " \ ++ "run bootscript; " \ ++ "else " \ ++ "if run loadimage; then " \ ++ "run mmcboot; " \ ++ "else run netboot; " \ ++ "fi; " \ ++ "fi; " \ ++ "else run netboot; fi" ++ ++/* Miscellaneous configurable options */ ++#define CONFIG_SYS_MEMTEST_START 0x80000000 ++#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_128M) ++ ++#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR ++#define CONFIG_SYS_HZ 1000 ++ ++#define CONFIG_CMDLINE_EDITING ++#define CONFIG_STACKSIZE SZ_128K ++ ++/* Physical Memory Map */ ++#define CONFIG_NR_DRAM_BANKS 1 ++#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR ++ ++#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM ++#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR ++#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE ++ ++#define CONFIG_SYS_INIT_SP_OFFSET \ ++ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) ++#define CONFIG_SYS_INIT_SP_ADDR \ ++ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) ++ ++/* FLASH and environment organization */ ++#define CONFIG_ENV_SIZE SZ_8K ++#define CONFIG_ENV_IS_IN_MMC ++#define CONFIG_ENV_OFFSET (8 * SZ_64K) ++#define CONFIG_SYS_MMC_ENV_DEV 0 ++#define CONFIG_SYS_MMC_ENV_PART 0 ++#define CONFIG_MMCROOT "/dev/mmcblk0p2" ++ ++#define CONFIG_CMD_BMODE ++ ++/* USB Configs */ ++#ifdef CONFIG_CMD_USB ++#define CONFIG_USB_EHCI ++#define CONFIG_USB_EHCI_MX6 ++#define CONFIG_USB_STORAGE ++#define CONFIG_EHCI_HCD_INIT_AFTER_RESET ++#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) ++#define CONFIG_MXC_USB_FLAGS 0 ++#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 ++#endif ++ ++#ifdef CONFIG_CMD_NET ++#define CONFIG_FEC_MXC ++#define CONFIG_MII ++#define CONFIG_FEC_ENET_DEV 0 ++ ++#define IMX_FEC_BASE ENET_BASE_ADDR ++#define CONFIG_FEC_MXC_PHYADDR 0x0 ++#define CONFIG_FEC_XCV_TYPE RMII ++#define CONFIG_ETHPRIME "FEC" ++ ++#define CONFIG_PHYLIB ++#define CONFIG_PHY_SMSC ++#endif ++ ++#define CONFIG_IMX_THERMAL ++ ++#endif +-- +2.10.0 + diff --git a/board/grinn/liteboard/post-image.sh b/board/grinn/liteboard/post-image.sh new file mode 100755 index 0000000000..1a076eecb8 --- /dev/null +++ b/board/grinn/liteboard/post-image.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/grinn/liteboard/readme.txt b/board/grinn/liteboard/readme.txt new file mode 100644 index 0000000000..fe1386a0b9 --- /dev/null +++ b/board/grinn/liteboard/readme.txt @@ -0,0 +1,45 @@ +********* +liteBoard +********* + +Build +===== + +First, configure Buildroot for your liteBoard: + + make grinn_liteboard_defconfig + +Build image: + + make + +After building you should get a tree like this: + + output/images/ + ├── boot.vfat + ├── imx6ul-liteboard.dtb + ├── rootfs.ext2 + ├── rootfs.ext4 + ├── rootfs.tar + ├── sdcard.img + ├── u-boot.imx + └── zImage + +Create a bootable microSD card +============================== + +Buildroot prepares a bootable microSD card image "sdcard.img" in output/images/ +directory, To flash SD card just run the following command: + + sudo dd if=output/images/sdcard.img of=/dev/ bs=1M + +where can be sdX or mmcblkX + +*** WARNING! This will destroy all contents of device you specify! *** + +Boot liteBoard +============== + +- insert the microSD card in the microSD slot of the board; +- plug micro USB cable to provide power and console interface +- use terminal emulator with 115200 bps, 8n1 diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig new file mode 100644 index 0000000000..5edb375c6d --- /dev/null +++ b/configs/grinn_liteboard_defconfig @@ -0,0 +1,26 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_GLOBAL_PATCH_DIR="board/grinn/liteboard/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/liteboard/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard" +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 4ac77e653c30853348df57fb096e1ef2c3496d78 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Thu, 6 Oct 2016 09:20:11 +0200 Subject: [PATCH 0546/3392] package/Config.in: fix alphabetical order Signed-off-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- package/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index ef82b2e65a..c3bcf73544 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1461,8 +1461,8 @@ menu "Networking applications" source "package/fmc/Config.in" source "package/fping/Config.in" source "package/freeswitch/Config.in" - source "package/gupnp-tools/Config.in" source "package/gesftpserver/Config.in" + source "package/gupnp-tools/Config.in" source "package/gutenprint/Config.in" source "package/hans/Config.in" source "package/hiawatha/Config.in" From 6f162f27edf45a99bedd1c15eeb4d947b9e51f57 Mon Sep 17 00:00:00 2001 From: daggs Date: Thu, 6 Oct 2016 14:14:59 +0300 Subject: [PATCH 0547/3392] config/odroidc2: force usage of gcc 4.9.x due to an issue with odroid's u-boot, compiling u-boot with gcc 5.x will result in a non booting image. so a gcc 4.9.x compiler must be used. this solve bug #9326 thanks to Erico Nunes for pointing to the right issue. Reported-by: Signed-off-by: Dagg Stompler Signed-off-by: Peter Korsgaard --- configs/odroidc2_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig index 45ede629c7..0c8ff3d3c5 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -7,6 +7,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/hardkernel/odroidc2/post-image.sh" BR2_PACKAGE_ODROID_SCRIPTS=y +BR2_GCC_VERSION_4_9_X=y # Kernel BR2_KERNEL_HEADERS_VERSION=y From bc9620a76be9e40fe2e6a9b679eb04822bd843c8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 06:52:37 +0200 Subject: [PATCH 0548/3392] package/python-pysnmp-apps: fix LICENSE_FILES Fixes http://autobuild.buildroot.net/results/4dd/4dd3a5c0654179a43b2efba54b5ac3094592d0d3/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/python-pysnmp-apps/python-pysnmp-apps.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pysnmp-apps/python-pysnmp-apps.mk b/package/python-pysnmp-apps/python-pysnmp-apps.mk index a055442d9e..2c831df1ee 100644 --- a/package/python-pysnmp-apps/python-pysnmp-apps.mk +++ b/package/python-pysnmp-apps/python-pysnmp-apps.mk @@ -9,7 +9,7 @@ PYTHON_PYSNMP_APPS_SOURCE = pysnmp-apps-$(PYTHON_PYSNMP_APPS_VERSION).tar.gz PYTHON_PYSNMP_APPS_SITE = https://pypi.python.org/packages/source/p/pysnmp-apps PYTHON_PYSNMP_APPS_SETUP_TYPE = setuptools PYTHON_PYSNMP_APPS_LICENSE = BSD-3c -PYTHON_PYSNMP_APPS_LICENSE_FILES = LICENSE +PYTHON_PYSNMP_APPS_LICENSE_FILES = LICENSE.txt PYTHON_PYSNMP_APPS_DEPENDENCIES = python-pysnmp From 66634ea8fc6e8e5e8c173958d64a9527e2351ded Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Thu, 6 Oct 2016 00:50:49 +0200 Subject: [PATCH 0549/3392] website: add Mind as a sponsor for the ELCE16 meeting Also move Openwide/SMILE down to the past sponsors. This also requires all the row endings to move. Note that I chose to mention Mind twice, once as current sponsor and once as past sponsor. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- docs/website/sponsors.html | 39 ++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index 7a176ee14e..0a4373d408 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -13,19 +13,19 @@
- - + +
- OpenWide/Smile is sponsoring - the Buildroot Summer Camp taking place on July 1-5 2016 in Toulouse, France. OpenWide/Smile is - sponsoring the participation of Romain Naour and paid the food expenses for the meeting participants. + As it did in previous years and at FOSDEM, Mind + is sponsoring the Friday night dinner at the Buildroot + Developers Meeting at ELCE 2016 in Berlin.
- + @@ -36,6 +36,23 @@ various companies, that we would like to thank below.

+
+
+
+
+ + + +
+
+ OpenWide/Smile sponsored + the Buildroot Summer Camp that took place on July 1-5 2016 in Toulouse, France. OpenWide/Smile is + sponsoring the participation of Romain Naour and paid the food expenses for the meeting participants. +
+
+
+
+
@@ -70,7 +87,9 @@
+
+
@@ -86,9 +105,7 @@
-
-
@@ -120,7 +137,9 @@
+
+
@@ -136,9 +155,7 @@
-
-
@@ -169,7 +186,9 @@
+
+
From 83f9b65c5e0f053530bf482a7b722f744bd2ab54 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 6 Oct 2016 21:35:26 +0200 Subject: [PATCH 0550/3392] luarocks: bump to version 2.4.1 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luarocks/luarocks.hash | 2 +- package/luarocks/luarocks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index 27507456bd..c35383a532 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 44381c9128d036247d428531291d1ff9405ae1daa238581d3c15f96d899497c3 luarocks-2.4.0.tar.gz +sha256 e429e0af9764bfd5cb640cac40f9d4ed1023fa17c052dff82ed0a41c05f3dcf9 luarocks-2.4.1.tar.gz diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 4a5ae03c67..64c8d5b948 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 2.4.0 +LUAROCKS_VERSION = 2.4.1 LUAROCKS_SITE = http://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING From 9003254ed4f5d334967fdacee621a8ca90c3d69e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:28 +0200 Subject: [PATCH 0551/3392] package/python-pexpect: bump version to 4.2.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pexpect/python-pexpect.hash | 6 +++--- package/python-pexpect/python-pexpect.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pexpect/python-pexpect.hash b/package/python-pexpect/python-pexpect.hash index 29cf892add..e3836074ec 100644 --- a/package/python-pexpect/python-pexpect.hash +++ b/package/python-pexpect/python-pexpect.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org, sha256 locally computed -md5 056df81e6ca7081f1015b4b147b977b7 pexpect-4.0.1.tar.gz -sha256 232795ebcaaf2e120396dbbaa3a129eda51757eeaae1911558f4ef8ee414fc6c pexpect-4.0.1.tar.gz +# md5 from https://pypi.python.org/pypi/pexpect/json, sha256 locally computed +md5 3694410001a99dff83f0b500a1ca1c95 pexpect-4.2.1.tar.gz +sha256 3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92 pexpect-4.2.1.tar.gz diff --git a/package/python-pexpect/python-pexpect.mk b/package/python-pexpect/python-pexpect.mk index 40a1741f3e..f1f9903946 100644 --- a/package/python-pexpect/python-pexpect.mk +++ b/package/python-pexpect/python-pexpect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PEXPECT_VERSION = 4.0.1 -PYTHON_PEXPECT_SITE = https://pypi.python.org/packages/source/p/pexpect +PYTHON_PEXPECT_VERSION = 4.2.1 PYTHON_PEXPECT_SOURCE = pexpect-$(PYTHON_PEXPECT_VERSION).tar.gz +PYTHON_PEXPECT_SITE = https://pypi.python.org/packages/e8/13/d0b0599099d6cd23663043a2a0bb7c61e58c6ba359b2656e6fb000ef5b98 PYTHON_PEXPECT_LICENSE = ISC PYTHON_PEXPECT_LICENSE_FILES = LICENSE PYTHON_PEXPECT_SETUP_TYPE = distutils From 86812795ea7cfa02278d692fb22501ee075a365a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:29 +0200 Subject: [PATCH 0552/3392] package/python-pillow: bump version to 3.4.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pillow/python-pillow.hash | 7 +++---- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index fa6834ed7b..ed195f6188 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,4 +1,3 @@ -https://pypi.python.org/pypi?:action=show_md5&digest=3bc85204223b52e96ed05c9441507eed -md5 3bc85204223b52e96ed05c9441507eed Pillow-3.3.1.tar.gz -# sha256 locally computed -sha256 3491ca65d9fdba4db094ab3f8e17170425e7dd670e507921a665a1975d1b3df1 Pillow-3.3.1.tar.gz +# md5 from https://pypi.python.org/pypi/pillow/json, sha256 locally computed +md5 1ea45914e8cc375fb385da2555b37267 Pillow-3.4.0.tar.gz +sha256 51027d511f4ab991f628f6f7b9b0fbf18f584ee8a67160410afe3b19685b9d50 Pillow-3.4.0.tar.gz diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 9116e122f3..f06ce8d197 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 3.3.1 +PYTHON_PILLOW_VERSION = 3.4.0 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz -PYTHON_PILLOW_SITE = https://pypi.python.org/packages/7b/32/e6978aed8fba6398c00eec25f12798fb57647a6cef4f85db1567e3d086ef +PYTHON_PILLOW_SITE = https://pypi.python.org/packages/51/1d/6456623ea7e155249c0e82cf92715c42ba1902759d1eeff6ac5c3107e747 PYTHON_PILLOW_LICENSE = PIL Software License PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_SETUP_TYPE = setuptools From 09af710cb70b7414a4332d949e991cb8285d0c27 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:30 +0200 Subject: [PATCH 0553/3392] package/python-pydal: bump version to 16.9 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pydal/python-pydal.hash | 5 +++-- package/python-pydal/python-pydal.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index bb366176b1..ad17c33c02 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 e59c050c4b7656c36351707dfbbae187645d46327e67e42415e15b3bc32d48b3 python-pydal-v15.07.tar.gz +# md5 from https://pypi.python.org/pypi/pydal/json, sha256 locally computed +md5 74c6cc43d5ee57bcffa804c1204030d8 pyDAL-16.9.tar.gz +sha256 e5e18b10df044c4328a5a2fe0400793a8f643fe3526daee8c99103fc5589476e pyDAL-16.9.tar.gz diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index 4c5da419c0..a0e9729d44 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = v15.07 -PYTHON_PYDAL_SITE = $(call github,web2py,pydal,$(PYTHON_PYDAL_VERSION)) +PYTHON_PYDAL_VERSION = 16.9 +PYTHON_PYDAL_SOURCE = pyDAL-$(PYTHON_PYDAL_VERSION).tar.gz +PYTHON_PYDAL_SITE = https://pypi.python.org/packages/31/cb/7537f8d848106e3e4b4063955395a5dc3177c32c2cd2cc0a1938a486d4fa PYTHON_PYDAL_LICENSE = BSD-3c PYTHON_PYDAL_LICENSE_FILES = LICENSE PYTHON_PYDAL_SETUP_TYPE = setuptools From 527c6603df56d283e1a63acbdb869d411546bc6a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:31 +0200 Subject: [PATCH 0554/3392] package/python-pysnmp-mibs: bump version to 0.1.6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pysnmp-mibs/python-pysnmp-mibs.hash | 5 +++-- package/python-pysnmp-mibs/python-pysnmp-mibs.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-pysnmp-mibs/python-pysnmp-mibs.hash b/package/python-pysnmp-mibs/python-pysnmp-mibs.hash index 3253896d12..8deb2e530e 100644 --- a/package/python-pysnmp-mibs/python-pysnmp-mibs.hash +++ b/package/python-pysnmp-mibs/python-pysnmp-mibs.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 a499ef45d942f42ab9e922c7da93efa084a7ec490ba6cad576b64a7d573ec043 pysnmp-mibs-0.1.4.tar.gz +# md5 from https://pypi.python.org/pypi/pysnmp-mibs/json, sha256 locally computed +md5 01845c4595d87d3c3485c0449616cbda pysnmp-mibs-0.1.6.tar.gz +sha256 00fa321ca598e8a14c0ad98702bf10fb5e9d57b7d06bb99dc818fea07683720c pysnmp-mibs-0.1.6.tar.gz diff --git a/package/python-pysnmp-mibs/python-pysnmp-mibs.mk b/package/python-pysnmp-mibs/python-pysnmp-mibs.mk index 21b9673764..a0db763cc6 100644 --- a/package/python-pysnmp-mibs/python-pysnmp-mibs.mk +++ b/package/python-pysnmp-mibs/python-pysnmp-mibs.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_PYSNMP_MIBS_VERSION = 0.1.4 +PYTHON_PYSNMP_MIBS_VERSION = 0.1.6 PYTHON_PYSNMP_MIBS_SOURCE = pysnmp-mibs-$(PYTHON_PYSNMP_MIBS_VERSION).tar.gz -PYTHON_PYSNMP_MIBS_SITE = https://pypi.python.org/packages/source/p/pysnmp-mibs +PYTHON_PYSNMP_MIBS_SITE = https://pypi.python.org/packages/bf/7c/99ab192af934ed5d41ceef92a1b949b41652f29b46241b902ffec55642f4 PYTHON_PYSNMP_MIBS_SETUP_TYPE = setuptools PYTHON_PYSNMP_MIBS_LICENSE = BSD-3c -PYTHON_PYSNMP_MIBS_LICENSE_FILES = LICENSE +PYTHON_PYSNMP_MIBS_LICENSE_FILES = LICENSE.txt PYTHON_PYSNMP_MIBS_DEPENDENCIES = python-pysnmp From cecbee260390e94513281f513100e09decf3597f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:32 +0200 Subject: [PATCH 0555/3392] package/python-pysnmp: bump version to 4.3.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pysnmp/python-pysnmp.hash | 5 +++-- package/python-pysnmp/python-pysnmp.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-pysnmp/python-pysnmp.hash b/package/python-pysnmp/python-pysnmp.hash index c7957a0cc1..b0f0f4962b 100644 --- a/package/python-pysnmp/python-pysnmp.hash +++ b/package/python-pysnmp/python-pysnmp.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 c5d78273f14afc6401b7456f086e7b56baaaa51fa0c39830d159bed611c9d89d pysnmp-4.2.4.tar.gz +# md5 from https://pypi.python.org/pypi/pysnmp/json, sha256 locally computed +md5 9a4d23c4c1edea1c77faed72c469d8e8 pysnmp-4.3.2.tar.gz +sha256 7c2bd81df17aa7dca0057a68e7a32284a72231309a0237d66d5b803b5c118977 pysnmp-4.3.2.tar.gz diff --git a/package/python-pysnmp/python-pysnmp.mk b/package/python-pysnmp/python-pysnmp.mk index 3d0f3b52cd..dff8bdd3ce 100644 --- a/package/python-pysnmp/python-pysnmp.mk +++ b/package/python-pysnmp/python-pysnmp.mk @@ -4,13 +4,13 @@ # ################################################################################ -PYTHON_PYSNMP_VERSION = 4.2.4 +PYTHON_PYSNMP_VERSION = 4.3.2 PYTHON_PYSNMP_SOURCE = pysnmp-$(PYTHON_PYSNMP_VERSION).tar.gz -PYTHON_PYSNMP_SITE = https://pypi.python.org/packages/source/p/pysnmp +PYTHON_PYSNMP_SITE = https://pypi.python.org/packages/9e/77/795fcc9d9a01adcb6175a3bf6532132addb8904922afd7877a9930d89f2f PYTHON_PYSNMP_SETUP_TYPE = setuptools PYTHON_PYSNMP_LICENSE = BSD-3c -PYTHON_PYSNMP_LICENSE_FILES = LICENSE +PYTHON_PYSNMP_LICENSE_FILES = LICENSE.txt PYTHON_PYSNMP_DEPENDENCIES = python-pyasn python-pycrypto From 4cd7ff475dc9eeac145758261d091bb26d96a584 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:33 +0200 Subject: [PATCH 0556/3392] package/python-pytablewriter: bump version to 0.10.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pytablewriter/python-pytablewriter.hash | 7 +++---- package/python-pytablewriter/python-pytablewriter.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-pytablewriter/python-pytablewriter.hash b/package/python-pytablewriter/python-pytablewriter.hash index 9c27aedede..09fb8ffb91 100644 --- a/package/python-pytablewriter/python-pytablewriter.hash +++ b/package/python-pytablewriter/python-pytablewriter.hash @@ -1,4 +1,3 @@ -# md5 from https://pypi.python.org/pypi/pytablewriter/json -md5 7a28e4ddb8b59199e161b7ee9e97e3a3 pytablewriter-0.5.0.tar.gz -# sha256 calculated by scanpypi -sha256 e939adec820e68ed1b7c2eddfba73ce82a88f315aa90c81e04af0229020bfb7c pytablewriter-0.5.0.tar.gz +# md5 from https://pypi.python.org/pypi/pytablewriter/json, sha256 locally computed +md5 1f63f9652c61c0d68f17dac054d2c923 pytablewriter-0.10.2.tar.gz +sha256 9a45c632ffd94878153cb989ada412b7291100005ce40baaf33a3d4bd51708cf pytablewriter-0.10.2.tar.gz diff --git a/package/python-pytablewriter/python-pytablewriter.mk b/package/python-pytablewriter/python-pytablewriter.mk index 1de7a69bc8..bf89d0a947 100644 --- a/package/python-pytablewriter/python-pytablewriter.mk +++ b/package/python-pytablewriter/python-pytablewriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEWRITER_VERSION = 0.5.0 +PYTHON_PYTABLEWRITER_VERSION = 0.10.2 PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz -PYTHON_PYTABLEWRITER_SITE = https://pypi.python.org/packages/c8/01/e4b7f1d83434d268fe6a0aec2d8ad00515de042285e58533090cfd72904d +PYTHON_PYTABLEWRITER_SITE = https://pypi.python.org/packages/eb/4f/ca66fd21db4d9ef81f8bb2012dece42a1f5239295df149a04d955e492fc5 PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools PYTHON_PYTABLEWRITER_LICENSE = MIT PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE From e3d7e801d8b4fec8353638881cc118eddfa4ed28 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:34 +0200 Subject: [PATCH 0557/3392] package/python-pytz: bump version to 2016.7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pytz/python-pytz.hash | 7 +++---- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index 5047a8c539..db362ec02a 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,4 +1,3 @@ -# md5 from https://pypi.python.org/pypi/pytz/json -md5 e56283d61935963157aebc5135206a47 pytz-2016.4.tar.bz2 -# sha256 calculated by scanpypi -sha256 ee7c751544e35a7b7fb5e3fb25a49dade37d51e70a93e5107f10575d7102c311 pytz-2016.4.tar.bz2 +# md5 from https://pypi.python.org/pypi/pytz/json, sha256 locally computed +md5 8d8121d619a43cf0b38a4195de1cb8a5 pytz-2016.7.tar.bz2 +sha256 6eab31709e3a4aea748457707da45e805b650cbb352583805d2417de2a1dd71e pytz-2016.7.tar.bz2 diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index a73c9cfba4..ffcab32910 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2016.4 +PYTHON_PYTZ_VERSION = 2016.7 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.bz2 -PYTHON_PYTZ_SITE = https://pypi.python.org/packages/f4/7d/7c0c85e9c64a75dde11bc9d3e1adc4e09a42ce7cdb873baffa1598118709 +PYTHON_PYTZ_SITE = https://pypi.python.org/packages/53/35/6376f58fb82ce69e2c113ca0ebe5c0f69b20f006e184bcc238a6007f4bdb PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From f338578aa28f4aff461e0e865c559e16d48af0f7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:36 +0200 Subject: [PATCH 0558/3392] package/python-pyxb: bump version to 1.2.5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-pyxb/python-pyxb.hash | 5 +++-- package/python-pyxb/python-pyxb.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/python-pyxb/python-pyxb.hash b/package/python-pyxb/python-pyxb.hash index d8b43f8c45..9aa50fc76e 100644 --- a/package/python-pyxb/python-pyxb.hash +++ b/package/python-pyxb/python-pyxb.hash @@ -1,2 +1,3 @@ -# Locally computed: -sha256 14ced19ecce51e7cd26434446f9bd6b4e309e91806f1f6fc5e21f4ac736aa0de python-pyxb-1.2.4.tar.gz +# md5 from https://pypi.python.org/pypi/pyxb/json, sha256 locally computed +md5 197c462ab8427ea197313ca3776b252a PyXB-1.2.5.tar.gz +sha256 4e8f62ee2cfffc37e4f40634ab9c79e0311cfaf28cf4ce5e7f4828ec56e4ff67 PyXB-1.2.5.tar.gz diff --git a/package/python-pyxb/python-pyxb.mk b/package/python-pyxb/python-pyxb.mk index eb9ffcebb2..d0b2da5461 100644 --- a/package/python-pyxb/python-pyxb.mk +++ b/package/python-pyxb/python-pyxb.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_PYXB_VERSION = 1.2.4 -PYTHON_PYXB_SITE = $(call github,pabigot,pyxb,PyXB-$(PYTHON_PYXB_VERSION)) +PYTHON_PYXB_VERSION = 1.2.5 +PYTHON_PYXB_SOURCE = PyXB-$(PYTHON_PYXB_VERSION).tar.gz +PYTHON_PYXB_SITE = https://pypi.python.org/packages/43/7a/9d40392e4380463f37bf5aa2851dfd8ba7c0e4d2a9dc2355177b8b785794 PYTHON_PYXB_LICENSE = Apache-2.0 PYTHON_PYXB_LICENSE_FILES = LICENSE PYTHON_PYXB_SETUP_TYPE = distutils From 43a60215f2aec9a7024bd5e2e790e721e96c005e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:37 +0200 Subject: [PATCH 0559/3392] package/python-rpi-gpio: bump version to 0.6.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-rpi-gpio/python-rpi-gpio.hash | 6 +++--- package/python-rpi-gpio/python-rpi-gpio.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) mode change 100755 => 100644 package/python-rpi-gpio/python-rpi-gpio.hash mode change 100755 => 100644 package/python-rpi-gpio/python-rpi-gpio.mk diff --git a/package/python-rpi-gpio/python-rpi-gpio.hash b/package/python-rpi-gpio/python-rpi-gpio.hash old mode 100755 new mode 100644 index 8b498f1f13..a502972c35 --- a/package/python-rpi-gpio/python-rpi-gpio.hash +++ b/package/python-rpi-gpio/python-rpi-gpio.hash @@ -1,3 +1,3 @@ -# md5sum from http://sourceforge.net/projects/raspberry-gpio-python/files/, sha256 calculated locally -md5 254d0443a436eb241367c487274e7197 RPi.GPIO-0.6.1.tar.gz -sha256 54e5fb06d9ea1a1389a497fb5a06dfa950c86303b0f4ba89b68c55999d1df064 RPi.GPIO-0.6.1.tar.gz +# md5 from https://pypi.python.org/pypi/rpi-gpio/json, sha256 locally computed +md5 9db86fd5f3bae872de9dbb068ee0b096 RPi.GPIO-0.6.2.tar.gz +sha256 82acff0ef6bbe3cdf6f4dbdd73d96add5294bb94baf7f51c1d901861af3c2392 RPi.GPIO-0.6.2.tar.gz diff --git a/package/python-rpi-gpio/python-rpi-gpio.mk b/package/python-rpi-gpio/python-rpi-gpio.mk old mode 100755 new mode 100644 index 106b8dd153..8f02d160e5 --- a/package/python-rpi-gpio/python-rpi-gpio.mk +++ b/package/python-rpi-gpio/python-rpi-gpio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPI_GPIO_VERSION = 0.6.1 +PYTHON_RPI_GPIO_VERSION = 0.6.2 PYTHON_RPI_GPIO_SOURCE = RPi.GPIO-$(PYTHON_RPI_GPIO_VERSION).tar.gz -PYTHON_RPI_GPIO_SITE = http://sourceforge.net/projects/raspberry-gpio-python/files +PYTHON_RPI_GPIO_SITE = https://pypi.python.org/packages/c1/a8/de92cf6d04376f541ce250de420f4fe7cbb2b32a7128929a600bc89aede5 PYTHON_RPI_GPIO_LICENSE = MIT PYTHON_RPI_GPIO_LICENSE_FILES = LICENCE.txt PYTHON_RPI_GPIO_SETUP_TYPE = distutils From e57ea511ee8f4e944bc6343b467386fff20acd37 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:38 +0200 Subject: [PATCH 0560/3392] package/python-rtslib-fb: bump version to 2.1.58 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-rtslib-fb/python-rtslib-fb.hash | 5 +++-- package/python-rtslib-fb/python-rtslib-fb.mk | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-rtslib-fb/python-rtslib-fb.hash b/package/python-rtslib-fb/python-rtslib-fb.hash index fd0618581e..e4e56e7719 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 d5d81a78046b4c228d29ba88d9950e0f63858e5fcf601e3d0f8bf107fbaadc03 python-rtslib-fb-v2.1.fb57.tar.gz +# md5 from https://pypi.python.org/pypi/rtslib-fb/json, sha256 locally computed +md5 f8a2c55cea6de95968fc0dd49beeef6f rtslib-fb-2.1.58.tar.gz +sha256 5806f9903557907787abd9c8b9dffb2b312e6c5e3ff40d50d26b10c37b118d47 rtslib-fb-2.1.58.tar.gz diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index 85bee0ba75..f0864a06a4 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -4,10 +4,11 @@ # ################################################################################ -PYTHON_RTSLIB_FB_VERSION = v2.1.fb57 -PYTHON_RTSLIB_FB_SITE = $(call github,agrover,rtslib-fb,$(PYTHON_RTSLIB_FB_VERSION)) +PYTHON_RTSLIB_FB_VERSION = 2.1.58 +PYTHON_RTSLIB_FB_SOURCE = rtslib-fb-$(PYTHON_RTSLIB_FB_VERSION).tar.gz +PYTHON_RTSLIB_FB_SITE = https://pypi.python.org/packages/c8/26/ae0ff9a721d046bef78c457d8fc19287f7dbe36f98f5e190b017f0d9e9b7 PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 -PYTHON_RTSLIB_FB_LICENSE_FILES = COPYING +PYTHON_RTSLIB_FB_LICENSE_FILES = setup.py PYTHON_RTSLIB_FB_SETUP_TYPE = setuptools PYTHON_RTSLIB_FB_DEPENDENCIES = python-six From f3001aeef5f3888239fe1047d0b5a3917dfdf0d5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:39 +0200 Subject: [PATCH 0561/3392] package/python-simplejson: bump version to 3.8.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-simplejson/python-simplejson.hash | 5 +++-- package/python-simplejson/python-simplejson.mk | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index c0f33b23e9..19421b8633 100644 --- a/package/python-simplejson/python-simplejson.hash +++ b/package/python-simplejson/python-simplejson.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 a80dc90320e1c1b8eaceaaa755ae2aed382d64a59321ae9f6ddbe0321c02878a simplejson-3.5.3.tar.gz +# md5 from https://pypi.python.org/pypi/simplejson/json, sha256 locally computed +md5 53b1371bbf883b129a12d594a97e9a18 simplejson-3.8.2.tar.gz +sha256 d58439c548433adcda98e695be53e526ba940a4b9c44fb9a05d92cd495cdd47f simplejson-3.8.2.tar.gz diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk index 61283b717d..703bca22d6 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.5.3 +PYTHON_SIMPLEJSON_VERSION = 3.8.2 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = http://pypi.python.org/packages/source/s/simplejson -PYTHON_SIMPLEJSON_LICENSE = MIT +PYTHON_SIMPLEJSON_SITE = https://pypi.python.org/packages/f0/07/26b519e6ebb03c2a74989f7571e6ae6b82e9d7d81b8de6fcdbfc643c7b58 +PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt -PYTHON_SIMPLEJSON_SETUP_TYPE = distutils +PYTHON_SIMPLEJSON_SETUP_TYPE = setuptools $(eval $(python-package)) From 010d34b739aa5c47d61356222c5da4762497b747 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:40 +0200 Subject: [PATCH 0562/3392] package/python-spidev: bump version to 3.2 Removed 0001-Fix-build-with-musl-libc.patch, applied upstream: https://github.com/doceme/py-spidev/pull/39/commits/3d6e59bff088783f249a60a5f1c900c7f99f933b Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-Fix-build-with-musl-libc.patch | 43 ------------------- package/python-spidev/python-spidev.hash | 5 ++- package/python-spidev/python-spidev.mk | 4 +- 3 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 package/python-spidev/0001-Fix-build-with-musl-libc.patch diff --git a/package/python-spidev/0001-Fix-build-with-musl-libc.patch b/package/python-spidev/0001-Fix-build-with-musl-libc.patch deleted file mode 100644 index b22a73aa67..0000000000 --- a/package/python-spidev/0001-Fix-build-with-musl-libc.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3d6e59bff088783f249a60a5f1c900c7f99f933b Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 31 Jan 2016 15:03:50 +0100 -Subject: [PATCH 1/1] Fix build with musl libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Include missing header to prevent build error: - -spidev_module.c: In function ‘SpiDev_xfer’: -spidev_module.c:330:27: error: ‘_IOC_SIZEBITS’ undeclared (first use in this function) - status = ioctl(self->fd, SPI_IOC_MESSAGE(1), &xfer); - ^ -spidev_module.c:330:27: note: each undeclared identifier is reported only once for each function it appears in -spidev_module.c: In function ‘SpiDev_xfer2’: -spidev_module.c:421:27: error: ‘_IOC_SIZEBITS’ undeclared (first use in this function) - status = ioctl(self->fd, SPI_IOC_MESSAGE(1), &xfer); - ^ - -Signed-off-by: Bernd Kuhls bernd.kuhls@t-online.de -Signed-off-by: Bernd Kuhls ---- -Patch sent upstream: https://github.com/doceme/py-spidev/pull/39 - - spidev_module.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/spidev_module.c b/spidev_module.c -index d58ef07..bccaacf 100644 ---- a/spidev_module.c -+++ b/spidev_module.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #define SPIDEV_MAXPATH 4096 - --- -2.7.0 - diff --git a/package/python-spidev/python-spidev.hash b/package/python-spidev/python-spidev.hash index 49e8db8a86..dc08925d30 100644 --- a/package/python-spidev/python-spidev.hash +++ b/package/python-spidev/python-spidev.hash @@ -1,2 +1,3 @@ -# Locally calculated -sha256 355391e9ad3024950590626b080324394c12e75bb21923dbd56a978a1eac6ac7 spidev-3.1.tar.gz +# md5 from https://pypi.python.org/pypi/spidev/json, sha256 locally computed +md5 f601676f1bb48b9aa3b3897f95216365 spidev-3.2.tar.gz +sha256 09d2b5122f0dd79910713a11f9a0020f71537224bf829916def4fffc0ea59456 spidev-3.2.tar.gz diff --git a/package/python-spidev/python-spidev.mk b/package/python-spidev/python-spidev.mk index 0a8dd15646..d839bb3f7f 100644 --- a/package/python-spidev/python-spidev.mk +++ b/package/python-spidev/python-spidev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SPIDEV_VERSION = 3.1 +PYTHON_SPIDEV_VERSION = 3.2 PYTHON_SPIDEV_SOURCE = spidev-$(PYTHON_SPIDEV_VERSION).tar.gz -PYTHON_SPIDEV_SITE = https://pypi.python.org/packages/source/s/spidev +PYTHON_SPIDEV_SITE = https://pypi.python.org/packages/36/83/73748b6e1819b57d8e1df8090200195cdae33aaa22a49a91ded16785eedd PYTHON_SPIDEV_SETUP_TYPE = distutils PYTHON_SPIDEV_LICENSE = GPLv2 PYTHON_SPIDEV_LICENSE_FILES = LICENSE.md From 7a89b875ee8880610de77daa389d487fe19dd4e9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:41 +0200 Subject: [PATCH 0563/3392] package/python-thrift: bump version to 0.9.3 PYTHON_THRIFT_SUBDIR is not needed anymore. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-thrift/python-thrift.hash | 5 +++-- package/python-thrift/python-thrift.mk | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-thrift/python-thrift.hash b/package/python-thrift/python-thrift.hash index 811aa988e3..72269eb836 100644 --- a/package/python-thrift/python-thrift.hash +++ b/package/python-thrift/python-thrift.hash @@ -1,2 +1,3 @@ -# From https://www.apache.org/dist/thrift/0.9.2/thrift-0.9.2.tar.gz.md5 -md5 89f63cc4d0100912f4a1f8a9dee63678 thrift-0.9.2.tar.gz +# md5 from https://pypi.python.org/pypi/thrift/json, sha256 locally computed +md5 b519551d7a086bb0b4f222a8f566b7e8 thrift-0.9.3.tar.gz +sha256 dfbc3d3bd19d396718dab05abaf46d93ae8005e2df798ef02e32793cd963877e thrift-0.9.3.tar.gz diff --git a/package/python-thrift/python-thrift.mk b/package/python-thrift/python-thrift.mk index 99641b8b4b..d0e3a14685 100644 --- a/package/python-thrift/python-thrift.mk +++ b/package/python-thrift/python-thrift.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_THRIFT_VERSION = 0.9.2 +PYTHON_THRIFT_VERSION = 0.9.3 PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz -PYTHON_THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(PYTHON_THRIFT_VERSION) +PYTHON_THRIFT_SITE = https://pypi.python.org/packages/ae/58/35e3f0cd290039ff862c2c9d8ae8a76896665d70343d833bdc2f748b8e55 PYTHON_THRIFT_LICENSE = Apache-2.0 -PYTHON_THRIFT_LICENSE_FILES = LICENSE +PYTHON_THRIFT_LICENSE_FILES = setup.py PYTHON_THRIFT_SETUP_TYPE = setuptools -PYTHON_THRIFT_SUBDIR = lib/py $(eval $(python-package)) From 2473a312d424b33ae82f3da219332ca49dda5ed2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:42 +0200 Subject: [PATCH 0564/3392] package/python-tornado: bump version to 4.4.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-tornado/python-tornado.hash | 4 ++-- package/python-tornado/python-tornado.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash index 27385a56c2..ee4080fe75 100644 --- a/package/python-tornado/python-tornado.hash +++ b/package/python-tornado/python-tornado.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/tornado/json, sha256 locally computed -md5 fff8a7d7f580b04bacc2ffe7ddf41133 tornado-4.4.1.tar.gz -sha256 371d0cf3d56c47accc66116a77ad558d76eebaa8458a6b677af71ca606522146 tornado-4.4.1.tar.gz +md5 b4816ea209118667ffc52ce9ff06ac85 tornado-4.4.2.tar.gz +sha256 2898f992f898cd41eeb8d53b6df75495f2f423b6672890aadaf196ea1448edcc tornado-4.4.2.tar.gz diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index 98d42b5a1b..e512e60fa1 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 4.4.1 +PYTHON_TORNADO_VERSION = 4.4.2 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://pypi.python.org/packages/96/5d/ff472313e8f337d5acda5d56e6ea79a43583cc8771b34c85a1f458e197c3 +PYTHON_TORNADO_SITE = https://pypi.python.org/packages/1e/7c/ea047f7bbd1ff22a7f69fe55e7561040e3e54d6f31da6267ef9748321f98 PYTHON_TORNADO_LICENSE = Apache-2.0 PYTHON_TORNADO_SETUP_TYPE = setuptools From 20468023e0299d9db5efabe910c3a7c1a3507feb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:43 +0200 Subject: [PATCH 0565/3392] package/python-twisted: bump version to 16.4.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-twisted/python-twisted.hash | 6 +++--- package/python-twisted/python-twisted.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 8836a10c07..c3a6e956dd 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi/Twisted/json, sha256 locally computed. -md5 8b35a88d5f1a4bfd762a008968fddabf Twisted-16.2.0.tar.bz2 -sha256 a090e8dc675e97fb20c3bb5f8114ae94169f4e29fd3b3cbede35705fd3cdbd79 Twisted-16.2.0.tar.bz2 +# md5 from https://pypi.python.org/pypi/twisted/json, sha256 locally computed +md5 c6d09bdd681f538369659111f079c29d Twisted-16.4.1.tar.bz2 +sha256 1d8d73f006c990744effb35588359fd44d43608649ac0b6b7edc71176e88e816 Twisted-16.4.1.tar.bz2 diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 3c45d01cd3..7e9e496c5f 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 16.2.0 +PYTHON_TWISTED_VERSION = 16.4.1 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://pypi.python.org/packages/18/85/eb7af503356e933061bf1220033c3a85bad0dbc5035dfd9a97f1e900dfcb +PYTHON_TWISTED_SITE = https://pypi.python.org/packages/6b/23/8dbe86fc83215015e221fbd861a545c6ec5c9e9cd7514af114d1f64084ab PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE From 46ee7aa8b9be4365c825f29c0e2930d2f0a0effd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:44 +0200 Subject: [PATCH 0566/3392] package/python-urllib3: bump version to 1.18 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-urllib3/python-urllib3.hash | 6 +++--- package/python-urllib3/python-urllib3.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 266b8e9023..fb5fd9dd27 100644 --- a/package/python-urllib3/python-urllib3.hash +++ b/package/python-urllib3/python-urllib3.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=5e1407428ac33b521c71a7ac273b3847, sha256 locally computed -md5 5e1407428ac33b521c71a7ac273b3847 urllib3-1.14.tar.gz -sha256 dd4fb13a4ce50b18338c7e4d665b21fd38632c5d4b1d9f1a1379276bd3c08d37 urllib3-1.14.tar.gz +# md5 from https://pypi.python.org/pypi/urllib3/json, sha256 locally computed +md5 1eadd93bd5e58d3528d977111f2997ea urllib3-1.18.tar.gz +sha256 d30dd4d1cbbc36ebab6e4a2076820cfe0c60f10adf087fecbc5a3edae79fdc81 urllib3-1.18.tar.gz diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index 0101053e9c..9043aa35a6 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.14 +PYTHON_URLLIB3_VERSION = 1.18 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://pypi.python.org/packages/source/u/urllib3 +PYTHON_URLLIB3_SITE = https://pypi.python.org/packages/8f/45/7434a6a44d42744b74fb969a39720f0c3d4f31f921737e51a69d8b15c859 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_SETUP_TYPE = setuptools From 4c36047128895b0fb8746664dddae0fd40b47fe0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:45 +0200 Subject: [PATCH 0567/3392] package/python-werkzeug: bump version to 0.11.11 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-werkzeug/python-werkzeug.hash | 6 +++--- package/python-werkzeug/python-werkzeug.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index e2afd14c88..3f233524bd 100644 --- a/package/python-werkzeug/python-werkzeug.hash +++ b/package/python-werkzeug/python-werkzeug.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=780967186f9157e88f2bfbfa6f07a893, sha256 locally computed -md5 780967186f9157e88f2bfbfa6f07a893 Werkzeug-0.11.10.tar.gz -sha256 cc64dafbacc716cdd42503cf6c44cb5a35576443d82f29f6829e5c49264aeeee Werkzeug-0.11.10.tar.gz +# md5 from https://pypi.python.org/pypi/werkzeug/json, sha256 locally computed +md5 1d34afa1f19abcef4c0da51ebc2c4ea7 Werkzeug-0.11.11.tar.gz +sha256 e72c46bc14405cba7a26bd2ce28df734471bc9016bc8b4cb69466c2c14c2f7e5 Werkzeug-0.11.11.tar.gz diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index c0af65c6f9..072937fc27 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 0.11.10 +PYTHON_WERKZEUG_VERSION = 0.11.11 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://pypi.python.org/packages/b7/7f/44d3cfe5a12ba002b253f6985a4477edfa66da53787a2a838a40f6415263 +PYTHON_WERKZEUG_SITE = https://pypi.python.org/packages/43/2e/d822b4a4216804519ace92e0368dcfc4b0b2887462d852fdd476b253ecc9 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3c PYTHON_WERKZEUG_LICENSE_FILES = LICENSE From 13afb2ab42b328a075038a5e387034e86bb8b2ee Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:46 +0200 Subject: [PATCH 0568/3392] package/python-ws4py: bump version to 0.3.5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-ws4py/python-ws4py.hash | 6 +++--- package/python-ws4py/python-ws4py.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-ws4py/python-ws4py.hash b/package/python-ws4py/python-ws4py.hash index e58e14aaf3..4d5904ee0c 100644 --- a/package/python-ws4py/python-ws4py.hash +++ b/package/python-ws4py/python-ws4py.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=6b47e33cbd13f5c134b04f2a44a480ad, sha256 locally computed -md5 6b47e33cbd13f5c134b04f2a44a480ad ws4py-0.3.4.tar.gz -sha256 85d5c01bb0d031e151a32fad56094caf54e20c2ddb51cf25b5709421ff92d007 ws4py-0.3.4.tar.gz +# md5 from https://pypi.python.org/pypi/ws4py/json, sha256 locally computed +md5 b0cbe30433350ef5ec98e8cbb3c3b39c ws4py-0.3.5.tar.gz +sha256 c4cc4a872027f6a6006a6142a38eb6d65c2ece29a4cefac98dd20a48c34ec7a9 ws4py-0.3.5.tar.gz diff --git a/package/python-ws4py/python-ws4py.mk b/package/python-ws4py/python-ws4py.mk index f332d15078..fac99f328a 100644 --- a/package/python-ws4py/python-ws4py.mk +++ b/package/python-ws4py/python-ws4py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WS4PY_VERSION = 0.3.4 +PYTHON_WS4PY_VERSION = 0.3.5 PYTHON_WS4PY_SOURCE = ws4py-$(PYTHON_WS4PY_VERSION).tar.gz -PYTHON_WS4PY_SITE = https://pypi.python.org/packages/source/w/ws4py +PYTHON_WS4PY_SITE = https://pypi.python.org/packages/c8/b4/1784512791fbd196a48f282ca6c79398cace9541a9c151d89c30b6add6e1 PYTHON_WS4PY_SETUP_TYPE = setuptools PYTHON_WS4PY_LICENSE = BSD-3c PYTHON_WS4PY_LICENSE_FILES = ws4py/__init__.py From 3786abe3ffe264180e0d884b66394e09d862915a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:47 +0200 Subject: [PATCH 0569/3392] package/python-xlsxwriter: bump version to 0.9.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-xlsxwriter/python-xlsxwriter.hash | 7 +++---- package/python-xlsxwriter/python-xlsxwriter.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-xlsxwriter/python-xlsxwriter.hash b/package/python-xlsxwriter/python-xlsxwriter.hash index 69bfc6f7bb..5f1a942beb 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.hash +++ b/package/python-xlsxwriter/python-xlsxwriter.hash @@ -1,4 +1,3 @@ -# md5 from https://pypi.python.org/pypi/XlsxWriter/json -md5 545c938f279abcfd7f11e705012302fe XlsxWriter-0.8.9.tar.gz -# sha256 locally computed -sha256 cb90c5283b88af72549adf82f203d15623a0f4faeae29b6a20733e187dfde882 XlsxWriter-0.8.9.tar.gz +# md5 from https://pypi.python.org/pypi/xlsxwriter/json, sha256 locally computed +md5 9035b1e37a579c554e703404ffcebdd4 XlsxWriter-0.9.3.tar.gz +sha256 19d2b5c0dd4d5fc00e8d7f164795f50e885b20d1cc27a3d04d5c7fec3c4d57f6 XlsxWriter-0.9.3.tar.gz diff --git a/package/python-xlsxwriter/python-xlsxwriter.mk b/package/python-xlsxwriter/python-xlsxwriter.mk index af911cc03a..a44a99b3ac 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.mk +++ b/package/python-xlsxwriter/python-xlsxwriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLSXWRITER_VERSION = 0.8.9 +PYTHON_XLSXWRITER_VERSION = 0.9.3 PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://pypi.python.org/packages/2a/de/4ee20ac103417662865e0e3acde859b002c13f52af0d50a2664d3eca5897 +PYTHON_XLSXWRITER_SITE = https://pypi.python.org/packages/75/46/f1552b4a4d6faa6ec39dc2ddcb56e6b9a2865f07b9e126b2144d9090f056 PYTHON_XLSXWRITER_SETUP_TYPE = setuptools PYTHON_XLSXWRITER_LICENSE = BSD-2c PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt From 0707588e027c612ff8d6ced67845d12d19d4cafb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 21:29:48 +0200 Subject: [PATCH 0570/3392] package/python-zope-interface: bump version to 4.3.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/python-zope-interface/python-zope-interface.hash | 6 +++--- package/python-zope-interface/python-zope-interface.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-zope-interface/python-zope-interface.hash b/package/python-zope-interface/python-zope-interface.hash index 2c161f3766..8558c9a0a7 100644 --- a/package/python-zope-interface/python-zope-interface.hash +++ b/package/python-zope-interface/python-zope-interface.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=9ae3d24c0c7415deb249dd1a132f0f79, sha256 locally computed -md5 9ae3d24c0c7415deb249dd1a132f0f79 zope.interface-4.1.3.tar.gz -sha256 2e221a9eec7ccc58889a278ea13dcfed5ef939d80b07819a9a8b3cb1c681484f zope.interface-4.1.3.tar.gz +# md5 from https://pypi.python.org/pypi/zope-interface/json, sha256 locally computed +md5 5f7e15a5bcdfa3c6c0e93ffe45caf87c zope.interface-4.3.2.tar.gz +sha256 6a0e224a052e3ce27b3a7b1300a24747513f7a507217fcc2a4cb02eb92945cee zope.interface-4.3.2.tar.gz diff --git a/package/python-zope-interface/python-zope-interface.mk b/package/python-zope-interface/python-zope-interface.mk index ac3c230149..7daf5aa092 100644 --- a/package/python-zope-interface/python-zope-interface.mk +++ b/package/python-zope-interface/python-zope-interface.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZOPE_INTERFACE_VERSION = 4.1.3 +PYTHON_ZOPE_INTERFACE_VERSION = 4.3.2 PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz -PYTHON_ZOPE_INTERFACE_SITE = https://pypi.python.org/packages/source/z/zope.interface +PYTHON_ZOPE_INTERFACE_SITE = https://pypi.python.org/packages/38/1b/d55c39f2cf442bd9fb2c59760ed058c84b57d25c680819c25f3aff741e1f PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools PYTHON_ZOPE_INTERFACE_LICENSE = ZPLv2.1 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt From fdbc3a8bbd9818655ab4314d52039ef031be5375 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:30 +0200 Subject: [PATCH 0571/3392] package/x11r7/xkeyboard-config: bump version to 2.19 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 7c2b64d1b2..1869491e7f 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,2 +1,2 @@ -# From https://lists.x.org/archives/xorg-announce/2016-June/002698.html -sha256 c41d917d6c8a59feb7ccbda51c40a6ada824fdd1e9684b52dd48c9530617ddd0 xkeyboard-config-2.18.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-September/002715.html +sha256 83dfd186b9eb9ced69e01d8d8e2f15b6a79b2e30124874ef086f2d3048f45827 xkeyboard-config-2.19.tar.bz2 diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index e96d1d736d..c3d1d8977e 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.18 +XKEYBOARD_CONFIG_VERSION = 2.19 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 13a77e9f16b2fc1e9891b18ec03674b4157460fc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:31 +0200 Subject: [PATCH 0572/3392] package/x11r7/xdriver_xf86-input-libinput: bump version to 0.20.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../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 24f9866a95..103e5154e0 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 https://lists.x.org/archives/xorg-announce/2016-September/002705.html -sha256 c7f1c9406f4af2dc28b6ed3c7cb9fe9d79e9a548c0bba823fbaba20795cd010d xf86-input-libinput-0.19.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-September/002717.html +sha256 c54e8155d0ba0e5abba9de7bb227c4e4930959a01a904de96b6c0e52bb2a39b0 xf86-input-libinput-0.20.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 2a5ad78cfe..c096032726 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.19.1 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.20.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 4b7745a4b40ed7747d6a0c88e67edbe86ad38c6c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:32 +0200 Subject: [PATCH 0573/3392] package/x11r7/xdriver_xf86-input-evdev: bump version to 2.10.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../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 91937f26cf..389356f9f0 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 https://lists.x.org/archives/xorg-announce/2016-June/002696.html -sha256 5aa21ba4be8df927e5676a99c7f4f0343abc089f5451b7e73e39536f29b332a2 xf86-input-evdev-2.10.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002718.html +sha256 bbf6a03fbce1a6c0c7d874eef519fd0a854bf01b515c745d41fa551ce6490cc2 xf86-input-evdev-2.10.4.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 c801323f19..606f1bed25 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.10.3 +XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.10.4 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 274ac0116bca258a009442db3197ef76f66cc13f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:33 +0200 Subject: [PATCH 0574/3392] package/x11r7/xlib_libX11: security bump to 1.6.4 Please see the security advisory for details: https://lists.x.org/archives/xorg-announce/2016-October/002720.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libX11/xlib_libX11.hash | 5 ++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index acae656208..aeb0e9d74a 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,3 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-March/002543.html -sha1 6f2aadf8346ee00b7419bd338461c6986e274733 libX11-1.6.3.tar.bz2 -sha256 cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111 libX11-1.6.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002721.html +sha256 b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441 libX11-1.6.4.tar.bz2 diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index 259592413b..80e89b4830 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.6.3 +XLIB_LIBX11_VERSION = 1.6.4 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBX11_LICENSE = MIT From 255ed433fa0bc315ab2d67cda2634bb7b5780df1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:34 +0200 Subject: [PATCH 0575/3392] package/x11r7/xlib_libXfixes: security bump to 5.0.3 Please see the security advisory for details: https://lists.x.org/archives/xorg-announce/2016-October/002720.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXfixes/xlib_libXfixes.hash | 4 ++-- package/x11r7/xlib_libXfixes/xlib_libXfixes.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash index 00164cdd25..d96e5c6a70 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002227.html -sha256 9bd20edfec084a1bed481d48dd4815dee88139fffad091418cdda081129a9aea libXfixes-5.0.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002722.html +sha256 de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6 libXfixes-5.0.3.tar.bz2 diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk index 82799a3827..b7d835bb30 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFIXES_VERSION = 5.0.2 +XLIB_LIBXFIXES_VERSION = 5.0.3 XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2 XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFIXES_LICENSE = MIT From bd61548a82352aefedee45c745c6034c4c3b75d1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:35 +0200 Subject: [PATCH 0576/3392] package/x11r7/xlib_libXi: security bump to 1.7.7 Please see the security advisory for details: https://lists.x.org/archives/xorg-announce/2016-October/002720.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXi/xlib_libXi.hash | 4 ++-- package/x11r7/xlib_libXi/xlib_libXi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXi/xlib_libXi.hash b/package/x11r7/xlib_libXi/xlib_libXi.hash index 28eb77e115..a11b299721 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.hash +++ b/package/x11r7/xlib_libXi/xlib_libXi.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-December/002664.html -sha256 1f32a552cec0f056c0260bdb32e853cec0673d2f40646ce932ad5a9f0205b7ac libXi-1.7.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002723.html +sha256 996f834fa57b9b33ba36690f6f5c6a29320bc8213022943912462d8015b1e030 libXi-1.7.7.tar.bz2 diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk index 54c9af4576..8dfea0fecd 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXI_VERSION = 1.7.6 +XLIB_LIBXI_VERSION = 1.7.7 XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXI_LICENSE = MIT From 5136df0116d31d03294eb66dbcd2afa58b60e78d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:36 +0200 Subject: [PATCH 0577/3392] package/x11r7/xlib_libXrandr: security bump to 1.5.1 Please see the security advisory for details: https://lists.x.org/archives/xorg-announce/2016-October/002720.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXrandr/xlib_libXrandr.hash | 4 ++-- package/x11r7/xlib_libXrandr/xlib_libXrandr.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash b/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash index e4b86a0120..84a50cb5de 100644 --- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash +++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002606.html -sha256 6f864959b7fc35db11754b270d71106ef5b5cf363426aa58589cb8ac8266de58 libXrandr-1.5.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002724.html +sha256 1ff9e7fa0e4adea912b16a5f0cfa7c1d35b0dcda0e216831f7715c8a3abcf51a libXrandr-1.5.1.tar.bz2 diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk index 5abd8b1d24..0fd298c50d 100644 --- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk +++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXRANDR_VERSION = 1.5.0 +XLIB_LIBXRANDR_VERSION = 1.5.1 XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2 XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXRANDR_LICENSE = MIT From e1c50412877fbda76f3629a6fc10d3084fb15d34 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:37 +0200 Subject: [PATCH 0578/3392] package/x11r7/xlib_libXrender: security bump to 0.9.10 Please see the security advisory for details: https://lists.x.org/archives/xorg-announce/2016-October/002720.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXrender/xlib_libXrender.hash | 4 ++-- package/x11r7/xlib_libXrender/xlib_libXrender.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.hash b/package/x11r7/xlib_libXrender/xlib_libXrender.hash index 2a9912af74..bbc5b898b3 100644 --- a/package/x11r7/xlib_libXrender/xlib_libXrender.hash +++ b/package/x11r7/xlib_libXrender/xlib_libXrender.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002593.html -sha256 fc2fe57980a14092426dffcd1f2d9de0987b9d40adea663bd70d6342c0e9be1a libXrender-0.9.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002725.html +sha256 c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949 libXrender-0.9.10.tar.bz2 diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk index 72626cf98d..6134c45386 100644 --- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk +++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXRENDER_VERSION = 0.9.9 +XLIB_LIBXRENDER_VERSION = 0.9.10 XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2 XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXRENDER_LICENSE = MIT From 46b271ae39b208b89d5803715f35659b5742de9e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:38 +0200 Subject: [PATCH 0579/3392] package/x11r7/xlib_libXtst: security bump to 1.2.3 Please see the security advisory for details: https://lists.x.org/archives/xorg-announce/2016-October/002720.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXtst/xlib_libXtst.hash | 4 ++-- package/x11r7/xlib_libXtst/xlib_libXtst.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.hash b/package/x11r7/xlib_libXtst/xlib_libXtst.hash index 4224121380..7e55a75e27 100644 --- a/package/x11r7/xlib_libXtst/xlib_libXtst.hash +++ b/package/x11r7/xlib_libXtst/xlib_libXtst.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002237.html -sha256 ef0a7ffd577e5f1a25b1663b375679529663a1880151beaa73e9186c8309f6d9 libXtst-1.2.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002726.html +sha256 4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204 libXtst-1.2.3.tar.bz2 diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk index ad3caeafc5..d71290ae40 100644 --- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk +++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXTST_VERSION = 1.2.2 +XLIB_LIBXTST_VERSION = 1.2.3 XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2 XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXTST_LICENSE = MIT From 8cda10e78dd578b71b90b6e6638998cf81fd2950 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:39 +0200 Subject: [PATCH 0580/3392] package/x11r7/xlib_libXv: security bump to 1.0.11 Please see the security advisory for details: https://lists.x.org/archives/xorg-announce/2016-October/002720.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXv/xlib_libXv.hash | 4 ++-- package/x11r7/xlib_libXv/xlib_libXv.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXv/xlib_libXv.hash b/package/x11r7/xlib_libXv/xlib_libXv.hash index 3a54cb3751..4cb26eac71 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.hash +++ b/package/x11r7/xlib_libXv/xlib_libXv.hash @@ -1,2 +1,2 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-September/056012.html -sha256 55fe92f8686ce8612e2c1bfaf58c057715534419da700bda8d517b1d97914525 libXv-1.0.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002727.html +sha256 d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088 libXv-1.0.11.tar.bz2 diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk index ef5c74696f..26f8badc5c 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.mk +++ b/package/x11r7/xlib_libXv/xlib_libXv.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXV_VERSION = 1.0.10 +XLIB_LIBXV_VERSION = 1.0.11 XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2 XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXV_LICENSE = MIT From a4663dcbde492cbd8b901f6161d08ced0fd3a646 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Oct 2016 07:28:40 +0200 Subject: [PATCH 0581/3392] package/x11r7/xlib_libXvMC: security bump to 1.0.10 Please see the security advisory for details: https://lists.x.org/archives/xorg-announce/2016-October/002720.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXvMC/xlib_libXvMC.hash | 5 ++--- package/x11r7/xlib_libXvMC/xlib_libXvMC.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash b/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash index f0fcd2ddf8..380c811989 100644 --- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash +++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash @@ -1,3 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-March/002548.html -sha1 6fc54831734e781b2848b6f7e3bcc4f752665f21 libXvMC-1.0.9.tar.bz2 -sha256 0703d7dff6ffc184f1735ca5d4eb9dbb402b522e08e008f2f96aee16c40a5756 libXvMC-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002728.html +sha256 e501a079b5dfaef0897c56152770c77e05e362065cec58910289aa567277ee2e libXvMC-1.0.10.tar.bz2 diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk index 101c15d2e9..cb39c29f21 100644 --- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk +++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXVMC_VERSION = 1.0.9 +XLIB_LIBXVMC_VERSION = 1.0.10 XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2 XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXVMC_LICENSE = MIT From 7de5b0d2d83bec38ec96ef5917259d9f46df58d4 Mon Sep 17 00:00:00 2001 From: Dagg Stompler Date: Fri, 7 Oct 2016 13:13:50 +0300 Subject: [PATCH 0582/3392] configs/odroidc2: bump kernel to 925e508d37c76848881a8c8f7e9b02abc5731d88 odroidc2's kernel remains based on 3.14. This commit upgrades the kernel to a new commit that is now based on 3.14.79, and contains a number of ODroidC2 related bug fixes and feature additions. Signed-off-by: Dagg Stompler Signed-off-by: Thomas Petazzoni --- configs/odroidc2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig index 0c8ff3d3c5..44fc61a31a 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -16,7 +16,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/hardkernel/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1cb48cebb9d525e524de0ede46710bb29f54d4a6" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="925e508d37c76848881a8c8f7e9b02abc5731d88" BR2_LINUX_KERNEL_DEFCONFIG="odroidc2" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_BUILD_DEFAULT_DTS=y From 77c3feabde2991620b3a26177213aca5863a2fb8 Mon Sep 17 00:00:00 2001 From: Pranit Sirsat Date: Thu, 29 Sep 2016 15:09:58 +0530 Subject: [PATCH 0583/3392] paho-mqtt-c: new package Reviewed-by: Abhimanyu Vishwakarma Reviewed-by: Rahul Bedarkar Signed-off-by: Pranit Tanaji Sirsat [Thomas: use += instead of = for assignments inside conditions.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/paho-mqtt-c/Config.in | 11 +++++++++++ package/paho-mqtt-c/paho-mqtt-c.hash | 2 ++ package/paho-mqtt-c/paho-mqtt-c.mk | 20 ++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 package/paho-mqtt-c/Config.in create mode 100644 package/paho-mqtt-c/paho-mqtt-c.hash create mode 100644 package/paho-mqtt-c/paho-mqtt-c.mk diff --git a/package/Config.in b/package/Config.in index c3bcf73544..dc5fed8e6b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1240,6 +1240,7 @@ menu "Networking" source "package/openpgm/Config.in" source "package/openzwave/Config.in" source "package/ortp/Config.in" + source "package/paho-mqtt-c/Config.in" source "package/qdecoder/Config.in" source "package/qpid-proton/Config.in" source "package/rabbitmq-c/Config.in" diff --git a/package/paho-mqtt-c/Config.in b/package/paho-mqtt-c/Config.in new file mode 100644 index 0000000000..3560d8c08c --- /dev/null +++ b/package/paho-mqtt-c/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PAHO_MQTT_C + bool "paho-mqtt-c" + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS + help + MQTT client C library + + https://eclipse.org/paho/clients/c/ + +comment "paho-mqtt-c needs a toolchain w/ threads and dynamic library support" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/paho-mqtt-c/paho-mqtt-c.hash b/package/paho-mqtt-c/paho-mqtt-c.hash new file mode 100644 index 0000000000..8807d788a3 --- /dev/null +++ b/package/paho-mqtt-c/paho-mqtt-c.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 970b9621efc24251441d386274cd0a90cf6ad52b64031f3c8cb53fdd5526f5f3 paho-mqtt-c-v1.1.0.tar.gz diff --git a/package/paho-mqtt-c/paho-mqtt-c.mk b/package/paho-mqtt-c/paho-mqtt-c.mk new file mode 100644 index 0000000000..7fb3026d93 --- /dev/null +++ b/package/paho-mqtt-c/paho-mqtt-c.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# paho-mqtt-c +# +################################################################################ + +PAHO_MQTT_C_VERSION = v1.1.0 +PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,$(PAHO_MQTT_C_VERSION)) +PAHO_MQTT_C_LICENSE = EPL-1.0 or BSD-3c +PAHO_MQTT_C_LICENSE_FILES = epl-v10 edl-v10 +PAHO_MQTT_C_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +PAHO_MQTT_C_DEPENDENCIES += openssl +PAHO_MQTT_C_CONF_OPTS += -DPAHO_WITH_SSL=TRUE +else +PAHO_MQTT_C_CONF_OPTS += -DPAHO_WITH_SSL=FALSE +endif + +$(eval $(cmake-package)) From 1dbb49c030569aaa9ca562d94dea1f4213274f71 Mon Sep 17 00:00:00 2001 From: Pranit Sirsat Date: Thu, 29 Sep 2016 15:09:59 +0530 Subject: [PATCH 0584/3392] DEVELOPERS: list paho-mqtt-c package under my name Signed-off-by: Pranit Tanaji Sirsat Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 03153385be..6469c7c196 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1185,6 +1185,9 @@ N: Pieterjan Camerlynck F: package/libdvbpsi/ F: package/mraa/ +N: Pranit Sirsat +F: package/paho-mqtt-c/ + N: Qais Yousef F: package/bellagio/ From a9a7a05f39a5cf720822a87c9ac6fa9cf27eaa0e Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Tue, 4 Oct 2016 16:52:22 +0200 Subject: [PATCH 0585/3392] fwts: new package Firmware Test Suite (FWTS) is a test suite that performs sanity checks on firmware. It is intended to identify BIOS and ACPI errors and if appropriate it will try to explain the errors and give advice to help workaround or fix firmware bugs. libfdt (dtc) is an optional dependency as fwts checks for it during configure, but will only disable a few tests (dt_base, dt_sysinfo) if it is not available. This has been build-tested in x86, x86_64 and aarch64 and run-tested in x86_64 and aarch64 with EFI firmware. This package has been limited to x86, x86_64 and aarch64 architectures as it fails to build with linking errors related to ACPI functions when building for other architectures. As it is less likely that this will be used for the other architectures, they are disabled for now. Signed-off-by: Erico Nunes [Thomas: add missing depends on for the Config.in comment, specify the LGPL version in the license information.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + .../fwts/0001-build-do-not-use-Werror.patch | 69 +++++++++++++++++++ package/fwts/Config.in | 27 ++++++++ package/fwts/fwts.hash | 2 + package/fwts/fwts.mk | 16 +++++ 5 files changed, 115 insertions(+) create mode 100644 package/fwts/0001-build-do-not-use-Werror.patch create mode 100644 package/fwts/Config.in create mode 100644 package/fwts/fwts.hash create mode 100644 package/fwts/fwts.mk diff --git a/package/Config.in b/package/Config.in index dc5fed8e6b..2941c45876 100644 --- a/package/Config.in +++ b/package/Config.in @@ -76,6 +76,7 @@ menu "Debugging, profiling and benchmark" source "package/dt/Config.in" source "package/duma/Config.in" source "package/fio/Config.in" + source "package/fwts/Config.in" source "package/gdb/Config.in" source "package/google-breakpad/Config.in" source "package/iozone/Config.in" diff --git a/package/fwts/0001-build-do-not-use-Werror.patch b/package/fwts/0001-build-do-not-use-Werror.patch new file mode 100644 index 0000000000..5246fd62d2 --- /dev/null +++ b/package/fwts/0001-build-do-not-use-Werror.patch @@ -0,0 +1,69 @@ +From db480b9f3e3a5c6c12e9dd04e87c8dff9381b8e7 Mon Sep 17 00:00:00 2001 +From: Erico Nunes +Date: Fri, 12 Aug 2016 23:11:56 +0200 +Subject: [PATCH] fwts: do not use -Werror + +Warnings come and go with various compiler versions, so using -Werror is +prone to cause build failures with various compiler versions, especially +newer versions that introduce new warnings. + +Remove use of -Werror. + +Signed-off-by: Erico Nunes +--- + configure.ac | 2 +- + src/Makefile.am | 2 +- + src/lib/src/Makefile.am | 2 +- + src/utilities/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e3e7512..64034fa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT([fwts],[0.1],[fwts-devel@lists.ubuntu.com]) +- AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) ++ AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AC_CANONICAL_HOST + AC_CONFIG_MACRO_DIR([m4]) +diff --git a/src/Makefile.am b/src/Makefile.am +index bc23e8d..599765d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -14,7 +14,7 @@ AM_CPPFLAGS = \ + `pkg-config --silence-errors --cflags json` \ + `pkg-config --silence-errors --cflags json-c` \ + -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ +- -Wall -Werror -Wextra ++ -Wall -Wextra + + bin_PROGRAMS = fwts + +diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am +index 1b8fd74..163c9ae 100644 +--- a/src/lib/src/Makefile.am ++++ b/src/lib/src/Makefile.am +@@ -6,7 +6,7 @@ AM_CPPFLAGS = \ + `pkg-config --silence-errors --cflags json-c` \ + `pkg-config --cflags glib-2.0 gio-2.0` \ + -DDATAROOTDIR=\"$(datarootdir)\" \ +- -Wall -Werror -Wextra ++ -Wall -Wextra + + pkglib_LTLIBRARIES = libfwts.la + +diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am +index 9a47980..14997df 100644 +--- a/src/utilities/Makefile.am ++++ b/src/utilities/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ ++AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ + `pkg-config --silence-errors --cflags json` \ + `pkg-config --silence-errors --cflags json-c` + +-- +2.7.4 + diff --git a/package/fwts/Config.in b/package/fwts/Config.in new file mode 100644 index 0000000000..37759c61cb --- /dev/null +++ b/package/fwts/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_FWTS + bool "fwts" + depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_JSON_C + help + Firmware Test Suite (FWTS) is a test suite that performs + sanity checks on firmware. It is intended to identify BIOS and + ACPI errors and if appropriate it will try to explain the + errors and give advice to help workaround or fix firmware + bugs. + + dtc (libfdt) is an optional dependency for fdt related tests. + + https://wiki.ubuntu.com/FirmwareTestSuite + +comment "fwts needs a glibc toolchain w/ wchar, threads" + depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash new file mode 100644 index 0000000000..a3e57584f2 --- /dev/null +++ b/package/fwts/fwts.hash @@ -0,0 +1,2 @@ +# Hash from: http://fwts.ubuntu.com/release/SHA256SUMS +sha256 4bab7a9daa6def8951b160e9f2c14b203459881d0a1279cb19329bec727c9f2d fwts-V16.09.00.tar.gz diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk new file mode 100644 index 0000000000..c63e2c5f16 --- /dev/null +++ b/package/fwts/fwts.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# fwts +# +################################################################################ + +FWTS_VERSION = V16.09.00 +FWTS_SITE = http://fwts.ubuntu.com/release +FWTS_STRIP_COMPONENTS = 0 +FWTS_LICENSE = GPLv2, LGPLv2.1, Custom +FWTS_LICENSE_FILES = debian/copyright +FWTS_AUTORECONF = YES +FWTS_DEPENDENCIES = host-pkgconf json-c libglib2 \ + $(if $(BR2_PACKAGE_DTC),dtc) + +$(eval $(autotools-package)) From 13fb1f6bf1ade73527fac0099bf8d01508d80f93 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Tue, 4 Oct 2016 16:52:23 +0200 Subject: [PATCH 0586/3392] DEVELOPERS: add entry for fwts Signed-off-by: Erico Nunes Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 6469c7c196..5dd50661e4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -418,6 +418,7 @@ F: package/acpica/ F: package/acpitool/ F: package/efibootmgr/ F: package/efivar/ +F: package/fwts/ F: package/spi-tools/ F: package/xdotool/ From 48073884101fe3db7d4bfc8d0b585232bd0e9080 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 Oct 2016 12:01:02 +0200 Subject: [PATCH 0587/3392] libmicrohttpd: update to 0.9.51 Bfin workaround is not required if the gcc bfin patch is applied. (gcc: enable _REENTRANT for bfin when -lpthread is used) Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/libmicrohttpd/libmicrohttpd.hash | 2 +- package/libmicrohttpd/libmicrohttpd.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index b228716300..848eb656d8 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d1b6385068abded29b6470e383287aa7705de05ae3c08ad0bf5747ac4dc6ebd7 libmicrohttpd-0.9.50.tar.gz +sha256 3000bb0ba219061f2ea60251b8ea3d5f694e8c6ce1706bbff57e7e24867a23c7 libmicrohttpd-0.9.51.tar.gz diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 2266d3ceaa..9caa24a2f5 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,18 +4,18 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.50 +LIBMICROHTTPD_VERSION = 0.9.51 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 -# gcc on arc and bfin doesn't define _REENTRANT when -pthread is +# gcc on arc doesn't define _REENTRANT when -pthread is # passed while it should. Compensate this defiency here otherwise # libmicrohttpd configure script doesn't find that thread support is # enabled. -ifeq ($(BR2_arc)$(BR2_bfin),y) +ifeq ($(BR2_arc),y) LIBMICROHTTPD_CFLAGS += -D_REENTRANT endif From 3215e4caf5d8dc78f0b4b34c38e708e90451150d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 7 Oct 2016 16:02:30 +0200 Subject: [PATCH 0588/3392] Revert "libmicrohttpd: update to 0.9.51" This reverts commit 48073884101fe3db7d4bfc8d0b585232bd0e9080. The commit broke the build with the pre-built Blackfin toolchain. Signed-off-by: Thomas Petazzoni --- package/libmicrohttpd/libmicrohttpd.hash | 2 +- package/libmicrohttpd/libmicrohttpd.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index 848eb656d8..b228716300 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3000bb0ba219061f2ea60251b8ea3d5f694e8c6ce1706bbff57e7e24867a23c7 libmicrohttpd-0.9.51.tar.gz +sha256 d1b6385068abded29b6470e383287aa7705de05ae3c08ad0bf5747ac4dc6ebd7 libmicrohttpd-0.9.50.tar.gz diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 9caa24a2f5..2266d3ceaa 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,18 +4,18 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.51 +LIBMICROHTTPD_VERSION = 0.9.50 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 -# gcc on arc doesn't define _REENTRANT when -pthread is +# gcc on arc and bfin doesn't define _REENTRANT when -pthread is # passed while it should. Compensate this defiency here otherwise # libmicrohttpd configure script doesn't find that thread support is # enabled. -ifeq ($(BR2_arc),y) +ifeq ($(BR2_arc)$(BR2_bfin),y) LIBMICROHTTPD_CFLAGS += -D_REENTRANT endif From aadb8b3bca814ca0e2dffb6cd1ba7b4d402a6f30 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 7 Oct 2016 16:13:30 -0300 Subject: [PATCH 0589/3392] linux-headers: bump 4.{4, 7, 8}.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a07ed182bc..c0e70671fd 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -244,9 +244,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.1.32" if BR2_KERNEL_HEADERS_4_1 default "4.2.8" if BR2_KERNEL_HEADERS_4_2 default "4.3.6" if BR2_KERNEL_HEADERS_4_3 - default "4.4.23" if BR2_KERNEL_HEADERS_4_4 + default "4.4.24" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 - default "4.7.6" if BR2_KERNEL_HEADERS_4_7 - default "4.8" if BR2_KERNEL_HEADERS_4_8 + default "4.7.7" if BR2_KERNEL_HEADERS_4_7 + default "4.8.1" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 5af77e67dc996bf19a8c65618b9e3a490281ec3c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 7 Oct 2016 16:13:31 -0300 Subject: [PATCH 0590/3392] linux: bump default to version 4.8.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index dd58562ee0..d8294cab89 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8)" + bool "Latest version (4.8.1)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.1" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 55a481bec1a592845c3777705865adb382ece1a3 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 7 Oct 2016 15:30:34 -0300 Subject: [PATCH 0591/3392] boot/uboot: Call 'make all' unconditionally Since commit fad58cefa4a392b ("boot/uboot: allow to build multiple U-Boot images") the installation of SPL binary fails. For example, when building the mx6cubox_defconfig target we see: LD u-boot OBJCOPY u-boot-nodtb.bin COPY u-boot.bin MKIMAGE u-boot.img >>> uboot 2016.09.01 Installing to target >>> uboot 2016.09.01 Installing to images directory cp -dpf /home/fabio/buildroot/output/build/uboot-2016.09.01/u-boot.bin /home/fabio/buildroot/output/images/ cp -dpf /home/fabio/buildroot/output/build/uboot-2016.09.01/u-boot.img /home/fabio/buildroot/output/images/ cp -dpf /home/fabio/buildroot/output/build/uboot-2016.09.01/SPL /home/fabio/buildroot/output/images/ cp: cannot stat '/home/fabio/buildroot/output/build/uboot-2016.09.01/SPL': No such file or directory Instead of calling 'make all' only for the BR2_TARGET_UBOOT_FORMAT_DTB_IMG case, call 'make all' unconditionally so that the SPL target can also be installed. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- boot/uboot/uboot.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 7379a4d139..86e5b84d90 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -48,6 +48,9 @@ UBOOT_MAKE_TARGET += mdbtrick endif endif +# Call 'make all' unconditionally +UBOOT_MAKE_TARGET += all + ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y) UBOOT_BINS += u-boot.kwb UBOOT_MAKE_TARGET += u-boot.kwb @@ -68,7 +71,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_IMG),y) UBOOT_BINS += u-boot-dtb.img -UBOOT_MAKE_TARGET += all u-boot-dtb.img +UBOOT_MAKE_TARGET += u-boot-dtb.img endif ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y) From 702bf6597dd6445c3c00b7142f67195ac8d9b5e2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 7 Oct 2016 18:59:11 +0200 Subject: [PATCH 0592/3392] package/mkpasswd: expose the host variant in menuconfig Some people may need it to generate passwords (not necessarily for users) from post-build scripts. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/mkpasswd/Config.in.host | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 package/mkpasswd/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 6d61f19d9a..1140c70c82 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -23,6 +23,7 @@ menu "Host utilities" source "package/jsmin/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/mke2img/Config.in.host" + source "package/mkpasswd/Config.in.host" source "package/mtd/Config.in.host" source "package/mtools/Config.in.host" source "package/mxsldr/Config.in.host" diff --git a/package/mkpasswd/Config.in.host b/package/mkpasswd/Config.in.host new file mode 100644 index 0000000000..fb5bc802d2 --- /dev/null +++ b/package/mkpasswd/Config.in.host @@ -0,0 +1,2 @@ +config BR2_PACKAGE_HOST_MKPASSWD + bool "host-mkpasswd" From 2a809e7fb1a41c858f7a630a536c9bd341c866fa Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Fri, 7 Oct 2016 17:30:28 -0300 Subject: [PATCH 0593/3392] atop: new package Atop is an ASCII full-screen performance monitor for Linux. - install only the basic functionality (command line tool atop). - add patch to fix musl build by removing unused include of termio.h. Patch was accepted upstream. Support for extra functionality can be added by follow-up patches: - init scripts (sysv and systemd) to autostart logging the system activity. - process accounting (needs counterpart enabled in the kernel). Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...01-remove-unused-include-of-termio.h.patch | 52 +++++++++++++++++++ package/atop/Config.in | 18 +++++++ package/atop/atop.hash | 2 + package/atop/atop.mk | 21 ++++++++ 5 files changed, 94 insertions(+) create mode 100644 package/atop/0001-remove-unused-include-of-termio.h.patch create mode 100644 package/atop/Config.in create mode 100644 package/atop/atop.hash create mode 100644 package/atop/atop.mk diff --git a/package/Config.in b/package/Config.in index 2941c45876..a1da86a201 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1687,6 +1687,7 @@ endmenu menu "System tools" source "package/acl/Config.in" source "package/android-tools/Config.in" + source "package/atop/Config.in" source "package/attr/Config.in" source "package/audit/Config.in" source "package/bootutils/Config.in" diff --git a/package/atop/0001-remove-unused-include-of-termio.h.patch b/package/atop/0001-remove-unused-include-of-termio.h.patch new file mode 100644 index 0000000000..3a04b05e60 --- /dev/null +++ b/package/atop/0001-remove-unused-include-of-termio.h.patch @@ -0,0 +1,52 @@ +remove unused include of termio.h + +This header is not provided by musl, leading to build failures. + +Patch status: accepted upstream. + +Signed-off-by: Ricardo Martincoski +--- +diff -purN atop-2.2-3.orig/showgeneric.c atop-2.2-3/showgeneric.c +--- atop-2.2-3.orig/showgeneric.c 2016-07-19 22:07:43.275324499 -0300 ++++ atop-2.2-3/showgeneric.c 2016-07-19 22:08:16.171453283 -0300 +@@ -268,7 +268,6 @@ static const char rcsid[] = "$Id: showge + #include + #include + #include +-#include + #include + #include + #include +diff -purN atop-2.2-3.orig/showlinux.c atop-2.2-3/showlinux.c +--- atop-2.2-3.orig/showlinux.c 2016-07-19 22:07:43.275324499 -0300 ++++ atop-2.2-3/showlinux.c 2016-07-19 22:08:20.979472459 -0300 +@@ -274,7 +274,6 @@ static const char rcsid[] = "$Id: showli + #include + #include + #include +-#include + #include + #include + #include +diff -purN atop-2.2-3.orig/showprocs.c atop-2.2-3/showprocs.c +--- atop-2.2-3.orig/showprocs.c 2016-07-19 22:07:43.275324499 -0300 ++++ atop-2.2-3/showprocs.c 2016-07-19 22:08:25.083488900 -0300 +@@ -94,7 +94,6 @@ static const char rcsid[] = "$Id: showpr + #include + #include + #include +-#include + #include + #include + #include +diff -purN atop-2.2-3.orig/showsys.c atop-2.2-3/showsys.c +--- atop-2.2-3.orig/showsys.c 2016-07-19 22:07:43.275324499 -0300 ++++ atop-2.2-3/showsys.c 2016-07-19 22:08:29.099505047 -0300 +@@ -80,7 +80,6 @@ static const char rcsid[] = "XXXXXX"; + #include + #include + #include +-#include + #include + #include + #include diff --git a/package/atop/Config.in b/package/atop/Config.in new file mode 100644 index 0000000000..d42a201bd9 --- /dev/null +++ b/package/atop/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_ATOP + bool "atop" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_ZLIB + help + Atop is an ASCII full-screen performance monitor for Linux + that is capable of reporting the activity of all processes + (even if processes have finished during the interval), daily + logging of system and process activity for long-term analysis, + highlighting overloaded system resources by using colors, etc. + At regular intervals, it shows system-level activity related + to the CPU, memory, swap, disks (including LVM) and network + layers, and for every process (and thread) it shows e.g. the + CPU utilization, memory growth, disk utilization, priority, + username, state, and exit code. + + http://www.atoptool.nl diff --git a/package/atop/atop.hash b/package/atop/atop.hash new file mode 100644 index 0000000000..bbf268d06e --- /dev/null +++ b/package/atop/atop.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d atop-2.2-3.tar.gz diff --git a/package/atop/atop.mk b/package/atop/atop.mk new file mode 100644 index 0000000000..27e1f82154 --- /dev/null +++ b/package/atop/atop.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# atop +# +################################################################################ + +ATOP_VERSION = 2.2-3 +ATOP_SITE = http://www.atoptool.nl/download +ATOP_LICENSE = GPLv2+ +ATOP_LICENSE_FILES = COPYING +ATOP_DEPENDENCIES = ncurses zlib + +define ATOP_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define ATOP_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/atop $(TARGET_DIR)/usr/bin/atop +endef + +$(eval $(generic-package)) From 0f4bfa1188caec076aac26789487bd1d16f7fab5 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Fri, 7 Oct 2016 17:30:31 -0300 Subject: [PATCH 0594/3392] DEVELOPERS: list atop package under my name Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5dd50661e4..481c845a1f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1203,6 +1203,9 @@ F: package/gupnp-av/ N: Renaud Aubin F: package/libhttpparser/ +N: Ricardo Martincoski +F: package/atop/ + N: Rhys Williams F: package/lirc-tools/ From a0f399399c8af6ac931a4246d6e91caf8f646209 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 7 Oct 2016 23:30:26 +0200 Subject: [PATCH 0595/3392] Revert "package/python-rtslib-fb: bump version to 2.1.58" This reverts commit e57ea511ee8f4e944bc6343b467386fff20acd37. As noted by the original author of the package, Christophe Vu-Brugier, this package should be updated together with python-configshell-fb and python-targetcli-fb. Signed-off-by: Thomas Petazzoni --- package/python-rtslib-fb/python-rtslib-fb.hash | 5 ++--- package/python-rtslib-fb/python-rtslib-fb.mk | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/python-rtslib-fb/python-rtslib-fb.hash b/package/python-rtslib-fb/python-rtslib-fb.hash index e4e56e7719..fd0618581e 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,3 +1,2 @@ -# md5 from https://pypi.python.org/pypi/rtslib-fb/json, sha256 locally computed -md5 f8a2c55cea6de95968fc0dd49beeef6f rtslib-fb-2.1.58.tar.gz -sha256 5806f9903557907787abd9c8b9dffb2b312e6c5e3ff40d50d26b10c37b118d47 rtslib-fb-2.1.58.tar.gz +# locally computed +sha256 d5d81a78046b4c228d29ba88d9950e0f63858e5fcf601e3d0f8bf107fbaadc03 python-rtslib-fb-v2.1.fb57.tar.gz diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index f0864a06a4..85bee0ba75 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -4,11 +4,10 @@ # ################################################################################ -PYTHON_RTSLIB_FB_VERSION = 2.1.58 -PYTHON_RTSLIB_FB_SOURCE = rtslib-fb-$(PYTHON_RTSLIB_FB_VERSION).tar.gz -PYTHON_RTSLIB_FB_SITE = https://pypi.python.org/packages/c8/26/ae0ff9a721d046bef78c457d8fc19287f7dbe36f98f5e190b017f0d9e9b7 +PYTHON_RTSLIB_FB_VERSION = v2.1.fb57 +PYTHON_RTSLIB_FB_SITE = $(call github,agrover,rtslib-fb,$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 -PYTHON_RTSLIB_FB_LICENSE_FILES = setup.py +PYTHON_RTSLIB_FB_LICENSE_FILES = COPYING PYTHON_RTSLIB_FB_SETUP_TYPE = setuptools PYTHON_RTSLIB_FB_DEPENDENCIES = python-six From dec089d8ebbc8b5af74d7ca58c0c960206217b07 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 12:09:31 +0200 Subject: [PATCH 0596/3392] package/ejabberd: fix typo in hash file url Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ejabberd/ejabberd.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ejabberd/ejabberd.hash b/package/ejabberd/ejabberd.hash index ea85d1cf4a..4284eec8fb 100644 --- a/package/ejabberd/ejabberd.hash +++ b/package/ejabberd/ejabberd.hash @@ -1,4 +1,4 @@ -# From https://www.process-one.net/downloads/ejabberd/15.11/ejabberd-16.01.tgz.md5 +# From https://www.process-one.net/downloads/ejabberd/16.01/ejabberd-16.01.tgz.md5 md5 5e525c25c8f04287217b8a9522d7c942 ejabberd-16.01.tgz # Locally computed sha256 e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 ejabberd-16.01.tgz From c1f3d4f0cc013b8f0c43408e83abe51d9b48534a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Oct 2016 18:53:22 +0200 Subject: [PATCH 0597/3392] package/oprofile: fix gcc6 build issue Backport a patch from upstream to fix a gcc6 build issue. Fixes: http://autobuild.buildroot.net/results/d9f/d9f2f771f8515a1ac17009e233a135b5af58ea00 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../0002-Fix-FTBFS-problem-with-GCC-6.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch diff --git a/package/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch b/package/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch new file mode 100644 index 0000000000..34bf365226 --- /dev/null +++ b/package/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch @@ -0,0 +1,51 @@ +From 39d4d46a0bd504ac708ffe72df87bf74cd12ad30 Mon Sep 17 00:00:00 2001 +From: William Cohen +Date: Fri, 5 Feb 2016 17:30:19 -0500 +Subject: [PATCH] Fix FTBFS problem with GCC-6 + +GCC-6 is pickier about some of the type conversions causing the Fedora +24 mass rebuild the build of oprofile failed with: + +make[3]: Entering directory '/builddir/build/BUILD/oprofile-1.1.0/libutil++' +g++ -DHAVE_CONFIG_H -I. -I.. -I ../libutil -I ../libop -I ../libpp -W -Wall -fno-common -ftemplate-depth-50 -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -c -o op_bfd.o op_bfd.cpp +op_bfd.cpp: In member function 'void op_bfd::get_symbol_range(symbol_index_t, long long unsigned int&, long long unsigned int&) const': +op_bfd.cpp:538:47: error: cannot convert 'std::ostream {aka std::basic_ostream}' to 'const bool' in initialization + bool const verbose = cverb << (vbfd & vlevel1); + ^ +op_bfd.cpp:546:7: error: in argument to unary ! + if (!verbose) + ^~~~~~~ + +Avoid the intermediate bool type to make GCC-6 happy. + +Signed-off-by: William Cohen +[Backported from upstream] +Signed-off-by: Romain Naour +--- + libutil++/op_bfd.cpp | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/libutil++/op_bfd.cpp b/libutil++/op_bfd.cpp +index 389c920..f2eb42b 100644 +--- a/libutil++/op_bfd.cpp ++++ b/libutil++/op_bfd.cpp +@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(symbol_index_t sym_idx, + { + op_bfd_symbol const & sym = syms[sym_idx]; + +- bool const verbose = cverb << (vbfd & vlevel1); +- + if (anon_obj) + start = sym.vma(); + else + start = sym.filepos(); + end = start + sym.size(); + +- if (!verbose) ++ if (!(cverb << (vbfd & vlevel1))) + return; + + io_state state(cverb << (vbfd & vlevel1)); +-- +2.5.5 + From 8a45d08c4a859565ecc0e31af57a8ab9b18e7533 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Oct 2016 20:22:45 +0200 Subject: [PATCH 0598/3392] uclibc: fix two more regressions introduced in 1.0.18 Fixes: http://autobuild.buildroot.net/results/e4c/e4c65ecf3ec011c39a80fd5d39ea0742c6171b06/ http://autobuild.buildroot.net/results/1c1/1c1080795c5f65c3e8a6b1bd79ca9dd997409260/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/uclibc/0003-cleanup-libc.a.patch | 42 +++++++++++++++++++ ...de-copysgnl.c-if-UCLIBC_HAS_LONG_DOU.patch | 31 ++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 package/uclibc/0003-cleanup-libc.a.patch create mode 100644 package/uclibc/0004-ppc-do-not-include-copysgnl.c-if-UCLIBC_HAS_LONG_DOU.patch diff --git a/package/uclibc/0003-cleanup-libc.a.patch b/package/uclibc/0003-cleanup-libc.a.patch new file mode 100644 index 0000000000..5fa27092f8 --- /dev/null +++ b/package/uclibc/0003-cleanup-libc.a.patch @@ -0,0 +1,42 @@ +From 9b1077dc70e52ee85a718bce3fcfec7ae9af2967 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sat, 8 Oct 2016 05:43:09 +0200 +Subject: [PATCH] cleanup libc.a + +The nested libpthread_nonshared.a and libdl.os shouldn't be included +in the static libc.a. Fixes compile issues for static builds. + +Signed-off-by: Waldemar Brodkorb +--- + libc/Makefile.in | 1 - + libpthread/nptl/Makefile.in | 2 -- + 2 files changed, 3 deletions(-) + +diff --git a/libc/Makefile.in b/libc/Makefile.in +index 55fd3d3..85986a7 100644 +--- a/libc/Makefile.in ++++ b/libc/Makefile.in +@@ -44,7 +44,6 @@ endif + + libc-a-y += $(libnsl-a-y) + libc-a-y += $(libresolv-a-y) +-libc-a-$(HAVE_SHARED) += $(libdl-a-y) + libc-a-y += $(libm-a-y) + libc-a-$(UCLIBC_HAS_LIBUTIL) += $(libutil-a-y) + libc-a-$(UCLIBC_HAS_CRYPT) += $(libcrypt-a-y) +diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in +index 0fc83e2..068eee4 100644 +--- a/libpthread/nptl/Makefile.in ++++ b/libpthread/nptl/Makefile.in +@@ -41,8 +41,6 @@ else + libpthread-a-y := $(libpthread-static-y) + endif + +-libpthread-a-y += $(top_builddir)lib/libpthread_nonshared.a +- + libc-shared-routines-y := $(filter-out $(notdir $(libpthread_libc_OBJS:.o=.c)), $(libc-shared-routines-y)) + libc-static-routines-y := $(filter-out $(notdir $(libpthread_libc_OBJS:.o=.c)), $(libc-static-routines-y)) + libc-shared-routines-y := $(addprefix $(libpthread_OUT)/,$(libc-shared-routines-y:.c=.oS)) +-- +2.1.4 + diff --git a/package/uclibc/0004-ppc-do-not-include-copysgnl.c-if-UCLIBC_HAS_LONG_DOU.patch b/package/uclibc/0004-ppc-do-not-include-copysgnl.c-if-UCLIBC_HAS_LONG_DOU.patch new file mode 100644 index 0000000000..686e15fc76 --- /dev/null +++ b/package/uclibc/0004-ppc-do-not-include-copysgnl.c-if-UCLIBC_HAS_LONG_DOU.patch @@ -0,0 +1,31 @@ +From 7136bb422a0681d787d07dc2936f08395b8a1007 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sat, 8 Oct 2016 18:03:27 +0200 +Subject: [PATCH] ppc: do not include copysgnl.c if + UCLIBC_HAS_LONG_DOUBLE_MATH enabled + +Fixes compilation of uClibc-ng when UCLIBC_HAS_LONG_DOUBLE_MATH is +used. + +Signed-off-by: Waldemar Brodkorb +--- + libc/sysdeps/linux/powerpc/Makefile.arch | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libc/sysdeps/linux/powerpc/Makefile.arch b/libc/sysdeps/linux/powerpc/Makefile.arch +index 7c09c87..f0144e7 100644 +--- a/libc/sysdeps/linux/powerpc/Makefile.arch ++++ b/libc/sysdeps/linux/powerpc/Makefile.arch +@@ -5,7 +5,8 @@ + # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + # + +-CSRC-y := __syscall_error.c ioctl.c copysignl.c ++CSRC-y := __syscall_error.c ioctl.c ++CSRC-$(if $(UCLIBC_HAS_LONG_DOUBLE_MATH),,y) += copysignl.c + + SSRC-y := \ + __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \ +-- +2.1.4 + From 12306a81f8edc6db84e4e3c5e58e707ba9e4c9f5 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Sat, 8 Oct 2016 21:03:31 +0200 Subject: [PATCH 0599/3392] gdb: get rid of host-texinfo dependency The host-texinfo dependency in gdb/host-gdb was added because gdb insisted in building info documentation in recent versions, and we want to avoid 'makeinfo' to be present on the build system. However, there is another solution that does not require actually building host-texinfo: instruct the makefiles to use a dummy makeinfo command ('true'). Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/gdb/gdb.mk | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 1c778e909a..0e7abfd2a6 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -37,12 +37,11 @@ endif # also need ncurses. HOST_GDB_DEPENDENCIES = host-expat host-ncurses -# Starting with gdb 7.10, gdb wants to re-generate its documentation. -# We were trying to avoid that by patching the Makefiles, but it wasn't -# working in all situations. So, we simply add a dependency on -# host-texinfo in all case. -GDB_DEPENDENCIES += host-texinfo -HOST_GDB_DEPENDENCIES += host-texinfo +# Disable building documentation +GDB_MAKE_OPTS += MAKEINFO=true +GDB_INSTALL_TARGET_OPTS += MAKEINFO=true +HOST_GDB_MAKE_OPTS += MAKEINFO=true +HOST_GDB_INSTALL_OPTS += MAKEINFO=true # Apply the Xtensa specific patches XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME)) From f7e7aea90dc83a175e86e577446811ae84f7b3db Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Sat, 8 Oct 2016 21:03:32 +0200 Subject: [PATCH 0600/3392] binutils: get rid of host-texinfo dependency and other documentation tricks The binutils/host-binutils package applied several tricks to avoid building info documentation. In the worst case, host-texinfo is added as dependency. However, there is a simpler solution that removes the need for all these tricks: instruct the makefiles to use a dummy makeinfo command ('true'). Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/binutils/binutils.mk | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 3a4a66158c..4e87fcb978 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -29,19 +29,8 @@ BINUTILS_LICENSE = GPLv3+, libiberty LGPLv2.1+ BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB ifeq ($(BINUTILS_FROM_GIT),y) -BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo -HOST_BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo -endif - -# The .info files in the >= 2.26 tarball have an incorrect timestamp, -# so binutils tries to re-generate them. In order to avoid the -# dependency on host-texinfo, we simply update the timestamps. -ifeq ($(BR2_BINUTILS_VERSION_2_26_X)$(BR2_BINUTILS_VERSION_2_27_X),y) -define BINUTILS_FIXUP_INFO_TIMESTAMPS - find $(@D) -name '*.info' -exec touch {} \; -endef -BINUTILS_POST_PATCH_HOOKS += BINUTILS_FIXUP_INFO_TIMESTAMPS -HOST_BINUTILS_POST_PATCH_HOOKS += BINUTILS_FIXUP_INFO_TIMESTAMPS +BINUTILS_DEPENDENCIES += host-flex host-bison +HOST_BINUTILS_DEPENDENCIES += host-flex host-bison endif # When binutils sources are fetched from the binutils-gdb repository, @@ -68,8 +57,12 @@ endif # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work -BINUTILS_CONF_ENV += ac_cv_prog_MAKEINFO=missing -HOST_BINUTILS_CONF_ENV += ac_cv_prog_MAKEINFO=missing +BINUTILS_CONF_ENV += MAKEINFO=true +BINUTILS_MAKE_OPTS += MAKEINFO=true +BINUTILS_INSTALL_TARGET_OPTS += MAKEINFO=true +HOST_BINUTILS_CONF_ENV += MAKEINFO=true +HOST_BINUTILS_MAKE_OPTS += MAKEINFO=true +HOST_BINUTILS_INSTALL_OPTS += MAKEINFO=true # gcc bug with Os/O2/O3, PR77311 # error: unable to find a register to spill in class 'CCREGS' @@ -109,7 +102,7 @@ HOST_BINUTILS_CONF_OPTS = \ # binutils run configure script of subdirs at make time, so ensure # our TARGET_CONFIGURE_ARGS are taken into consideration for those define BINUTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) $(BINUTILS_MAKE_OPTS) -C $(@D) endef # We just want libbfd, libiberty and libopcodes, From 79c8abdad7c997c1815c682859acfcf76ee619a8 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Sat, 8 Oct 2016 21:03:33 +0200 Subject: [PATCH 0601/3392] Revert "texinfo: new host package" This reverts commit ea161cf6891c3a3a601dfce072f68ee4aed08d21. The host-texinfo dependency is no longer used by any package, after using another solution to the problem that required its introduction in the first place. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/texinfo/texinfo.hash | 2 -- package/texinfo/texinfo.mk | 13 ------------- 2 files changed, 15 deletions(-) delete mode 100644 package/texinfo/texinfo.hash delete mode 100644 package/texinfo/texinfo.mk diff --git a/package/texinfo/texinfo.hash b/package/texinfo/texinfo.hash deleted file mode 100644 index 4bdf34357c..0000000000 --- a/package/texinfo/texinfo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2 texinfo-6.1.tar.xz diff --git a/package/texinfo/texinfo.mk b/package/texinfo/texinfo.mk deleted file mode 100644 index ebd0b48877..0000000000 --- a/package/texinfo/texinfo.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# texinfo -# -################################################################################ - -TEXINFO_VERSION = 6.1 -TEXINFO_SITE = $(BR2_GNU_MIRROR)/texinfo -TEXINFO_SOURCE = texinfo-$(TEXINFO_VERSION).tar.xz -TEXINFO_LICENSE = GPLv3+ -TEXINFO_LICENSE_FILES = COPYING - -$(eval $(host-autotools-package)) From 3b4adcd675ba58b8df4e749f812ea69dd33a1808 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Oct 2016 18:18:26 +0200 Subject: [PATCH 0602/3392] DEVELOPERS: add entry for uclibc/mksh Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 481c845a1f..240fb2c1e5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1532,6 +1532,8 @@ N: Waldemar Brodkorb F: arch/Config.in.bfin F: arch/Config.in.sparc F: arch/Config.in.m68k +F: package/uclibc/ +F: package/mksh/ N: Waldemar Rymarkiewicz F: package/ccid/ From b9a207e4ffbd099365da30d0f4ebd259b40c1862 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Sat, 8 Oct 2016 16:34:50 +0200 Subject: [PATCH 0603/3392] package/python-rtslib-fb: update URL to the open-iscsi organization Also add a comment to indicate that python-configshell-fb and targetcli-fb should be bumped every time python-rtslib-fb is bumped because upstream usually upgrades all of these packages at the same time. Another comment warns that switching this package to PyPI would make us miss new versions of python-rtslib-fb. Signed-off-by: Christophe Vu-Brugier Signed-off-by: Thomas Petazzoni --- package/python-rtslib-fb/Config.in | 2 +- package/python-rtslib-fb/python-rtslib-fb.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/python-rtslib-fb/Config.in b/package/python-rtslib-fb/Config.in index 7bae560409..f4083340e6 100644 --- a/package/python-rtslib-fb/Config.in +++ b/package/python-rtslib-fb/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_PYTHON_RTSLIB_FB the LIO generic SCSI target, present in 3.x Linux kernel versions. - https://github.com/agrover/rtslib-fb + https://github.com/open-iscsi/rtslib-fb diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index 85bee0ba75..8236fb8eb1 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -4,8 +4,11 @@ # ################################################################################ +# When upgrading the version, be sure to also upgrade +# python-configshell-fb and targetcli-fb at the same time. PYTHON_RTSLIB_FB_VERSION = v2.1.fb57 -PYTHON_RTSLIB_FB_SITE = $(call github,agrover,rtslib-fb,$(PYTHON_RTSLIB_FB_VERSION)) +# Do not switch site to PyPI: it does not contain the latest version. +PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 PYTHON_RTSLIB_FB_LICENSE_FILES = COPYING PYTHON_RTSLIB_FB_SETUP_TYPE = setuptools From 8025a97985af8a6e8c4d11b8dad9f8e13e9f5195 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Sat, 8 Oct 2016 16:34:51 +0200 Subject: [PATCH 0604/3392] package/python-configshell-fb: update URL to the open-iscsi organization Also add a comment to indicate that python-rtslib-fb and targetcli-fb should be bumped every time python-configshell-fb is bumped because upstream usually upgrades all of these packages at the same time. Signed-off-by: Christophe Vu-Brugier Signed-off-by: Thomas Petazzoni --- package/python-configshell-fb/Config.in | 2 +- package/python-configshell-fb/python-configshell-fb.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/python-configshell-fb/Config.in b/package/python-configshell-fb/Config.in index a680ce01f1..90a295fc8d 100644 --- a/package/python-configshell-fb/Config.in +++ b/package/python-configshell-fb/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_PYTHON_CONFIGSHELL_FB configshell-fb is a Python library that provides a framework for building simple but nice CLI-based applications. - https://github.com/agrover/configshell-fb + https://github.com/open-iscsi/configshell-fb diff --git a/package/python-configshell-fb/python-configshell-fb.mk b/package/python-configshell-fb/python-configshell-fb.mk index d0671d5ec9..a2e9cae157 100644 --- a/package/python-configshell-fb/python-configshell-fb.mk +++ b/package/python-configshell-fb/python-configshell-fb.mk @@ -4,8 +4,10 @@ # ################################################################################ +# When upgrading the version, be sure to also upgrade python-rtslib-fb +# and targetcli-fb at the same time. PYTHON_CONFIGSHELL_FB_VERSION = v1.1.fb18 -PYTHON_CONFIGSHELL_FB_SITE = $(call github,agrover,configshell-fb,$(PYTHON_CONFIGSHELL_FB_VERSION)) +PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,$(PYTHON_CONFIGSHELL_FB_VERSION)) PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING PYTHON_CONFIGSHELL_FB_SETUP_TYPE = setuptools From 38b158aa9c66a5b063f05b99fe77d18c10ee4485 Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Sat, 8 Oct 2016 16:34:52 +0200 Subject: [PATCH 0605/3392] package/targetcli-fb: update URL to the open-iscsi organization Also add a comment to indicate that python-rtslib-fb and python-configshell-fb should be bumped every time targetcli-fb is bumped because upstream usually upgrades all of these packages at the same time. Signed-off-by: Christophe Vu-Brugier Signed-off-by: Thomas Petazzoni --- package/targetcli-fb/Config.in | 2 +- package/targetcli-fb/targetcli-fb.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/Config.in b/package/targetcli-fb/Config.in index b655938700..24ff3145f6 100644 --- a/package/targetcli-fb/Config.in +++ b/package/targetcli-fb/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_TARGETCLI_FB LIO generic SCSI target, present in 3.x Linux kernel versions. - https://github.com/agrover/targetcli-fb + https://github.com/open-iscsi/targetcli-fb diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index cf7f29ff4e..4057592564 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -4,8 +4,10 @@ # ################################################################################ +# When upgrading the version, be sure to also upgrade python-rtslib-fb +# and python-configshell-fb at the same time. TARGETCLI_FB_VERSION = v2.1.fb41 -TARGETCLI_FB_SITE = $(call github,agrover,targetcli-fb,$(TARGETCLI_FB_VERSION)) +TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING TARGETCLI_FB_SETUP_TYPE = setuptools From 840b7bca0051a5f1dd07f3d6bdf66be06247611c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Oct 2016 15:46:52 +0200 Subject: [PATCH 0606/3392] package/gcc: nios2 Backport nios2 r31 fix As reported on the mailing list, gcc5 with binutils 2.26.1 produce some assembler error "r31 cannot be used with jmp; use ret instead" [1] The bug is reported upstream [2], but gcc 5.4 needs an upstream patch to fix this issue. Note: openembedded backported the same patch for gcc 5.3 [3] Fixes: alsa-lib: http://autobuild.buildroot.net/results/1fc9806a62b813b085c39d36000f4d9d18f779df http://autobuild.buildroot.net/results/03eb11b6a783da1985c19858f6c5f69027e0ed9c http://autobuild.buildroot.net/results/d620812ae79c4e8252d2b0c410f94e9cdcbcfbc3 http://autobuild.buildroot.net/results/04b7609f5decc71bf25e981f14756029715fc621 http://autobuild.buildroot.net/results/e85be7ffd62e7ab95c4dd0049b0c67ae98f75543 freeswitch: http://autobuild.buildroot.net/results/96f69b7be1978f85271e2827c2e18d4ed8de8dfc flac: http://autobuild.buildroot.net/results/fb3/fb36a9939cac82dc187b64fae93720ea1930f343 libmodplug: http://autobuild.buildroot.net/results/f12/f12a5d5b4f5338438fbb053ec013e69559eaaa0c [1] http://lists.busybox.net/pipermail/buildroot/2016-September/172932.html [2] https://sourceware.org/bugzilla/show_bug.cgi?id=20674 [3] http://lists.openembedded.org/pipermail/openembedded-core/2016-February/117633.html Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../880-gcc-nios2-Add-IJMP_REGS-enum.patch | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 package/gcc/5.4.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch diff --git a/package/gcc/5.4.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch b/package/gcc/5.4.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch new file mode 100644 index 0000000000..7a8c843e55 --- /dev/null +++ b/package/gcc/5.4.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch @@ -0,0 +1,103 @@ +From 920a898d2a04933c13eb808a513bc5822e91f70a Mon Sep 17 00:00:00 2001 +From: sandra +Date: Tue, 12 May 2015 15:57:22 +0000 +Subject: [PATCH] gcc/nios2: Add IJMP_REGS enum + +2015-05-12 Chung-Lin Tang + Sandra Loosemore + + gcc/ + * config/nios2/nios2.h (enum reg_class): Add IJMP_REGS enum + value. + (REG_CLASS_NAMES): Add "IJMP_REGS". + (REG_CLASS_CONTENTS): Add new entry for IJMP_REGS. + * config/nios2/nios2.md (indirect_jump,*tablejump): Adjust to + use new "c" register constraint. + * config/nios2/constraint.md (c): New register constraint + corresponding to IJMP_REGS. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223082 138bc75d-0d04-0410-961f-82ee72b054a4 + +[Romain: rebase on gcc 5.4] +Signed-off-by: Romain Naour +--- + gcc/config/nios2/constraints.md | 3 +++ + gcc/config/nios2/nios2.h | 11 +++++++---- + gcc/config/nios2/nios2.md | 4 ++-- + 3 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/gcc/config/nios2/constraints.md b/gcc/config/nios2/constraints.md +index f4bd9f7..735f892 100644 +--- a/gcc/config/nios2/constraints.md ++++ b/gcc/config/nios2/constraints.md +@@ -39,6 +39,9 @@ + + ;; Register constraints + ++(define_register_constraint "c" "IJMP_REGS" ++ "A register suitable for an indirect jump.") ++ + (define_register_constraint "j" "SIB_REGS" + "A register suitable for an indirect sibcall.") + +diff --git a/gcc/config/nios2/nios2.h b/gcc/config/nios2/nios2.h +index 117983d..7c329ae 100644 +--- a/gcc/config/nios2/nios2.h ++++ b/gcc/config/nios2/nios2.h +@@ -173,6 +173,7 @@ enum reg_class + { + NO_REGS, + SIB_REGS, ++ IJMP_REGS, + GP_REGS, + ALL_REGS, + LIM_REG_CLASSES +@@ -183,6 +184,7 @@ enum reg_class + #define REG_CLASS_NAMES \ + { "NO_REGS", \ + "SIB_REGS", \ ++ "IJMP_REGS", \ + "GP_REGS", \ + "ALL_REGS" } + +@@ -190,10 +192,11 @@ enum reg_class + + #define REG_CLASS_CONTENTS \ + { \ +- /* NO_REGS */ { 0, 0}, \ +- /* SIB_REGS */ { 0xfe0c, 0}, \ +- /* GP_REGS */ {~0, 0}, \ +- /* ALL_REGS */ {~0,~0} \ ++ /* NO_REGS */ { 0, 0}, \ ++ /* SIB_REGS */ { 0xfe0c, 0}, \ ++ /* IJMP_REGS */ { 0x7fffffff, 0}, \ ++ /* GP_REGS */ {~0, 0}, \ ++ /* ALL_REGS */ {~0,~0} \ + } + + +diff --git a/gcc/config/nios2/nios2.md b/gcc/config/nios2/nios2.md +index 7b35d269..36ef101 100644 +--- a/gcc/config/nios2/nios2.md ++++ b/gcc/config/nios2/nios2.md +@@ -697,7 +697,7 @@ + ; check or adjust for overflow. + + (define_insn "indirect_jump" +- [(set (pc) (match_operand:SI 0 "register_operand" "r"))] ++ [(set (pc) (match_operand:SI 0 "register_operand" "c"))] + "" + "jmp\\t%0" + [(set_attr "type" "control")]) +@@ -811,7 +811,7 @@ + + (define_insn "*tablejump" + [(set (pc) +- (match_operand:SI 0 "register_operand" "r")) ++ (match_operand:SI 0 "register_operand" "c")) + (use (label_ref (match_operand 1 "" "")))] + "" + "jmp\\t%0" +-- +2.5.5 + From 0d936dd2d3a8f8d2810971597601679ccd012d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Sat, 8 Oct 2016 15:41:54 +0200 Subject: [PATCH 0607/3392] wine: Bump to version 1.8.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/wine/wine.hash | 2 +- package/wine/wine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wine/wine.hash b/package/wine/wine.hash index d58ac02cd4..0f6b9d3ffd 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 515d10439777a4816fe5b0a0fc9a4ce498a2ecfd23eba0c25dc00f3d6c805079 wine-1.8.4.tar.bz2 +sha256 dee2a4959e5f90a89aaf04566c23f2926e9590f8968ea662afd81947fdb6f6d6 wine-1.8.5.tar.bz2 diff --git a/package/wine/wine.mk b/package/wine/wine.mk index aceea352db..d9a0ecf851 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,7 +4,7 @@ # ################################################################################ -WINE_VERSION = 1.8.4 +WINE_VERSION = 1.8.5 WINE_SOURCE = wine-$(WINE_VERSION).tar.bz2 WINE_SITE = https://dl.winehq.org/wine/source/1.8 WINE_LICENSE = LGPLv2.1+ From 5d076804edde7914c69f226f34a1d57097f02a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 25 Sep 2016 16:11:52 +0200 Subject: [PATCH 0608/3392] package/upmpdcli: add patch to fix error not detecting jsoncpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: http://autobuild.buildroot.net/results/205463c9ea8651911972c2835e28ded1912c811a http://autobuild.buildroot.net/results/5e9279ee60c11a3dacacf6d78f87f8d1b92968f5 http://autobuild.buildroot.net/results/97043f8defd5a59ae39b4c7f095a10d15c7fe632 http://autobuild.buildroot.net/results/e775126d5939093289b1a833dd6323ac293322ed .. and many more. libmpdclient, libmicrohttpd and jsoncpp provide a .pc file. Use pkg-config for detecting the libraries and for providing the necessary details for compiling and linking. The current build system of upmpdcli does not use PKG_CHECK_MODULES, but AC_LINK_IFELSE to detect jsoncpp. After bumping jsoncpp version from 1.7.2 to 1.7.5 the detection fails, because the test program does not compile anymore: """ In file included from /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/autolink.h:9:0, from /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/json.h:9, from test.c:1: /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:155:9: error: 'int64_t' does not name a type typedef int64_t Int64; ^ /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:156:9: error: 'uint64_t' does not name a type typedef uint64_t UInt64; ^ /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:158:9: error: 'Int64' does not name a type typedef Int64 LargestInt; ^ /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:159:9: error: 'UInt64' does not name a type typedef UInt64 LargestUInt; ^ In file included from /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/json.h:10:0, from test.c:1: /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/value.h:184:11: error: 'UInt64' in namespace 'Json' does not name a type typedef Json::UInt64 UInt64; [..] """ Instead of fixing the test program use PKG_CHECK_MODULES to check for jsoncpp. While we're on it, add it for libmpdclient and libmicrohttpd, too. Upstream-status: https://github.com/medoc92/upmpdcli/pull/52 Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- ...r-jsoncpp-libmpdclient-libmicrohttpd.patch | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 package/upmpdcli/0004-Use-pkg-config-for-jsoncpp-libmpdclient-libmicrohttpd.patch diff --git a/package/upmpdcli/0004-Use-pkg-config-for-jsoncpp-libmpdclient-libmicrohttpd.patch b/package/upmpdcli/0004-Use-pkg-config-for-jsoncpp-libmpdclient-libmicrohttpd.patch new file mode 100644 index 0000000000..a1f194a3e8 --- /dev/null +++ b/package/upmpdcli/0004-Use-pkg-config-for-jsoncpp-libmpdclient-libmicrohttpd.patch @@ -0,0 +1,105 @@ +From 5091e1afd9d0a69bdf10d12d4a66f7147e8185a3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Fri, 23 Sep 2016 21:37:36 +0200 +Subject: [PATCH] Use pkg-config for jsoncpp, libmpdclient and libmicrohttpd +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libmpdclient, libmicrohttpd and jsoncpp provide a .pc file. Use +pkg-config for detecting the libraries and for providing the necessary +details for compiling and linking. + +The current build system of upmpdcli does not use PKG_CHECK_MODULES, but +AC_LINK_IFELSE to detect jsoncpp. After bumping jsoncpp version from 1.7.2 to +1.7.5 the detection fails, because the test program does not compile: + +''' +In file included from /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/autolink.h:9:0, + from /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/json.h:9, + from test.c:1: +/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:155:9: error: 'int64_t' does not name a type + typedef int64_t Int64; + ^ +/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:156:9: error: 'uint64_t' does not name a type + typedef uint64_t UInt64; + ^ +/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:158:9: error: 'Int64' does not name a type + typedef Int64 LargestInt; + ^ +/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:159:9: error: 'UInt64' does not name a type + typedef UInt64 LargestUInt; + ^ +In file included from /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/json.h:10:0, + from test.c:1: +/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/value.h:184:11: error: 'UInt64' in namespace 'Json' does not name a type + typedef Json::UInt64 UInt64; + +[..] +''' + +Instead of fixing the test program use PKG_CHECK_MODULES to check for +jsoncpp. While we're on it, add it for libmpdclient and libmicrohttpd, too. + +Upstream-status: https://github.com/medoc92/upmpdcli/pull/52 + +Signed-off-by: Jörg Krause +--- + Makefile.am | 3 ++- + configure.ac | 24 +++++++----------------- + 2 files changed, 9 insertions(+), 18 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5c83aa1..6f6e018 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,6 @@ + AM_CPPFLAGS = -DDEBUG -g -Wall \ +- $(upnpp_CFLAGS) \ ++ $(upnpp_CFLAGS) $(libmpdclient_CFLAGS) $(libmicrohttpd_CFLAGS) \ ++ $(jsoncpp_CFLAGS) \ + -I$(top_srcdir)/src \ + -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\" + +diff --git a/configure.ac b/configure.ac +index a165b5d..0ef0f3b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -36,27 +36,17 @@ dnl AC_CHECK_LIB([curl], [curl_easy_init], [],AC_MSG_ERROR([libcurl not found])) + dnl AC_CHECK_LIB([expat], [XML_ParserCreate], [],AC_MSG_ERROR([libexpat not found])) + + PKG_CHECK_MODULES([upnpp], [libupnpp], [], [AC_MSG_ERROR([libupnpp])]) +-AC_CHECK_LIB([mpdclient], [mpd_connection_new], [], +- AC_MSG_ERROR([libmpdclient not found])) +-SCCTL_LIBS="$LIBS $upnpp_LIBS" ++PKG_CHECK_MODULES([libmpdclient], [libmpdclient], [], ++ [AC_MSG_ERROR([libmpdclient not found])]) ++SCCTL_LIBS="$LIBS $upnpp_LIBS $libmpdclient_LIBS" + +-AC_CHECK_LIB([microhttpd], [MHD_queue_response], [], []) +- +-AC_LANG_PUSH([C++]) ++PKG_CHECK_MODULES([libmicrohttpd], [libmicrohttpd], [], ++ [AC_MSG_ERROR([libmicrohttpd not found])]) + + AC_CHECK_HEADERS(json/json.h jsoncpp/json/json.h) +-LIBS="$LIBS -ljsoncpp" +-AC_LINK_IFELSE([AC_LANG_PROGRAM( +- [[#ifdef HAVE_JSONCPP_JSON_JSON_H +- #include +- #else +- #include +- #endif]], [Json::Features dummy])], +- [HAVE_JSONCPP=1], +- [AC_MSG_ERROR([libjsoncpp not found.])]) +-AC_LANG_POP ++PKG_CHECK_MODULES([jsoncpp], [jsoncpp], [], [AC_MSG_ERROR([jsoncpp not found])]) + +-UPMPDCLI_LIBS="$LIBS $upnpp_LIBS" ++UPMPDCLI_LIBS="$LIBS $upnpp_LIBS $libmpdclient_LIBS $libmicrohttpd_LIBS $jsoncpp_LIBS" + echo "UPMPDCLI_LIBS=$UPMPDCLI_LIBS" + + LIBS="" +-- +2.10.0 + From b566ffb2d45266a4b5c40244b3752ed03a6a2927 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 Oct 2016 15:01:45 +0200 Subject: [PATCH 0609/3392] Revert "Revert "texinfo: new host package"" This reverts commit 79c8abdad7c997c1815c682859acfcf76ee619a8. The change in the binutils package to avoid the texinfo dependency broke the toolchain build. See: http://autobuild.buildroot.net/results/90d0537bc12cbb2a7c6d344b3c6c9e1a5046d791/ Signed-off-by: Thomas Petazzoni --- package/texinfo/texinfo.hash | 2 ++ package/texinfo/texinfo.mk | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 package/texinfo/texinfo.hash create mode 100644 package/texinfo/texinfo.mk diff --git a/package/texinfo/texinfo.hash b/package/texinfo/texinfo.hash new file mode 100644 index 0000000000..4bdf34357c --- /dev/null +++ b/package/texinfo/texinfo.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2 texinfo-6.1.tar.xz diff --git a/package/texinfo/texinfo.mk b/package/texinfo/texinfo.mk new file mode 100644 index 0000000000..ebd0b48877 --- /dev/null +++ b/package/texinfo/texinfo.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# texinfo +# +################################################################################ + +TEXINFO_VERSION = 6.1 +TEXINFO_SITE = $(BR2_GNU_MIRROR)/texinfo +TEXINFO_SOURCE = texinfo-$(TEXINFO_VERSION).tar.xz +TEXINFO_LICENSE = GPLv3+ +TEXINFO_LICENSE_FILES = COPYING + +$(eval $(host-autotools-package)) From d71570e7791d65eb23d239a21fa927a60916ca81 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 Oct 2016 15:02:26 +0200 Subject: [PATCH 0610/3392] Revert "binutils: get rid of host-texinfo dependency and other documentation tricks" This reverts commit f7e7aea90dc83a175e86e577446811ae84f7b3db. This change broke the build of the toolchain. See: http://autobuild.buildroot.net/results/90d0537bc12cbb2a7c6d344b3c6c9e1a5046d791/ Signed-off-by: Thomas Petazzoni --- package/binutils/binutils.mk | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 4e87fcb978..3a4a66158c 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -29,8 +29,19 @@ BINUTILS_LICENSE = GPLv3+, libiberty LGPLv2.1+ BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB ifeq ($(BINUTILS_FROM_GIT),y) -BINUTILS_DEPENDENCIES += host-flex host-bison -HOST_BINUTILS_DEPENDENCIES += host-flex host-bison +BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo +HOST_BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo +endif + +# The .info files in the >= 2.26 tarball have an incorrect timestamp, +# so binutils tries to re-generate them. In order to avoid the +# dependency on host-texinfo, we simply update the timestamps. +ifeq ($(BR2_BINUTILS_VERSION_2_26_X)$(BR2_BINUTILS_VERSION_2_27_X),y) +define BINUTILS_FIXUP_INFO_TIMESTAMPS + find $(@D) -name '*.info' -exec touch {} \; +endef +BINUTILS_POST_PATCH_HOOKS += BINUTILS_FIXUP_INFO_TIMESTAMPS +HOST_BINUTILS_POST_PATCH_HOOKS += BINUTILS_FIXUP_INFO_TIMESTAMPS endif # When binutils sources are fetched from the binutils-gdb repository, @@ -57,12 +68,8 @@ endif # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work -BINUTILS_CONF_ENV += MAKEINFO=true -BINUTILS_MAKE_OPTS += MAKEINFO=true -BINUTILS_INSTALL_TARGET_OPTS += MAKEINFO=true -HOST_BINUTILS_CONF_ENV += MAKEINFO=true -HOST_BINUTILS_MAKE_OPTS += MAKEINFO=true -HOST_BINUTILS_INSTALL_OPTS += MAKEINFO=true +BINUTILS_CONF_ENV += ac_cv_prog_MAKEINFO=missing +HOST_BINUTILS_CONF_ENV += ac_cv_prog_MAKEINFO=missing # gcc bug with Os/O2/O3, PR77311 # error: unable to find a register to spill in class 'CCREGS' @@ -102,7 +109,7 @@ HOST_BINUTILS_CONF_OPTS = \ # binutils run configure script of subdirs at make time, so ensure # our TARGET_CONFIGURE_ARGS are taken into consideration for those define BINUTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) $(BINUTILS_MAKE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) -C $(@D) endef # We just want libbfd, libiberty and libopcodes, From 2f556ab99f51a0b90183610a7fecb9ed22ed4aa3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 Oct 2016 15:11:39 +0200 Subject: [PATCH 0611/3392] Revert "libglib2: add host-util-linux for host variant" This reverts commit 71c5a81c96873c056cb2c54580e3ba2db528ca8a. The bump to libglib2 2.25.0 causes a large number of build failures due to the redefinition of crc32() in both util-linux libblkid and zlib. This commit is related to the bump, so it needs to get reverted as well. Signed-off-by: Thomas Petazzoni --- package/libglib2/libglib2.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index f199a4aa2d..5bc6ed5f6d 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -105,12 +105,7 @@ LIBGLIB2_DEPENDENCIES = \ libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext) HOST_LIBGLIB2_DEPENDENCIES = \ - host-gettext \ - host-libffi \ - host-pcre \ - host-pkgconf \ - host-util-linux \ - host-zlib + host-gettext host-libffi host-pcre host-pkgconf host-zlib LIBGLIB2_CONF_OPTS = \ --with-pcre=system From 40da5b434d0d25662b447f14b724245da04ed90d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 Oct 2016 15:12:15 +0200 Subject: [PATCH 0612/3392] Revert "libglib2: bump to version 2.50.0" This reverts commit 4c7c010f9fae01399070844991252d3f5b9aae5f. The bump to libglib2 2.25.0 causes a large number of build failures due to the redefinition of crc32() in both util-linux libblkid and zlib. Fixes: http://autobuild.buildroot.net/results/ac65c9177dd63fc8d76dba3b9845f81b15faa716/ (and approximately 500 other similar build failures) Signed-off-by: Thomas Petazzoni --- package/libglib2/Config.in | 2 -- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 80c7d6749b..84ee816a89 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -5,8 +5,6 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_ZLIB depends on BR2_USE_WCHAR # gettext depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 3bc4021477..35728e2e33 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,2 +1,2 @@ -# https://download.gnome.org/sources/glib/2.50/glib-2.50.0.sha256sum -sha256 830b551fa626bda06e12729205b3c5bb0d82b924a8cf64d948945878f01b7d70 glib-2.50.0.tar.xz +# https://download.gnome.org/sources/glib/2.48/glib-2.48.2.sha256sum +sha256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 glib-2.48.2.tar.xz diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 5bc6ed5f6d..6b1a387946 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.50 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 +LIBGLIB2_VERSION_MAJOR = 2.48 +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+ @@ -102,7 +102,7 @@ HOST_LIBGLIB2_CONF_OPTS = \ LIBGLIB2_DEPENDENCIES = \ host-pkgconf host-libglib2 host-gettext \ - libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext) + libffi pcre zlib $(if $(BR2_NEEDS_GETTEXT),gettext) HOST_LIBGLIB2_DEPENDENCIES = \ host-gettext host-libffi host-pcre host-pkgconf host-zlib From 6e99c712bcea16ab0e17d92c69a4da4a2896e81b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 9 Oct 2016 21:39:13 +0200 Subject: [PATCH 0613/3392] uclibc: fix mips/mips64 build with older compilers For example gcc 4.8.x fails to build uClibc-ng for mips/mips64. Check if feature exist before using it. Reported-by: Thomas Petazzoni Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...-mips-mips64-build-for-old-compilers.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/uclibc/0005-fix-mips-mips64-build-for-old-compilers.patch diff --git a/package/uclibc/0005-fix-mips-mips64-build-for-old-compilers.patch b/package/uclibc/0005-fix-mips-mips64-build-for-old-compilers.patch new file mode 100644 index 0000000000..1475132681 --- /dev/null +++ b/package/uclibc/0005-fix-mips-mips64-build-for-old-compilers.patch @@ -0,0 +1,28 @@ +From 43c4bbf3e0e61f5f487a00a0066816913503656c Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sun, 9 Oct 2016 20:15:00 +0200 +Subject: [PATCH] fix mips/mips64 build for old compilers + +Signed-off-by: Waldemar Brodkorb +--- + Rules.mak | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Rules.mak b/Rules.mak +index 67189ff..b9dbf25 100644 +--- a/Rules.mak ++++ b/Rules.mak +@@ -404,8 +404,8 @@ ifeq ($(TARGET_ARCH),mips) + CPU_CFLAGS-$(CONFIG_MIPS_N64_ABI)+=-mabi=64 + CPU_CFLAGS-$(CONFIG_MIPS_O32_ABI)+=-mabi=32 + CPU_CFLAGS-$(CONFIG_MIPS_N32_ABI)+=-mabi=n32 +- CPU_CFLAGS-$(CONFIG_MIPS_NAN_LEGACY)+=-mnan=legacy +- CPU_CFLAGS-$(CONFIG_MIPS_NAN_2008)+=-mnan=2008 ++ CPU_CFLAGS-$(CONFIG_MIPS_NAN_LEGACY)+=$(call check_gcc,-mnan=legacy) ++ CPU_CFLAGS-$(CONFIG_MIPS_NAN_2008)+=$(call check_gcc,-mnan=2008) + CPU_LDFLAGS-y += $(CPU_CFLAGS) + endif + +-- +2.1.4 + From d87992892f8772d068adbea8ee6cfe041536e708 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 8 Oct 2016 10:14:25 +0200 Subject: [PATCH 0614/3392] minnowboard_max: defconfigs: bump linux kernel to 4.8.1 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- board/minnowboard/{linux-4.6.config => linux-4.8.config} | 0 configs/minnowboard_max-graphical_defconfig | 6 +++--- configs/minnowboard_max_defconfig | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) rename board/minnowboard/{linux-4.6.config => linux-4.8.config} (100%) diff --git a/board/minnowboard/linux-4.6.config b/board/minnowboard/linux-4.8.config similarity index 100% rename from board/minnowboard/linux-4.6.config rename to board/minnowboard/linux-4.8.config diff --git a/configs/minnowboard_max-graphical_defconfig b/configs/minnowboard_max-graphical_defconfig index de803f0239..1b95d8e5a1 100644 --- a/configs/minnowboard_max-graphical_defconfig +++ b/configs/minnowboard_max-graphical_defconfig @@ -3,7 +3,7 @@ BR2_x86_64=y BR2_x86_atom=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -22,9 +22,9 @@ BR2_PACKAGE_HOST_MTOOLS=y # Linux BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux-4.6.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux-4.8.config" # Bootloader BR2_TARGET_GRUB2=y diff --git a/configs/minnowboard_max_defconfig b/configs/minnowboard_max_defconfig index 0adb382f0c..63190eaa48 100644 --- a/configs/minnowboard_max_defconfig +++ b/configs/minnowboard_max_defconfig @@ -8,8 +8,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="minnowboard-max" -# Linux headers same as kernel, a 4.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y @@ -21,9 +21,9 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux-4.6.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux-4.8.config" # Bootloader BR2_TARGET_GRUB2=y From 521cf82ad842e019c07e3a0d1c0c29c09ae00776 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Oct 2016 12:37:39 +0200 Subject: [PATCH 0615/3392] package/wvstreams: mark as deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As reported by Jörg and I [1] [2], wvstreams is not maintained anymore. Last activity was on Github was 2011, the current version 1.6.1 dates from 2009. Also it doesn't build anymore with a recent compiler (gcc5 and gcc6). Instead of stacking patches forever, mark this wvstreams and wvdial deprecated before removing them completely. Remove following failures from autobuilders. http://autobuild.buildroot.net/results/f01/f0166f030875ecaf0d757790de6361339071831e http://autobuild.buildroot.net/results/32b/32b4eba8c7cbe8a3b1cde2d67f1af3f913fcc292 http://autobuild.buildroot.net/results/38f/38fefa126596c6e267ffaf0f2dd9c5e3dcf09aff http://autobuild.buildroot.net/results/ea2/ea223c8a4f817541f55aa36c47b159a316031bff [1] http://patchwork.ozlabs.org/patch/674238/ [2] http://patchwork.ozlabs.org/patch/505304/ Signed-off-by: Romain Naour Cc: Simon Dawson Cc: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/wvdial/Config.in | 2 ++ package/wvstreams/Config.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/wvdial/Config.in b/package/wvdial/Config.in index 03730f3bf8..0c13202790 100644 --- a/package/wvdial/Config.in +++ b/package/wvdial/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_WVDIAL bool "wvdial" + depends on BR2_DEPRECATED_SINCE_2016_08 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # wvstreams depends on !BR2_STATIC_LIBS # wvstreams @@ -11,5 +12,6 @@ config BR2_PACKAGE_WVDIAL http://wvdial.googlecode.com/ comment "wvdial needs a glibc or uClibc toolchain w/ C++, dynamic library" + depends on BR2_DEPRECATED_SINCE_2016_08 depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/wvstreams/Config.in b/package/wvstreams/Config.in index 3d2d8f4292..a550c57b96 100644 --- a/package/wvstreams/Config.in +++ b/package/wvstreams/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_WVSTREAMS bool "wvstreams" + depends on BR2_DEPRECATED_SINCE_2016_08 depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() @@ -13,5 +14,6 @@ config BR2_PACKAGE_WVSTREAMS http://wvstreams.googlecode.com/ comment "wvstreams needs a glibc or uClibc toolchain w/ C++, dynamic library" + depends on BR2_DEPRECATED_SINCE_2016_08 depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL From 31e78ab72f4d51ab39b19fe58bf6b8a53bec1b01 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Fri, 7 Oct 2016 20:52:32 -0700 Subject: [PATCH 0616/3392] sysklogd: add patch to fix build with glibc 2.24 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building sysklogd with glibc 2.24 fails with the following error: syslogd.c: In function ‘reapchild’: syslogd.c:2097:13: error: storage size of ‘status’ isn’t known union wait status; ^ Makefile:99: recipe for target 'syslogd.o' failed make[2]: *** [syslogd.o] Error 1 make[2]: *** Waiting for unfinished jobs.... package/pkg-generic.mk:201: recipe for target './buildroot/output/build/sysklogd-1.5.1/.stamp_built' failed make[1]: *** [./buildroot/output/build/sysklogd-1.5.1/.stamp_built] Error 2 Makefile:41: recipe for target '_all' failed make: *** [_all] Error 2 union wait was marked deprecated in glibc 2.23 and removed in glibc 2.24. The fix is to declare it as an int. See https://sourceware.org/ml/libc-alpha/2016-02/msg00342.html Sent upstream via their mailing list Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni --- ...place-deprecated-union-wait-with-int.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 package/sysklogd/0001-replace-deprecated-union-wait-with-int.patch diff --git a/package/sysklogd/0001-replace-deprecated-union-wait-with-int.patch b/package/sysklogd/0001-replace-deprecated-union-wait-with-int.patch new file mode 100644 index 0000000000..c9a30e9924 --- /dev/null +++ b/package/sysklogd/0001-replace-deprecated-union-wait-with-int.patch @@ -0,0 +1,25 @@ +From 86fe87cdf097e6286e76eadcc9c11c79be6258f2 Mon Sep 17 00:00:00 2001 +From: Ryan Coe +Date: Fri, 7 Oct 2016 19:42:40 -0700 +Subject: [PATCH 1/1] replace deprecated union wait with int + +Signed-off-by: Ryan Coe +--- + syslogd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/syslogd.c b/syslogd.c +index ea73ea5da5e935bb8cab328559f950cd3afc2d20..ace96c8be40f50d123120c0586a384a298212245 100644 +--- a/syslogd.c ++++ b/syslogd.c +@@ -2094,7 +2094,7 @@ void reapchild() + (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */ + wait ((int *)0); + #else +- union wait status; ++ int status; + + while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0) + ; +-- +2.9.3 From 12e3d98d8fc8193bd565ae9d90f707574fdbca02 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 7 Oct 2016 18:25:44 -0300 Subject: [PATCH 0617/3392] configs/grinn_liteboard: Bump to U-Boot 2016.09.01 U-Boot 2016.09.01 is a bugfix release, so bump to this version. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/grinn_liteboard_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index 5edb375c6d..d82f7fef10 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From 3907b1ac66422c0b9182f090f41e6544dc859825 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 3 Oct 2016 20:09:56 -0500 Subject: [PATCH 0618/3392] zynq: document how to use custom ps7_init files Since U-Boot supported SPL for Zynq boards at v2014.04 release, it became much easier to build a system. At that time, however, users still needed to manually copy ps7_init.c/h to the U-Boot source tree to generate a working SPL image because ps7_init.c/h output from Xilinx tools are not compatible with GPL. Later, the license problem was solved when Xilinx tools became able to output the GPL-compatible variants (ps7_init_gpl.c/h) as well. U-Boot v2015.07 or later includes ps7_init_gpl.c/h for major Zynq boards so that users can build a boot image straight away. Now Buildroot supports 3 boards (Zedboard, MicroZed, ZC706) without any manual intervention. This is a good thing itself, but commit b9cd72cdbfe3 ("zynq_zc706: bump U-Boot to xilinx-v2016.2") entirely dropped the information about custom ps7_init files. This commit provides up-to-date guidance for how to customize the ps7_init files. Signed-off-by: Masahiro Yamada Signed-off-by: Matt Weber Acked-by: Alistair Francis [Thomas: rewording and formatting tweaks.] Signed-off-by: Thomas Petazzoni --- board/zynq/readme.txt | 48 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/board/zynq/readme.txt b/board/zynq/readme.txt index 51e28b6b34..c5506fe966 100644 --- a/board/zynq/readme.txt +++ b/board/zynq/readme.txt @@ -6,13 +6,6 @@ Currently, three boards are natively supported by Buildroot: - Avnet ZedBoard (zynq_zed_defconfig) - Avnet MicroZed (zynq_microzed_defconfig) -The following build procedure focuses on them, but you can adjust it to your -board even if it is not listed above. Major Zynq-based boards are supported by -U-Boot, and their Device Trees are merged in Linux Kernel. If your board is the -case, booting the kernel is a piece of cake. All you need to do is to change: - - Kernel Device Tree file name (BR2_LINUX_KERNEL_INTREE_DTS_NAME) - - U-Boot board defconfig (BR2_TARGET_UBOOT_BOARD_KCONFIG) - Steps to create a working system for a Zynq board: 1) Configuration (do one of the following) @@ -50,3 +43,44 @@ References: - Zedboard/Microzed information including schematics, reference designs, and manuals are available from http://www.zedboard.org . + +Support for other boards: + +If you want to build a system for other boards based on the same SoC +(for ex. Digilent Zybo board), and the board is already supported by +the upstream kernel and U-Boot, you simply need to change the +following Buildroot options: + + - Kernel Device Tree file name (BR2_LINUX_KERNEL_INTREE_DTS_NAME) + - U-Boot board defconfig (BR2_TARGET_UBOOT_BOARD_DEFCONFIG) + +Custom ps7_init_gpl.c/h support: + +To generate a working boot.bin image, ps7_init_gpl.c/h are required in +the U-Boot source tree. Without those files, boot.bin will be built +successfully but it will not be functional at all. Those files are +output from the Xilinx tools, but for convenience, U-Boot includes the +default ps7_init_gpl.c/h of popular boards. Those files may need to be +updated for any programmable logic customizations which impact +ps7_init (clock/pin setup & mapping/AXI bridge setup/etc). See +board/xilinx/zynq/ directory of U-Boot for natively supported ps7_init +files. If the ps7_init files for your board are not found in U-Boot, +you need to add them by yourself. + +1) Start with a defconfig supported by Buildroot (e.g. Zedboard) + make zynq_zed_defconfig + +2) make uboot-menuconfig + Visit the following menu and enable CONFIG_ZYNQ_CUSTOM_INIT. + + ARM architecture ---> + [*] Use custom ps7_init provided by Xilinx tool + +3) Copy ps7_init_gpl.c/h generated by the Xilinx tools into + output/build/uboot-xilinx-/board/xilinx/zynq/custom_hw_platform/ + +4) make + +Note: The files in step 3 will need to be re-copied after cleaning the +output directory and at this time, there is no way to save them as +part of the buildroot configuration, except as a U-Boot patch. From 8ec127d8d87f3aa373be94fde2849de4e793131c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 5 Oct 2016 21:11:17 -0300 Subject: [PATCH 0619/3392] configs/mx6udoo: Add initial support Add the initial support for mx6q/dl udoo boards. For information about these boards, please visit: http://www.udoo.org/ In linux.fragment we disable USB support for now because kernel 4.8 hangs on udoo board. This is been addressed by Peter Chen's kernel patch series that provides a standard way to reset a USB hub. When such series hit mainline, then we can bump the kernel and remove linux.fragment. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/udoo/genimage.cfg | 48 +++++++++++++++++++++++++++++++++++++++ board/udoo/linux.fragment | 1 + board/udoo/post-image.sh | 14 ++++++++++++ board/udoo/readme.txt | 17 ++++++++++++++ configs/mx6udoo_defconfig | 26 +++++++++++++++++++++ 5 files changed, 106 insertions(+) create mode 100644 board/udoo/genimage.cfg create mode 100644 board/udoo/linux.fragment create mode 100755 board/udoo/post-image.sh create mode 100644 board/udoo/readme.txt create mode 100644 configs/mx6udoo_defconfig diff --git a/board/udoo/genimage.cfg b/board/udoo/genimage.cfg new file mode 100644 index 0000000000..4361d540c7 --- /dev/null +++ b/board/udoo/genimage.cfg @@ -0,0 +1,48 @@ +# Minimal microSD card image for Udoo MX6Q/DL boards +# +# We mimic the .sdcard Freescale's image format for i.MX6: +# * the microSD card must have 1 kB free space at the beginning, +# * U-Boot is dumped as is, +# * a FAT partition at offset 16 MB is containing zImage and dtbs, +# * a single root filesystem partition is required (Ext4 in this case). +# + +image boot.vfat { + vfat { + files = { + "imx6q-udoo.dtb", + "imx6dl-udoo.dtb", + "zImage" + } + } + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition SPL { + in-partition-table = "no" + image = "SPL" + offset = 1K + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot.img" + offset = 69K + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 16M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/udoo/linux.fragment b/board/udoo/linux.fragment new file mode 100644 index 0000000000..2acad15757 --- /dev/null +++ b/board/udoo/linux.fragment @@ -0,0 +1 @@ +CONFIG_USB=n diff --git a/board/udoo/post-image.sh b/board/udoo/post-image.sh new file mode 100755 index 0000000000..b4ac4608ff --- /dev/null +++ b/board/udoo/post-image.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/udoo/readme.txt b/board/udoo/readme.txt new file mode 100644 index 0000000000..acd05f6775 --- /dev/null +++ b/board/udoo/readme.txt @@ -0,0 +1,17 @@ +Udoo MX6Q/DL board + +For information about MX6 Udoo boards: +http://www.udoo.org/ + +To build a minimal support for these boards: + + $ make mx6udoo_defconfig + $ make + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a micro SD card: + +dd if=output/images/sdcard.img of=/dev/ + +For details about the medium image layout, see the definition in +board/udoo/genimage.cfg. diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig new file mode 100644 index 0000000000..1ca2be4f6a --- /dev/null +++ b/configs/mx6udoo_defconfig @@ -0,0 +1,26 @@ +BR2_arm=y +BR2_cortex_a9=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/post-image.sh" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="udoo" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-udoo imx6dl-udoo" +# required tools to create the SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 5d4bdb272644675a54ac4a3e7621273ce72db6b8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 14:46:16 +0200 Subject: [PATCH 0620/3392] package/python3: add optional support for lzma Needed by the upcoming python-mwscrape2slob package. Signed-off-by: Bernd Kuhls [Thomas: move "select" after "bool".] Signed-off-by: Thomas Petazzoni --- package/python3/Config.in | 6 ++++++ package/python3/python3.mk | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/package/python3/Config.in b/package/python3/Config.in index 0f4fc88a6e..bf2cd7c11e 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -98,6 +98,12 @@ config BR2_PACKAGE_PYTHON3_PYEXPAT help pyexpat and xml libraries for Python3. +config BR2_PACKAGE_PYTHON3_XZ + bool "xz module" + select BR2_PACKAGE_XZ + help + xz (a.k.a lzma) module for Python3 + config BR2_PACKAGE_PYTHON3_ZLIB bool "zlib module" select BR2_PACKAGE_ZLIB diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 393b9fb2ac..b3f31c0aa0 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -103,6 +103,10 @@ ifeq ($(BR2_PACKAGE_PYTHON3_BZIP2),y) PYTHON3_DEPENDENCIES += bzip2 endif +ifeq ($(BR2_PACKAGE_PYTHON3_XZ),y) +PYTHON3_DEPENDENCIES += xz +endif + ifeq ($(BR2_PACKAGE_PYTHON3_ZLIB),y) PYTHON3_DEPENDENCIES += zlib endif From 01b8d67c50f7adcc78d8afd1b30547812326dd0d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 Oct 2016 22:48:57 +0200 Subject: [PATCH 0621/3392] python3: move "select" after "bool" in Config.in Signed-off-by: Thomas Petazzoni --- package/python3/Config.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python3/Config.in b/package/python3/Config.in index bf2cd7c11e..35f57e65ce 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -40,8 +40,8 @@ menu "core python3 modules" comment "The following modules are unusual or require extra libraries" config BR2_PACKAGE_PYTHON3_BZIP2 - select BR2_PACKAGE_BZIP2 bool "bz2 module" + select BR2_PACKAGE_BZIP2 help bzip2 module for Python3 @@ -51,14 +51,14 @@ config BR2_PACKAGE_PYTHON3_CODECSCJK Chinese/Japanese/Korean codecs module for Python (large). config BR2_PACKAGE_PYTHON3_CURSES - select BR2_PACKAGE_NCURSES bool "curses module" + select BR2_PACKAGE_NCURSES help curses module for Python3. config BR2_PACKAGE_PYTHON3_DECIMAL - select BR2_PACKAGE_MPDECIMAL bool "decimal module" + select BR2_PACKAGE_MPDECIMAL help decimal module for Python3. @@ -68,15 +68,15 @@ config BR2_PACKAGE_PYTHON3_OSSAUDIODEV ossaudiodev module for Python3. config BR2_PACKAGE_PYTHON3_READLINE - select BR2_PACKAGE_READLINE bool "readline" + select BR2_PACKAGE_READLINE help readline module for Python3 (required for command-line editing in the Python shell). config BR2_PACKAGE_PYTHON3_SSL - select BR2_PACKAGE_OPENSSL bool "ssl" + select BR2_PACKAGE_OPENSSL help _ssl module for Python3 (required for https in urllib etc). @@ -93,8 +93,8 @@ config BR2_PACKAGE_PYTHON3_SQLITE SQLite database support config BR2_PACKAGE_PYTHON3_PYEXPAT - select BR2_PACKAGE_EXPAT bool "xml module" + select BR2_PACKAGE_EXPAT help pyexpat and xml libraries for Python3. From 8238368d0540318ae2446c6ed1324a356ac5993d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 14:46:17 +0200 Subject: [PATCH 0622/3392] package/python-couchdb: new package Needed by upcoming python-mwscrape package. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-couchdb/Config.in | 8 ++++++++ package/python-couchdb/python-couchdb.hash | 3 +++ package/python-couchdb/python-couchdb.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-couchdb/Config.in create mode 100644 package/python-couchdb/python-couchdb.hash create mode 100644 package/python-couchdb/python-couchdb.mk diff --git a/package/Config.in b/package/Config.in index a1da86a201..f919bd54da 100644 --- a/package/Config.in +++ b/package/Config.in @@ -657,6 +657,7 @@ menu "External python modules" source "package/python-coherence/Config.in" source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" + source "package/python-couchdb/Config.in" source "package/python-crc16/Config.in" source "package/python-crcmod/Config.in" source "package/python-crossbar/Config.in" diff --git a/package/python-couchdb/Config.in b/package/python-couchdb/Config.in new file mode 100644 index 0000000000..9156883b38 --- /dev/null +++ b/package/python-couchdb/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_COUCHDB + bool "python-couchdb" + select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime + help + Python client library for working with CouchDB. + + https://github.com/djc/couchdb-python/ diff --git a/package/python-couchdb/python-couchdb.hash b/package/python-couchdb/python-couchdb.hash new file mode 100644 index 0000000000..f9422a8ce7 --- /dev/null +++ b/package/python-couchdb/python-couchdb.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/couchdb/json, sha256 locally computed +md5 2ed5ad2a477fd3cb472ed6dc5a381ff3 CouchDB-1.1.tar.gz +sha256 9503ea413956c33b5e2af248235afb5e0f011f33f816a32e872f8ff9b0a0e710 CouchDB-1.1.tar.gz diff --git a/package/python-couchdb/python-couchdb.mk b/package/python-couchdb/python-couchdb.mk new file mode 100644 index 0000000000..c88787c1db --- /dev/null +++ b/package/python-couchdb/python-couchdb.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-couchdb +# +################################################################################ + +PYTHON_COUCHDB_VERSION = 1.1 +PYTHON_COUCHDB_SOURCE = CouchDB-$(PYTHON_COUCHDB_VERSION).tar.gz +PYTHON_COUCHDB_SITE = https://pypi.python.org/packages/9a/e8/c3c8da6d00145aaca07f2b784794917613dad26532068da4e8392dc48d7f +PYTHON_COUCHDB_SETUP_TYPE = setuptools +PYTHON_COUCHDB_LICENSE = BSD-3c +PYTHON_COUCHDB_LICENSE_FILES = COPYING + +$(eval $(python-package)) From bfe76ebfb9accd2b33a2d3d7cd679cb6e8ddaea0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 14:46:18 +0200 Subject: [PATCH 0623/3392] package/python-futures: new package Needed by upcoming python-mwscrape package. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-futures/Config.in | 7 +++++++ package/python-futures/python-futures.hash | 3 +++ package/python-futures/python-futures.mk | 14 ++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/python-futures/Config.in create mode 100644 package/python-futures/python-futures.hash create mode 100644 package/python-futures/python-futures.mk diff --git a/package/Config.in b/package/Config.in index f919bd54da..d418126d6a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -682,6 +682,7 @@ menu "External python modules" source "package/python-flask-jsonrpc/Config.in" source "package/python-flask-login/Config.in" source "package/python-flup/Config.in" + source "package/python-futures/Config.in" source "package/python-gobject/Config.in" source "package/python-html5lib/Config.in" source "package/python-httplib2/Config.in" diff --git a/package/python-futures/Config.in b/package/python-futures/Config.in new file mode 100644 index 0000000000..2eb40e93bd --- /dev/null +++ b/package/python-futures/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_FUTURES + bool "python-futures" + depends on BR2_PACKAGE_PYTHON # not needed for python3 + help + Backport of the concurrent.futures package from Python 3.2. + + https://github.com/agronholm/pythonfutures diff --git a/package/python-futures/python-futures.hash b/package/python-futures/python-futures.hash new file mode 100644 index 0000000000..f0948ae4e2 --- /dev/null +++ b/package/python-futures/python-futures.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/futures/json, sha256 locally computed +md5 ced2c365e518242512d7a398b515ff95 futures-3.0.5.tar.gz +sha256 0542525145d5afc984c88f914a0c85c77527f65946617edb5274f72406f981df futures-3.0.5.tar.gz diff --git a/package/python-futures/python-futures.mk b/package/python-futures/python-futures.mk new file mode 100644 index 0000000000..8a1afa3386 --- /dev/null +++ b/package/python-futures/python-futures.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-futures +# +################################################################################ + +PYTHON_FUTURES_VERSION = 3.0.5 +PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz +PYTHON_FUTURES_SITE = https://pypi.python.org/packages/55/db/97c1ca37edab586a1ae03d6892b6633d8eaa23b23ac40c7e5bbc55423c78 +PYTHON_FUTURES_SETUP_TYPE = setuptools +PYTHON_FUTURES_LICENSE = BSD-2c +PYTHON_FUTURES_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From ae86d30913786765aecce38177a99353c7e800aa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 14:46:19 +0200 Subject: [PATCH 0624/3392] package/python-pylru: new package Needed by upcoming python-mwscrape package. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-pylru/Config.in | 6 ++++++ package/python-pylru/python-pylru.hash | 3 +++ package/python-pylru/python-pylru.mk | 14 ++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/python-pylru/Config.in create mode 100644 package/python-pylru/python-pylru.hash create mode 100644 package/python-pylru/python-pylru.mk diff --git a/package/Config.in b/package/Config.in index d418126d6a..db4f72246c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -736,6 +736,7 @@ menu "External python modules" source "package/python-pygame/Config.in" source "package/python-pygments/Config.in" source "package/python-pyinotify/Config.in" + source "package/python-pylru/Config.in" source "package/python-pymysql/Config.in" source "package/python-pynacl/Config.in" source "package/python-pyopenssl/Config.in" diff --git a/package/python-pylru/Config.in b/package/python-pylru/Config.in new file mode 100644 index 0000000000..c174576942 --- /dev/null +++ b/package/python-pylru/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYLRU + bool "python-pylru" + help + A least recently used (LRU) cache implementation. + + https://github.com/jlhutch/pylru diff --git a/package/python-pylru/python-pylru.hash b/package/python-pylru/python-pylru.hash new file mode 100644 index 0000000000..806ea36a0f --- /dev/null +++ b/package/python-pylru/python-pylru.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/pylru/json, sha256 locally computed +md5 41369d58a1c4391c5cc36f84262abcdc pylru-1.0.9.tar.gz +sha256 71376192671f0ad1690b2a7427d39a29b1df994c8469a9b46b03ed7e28c0172c pylru-1.0.9.tar.gz diff --git a/package/python-pylru/python-pylru.mk b/package/python-pylru/python-pylru.mk new file mode 100644 index 0000000000..e670f3d1cf --- /dev/null +++ b/package/python-pylru/python-pylru.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pylru +# +################################################################################ + +PYTHON_PYLRU_VERSION = 1.0.9 +PYTHON_PYLRU_SOURCE = pylru-$(PYTHON_PYLRU_VERSION).tar.gz +PYTHON_PYLRU_SITE = https://pypi.python.org/packages/c0/7d/0de1055632f3871dfeaabe5a3f0510317cd98b93e7b792b44e4c7de2b17b +PYTHON_PYLRU_SETUP_TYPE = distutils +PYTHON_PYLRU_LICENSE = GPLv2 +PYTHON_PYLRU_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From 1519e5311097f9fd1779ab1f6e706a8cd7f9830b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 14:46:20 +0200 Subject: [PATCH 0625/3392] package/python-mwclient: new package Needed by upcoming python-mwscrape package. Signed-off-by: Bernd Kuhls Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...01-use-exec-in-py3-compatible-manner.patch | 36 +++++++++++++++++++ package/python-mwclient/Config.in | 8 +++++ package/python-mwclient/python-mwclient.hash | 3 ++ package/python-mwclient/python-mwclient.mk | 14 ++++++++ 5 files changed, 62 insertions(+) create mode 100644 package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch create mode 100644 package/python-mwclient/Config.in create mode 100644 package/python-mwclient/python-mwclient.hash create mode 100644 package/python-mwclient/python-mwclient.mk diff --git a/package/Config.in b/package/Config.in index db4f72246c..66dfb159be 100644 --- a/package/Config.in +++ b/package/Config.in @@ -709,6 +709,7 @@ menu "External python modules" source "package/python-meld3/Config.in" source "package/python-mistune/Config.in" source "package/python-msgpack/Config.in" + source "package/python-mwclient/Config.in" source "package/python-netaddr/Config.in" source "package/python-netifaces/Config.in" source "package/python-networkmanager/Config.in" diff --git a/package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch b/package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch new file mode 100644 index 0000000000..ac7838a7f7 --- /dev/null +++ b/package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch @@ -0,0 +1,36 @@ +From 5de1bb82465d39962e26175c62f644a3e423d030 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 21 Jan 2016 17:21:52 -0800 +Subject: [PATCH] use 'exec' in py3-compatible manner + +per https://docs.python.org/2/reference/simple_stmts.html , +as exec is a function not a statement in py3, the py2 version +has been set to allow the subsequent statement to be a tuple, +so we can invoke it like this to make it both py2 and py3 +compatible. Without this, byte-compiling the file fails under +py3. + +Signed-off-by: Bernd Kuhls +--- +downloaded from upstream commit: +https://github.com/mwclient/mwclient/commit/5de1bb82465d39962e26175c62f644a3e423d030 + + mwclient/ex.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mwclient/ex.py b/mwclient/ex.py +index db4006c..c0b1eae 100644 +--- a/mwclient/ex.py ++++ b/mwclient/ex.py +@@ -12,7 +12,7 @@ def read_config(config_files, **predata): + + def _read_config_file(_config_file, predata): + _file = open(_config_file) +- exec _file in globals(), predata ++ exec(_file, globals(), predata) + _file.close() + + for _k, _v in predata.iteritems(): +-- +2.9.3 + diff --git a/package/python-mwclient/Config.in b/package/python-mwclient/Config.in new file mode 100644 index 0000000000..be8897864c --- /dev/null +++ b/package/python-mwclient/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_MWCLIENT + bool "python-mwclient" + select BR2_PACKAGE_PYTHON_REQUESTS # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + help + MediaWiki API client. + + https://github.com/btongminh/mwclient diff --git a/package/python-mwclient/python-mwclient.hash b/package/python-mwclient/python-mwclient.hash new file mode 100644 index 0000000000..109897173e --- /dev/null +++ b/package/python-mwclient/python-mwclient.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/mwclient/json, sha256 locally computed +md5 c1334facf2d6ca54fe6dba4ab75ecf34 mwclient-0.8.1.tar.gz +sha256 5f892711cc0b23ff2a6d8b7986ee63cd43fd1ec92b0783604ffa7613cd1662e4 mwclient-0.8.1.tar.gz diff --git a/package/python-mwclient/python-mwclient.mk b/package/python-mwclient/python-mwclient.mk new file mode 100644 index 0000000000..1f1e209661 --- /dev/null +++ b/package/python-mwclient/python-mwclient.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-mwclient +# +################################################################################ + +PYTHON_MWCLIENT_VERSION = 0.8.1 +PYTHON_MWCLIENT_SOURCE = mwclient-$(PYTHON_MWCLIENT_VERSION).tar.gz +PYTHON_MWCLIENT_SITE = https://pypi.python.org/packages/19/79/481b288a497f625ee8f76141ff3472d81428b1f14b7155a28a63a3247197 +PYTHON_MWCLIENT_LICENSE = MIT +PYTHON_MWCLIENT_LICENSE_FILES = mwclient/__init__.py +PYTHON_MWCLIENT_SETUP_TYPE = setuptools + +$(eval $(python-package)) From b8babf842b0ca2584895586b6ba53f78f9204ff1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 14:46:21 +0200 Subject: [PATCH 0626/3392] package/python-mwscrape: new package Signed-off-by: Bernd Kuhls [Thomas: fix license, it's MPL-2.0, not BSD-3c.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-mwscrape/Config.in | 11 +++++++++++ package/python-mwscrape/python-mwscrape.hash | 2 ++ package/python-mwscrape/python-mwscrape.mk | 13 +++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-mwscrape/Config.in create mode 100644 package/python-mwscrape/python-mwscrape.hash create mode 100644 package/python-mwscrape/python-mwscrape.mk diff --git a/package/Config.in b/package/Config.in index 66dfb159be..6172f0f721 100644 --- a/package/Config.in +++ b/package/Config.in @@ -710,6 +710,7 @@ menu "External python modules" source "package/python-mistune/Config.in" source "package/python-msgpack/Config.in" source "package/python-mwclient/Config.in" + source "package/python-mwscrape/Config.in" source "package/python-netaddr/Config.in" source "package/python-netifaces/Config.in" source "package/python-networkmanager/Config.in" diff --git a/package/python-mwscrape/Config.in b/package/python-mwscrape/Config.in new file mode 100644 index 0000000000..273ce9a4a8 --- /dev/null +++ b/package/python-mwscrape/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_MWSCRAPE + bool "python-mwscrape" + depends on BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_COUCHDB # runtime + select BR2_PACKAGE_PYTHON_FUTURES # runtime + select BR2_PACKAGE_PYTHON_MWCLIENT # runtime + select BR2_PACKAGE_PYTHON_PYLRU # runtime + help + Download rendered articles from MediaWiki API to CouchDB + + https://github.com/itkach/mwscrape diff --git a/package/python-mwscrape/python-mwscrape.hash b/package/python-mwscrape/python-mwscrape.hash new file mode 100644 index 0000000000..b91ef69a28 --- /dev/null +++ b/package/python-mwscrape/python-mwscrape.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 8de8a5ef257851f6e1e41247f64710f48859a5e3f91ebc7200bb60769f02f296 python-mwscrape-6a58d7801eb1e884fd0516f1adbedbd4481c10e6.tar.gz diff --git a/package/python-mwscrape/python-mwscrape.mk b/package/python-mwscrape/python-mwscrape.mk new file mode 100644 index 0000000000..47b943f45f --- /dev/null +++ b/package/python-mwscrape/python-mwscrape.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-mwscrape +# +################################################################################ + +PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6 +PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION)) +PYTHON_MWSCRAPE_LICENSE = MPL-2.0 +PYTHON_MWSCRAPE_LICENSE_FILES = LICENSE.txt +PYTHON_MWSCRAPE_SETUP_TYPE = distutils + +$(eval $(python-package)) From 0b26a01906df2a3862feca130e4d08f084afb5d9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 14:46:22 +0200 Subject: [PATCH 0627/3392] package/python-cssutils: new package Needed for upcoming python-mwscrape2slob package. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-cssutils/Config.in | 8 ++++++++ package/python-cssutils/python-cssutils.hash | 3 +++ package/python-cssutils/python-cssutils.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-cssutils/Config.in create mode 100644 package/python-cssutils/python-cssutils.hash create mode 100644 package/python-cssutils/python-cssutils.mk diff --git a/package/Config.in b/package/Config.in index 6172f0f721..10381e4e5a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -663,6 +663,7 @@ menu "External python modules" source "package/python-crossbar/Config.in" source "package/python-cryptography/Config.in" source "package/python-cssselect/Config.in" + source "package/python-cssutils/Config.in" source "package/python-daemon/Config.in" source "package/python-dataproperty/Config.in" source "package/python-dateutil/Config.in" diff --git a/package/python-cssutils/Config.in b/package/python-cssutils/Config.in new file mode 100644 index 0000000000..74de742c31 --- /dev/null +++ b/package/python-cssutils/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_CSSUTILS + bool "python-cssutils" + select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime + select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime + help + A CSS Cascading Style Sheets library for Python. + + http://cthedot.de/cssutils/ diff --git a/package/python-cssutils/python-cssutils.hash b/package/python-cssutils/python-cssutils.hash new file mode 100644 index 0000000000..7b188bcd43 --- /dev/null +++ b/package/python-cssutils/python-cssutils.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/cssutils/json, sha256 locally computed +md5 7fcdf2c3e9f053136af1990146eb361d cssutils-1.0.1.tar.gz +sha256 d8a18b2848ea1011750231f1dd64fe9053dbec1be0b37563c582561e7a529063 cssutils-1.0.1.tar.gz diff --git a/package/python-cssutils/python-cssutils.mk b/package/python-cssutils/python-cssutils.mk new file mode 100644 index 0000000000..3dd501aa04 --- /dev/null +++ b/package/python-cssutils/python-cssutils.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-cssutils +# +################################################################################ + +PYTHON_CSSUTILS_VERSION = 1.0.1 +PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz +PYTHON_CSSUTILS_SITE = https://pypi.python.org/packages/22/de/6b03e0088baf0299ab7d2e95a9e26c2092e9cb3855876b958b6a62175ca2 +PYTHON_CSSUTILS_LICENSE = LGPLv3+ +PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER +PYTHON_CSSUTILS_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 49b7a57d351719ee0148f21b5a807836de59c934 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 14:46:23 +0200 Subject: [PATCH 0628/3392] package/python-pyicu: new package Needed for the upcoming python-slob package. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-pyicu/Config.in | 13 +++++++++++++ package/python-pyicu/python-pyicu.hash | 3 +++ package/python-pyicu/python-pyicu.mk | 15 +++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 package/python-pyicu/Config.in create mode 100644 package/python-pyicu/python-pyicu.hash create mode 100644 package/python-pyicu/python-pyicu.mk diff --git a/package/Config.in b/package/Config.in index 10381e4e5a..406a5ea5d6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -738,6 +738,7 @@ menu "External python modules" source "package/python-pyftpdlib/Config.in" source "package/python-pygame/Config.in" source "package/python-pygments/Config.in" + source "package/python-pyicu/Config.in" source "package/python-pyinotify/Config.in" source "package/python-pylru/Config.in" source "package/python-pymysql/Config.in" diff --git a/package/python-pyicu/Config.in b/package/python-pyicu/Config.in new file mode 100644 index 0000000000..a3578f10c1 --- /dev/null +++ b/package/python-pyicu/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_PYICU + bool "python-pyicu" + depends on !BR2_BINFMT_FLAT # icu + depends on BR2_INSTALL_LIBSTDCPP # icu + select BR2_PACKAGE_ICU + help + Python extension wrapping the ICU C++ API. + + http://pyicu.osafoundation.org/ + +comment "python-pyicu needs a toolchain w/ C++" + depends on !BR2_BINFMT_FLAT + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pyicu/python-pyicu.hash b/package/python-pyicu/python-pyicu.hash new file mode 100644 index 0000000000..a05a30ee96 --- /dev/null +++ b/package/python-pyicu/python-pyicu.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/PyICU/json, sha256 locally computed +md5 fadaf9f85830632f915cb85875ae9a39 PyICU-1.9.3.tar.gz +sha256 1a7a96212cb3e42e8df85b9062f1f1d6e207474d44f087218fad1d4ec210fa42 PyICU-1.9.3.tar.gz diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk new file mode 100644 index 0000000000..fa3a7f4195 --- /dev/null +++ b/package/python-pyicu/python-pyicu.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-pyicu +# +################################################################################ + +PYTHON_PYICU_VERSION = 1.9.3 +PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz +PYTHON_PYICU_SITE = https://pypi.python.org/packages/bf/1f/cea237f542e3bb592980008a734850e8cbbc25c19c72c98767c71c1bd9c2 +PYTHON_PYICU_LICENSE = MIT +PYTHON_PYICU_LICENSE_FILES = LICENSE +PYTHON_PYICU_DEPENDENCIES = icu +PYTHON_PYICU_SETUP_TYPE = setuptools + +$(eval $(python-package)) From 4eaf9b248f9af6df9d511efd85abfd101db44145 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 14:46:24 +0200 Subject: [PATCH 0629/3392] package/python-slob: new package Needed for the upcoming python-mwscrape2slob package. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-slob/Config.in | 17 +++++++++++++++++ package/python-slob/python-slob.hash | 2 ++ package/python-slob/python-slob.mk | 13 +++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/python-slob/Config.in create mode 100644 package/python-slob/python-slob.hash create mode 100644 package/python-slob/python-slob.mk diff --git a/package/Config.in b/package/Config.in index 406a5ea5d6..6e071ef850 100644 --- a/package/Config.in +++ b/package/Config.in @@ -782,6 +782,7 @@ menu "External python modules" source "package/python-singledispatch/Config.in" source "package/python-sip/Config.in" source "package/python-six/Config.in" + source "package/python-slob/Config.in" source "package/python-smbus-cffi/Config.in" source "package/python-socketio/Config.in" source "package/python-spidev/Config.in" diff --git a/package/python-slob/Config.in b/package/python-slob/Config.in new file mode 100644 index 0000000000..2c8ddb0880 --- /dev/null +++ b/package/python-slob/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_PYTHON_SLOB + bool "python-slob" + depends on !BR2_BINFMT_FLAT # python-pyicu -> icu + depends on BR2_INSTALL_LIBSTDCPP # python-pyicu -> icu + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PYICU # runtime + # although optional, it is used as default compression + select BR2_PACKAGE_PYTHON3_XZ # runtime + help + slob.py is a reference implementation of slob format reader + and writer. + + https://github.com/itkach/slob + +comment "python-slob needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-slob/python-slob.hash b/package/python-slob/python-slob.hash new file mode 100644 index 0000000000..39d5d81f30 --- /dev/null +++ b/package/python-slob/python-slob.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 18eb4f45d09d49b1f776cac52ea70ab951566c60cd30bbec39e88f10908fd8ff python-slob-31ad0e769360a5b10a4893f686587bb8e48c3895.tar.gz diff --git a/package/python-slob/python-slob.mk b/package/python-slob/python-slob.mk new file mode 100644 index 0000000000..474c0c94df --- /dev/null +++ b/package/python-slob/python-slob.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-slob +# +################################################################################ + +PYTHON_SLOB_VERSION = 31ad0e769360a5b10a4893f686587bb8e48c3895 +PYTHON_SLOB_SITE = $(call github,itkach,slob,$(PYTHON_SLOB_VERSION)) +PYTHON_SLOB_LICENSE = GPLv3 +PYTHON_SLOB_LICENSE_FILES = LICENSE +PYTHON_SLOB_SETUP_TYPE = distutils + +$(eval $(python-package)) From 24a688857aeba207cce88e079c1ccfc2bcadbaab Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Oct 2016 16:31:44 +0200 Subject: [PATCH 0630/3392] package/python-mwscrape2slob: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-mwscrape2slob/Config.in | 19 +++++++++++++++++++ .../python-mwscrape2slob.hash | 2 ++ .../python-mwscrape2slob.mk | 12 ++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 package/python-mwscrape2slob/Config.in create mode 100644 package/python-mwscrape2slob/python-mwscrape2slob.hash create mode 100644 package/python-mwscrape2slob/python-mwscrape2slob.mk diff --git a/package/Config.in b/package/Config.in index 6e071ef850..60184ce99f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -712,6 +712,7 @@ menu "External python modules" source "package/python-msgpack/Config.in" source "package/python-mwclient/Config.in" source "package/python-mwscrape/Config.in" + source "package/python-mwscrape2slob/Config.in" source "package/python-netaddr/Config.in" source "package/python-netifaces/Config.in" source "package/python-networkmanager/Config.in" diff --git a/package/python-mwscrape2slob/Config.in b/package/python-mwscrape2slob/Config.in new file mode 100644 index 0000000000..799ab29c34 --- /dev/null +++ b/package/python-mwscrape2slob/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB + bool "python-mwscrape2slob" + depends on !BR2_BINFMT_FLAT # python-slob -> python-pyicu -> icu + depends on BR2_INSTALL_LIBSTDCPP # python-slob -> python-pyicu -> icu + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_COUCHDB # runtime + select BR2_PACKAGE_PYTHON_CSSSELECT # runtime + select BR2_PACKAGE_PYTHON_CSSUTILS # runtime + select BR2_PACKAGE_PYTHON_LXML # runtime + select BR2_PACKAGE_PYTHON_SLOB # runtime + help + A tool to create slob with content from a MediaWiki CouchDB + created by mwscrape. + + https://github.com/itkach/mwscrape2slob + +comment "python-mwscrape2slob needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-mwscrape2slob/python-mwscrape2slob.hash b/package/python-mwscrape2slob/python-mwscrape2slob.hash new file mode 100644 index 0000000000..f1f5e4f166 --- /dev/null +++ b/package/python-mwscrape2slob/python-mwscrape2slob.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 367ffc3203f7eb2cc26211f58c0693526652d9a238af48c88f936920e804faf7 python-mwscrape2slob-0f9124ed62009dff6a230947d80340f5a61a6f49.tar.gz diff --git a/package/python-mwscrape2slob/python-mwscrape2slob.mk b/package/python-mwscrape2slob/python-mwscrape2slob.mk new file mode 100644 index 0000000000..4d27d8d6ea --- /dev/null +++ b/package/python-mwscrape2slob/python-mwscrape2slob.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# python-mwscrape2slob +# +################################################################################ + +PYTHON_MWSCRAPE2SLOB_VERSION = 0f9124ed62009dff6a230947d80340f5a61a6f49 +PYTHON_MWSCRAPE2SLOB_SITE = $(call github,itkach,mwscrape2slob,$(PYTHON_MWSCRAPE2SLOB_VERSION)) +PYTHON_MWSCRAPE2SLOB_LICENSE = GPLv3, Apache-2.0 (MathJax), GPL (MediaWiki monobook style sheet) +PYTHON_MWSCRAPE2SLOB_SETUP_TYPE = distutils + +$(eval $(python-package)) From 6bce311efcfa69bfe28eb7ed12a5c1b61f625d80 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 18:39:07 -0300 Subject: [PATCH 0631/3392] Revert "Revert "libglib2: bump to version 2.50.0"" This reverts commit 40da5b434d0d25662b447f14b724245da04ed90d. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libglib2/Config.in | 2 ++ package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 84ee816a89..80c7d6749b 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_ZLIB depends on BR2_USE_WCHAR # gettext depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 35728e2e33..3bc4021477 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,2 +1,2 @@ -# https://download.gnome.org/sources/glib/2.48/glib-2.48.2.sha256sum -sha256 f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 glib-2.48.2.tar.xz +# https://download.gnome.org/sources/glib/2.50/glib-2.50.0.sha256sum +sha256 830b551fa626bda06e12729205b3c5bb0d82b924a8cf64d948945878f01b7d70 glib-2.50.0.tar.xz diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 6b1a387946..5bc6ed5f6d 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.48 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 +LIBGLIB2_VERSION_MAJOR = 2.50 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPLv2+ @@ -102,7 +102,7 @@ HOST_LIBGLIB2_CONF_OPTS = \ LIBGLIB2_DEPENDENCIES = \ host-pkgconf host-libglib2 host-gettext \ - libffi pcre zlib $(if $(BR2_NEEDS_GETTEXT),gettext) + libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext) HOST_LIBGLIB2_DEPENDENCIES = \ host-gettext host-libffi host-pcre host-pkgconf host-zlib From bec4e518be7dc094b9158973c3d34acd2ca95a79 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 18:39:08 -0300 Subject: [PATCH 0632/3392] Revert "Revert "libglib2: add host-util-linux for host variant"" This reverts commit 2f556ab99f51a0b90183610a7fecb9ed22ed4aa3. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libglib2/libglib2.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 5bc6ed5f6d..f199a4aa2d 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -105,7 +105,12 @@ LIBGLIB2_DEPENDENCIES = \ libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext) HOST_LIBGLIB2_DEPENDENCIES = \ - host-gettext host-libffi host-pcre host-pkgconf host-zlib + host-gettext \ + host-libffi \ + host-pcre \ + host-pkgconf \ + host-util-linux \ + host-zlib LIBGLIB2_CONF_OPTS = \ --with-pcre=system From d74e5975daee19a262c0c16726661dd2be395705 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 18:39:09 -0300 Subject: [PATCH 0633/3392] util-linux: fix crc32 function collision When linking both zlib and libblkid statically in the same target a collision occurs. Fix this by prefixing publicly-visible crc32 library functions. Fixes: http://autobuild.buildroot.net/results/25e/25efb79dd6ff1d93b5775baeccda23194d68c711/ Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...01-lib-crc32-prefix-public-functions.patch | 182 ++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 package/util-linux/0001-lib-crc32-prefix-public-functions.patch diff --git a/package/util-linux/0001-lib-crc32-prefix-public-functions.patch b/package/util-linux/0001-lib-crc32-prefix-public-functions.patch new file mode 100644 index 0000000000..fa68bd01e7 --- /dev/null +++ b/package/util-linux/0001-lib-crc32-prefix-public-functions.patch @@ -0,0 +1,182 @@ +From b39b4cac29dcc5d060d8e30344f693462502066a Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Mon, 10 Oct 2016 17:42:42 -0300 +Subject: [PATCH] lib/crc32: prefix public functions + +Make the publicly-visible crc32 library functions prefixed by ul_, such +as crc32() -> ul_crc32(). +This is because it clashes with the crc32() function from zlib. +For newer versions of glib (2.50+) zlib and libblkid are required +dependencies and otherwise results in build failure when building +statically. + +Signed-off-by: Gustavo Zacarias +--- +Status: submitted upstream + + disk-utils/fsck.cramfs.c | 12 ++++++------ + disk-utils/mkfs.cramfs.c | 6 +++--- + include/crc32.h | 4 ++-- + lib/crc32.c | 4 ++-- + libblkid/src/partitions/gpt.c | 2 +- + libblkid/src/superblocks/nilfs.c | 6 +++--- + libfdisk/src/gpt.c | 2 +- + 7 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c +index 12009f2..f34e79f 100644 +--- a/disk-utils/fsck.cramfs.c ++++ b/disk-utils/fsck.cramfs.c +@@ -214,7 +214,7 @@ static void test_crc(int start) + return; + } + +- crc = crc32(0L, Z_NULL, 0); ++ crc = ul_crc32(0L, Z_NULL, 0); + + buf = + mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); +@@ -231,8 +231,8 @@ static void test_crc(int start) + } + if (buf != MAP_FAILED) { + ((struct cramfs_super *)((unsigned char *) buf + start))->fsid.crc = +- crc32(0L, Z_NULL, 0); +- crc = crc32(crc, (unsigned char *) buf + start, super.size - start); ++ ul_crc32(0L, Z_NULL, 0); ++ crc = ul_crc32(crc, (unsigned char *) buf + start, super.size - start); + munmap(buf, super.size); + } else { + int retval; +@@ -249,15 +249,15 @@ static void test_crc(int start) + break; + if (length == 0) + ((struct cramfs_super *)buf)->fsid.crc = +- crc32(0L, Z_NULL, 0); ++ ul_crc32(0L, Z_NULL, 0); + length += retval; + if (length > (super.size - start)) { +- crc = crc32(crc, buf, ++ crc = ul_crc32(crc, buf, + retval - (length - + (super.size - start))); + break; + } +- crc = crc32(crc, buf, retval); ++ crc = ul_crc32(crc, buf, retval); + } + free(buf); + } +diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c +index 4e6b3ab..55d6871 100644 +--- a/disk-utils/mkfs.cramfs.c ++++ b/disk-utils/mkfs.cramfs.c +@@ -406,7 +406,7 @@ static unsigned int write_superblock(struct entry *root, char *base, int size) + super->size = size; + memcpy(super->signature, CRAMFS_SIGNATURE, sizeof(super->signature)); + +- super->fsid.crc = crc32(0L, Z_NULL, 0); ++ super->fsid.crc = ul_crc32(0L, Z_NULL, 0); + super->fsid.edition = opt_edition; + super->fsid.blocks = total_blocks; + super->fsid.files = total_nodes; +@@ -700,7 +700,7 @@ int main(int argc, char **argv) + loff_t fslen_ub = sizeof(struct cramfs_super); + unsigned int fslen_max; + char const *dirname, *outfile; +- uint32_t crc = crc32(0L, Z_NULL, 0); ++ uint32_t crc = ul_crc32(0L, Z_NULL, 0); + int c; + cramfs_is_big_endian = HOST_IS_BIG_ENDIAN; /* default is to use host order */ + +@@ -856,7 +856,7 @@ int main(int argc, char **argv) + sizeof(struct cramfs_super)); + + /* Put the checksum in. */ +- crc = crc32(crc, (unsigned char *) (rom_image+opt_pad), (offset-opt_pad)); ++ crc = ul_crc32(crc, (unsigned char *) (rom_image+opt_pad), (offset-opt_pad)); + ((struct cramfs_super *) (rom_image+opt_pad))->fsid.crc = u32_toggle_endianness(cramfs_is_big_endian, crc); + if (verbose) + printf(_("CRC: %x\n"), crc); +diff --git a/include/crc32.h b/include/crc32.h +index ff2dd99..2551f50 100644 +--- a/include/crc32.h ++++ b/include/crc32.h +@@ -4,8 +4,8 @@ + #include + #include + +-extern uint32_t crc32(uint32_t seed, const unsigned char *buf, size_t len); +-extern uint32_t crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len, ++extern uint32_t ul_crc32(uint32_t seed, const unsigned char *buf, size_t len); ++extern uint32_t ul_crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len, + size_t exclude_off, size_t exclude_len); + + #endif +diff --git a/lib/crc32.c b/lib/crc32.c +index a5e3216..824693d 100644 +--- a/lib/crc32.c ++++ b/lib/crc32.c +@@ -108,7 +108,7 @@ static inline uint32_t crc32_add_char(uint32_t crc, unsigned char c) + * and does __not__ xor at the end. Then individual users can do + * whatever they need. + */ +-uint32_t crc32(uint32_t seed, const unsigned char *buf, size_t len) ++uint32_t ul_crc32(uint32_t seed, const unsigned char *buf, size_t len) + { + uint32_t crc = seed; + const unsigned char *p = buf; +@@ -121,7 +121,7 @@ uint32_t crc32(uint32_t seed, const unsigned char *buf, size_t len) + return crc; + } + +-uint32_t crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len, ++uint32_t ul_crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len, + size_t exclude_off, size_t exclude_len) + { + uint32_t crc = seed; +diff --git a/libblkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c +index dcc04e6..e6baa59 100644 +--- a/libblkid/src/partitions/gpt.c ++++ b/libblkid/src/partitions/gpt.c +@@ -105,7 +105,7 @@ struct gpt_entry { + static inline uint32_t count_crc32(const unsigned char *buf, size_t len, + size_t exclude_off, size_t exclude_len) + { +- return (crc32_exclude_offset(~0L, buf, len, exclude_off, exclude_len) ^ ~0L); ++ return (ul_crc32_exclude_offset(~0L, buf, len, exclude_off, exclude_len) ^ ~0L); + } + + static inline unsigned char *get_lba_buffer(blkid_probe pr, +diff --git a/libblkid/src/superblocks/nilfs.c b/libblkid/src/superblocks/nilfs.c +index ee5c5f9..95538ef 100644 +--- a/libblkid/src/superblocks/nilfs.c ++++ b/libblkid/src/superblocks/nilfs.c +@@ -89,9 +89,9 @@ static int nilfs_valid_sb(blkid_probe pr, struct nilfs_super_block *sb, int is_b + if (bytes < crc_start || bytes > sizeof(struct nilfs_super_block)) + return 0; + +- crc = crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff); +- crc = crc32(crc, sum, 4); +- crc = crc32(crc, (unsigned char *)sb + crc_start, bytes - crc_start); ++ crc = ul_crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff); ++ crc = ul_crc32(crc, sum, 4); ++ crc = ul_crc32(crc, (unsigned char *)sb + crc_start, bytes - crc_start); + + return blkid_probe_verify_csum(pr, crc, le32_to_cpu(sb->s_sum)); + } +diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c +index 8377192..208699b 100644 +--- a/libfdisk/src/gpt.c ++++ b/libfdisk/src/gpt.c +@@ -850,7 +850,7 @@ fail: + static inline uint32_t count_crc32(const unsigned char *buf, size_t len, + size_t ex_off, size_t ex_len) + { +- return (crc32_exclude_offset(~0L, buf, len, ex_off, ex_len) ^ ~0L); ++ return (ul_crc32_exclude_offset(~0L, buf, len, ex_off, ex_len) ^ ~0L); + } + + static inline uint32_t gpt_header_count_crc32(struct gpt_header *header) +-- +2.7.3 + From f7742092104b2875e0752782f19afeb00b046f13 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 19:51:57 -0300 Subject: [PATCH 0634/3392] debianutils: bump to version 4.8 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/debianutils/debianutils.hash | 4 ++-- package/debianutils/debianutils.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/debianutils/debianutils.hash b/package/debianutils/debianutils.hash index 4d1b57403f..212d321802 100644 --- a/package/debianutils/debianutils.hash +++ b/package/debianutils/debianutils.hash @@ -1,2 +1,2 @@ -# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.7.dsc -sha256 a269cacd40f52f2fa5d5636357714a49e8538459c16d77772efaa23711fe53d9 debianutils_4.7.tar.xz +# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.8.dsc +sha256 afa95bbe6b6fd3ef3c0c838b2d7232f09fabeff593ca4b5583cffa6748567ee2 debianutils_4.8.tar.xz diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk index 17f0240e84..566d0ad48c 100644 --- a/package/debianutils/debianutils.mk +++ b/package/debianutils/debianutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -DEBIANUTILS_VERSION = 4.7 +DEBIANUTILS_VERSION = 4.8 DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.xz -DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20160126T220153Z/pool/main/d/debianutils +DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20160629T224408Z/pool/main/d/debianutils DEBIANUTILS_CONF_OPTS = --exec-prefix=/ # Make sure we override the busybox tools, such as which DEBIANUTILS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) From f962221f0e73f6dff69686282b265aa52b04673d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 19:52:14 -0300 Subject: [PATCH 0635/3392] ifupdown: bump to version 0.8.16 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/ifupdown/ifupdown.hash | 4 ++-- package/ifupdown/ifupdown.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash index 5f59d281a7..01353c639b 100644 --- a/package/ifupdown/ifupdown.hash +++ b/package/ifupdown/ifupdown.hash @@ -1,2 +1,2 @@ -# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.13.dsc -sha256 90938bf6a2bb31b0ed4d8b2be71beb909c334af64c9284b3f50820cbaeff49b6 ifupdown_0.8.13.tar.xz +# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.16.dsc +sha256 601416c12e39ac29022951a2867aed5c607f732ac57fd51517bfba92a4cc4fb0 ifupdown_0.8.16.tar.xz diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk index 156496b221..ad0e513f93 100644 --- a/package/ifupdown/ifupdown.mk +++ b/package/ifupdown/ifupdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -IFUPDOWN_VERSION = 0.8.13 +IFUPDOWN_VERSION = 0.8.16 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160604T232714Z/pool/main/i/ifupdown +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) IFUPDOWN_LICENSE = GPLv2+ IFUPDOWN_LICENSE_FILES = COPYING From c6bb41c4ed413c7e190460b18277783420f4e6f3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 19:52:29 -0300 Subject: [PATCH 0636/3392] start-stop-daemon: bump to version 1.8.10 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/start-stop-daemon/start-stop-daemon.hash | 4 ++-- package/start-stop-daemon/start-stop-daemon.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/start-stop-daemon/start-stop-daemon.hash b/package/start-stop-daemon/start-stop-daemon.hash index 18a19486c6..7ce6cc3663 100644 --- a/package/start-stop-daemon/start-stop-daemon.hash +++ b/package/start-stop-daemon/start-stop-daemon.hash @@ -1,2 +1,2 @@ -# From http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_1.18.7.dsc -sha256 ace36d3a6dc750a42baf797f9e75ec580a21f92bb9ff96b482100755d6d9b87b dpkg_1.18.7.tar.xz +# From http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_1.18.10.dsc +sha256 025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5 dpkg_1.18.10.tar.xz diff --git a/package/start-stop-daemon/start-stop-daemon.mk b/package/start-stop-daemon/start-stop-daemon.mk index d849badf6f..5aac541707 100644 --- a/package/start-stop-daemon/start-stop-daemon.mk +++ b/package/start-stop-daemon/start-stop-daemon.mk @@ -7,9 +7,9 @@ # Debian start-stop-daemon is part of dpkg. Since start-stop-daemon is the only # interesting tool in it, we call the buildroot package start-stop-daemon. -START_STOP_DAEMON_VERSION = 1.18.7 +START_STOP_DAEMON_VERSION = 1.18.10 START_STOP_DAEMON_SOURCE = dpkg_$(START_STOP_DAEMON_VERSION).tar.xz -START_STOP_DAEMON_SITE = http://snapshot.debian.org/archive/debian/20160509T100042Z/pool/main/d/dpkg +START_STOP_DAEMON_SITE = http://snapshot.debian.org/archive/debian/20160731T221931Z/pool/main/d/dpkg START_STOP_DAEMON_CONF_OPTS = \ --disable-dselect \ --disable-update-alternatives \ From 92310c993f0a4d54272026254ef98899f5f02175 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 10 Oct 2016 21:09:58 +0200 Subject: [PATCH 0637/3392] DEVELOPERS: add myself for mwscrape-related python packages Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 240fb2c1e5..0ae3150a36 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -235,7 +235,16 @@ F: package/perl-www-robotrules/ F: package/pixman/ F: package/pound/ F: package/pure-ftpd/ +F: package/python-couchdb/ +F: package/python-cssutils/ +F: package/python-futures/ +F: package/python-mwclient/ +F: package/python-mwscrape/ +F: package/python-mwscrape2slob/ F: package/python-mako/ +F: package/python-pyicu/ +F: package/python-pylru/ +F: package/python-slob/ F: package/rtmpdump/ F: package/softether/ F: package/taglib/ From 053e21def21edf2412c4b2ec2f7df1bc797a1710 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 18:03:12 -0300 Subject: [PATCH 0638/3392] webkitgtk: add upstream patch for failed gcc6 builds Signed-off-by: Gustavo Zacarias [Thomas: add upstream patch description in the patch.] Signed-off-by: Thomas Petazzoni --- package/webkitgtk/0001-fix-gcc6-builds.patch | 53 ++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/webkitgtk/0001-fix-gcc6-builds.patch diff --git a/package/webkitgtk/0001-fix-gcc6-builds.patch b/package/webkitgtk/0001-fix-gcc6-builds.patch new file mode 100644 index 0000000000..35487ad55a --- /dev/null +++ b/package/webkitgtk/0001-fix-gcc6-builds.patch @@ -0,0 +1,53 @@ +[CMake] Build failure with GCC 6 (fatal error: stdlib.h: No such file or directory) + +https://bugs.webkit.org/show_bug.cgi?id=161697 + +Reviewed by Michael Catanzaro. + +Get the list of system includes from GCC and add it to the CMake +list of implicit includes. This way, CMake will filter any of this +directories from the list of includes when calling the compiler. + +This avoids an issue with GCC 6 that causes build failures when +including the default include path as a system include (-isystem). + +Upstream, from: https://trac.webkit.org/changeset/205672 + +Signed-off-by: Gustavo Zacarias + +Index: trunk/Source/cmake/OptionsCommon.cmake +=================================================================== +--- trunk/Source/cmake/OptionsCommon.cmake (revision 204084) ++++ trunk/Source/cmake/OptionsCommon.cmake (revision 205672) +@@ -36,4 +36,31 @@ + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics") ++endif () ++ ++# Ensure that the default include system directories are added to the list of CMake implicit includes. ++# This workarounds an issue that happens when using GCC 6 and using system includes (-isystem). ++# For more details check: https://bugs.webkit.org/show_bug.cgi?id=161697 ++macro(DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _compiler _flags _result) ++ file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n") ++ separate_arguments(_buildFlags UNIX_COMMAND "${_flags}") ++ execute_process(COMMAND ${_compiler} ${_buildFlags} -v -E -x ${_lang} -dD dummy ++ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles OUTPUT_QUIET ++ ERROR_VARIABLE _gccOutput) ++ file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy") ++ if ("${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list") ++ set(${_result} ${CMAKE_MATCH_1}) ++ string(REPLACE "\n" " " ${_result} "${${_result}}") ++ separate_arguments(${_result}) ++ endif () ++endmacro() ++ ++if (CMAKE_COMPILER_IS_GNUCC) ++ DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c" "${CMAKE_C_COMPILER}" "${CMAKE_C_FLAGS}" SYSTEM_INCLUDE_DIRS) ++ set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS}) ++endif () ++ ++if (CMAKE_COMPILER_IS_GNUCXX) ++ DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c++" "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_FLAGS}" SYSTEM_INCLUDE_DIRS) ++ set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS}) + endif () + From 4ed51b3982a10850d89b303ab72cda5542a3b7e7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 14:14:03 -0300 Subject: [PATCH 0639/3392] busybox: bump to version 1.25.1 Drop upstream patches. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/busybox/0003-gzip.patch | 18 ----------------- ...e-free-prev_hist-out-of-signal-path.patch} | 0 package/busybox/0004-ip.patch | 18 ----------------- package/busybox/0005-ntpd.patch | 20 ------------------- package/busybox/busybox.hash | 6 +++--- package/busybox/busybox.mk | 2 +- 6 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 package/busybox/0003-gzip.patch rename package/busybox/{0006-top-move-free-prev_hist-out-of-signal-path.patch => 0003-top-move-free-prev_hist-out-of-signal-path.patch} (100%) delete mode 100644 package/busybox/0004-ip.patch delete mode 100644 package/busybox/0005-ntpd.patch diff --git a/package/busybox/0003-gzip.patch b/package/busybox/0003-gzip.patch deleted file mode 100644 index f9b321fc57..0000000000 --- a/package/busybox/0003-gzip.patch +++ /dev/null @@ -1,18 +0,0 @@ -From upstream: https://busybox.net/downloads/fixes-1.25.0/ - -Signed-off-by: Gustavo Zacarias - ---- busybox-1.25.0/archival/gzip.c -+++ busybox-1.25.0-gzip/archival/gzip.c -@@ -2220,10 +2220,7 @@ int gzip_main(int argc UNUSED_PARAM, cha - opt >>= ENABLE_GUNZIP ? 7 : 5; /* drop cfv[dt]qn bits */ - if (opt == 0) - opt = 1 << 6; /* default: 6 */ -- /* Map 1..3 to 4 */ -- if (opt & 0x7) -- opt |= 1 << 4; -- opt = ffs(opt >> 3); -+ opt = ffs(opt >> 4); /* Maps -1..-4 to [0], -5 to [1] ... -9 to [5] */ - max_chain_length = 1 << gzip_level_config[opt].chain_shift; - good_match = gzip_level_config[opt].good; - max_lazy_match = gzip_level_config[opt].lazy2 * 2; diff --git a/package/busybox/0006-top-move-free-prev_hist-out-of-signal-path.patch b/package/busybox/0003-top-move-free-prev_hist-out-of-signal-path.patch similarity index 100% rename from package/busybox/0006-top-move-free-prev_hist-out-of-signal-path.patch rename to package/busybox/0003-top-move-free-prev_hist-out-of-signal-path.patch diff --git a/package/busybox/0004-ip.patch b/package/busybox/0004-ip.patch deleted file mode 100644 index d392adc196..0000000000 --- a/package/busybox/0004-ip.patch +++ /dev/null @@ -1,18 +0,0 @@ -From upstream: https://busybox.net/downloads/fixes-1.25.0/ - -Signed-off-by: Gustavo Zacarias - ---- busybox-1.25.0/networking/libiproute/iproute.c -+++ busybox-1.25.0-ip/networking/libiproute/iproute.c -@@ -362,10 +362,9 @@ IF_FEATURE_IP_RULE(ARG_table,) - req.r.rtm_scope = RT_SCOPE_NOWHERE; - - if (cmd != RTM_DELROUTE) { -+ req.r.rtm_scope = RT_SCOPE_UNIVERSE; - if (RTPROT_BOOT != 0) - req.r.rtm_protocol = RTPROT_BOOT; -- if (RT_SCOPE_UNIVERSE != 0) -- req.r.rtm_scope = RT_SCOPE_UNIVERSE; - if (RTN_UNICAST != 0) - req.r.rtm_type = RTN_UNICAST; - } diff --git a/package/busybox/0005-ntpd.patch b/package/busybox/0005-ntpd.patch deleted file mode 100644 index f652ec667c..0000000000 --- a/package/busybox/0005-ntpd.patch +++ /dev/null @@ -1,20 +0,0 @@ -From upstream: https://busybox.net/downloads/fixes-1.25.0/ - -Signed-off-by: Gustavo Zacarias - ---- busybox-1.25.0/networking/ntpd.c -+++ busybox-1.25.0-ntpd/networking/ntpd.c -@@ -2051,6 +2051,13 @@ recv_and_process_client_pkt(void /*int f - goto bail; - } - -+ /* Respond only to client and symmetric active packets */ -+ if ((msg.m_status & MODE_MASK) != MODE_CLIENT -+ && (msg.m_status & MODE_MASK) != MODE_SYM_ACT -+ ) { -+ goto bail; -+ } -+ - query_status = msg.m_status; - query_xmttime = msg.m_xmttime; - diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index e9e06915ab..8306de979d 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,3 +1,3 @@ -# From http://busybox.net/downloads/busybox-1.25.0.tar.bz2.sign -md5 b05af9645076f75429a8683f8afcbdb3 busybox-1.25.0.tar.bz2 -sha1 c6c759bf4c4f24b37f52e136e2b15d921a8d44cb busybox-1.25.0.tar.bz2 +# From http://busybox.net/downloads/busybox-1.25.1.tar.bz2.sign +md5 4f4c5de50b479b11ff636d7d8eb902a2 busybox-1.25.1.tar.bz2 +sha1 8b227b3efdb4c4aa94750f80cc63429aec6daa0b busybox-1.25.1.tar.bz2 diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 895f4ca9bd..fc23a90a29 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.25.0 +BUSYBOX_VERSION = 1.25.1 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPLv2 From d99a717d953124ea8543da814c004e7de2a08be0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 14:33:40 -0300 Subject: [PATCH 0640/3392] shared-mime-info: bump to version 1.7 Switch URLs to avoid 301s. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/shared-mime-info/Config.in | 2 +- package/shared-mime-info/shared-mime-info.hash | 2 +- package/shared-mime-info/shared-mime-info.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/shared-mime-info/Config.in b/package/shared-mime-info/Config.in index 91a5a15a05..514044bea2 100644 --- a/package/shared-mime-info/Config.in +++ b/package/shared-mime-info/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_SHARED_MIME_INFO database of common types and the update-mime-database command used to extend it. - http://freedesktop.org/wiki/Software/shared-mime-info + https://freedesktop.org/wiki/Software/shared-mime-info/ comment "shared-mime-info needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU diff --git a/package/shared-mime-info/shared-mime-info.hash b/package/shared-mime-info/shared-mime-info.hash index 997751d995..2007e0efea 100644 --- a/package/shared-mime-info/shared-mime-info.hash +++ b/package/shared-mime-info/shared-mime-info.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b2f8f85b6467933824180d0252bbcaee523f550a8fbc95cc4391bd43c03bc34c shared-mime-info-1.6.tar.xz +sha256 eacc781cfebaa2074e43cf9521dc7ab4391ace8a4712902b2841669c83144d2e shared-mime-info-1.7.tar.xz diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk index a70bc9a1c4..e917ab54f3 100644 --- a/package/shared-mime-info/shared-mime-info.mk +++ b/package/shared-mime-info/shared-mime-info.mk @@ -4,9 +4,9 @@ # ################################################################################ -SHARED_MIME_INFO_VERSION = 1.6 +SHARED_MIME_INFO_VERSION = 1.7 SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.xz -SHARED_MIME_INFO_SITE = http://freedesktop.org/~hadess +SHARED_MIME_INFO_SITE = https://people.freedesktop.org/~hadess SHARED_MIME_INFO_INSTALL_STAGING = YES SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint SHARED_MIME_INFO_DEPENDENCIES = host-shared-mime-info libxml2 libglib2 From 0b193980f3685193a4dc854158dd9ae94a4dcc3e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 12:56:08 -0300 Subject: [PATCH 0641/3392] xterm: bump to version 327 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/xterm/xterm.hash | 2 +- package/xterm/xterm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 206bb91689..bbd0e11002 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 3b31b07a0c40427e9330ec3be9d1a748c72808f945953cea9e526e48be315f1b xterm-325.tgz +sha256 66fb2f6c35b342148f549c276b12a3aa3fb408e27ab6360ddec513e14376150b xterm-327.tgz diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 3495ad9446..eba781ffb8 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 325 +XTERM_VERSION = 327 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From 52d1fe236dee7a32ca242074dd0577dafe1ddee0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 11 Oct 2016 20:26:19 -0300 Subject: [PATCH 0642/3392] libglib2: bump to version 2.50.1 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 3bc4021477..02c38ad066 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,2 +1,2 @@ -# https://download.gnome.org/sources/glib/2.50/glib-2.50.0.sha256sum -sha256 830b551fa626bda06e12729205b3c5bb0d82b924a8cf64d948945878f01b7d70 glib-2.50.0.tar.xz +# https://download.gnome.org/sources/glib/2.50/glib-2.50.1.sha256sum +sha256 2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd glib-2.50.1.tar.xz diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index f199a4aa2d..a9b93c69d9 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.50 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).1 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPLv2+ From 2ef67797e1040885d39c7f471ecc41a1b80eaa09 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 11 Oct 2016 20:26:36 -0300 Subject: [PATCH 0643/3392] vala: bump to version 0.34.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index b8d47a6f70..78367d0df7 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,2 +1,2 @@ -# From https://download.gnome.org/sources/vala/0.34/vala-0.34.0.sha256sum -sha256 5d59e1ad4c59debc83687b593345a3cf9ef2e9020354145e59a188de4348f455 vala-0.34.0.tar.xz +# From https://download.gnome.org/sources/vala/0.34/vala-0.34.1.sha256sum +sha256 f5ccfcfc460a0c6797bfbd7e739042bf5988a0f44d82278dbe1880c0e5f29299 vala-0.34.1.tar.xz diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 2a4d25799f..3333cf4a9c 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ################################################################################ VALA_VERSION_MAJOR = 0.34 -VALA_VERSION = $(VALA_VERSION_MAJOR).0 +VALA_VERSION = $(VALA_VERSION_MAJOR).1 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPLv2.1+ From 59fe141496f95d5db91039e8a018ea4964ac3c5d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 11 Oct 2016 20:26:53 -0300 Subject: [PATCH 0644/3392] gvfs: bump to version 1.30.1 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 9c534875c2..a7f0b8997b 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.30/gvfs-1.30.0.sha256sum -sha256 2285d387213eef528f09df4b113d9d2e54ce7108c50587355d07f2a885840da4 gvfs-1.30.0.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.30/gvfs-1.30.1.sha256sum +sha256 e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b gvfs-1.30.1.tar.xz diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 50a2fa216b..897b1a9769 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -5,7 +5,7 @@ ################################################################################ GVFS_VERSION_MAJOR = 1.30 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).0 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 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 5abf7b5f406277cc095dbcafd7f8215b1155b370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 11 Oct 2016 21:50:06 +0200 Subject: [PATCH 0645/3392] package/libupnpp: bump to version 0.15.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove patches applied upstream. No need to set AUTORECONF anymore. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- .../libupnpp/0001-Check-for-std-future.patch | 127 ------------------ .../libupnpp/0002-Add-pkg-config-file.patch | 63 --------- package/libupnpp/libupnpp.hash | 4 +- package/libupnpp/libupnpp.mk | 6 +- 4 files changed, 3 insertions(+), 197 deletions(-) delete mode 100644 package/libupnpp/0001-Check-for-std-future.patch delete mode 100644 package/libupnpp/0002-Add-pkg-config-file.patch diff --git a/package/libupnpp/0001-Check-for-std-future.patch b/package/libupnpp/0001-Check-for-std-future.patch deleted file mode 100644 index 73193953d8..0000000000 --- a/package/libupnpp/0001-Check-for-std-future.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 3bfcb171026c4fd5c7caf807f79184a81c8af5b2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sun, 11 Sep 2016 21:09:22 +0200 -Subject: [PATCH] Check for std::future -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -std::future is not available for all architectures, e.g. it is missing -for ARMv5 (soft-float). - -The problem is that libstdc++ only enables `std::future` if -`ATOMIC_INT_LOCK_FREE > 1` which is not true for the ARMv5 target. - -As the future functionality is not used for much we just ifdef out the -parts from `std::future`. - -Upstream-status: https://github.com/medoc92/libupnpp/issues/8 - -This patch is squashed from two upstream commits: -1/ d3e3cada667cca5b70693b351e5865231275dd82 -2/ 90407dcc206987c8e58d61c64db539489f0717d2 - -Signed-off-by: Jörg Krause ---- - configure.ac | 17 +++++++++++++++++ - libupnpp/config.h.in | 3 +++ - libupnpp/workqueue.h | 14 +++++++++++++- - 3 files changed, 33 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 877a773..9ff2058 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -47,6 +47,23 @@ AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size]) - AC_CHECK_LIB([rt], [clock_gettime], [], []) - AC_CHECK_LIB([pthread], [pthread_create], [], []) - -+# Check that std::future is available. -+AC_LANG_PUSH([C++]) -+CXXFLAGS="-std=c++11 $CXXFLAGS" -+AC_MSG_CHECKING([whether std::future is available]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], -+ [[std::future f;]])], -+ [ AC_DEFINE([HAVE_STD_FUTURE], [1], -+ [Define to 1 if you have the `std::future`.]) -+ have_std_future=yes -+ ], -+ [ -+ have_std_future=no -+ ] -+) -+AC_MSG_RESULT([$have_std_future]) -+AC_LANG_POP -+ - # The 2 following checks for libthreadutil and libixml are normally - # unnecessary and even problematic. libupnpp does not use them directly, - # and they should be used automatically because libupnpp is linked with them. -diff --git a/libupnpp/config.h.in b/libupnpp/config.h.in -index 39fa410..4471855 100644 ---- a/libupnpp/config.h.in -+++ b/libupnpp/config.h.in -@@ -36,6 +36,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_STDLIB_H - -+/* Define to 1 if you have the `std::future`. */ -+#undef HAVE_STD_FUTURE -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_STRINGS_H - -diff --git a/libupnpp/workqueue.h b/libupnpp/workqueue.h -index 52a6138..9c0ec02 100644 ---- a/libupnpp/workqueue.h -+++ b/libupnpp/workqueue.h -@@ -18,7 +18,9 @@ - #define _WORKQUEUE_H_INCLUDED_ - - #include -+#if HAVE_STD_FUTURE - #include -+#endif - #include - #include - #include -@@ -76,10 +78,14 @@ public: - bool start(int nworkers, void *(workproc)(void *), void *arg) { - std::unique_lock lock(m_mutex); - for (int i = 0; i < nworkers; i++) { -- std::packaged_task task(workproc); - Worker w; -+#if HAVE_STD_FUTURE -+ std::packaged_task task(workproc); - w.res = task.get_future(); - w.thr = std::thread(std::move(task), arg); -+#else -+ w.thr = std::thread(workproc, arg); -+#endif - m_worker_threads.push_back(std::move(w)); - } - return true; -@@ -189,7 +195,11 @@ public: - // Workers return (void*)1 if ok - void *statusall = (void*)1; - while (!m_worker_threads.empty()) { -+#if HAVE_STD_FUTURE - void *status = m_worker_threads.front().res.get(); -+#else -+ void *status = (void*) 1; -+#endif - m_worker_threads.front().thr.join(); - if (status == (void *)0) { - statusall = status; -@@ -305,7 +315,9 @@ private: - - struct Worker { - std::thread thr; -+#if HAVE_STD_FUTURE - std::future res; -+#endif - }; - - // Configuration --- -2.9.3 - diff --git a/package/libupnpp/0002-Add-pkg-config-file.patch b/package/libupnpp/0002-Add-pkg-config-file.patch deleted file mode 100644 index 377b5e09a1..0000000000 --- a/package/libupnpp/0002-Add-pkg-config-file.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 22ec8e3a2b54a4e1fd1340a592f49829d6cde735 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sun, 11 Sep 2016 22:26:33 +0200 -Subject: [PATCH] Add pkg-config file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add a pkg-config file. - -Fetched from: -https://github.com/medoc92/libupnpp/commit/9f03bb0e7b47e2843edea6f25ed9eabbfb6412df - -Signed-off-by: Jörg Krause ---- - Makefile.am | 3 +++ - configure.ac | 1 + - libupnpp.pc.in | 12 ++++++++++++ - 3 files changed, 16 insertions(+) - create mode 100644 libupnpp.pc.in - -diff --git a/Makefile.am b/Makefile.am -index 2d20b9b..39559e9 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -112,3 +112,6 @@ nobase_include_HEADERS = \ - libupnpp_la_LDFLAGS = -version-info $(VERSION_INFO) - - libupnpp_la_LIBADD = $(LIBUPNPP_LIBS) -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = libupnpp.pc -diff --git a/configure.ac b/configure.ac -index 9ff2058..89525b3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -90,4 +90,5 @@ AC_SUBST(LIBUPNPP_LIBS) - AC_SUBST(VERSION_INFO) - - AC_CONFIG_FILES([Makefile]) -+AC_CONFIG_FILES([libupnpp.pc]) - AC_OUTPUT -diff --git a/libupnpp.pc.in b/libupnpp.pc.in -new file mode 100644 -index 0000000..90f4b2b ---- /dev/null -+++ b/libupnpp.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE_NAME@ -+Description: C++ wrapper for libupnp -+Version: @PACKAGE_VERSION@ -+Requires: libcurl libupnp -+Libs: -L${libdir} -lupnpp -+Libs.private: -lexpat -lpthread -lrt -+Cflags: -I${includedir} --- -2.9.3 - diff --git a/package/libupnpp/libupnpp.hash b/package/libupnpp/libupnpp.hash index 4edc3b9294..dde4c4f67c 100644 --- a/package/libupnpp/libupnpp.hash +++ b/package/libupnpp/libupnpp.hash @@ -1,2 +1,2 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.15.0.tar.gz.sha256 -sha256 5578389c1928a84cd8ec05c127321b44e2bfafaf3b02ebb8b1d10c10ae2b0aeb libupnpp-0.15.0.tar.gz +# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.15.1.tar.gz.sha256 +sha256 c558e6285d61485e656bc973511396665b68b1d5cfa34db5fa4e64e0f2026c3a libupnpp-0.15.1.tar.gz diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk index d712c214cf..0cb3eae2ca 100644 --- a/package/libupnpp/libupnpp.mk +++ b/package/libupnpp/libupnpp.mk @@ -4,16 +4,12 @@ # ################################################################################ -LIBUPNPP_VERSION = 0.15.0 +LIBUPNPP_VERSION = 0.15.1 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBUPNPP_LICENSE = GPLv2+ LIBUPNPP_LICENSE_FILES = COPYING LIBUPNPP_INSTALL_STAGING = YES LIBUPNPP_DEPENDENCIES = expat libcurl libupnp -# touching configure.ac in: -# 0001-Check-for-std-future.patch -# 0002-Add-pkg-config-file.patch -LIBUPNPP_AUTORECONF = YES # configure script fails to link against the dependencies of libupnp # and libcurl causing detection to fail when statically linking From d3e0249711f3cbd85add1e740551c96575c23fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 11 Oct 2016 21:55:03 +0200 Subject: [PATCH 0646/3392] package/upmpdcli: bump to version 1.2.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove patches applied upstream. As we are not touching configure.ac or Makefile.am anymore there is no need for AUTORECONF. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- .../upmpdcli/0001-fix-jsoncpp-detection.patch | 90 -------------- .../0002-use-pkg-config-for-libupnpp.patch | 66 ----------- ...ding-header-file-log.h-from-libupnpp.patch | 110 ------------------ ...r-jsoncpp-libmpdclient-libmicrohttpd.patch | 105 ----------------- package/upmpdcli/upmpdcli.hash | 2 +- package/upmpdcli/upmpdcli.mk | 6 +- 6 files changed, 2 insertions(+), 377 deletions(-) delete mode 100644 package/upmpdcli/0001-fix-jsoncpp-detection.patch delete mode 100644 package/upmpdcli/0002-use-pkg-config-for-libupnpp.patch delete mode 100644 package/upmpdcli/0003-Fix-including-header-file-log.h-from-libupnpp.patch delete mode 100644 package/upmpdcli/0004-Use-pkg-config-for-jsoncpp-libmpdclient-libmicrohttpd.patch diff --git a/package/upmpdcli/0001-fix-jsoncpp-detection.patch b/package/upmpdcli/0001-fix-jsoncpp-detection.patch deleted file mode 100644 index 69a9a0ed4e..0000000000 --- a/package/upmpdcli/0001-fix-jsoncpp-detection.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 25762953c019ca0c5a047a5fa28f1fe6c78c731a Mon Sep 17 00:00:00 2001 -From: Jean-Francois Dockes -Date: Sun, 11 Sep 2016 13:43:28 +0200 -Subject: [PATCH] fix jsoncpp detection -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The default installation path for the header files is {prefix}/json, but some -system prefers to install the headers in {prefix}/jsoncpp/json. - -This patch from upstream handles both cases now when checking for the jsoncpp -library. - -The patch is squashed of two commits from upstream: -1/ aba96db0cfe8a2e5c825f4448c0ad184e21b50e1 -2/ ce144f19a8c2e8c1e0ec3fe53699e874e5eb43fe - -Signed-off-by: Jörg Krause ---- - configure.ac | 8 +++++++- - src/config.h.in | 6 ++++++ - src/mediaserver/cdplugins/plgwithslave.cxx | 5 +++++ - 3 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f191ad7..108dcce 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -43,9 +43,15 @@ SCCTL_LIBS=$LIBS - AC_CHECK_LIB([microhttpd], [MHD_queue_response], [], []) - - AC_LANG_PUSH([C++]) -+ -+AC_CHECK_HEADERS(json/json.h jsoncpp/json/json.h) - LIBS="$LIBS -ljsoncpp" - AC_LINK_IFELSE([AC_LANG_PROGRAM( -- [#include ], [Json::Features dummy])], -+ [[#ifdef HAVE_JSONCPP_JSON_JSON_H -+ #include -+ #else -+ #include -+ #endif]], [Json::Features dummy])], - [HAVE_JSONCPP=1], - [AC_MSG_ERROR([libjsoncpp not found.])]) - AC_LANG_POP -diff --git a/src/config.h.in b/src/config.h.in -index 1350308..0a33e15 100644 ---- a/src/config.h.in -+++ b/src/config.h.in -@@ -3,6 +3,12 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_INTTYPES_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_JSONCPP_JSON_JSON_H -+ -+/* Define to 1 if you have the header file. */ -+#undef HAVE_JSON_JSON_H -+ - /* Define to 1 if you have the `microhttpd' library (-lmicrohttpd). */ - #undef HAVE_LIBMICROHTTPD - -diff --git a/src/mediaserver/cdplugins/plgwithslave.cxx b/src/mediaserver/cdplugins/plgwithslave.cxx -index 04f0544..545805c 100644 ---- a/src/mediaserver/cdplugins/plgwithslave.cxx -+++ b/src/mediaserver/cdplugins/plgwithslave.cxx -@@ -14,6 +14,7 @@ - * Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -+#include "config.h" - - #include "plgwithslave.hxx" - -@@ -25,7 +26,11 @@ - #include - #include - #include -+#ifdef HAVE_JSONCPP_JSON_JSON_H - #include -+#else -+#include -+#endif - - #include "cmdtalk.h" - #include "pathut.h" --- -2.9.3 - diff --git a/package/upmpdcli/0002-use-pkg-config-for-libupnpp.patch b/package/upmpdcli/0002-use-pkg-config-for-libupnpp.patch deleted file mode 100644 index daef41525f..0000000000 --- a/package/upmpdcli/0002-use-pkg-config-for-libupnpp.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 16bcaaee1c28b972e0cc6a542f511af44306ce6c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 14 Sep 2016 11:43:21 +0200 -Subject: [PATCH] Use pkg-config for libupnpp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use pkg-config for libupnpp to fix build issues when cross-compiling and -building upmpdcli statically. - -Building upmpdcli aborts because of an unsafe header inclusion of -`/usr/include/libupnpp`. Using `{prefix}` to get the header path is wrong for -cross-compilation. Instead of hard-coding the flags for libupnpp use pkg-config -to get the correct ones. - -Upstream-status: https://github.com/medoc92/upmpdcli/pull/49 - -Signed-off-by: Jörg Krause ---- - Makefile.am | 2 +- - configure.ac | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index d0c10a4..5c83aa1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,5 +1,5 @@ - AM_CPPFLAGS = -DDEBUG -g -Wall \ -- -I${prefix}/include/libupnpp \ -+ $(upnpp_CFLAGS) \ - -I$(top_srcdir)/src \ - -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\" - -diff --git a/configure.ac b/configure.ac -index 108dcce..a165b5d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -35,10 +35,10 @@ dnl AC_CHECK_LIB([upnp], [UpnpInit], [], AC_MSG_ERROR([libupnp not found])) - dnl AC_CHECK_LIB([curl], [curl_easy_init], [],AC_MSG_ERROR([libcurl not found])) - dnl AC_CHECK_LIB([expat], [XML_ParserCreate], [],AC_MSG_ERROR([libexpat not found])) - --AC_CHECK_LIB([upnpp], [getsyshwaddr], [], [AC_MSG_ERROR([libupnpp])]) -+PKG_CHECK_MODULES([upnpp], [libupnpp], [], [AC_MSG_ERROR([libupnpp])]) - AC_CHECK_LIB([mpdclient], [mpd_connection_new], [], - AC_MSG_ERROR([libmpdclient not found])) --SCCTL_LIBS=$LIBS -+SCCTL_LIBS="$LIBS $upnpp_LIBS" - - AC_CHECK_LIB([microhttpd], [MHD_queue_response], [], []) - -@@ -56,8 +56,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM( - [AC_MSG_ERROR([libjsoncpp not found.])]) - AC_LANG_POP - --UPMPDCLI_LIBS=$LIBS --echo "UPMPDCLI_LIBS=$LIBS" -+UPMPDCLI_LIBS="$LIBS $upnpp_LIBS" -+echo "UPMPDCLI_LIBS=$UPMPDCLI_LIBS" - - LIBS="" - --- -2.9.3 - diff --git a/package/upmpdcli/0003-Fix-including-header-file-log.h-from-libupnpp.patch b/package/upmpdcli/0003-Fix-including-header-file-log.h-from-libupnpp.patch deleted file mode 100644 index 29e6492a30..0000000000 --- a/package/upmpdcli/0003-Fix-including-header-file-log.h-from-libupnpp.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 366e726821abce305ef2887effea443a24043511 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 14 Sep 2016 11:46:22 +0200 -Subject: [PATCH] Fix including header file log.h from libupnpp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The "log.{h,hxx}" header files are included from libupnpp. - -As we are using the pkg-config file of libupnpp to get the header include path, -instead of the hardcoded `{prefix}/include/libupnpp` these files are not found. - -Upstream-status: https://github.com/medoc92/upmpdcli/issues/46 - -Signed-off-by: Jörg Krause ---- - src/conftree.cpp | 2 +- - src/execmd.cpp | 4 ++-- - src/mediaserver/cdplugins/cmdtalk.cpp | 2 +- - src/mediaserver/cdplugins/plgwithslave.cxx | 2 +- - src/netcon.cpp | 4 ++-- - 5 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/conftree.cpp b/src/conftree.cpp -index 12eb4b5..8a79812 100644 ---- a/src/conftree.cpp -+++ b/src/conftree.cpp -@@ -42,7 +42,7 @@ - - #include "pathut.h" - #include "smallut.h" --#include "log.h" -+#include "libupnpp/log.h" - - using namespace std; - -diff --git a/src/execmd.cpp b/src/execmd.cpp -index 0db9032..9bf2971 100644 ---- a/src/execmd.cpp -+++ b/src/execmd.cpp -@@ -53,7 +53,7 @@ - #include "netcon.h" - #include "closefrom.h" - #include "smallut.h" --#include "log.h" -+#include "libupnpp/log.h" - - using namespace std; - -@@ -1135,7 +1135,7 @@ void ReExec::reexec() - #include - #include - --#include "log.h" -+#include "libupnpp/log.h" - - #include "execmd.h" - #ifdef BUILDING_RECOLL -diff --git a/src/mediaserver/cdplugins/cmdtalk.cpp b/src/mediaserver/cdplugins/cmdtalk.cpp -index eddd68f..e19f7ea 100644 ---- a/src/mediaserver/cdplugins/cmdtalk.cpp -+++ b/src/mediaserver/cdplugins/cmdtalk.cpp -@@ -24,7 +24,7 @@ - - #include "smallut.h" - #include "execmd.h" --#include "log.h" -+#include "libupnpp/log.h" - - using namespace std; - -diff --git a/src/mediaserver/cdplugins/plgwithslave.cxx b/src/mediaserver/cdplugins/plgwithslave.cxx -index 545805c..1ad44ef 100644 ---- a/src/mediaserver/cdplugins/plgwithslave.cxx -+++ b/src/mediaserver/cdplugins/plgwithslave.cxx -@@ -35,7 +35,7 @@ - #include "cmdtalk.h" - #include "pathut.h" - #include "smallut.h" --#include "log.hxx" -+#include "libupnpp/log.hxx" - #include "main.hxx" - #include "conftree.h" - -diff --git a/src/netcon.cpp b/src/netcon.cpp -index 5674cf3..193d1cd 100644 ---- a/src/netcon.cpp -+++ b/src/netcon.cpp -@@ -47,7 +47,7 @@ - - #include - --#include "log.h" -+#include "libupnpp/log.h" - - using namespace std; - -@@ -1031,7 +1031,7 @@ NetconServLis::checkperms(void *cl, int) - #include - #include - --#include "log.h" -+#include "libupnpp/log.h" - - #include "netcon.h" - --- -2.9.3 - diff --git a/package/upmpdcli/0004-Use-pkg-config-for-jsoncpp-libmpdclient-libmicrohttpd.patch b/package/upmpdcli/0004-Use-pkg-config-for-jsoncpp-libmpdclient-libmicrohttpd.patch deleted file mode 100644 index a1f194a3e8..0000000000 --- a/package/upmpdcli/0004-Use-pkg-config-for-jsoncpp-libmpdclient-libmicrohttpd.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 5091e1afd9d0a69bdf10d12d4a66f7147e8185a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Fri, 23 Sep 2016 21:37:36 +0200 -Subject: [PATCH] Use pkg-config for jsoncpp, libmpdclient and libmicrohttpd -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libmpdclient, libmicrohttpd and jsoncpp provide a .pc file. Use -pkg-config for detecting the libraries and for providing the necessary -details for compiling and linking. - -The current build system of upmpdcli does not use PKG_CHECK_MODULES, but -AC_LINK_IFELSE to detect jsoncpp. After bumping jsoncpp version from 1.7.2 to -1.7.5 the detection fails, because the test program does not compile: - -''' -In file included from /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/autolink.h:9:0, - from /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/json.h:9, - from test.c:1: -/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:155:9: error: 'int64_t' does not name a type - typedef int64_t Int64; - ^ -/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:156:9: error: 'uint64_t' does not name a type - typedef uint64_t UInt64; - ^ -/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:158:9: error: 'Int64' does not name a type - typedef Int64 LargestInt; - ^ -/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/config.h:159:9: error: 'UInt64' does not name a type - typedef UInt64 LargestUInt; - ^ -In file included from /usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/json.h:10:0, - from test.c:1: -/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include/json/value.h:184:11: error: 'UInt64' in namespace 'Json' does not name a type - typedef Json::UInt64 UInt64; - -[..] -''' - -Instead of fixing the test program use PKG_CHECK_MODULES to check for -jsoncpp. While we're on it, add it for libmpdclient and libmicrohttpd, too. - -Upstream-status: https://github.com/medoc92/upmpdcli/pull/52 - -Signed-off-by: Jörg Krause ---- - Makefile.am | 3 ++- - configure.ac | 24 +++++++----------------- - 2 files changed, 9 insertions(+), 18 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 5c83aa1..6f6e018 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,5 +1,6 @@ - AM_CPPFLAGS = -DDEBUG -g -Wall \ -- $(upnpp_CFLAGS) \ -+ $(upnpp_CFLAGS) $(libmpdclient_CFLAGS) $(libmicrohttpd_CFLAGS) \ -+ $(jsoncpp_CFLAGS) \ - -I$(top_srcdir)/src \ - -DDATADIR=\"${pkgdatadir}\" -DCONFIGDIR=\"${sysconfdir}\" - -diff --git a/configure.ac b/configure.ac -index a165b5d..0ef0f3b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -36,27 +36,17 @@ dnl AC_CHECK_LIB([curl], [curl_easy_init], [],AC_MSG_ERROR([libcurl not found])) - dnl AC_CHECK_LIB([expat], [XML_ParserCreate], [],AC_MSG_ERROR([libexpat not found])) - - PKG_CHECK_MODULES([upnpp], [libupnpp], [], [AC_MSG_ERROR([libupnpp])]) --AC_CHECK_LIB([mpdclient], [mpd_connection_new], [], -- AC_MSG_ERROR([libmpdclient not found])) --SCCTL_LIBS="$LIBS $upnpp_LIBS" -+PKG_CHECK_MODULES([libmpdclient], [libmpdclient], [], -+ [AC_MSG_ERROR([libmpdclient not found])]) -+SCCTL_LIBS="$LIBS $upnpp_LIBS $libmpdclient_LIBS" - --AC_CHECK_LIB([microhttpd], [MHD_queue_response], [], []) -- --AC_LANG_PUSH([C++]) -+PKG_CHECK_MODULES([libmicrohttpd], [libmicrohttpd], [], -+ [AC_MSG_ERROR([libmicrohttpd not found])]) - - AC_CHECK_HEADERS(json/json.h jsoncpp/json/json.h) --LIBS="$LIBS -ljsoncpp" --AC_LINK_IFELSE([AC_LANG_PROGRAM( -- [[#ifdef HAVE_JSONCPP_JSON_JSON_H -- #include -- #else -- #include -- #endif]], [Json::Features dummy])], -- [HAVE_JSONCPP=1], -- [AC_MSG_ERROR([libjsoncpp not found.])]) --AC_LANG_POP -+PKG_CHECK_MODULES([jsoncpp], [jsoncpp], [], [AC_MSG_ERROR([jsoncpp not found])]) - --UPMPDCLI_LIBS="$LIBS $upnpp_LIBS" -+UPMPDCLI_LIBS="$LIBS $upnpp_LIBS $libmpdclient_LIBS $libmicrohttpd_LIBS $jsoncpp_LIBS" - echo "UPMPDCLI_LIBS=$UPMPDCLI_LIBS" - - LIBS="" --- -2.10.0 - diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index 7e23adcdd0..847cdc23e1 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,2 +1,2 @@ # Manually calculated: -sha256 6a3ad211707d7eca287f7f64688ff2e569d50bc463aa2145b01c98252fe30955 upmpdcli-1.2.2.tar.gz +sha256 a788796e634e243a5ac11db3b19ea872d2bff4d5fb673d058ab7a683ca029dae upmpdcli-1.2.8.tar.gz diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 3beda1bd00..84a876362b 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,15 +4,11 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.2.2 +UPMPDCLI_VERSION = 1.2.8 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp -# touching configure.ac and Makefile.am in -# 0001-fix-jsoncpp-detection.patch -# 0002-use-pkg-config-for-libupnpp.patch -UPMPDCLI_AUTORECONF = YES # Upmpdcli only runs if user upmpdcli exists define UPMPDCLI_USERS From 6c5d0032fd7cff563aedeff0a196857c5e677e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 11 Oct 2016 20:54:50 +0200 Subject: [PATCH 0647/3392] package/wpa_supplicant: bump to version 2.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove all patches as they are applied to or were fetched from upstream. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- .../0001-fix-readline-libs-ordering.patch | 26 ------ ...ata-in-WNM-Sleep-Mode-Response-frame.patch | 32 ------- ...-Fix-last-fragment-length-validation.patch | 54 ------------ ...-Fix-last-fragment-length-validation.patch | 51 ----------- ...-error-path-for-unexpected-Confirm-m.patch | 34 -------- .../0006-fix-libwpa_client.patch | 39 --------- ...ervice-files-according-to-dbus-inter.patch | 77 ----------------- ...a-Credential-with-invalid-passphrase.patch | 85 ------------------- ...eter-set-with-invalid-passphrase-cha.patch | 53 ------------ ...from-wpa_supplicant-config-network-o.patch | 84 ------------------ ...commands-with-newline-characters-in-.patch | 65 -------------- ...nds-with-newline-characters-in-the-s.patch | 53 ------------ package/wpa_supplicant/wpa_supplicant.hash | 2 +- package/wpa_supplicant/wpa_supplicant.mk | 2 +- 14 files changed, 2 insertions(+), 655 deletions(-) delete mode 100644 package/wpa_supplicant/0001-fix-readline-libs-ordering.patch delete mode 100644 package/wpa_supplicant/0002-WNM-Ignore-Key-Data-in-WNM-Sleep-Mode-Response-frame.patch delete mode 100644 package/wpa_supplicant/0003-EAP-pwd-peer-Fix-last-fragment-length-validation.patch delete mode 100644 package/wpa_supplicant/0004-EAP-pwd-server-Fix-last-fragment-length-validation.patch delete mode 100644 package/wpa_supplicant/0005-EAP-pwd-peer-Fix-error-path-for-unexpected-Confirm-m.patch delete mode 100644 package/wpa_supplicant/0006-fix-libwpa_client.patch delete mode 100644 package/wpa_supplicant/0007-systemd-Update-service-files-according-to-dbus-inter.patch delete mode 100644 package/wpa_supplicant/0008-WPS-Reject-a-Credential-with-invalid-passphrase.patch delete mode 100644 package/wpa_supplicant/0009-Reject-psk-parameter-set-with-invalid-passphrase-cha.patch delete mode 100644 package/wpa_supplicant/0010-Remove-newlines-from-wpa_supplicant-config-network-o.patch delete mode 100644 package/wpa_supplicant/0011-Reject-SET_CRED-commands-with-newline-characters-in-.patch delete mode 100644 package/wpa_supplicant/0012-Reject-SET-commands-with-newline-characters-in-the-s.patch diff --git a/package/wpa_supplicant/0001-fix-readline-libs-ordering.patch b/package/wpa_supplicant/0001-fix-readline-libs-ordering.patch deleted file mode 100644 index 2a9b832797..0000000000 --- a/package/wpa_supplicant/0001-fix-readline-libs-ordering.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 631f0893038743cebd2def39df61aceb48bd43a9 -Author: David du Colombier <0intro@gmail.com> -Date: Sun Sep 13 23:40:43 2015 +0200 - - wpa_supplicant: fix static link with readline - - The readline library depends on ncurses, so - it should be set before ncurses on the linker - command line to be able to be statically linked - successfully. - - Signed-off-by: David du Colombier <0intro@gmail.com> - -diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile -index 1597412..581db02 100644 ---- a/wpa_supplicant/Makefile -+++ b/wpa_supplicant/Makefile -@@ -1408,7 +1408,7 @@ LIBS += $(DBUS_LIBS) - - ifdef CONFIG_READLINE - OBJS_c += ../src/utils/edit_readline.o --LIBS_c += -lncurses -lreadline -+LIBS_c += -lreadline -lncurses - else - ifdef CONFIG_WPA_CLI_EDIT - OBJS_c += ../src/utils/edit.o diff --git a/package/wpa_supplicant/0002-WNM-Ignore-Key-Data-in-WNM-Sleep-Mode-Response-frame.patch b/package/wpa_supplicant/0002-WNM-Ignore-Key-Data-in-WNM-Sleep-Mode-Response-frame.patch deleted file mode 100644 index 00e5b7c771..0000000000 --- a/package/wpa_supplicant/0002-WNM-Ignore-Key-Data-in-WNM-Sleep-Mode-Response-frame.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6b12d93d2c7428a34bfd4b3813ba339ed57b698a Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sun, 25 Oct 2015 15:45:50 +0200 -Subject: [PATCH] WNM: Ignore Key Data in WNM Sleep Mode Response frame if no - PMF in use - -WNM Sleep Mode Response frame is used to update GTK/IGTK only if PMF is -enabled. Verify that PMF is in use before using this field on station -side to avoid accepting unauthenticated key updates. (CVE-2015-5310) - -Signed-off-by: Jouni Malinen ---- - wpa_supplicant/wnm_sta.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c -index 954de67..7d79499 100644 ---- a/wpa_supplicant/wnm_sta.c -+++ b/wpa_supplicant/wnm_sta.c -@@ -187,6 +187,12 @@ static void wnm_sleep_mode_exit_success(struct wpa_supplicant *wpa_s, - end = ptr + key_len_total; - wpa_hexdump_key(MSG_DEBUG, "WNM: Key Data", ptr, key_len_total); - -+ if (key_len_total && !wpa_sm_pmf_enabled(wpa_s->wpa)) { -+ wpa_msg(wpa_s, MSG_INFO, -+ "WNM: Ignore Key Data in WNM-Sleep Mode Response - PMF not enabled"); -+ return; -+ } -+ - while (ptr + 1 < end) { - if (ptr + 2 + ptr[1] > end) { - wpa_printf(MSG_DEBUG, "WNM: Invalid Key Data element " diff --git a/package/wpa_supplicant/0003-EAP-pwd-peer-Fix-last-fragment-length-validation.patch b/package/wpa_supplicant/0003-EAP-pwd-peer-Fix-last-fragment-length-validation.patch deleted file mode 100644 index 82c26398b6..0000000000 --- a/package/wpa_supplicant/0003-EAP-pwd-peer-Fix-last-fragment-length-validation.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8057821706784608b828e769ccefbced95591e50 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sun, 1 Nov 2015 18:18:17 +0200 -Subject: [PATCH] EAP-pwd peer: Fix last fragment length validation - -All but the last fragment had their length checked against the remaining -room in the reassembly buffer. This allowed a suitably constructed last -fragment frame to try to add extra data that would go beyond the buffer. -The length validation code in wpabuf_put_data() prevents an actual -buffer write overflow from occurring, but this results in process -termination. (CVE-2015-5315) - -Signed-off-by: Jouni Malinen ---- - src/eap_peer/eap_pwd.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c -index 1f78544..75ceef1 100644 ---- a/src/eap_peer/eap_pwd.c -+++ b/src/eap_peer/eap_pwd.c -@@ -903,7 +903,7 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret, - /* - * buffer and ACK the fragment - */ -- if (EAP_PWD_GET_MORE_BIT(lm_exch)) { -+ if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) { - data->in_frag_pos += len; - if (data->in_frag_pos > wpabuf_size(data->inbuf)) { - wpa_printf(MSG_INFO, "EAP-pwd: Buffer overflow attack " -@@ -916,7 +916,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret, - return NULL; - } - wpabuf_put_data(data->inbuf, pos, len); -- -+ } -+ if (EAP_PWD_GET_MORE_BIT(lm_exch)) { - resp = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_PWD, - EAP_PWD_HDR_SIZE, - EAP_CODE_RESPONSE, eap_get_id(reqData)); -@@ -930,10 +931,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret, - * we're buffering and this is the last fragment - */ - if (data->in_frag_pos) { -- wpabuf_put_data(data->inbuf, pos, len); - wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes", - (int) len); -- data->in_frag_pos += len; - pos = wpabuf_head_u8(data->inbuf); - len = data->in_frag_pos; - } --- -1.9.1 - diff --git a/package/wpa_supplicant/0004-EAP-pwd-server-Fix-last-fragment-length-validation.patch b/package/wpa_supplicant/0004-EAP-pwd-server-Fix-last-fragment-length-validation.patch deleted file mode 100644 index bfc4c74e95..0000000000 --- a/package/wpa_supplicant/0004-EAP-pwd-server-Fix-last-fragment-length-validation.patch +++ /dev/null @@ -1,51 +0,0 @@ -From bef802ece03f9ae9d52a21f0cf4f1bc2c5a1f8aa Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sun, 1 Nov 2015 18:24:16 +0200 -Subject: [PATCH] EAP-pwd server: Fix last fragment length validation - -All but the last fragment had their length checked against the remaining -room in the reassembly buffer. This allowed a suitably constructed last -fragment frame to try to add extra data that would go beyond the buffer. -The length validation code in wpabuf_put_data() prevents an actual -buffer write overflow from occurring, but this results in process -termination. (CVE-2015-5314) - -Signed-off-by: Jouni Malinen ---- - src/eap_server/eap_server_pwd.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/eap_server/eap_server_pwd.c b/src/eap_server/eap_server_pwd.c -index cb83ff7..9f787ab 100644 ---- a/src/eap_server/eap_server_pwd.c -+++ b/src/eap_server/eap_server_pwd.c -@@ -970,7 +970,7 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv, - /* - * the first and all intermediate fragments have the M bit set - */ -- if (EAP_PWD_GET_MORE_BIT(lm_exch)) { -+ if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) { - if ((data->in_frag_pos + len) > wpabuf_size(data->inbuf)) { - wpa_printf(MSG_DEBUG, "EAP-pwd: Buffer overflow " - "attack detected! (%d+%d > %d)", -@@ -981,6 +981,8 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv, - } - wpabuf_put_data(data->inbuf, pos, len); - data->in_frag_pos += len; -+ } -+ if (EAP_PWD_GET_MORE_BIT(lm_exch)) { - wpa_printf(MSG_DEBUG, "EAP-pwd: Got a %d byte fragment", - (int) len); - return; -@@ -990,8 +992,6 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv, - * buffering fragments so that's how we know it's the last) - */ - if (data->in_frag_pos) { -- wpabuf_put_data(data->inbuf, pos, len); -- data->in_frag_pos += len; - pos = wpabuf_head_u8(data->inbuf); - len = data->in_frag_pos; - wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes", --- -1.9.1 - diff --git a/package/wpa_supplicant/0005-EAP-pwd-peer-Fix-error-path-for-unexpected-Confirm-m.patch b/package/wpa_supplicant/0005-EAP-pwd-peer-Fix-error-path-for-unexpected-Confirm-m.patch deleted file mode 100644 index 3088f6a6dc..0000000000 --- a/package/wpa_supplicant/0005-EAP-pwd-peer-Fix-error-path-for-unexpected-Confirm-m.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 95577884ca4fa76be91344ff7a8d5d1e6dc3da61 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sun, 1 Nov 2015 19:35:44 +0200 -Subject: [PATCH] EAP-pwd peer: Fix error path for unexpected Confirm message - -If the Confirm message is received from the server before the Identity -exchange has been completed, the group has not yet been determined and -data->grp is NULL. The error path in eap_pwd_perform_confirm_exchange() -did not take this corner case into account and could end up -dereferencing a NULL pointer and terminating the process if invalid -message sequence is received. (CVE-2015-5316) - -Signed-off-by: Jouni Malinen ---- - src/eap_peer/eap_pwd.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c -index 75ceef1..892b590 100644 ---- a/src/eap_peer/eap_pwd.c -+++ b/src/eap_peer/eap_pwd.c -@@ -774,7 +774,8 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data, - wpabuf_put_data(data->outbuf, conf, SHA256_MAC_LEN); - - fin: -- bin_clear_free(cruft, BN_num_bytes(data->grp->prime)); -+ if (data->grp) -+ bin_clear_free(cruft, BN_num_bytes(data->grp->prime)); - BN_clear_free(x); - BN_clear_free(y); - if (data->outbuf == NULL) { --- -1.9.1 - diff --git a/package/wpa_supplicant/0006-fix-libwpa_client.patch b/package/wpa_supplicant/0006-fix-libwpa_client.patch deleted file mode 100644 index 11c5402374..0000000000 --- a/package/wpa_supplicant/0006-fix-libwpa_client.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6f7e0354a9035ce33742a5f869f817a6b39b2f31 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Thu, 29 Oct 2015 11:39:03 +0100 -Subject: [PATCH 1/1] wpa_supplicant/Makefile: fix libwpa_client -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Building libwpa_client requires src/utils/common.c for bin_clear_free() else -loading the library fails with: - - Error relocating /usr/lib/libwpa_client.so: bin_clear_free: symbol not found - -Backported from: 736b7cb2daf877a0cb9ad42ff15a2efbbd65fa42 - -Signed-off-by: Jörg Krause ---- - wpa_supplicant/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile -index 61f8f18..0c444b0 100644 ---- a/wpa_supplicant/Makefile -+++ b/wpa_supplicant/Makefile -@@ -1706,9 +1706,11 @@ wpa_cli: $(OBJS_c) - - LIBCTRL += ../src/common/wpa_ctrl.o - LIBCTRL += ../src/utils/os_$(CONFIG_OS).o -+LIBCTRL += ../src/utils/common.c - LIBCTRL += ../src/utils/wpa_debug.o - LIBCTRLSO += ../src/common/wpa_ctrl.c - LIBCTRLSO += ../src/utils/os_$(CONFIG_OS).c -+LIBCTRLSO += ../src/utils/common.c - LIBCTRLSO += ../src/utils/wpa_debug.c - - libwpa_client.a: $(LIBCTRL) --- -2.6.2 - diff --git a/package/wpa_supplicant/0007-systemd-Update-service-files-according-to-dbus-inter.patch b/package/wpa_supplicant/0007-systemd-Update-service-files-according-to-dbus-inter.patch deleted file mode 100644 index 59c54506eb..0000000000 --- a/package/wpa_supplicant/0007-systemd-Update-service-files-according-to-dbus-inter.patch +++ /dev/null @@ -1,77 +0,0 @@ -From b6cea24d6191d9ccdcd1ac38a5322e3da73218db Mon Sep 17 00:00:00 2001 -From: Marcin Niestroj -Date: Mon, 11 Apr 2016 13:23:54 +0200 -Subject: [PATCH] systemd: Update service files according to dbus interface - version used - -systemd service files were supplied with old DBus bus name. After -service activation systemd was waiting for appearance of specified bus -name to consider it started successfully. However, if wpa_supplicant was -compiled only with new dbus interface name, then systemd didn't notice -configured (old) DBus bus name appearance. In the end service was -considered malfunctioning and it was deactivated. - -Update systemd service BusName property according to supported DBus -interface version. - -Signed-off-by: Marcin Niestroj ---- - wpa_supplicant/Makefile | 8 ++++++-- - wpa_supplicant/systemd/wpa_supplicant.service.in | 4 ++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile -index ad9ead9..fbd1b25 100644 ---- a/wpa_supplicant/Makefile -+++ b/wpa_supplicant/Makefile -@@ -1374,6 +1374,7 @@ ifndef DBUS_INCLUDE - DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1) - endif - DBUS_CFLAGS += $(DBUS_INCLUDE) -+DBUS_INTERFACE=fi.epitest.hostap.WPASupplicant - endif - - ifdef CONFIG_CTRL_IFACE_DBUS_NEW -@@ -1399,6 +1400,7 @@ DBUS_OBJS += dbus/dbus_new_introspect.o - DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_INTRO - endif - DBUS_CFLAGS += $(DBUS_INCLUDE) -+DBUS_INTERFACE=fi.w1.wpa_supplicant1 - endif - - ifdef DBUS -@@ -1760,11 +1762,13 @@ else - endif - - %.service: %.service.in -- $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ -+ $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' \ -+ -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@ - @$(E) " sed" $< - - %@.service: %.service.arg.in -- $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ -+ $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' \ -+ -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@ - @$(E) " sed" $< - - wpa_supplicant.exe: wpa_supplicant -diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in -index ea964ce..bc5d49a 100644 ---- a/wpa_supplicant/systemd/wpa_supplicant.service.in -+++ b/wpa_supplicant/systemd/wpa_supplicant.service.in -@@ -5,9 +5,9 @@ Wants=network.target - - [Service] - Type=dbus --BusName=fi.epitest.hostap.WPASupplicant -+BusName=@DBUS_INTERFACE@ - ExecStart=@BINDIR@/wpa_supplicant -u - - [Install] - WantedBy=multi-user.target --Alias=dbus-fi.epitest.hostap.WPASupplicant.service -+Alias=dbus-@DBUS_INTERFACE@.service --- -2.8.0 - diff --git a/package/wpa_supplicant/0008-WPS-Reject-a-Credential-with-invalid-passphrase.patch b/package/wpa_supplicant/0008-WPS-Reject-a-Credential-with-invalid-passphrase.patch deleted file mode 100644 index 282aa952b5..0000000000 --- a/package/wpa_supplicant/0008-WPS-Reject-a-Credential-with-invalid-passphrase.patch +++ /dev/null @@ -1,85 +0,0 @@ -From ecbb0b3dc122b0d290987cf9c84010bbe53e1022 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Fri, 4 Mar 2016 17:20:18 +0200 -Subject: [PATCH] WPS: Reject a Credential with invalid passphrase - -WPA/WPA2-Personal passphrase is not allowed to include control -characters. Reject a Credential received from a WPS Registrar both as -STA (Credential) and AP (AP Settings) if the credential is for WPAPSK or -WPA2PSK authentication type and includes an invalid passphrase. - -This fixes an issue where hostapd or wpa_supplicant could have updated -the configuration file PSK/passphrase parameter with arbitrary data from -an external device (Registrar) that may not be fully trusted. Should -such data include a newline character, the resulting configuration file -could become invalid and fail to be parsed. - -Signed-off-by: Jouni Malinen -Signed-off-by: Baruch Siach ---- -Patch status: upstream (ecbb0b3dc122b0d290987cf9c84010bbe53e1022) - - src/utils/common.c | 12 ++++++++++++ - src/utils/common.h | 1 + - src/wps/wps_attr_process.c | 10 ++++++++++ - 3 files changed, 23 insertions(+) - -diff --git a/src/utils/common.c b/src/utils/common.c -index 450e2c6519ba..27b7c02de10b 100644 ---- a/src/utils/common.c -+++ b/src/utils/common.c -@@ -697,6 +697,18 @@ int is_hex(const u8 *data, size_t len) - } - - -+int has_ctrl_char(const u8 *data, size_t len) -+{ -+ size_t i; -+ -+ for (i = 0; i < len; i++) { -+ if (data[i] < 32 || data[i] == 127) -+ return 1; -+ } -+ return 0; -+} -+ -+ - size_t merge_byte_arrays(u8 *res, size_t res_len, - const u8 *src1, size_t src1_len, - const u8 *src2, size_t src2_len) -diff --git a/src/utils/common.h b/src/utils/common.h -index 701dbb236ed5..a97224070385 100644 ---- a/src/utils/common.h -+++ b/src/utils/common.h -@@ -488,6 +488,7 @@ const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len); - - char * wpa_config_parse_string(const char *value, size_t *len); - int is_hex(const u8 *data, size_t len); -+int has_ctrl_char(const u8 *data, size_t len); - size_t merge_byte_arrays(u8 *res, size_t res_len, - const u8 *src1, size_t src1_len, - const u8 *src2, size_t src2_len); -diff --git a/src/wps/wps_attr_process.c b/src/wps/wps_attr_process.c -index eadb22fe2e78..e8c4579309ab 100644 ---- a/src/wps/wps_attr_process.c -+++ b/src/wps/wps_attr_process.c -@@ -229,6 +229,16 @@ static int wps_workaround_cred_key(struct wps_credential *cred) - cred->key_len--; - #endif /* CONFIG_WPS_STRICT */ - } -+ -+ -+ if (cred->auth_type & (WPS_AUTH_WPAPSK | WPS_AUTH_WPA2PSK) && -+ (cred->key_len < 8 || has_ctrl_char(cred->key, cred->key_len))) { -+ wpa_printf(MSG_INFO, "WPS: Reject credential with invalid WPA/WPA2-Personal passphrase"); -+ wpa_hexdump_ascii_key(MSG_INFO, "WPS: Network Key", -+ cred->key, cred->key_len); -+ return -1; -+ } -+ - return 0; - } - --- -2.8.1 - diff --git a/package/wpa_supplicant/0009-Reject-psk-parameter-set-with-invalid-passphrase-cha.patch b/package/wpa_supplicant/0009-Reject-psk-parameter-set-with-invalid-passphrase-cha.patch deleted file mode 100644 index 316c0700ce..0000000000 --- a/package/wpa_supplicant/0009-Reject-psk-parameter-set-with-invalid-passphrase-cha.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 73e4abb24a936014727924d8b0b2965edfc117dd Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Fri, 4 Mar 2016 18:46:41 +0200 -Subject: [PATCH] Reject psk parameter set with invalid passphrase character - -WPA/WPA2-Personal passphrase is not allowed to include control -characters. Reject a passphrase configuration attempt if that passphrase -includes an invalid passphrase. - -This fixes an issue where wpa_supplicant could have updated the -configuration file psk parameter with arbitrary data from the control -interface or D-Bus interface. While those interfaces are supposed to be -accessible only for trusted users/applications, it may be possible that -an untrusted user has access to a management software component that -does not validate the passphrase value before passing it to -wpa_supplicant. - -This could allow such an untrusted user to inject up to 63 characters of -almost arbitrary data into the configuration file. Such configuration -file could result in wpa_supplicant trying to load a library (e.g., -opensc_engine_path, pkcs11_engine_path, pkcs11_module_path, -load_dynamic_eap) from user controlled location when starting again. -This would allow code from that library to be executed under the -wpa_supplicant process privileges. - -Signed-off-by: Jouni Malinen -Signed-off-by: Baruch Siach ---- -Patch status: upstream (73e4abb24a936014727924d8b0b2965edfc117dd) - - wpa_supplicant/config.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c -index b1c7870dafe0..fdd964356afa 100644 ---- a/wpa_supplicant/config.c -+++ b/wpa_supplicant/config.c -@@ -478,6 +478,12 @@ static int wpa_config_parse_psk(const struct parse_data *data, - } - wpa_hexdump_ascii_key(MSG_MSGDUMP, "PSK (ASCII passphrase)", - (u8 *) value, len); -+ if (has_ctrl_char((u8 *) value, len)) { -+ wpa_printf(MSG_ERROR, -+ "Line %d: Invalid passphrase character", -+ line); -+ return -1; -+ } - if (ssid->passphrase && os_strlen(ssid->passphrase) == len && - os_memcmp(ssid->passphrase, value, len) == 0) { - /* No change to the previously configured value */ --- -2.8.1 - diff --git a/package/wpa_supplicant/0010-Remove-newlines-from-wpa_supplicant-config-network-o.patch b/package/wpa_supplicant/0010-Remove-newlines-from-wpa_supplicant-config-network-o.patch deleted file mode 100644 index 8a40dcecfe..0000000000 --- a/package/wpa_supplicant/0010-Remove-newlines-from-wpa_supplicant-config-network-o.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 0fe5a234240a108b294a87174ad197f6b5cb38e9 Mon Sep 17 00:00:00 2001 -From: Paul Stewart -Date: Thu, 3 Mar 2016 15:40:19 -0800 -Subject: [PATCH] Remove newlines from wpa_supplicant config network output - -Spurious newlines output while writing the config file can corrupt the -wpa_supplicant configuration. Avoid writing these for the network block -parameters. This is a generic filter that cover cases that may not have -been explicitly addressed with a more specific commit to avoid control -characters in the psk parameter. - -Signed-off-by: Paul Stewart -Signed-off-by: Baruch Siach ---- -Patch status: upstream (0fe5a234240a108b294a87174ad197f6b5cb38e9) - - src/utils/common.c | 11 +++++++++++ - src/utils/common.h | 1 + - wpa_supplicant/config.c | 15 +++++++++++++-- - 3 files changed, 25 insertions(+), 2 deletions(-) - -diff --git a/src/utils/common.c b/src/utils/common.c -index 27b7c02de10b..9856463242c7 100644 ---- a/src/utils/common.c -+++ b/src/utils/common.c -@@ -709,6 +709,17 @@ int has_ctrl_char(const u8 *data, size_t len) - } - - -+int has_newline(const char *str) -+{ -+ while (*str) { -+ if (*str == '\n' || *str == '\r') -+ return 1; -+ str++; -+ } -+ return 0; -+} -+ -+ - size_t merge_byte_arrays(u8 *res, size_t res_len, - const u8 *src1, size_t src1_len, - const u8 *src2, size_t src2_len) -diff --git a/src/utils/common.h b/src/utils/common.h -index a97224070385..d19927b375bf 100644 ---- a/src/utils/common.h -+++ b/src/utils/common.h -@@ -489,6 +489,7 @@ const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len); - char * wpa_config_parse_string(const char *value, size_t *len); - int is_hex(const u8 *data, size_t len); - int has_ctrl_char(const u8 *data, size_t len); -+int has_newline(const char *str); - size_t merge_byte_arrays(u8 *res, size_t res_len, - const u8 *src1, size_t src1_len, - const u8 *src2, size_t src2_len); -diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c -index fdd964356afa..eb97cd5e4e6e 100644 ---- a/wpa_supplicant/config.c -+++ b/wpa_supplicant/config.c -@@ -2699,8 +2699,19 @@ char * wpa_config_get(struct wpa_ssid *ssid, const char *var) - - for (i = 0; i < NUM_SSID_FIELDS; i++) { - const struct parse_data *field = &ssid_fields[i]; -- if (os_strcmp(var, field->name) == 0) -- return field->writer(field, ssid); -+ if (os_strcmp(var, field->name) == 0) { -+ char *ret = field->writer(field, ssid); -+ -+ if (ret && has_newline(ret)) { -+ wpa_printf(MSG_ERROR, -+ "Found newline in value for %s; not returning it", -+ var); -+ os_free(ret); -+ ret = NULL; -+ } -+ -+ return ret; -+ } - } - - return NULL; --- -2.8.1 - diff --git a/package/wpa_supplicant/0011-Reject-SET_CRED-commands-with-newline-characters-in-.patch b/package/wpa_supplicant/0011-Reject-SET_CRED-commands-with-newline-characters-in-.patch deleted file mode 100644 index 530681faa4..0000000000 --- a/package/wpa_supplicant/0011-Reject-SET_CRED-commands-with-newline-characters-in-.patch +++ /dev/null @@ -1,65 +0,0 @@ -From b166cd84a77a6717be9600bf95378a0055d6f5a5 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Tue, 5 Apr 2016 23:33:10 +0300 -Subject: [PATCH] Reject SET_CRED commands with newline characters in the - string values - -Most of the cred block parameters are written as strings without -filtering and if there is an embedded newline character in the value, -unexpected configuration file data might be written. - -This fixes an issue where wpa_supplicant could have updated the -configuration file cred parameter with arbitrary data from the control -interface or D-Bus interface. While those interfaces are supposed to be -accessible only for trusted users/applications, it may be possible that -an untrusted user has access to a management software component that -does not validate the credential value before passing it to -wpa_supplicant. - -This could allow such an untrusted user to inject almost arbitrary data -into the configuration file. Such configuration file could result in -wpa_supplicant trying to load a library (e.g., opensc_engine_path, -pkcs11_engine_path, pkcs11_module_path, load_dynamic_eap) from user -controlled location when starting again. This would allow code from that -library to be executed under the wpa_supplicant process privileges. - -Signed-off-by: Jouni Malinen -Signed-off-by: Baruch Siach ---- -Patch status: upstream (b166cd84a77a6717be9600bf95378a0055d6f5a5) - - wpa_supplicant/config.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c -index eb97cd5e4e6e..69152efdea1a 100644 ---- a/wpa_supplicant/config.c -+++ b/wpa_supplicant/config.c -@@ -2896,6 +2896,8 @@ int wpa_config_set_cred(struct wpa_cred *cred, const char *var, - - if (os_strcmp(var, "password") == 0 && - os_strncmp(value, "ext:", 4) == 0) { -+ if (has_newline(value)) -+ return -1; - str_clear_free(cred->password); - cred->password = os_strdup(value); - cred->ext_password = 1; -@@ -2946,9 +2948,14 @@ int wpa_config_set_cred(struct wpa_cred *cred, const char *var, - } - - val = wpa_config_parse_string(value, &len); -- if (val == NULL) { -+ if (val == NULL || -+ (os_strcmp(var, "excluded_ssid") != 0 && -+ os_strcmp(var, "roaming_consortium") != 0 && -+ os_strcmp(var, "required_roaming_consortium") != 0 && -+ has_newline(val))) { - wpa_printf(MSG_ERROR, "Line %d: invalid field '%s' string " - "value '%s'.", line, var, value); -+ os_free(val); - return -1; - } - --- -2.8.1 - diff --git a/package/wpa_supplicant/0012-Reject-SET-commands-with-newline-characters-in-the-s.patch b/package/wpa_supplicant/0012-Reject-SET-commands-with-newline-characters-in-the-s.patch deleted file mode 100644 index a29df07912..0000000000 --- a/package/wpa_supplicant/0012-Reject-SET-commands-with-newline-characters-in-the-s.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2a3f56502b52375c3bf113cf92adfa99bad6b488 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Tue, 5 Apr 2016 23:55:48 +0300 -Subject: [PATCH] Reject SET commands with newline characters in the string - values - -Many of the global configuration parameters are written as strings -without filtering and if there is an embedded newline character in the -value, unexpected configuration file data might be written. - -This fixes an issue where wpa_supplicant could have updated the -configuration file global parameter with arbitrary data from the control -interface or D-Bus interface. While those interfaces are supposed to be -accessible only for trusted users/applications, it may be possible that -an untrusted user has access to a management software component that -does not validate the value of a parameter before passing it to -wpa_supplicant. - -This could allow such an untrusted user to inject almost arbitrary data -into the configuration file. Such configuration file could result in -wpa_supplicant trying to load a library (e.g., opensc_engine_path, -pkcs11_engine_path, pkcs11_module_path, load_dynamic_eap) from user -controlled location when starting again. This would allow code from that -library to be executed under the wpa_supplicant process privileges. - -Signed-off-by: Jouni Malinen -Signed-off-by: Baruch Siach ---- -Patch status: upstream (2a3f56502b52375c3bf113cf92adfa99bad6b488) - - wpa_supplicant/config.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c -index 69152efdea1a..d9a1603f6d7e 100644 ---- a/wpa_supplicant/config.c -+++ b/wpa_supplicant/config.c -@@ -3764,6 +3764,12 @@ static int wpa_global_config_parse_str(const struct global_parse_data *data, - return -1; - } - -+ if (has_newline(pos)) { -+ wpa_printf(MSG_ERROR, "Line %d: invalid %s value with newline", -+ line, data->name); -+ return -1; -+ } -+ - tmp = os_strdup(pos); - if (tmp == NULL) - return -1; --- -2.8.1 - diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash index 19e43598f2..22b2e8ddd8 100644 --- a/package/wpa_supplicant/wpa_supplicant.hash +++ b/package/wpa_supplicant/wpa_supplicant.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 cce55bae483b364eae55c35ba567c279be442ed8bab5b80a3c7fb0d057b9b316 wpa_supplicant-2.5.tar.gz +sha256 b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450 wpa_supplicant-2.6.tar.gz diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index d46328e0e9..e3e6f3a0ef 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPA_SUPPLICANT_VERSION = 2.5 +WPA_SUPPLICANT_VERSION = 2.6 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases WPA_SUPPLICANT_LICENSE = BSD-3c WPA_SUPPLICANT_LICENSE_FILES = README From cad565d42421b675d1d3a6621aef36c8ef956d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 11 Oct 2016 20:54:51 +0200 Subject: [PATCH 0648/3392] package/wpa_supplicant: enable interface matching option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new wpa_supplicant command line argument -M can be used to describe matching rules with a wildcard interface name (e.g., "wlan*"). This is very useful for systems without udev. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/wpa_supplicant/wpa_supplicant.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index e3e6f3a0ef..3c3317b122 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -28,7 +28,8 @@ WPA_SUPPLICANT_CONFIG_ENABLE = \ CONFIG_IEEE80211N \ CONFIG_IEEE80211R \ CONFIG_INTERNAL_LIBTOMMATH \ - CONFIG_DEBUG_FILE + CONFIG_DEBUG_FILE \ + CONFIG_MATCH_IFACE WPA_SUPPLICANT_CONFIG_DISABLE = \ CONFIG_SMARTCARD From 36b52da5a2395133351d0d927b937e6579ed0a25 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 16:37:10 -0300 Subject: [PATCH 0649/3392] linux-headers: bump 3.18.x and 4.1.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index c0e70671fd..ebb869ba69 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -238,10 +238,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.10.103" if BR2_KERNEL_HEADERS_3_10 default "3.12.64" if BR2_KERNEL_HEADERS_3_12 default "3.14.79" if BR2_KERNEL_HEADERS_3_14 - default "3.18.41" if BR2_KERNEL_HEADERS_3_18 + default "3.18.43" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.32" if BR2_KERNEL_HEADERS_4_1 + default "4.1.34" if BR2_KERNEL_HEADERS_4_1 default "4.2.8" if BR2_KERNEL_HEADERS_4_2 default "4.3.6" if BR2_KERNEL_HEADERS_4_3 default "4.4.24" if BR2_KERNEL_HEADERS_4_4 From d3b22a64fbd34fe6cdeb2ea344b67635d8447c01 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 09:37:32 -0300 Subject: [PATCH 0650/3392] libgee: bump to version 0.18.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libgee/libgee.hash | 4 ++-- package/libgee/libgee.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index 4c38c7833e..83ac810156 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,2 +1,2 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.18/libgee-0.18.0.sha256sum -sha256 4ad99ef937d071b4883c061df40bfe233f7649d50c354cf81235f180b4244399 libgee-0.18.0.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.18/libgee-0.18.1.sha256sum +sha256 99686bbe5a9c89ba9502c25f61314ee8efa0dd2a1159c9a639afc1458c2839a2 libgee-0.18.1.tar.xz diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 1df322c018..1df54d2b34 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.18 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).0 +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).1 LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 From fff5039b3a58d86e42d884172259dfeef79a1a76 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 12 Oct 2016 18:53:02 +0200 Subject: [PATCH 0651/3392] package/freeswitch: bump version to 1.6.12 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/freeswitch/freeswitch.hash | 4 ++-- package/freeswitch/freeswitch.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 9d23174c63..5b888f523e 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,2 +1,2 @@ -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.11.tar.xz.sha256 -sha256 653aa8aa1ad012828e0b3d3441d4d2463dbeee0126b751006055c07417127b6e freeswitch-1.6.11.tar.xz +# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.12.tar.xz.sha256 +sha256 ae072ca2d96fd9ef59ca6f589f932048b088c7b469d46e468bb917371de24ff9 freeswitch-1.6.12.tar.xz diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index ce30d17970..12b0913447 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.6.11 +FREESWITCH_VERSION = 1.6.12 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases FREESWITCH_LICENSE = MPLv1.1, \ From 05eef0d796b53521f609f66ed0fb1d9bb97a3be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 12 Oct 2016 21:11:13 +0200 Subject: [PATCH 0652/3392] package/shairport-sync: bump to version 2.8.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: Peter Korsgaard --- package/shairport-sync/shairport-sync.hash | 2 +- package/shairport-sync/shairport-sync.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash index 907a71e99e..dfe0d05ea6 100644 --- a/package/shairport-sync/shairport-sync.hash +++ b/package/shairport-sync/shairport-sync.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 80dd94c5f37b43e9b157dd5335f8edaf11109859d0144e0046c7b86fe88f6547 shairport-sync-2.8.4.tar.gz +sha256 d19f6cd3d53f5010abcf24cc20a301934372b41efc3ff2a2e4e7d8fa49200cdc shairport-sync-2.8.5.tar.gz diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 49c660421c..7af030bd58 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 2.8.4 +SHAIRPORT_SYNC_VERSION = 2.8.5 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c From fde62c31a363218f1432caff8bbb0d46dac1081b Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Wed, 12 Oct 2016 23:05:21 +0200 Subject: [PATCH 0653/3392] package/systemd-bootchart: indentation cleanup Signed-off-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- package/systemd-bootchart/systemd-bootchart.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/systemd-bootchart/systemd-bootchart.mk b/package/systemd-bootchart/systemd-bootchart.mk index 3d91b05f75..354270eb08 100644 --- a/package/systemd-bootchart/systemd-bootchart.mk +++ b/package/systemd-bootchart/systemd-bootchart.mk @@ -18,7 +18,7 @@ SYSTEMD_BOOTCHART_AUTORECONF = YES SYSTEMD_BOOTCHART_CONF_OPTS = --disable-man define SYSTEMD_BOOTCHART_INTLTOOLIZE - cd $(@D) && $(HOST_DIR)/usr/bin/intltoolize --force --automake + cd $(@D) && $(HOST_DIR)/usr/bin/intltoolize --force --automake endef SYSTEMD_BOOTCHART_PRE_CONFIGURE_HOOKS = SYSTEMD_BOOTCHART_INTLTOOLIZE From 1bd7c73a43e792083c369313d18c3203b560c482 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Wed, 12 Oct 2016 23:05:22 +0200 Subject: [PATCH 0654/3392] package/vde2: indentation cleanup Signed-off-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- package/vde2/vde2.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk index b750adbbc4..3bbfd5f5ca 100644 --- a/package/vde2/vde2.mk +++ b/package/vde2/vde2.mk @@ -27,11 +27,11 @@ VDE2_AUTORECONF = YES # in future commits. VDE2_CONF_OPTS = \ --disable-cryptcab \ - --disable-experimental \ - --disable-kernel-switch \ + --disable-experimental \ + --disable-kernel-switch \ --disable-pcap \ --disable-profile \ - --disable-python \ + --disable-python \ --enable-tuntap # Package does not build in parallel due to improper make rules @@ -39,11 +39,11 @@ VDE2_MAKE = $(MAKE1) HOST_VDE2_CONF_OPTS = \ --disable-cryptcab \ - --disable-experimental \ - --disable-kernel-switch \ + --disable-experimental \ + --disable-kernel-switch \ --disable-pcap \ --disable-profile \ - --disable-python \ + --disable-python \ --enable-tuntap HOST_VDE2_MAKE = $(MAKE1) From f32c2d96a4d4762e15f8ede1e0ced633234809d4 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Wed, 12 Oct 2016 23:05:23 +0200 Subject: [PATCH 0655/3392] package/iozone: indentation cleanup Signed-off-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- package/iozone/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/iozone/Config.in b/package/iozone/Config.in index fe49bd141a..33c938ee7f 100644 --- a/package/iozone/Config.in +++ b/package/iozone/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_IOZONE comment "iozone needs a toolchain w/ NPTL" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL From 3b1fe969048fa8625e134f4fd773dbd91d1427b8 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Wed, 12 Oct 2016 23:05:24 +0200 Subject: [PATCH 0656/3392] package/tinydtls: indentation cleanup Signed-off-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- package/tinydtls/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinydtls/Config.in b/package/tinydtls/Config.in index 33b08feb5d..2f90eb2436 100644 --- a/package/tinydtls/Config.in +++ b/package/tinydtls/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_TINYDTLS https://sourceforge.net/projects/tinydtls comment "tinydtls needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS From 2d199dcff054d22a1ccc730fadfc7543b8c6e8f3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 20:17:17 -0300 Subject: [PATCH 0657/3392] c-ares: security bump to version 1.12.0 Fixes: CVE-2016-5180 - ares_create_query single byte out of buffer write Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index f24cc3624a..f46ef02aba 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 b3612e6617d9682928a1d50c1040de4db6519f977f0b25d40cf1b632900b3efd c-ares-1.11.0.tar.gz +sha256 8692f9403cdcdf936130e045c84021665118ee9bfea905d1a76f04d4e6f365fb c-ares-1.12.0.tar.gz diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 298fe41671..e817d4add5 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.11.0 +C_ARES_VERSION = 1.12.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From 5454e25a69b13b4680d4d313864f98acdd9f835a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 20:17:27 -0300 Subject: [PATCH 0658/3392] postgresql: security bump to version 9.5.4 Fixes: CVE-2016-5423 - CASE/WHEN with inlining can cause untrusted pointer dereference (bsc#993454). CVE-2016-5424 - Fix client programs' handling of special characters in database and role names (bsc#993453). Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 4dde5895da..0d54890d2c 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,2 +1,2 @@ -# From https://ftp.postgresql.org/pub/source/v9.5.3/postgresql-9.5.3.tar.bz2.sha256 -sha256 7385c01dc58acba8d7ac4e6ad42782bd7c0b59272862a3a3d5fe378d4503a0b4 postgresql-9.5.3.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v9.5.4/postgresql-9.5.4.tar.bz2.sha256 +sha256 cf5e571164ad66028ecd7dd8819e3765470d45bcd440d258b686be7e69c76ed0 postgresql-9.5.4.tar.bz2 diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 8edefb7543..7179bbe88b 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 9.5.3 +POSTGRESQL_VERSION = 9.5.4 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 4db9bc15413c66c12af85c27998b52c3942ebf93 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 21:57:02 -0300 Subject: [PATCH 0659/3392] unrar: bump to version 5.4.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/unrar/unrar.hash | 2 +- package/unrar/unrar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index e6a146c06b..36450e05e3 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 e4f05190d9e379449a04c22baffc24cc2f03164a4738befe601b1325440db0c6 unrarsrc-5.4.3.tar.gz +sha256 e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c unrarsrc-5.4.5.tar.gz diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index e49fe6c367..68d81b7353 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 5.4.3 +UNRAR_VERSION = 5.4.5 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = http://www.rarlab.com/rar UNRAR_LICENSE = unrar From dbf7f6d3debf669cb89b2bcccde00dbe7267b3c2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 17:52:19 -0300 Subject: [PATCH 0660/3392] btrfs-progs: bump to version 4.8.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index d3a0f312bf..c21cd3b605 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 90cd6f0ce5a8bed5fcd6ea8a70d81de4a038163035d48a9ae0339bbf51df771c btrfs-progs-v4.7.3.tar.xz +sha256 836e6d707abfc155319c072f53d296261cbd17f0e03484a3694b8af48640db83 btrfs-progs-v4.8.1.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 02820ccd93..d9bd6e645e 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.7.3 +BTRFS_PROGS_VERSION = 4.8.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib From 41850b2897dfc2594048477b936c5394dd0462bd Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 22:07:23 -0300 Subject: [PATCH 0661/3392] libgpgme: bump to version 1.7.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libgpgme/libgpgme.hash | 2 +- package/libgpgme/libgpgme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index a7efbf6d24..9b96fd2ce4 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207 gpgme-1.5.5.tar.bz2 +sha256 71f55fed0f2b3eaf7a606e59772aa645ce3ffff322d361ce359951b3f755cc48 gpgme-1.7.0.tar.bz2 diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 574ddd6be1..7e86daf95c 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPGME_VERSION = 1.5.5 +LIBGPGME_VERSION = 1.7.0 LIBGPGME_SITE = ftp://ftp.gnupg.org/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPLv2.1+ From 0debadb4f6499bb0f8ece93af9aaf5a91f400399 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 22:03:06 -0300 Subject: [PATCH 0662/3392] libsigc: bump gcc version requirement to 4.8 It now uses C++11 features that aren't available in 4.7. Fixes: http://autobuild.buildroot.net/results/405/40563404e2612590a6ad19cbb39df14074fe160e/ Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libsigc/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsigc/Config.in b/package/libsigc/Config.in index 41ea19e227..f38749b4d9 100644 --- a/package/libsigc/Config.in +++ b/package/libsigc/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBSIGC bool "libsigc++" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_INSTALL_LIBSTDCPP help libsigc++ implements a typesafe callback system for standard C++. @@ -10,5 +10,5 @@ config BR2_PACKAGE_LIBSIGC http://libsigc.sourceforge.net/ -comment "libsigc++ needs a toolchain w/ C++, gcc >= 4.7" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 +comment "libsigc++ needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 From cf53e7d1f9cc853cf39cb4fe6ac6d750db26233f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 12 Oct 2016 22:38:16 +0200 Subject: [PATCH 0663/3392] package/enlightenment: bump to 0.21.3 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/enlightenment/enlightenment.hash | 4 ++-- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index 8abbd963ba..6c82bdc5f2 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,2 +1,2 @@ -# From https://www.enlightenment.org/news/e-0.21.2-release -sha256 a877645dc70aee71141013888863b69a1029f575f685e285b570db7c736f253a enlightenment-0.21.2.tar.xz +# From https://www.enlightenment.org/news/e-0.21.3-release +sha256 b90517d3de780023043b6e3ade30f686bd2cdcf5b66d24155b50da720e665fd2 enlightenment-0.21.3.tar.xz diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index d77421f44a..98f537df1e 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.21.2 +ENLIGHTENMENT_VERSION = 0.21.3 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2c From 917bf769db061995667abfc7a4ae36e79cc2a546 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 11 Oct 2016 12:20:16 +0100 Subject: [PATCH 0664/3392] git: bump version to 2.10.1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index e2cf300a66..73bb9cb7df 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 c73364ac00ae85ffc6cfb12ca2700bb0edf30f63262be97be4039be594ff29e7 git-2.10.0.tar.xz +sha256 a9c32df9061cfc2c194ecaa0357ba273c1f24a0dbf0d856b03dcedafcd0a4dc6 git-2.10.1.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 3730b77ad9..8bc2907561 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.10.0 +GIT_VERSION = 2.10.1 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2 LGPLv2.1+ From 091a2e9ef687e338040b58ba508b27edc556dd7c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 11 Oct 2016 12:20:17 +0100 Subject: [PATCH 0665/3392] dhcp: bump version to 4.3.5 - 0001-dhcp-cross-compile.patch is now upstream: https://source.isc.org/cgi-bin/gitweb.cgi?p=dhcp.git;a=commit;h=e2f36ff16f7de5fb6e028354a2cc04a181e887b4 - 0003-bind-host-cc.patch is now upstream: https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=commit;h=118394ef2ec7cef253c55359a3d70d202ddc2fa0 - --with-randomdev configure option can now be used normally. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/dhcp/0001-dhcp-cross-compile.patch | 34 ------------------ package/dhcp/0003-bind-host-cc.patch | 40 ---------------------- package/dhcp/dhcp.hash | 4 +-- package/dhcp/dhcp.mk | 7 ++-- 4 files changed, 5 insertions(+), 80 deletions(-) delete mode 100644 package/dhcp/0001-dhcp-cross-compile.patch delete mode 100644 package/dhcp/0003-bind-host-cc.patch diff --git a/package/dhcp/0001-dhcp-cross-compile.patch b/package/dhcp/0001-dhcp-cross-compile.patch deleted file mode 100644 index 95b468915f..0000000000 --- a/package/dhcp/0001-dhcp-cross-compile.patch +++ /dev/null @@ -1,34 +0,0 @@ -dhcp cross compile support integration - -Allow BINDCONFIG to be initialized in environment passed to configure. - -Allow archiver to be determined during configure. - -This patch is submitted upstream as part of a cross compiling enhancement -suggestion to dhcp-suggest@isc.org. Reference ISC-Bugs #41502. - -Signed-off-by: Doug Kehn - -Index: dhcp-4.3.3-P1/configure.ac -=================================================================== ---- dhcp-4.3.3-P1.orig/configure.ac -+++ dhcp-4.3.3-P1/configure.ac -@@ -33,7 +33,7 @@ if test "$GCC" = "yes"; then - fi - - # We can have some flags to pass to bind configure --BINDCONFIG= -+BINDCONFIG="$BINDCONFIG" - AC_SUBST(BINDCONFIG) - - # POSIX doesn't include the IPv6 Advanced Socket API and glibc hides -@@ -43,6 +43,9 @@ AC_SUBST(BINDCONFIG) - # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. - AC_USE_SYSTEM_EXTENSIONS - -+AC_CHECK_TOOL(AR,ar) -+AC_SUBST(AR) -+ - AC_PROG_RANLIB - AC_CONFIG_HEADERS([includes/config.h]) - diff --git a/package/dhcp/0003-bind-host-cc.patch b/package/dhcp/0003-bind-host-cc.patch deleted file mode 100644 index 96c144fffb..0000000000 --- a/package/dhcp/0003-bind-host-cc.patch +++ /dev/null @@ -1,40 +0,0 @@ -ensure host compiler is used - -dns/Makefile.in patch is derived from: -http://wiki.beyondlogic.org/patches/dhcp-4.3.0b1.bind_arm-linux-gnueabi.patch - -This patch is already accepted upstream and will be included in the next -release: ---[snip]-- -From Francis Dupont via RT -To rdkehn@yahoo.com - -Message body -It was fixed on the master branch sometimes ago. -Quoting master RELNOTES: - -- Made the embedded bind libraries able to be cross compiled - (please refer to the bind9 documentation to learn how to cross - compile DHCP and its bind library dependency). - [ISC-Bugs #38836] - -This is in the Changes since 4.3.3 so for the next release. ---[snip]-- - -Signed-off-by: Doug Kehn - -Index: dhcp-4.3.3-P1/bind/bind-9.9.7-P3/lib/export/dns/Makefile.in -=================================================================== ---- dhcp-4.3.3-P1.orig/bind/bind-9.9.7-P3/lib/export/dns/Makefile.in -+++ dhcp-4.3.3-P1/bind/bind-9.9.7-P3/lib/export/dns/Makefile.in -@@ -168,7 +168,9 @@ code.h: gen - ./gen -s ${srcdir} > code.h - - gen: ${srcdir}/gen.c -- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} -+ ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ -+ ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \ -+ ${BUILD_LIBS} - - #We don't need rbtdb64 for this library - #rbtdb64.@O@: rbtdb.c diff --git a/package/dhcp/dhcp.hash b/package/dhcp/dhcp.hash index fd9b24ad6d..7898aa45d3 100644 --- a/package/dhcp/dhcp.hash +++ b/package/dhcp/dhcp.hash @@ -1,2 +1,2 @@ -# Verified from https://ftp.isc.org/isc/dhcp/4.3.3-P1/dhcp-4.3.3-P1.tar.gz.sha256.asc -sha256 c11e896dffa1bfbc49462965d3f6dec45534e34068603546d9a236f2aa669921 dhcp-4.3.3-P1.tar.gz +# Verified from https://ftp.isc.org/isc/dhcp/4.3.5/dhcp-4.3.5.tar.gz.sha256.asc +sha256 eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954 dhcp-4.3.5.tar.gz diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 5cb6043e7b..4d2cb06352 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -4,17 +4,16 @@ # ################################################################################ -DHCP_VERSION = 4.3.3-P1 +DHCP_VERSION = 4.3.5 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = ISC DHCP_LICENSE_FILES = LICENSE DHCP_CONF_ENV = \ CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \ - -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \ - ac_cv_file__dev_random=yes \ - BINDCONFIG='--with-randomdev=/dev/random' + -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' DHCP_CONF_OPTS = \ + --with-randomdev=/dev/random \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ --with-cli-lease-file=/var/lib/dhcp/dhclient.leases \ From fda6f9f7fbd7c01bb49ea180c30ce27a91a2cb37 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 11 Oct 2016 13:58:49 +0100 Subject: [PATCH 0666/3392] mutt: bump version to 1.7.1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index ae7de58d00..460cd5f04f 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 mutt-1.7.0.tar.gz +sha256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df mutt-1.7.1.tar.gz diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 989a1b68f2..cd44ca101d 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 1.7.0 +MUTT_VERSION = 1.7.1 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPLv2+ MUTT_LICENSE_FILES = GPL From e8d04791ff37be807995f6b7d242179756581343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 11 Oct 2016 21:09:30 +0200 Subject: [PATCH 0667/3392] package/jsoncpp: bump to version 1.7.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/jsoncpp/jsoncpp.hash | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jsoncpp/jsoncpp.hash b/package/jsoncpp/jsoncpp.hash index e1768ed7fc..504357f163 100644 --- a/package/jsoncpp/jsoncpp.hash +++ b/package/jsoncpp/jsoncpp.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 4338c6cab8af8dee6cdfd54e6218bd0533785f552c6162bb083f8dd28bf8fbbe jsoncpp-1.7.5.tar.gz +sha256 087640ebcf7fbcfe8e2717a0b9528fff89c52fcf69fa2a18cc2b538008098f97 jsoncpp-1.7.7.tar.gz diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index 83ce0a7f0a..a9694411c9 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSONCPP_VERSION = 1.7.5 +JSONCPP_VERSION = 1.7.7 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE From 9f03a7aeec94a6a3fcda1e006c0f20fc5a5fe510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 11 Oct 2016 21:05:08 +0200 Subject: [PATCH 0668/3392] package/hostapd: bump to version 2.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove all patches as they are applied to or were fetched from upstream. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- ...-Fix-last-fragment-length-validation.patch | 54 ------------ ...-Fix-last-fragment-length-validation.patch | 51 ----------- .../0003-vlan-fix-musl-build-error.patch | 60 ------------- ...bc-conflict-with-Linux-kernel-header.patch | 60 ------------- ...a-Credential-with-invalid-passphrase.patch | 85 ------------------- package/hostapd/hostapd.hash | 2 +- package/hostapd/hostapd.mk | 2 +- 7 files changed, 2 insertions(+), 312 deletions(-) delete mode 100644 package/hostapd/0001-EAP-pwd-peer-Fix-last-fragment-length-validation.patch delete mode 100644 package/hostapd/0002-EAP-pwd-server-Fix-last-fragment-length-validation.patch delete mode 100644 package/hostapd/0003-vlan-fix-musl-build-error.patch delete mode 100644 package/hostapd/0004-vlan-fix-musl-libc-conflict-with-Linux-kernel-header.patch delete mode 100644 package/hostapd/0005-WPS-Reject-a-Credential-with-invalid-passphrase.patch diff --git a/package/hostapd/0001-EAP-pwd-peer-Fix-last-fragment-length-validation.patch b/package/hostapd/0001-EAP-pwd-peer-Fix-last-fragment-length-validation.patch deleted file mode 100644 index 82c26398b6..0000000000 --- a/package/hostapd/0001-EAP-pwd-peer-Fix-last-fragment-length-validation.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8057821706784608b828e769ccefbced95591e50 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sun, 1 Nov 2015 18:18:17 +0200 -Subject: [PATCH] EAP-pwd peer: Fix last fragment length validation - -All but the last fragment had their length checked against the remaining -room in the reassembly buffer. This allowed a suitably constructed last -fragment frame to try to add extra data that would go beyond the buffer. -The length validation code in wpabuf_put_data() prevents an actual -buffer write overflow from occurring, but this results in process -termination. (CVE-2015-5315) - -Signed-off-by: Jouni Malinen ---- - src/eap_peer/eap_pwd.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c -index 1f78544..75ceef1 100644 ---- a/src/eap_peer/eap_pwd.c -+++ b/src/eap_peer/eap_pwd.c -@@ -903,7 +903,7 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret, - /* - * buffer and ACK the fragment - */ -- if (EAP_PWD_GET_MORE_BIT(lm_exch)) { -+ if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) { - data->in_frag_pos += len; - if (data->in_frag_pos > wpabuf_size(data->inbuf)) { - wpa_printf(MSG_INFO, "EAP-pwd: Buffer overflow attack " -@@ -916,7 +916,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret, - return NULL; - } - wpabuf_put_data(data->inbuf, pos, len); -- -+ } -+ if (EAP_PWD_GET_MORE_BIT(lm_exch)) { - resp = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_PWD, - EAP_PWD_HDR_SIZE, - EAP_CODE_RESPONSE, eap_get_id(reqData)); -@@ -930,10 +931,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret, - * we're buffering and this is the last fragment - */ - if (data->in_frag_pos) { -- wpabuf_put_data(data->inbuf, pos, len); - wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes", - (int) len); -- data->in_frag_pos += len; - pos = wpabuf_head_u8(data->inbuf); - len = data->in_frag_pos; - } --- -1.9.1 - diff --git a/package/hostapd/0002-EAP-pwd-server-Fix-last-fragment-length-validation.patch b/package/hostapd/0002-EAP-pwd-server-Fix-last-fragment-length-validation.patch deleted file mode 100644 index bfc4c74e95..0000000000 --- a/package/hostapd/0002-EAP-pwd-server-Fix-last-fragment-length-validation.patch +++ /dev/null @@ -1,51 +0,0 @@ -From bef802ece03f9ae9d52a21f0cf4f1bc2c5a1f8aa Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sun, 1 Nov 2015 18:24:16 +0200 -Subject: [PATCH] EAP-pwd server: Fix last fragment length validation - -All but the last fragment had their length checked against the remaining -room in the reassembly buffer. This allowed a suitably constructed last -fragment frame to try to add extra data that would go beyond the buffer. -The length validation code in wpabuf_put_data() prevents an actual -buffer write overflow from occurring, but this results in process -termination. (CVE-2015-5314) - -Signed-off-by: Jouni Malinen ---- - src/eap_server/eap_server_pwd.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/eap_server/eap_server_pwd.c b/src/eap_server/eap_server_pwd.c -index cb83ff7..9f787ab 100644 ---- a/src/eap_server/eap_server_pwd.c -+++ b/src/eap_server/eap_server_pwd.c -@@ -970,7 +970,7 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv, - /* - * the first and all intermediate fragments have the M bit set - */ -- if (EAP_PWD_GET_MORE_BIT(lm_exch)) { -+ if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) { - if ((data->in_frag_pos + len) > wpabuf_size(data->inbuf)) { - wpa_printf(MSG_DEBUG, "EAP-pwd: Buffer overflow " - "attack detected! (%d+%d > %d)", -@@ -981,6 +981,8 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv, - } - wpabuf_put_data(data->inbuf, pos, len); - data->in_frag_pos += len; -+ } -+ if (EAP_PWD_GET_MORE_BIT(lm_exch)) { - wpa_printf(MSG_DEBUG, "EAP-pwd: Got a %d byte fragment", - (int) len); - return; -@@ -990,8 +992,6 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv, - * buffering fragments so that's how we know it's the last) - */ - if (data->in_frag_pos) { -- wpabuf_put_data(data->inbuf, pos, len); -- data->in_frag_pos += len; - pos = wpabuf_head_u8(data->inbuf); - len = data->in_frag_pos; - wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes", --- -1.9.1 - diff --git a/package/hostapd/0003-vlan-fix-musl-build-error.patch b/package/hostapd/0003-vlan-fix-musl-build-error.patch deleted file mode 100644 index da1ffcb7d5..0000000000 --- a/package/hostapd/0003-vlan-fix-musl-build-error.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 67ba6ed9871b2cab16eeee93818f05d9c49ccbab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 8 Mar 2016 12:05:01 +0100 -Subject: [PATCH] vlan: fix musl build error -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -caddr_t is legacy BSD and should be avoided [1]. - -This fixes compile errors with the musl libc: - -../src/ap/vlan_init.c: In function 'br_delif': -../src/ap/vlan_init.c:218:18: error: '__caddr_t' undeclared (first use in this function) - ifr.ifr_data = (__caddr_t) args; - -Upstream status: Pending [2] - -[1] http://stackoverflow.com/questions/6381526/what-is-the-significance-of-caddr-t-and-when-is-it-used -[2] http://lists.infradead.org/pipermail/hostap/2016-March/035350.html - -Signed-off-by: Jörg Krause ---- - src/ap/vlan_init.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/ap/vlan_init.c b/src/ap/vlan_init.c -index fd1c8dd..1670c0d 100644 ---- a/src/ap/vlan_init.c -+++ b/src/ap/vlan_init.c -@@ -215,7 +215,7 @@ static int br_delif(const char *br_name, const char *if_name) - args[1] = if_index; - - os_strlcpy(ifr.ifr_name, br_name, sizeof(ifr.ifr_name)); -- ifr.ifr_data = (__caddr_t) args; -+ ifr.ifr_data = (void *) args; - - if (ioctl(fd, SIOCDEVPRIVATE, &ifr) < 0 && errno != EINVAL) { - /* No error if interface already removed. */ -@@ -266,7 +266,7 @@ static int br_addif(const char *br_name, const char *if_name) - args[1] = if_index; - - os_strlcpy(ifr.ifr_name, br_name, sizeof(ifr.ifr_name)); -- ifr.ifr_data = (__caddr_t) args; -+ ifr.ifr_data = (void *) args; - - if (ioctl(fd, SIOCDEVPRIVATE, &ifr) < 0) { - if (errno == EBUSY) { -@@ -394,7 +394,7 @@ static int br_getnumports(const char *br_name) - - os_memset(ifindices, 0, sizeof(ifindices)); - os_strlcpy(ifr.ifr_name, br_name, sizeof(ifr.ifr_name)); -- ifr.ifr_data = (__caddr_t) arg; -+ ifr.ifr_data = (void *) arg; - - if (ioctl(fd, SIOCDEVPRIVATE, &ifr) < 0) { - wpa_printf(MSG_ERROR, "VLAN: %s: BRCTL_GET_PORT_LIST " --- -2.7.2 - diff --git a/package/hostapd/0004-vlan-fix-musl-libc-conflict-with-Linux-kernel-header.patch b/package/hostapd/0004-vlan-fix-musl-libc-conflict-with-Linux-kernel-header.patch deleted file mode 100644 index 3e753d619a..0000000000 --- a/package/hostapd/0004-vlan-fix-musl-libc-conflict-with-Linux-kernel-header.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 71a517e922c91e2c6cad28d339a081b5f6de0932 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 8 Mar 2016 21:07:12 +0100 -Subject: [PATCH] vlan: fix musl libc conflict with Linux kernel headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Due to both (in "utils/includes.h") and (in -) being included, the in6_addr is being redefined: once from -the C library headers and once from the Linux kernel headers. This causes some -build failures with for example the musl C library: - -In file included from /usr/include/linux/if_bridge.h:18, - from ../src/ap/vlan_init.c:17: -/usr/include/linux/in6.h:32: error: redefinition of 'struct in6_addr' -/usr/include/linux/in6.h:49: error: redefinition of 'struct sockaddr_in6' -/usr/include/linux/in6.h:59: error: redefinition of 'struct ipv6_mreq' - -Mixing C library and Linux kernel headers is a bit problematic [1] and should be -avoided if possible [2]. In order to fix this, define just the macros needed -from as done in Busybox for the brctl applet [3]. - -Upstream status: Pending [4] - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=15850 -[2] http://www.openwall.com/lists/musl/2015/10/06/1 -[3] https://git.busybox.net/busybox/commit/?id=5fa6d1a632505789409a2ba6cf8e112529f9db18 -[4] http://lists.infradead.org/pipermail/hostap/2016-March/035357.html - -Signed-off-by: Jörg Krause ---- - src/ap/vlan_init.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/ap/vlan_init.c b/src/ap/vlan_init.c -index 1670c0d..f2e3da0 100644 ---- a/src/ap/vlan_init.c -+++ b/src/ap/vlan_init.c -@@ -14,7 +14,16 @@ - #include - #include - #include --#include -+/* From */ -+#define BRCTL_GET_VERSION 0 -+#define BRCTL_GET_BRIDGES 1 -+#define BRCTL_ADD_BRIDGE 2 -+#define BRCTL_DEL_BRIDGE 3 -+#define BRCTL_ADD_IF 4 -+#define BRCTL_DEL_IF 5 -+#define BRCTL_GET_BRIDGE_INFO 6 -+#define BRCTL_GET_PORT_LIST 7 -+#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8 - #endif /* CONFIG_FULL_DYNAMIC_VLAN */ - - #include "utils/common.h" --- -2.7.2 - diff --git a/package/hostapd/0005-WPS-Reject-a-Credential-with-invalid-passphrase.patch b/package/hostapd/0005-WPS-Reject-a-Credential-with-invalid-passphrase.patch deleted file mode 100644 index 282aa952b5..0000000000 --- a/package/hostapd/0005-WPS-Reject-a-Credential-with-invalid-passphrase.patch +++ /dev/null @@ -1,85 +0,0 @@ -From ecbb0b3dc122b0d290987cf9c84010bbe53e1022 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Fri, 4 Mar 2016 17:20:18 +0200 -Subject: [PATCH] WPS: Reject a Credential with invalid passphrase - -WPA/WPA2-Personal passphrase is not allowed to include control -characters. Reject a Credential received from a WPS Registrar both as -STA (Credential) and AP (AP Settings) if the credential is for WPAPSK or -WPA2PSK authentication type and includes an invalid passphrase. - -This fixes an issue where hostapd or wpa_supplicant could have updated -the configuration file PSK/passphrase parameter with arbitrary data from -an external device (Registrar) that may not be fully trusted. Should -such data include a newline character, the resulting configuration file -could become invalid and fail to be parsed. - -Signed-off-by: Jouni Malinen -Signed-off-by: Baruch Siach ---- -Patch status: upstream (ecbb0b3dc122b0d290987cf9c84010bbe53e1022) - - src/utils/common.c | 12 ++++++++++++ - src/utils/common.h | 1 + - src/wps/wps_attr_process.c | 10 ++++++++++ - 3 files changed, 23 insertions(+) - -diff --git a/src/utils/common.c b/src/utils/common.c -index 450e2c6519ba..27b7c02de10b 100644 ---- a/src/utils/common.c -+++ b/src/utils/common.c -@@ -697,6 +697,18 @@ int is_hex(const u8 *data, size_t len) - } - - -+int has_ctrl_char(const u8 *data, size_t len) -+{ -+ size_t i; -+ -+ for (i = 0; i < len; i++) { -+ if (data[i] < 32 || data[i] == 127) -+ return 1; -+ } -+ return 0; -+} -+ -+ - size_t merge_byte_arrays(u8 *res, size_t res_len, - const u8 *src1, size_t src1_len, - const u8 *src2, size_t src2_len) -diff --git a/src/utils/common.h b/src/utils/common.h -index 701dbb236ed5..a97224070385 100644 ---- a/src/utils/common.h -+++ b/src/utils/common.h -@@ -488,6 +488,7 @@ const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len); - - char * wpa_config_parse_string(const char *value, size_t *len); - int is_hex(const u8 *data, size_t len); -+int has_ctrl_char(const u8 *data, size_t len); - size_t merge_byte_arrays(u8 *res, size_t res_len, - const u8 *src1, size_t src1_len, - const u8 *src2, size_t src2_len); -diff --git a/src/wps/wps_attr_process.c b/src/wps/wps_attr_process.c -index eadb22fe2e78..e8c4579309ab 100644 ---- a/src/wps/wps_attr_process.c -+++ b/src/wps/wps_attr_process.c -@@ -229,6 +229,16 @@ static int wps_workaround_cred_key(struct wps_credential *cred) - cred->key_len--; - #endif /* CONFIG_WPS_STRICT */ - } -+ -+ -+ if (cred->auth_type & (WPS_AUTH_WPAPSK | WPS_AUTH_WPA2PSK) && -+ (cred->key_len < 8 || has_ctrl_char(cred->key, cred->key_len))) { -+ wpa_printf(MSG_INFO, "WPS: Reject credential with invalid WPA/WPA2-Personal passphrase"); -+ wpa_hexdump_ascii_key(MSG_INFO, "WPS: Network Key", -+ cred->key, cred->key_len); -+ return -1; -+ } -+ - return 0; - } - --- -2.8.1 - diff --git a/package/hostapd/hostapd.hash b/package/hostapd/hostapd.hash index 869849b640..fb891476b3 100644 --- a/package/hostapd/hostapd.hash +++ b/package/hostapd/hostapd.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8e272d954dc0d7026c264b79b15389ec2b2c555b32970de39f506b9f463ec74a hostapd-2.5.tar.gz +sha256 01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d hostapd-2.6.tar.gz diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 5aa2b9a9e8..a499011385 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -4,7 +4,7 @@ # ################################################################################ -HOSTAPD_VERSION = 2.5 +HOSTAPD_VERSION = 2.6 HOSTAPD_SITE = http://hostap.epitest.fi/releases HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config From 1cf00eb00c0dbd44bf5bf4037d1da1a14857222b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 13:54:45 -0300 Subject: [PATCH 0669/3392] libnspr: bump to version 4.13 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- 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 f513213d25..36203ac1d1 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.12/src/SHA256SUMS -sha256 e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de nspr-4.12.tar.gz +# From https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.13/src/SHA256SUMS +sha256 19c33334bb3fa6d24800ffa65d7d806c54ad5f8c3758a5c11352ad43212ab181 nspr-4.13.tar.gz diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 0311f8fc98..3cf3fe9900 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.12 +LIBNSPR_VERSION = 4.13 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 3ccdc270eeb72de718afa348f2a362c79ba0579d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 13:54:46 -0300 Subject: [PATCH 0670/3392] libnss: bump to version 3.27.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 8e03faf31c..acc32e3434 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_23_RTM/src/SHA256SUMS -sha256 94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf nss-3.23.tar.gz +# From https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_27_1_RTM/src/SHA256SUMS +sha256 fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b nss-3.27.1.tar.gz diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index e2bbf1f39f..b4f9cce2c0 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.23 +LIBNSS_VERSION = 3.27.1 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From 420bfabf4702f511d1472a0a31ee928209966266 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 12:56:40 -0300 Subject: [PATCH 0671/3392] dbus: security bump to version 1.10.12 Fixes: Format string vulnerability processing ActivationFailure messages See: https://bugs.freedesktop.org/show_bug.cgi?id=98157 CVE not assigned yet. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- 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 1b20d3f2e5..27d38ea92d 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43 dbus-1.10.10.tar.gz +sha256 210a79430b276eafc6406c71705e9140d25b9956d18068df98a70156dc0e475d dbus-1.10.12.tar.gz diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 1388e346bf..86571286b5 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.10.10 +DBUS_VERSION = 1.10.12 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools) DBUS_LICENSE_FILES = COPYING From 618fa6da21e65291c131b05ed9e44acc3ab598ef Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 12:47:42 -0300 Subject: [PATCH 0672/3392] imagemagick: security bump to version 7.0.3-3 Fixes: memory allocate failure in AcquireQuantumPixels (quantum.c) heap-based buffer overflow in IsPixelMonochrome (pixel-accessor.h) No CVEs assigned yet. Signed-off-by: Gustavo Zacarias 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 dcbef18dee..fa43d58bd5 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 22df4f197985f36f77b7b0d44de92ff44415885045f0191b3319540bdc82ff53 ImageMagick-7.0.2-9.tar.xz +sha256 6ed0b059c9a108a631e0febcf9a9338342e25df4bbc9a9531ffe36d66031b0d8 ImageMagick-7.0.3-3.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 373765c6e6..39d79d826e 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.2-9 +IMAGEMAGICK_VERSION = 7.0.3-3 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From e2dbdb8a32dc0dab05fc7ff1026dc481a6c91fa6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 11:57:29 -0300 Subject: [PATCH 0673/3392] dhcpcd: bump to version 6.11.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/dhcpcd/dhcpcd.hash | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash index 2e74eccf8a..3be3f7ff51 100644 --- a/package/dhcpcd/dhcpcd.hash +++ b/package/dhcpcd/dhcpcd.hash @@ -1,2 +1,2 @@ # Locally calculated from download (no sig, hash) -sha256 5c823d607ed1d7513d16ec51c54e21657f1324899e0ba333a497682d88a8c6ee dhcpcd-6.11.1.tar.xz +sha256 6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e dhcpcd-6.11.5.tar.xz diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index 59abaa5c88..2d446fb7f1 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 6.11.1 +DHCPCD_VERSION = 6.11.5 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd DHCPCD_DEPENDENCIES = host-pkgconf From 881b7bd31e0c306f1dfa317ec958b4ee4456f435 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 10:03:48 -0300 Subject: [PATCH 0674/3392] gnutls: bump to version 3.4.16 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- 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 89b0f4cd6d..f9725df371 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 eb2a013905f5f2a0cbf7bcc1d20c85a50065063ee87bd33b496c4e19815e3498 gnutls-3.4.15.tar.xz +sha256 d99abb1b320771b58c949bab85e4b654dd1e3e9d92e2572204b7dc479d923927 gnutls-3.4.16.tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 4e9a83d318..d359a61e9e 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.4 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).15 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).16 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) # README says that the core library is under LGPLv2.1+, but a few From 0b0434437afee60dd9b0ba994fb77d6ca8766fe6 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Mon, 10 Oct 2016 06:45:59 -0700 Subject: [PATCH 0675/3392] system: fix typo Signed-off-by: Matt Kraai Signed-off-by: Peter Korsgaard --- system/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Config.in b/system/Config.in index d3b2889bbd..f9a3bda5a7 100644 --- a/system/Config.in +++ b/system/Config.in @@ -509,7 +509,7 @@ config BR2_ROOTFS_POST_FAKEROOT_SCRIPT This gives users the opportunity to do customisations of the content of the rootfs, which would otherwise require root - rigths. + rights. These scripts are called with the target directory name as first argument. The build will fail on the first scripts that From 0dcdf20683a3c8adf7774e7ad6409c00179578cf Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 10 Oct 2016 07:48:21 +0200 Subject: [PATCH 0676/3392] mxml: bump to version 2.10 Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/mxml/mxml.hash | 4 ++-- package/mxml/mxml.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mxml/mxml.hash b/package/mxml/mxml.hash index 310e2cae0a..90392755ba 100644 --- a/package/mxml/mxml.hash +++ b/package/mxml/mxml.hash @@ -1,4 +1,4 @@ # From http://www.msweet.org/downloads.php?L+Z3 -md5 e21cad0f7aacd18f942aa0568a8dee19 mxml-2.9.tar.gz +md5 8804c961a24500a95690ef287d150abe mxml-2.10.tar.gz # Locally computed -sha256 cded54653c584b24c4a78a7fa1b3b4377d49ac4f451ddf170ebbc8161d85ff92 mxml-2.9.tar.gz +sha256 267ff58b64ddc767170d71dab0c729c06f45e1df9a9b6f75180b564f09767891 mxml-2.10.tar.gz diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk index 7e9b4d6c89..f36c75cabb 100644 --- a/package/mxml/mxml.mk +++ b/package/mxml/mxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -MXML_VERSION = 2.9 +MXML_VERSION = 2.10 MXML_SITE = http://www.msweet.org/files/project3 MXML_LICENSE = LGPLv2+ with exceptions MXML_LICENSE_FILES = COPYING From e54540ec710cf9e7d0f0bccc68ddb811eb73365c Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 10 Oct 2016 08:12:30 +0200 Subject: [PATCH 0677/3392] python-pytablewriter: add missing python-xlwt dependency Since version 0.6.0 pytablewriter requires xlwt package too. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-pytablewriter/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pytablewriter/Config.in b/package/python-pytablewriter/Config.in index 6c19745133..d889161c87 100644 --- a/package/python-pytablewriter/Config.in +++ b/package/python-pytablewriter/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_PYTHON_PYTABLEWRITER select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_XLSXWRITER # runtime + select BR2_PACKAGE_PYTHON_XLWT # runtime help pytablewriter is a python library to write a table in various formats: CSV, HTML, JavaScript, JSON, Markdown, Excel, Pandas, From 521aaf55546eac9f44b22eb01bec8cd145eb6650 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 13 Oct 2016 10:52:37 +0200 Subject: [PATCH 0678/3392] imagemagick: bump version to 7.0.3-4 7.0.3-3 is no longer available upstream and has instead been replaced by -4, so use that instead. 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 fa43d58bd5..8ad340dd19 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 6ed0b059c9a108a631e0febcf9a9338342e25df4bbc9a9531ffe36d66031b0d8 ImageMagick-7.0.3-3.tar.xz +sha256 86a1f04077de2b1486a93088030b010780067b25ab0284560435e2f458e247ca ImageMagick-7.0.3-4.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 39d79d826e..2cae064bec 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.3-3 +IMAGEMAGICK_VERSION = 7.0.3-4 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From 063338c8cb378bad40f33fe4b4af7ab566818e80 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 06:52:13 -0300 Subject: [PATCH 0679/3392] guile: security bump to version 2.0.13 Fixes: CVE-2016-8606 - REPL server now protects against HTTP inter-protocol attacks. CVE-2016-8605 - 'mkdir' procedure no longer calls umask(2). Remove upstream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/guile/0003-remove_unused_funcs.patch | 36 ------------------- ... 0003-workaround-ice-ssa-corruption.patch} | 0 package/guile/guile.hash | 2 +- package/guile/guile.mk | 2 +- 4 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 package/guile/0003-remove_unused_funcs.patch rename package/guile/{0004-workaround-ice-ssa-corruption.patch => 0003-workaround-ice-ssa-corruption.patch} (100%) diff --git a/package/guile/0003-remove_unused_funcs.patch b/package/guile/0003-remove_unused_funcs.patch deleted file mode 100644 index 3d70ee9fc9..0000000000 --- a/package/guile/0003-remove_unused_funcs.patch +++ /dev/null @@ -1,36 +0,0 @@ -Remove unused static inline functions str_upcase_l() and -str_downcase_l() that cause the compilation error: -'dereferencing pointer to incomplete type'. - -Signed-off-by: Pedro Aguilar - -diff -Nau guile-2.0.11.orig/libguile/i18n.c guile-2.0.11/libguile/i18n.c ---- guile-2.0.11.orig/libguile/i18n.c 2014-01-21 22:25:11.000000000 +0100 -+++ guile-2.0.11/libguile/i18n.c 2014-11-04 23:18:52.675435613 +0100 -@@ -851,26 +851,6 @@ - *dst = '\0'; - } - --#ifdef USE_GNU_LOCALE_API --static inline void --str_upcase_l (register char *dst, register const char *src, -- scm_t_locale locale) --{ -- for (; *src != '\0'; src++, dst++) -- *dst = toupper_l (*src, locale); -- *dst = '\0'; --} -- --static inline void --str_downcase_l (register char *dst, register const char *src, -- scm_t_locale locale) --{ -- for (; *src != '\0'; src++, dst++) -- *dst = tolower_l (*src, locale); -- *dst = '\0'; --} --#endif -- - - SCM_DEFINE (scm_string_locale_lt, "string-locale Date: Thu, 13 Oct 2016 11:31:30 +0200 Subject: [PATCH 0680/3392] package/libamcodec: indentation cleanup Signed-off-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- package/libamcodec/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libamcodec/Config.in b/package/libamcodec/Config.in index 7300259e0d..45846e6d29 100644 --- a/package/libamcodec/Config.in +++ b/package/libamcodec/Config.in @@ -9,6 +9,6 @@ config BR2_PACKAGE_LIBAMCODEC depends on !BR2_STATIC_LIBS # dlfcn.h select BR2_PACKAGE_ALSA_LIB help - Interface library for Amlogic media codecs + Interface library for Amlogic media codecs - https://github.com/mdrjr/c2_aml_libs.git + https://github.com/mdrjr/c2_aml_libs.git From bac87bfaf7e75d9902e772d714e8408c1a0a96ca Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 07:25:07 -0300 Subject: [PATCH 0681/3392] memcached: bump to version 1.4.32 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/memcached/memcached.hash | 6 +++--- package/memcached/memcached.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 918a36bbf5..dbc0c0ddac 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,4 +1,4 @@ -# From http://www.memcached.org/files/memcached-1.4.31.tar.gz.sha1 -sha1 3ea34f5bc5c5aacb76cfc07f4ee5847f33526cb6 memcached-1.4.31.tar.gz +# From http://www.memcached.org/files/memcached-1.4.32.tar.gz.sha1 +sha1 cbec6b533fe037b5ad5c54d111e0d30bc9db4424 memcached-1.4.32.tar.gz # Calculated based on the hash above -sha256 77ce5f820bafe94c33bf7bd86268d9bcdb3b76f68128d795b106db53d528707f memcached-1.4.31.tar.gz +sha256 54bb9acd5fbbb73cd1fbfa67cbc6b301009a2835a26c8a4c3dba634a0c3d875d memcached-1.4.32.tar.gz diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 409942837a..2d84574471 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.4.31 +MEMCACHED_VERSION = 1.4.32 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From 7341abaff3518bee74463d63f0ce52ef253886de Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 11 Oct 2016 16:30:22 +0200 Subject: [PATCH 0682/3392] tinycbor: fix detection of cjson Fixes: - http://autobuild.buildroot.net/results/8fc/8fc7365e0dc777edc57e950a84df7fddc13c6776 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tinycbor/tinycbor.hash | 1 + package/tinycbor/tinycbor.mk | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/package/tinycbor/tinycbor.hash b/package/tinycbor/tinycbor.hash index 8757047b12..f07fc17d9a 100644 --- a/package/tinycbor/tinycbor.hash +++ b/package/tinycbor/tinycbor.hash @@ -1,3 +1,4 @@ # Locally computed: sha256 f70de1e6b7e3750abb4ceacf0059e47b47c769f113434de10293b33867ce54c2 tinycbor-v0.3.2.tar.gz sha256 7d3aa839ae246e9e14fc73e67869d88c684802c1578fb75503f3fdde1482dcf6 ede7f1431ae06c9086f2a83a57bd7832d99280e3.patch +sha256 42054074478d074d0320e0c64e8d44f60081b6f0d8dc0e3607e0fb7f4dad96a4 ad09b6af11fc8b6391041973783785cfe1559d63.patch diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index 6af2eef467..8ce9a76824 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -15,6 +15,11 @@ TINYCBOR_LICENSE_FILES = LICENSE TINYCBOR_PATCH = \ https://github.com/01org/tinycbor/commit/ede7f1431ae06c9086f2a83a57bd7832d99280e3.patch +# This patch fixes the issue on cjson detection +# This patch is currently in dev branch and will be a part of v0.4 +TINYCBOR_PATCH += \ + https://github.com/01org/tinycbor/commit/ad09b6af11fc8b6391041973783785cfe1559d63.patch + TINYCBOR_DEPENDENCIES = host-pkgconf TINYCBOR_INSTALL_STAGING = YES From 477756b257c4b72e03679b9142104860e1d4dabc Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 10:02:48 -0300 Subject: [PATCH 0683/3392] configs/qemu: bump to the latest kernel version Drop m68k-mcf5208 kernel patch since it's upstream. Also bump the pc samples since they're tied to the (base) qemu config. Results table: Defconfig Kernel Qemu Network Status -------------------------------------------------------------- aarch64_virt 4.8.1 2.6.0 YES OK (3) arm_versatile 4.8.1 2.5.0 YES OK arm_vexpress 4.8.1 2.5.0 YES OK m68k_mcf5208 4.8.1 2.5.0 YES OK m68k_q800 4.8.1 q800-v2.4.0 NO (2) OK microblazebe 4.8.1 2.5.0 YES OK microblazeel 4.8.1 2.5.0 YES OK mips32r2el_malta 4.8.1 2.5.0 YES OK mips32r2_malta 4.8.1 2.5.0 YES OK mips32r6el_malta 4.8.1 2.6.0 YES OK (3) mips32r6_malta 4.8.1 2.6.0 YES OK (3) mips64el_malta 4.8.1 2.5.0 YES OK mips64_malta 4.8.1 2.5.0 YES OK mips64r6el_malta 4.8.1 2.7.0 YES OK (3)(4) mips64r6_malta 4.8.1 2.7.0 YES OK (3)(4) ppc_g3beige 4.8.1 2.5.0 YES OK ppc_mpc8544ds 4.8.1 2.5.0 YES OK ppc_virtex_ml507 4.8.1 2.5.0 NO OK ppc64_pseries 4.8.1 2.5.0 YES OK sh4 4.8.1 2.5.0 YES OK sh4eb 4.8.1 2.5.0 NO (1) OK sparc_ss10 4.8.1 2.5.0 YES OK sparc64_sun4u 4.8.1 2.5.0 YES OK sparc_sun4u 4.8.1 2.5.0 YES OK x86 4.8.1 2.5.0 YES OK x86_64 4.8.1 2.5.0 YES OK xtensa_lx60 4.8.1 2.6.0 YES OK xtensa_lx60_nommu 4.8.1 2.6.0 YES OK (1) - Probably an endian issue with 8139 emulation/driver (2) - There's a network interface, but enabling it in qemu fails (3) - Known to fail with qemu versions lower than 2.6.0 (4) - Might work with 2.6.0, but the cpu definition changed in 2.7.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../patches/linux/m68knommu-fix-signal.patch | 45 ------------------- .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 board/qemu/mips64r6-malta/readme.txt | 7 ++- .../{linux-4.7.config => linux-4.8.config} | 0 board/qemu/mips64r6el-malta/readme.txt | 5 ++- .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 board/qemu/x86/linux-4.7.config | 1 - board/qemu/x86/linux-4.8.config | 1 + .../{linux-4.7.config => linux-4.8.config} | 0 ....7-nommu.config => linux-4.8-nommu.config} | 0 .../{linux-4.7.config => linux-4.8.config} | 0 configs/pc_x86_64_bios_defconfig | 8 ++-- configs/pc_x86_64_efi_defconfig | 8 ++-- configs/qemu_aarch64_virt_defconfig | 8 ++-- configs/qemu_arm_versatile_defconfig | 8 ++-- configs/qemu_arm_vexpress_defconfig | 6 +-- configs/qemu_m68k_mcf5208_defconfig | 10 ++--- configs/qemu_m68k_q800_defconfig | 8 ++-- configs/qemu_microblazebe_mmu_defconfig | 8 ++-- configs/qemu_microblazeel_mmu_defconfig | 8 ++-- configs/qemu_mips32r2_malta_defconfig | 8 ++-- configs/qemu_mips32r2el_malta_defconfig | 8 ++-- configs/qemu_mips32r6_malta_defconfig | 8 ++-- configs/qemu_mips32r6el_malta_defconfig | 8 ++-- configs/qemu_mips64_malta_defconfig | 8 ++-- configs/qemu_mips64el_malta_defconfig | 8 ++-- configs/qemu_mips64r6_malta_defconfig | 8 ++-- configs/qemu_mips64r6el_malta_defconfig | 8 ++-- configs/qemu_ppc64_pseries_defconfig | 6 +-- configs/qemu_ppc_g3beige_defconfig | 8 ++-- configs/qemu_ppc_mpc8544ds_defconfig | 8 ++-- configs/qemu_ppc_virtex_ml507_defconfig | 8 ++-- configs/qemu_sh4_r2d_defconfig | 8 ++-- configs/qemu_sh4eb_r2d_defconfig | 8 ++-- configs/qemu_sparc64_sun4u_defconfig | 8 ++-- configs/qemu_sparc_ss10_defconfig | 8 ++-- configs/qemu_x86_64_defconfig | 8 ++-- configs/qemu_x86_defconfig | 8 ++-- configs/qemu_xtensa_lx60_defconfig | 8 ++-- configs/qemu_xtensa_lx60_nommu_defconfig | 8 ++-- 58 files changed, 124 insertions(+), 165 deletions(-) rename board/qemu/aarch64-virt/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/arm-versatile/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/m68k-mcf5208/{linux-4.7.config => linux-4.8.config} (100%) delete mode 100644 board/qemu/m68k-mcf5208/patches/linux/m68knommu-fix-signal.patch rename board/qemu/m68k-q800/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/microblazebe-mmu/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/microblazeel-mmu/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/mips32r2-malta/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/mips32r2el-malta/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/mips32r6-malta/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/mips32r6el-malta/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/mips64-malta/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/mips64el-malta/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/mips64r6-malta/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/mips64r6el-malta/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/ppc-g3beige/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/ppc-mpc8544ds/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/ppc-virtex-ml507/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/sh4-r2d/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/sh4eb-r2d/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/sparc-ss10/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/sparc64-sun4u/{linux-4.7.config => linux-4.8.config} (100%) delete mode 120000 board/qemu/x86/linux-4.7.config create mode 120000 board/qemu/x86/linux-4.8.config rename board/qemu/x86_64/{linux-4.7.config => linux-4.8.config} (100%) rename board/qemu/xtensa-lx60/{linux-4.7-nommu.config => linux-4.8-nommu.config} (100%) rename board/qemu/xtensa-lx60/{linux-4.7.config => linux-4.8.config} (100%) diff --git a/board/qemu/aarch64-virt/linux-4.7.config b/board/qemu/aarch64-virt/linux-4.8.config similarity index 100% rename from board/qemu/aarch64-virt/linux-4.7.config rename to board/qemu/aarch64-virt/linux-4.8.config diff --git a/board/qemu/arm-versatile/linux-4.7.config b/board/qemu/arm-versatile/linux-4.8.config similarity index 100% rename from board/qemu/arm-versatile/linux-4.7.config rename to board/qemu/arm-versatile/linux-4.8.config diff --git a/board/qemu/m68k-mcf5208/linux-4.7.config b/board/qemu/m68k-mcf5208/linux-4.8.config similarity index 100% rename from board/qemu/m68k-mcf5208/linux-4.7.config rename to board/qemu/m68k-mcf5208/linux-4.8.config diff --git a/board/qemu/m68k-mcf5208/patches/linux/m68knommu-fix-signal.patch b/board/qemu/m68k-mcf5208/patches/linux/m68knommu-fix-signal.patch deleted file mode 100644 index b56994b239..0000000000 --- a/board/qemu/m68k-mcf5208/patches/linux/m68knommu-fix-signal.patch +++ /dev/null @@ -1,45 +0,0 @@ -m68knommu: fix user a5 register being overwritten - -On no-MMU systems the application a5 register can be overwitten with the -address of the process data segment when processing application signals. -For flat format applications compiled with full absolute relocation this -effectively corrupts the a5 register on signal processing - and this very -quickly leads to process crash and often takes out the whole system with -a panic as well. - -This has no effect on flat format applications compiled with the more -common PIC methods (such as -msep-data). These format applications reserve -a5 for the pointer to the data segment anyway - so it doesn't change it. - -A long time ago the a5 register was used in the code packed into the user -stack to enable signal return processing. And so it had to be restored on -end of signal cleanup processing back to the original a5 user value. This -was historically done by saving away a5 in the sigcontext structure. At -some point (a long time back it seems) the a5 restore process was changed -and it was hard coded to put the user data segment address directly into a5. -Which is ok for the common PIC compiled application case, but breaks the -full relocation application code. - -We no longer use this type of signal handling mechanism and so we don't -need to do anything special to save and restore a5 at all now. So remove the -code that hard codes a5 to the address of the user data segment. - -Signed-off-by: Greg Ungerer ---- - arch/m68k/kernel/signal.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c -index 2dcee3a..9202f82 100644 ---- a/arch/m68k/kernel/signal.c -+++ b/arch/m68k/kernel/signal.c -@@ -213,7 +213,6 @@ static inline int frame_extra_sizes(int f) - - static inline void adjustformat(struct pt_regs *regs) - { -- ((struct switch_stack *)regs - 1)->a5 = current->mm->start_data; - /* - * set format byte to make stack appear modulo 4, which it will - * be when doing the rte --- -1.9.1 diff --git a/board/qemu/m68k-q800/linux-4.7.config b/board/qemu/m68k-q800/linux-4.8.config similarity index 100% rename from board/qemu/m68k-q800/linux-4.7.config rename to board/qemu/m68k-q800/linux-4.8.config diff --git a/board/qemu/microblazebe-mmu/linux-4.7.config b/board/qemu/microblazebe-mmu/linux-4.8.config similarity index 100% rename from board/qemu/microblazebe-mmu/linux-4.7.config rename to board/qemu/microblazebe-mmu/linux-4.8.config diff --git a/board/qemu/microblazeel-mmu/linux-4.7.config b/board/qemu/microblazeel-mmu/linux-4.8.config similarity index 100% rename from board/qemu/microblazeel-mmu/linux-4.7.config rename to board/qemu/microblazeel-mmu/linux-4.8.config diff --git a/board/qemu/mips32r2-malta/linux-4.7.config b/board/qemu/mips32r2-malta/linux-4.8.config similarity index 100% rename from board/qemu/mips32r2-malta/linux-4.7.config rename to board/qemu/mips32r2-malta/linux-4.8.config diff --git a/board/qemu/mips32r2el-malta/linux-4.7.config b/board/qemu/mips32r2el-malta/linux-4.8.config similarity index 100% rename from board/qemu/mips32r2el-malta/linux-4.7.config rename to board/qemu/mips32r2el-malta/linux-4.8.config diff --git a/board/qemu/mips32r6-malta/linux-4.7.config b/board/qemu/mips32r6-malta/linux-4.8.config similarity index 100% rename from board/qemu/mips32r6-malta/linux-4.7.config rename to board/qemu/mips32r6-malta/linux-4.8.config diff --git a/board/qemu/mips32r6el-malta/linux-4.7.config b/board/qemu/mips32r6el-malta/linux-4.8.config similarity index 100% rename from board/qemu/mips32r6el-malta/linux-4.7.config rename to board/qemu/mips32r6el-malta/linux-4.8.config diff --git a/board/qemu/mips64-malta/linux-4.7.config b/board/qemu/mips64-malta/linux-4.8.config similarity index 100% rename from board/qemu/mips64-malta/linux-4.7.config rename to board/qemu/mips64-malta/linux-4.8.config diff --git a/board/qemu/mips64el-malta/linux-4.7.config b/board/qemu/mips64el-malta/linux-4.8.config similarity index 100% rename from board/qemu/mips64el-malta/linux-4.7.config rename to board/qemu/mips64el-malta/linux-4.8.config diff --git a/board/qemu/mips64r6-malta/linux-4.7.config b/board/qemu/mips64r6-malta/linux-4.8.config similarity index 100% rename from board/qemu/mips64r6-malta/linux-4.7.config rename to board/qemu/mips64r6-malta/linux-4.8.config diff --git a/board/qemu/mips64r6-malta/readme.txt b/board/qemu/mips64r6-malta/readme.txt index 8f792a0ac1..4a6c5fe798 100644 --- a/board/qemu/mips64r6-malta/readme.txt +++ b/board/qemu/mips64r6-malta/readme.txt @@ -1,7 +1,10 @@ Run the emulation with: - qemu-system-mips64 -M malta -cpu MIPS64R6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -nographic + qemu-system-mips64 -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -nographic The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.6.0 +Tested with QEMU 2.7.0 + +Might work with 2.6.0 by changing the -cpu entry to MIPS64R6-generic +since the naming was updated and the old name removed in 2.7.0 diff --git a/board/qemu/mips64r6el-malta/linux-4.7.config b/board/qemu/mips64r6el-malta/linux-4.8.config similarity index 100% rename from board/qemu/mips64r6el-malta/linux-4.7.config rename to board/qemu/mips64r6el-malta/linux-4.8.config diff --git a/board/qemu/mips64r6el-malta/readme.txt b/board/qemu/mips64r6el-malta/readme.txt index 3459a87768..b1dc23a22f 100644 --- a/board/qemu/mips64r6el-malta/readme.txt +++ b/board/qemu/mips64r6el-malta/readme.txt @@ -1,7 +1,10 @@ Run the emulation with: - qemu-system-mips64el -M malta -cpu MIPS64R6-generic -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -nographic + qemu-system-mips64el -M malta -cpu I6400 -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "root=/dev/hda" -nographic The login prompt will appear in the terminal that started Qemu. Tested with QEMU 2.6.0 + +Might work with 2.6.0 by changing the -cpu entry to MIPS64R6-generic +since the naming was updated and the old name removed in 2.7.0 diff --git a/board/qemu/ppc-g3beige/linux-4.7.config b/board/qemu/ppc-g3beige/linux-4.8.config similarity index 100% rename from board/qemu/ppc-g3beige/linux-4.7.config rename to board/qemu/ppc-g3beige/linux-4.8.config diff --git a/board/qemu/ppc-mpc8544ds/linux-4.7.config b/board/qemu/ppc-mpc8544ds/linux-4.8.config similarity index 100% rename from board/qemu/ppc-mpc8544ds/linux-4.7.config rename to board/qemu/ppc-mpc8544ds/linux-4.8.config diff --git a/board/qemu/ppc-virtex-ml507/linux-4.7.config b/board/qemu/ppc-virtex-ml507/linux-4.8.config similarity index 100% rename from board/qemu/ppc-virtex-ml507/linux-4.7.config rename to board/qemu/ppc-virtex-ml507/linux-4.8.config diff --git a/board/qemu/sh4-r2d/linux-4.7.config b/board/qemu/sh4-r2d/linux-4.8.config similarity index 100% rename from board/qemu/sh4-r2d/linux-4.7.config rename to board/qemu/sh4-r2d/linux-4.8.config diff --git a/board/qemu/sh4eb-r2d/linux-4.7.config b/board/qemu/sh4eb-r2d/linux-4.8.config similarity index 100% rename from board/qemu/sh4eb-r2d/linux-4.7.config rename to board/qemu/sh4eb-r2d/linux-4.8.config diff --git a/board/qemu/sparc-ss10/linux-4.7.config b/board/qemu/sparc-ss10/linux-4.8.config similarity index 100% rename from board/qemu/sparc-ss10/linux-4.7.config rename to board/qemu/sparc-ss10/linux-4.8.config diff --git a/board/qemu/sparc64-sun4u/linux-4.7.config b/board/qemu/sparc64-sun4u/linux-4.8.config similarity index 100% rename from board/qemu/sparc64-sun4u/linux-4.7.config rename to board/qemu/sparc64-sun4u/linux-4.8.config diff --git a/board/qemu/x86/linux-4.7.config b/board/qemu/x86/linux-4.7.config deleted file mode 120000 index 22732f69a8..0000000000 --- a/board/qemu/x86/linux-4.7.config +++ /dev/null @@ -1 +0,0 @@ -../x86_64/linux-4.7.config \ No newline at end of file diff --git a/board/qemu/x86/linux-4.8.config b/board/qemu/x86/linux-4.8.config new file mode 120000 index 0000000000..fca759e105 --- /dev/null +++ b/board/qemu/x86/linux-4.8.config @@ -0,0 +1 @@ +../x86_64/linux-4.8.config \ No newline at end of file diff --git a/board/qemu/x86_64/linux-4.7.config b/board/qemu/x86_64/linux-4.8.config similarity index 100% rename from board/qemu/x86_64/linux-4.7.config rename to board/qemu/x86_64/linux-4.8.config diff --git a/board/qemu/xtensa-lx60/linux-4.7-nommu.config b/board/qemu/xtensa-lx60/linux-4.8-nommu.config similarity index 100% rename from board/qemu/xtensa-lx60/linux-4.7-nommu.config rename to board/qemu/xtensa-lx60/linux-4.8-nommu.config diff --git a/board/qemu/xtensa-lx60/linux-4.7.config b/board/qemu/xtensa-lx60/linux-4.8.config similarity index 100% rename from board/qemu/xtensa-lx60/linux-4.7.config rename to board/qemu/xtensa-lx60/linux-4.8.config diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index 020be85873..242d3bf52c 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -20,15 +20,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image.sh" -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.8.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pc/linux-extras.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index 131948817f..118cc5982b 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -23,15 +23,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image.sh" -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.8.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pc/linux-extras.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 2f5429b164..acde3547c8 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-4.8.config" diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 738c7277d5..452ed5f92e 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-4.8.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 381c0eb795..e841bac5d3 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -13,13 +13,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 659ae3d8e6..c6c9098c25 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -9,17 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set -BR2_GLOBAL_PATCH_DIR="board/qemu/m68k-mcf5208/patches" - -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index 6ebd6fae3c..1d59d7746e 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index ecff6c3bd6..188304e6e9 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-4.8.config" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/xilinx-xemaclite.patch" diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 67534b3111..471d86ad30 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-4.8.config" BR2_LINUX_KERNEL_LINUX_BIN=y BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch" diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index 7aa8fc0891..16cc0ca585 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 6c6b3cd422..a66bdbda34 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index bddde486d6..a74c101502 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Compiler diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index f0d64ffc27..5202e2c462 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Compiler diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index 211bf01e23..92bacc07b6 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index b80b3eb924..d3cac61c63 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 43e141d6ac..c68d887798 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -10,15 +10,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Compiler diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index c3acc1cabb..c0ad30449f 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -10,15 +10,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Compiler diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 5c183573c0..810f6e6e18 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index ab3276d710..d0cd2cc2a8 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index a77936f3b2..ed10eeeea2 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig index d2581cbdb4..c8571b6a74 100644 --- a/configs/qemu_ppc_virtex_ml507_defconfig +++ b/configs/qemu_ppc_virtex_ml507_defconfig @@ -6,8 +6,8 @@ BR2_powerpc_440=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Use soft float BR2_SOFT_FLOAT=y @@ -15,9 +15,9 @@ BR2_SOFT_FLOAT=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-virtex-ml507/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-virtex-ml507/linux-4.8.config" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="virtex440-ml507" diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index ce387c27d0..11c4d26a19 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-4.8.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index 246e39e313..e88b638193 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux-4.8.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 288945b347..a4c0e96b36 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -9,12 +9,12 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux-4.8.config" diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 42efa481a1..0f3b474b14 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -9,12 +9,12 @@ BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux-4.8.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 40840bee59..8284d3fc5b 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.8.config" diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index a17ced44d5..0a4c6a8237 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-4.8.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index cf60100b44..020ea0cc75 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -16,15 +16,15 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4,8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-4.7.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-4.8.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index ab9de6aa80..b2ff47942a 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -20,15 +20,15 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_INITRAMFS=y -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-4.7-nommu.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-4.8-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf" BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" From 4c4f400007316127c9f5a4a7b843fac65c36a04d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 07:30:40 -0300 Subject: [PATCH 0684/3392] wpa_supplicant: AP mode now requires nl80211 Fixes: http://autobuild.buildroot.net/results/427/4275ea6e9f5a18d2ed42c93bdafbe6cbd50126a9/ Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/wpa_supplicant/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 85520b6a68..454541fdce 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -31,6 +31,7 @@ comment "nl80211 support needs a toolchain w/ threads" config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT bool "Enable AP mode" + depends on BR2_PACKAGE_WPA_SUPPLICANT_NL80211 help With this option enabled, wpa_supplicant can act as an access point much like hostapd does with a limited feature set. From 7fabade2ab66272acb80f41e7fb5265fc32072f8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 27 Sep 2016 23:37:47 +0200 Subject: [PATCH 0685/3392] motion: new package Motion is a program that monitors the video signal from cameras. It is able to detect if a significant part of the picture has changed; in other words, it can detect motion. https://motion-project.github.io Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/motion/Config.in | 17 +++++++ package/motion/S99motion | 37 +++++++++++++++ package/motion/motion.hash | 4 ++ package/motion/motion.mk | 89 +++++++++++++++++++++++++++++++++++ package/motion/motion.service | 10 ++++ 6 files changed, 158 insertions(+) create mode 100644 package/motion/Config.in create mode 100644 package/motion/S99motion create mode 100644 package/motion/motion.hash create mode 100644 package/motion/motion.mk create mode 100644 package/motion/motion.service diff --git a/package/Config.in b/package/Config.in index 60184ce99f..25f16889f4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -25,6 +25,7 @@ menu "Audio and video applications" source "package/miraclecast/Config.in" source "package/mjpegtools/Config.in" source "package/modplugtools/Config.in" + source "package/motion/Config.in" source "package/mpd/Config.in" source "package/mpd-mpc/Config.in" source "package/mpg123/Config.in" diff --git a/package/motion/Config.in b/package/motion/Config.in new file mode 100644 index 0000000000..a27e7f9fb6 --- /dev/null +++ b/package/motion/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_MOTION + bool "motion" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_JPEG + help + Motion is a program that monitors the video signal from + cameras. It is able to detect if a significant part of + the picture has changed; in other words, it can detect motion. + + libv4l has to be selected to be able to use a local camera. + + https://motion-project.github.io + +comment "motion needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/motion/S99motion b/package/motion/S99motion new file mode 100644 index 0000000000..36bfc23880 --- /dev/null +++ b/package/motion/S99motion @@ -0,0 +1,37 @@ +#!/bin/sh + +NAME=motion +PIDFILE=/var/run/$NAME.pid +DAEMON=/usr/bin/$NAME + +start() { + printf "Starting $NAME: " + start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +stop() { + printf "Stopping $NAME: " + start-stop-daemon -K -q -p $PIDFILE + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac + +exit $? diff --git a/package/motion/motion.hash b/package/motion/motion.hash new file mode 100644 index 0000000000..27f66b52fb --- /dev/null +++ b/package/motion/motion.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 0d1702c7958fd03b99bf4fdcb45d8e604864e5867034f825f2fc543e8be64549 motion-release-3.4.1.tar.gz +sha256 24e7150b753da04f3477276c36ce5664453965f279196f892668063ca4d6e975 709f626b7ef83a2bb3ef1f77205276207ab27196.patch +sha256 45ddb1599b850176a319afbcebb7f0bec309c918331da6d5fd6c3cba35387405 72193ccaff83fcb074c9aaa37c5691a8d8a18c7c.patch diff --git a/package/motion/motion.mk b/package/motion/motion.mk new file mode 100644 index 0000000000..de29a2a8e2 --- /dev/null +++ b/package/motion/motion.mk @@ -0,0 +1,89 @@ +################################################################################ +# +# motion +# +################################################################################ + +MOTION_VERSION = release-3.4.1 +MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION)) +MOTION_LICENSE = GPLv2 +MOTION_LICENSE_FILES = COPYING +MOTION_DEPENDENCIES = host-pkgconf jpeg +# From git and configure.ac is patched +MOTION_AUTORECONF = YES + +# This patch fixes detection of sqlite when cross-compiling +MOTION_PATCH = \ + https://github.com/Motion-Project/motion/commit/709f626b7ef83a2bb3ef1f77205276207ab27196.patch + +# This patch adds --with-sdl=[DIR] option to fix detection of sdl-config +MOTION_PATCH += \ + https://github.com/Motion-Project/motion/commit/72193ccaff83fcb074c9aaa37c5691a8d8a18c7c.patch + +# motion does not use any specific function of jpeg-turbo, so just relies on +# jpeg selection +MOTION_CONF_OPTS += --without-jpeg-turbo + +ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y) +MOTION_DEPENDENCIES += ffmpeg +MOTION_CONF_OPTS += --with-ffmpeg +else +MOTION_CONF_OPTS += --without-ffmpeg +endif + +ifeq ($(BR2_PACKAGE_MYSQL),y) +MOTION_DEPENDENCIES += mysql +MOTION_CONF_OPTS += \ + --with-mysql \ + --with-mysql-include=$(STAGING_DIR)/usr/include/mysql \ + --with-mysql-lib=$(STAGING_DIR)/usr/lib +else +MOTION_CONF_OPTS += --without-mysql +endif + +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +MOTION_DEPENDENCIES += postgresql +MOTION_CONF_OPTS += \ + --with-postgresql \ + --with-pgsql-include=$(STAGING_DIR)/usr/include \ + --with-pgsql-lib=$(STAGING_DIR)/usr/lib +else +MOTION_CONF_OPTS += --without-postgresql +endif + +ifeq ($(BR2_PACKAGE_SDL),y) +MOTION_DEPENDENCIES += sdl +MOTION_CONF_OPTS += --with-sdl=$(STAGING_DIR)/usr +else +MOTION_CONF_OPTS += --without-sdl +endif + +ifeq ($(BR2_PACKAGE_SQLITE),y) +MOTION_DEPENDENCIES += sqlite +MOTION_CONF_OPTS += --with-sqlite3 +else +MOTION_CONF_OPTS += --without-sqlite3 +endif + +# Do not use default install target as it installs many unneeded files and +# directories: docs, examples and init scripts +define MOTION_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0644 $(@D)/motion-dist.conf \ + $(TARGET_DIR)/etc/motion.conf + $(INSTALL) -D -m 0755 $(@D)/motion $(TARGET_DIR)/usr/bin/motion +endef + +define MOTION_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/motion/S99motion \ + $(TARGET_DIR)/etc/init.d/S99motion +endef + +define MOTION_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/motion/motion.service \ + $(TARGET_DIR)/usr/lib/systemd/system/motion.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -sf ../../../../usr/lib/systemd/system/motion.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/motion.service +endef + +$(eval $(autotools-package)) diff --git a/package/motion/motion.service b/package/motion/motion.service new file mode 100644 index 0000000000..c788cd6450 --- /dev/null +++ b/package/motion/motion.service @@ -0,0 +1,10 @@ +[Unit] +Description=Motion camera monitoring system +After=network.target + +[Service] +ExecStart=/usr/bin/motion +Restart=always + +[Install] +WantedBy=multi-user.target From 384e00515ba9b9d133998c3943889fb31ce59c4e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:39:26 -0300 Subject: [PATCH 0686/3392] php: security bump to version 7.0.12 See http://www.php.net/ChangeLog-7.php#7.0.12 since there are no CVEs out yet. And drop upstream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...close-phpdbg_load_module_or_extensio.patch | 47 ------------------- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/php/0007-phpdbg_prompt-enclose-phpdbg_load_module_or_extensio.patch diff --git a/package/php/0007-phpdbg_prompt-enclose-phpdbg_load_module_or_extensio.patch b/package/php/0007-phpdbg_prompt-enclose-phpdbg_load_module_or_extensio.patch deleted file mode 100644 index 006a03485e..0000000000 --- a/package/php/0007-phpdbg_prompt-enclose-phpdbg_load_module_or_extensio.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9ca3de0446fcd31b1561b333020ae0674a83bec7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 9 Aug 2016 11:39:10 +0200 -Subject: [PATCH] phpdbg_prompt: enclose phpdbg_load_module_or_extension() in - HAVE_LIBDL - -The phpdbg_load_module_or_extension() function relies on libdl -functionality, so it should be enclosed in HAVE_LIBDL to avoid the -following build failure when libdl support is not available: - -php-7.0.9/sapi/phpdbg/phpdbg_prompt.c:(.text+0x1c20): undefined reference to `_DL_LOAD' -php-7.0.9/sapi/phpdbg/phpdbg_prompt.c:(.text+0x1c36): undefined reference to `_GET_DL_ERROR' -php-7.0.9/sapi/phpdbg/phpdbg_prompt.c:(.text+0x1c6a): undefined reference to `_DL_FETCH_SYMBOL' -php-7.0.9/sapi/phpdbg/phpdbg_prompt.c:(.text+0x1c7e): undefined reference to `_DL_FETCH_SYMBOL' -php-7.0.9/sapi/phpdbg/phpdbg_prompt.c:(.text+0x1dc6): undefined reference to `_DL_UNLOAD' - -This function is only called in the "dl" debug command, inside an -HAVE_LIBDL condition. - -Signed-off-by: Thomas Petazzoni ---- - sapi/phpdbg/phpdbg_prompt.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c -index 6f73d30..6768dc5 100644 ---- a/sapi/phpdbg/phpdbg_prompt.c -+++ b/sapi/phpdbg/phpdbg_prompt.c -@@ -1019,6 +1019,7 @@ static int add_zendext_info(zend_extension *ext) /* {{{ */ { - } - /* }}} */ - -+#ifdef HAVE_LIBDL - PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, char **name) /* {{{ */ { - DL_HANDLE handle; - char *extension_dir; -@@ -1158,6 +1159,7 @@ quit: - DL_UNLOAD(handle); - return NULL; - } -+#endif - /* }}} */ - - PHPDBG_COMMAND(dl) /* {{{ */ --- -2.7.4 - diff --git a/package/php/php.hash b/package/php/php.hash index 0092095009..dde6a64dc3 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 d4cccea8da1d27c11b89386f8b8e95692ad3356610d571253d00ca67d524c735 php-7.0.11.tar.xz +sha256 f3d6c49e1c242e5995dec15e503fde996c327eb86cd7ec45c690e93c971b83ff php-7.0.12.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index b1b19ada7c..f925ec1eba 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.0.11 +PHP_VERSION = 7.0.12 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 5239108c33374a2b361276f5dcea50a6d09e19d1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 14 Oct 2016 09:20:33 +0200 Subject: [PATCH 0687/3392] mbedtls: bump to version 2.3.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index eebbfe8561..2d0fa11a97 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,2 +1,2 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.2.1-2.1.4-1.3.16-and-polarssl.1.2.19-released -sha256 6ddd5ca2e7dfb43d2fd750400856246fc1c98344dabf01b1594eb2f9880ef7ce mbedtls-2.2.1-apache.tgz +# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.3.0-2.1.5-and-1.3.17-released +sha256 590734c8bc8b3ac48e9123d44bf03562e91f8dce0d1ac2615c318c077f3215b2 mbedtls-2.3.0-apache.tgz diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 994a3f40a8..7067bebecd 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -5,7 +5,7 @@ ################################################################################ MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.2.1 +MBEDTLS_VERSION = 2.3.0 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From 64ace94d4ab30aad2d8dcae61abd2beebe00b226 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Thu, 13 Oct 2016 20:27:46 +0200 Subject: [PATCH 0688/3392] fwts: needs host-bison and host-flex Fixes: http://autobuild.buildroot.net/results/2e6bc77e89868d7a9902123ffb602c5b745d4580 Tested in a minimal debian environment, there should be no missing host package dependencies after these. Signed-off-by: Erico Nunes Signed-off-by: Thomas Petazzoni --- package/fwts/fwts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index c63e2c5f16..7ec1d5ed31 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -10,7 +10,7 @@ FWTS_STRIP_COMPONENTS = 0 FWTS_LICENSE = GPLv2, LGPLv2.1, Custom FWTS_LICENSE_FILES = debian/copyright FWTS_AUTORECONF = YES -FWTS_DEPENDENCIES = host-pkgconf json-c libglib2 \ +FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf json-c libglib2 \ $(if $(BR2_PACKAGE_DTC),dtc) $(eval $(autotools-package)) From 3aa01695eabb9183ffb804337924a7bd649be9ec Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 14 Oct 2016 11:29:04 +0200 Subject: [PATCH 0689/3392] docs: update URL to uClibc-ng homepage It is not necessary to update all mentioning of uClibc, but at least we should point to the right homepage of the used project. Signed-off-by: Waldemar Brodkorb Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- docs/manual/configure.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt index 0cd9f826f3..0739bc7c8c 100644 --- a/docs/manual/configure.txt +++ b/docs/manual/configure.txt @@ -31,7 +31,7 @@ code for your system. It consists of a compiler (in our case, +gcc+), binary utils like assembler and linker (in our case, +binutils+) and a C standard library (for example http://www.gnu.org/software/libc/libc.html[GNU Libc], -http://www.uclibc.org/[uClibc]). +http://www.uclibc-ng.org/[uClibc-ng]). The system installed on your development station certainly already has a compilation toolchain that you can use to compile an application @@ -81,7 +81,7 @@ by itself a cross-compilation toolchain, before building the userspace applications and libraries for your target embedded system. This backend supports several C libraries: -http://www.uclibc.org[uClibc], +http://www.uclibc-ng.org[uClibc-ng], http://www.gnu.org/software/libc/libc.html[glibc] and http://www.musl-libc.org[musl]. From 77880b73f7b4f0907ab508d716bf7bb21fe76ba7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 14 Oct 2016 16:09:44 +0200 Subject: [PATCH 0690/3392] package/Makefile.in: synchronize pkg-config settings between HOST_{CONFIGURE_OPTS, MAKE_ENV} The pkg-config settings in HOST_CONFIGURE_OPTS and HOST_MAKE_ENV have diverged over time, so they now use different _LIBDIR and _ALLOW_SYSTEM_{CFLAGS,LIBS} settings. Conceptually _CONFIGURE_OPTS should be a superset of _MAKE_ENV, so move the definitions around and define _CONFIGURE_OPTS in terms of _MAKE_ENV instead of repeating the individual settings. Do this both for the target and host variant for consistency. Signed-off-by: Peter Korsgaard Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/Makefile.in | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index b4a4c60649..98e30b4921 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -235,8 +235,10 @@ export PERL=$(shell which perl) # finds this perl module by exporting the proper value for PERL5LIB. export PERL5LIB=$(HOST_DIR)/usr/lib/perl +TARGET_MAKE_ENV = PATH=$(BR_PATH) + TARGET_CONFIGURE_OPTS = \ - PATH=$(BR_PATH) \ + $(TARGET_MAKE_ENV) \ AR="$(TARGET_AR)" \ AS="$(TARGET_AS)" \ LD="$(TARGET_LD)" \ @@ -275,11 +277,17 @@ TARGET_CONFIGURE_OPTS = \ STAGING_DIR="$(STAGING_DIR)" \ INTLTOOL_PERL=$(PERL) -TARGET_MAKE_ENV = PATH=$(BR_PATH) +HOST_MAKE_ENV = \ + PATH=$(BR_PATH) \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + PKG_CONFIG_SYSROOT_DIR="/" \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ + PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ + PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" HOST_CONFIGURE_OPTS = \ - PATH=$(BR_PATH) \ + $(HOST_MAKE_ENV) \ AR="$(HOSTAR)" \ AS="$(HOSTAS)" \ LD="$(HOSTLD)" \ @@ -294,19 +302,8 @@ HOST_CONFIGURE_OPTS = \ CFLAGS="$(HOST_CFLAGS)" \ CXXFLAGS="$(HOST_CXXFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_SYSROOT_DIR="/" \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \ INTLTOOL_PERL=$(PERL) -HOST_MAKE_ENV = \ - PATH=$(BR_PATH) \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_SYSROOT_DIR="/" \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" - # This is extra environment we can not export ourselves (eg. because some # packages use that variable internally, eg. uboot), so we have to # explicitly pass it to user-supplied external hooks (eg. post-build, From c355ee5bd8bf5026b10e46e0a878ccc4a36c4295 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 12:50:09 -0300 Subject: [PATCH 0691/3392] squid: disable netfilter for musl toolchains It has been broken for several releases, fixes: http://autobuild.buildroot.net/results/d6c/d6cf725e88bc0a4afd0b7e1ae58a8e5a649ae6c3/ Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/squid/squid.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 702b2207e7..c8a72487f6 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -25,7 +25,7 @@ SQUID_CONF_ENV = \ BUILDCXXFLAGS="$(HOST_CXXFLAGS)" SQUID_CONF_OPTS = \ --enable-async-io=8 \ - --enable-linux-netfilter \ + $(if $(BR2_TOOLCHAIN_USES_MUSL),--disable-linux-netfilter,--enable-linux-netfilter) \ --enable-removal-policies="lru,heap" \ --with-filedescriptors=1024 \ --disable-ident-lookups \ From 9d391ed8b7a4751a3efe9453e81de373ae85a745 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 10 Oct 2016 12:50:10 -0300 Subject: [PATCH 0692/3392] squid: bump to version 3.5.22 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 30eed501bb..3b2f2debbe 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.21.tar.xz.asc -md5 e6745a6e4ac0b48b7283861f64a40ae5 squid-3.5.21.tar.xz -sha1 38c4f801a17e27ea530fef88c6ee24b42f08529c squid-3.5.21.tar.xz +# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.22.tar.xz.asc +md5 afb82d2748c06c95815c171463b4aa14 squid-3.5.22.tar.xz +sha1 73e9199dd9d2a7f107f78d03454830713a4a571d squid-3.5.22.tar.xz diff --git a/package/squid/squid.mk b/package/squid/squid.mk index c8a72487f6..ddd0b83b04 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).21 +SQUID_VERSION = $(SQUID_VERSION_MAJOR).22 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR) SQUID_LICENSE = GPLv2+ From 1c387674c7fafeaf154b0361c9a56c8b4ab0e632 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 11 Oct 2016 15:07:04 +0200 Subject: [PATCH 0693/3392] package/nut: fix build with musl Add missing header, backport from an upstream commit. Fixes; http://autobuild.buildroot.org/results/441/4419b24fff68dbddf488003100b6abd7b3cd5576/ Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- .../0003-client-ups-add-missing-include.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/nut/0003-client-ups-add-missing-include.patch diff --git a/package/nut/0003-client-ups-add-missing-include.patch b/package/nut/0003-client-ups-add-missing-include.patch new file mode 100644 index 0000000000..78472cd32e --- /dev/null +++ b/package/nut/0003-client-ups-add-missing-include.patch @@ -0,0 +1,29 @@ +From da0969b26ad4bb839bcb88362c8f41aaf0eb8363 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Tue, 11 Oct 2016 12:05:36 +0200 +Subject: [PATCH] client/ups: add missing include + +struct timeval is declared in sys/time.h, so we need to #include it. + +Signed-off-by: "Yann E. MORIN" +--- +Backported from upstream. +--- + clients/upsclient.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/clients/upsclient.c b/clients/upsclient.c +index 43c0e79..dfadd0d 100644 +--- a/clients/upsclient.c ++++ b/clients/upsclient.c +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include "upsclient.h" + #include "common.h" +-- +2.7.4 + From 366cec113a1c5a20b4afb671d14f02ea10b660e8 Mon Sep 17 00:00:00 2001 From: Dagg Stompler Date: Thu, 13 Oct 2016 22:56:21 +0300 Subject: [PATCH 0694/3392] configs/odroidc2: bump kernel headers to 3.14.79 following commit 7de5b0d2d83bec38ec96ef5917259d9f46df58d4, bump kernel headers to 3.14.79 to match the kernel version. We cannot use BR2_KERNEL_HEADERS_AS_KERNEL as some of their kernel modifications causes glibc to fail to build. Signed-off-by: Dagg Stompler Signed-off-by: Peter Korsgaard --- configs/odroidc2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig index 44fc61a31a..95a916944a 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -11,7 +11,7 @@ BR2_GCC_VERSION_4_9_X=y # Kernel BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.14.29" +BR2_DEFAULT_KERNEL_VERSION="3.14.79" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y From 8ae8d1162d92f14a0445fc497f473fde0aee6c3c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 14 Oct 2016 19:32:43 +0200 Subject: [PATCH 0695/3392] gdb: unbreak host/target install step Commit 12306a81f8edc (gdb: get rid of host-texinfo dependency) tried to append MAKEINFO=true to the host/target make install arguments, but as the default values for these are only added when (host-)autotools-package is evaluated (and only if empty), this effectively drops the default values and we ended up without the 'install' target and nothing got installed. To fix this, specify the full install arguments. Signed-off-by: Peter Korsgaard --- package/gdb/gdb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 0e7abfd2a6..ccf9e4968d 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -39,9 +39,9 @@ HOST_GDB_DEPENDENCIES = host-expat host-ncurses # Disable building documentation GDB_MAKE_OPTS += MAKEINFO=true -GDB_INSTALL_TARGET_OPTS += MAKEINFO=true +GDB_INSTALL_TARGET_OPTS += MAKEINFO=true DESTDIR=$(TARGET_DIR) install HOST_GDB_MAKE_OPTS += MAKEINFO=true -HOST_GDB_INSTALL_OPTS += MAKEINFO=true +HOST_GDB_INSTALL_OPTS += MAKEINFO=true install # Apply the Xtensa specific patches XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME)) From a4ebc1c1de6d2bb9090cd99253a3e84dff9d87e4 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 11 Oct 2016 14:02:33 +0200 Subject: [PATCH 0696/3392] binutils: get rid of host-texinfo dependency and other documentation tricks The binutils/host-binutils package applied several tricks to avoid building info documentation. In the worst case, host-texinfo is added as dependency. However, there is a simpler solution that removes the need for all these tricks: instruct the makefiles to use a dummy makeinfo command ('true'). Signed-off-by: Thomas De Schampheleire Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/binutils/binutils.mk | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 3a4a66158c..966cc793f7 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -29,19 +29,8 @@ BINUTILS_LICENSE = GPLv3+, libiberty LGPLv2.1+ BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB ifeq ($(BINUTILS_FROM_GIT),y) -BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo -HOST_BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo -endif - -# The .info files in the >= 2.26 tarball have an incorrect timestamp, -# so binutils tries to re-generate them. In order to avoid the -# dependency on host-texinfo, we simply update the timestamps. -ifeq ($(BR2_BINUTILS_VERSION_2_26_X)$(BR2_BINUTILS_VERSION_2_27_X),y) -define BINUTILS_FIXUP_INFO_TIMESTAMPS - find $(@D) -name '*.info' -exec touch {} \; -endef -BINUTILS_POST_PATCH_HOOKS += BINUTILS_FIXUP_INFO_TIMESTAMPS -HOST_BINUTILS_POST_PATCH_HOOKS += BINUTILS_FIXUP_INFO_TIMESTAMPS +BINUTILS_DEPENDENCIES += host-flex host-bison +HOST_BINUTILS_DEPENDENCIES += host-flex host-bison endif # When binutils sources are fetched from the binutils-gdb repository, @@ -68,8 +57,12 @@ endif # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work -BINUTILS_CONF_ENV += ac_cv_prog_MAKEINFO=missing -HOST_BINUTILS_CONF_ENV += ac_cv_prog_MAKEINFO=missing +BINUTILS_CONF_ENV += MAKEINFO=true +BINUTILS_MAKE_OPTS += MAKEINFO=true +BINUTILS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MAKEINFO=true install +HOST_BINUTILS_CONF_ENV += MAKEINFO=true +HOST_BINUTILS_MAKE_OPTS += MAKEINFO=true +HOST_BINUTILS_INSTALL_OPTS += MAKEINFO=true install # gcc bug with Os/O2/O3, PR77311 # error: unable to find a register to spill in class 'CCREGS' @@ -109,7 +102,7 @@ HOST_BINUTILS_CONF_OPTS = \ # binutils run configure script of subdirs at make time, so ensure # our TARGET_CONFIGURE_ARGS are taken into consideration for those define BINUTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) $(BINUTILS_MAKE_OPTS) -C $(@D) endef # We just want libbfd, libiberty and libopcodes, From 8e327d4c69720fb215c547de788e65cb211a9978 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 11 Oct 2016 14:02:34 +0200 Subject: [PATCH 0697/3392] Revert "texinfo: new host package" This reverts commit ea161cf6891c3a3a601dfce072f68ee4aed08d21. The host-texinfo dependency is no longer used by any package, after using another solution to the problem that required its introduction in the first place. Signed-off-by: Thomas De Schampheleire Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/texinfo/texinfo.hash | 2 -- package/texinfo/texinfo.mk | 13 ------------- 2 files changed, 15 deletions(-) delete mode 100644 package/texinfo/texinfo.hash delete mode 100644 package/texinfo/texinfo.mk diff --git a/package/texinfo/texinfo.hash b/package/texinfo/texinfo.hash deleted file mode 100644 index 4bdf34357c..0000000000 --- a/package/texinfo/texinfo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2 texinfo-6.1.tar.xz diff --git a/package/texinfo/texinfo.mk b/package/texinfo/texinfo.mk deleted file mode 100644 index ebd0b48877..0000000000 --- a/package/texinfo/texinfo.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# texinfo -# -################################################################################ - -TEXINFO_VERSION = 6.1 -TEXINFO_SITE = $(BR2_GNU_MIRROR)/texinfo -TEXINFO_SOURCE = texinfo-$(TEXINFO_VERSION).tar.xz -TEXINFO_LICENSE = GPLv3+ -TEXINFO_LICENSE_FILES = COPYING - -$(eval $(host-autotools-package)) From 8e1625b8d35623559e7dbffae8982c6e737d5304 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 14 Oct 2016 19:24:27 +0200 Subject: [PATCH 0698/3392] package/x11r7/xlib_libXxf86dga: needs MMU Fixes http://autobuild.buildroot.net/results/f8f/f8f0b6cf9af21ff7d9ac76e670a7735ee9753315/ http://autobuild.buildroot.net/results/579/579e6db79929910ac53a914f65fc398a483134ae/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXxf86dga/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/x11r7/xlib_libXxf86dga/Config.in b/package/x11r7/xlib_libXxf86dga/Config.in index 5e21502cda..8276b7178f 100644 --- a/package/x11r7/xlib_libXxf86dga/Config.in +++ b/package/x11r7/xlib_libXxf86dga/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_XLIB_LIBXXF86DGA bool "libXxf86dga" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XPROTO_XF86DGAPROTO From 3adc7f521f5f6b66494f4d42d35118a0b1ce36ba Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 Sep 2016 12:55:20 +0200 Subject: [PATCH 0699/3392] qemu: add ARM noMMU defconfig Useful for testing no-MMU ARM code in Qemu. The newer Linux kernels with DT support for Qemu Versatile aren't yet working, so use latest 4.4 kernel. Signed-off-by: Waldemar Brodkorb Tested-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../qemu/arm-versatile/linux-4.4-nommu.config | 46 +++++++++++++++++++ .../patches/linux/versatile-nommu.patch | 30 ++++++++++++ board/qemu/arm-versatile/readme.txt | 4 ++ configs/qemu_arm_versatile_nommu_defconfig | 32 +++++++++++++ 4 files changed, 112 insertions(+) create mode 100644 board/qemu/arm-versatile/linux-4.4-nommu.config create mode 100644 board/qemu/arm-versatile/patches/linux/versatile-nommu.patch create mode 100644 configs/qemu_arm_versatile_nommu_defconfig diff --git a/board/qemu/arm-versatile/linux-4.4-nommu.config b/board/qemu/arm-versatile/linux-4.4-nommu.config new file mode 100644 index 0000000000..e1264dca00 --- /dev/null +++ b/board/qemu/arm-versatile/linux-4.4-nommu.config @@ -0,0 +1,46 @@ +# CONFIG_MMU is not set +CONFIG_ARCH_VERSATILE=y +CONFIG_SET_MEM_PARAM=y +CONFIG_DRAM_BASE=0x00000000 +CONFIG_DRAM_SIZE=0x08000000 +CONFIG_ARCH_VERSATILE_PB=y +CONFIG_MACH_VERSATILE_AB=y +# CONFIG_MACH_VERSATILE_DT is not set +CONFIG_BINFMT_FLAT=y +CONFIG_SYSVIPC=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_ARCH_MULTI_V7 is not set +CONFIG_AEABI=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_NETDEVICES=y +CONFIG_SMC91X=y +CONFIG_PHYLIB=y +CONFIG_INPUT_EVDEV=y +CONFIG_SERIO_AMBAKMI=y +CONFIG_LEGACY_PTY_COUNT=16 +CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=m +CONFIG_FB=y +CONFIG_FB_ARMCLCD=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_SOUND=y +CONFIG_SND=m +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_ARMAACI=m +CONFIG_EXT4_FS=y +CONFIG_VFAT_FS=m +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_MAGIC_SYSRQ=y diff --git a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch b/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch new file mode 100644 index 0000000000..961b6c3dd1 --- /dev/null +++ b/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch @@ -0,0 +1,30 @@ +From b7c1666813424d329868335c8faf8886b0f85b6c Mon Sep 17 00:00:00 2001 +From: Greg Ungerer +Date: Thu, 11 Aug 2016 21:33:11 +1000 +Subject: [PATCH] arm: fix versatile platform to work in no-MMU mode + +If CONFIG_MMU is disabled then do not carry out the virtual memory address +translation for IO devices. + +With this fix in place we can run the ARM Versatile board (including its +qemu emulation) as a no-MMU Linux system. + +Signed-off-by: Greg Ungerer +Signed-off-by: Waldemar Brodkorb + +diff -Nur linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h +--- linux-4.4.17.orig/arch/arm/mach-versatile/include/mach/hardware.h 2016-08-10 11:49:43.000000000 +0200 ++++ linux-4.4.17/arch/arm/mach-versatile/include/mach/hardware.h 2016-08-25 23:19:03.691716292 +0200 +@@ -30,8 +30,12 @@ + #define VERSATILE_PCI_VIRT_BASE (void __iomem *)0xe8000000ul + #define VERSATILE_PCI_CFG_VIRT_BASE (void __iomem *)0xe9000000ul + ++#ifdef CONFIG_MMU + /* macro to get at MMIO space when running virtually */ + #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) ++#else ++#define IO_ADDRESS(x) (x) ++#endif + + #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) + diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt index f6f05f9ca0..c8ea4cda85 100644 --- a/board/qemu/arm-versatile/readme.txt +++ b/board/qemu/arm-versatile/readme.txt @@ -2,6 +2,10 @@ Run the emulation with: qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user +Or for the noMMU emulation: + + qemu-system-arm -M versatilepb -kernel output/images/zImage -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 + The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig new file mode 100644 index 0000000000..49e4411de4 --- /dev/null +++ b/configs/qemu_arm_versatile_nommu_defconfig @@ -0,0 +1,32 @@ +# Architecture +BR2_arm=y +BR2_arm926t=y + +# Toolchain +BR2_PACKAGE_HOST_ELF2FLT=y +# BR2_USE_MMU is not set + +# Patches +BR2_GLOBAL_PATCH_DIR="board/qemu/arm-versatile/patches" + +# Busybox with hush +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" + +# System +BR2_SYSTEM_DHCP="eth0" +BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + +# Filesystem +# BR2_TARGET_ROOTFS_EXT2 is not set +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Linux headers same as kernel, a 4.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-4.4-nommu.config" From 9f4483f7cefebc6a489c1eeab7f6468be5561f27 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 15 Oct 2016 10:13:58 +0200 Subject: [PATCH 0700/3392] toolchain: update comment about uClibc/uClibc-ng External toolchains can use both, so mention it here. Reported-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Waldemar Brodkorb Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-external/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 2b17b7a9e5..bcb42db6ba 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -920,14 +920,16 @@ choice default BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC - bool "uClibc" + bool "uClibc/uClibc-ng" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC # For the time being, we assume that all custom external # toolchains have shadow password support. select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS help Select this option if your external toolchain uses the - uClibc C library (available from http://www.uclibc.org/). + uClibc (available from http://www.uclibc.org/) + or uClibc-ng (available from http://www.uclibc-ng.org) + C library. config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC bool "glibc/eglibc" From 5130e9f874ea07db417a02b6d78d118a8cd6a068 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 08:19:55 -0300 Subject: [PATCH 0701/3392] libgpgme: improve language bindings The C++ bindings require C++11 support with minimum gcc version 4.8, so handle it accordingly. The new python bindings require some work, but since they were previously unavailable just disable them for now until someone is interested in building/using them. Fixes: http://autobuild.buildroot.net/results/685/6853c21aa084952bc232f0ec3e96dcb972d8fbfe/ Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libgpgme/libgpgme.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 7e86daf95c..c581a3c496 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -11,6 +11,7 @@ LIBGPGME_LICENSE = LGPLv2.1+ LIBGPGME_LICENSE_FILES = COPYING.LESSER LIBGPGME_INSTALL_STAGING = YES LIBGPGME_DEPENDENCIES = libassuan libgpg-error +LIBGPGME_LANGUAGE_BINDINGS = cl # libgpgme, needs to know the gpg binary path on the target. LIBGPGME_CONF_OPTS = --with-gpg=/usr/bin/gpg \ @@ -19,7 +20,13 @@ LIBGPGME_CONF_OPTS = --with-gpg=/usr/bin/gpg \ --disable-gpgsm-test \ --disable-gpgconf-test \ --disable-g13-test \ - --disable-gpg-test + --disable-gpg-test \ + --enable-languages=$(LIBGPGME_LANGUAGE_BINDINGS) + +# C++ bindings require a C++11 capable gcc +ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),yy) +LIBGPGME_LANGUAGE_BINDINGS := $(LIBGPGME_LANGUAGE_BINDINGS),cpp +endif # Handle argp-standalone or it errors out during build ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) From d882a232c4cc2100bd18e994f0861cd614efabff Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 13 Oct 2016 18:04:17 +0200 Subject: [PATCH 0702/3392] package/monolite: bump to version 149 This patch bumps monolite to version 149 Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- 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 44ec39a2af..621e5e4f5f 100644 --- a/package/monolite/monolite.hash +++ b/package/monolite/monolite.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 885270da1b64670bffec9c8df1272ab88ff0b96186d2ebb61bdfa47a5586f987 monolite-140-latest.tar.gz +sha256 c01e9ba37d8d8f9ef68e08170b2582cc710a8a77756e2412dff298a39b3c4d2b monolite-149-latest.tar.gz diff --git a/package/monolite/monolite.mk b/package/monolite/monolite.mk index 91c01d794a..d50d9f22fb 100644 --- a/package/monolite/monolite.mk +++ b/package/monolite/monolite.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONOLITE_VERSION = 140 +MONOLITE_VERSION = 149 MONOLITE_SITE = http://download.mono-project.com/monolite/ MONOLITE_SOURCE = monolite-$(MONOLITE_VERSION)-latest.tar.gz MONOLITE_LICENSE = LGPLv2 or commercial From d61b8de0b09515c7927e6c93c14741d8aa4e4d70 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 13 Oct 2016 18:04:18 +0200 Subject: [PATCH 0703/3392] package/mono: bump to version 4.6.0.245 * Bump to mono 4.6.0.245 * Enabling previously disabled aot cause this version doesn't compile without * Fixing removed licensing file in mcs/COPYING.LIB Signed-off-by: Angelo Compagnucci Signed-off-by: Peter Korsgaard --- package/mono/mono.hash | 2 +- package/mono/mono.mk | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mono/mono.hash b/package/mono/mono.hash index c275e15bf3..4d05458a9a 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 900c2cc25ee55adeec04e1ae889316efc127c82cc0c392f928421f19f8f5b633 mono-4.4.2.11.tar.bz2 +sha256 2981f518cace63bfe10953fecd57c7fef040077a1ac617967dde5466062c1327 mono-4.6.0.245.tar.bz2 diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 3d0b9bc739..ea4a7f18a6 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,12 +4,12 @@ # ################################################################################ -MONO_VERSION = 4.4.2.11 +MONO_VERSION = 4.6.0.245 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 -MONO_LICENSE_FILES = LICENSE COPYING.LIB mcs/COPYING.LIB mcs/COPYING \ - eglib/COPYING external/Newtonsoft.Json/Tools/7-zip/copying.txt +MONO_LICENSE = GPLv2 or MIT (compiler, tools), MIT (libs) or commercial +MONO_LICENSE_FILES = LICENSE mcs/COPYING eglib/COPYING \ + external/Newtonsoft.Json/Tools/7-zip/copying.txt MONO_INSTALL_STAGING = YES ## Mono native @@ -22,7 +22,7 @@ MONO_CONF_OPTS = --disable-gtk-doc \ --with-mcs-docs=no \ --with-moonlight=no \ --with-ikvm-native=no \ - --enable-minimal=aot,profiler,debug \ + --enable-minimal=profiler,debug \ --disable-mcs-build \ --enable-static @@ -49,7 +49,7 @@ HOST_MONO_CONF_OPTS = --disable-gtk-doc \ --with-moonlight=no \ --disable-libraries \ --with-ikvm-native=no \ - --enable-minimal=aot,profiler,debug \ + --enable-minimal=profiler,debug \ --enable-static # ensure monolite is used From e278c5201251f0fb25d17cfb9e1a443a17a5f54d Mon Sep 17 00:00:00 2001 From: Eloi BAIL Date: Thu, 13 Oct 2016 14:28:02 -0400 Subject: [PATCH 0704/3392] mysql: Make S97mysqld source a default file Hardcoded parameters are used for mysql user/directory. Make S97mysqld source a /etc/default/mysql file where these parameters can be overridden. Signed-off-by: Eloi BAIL Tested-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/mysql/S97mysqld | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/mysql/S97mysqld b/package/mysql/S97mysqld index 5a660e9424..110ca2cd12 100644 --- a/package/mysql/S97mysqld +++ b/package/mysql/S97mysqld @@ -1,10 +1,15 @@ #!/bin/sh +MYSQL_DIR="/var/mysql" +MYSQL_USER="mysql" + +[ -r /etc/default/mysql ] && . /etc/default/mysql + case "$1" in start) - if [ ! -d /var/mysql/mysql ] ; then + if [ ! -d $MYSQL_DIR/mysql ] ; then echo "Creating MySQL system tables..." - mysql_install_db --user=mysql --ldata=/var/mysql + mysql_install_db --user=$MYSQL_USER --ldata=$MYSQL_DIR fi # mysqld runs as user mysql, but /run is only writable by root From fdf9f298d2c863bf9651d469db6abfb9ba73e4bc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 15 Oct 2016 09:44:51 +0200 Subject: [PATCH 0705/3392] hiawatha: bump version to 10.4 Needed for compatibility with mbedtls 2.3.0 Fixes: http://autobuild.buildroot.net/results/8d7/8d77069856620ec0e95a2e9bd865be08180fedff/ http://autobuild.buildroot.net/results/54b/54b2c7df1b1d2edab5f4925455248eaabea7ef87/ Signed-off-by: Peter Korsgaard --- package/hiawatha/hiawatha.hash | 2 +- package/hiawatha/hiawatha.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hiawatha/hiawatha.hash b/package/hiawatha/hiawatha.hash index a5207a17dd..31025d9689 100644 --- a/package/hiawatha/hiawatha.hash +++ b/package/hiawatha/hiawatha.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 99d185fb16bb1ab706724494d3cac86464f1485ed4b0fff09a192eca6da5ff8e hiawatha-10.3.tar.gz +sha256 e40ebcbde8fbd5a14dbf7279143757aea02a461940daa5c460496871eaa75454 hiawatha-10.4.tar.gz diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index dc4921601b..8821b0f6ed 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIAWATHA_VERSION = 10.3 +HIAWATHA_VERSION = 10.4 HIAWATHA_SITE = http://www.hiawatha-webserver.org/files HIAWATHA_DEPENDENCIES = zlib HIAWATHA_LICENSE = GPLv2 From f090540e279c8ce21ecc07e29af670f7501897ab Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 22:13:52 -0300 Subject: [PATCH 0706/3392] gsettings-desktop-schemas: bump to version 3.22.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../gsettings-desktop-schemas/gsettings-desktop-schemas.hash | 4 ++-- .../gsettings-desktop-schemas/gsettings-desktop-schemas.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash index 7fed553042..05ec7a418f 100644 --- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash +++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash @@ -1,2 +1,2 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.20/gsettings-desktop-schemas-3.20.0.sha256sum -sha256 55a41b533c0ab955e0a36a84d73829451c88b027d8d719955d8f695c35c6d9c1 gsettings-desktop-schemas-3.20.0.tar.xz +# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.sha256sum +sha256 0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1 gsettings-desktop-schemas-3.22.0.tar.xz diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk index 04ad2e031a..7fa61817c1 100644 --- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk +++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.20 +GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.22 GSETTINGS_DESKTOP_SCHEMAS_VERSION = $(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR).0 GSETTINGS_DESKTOP_SCHEMAS_SOURCE = gsettings-desktop-schemas-$(GSETTINGS_DESKTOP_SCHEMAS_VERSION).tar.xz GSETTINGS_DESKTOP_SCHEMAS_SITE = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) From ab2c6b4b06be4cb8ebb7c3e8fe71372175562562 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 22:13:54 -0300 Subject: [PATCH 0707/3392] poppler: add explicit cairo support Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/poppler/poppler.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index c6cd2eb92f..4632d8dd0c 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -14,6 +14,13 @@ POPPLER_INSTALL_STAGING = YES POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \ --enable-xpdf-headers +ifeq ($(BR2_PACKAGE_CAIRO),y) +POPPLER_CONF_OPTS += --enable-cairo-output +POPPLER_DEPENDENCIES += cairo +else +POPLER_CONF_OPTS += --disable-cairo-output +endif + ifeq ($(BR2_PACKAGE_LCMS2),y) POPPLER_CONF_OPTS += --enable-cms=lcms2 POPPLER_DEPENDENCIES += lcms2 From 8d0a731d8f3e0314e579523fdcb9812ea737bd7e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 22:13:55 -0300 Subject: [PATCH 0708/3392] poppler: add explicit libglib2 support Evince needs poppler-glib support (when poppler is enabled, for PDF reading support), so add explicit handling to the package. And poppler-glib requires cairo output, hence the conditional on both libglib2 and cairo to enable it. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/poppler/poppler.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 4632d8dd0c..172c428c63 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -28,6 +28,13 @@ else POPPLER_CONF_OPTS += --enable-cms=none endif +ifeq ($(BR2_PACKAGE_CAIRO)$(BR2_PACKAGE_LIBGLIB2),yy) +POPPLER_CONF_OPTS += --enable-poppler-glib +POPPLER_DEPENDENCIES += libglib2 +else +POPPLER_CONF_OPTS += --disable-poppler-glib +endif + ifeq ($(BR2_PACKAGE_TIFF),y) POPPLER_CONF_OPTS += --enable-libtiff # Help poppler to find libtiff in static linking scenarios From b672b404d16ee5a7dc921c96a1677f4fb3fd48f0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 12 Oct 2016 22:13:56 -0300 Subject: [PATCH 0709/3392] poppler: bump to version 0.48.0 Drop upstream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...id-shell-comparaison-in-libtiff-test.patch | 23 ------------------- package/poppler/poppler.hash | 2 +- package/poppler/poppler.mk | 2 +- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 package/poppler/0001-Fix-invalid-shell-comparaison-in-libtiff-test.patch diff --git a/package/poppler/0001-Fix-invalid-shell-comparaison-in-libtiff-test.patch b/package/poppler/0001-Fix-invalid-shell-comparaison-in-libtiff-test.patch deleted file mode 100644 index f40bee1dd4..0000000000 --- a/package/poppler/0001-Fix-invalid-shell-comparaison-in-libtiff-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix syntax issue in configure script - -The change is not done in configure.ac, because the package doesn't -autoreconf properly. - -Patch on configure.ac submitted upstream at -https://bugs.freedesktop.org/show_bug.cgi?id=90292. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure -=================================================================== ---- a/configure -+++ b/configure -@@ -19738,7 +19738,7 @@ - CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS" - LIBS="$LIBS $LIBTIFF_LIBS" - if test x$enable_libtiff = xyes; then -- if test x"$LIBTIFF_LIBS" != ; then -+ if test x"$LIBTIFF_LIBS" != x; then - ac_fn_cxx_check_func "$LINENO" "TIFFOpen" "ac_cv_func_TIFFOpen" - if test "x$ac_cv_func_TIFFOpen" = xyes; then : - diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index c4c7f661b3..533178f1f3 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 poppler-0.32.0.tar.xz +sha256 85a003968074c85d8e13bf320ec47cef647b496b56dcff4c790b34e5482fef93 poppler-0.48.0.tar.xz diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 172c428c63..202eac29d1 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,7 +4,7 @@ # ################################################################################ -POPPLER_VERSION = 0.32.0 +POPPLER_VERSION = 0.48.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = http://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf From e662416d844040806a49a97c608aa674dcdd6580 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 11 Oct 2016 13:54:23 +0100 Subject: [PATCH 0710/3392] bind: bump version to 9.11.0 - With the release of BIND 9.11.0, ISC is changing the open source license for BIND from the ISC license to the Mozilla Public License (MPL 2.0). See release notes: http://ftp.isc.org/isc/bind9/9.11.0/RELEASE-NOTES-bind-9.11.0.html - Explicitly enable/disable zlib support, otherwise the configure script will fail like this: checking for zlib library... yes checking for library containing deflate... no configure: error: found zlib include but not library. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 8acfda5625..bc46604ffe 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,2 +1,2 @@ -# Verified from ftp://ftp.isc.org/isc/bind9/9.10.4-P3/bind-9.10.4-P3.tar.gz.sha256.asc -sha256 a075e5ce89fddccb0e64d1777d59161387dd5151cf4e7d1a93875a487812baef bind-9.10.4-P3.tar.gz +# Verified from ftp://ftp.isc.org/isc/bind9/9.11.0/bind-9.11.0.tar.gz.sha256.asc +sha256 6f0b403036e0281b272a0fbdd0dc3417f3050b625cb059c5409432611418058b bind-9.11.0.tar.gz diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e6bf2047d8..cda9fed875 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,13 +4,13 @@ # ################################################################################ -BIND_VERSION = 9.10.4-P3 +BIND_VERSION = 9.11.0 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) BIND_INSTALL_STAGING = YES BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh -BIND_LICENSE = ISC +BIND_LICENSE = MPLv2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_TARGET_SERVER_SBIN = arpaname ddns-confgen dnssec-checkds dnssec-coverage BIND_TARGET_SERVER_SBIN += dnssec-importkey dnssec-keygen dnssec-revoke @@ -32,6 +32,13 @@ BIND_CONF_OPTS = \ --enable-rrl \ --enable-filter-aaaa +ifeq ($(BR2_PACKAGE_ZLIB),y) +BIND_CONF_OPTS += --with-zlib +BIND_DEPENDENCIES += zlib +else +BIND_CONF_OPTS += --without-zlib +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) BIND_CONF_OPTS += --enable-linux-caps BIND_DEPENDENCIES += libcap From f41d153b6cae9ee27007024d1aa026f125a3f99d Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Wed, 12 Oct 2016 10:06:31 +0200 Subject: [PATCH 0711/3392] python-pyelftools: new package Signed-off-by: Olivier Matz Signed-off-by: Julien Floret Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-pyelftools/Config.in | 7 +++++++ package/python-pyelftools/python-pyelftools.hash | 4 ++++ package/python-pyelftools/python-pyelftools.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-pyelftools/Config.in create mode 100644 package/python-pyelftools/python-pyelftools.hash create mode 100644 package/python-pyelftools/python-pyelftools.mk diff --git a/package/Config.in b/package/Config.in index 25f16889f4..35ba5f695c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -737,6 +737,7 @@ menu "External python modules" source "package/python-pycparser/Config.in" source "package/python-pycrypto/Config.in" source "package/python-pydal/Config.in" + source "package/python-pyelftools/Config.in" source "package/python-pyftpdlib/Config.in" source "package/python-pygame/Config.in" source "package/python-pygments/Config.in" diff --git a/package/python-pyelftools/Config.in b/package/python-pyelftools/Config.in new file mode 100644 index 0000000000..ca27302227 --- /dev/null +++ b/package/python-pyelftools/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PYELFTOOLS + bool "python-pyelftools" + help + Pyelftools is a Python library for parsing and analyzing ELF + files and DWARF debug information. + + https://github.com/eliben/pyelftools diff --git a/package/python-pyelftools/python-pyelftools.hash b/package/python-pyelftools/python-pyelftools.hash new file mode 100644 index 0000000000..e345a5bbf9 --- /dev/null +++ b/package/python-pyelftools/python-pyelftools.hash @@ -0,0 +1,4 @@ +# From https://pypi.python.org/packages/ba/78/d4a186a2e38731286c99dc3e3ca8123b6f55cf2e28608e8daf2d84b65494/pyelftools-0.24.tar.gz#md5=c960d5fe0a9308d96ba38b4beec8ac8e +md5 c960d5fe0a9308d96ba38b4beec8ac8e pyelftools-0.24.tar.gz +# Locally calculated +sha256 e9dd97d685a5b96b88a988dabadb88e5a539b64cd7d7927fac9a7368dc4c459c pyelftools-0.24.tar.gz diff --git a/package/python-pyelftools/python-pyelftools.mk b/package/python-pyelftools/python-pyelftools.mk new file mode 100644 index 0000000000..5b5b488cf0 --- /dev/null +++ b/package/python-pyelftools/python-pyelftools.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyelftools +# +################################################################################ + +PYTHON_PYELFTOOLS_VERSION = 0.24 +PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz +PYTHON_PYELFTOOLS_SITE = https://pypi.python.org/packages/ba/78/d4a186a2e38731286c99dc3e3ca8123b6f55cf2e28608e8daf2d84b65494 +PYTHON_PYELFTOOLS_LICENSE = Public domain +PYTHON_PYELFTOOLS_LICENSE_FILES = LICENSE +PYTHON_PYELFTOOLS_SETUP_TYPE = distutils + +$(eval $(python-package)) From 84902bd0f651c92e1b2ad12122fe98b0ac0e802d Mon Sep 17 00:00:00 2001 From: Julien Floret Date: Wed, 12 Oct 2016 10:06:32 +0200 Subject: [PATCH 0712/3392] DEVELOPERS: add entry for python-pyelftools Signed-off-by: Julien Floret Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0ae3150a36..25ded5b4d5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1098,6 +1098,9 @@ N: Oli Vogt F: package/python-django/ F: package/python-flup/ +N: Olivier Matz +F: package/python-pyelftools/ + N: Olivier Schonken F: package/ijs/ F: package/poppler/ From baa566888dc053f6b0586e4a7222391f062cb3a0 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 11 Oct 2016 16:44:49 -0400 Subject: [PATCH 0713/3392] php-amqp: new package Signed-off-by: Frank Hunleth Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/php-amqp/Config.in | 14 ++++++++++++++ package/php-amqp/php-amqp.hash | 2 ++ package/php-amqp/php-amqp.mk | 26 ++++++++++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 package/php-amqp/Config.in create mode 100644 package/php-amqp/php-amqp.hash create mode 100644 package/php-amqp/php-amqp.mk diff --git a/package/Config.in b/package/Config.in index 35ba5f695c..1b0ffcfc23 100644 --- a/package/Config.in +++ b/package/Config.in @@ -624,6 +624,7 @@ endif if BR2_PACKAGE_PHP if !BR2_STATIC_LIBS menu "External php extensions" + source "package/php-amqp/Config.in" source "package/php-geoip/Config.in" source "package/php-gnupg/Config.in" source "package/php-imagick/Config.in" diff --git a/package/php-amqp/Config.in b/package/php-amqp/Config.in new file mode 100644 index 0000000000..253bfa7b7c --- /dev/null +++ b/package/php-amqp/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_PHP_AMQP + bool "php-amqp" + depends on BR2_PACKAGE_PHP + depends on BR2_TOOLCHAIN_HAS_THREADS # rabbitmq-c + depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX # rabbitmq-c + select BR2_PACKAGE_RABBITMQ_C + help + Communicate with any AMQP compliant server. + + http://pecl.php.net/package/amqp + +comment "php-amqp needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX diff --git a/package/php-amqp/php-amqp.hash b/package/php-amqp/php-amqp.hash new file mode 100644 index 0000000000..73c69d920b --- /dev/null +++ b/package/php-amqp/php-amqp.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 38a92eaef1aa863404170bcd15605f7f78140eeec1ff5be6af65c5b8081e2599 amqp-1.7.1.tgz diff --git a/package/php-amqp/php-amqp.mk b/package/php-amqp/php-amqp.mk new file mode 100644 index 0000000000..d3ffe1600d --- /dev/null +++ b/package/php-amqp/php-amqp.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# php-amqp +# +################################################################################ + +PHP_AMQP_VERSION = 1.7.1 +PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz +PHP_AMQP_SITE = https://pecl.php.net/get +PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ + --with-amqp=$(STAGING_DIR)/usr +# phpize does the autoconf magic +PHP_AMQP_DEPENDENCIES = rabbitmq-c php host-autoconf +PHP_AMQP_LICENSE = PHP +PHP_AMQP_LICENSE_FILES = LICENSE + +define PHP_AMQP_PHPIZE + (cd $(@D); \ + PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ + PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ + $(STAGING_DIR)/usr/bin/phpize) +endef + +PHP_AMQP_PRE_CONFIGURE_HOOKS += PHP_AMQP_PHPIZE + +$(eval $(autotools-package)) From 9d2f18de4e07a7266132fe077792784bd203718d Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 11 Oct 2016 16:44:50 -0400 Subject: [PATCH 0714/3392] DEVELOPERS: add entry for php-amqp Signed-off-by: Frank Hunleth Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 25ded5b4d5..e702b2ae86 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -518,6 +518,7 @@ N: Frank Hunleth F: package/am335x-pru-package/ F: package/libdmtx/ F: package/libsodium/ +F: package/php-amqp/ F: package/python-cherrypy/ F: package/sane-backends/ F: package/ucl/ From a23723d4c7014402c72efc36edee3913c937736b Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sat, 15 Oct 2016 12:04:20 +0200 Subject: [PATCH 0715/3392] package/urg: update homepage and source url Fetch the source archive from fedora repository since this version of the source is not available on the project site since it moved to sourceforge. Also add the md5 checksum computed by feodra to the *.hash file. Signed-off-by: Samuel Martin Signed-off-by: Peter Korsgaard --- package/urg/Config.in | 2 +- package/urg/urg.hash | 2 ++ package/urg/urg.mk | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/urg/Config.in b/package/urg/Config.in index 9d57645d62..c602624257 100644 --- a/package/urg/Config.in +++ b/package/urg/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_URG help Library to control Hokuyo's URG series sensors. - http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/ + https://sourceforge.net/p/urgnetwork/wiki/Home/ comment "urg needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/urg/urg.hash b/package/urg/urg.hash index 5764a14095..41749d7245 100644 --- a/package/urg/urg.hash +++ b/package/urg/urg.hash @@ -1,2 +1,4 @@ +# from http://pkgs.fedoraproject.org/repo/pkgs/urg/urg-0.8.18.zip/ +md5 93f90d2ccc36e784407c5282ef6bd2cb urg-0.8.18.zip # Locally calculated sha256 b2cab7e539c90c60fc99a2350a42b5d5390ff952b694b196c3cbb54623cfee7f urg-0.8.18.zip diff --git a/package/urg/urg.mk b/package/urg/urg.mk index 41ac4f41b1..5d49aeb41d 100644 --- a/package/urg/urg.mk +++ b/package/urg/urg.mk @@ -5,7 +5,7 @@ ################################################################################ URG_VERSION = 0.8.18 -URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en +URG_SITE = http://pkgs.fedoraproject.org/repo/pkgs/urg/urg-0.8.18.zip/md5/93f90d2ccc36e784407c5282ef6bd2cb URG_SOURCE = urg-$(URG_VERSION).zip URG_LICENSE = LGPLv3 URG_LICENSE_FILES = COPYING From 39278f17d6d9d45a7570882b206f840ade8358ae Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Mon, 12 Sep 2016 21:23:23 +0200 Subject: [PATCH 0716/3392] package/urg: fix build with gcc-6 Add patch fixing/adding explicit cast on negative value in char[], which is required with gcc-6 (see "Narrowing conversions" paragraph in [1]) Fixes: http://autobuild.buildroot.net/results/d0c/d0cd11163753db69a14c02e941dbda40e5f98bba/ [1] https://gcc.gnu.org/gcc-6/porting_to.html Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- ...02-urg-gcc6-fix-narrowing-conversion.patch | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch diff --git a/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch b/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch new file mode 100644 index 0000000000..e3db898049 --- /dev/null +++ b/package/urg/0002-urg-gcc6-fix-narrowing-conversion.patch @@ -0,0 +1,99 @@ +urg: fix 'narrowing conversion' with gcc6 + +Fixes: + http://autobuild.buildroot.net/results/d0c/d0cd11163753db69a14c02e941dbda40e5f98bba/ + +Signed-off-by: Samuel Martin + +--- a/src/cpp/urg/ScipHandler.cpp 2016-09-11 16:11:16.083995214 +0200 ++++ b/src/cpp/urg/ScipHandler.cpp 2016-09-11 16:11:24.380832543 +0200 +@@ -120,7 +120,7 @@ struct ScipHandler::pImpl + + // QT ̔s + int return_code = -1; +- char qt_expected_response[] = { 0, -1 }; ++ char qt_expected_response[] = { 0, (char)-1 }; + // return_code g߁AsetLaserOutput() p QT 𑗐M + if (response(return_code, "QT\n", qt_expected_response)) { + laser_state_ = LaserOff; +@@ -139,7 +139,7 @@ struct ScipHandler::pImpl + + } else if (return_code == Scip11Response) { + // SCIP1.1 vgȐꍇ̂݁ASCIP2.0 𑗐M +- char scip20_expected_response[] = { 0, -1 }; ++ char scip20_expected_response[] = { 0, (char)-1 }; + if (! response(return_code, "SCIP2.0\n", scip20_expected_response)) { + error_message_ = + "SCIP1.1 protocol is not supported. Please update URG firmware, or reconnect after a few seconds because sensor is booting."; +@@ -150,7 +150,7 @@ struct ScipHandler::pImpl + + } else if (return_code == 0xE) { + // TM [hƂ݂ȂATM2 𔭍s +- char tm2_expected_response[] = { 0, -1 }; ++ char tm2_expected_response[] = { 0, (char)-1 }; + if (response(return_code, "TM2\n", tm2_expected_response)) { + laser_state_ = LaserOff; + return changeBothBaudrate(baudrate); +@@ -202,7 +202,7 @@ struct ScipHandler::pImpl + snprintf(send_buffer, 10, "SS%06ld\n", baudrate); + int return_code = -1; + // !!! ɐݒΏۂ̃{[[gȀꍇ̖߂l ss_expected... ɒlj +- char ss_expected_response[] = { 0, 0x3, 0x4, 0xf, -1 }; ++ char ss_expected_response[] = { 0, 0x3, 0x4, 0xf, (char)-1 }; + if (! response(return_code, send_buffer, ss_expected_response)) { + error_message_ = "Baudrate change fail."; + return false; +@@ -216,7 +216,7 @@ struct ScipHandler::pImpl + { + // PP ̑Mƃf[^̎M + int return_code = -1; +- char pp_expected_response[] = { 0, -1 }; ++ char pp_expected_response[] = { 0, (char)-1 }; + vector lines; + if (! response(return_code, "PP\n", pp_expected_response, &lines)) { + error_message_ = "PP fail."; +@@ -356,7 +356,7 @@ struct ScipHandler::pImpl + + if (on) { + int return_code = -1; +- char expected_response[] = { 0, -1 }; ++ char expected_response[] = { 0, (char)-1 }; + if (! response(return_code, "BM\n", expected_response)) { + error_message_ = "BM fail."; + return false; +@@ -369,7 +369,7 @@ struct ScipHandler::pImpl + if (! mx_capturing_) { + // 邽߂ QT ł́A҂‚ׂ + int return_code = -1; +- char qt_expected_response[] = { 0, -1 }; ++ char qt_expected_response[] = { 0, (char)-1 }; + if (! response(return_code, "QT\n", qt_expected_response)) { + return false; + } +@@ -777,7 +777,7 @@ bool ScipHandler::loadParameter(RangeSen + bool ScipHandler::versionLines(vector& lines) + { + int return_code = -1; +- char expected_response[] = { 0, -1 }; ++ char expected_response[] = { 0, (char)-1 }; + if (! pimpl->response(return_code, "VV\n", expected_response, &lines)) { + return false; + } +@@ -792,7 +792,7 @@ bool ScipHandler::setRawTimestampMode(bo + + // TM0 or TM2 ̑M + int return_code = -1; +- char expected_response[] = { 0, -1 }; ++ char expected_response[] = { 0, (char)-1 }; + if (! pimpl->response(return_code, send_command, expected_response)) { + pimpl->error_message_ = (on) ? "TM0 fail." : "TM2 fail."; + return false; +@@ -809,7 +809,7 @@ bool ScipHandler::rawTimestamp(int* time + { + // TM1 ̒lԂ + int return_code = -1; +- char expected_response[] = { 0, -1 }; ++ char expected_response[] = { 0, (char)-1 }; + vector lines; + if (! pimpl->response(return_code, "TM1\n", expected_response, &lines)) { + pimpl->error_message_ = "TM1 fail."; From 609f58b80aa000fecb9b24ba8069f7205e887e7e Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sat, 15 Oct 2016 11:44:31 +0200 Subject: [PATCH 0717/3392] package/assimp: wrap long lines Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/assimp/assimp.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index cda02dda59..08893fff00 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -16,6 +16,7 @@ ifeq ($(BR2_m68k),y) ASSIMP_CXXFLAGS += -mxgot endif -ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)" +ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)" $(eval $(cmake-package)) From 82e84a4f358c9dd2a527015d923d7b355f3a7fa5 Mon Sep 17 00:00:00 2001 From: Joao Pinto Date: Sat, 15 Oct 2016 10:03:41 +0200 Subject: [PATCH 0718/3392] vexpress-firmware: new package This commit adds a new package for the SCP (System Control Processor) firmware for the ARM reference platforms. There will most likely be other SCP firmware provided by other vendors, but they might be provided in a different form, so we for now create a vendor-specific package named vexpress-firmware. Since this firmware is used for booting, we create the package in boot/ and not in package/. The package simply installs a single pre-built binary file into the images directory. Signed-off-by: Joao Pinto [Thomas: - Rename the package from scpfirmware to vexpress-firmware. - Add a Config.in prompt for the package. - Remove the prompt-less Config.in options to select the Git repo and version. Since we only support the Vexpress firmware, there's no need for configurability here, so we just use the right Git repo/version in the .mk file. - Use $(INSTALL) -D to install the firmware file. - Add license information.] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" [Thomas: add hash file, as suggested by Yann.] Signed-off-by: Thomas Petazzoni --- boot/Config.in | 1 + boot/vexpress-firmware/Config.in | 6 ++++++ boot/vexpress-firmware/vexpress-firmware.hash | 2 ++ boot/vexpress-firmware/vexpress-firmware.mk | 20 +++++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 boot/vexpress-firmware/Config.in create mode 100644 boot/vexpress-firmware/vexpress-firmware.hash create mode 100644 boot/vexpress-firmware/vexpress-firmware.mk diff --git a/boot/Config.in b/boot/Config.in index 677e5f083f..6ffacc6467 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -15,6 +15,7 @@ source "boot/s500-bootloader/Config.in" source "boot/syslinux/Config.in" source "boot/ts4800-mbrboot/Config.in" source "boot/uboot/Config.in" +source "boot/vexpress-firmware/Config.in" source "boot/xloader/Config.in" endmenu diff --git a/boot/vexpress-firmware/Config.in b/boot/vexpress-firmware/Config.in new file mode 100644 index 0000000000..8479df3d57 --- /dev/null +++ b/boot/vexpress-firmware/Config.in @@ -0,0 +1,6 @@ +config BR2_TARGET_VEXPRESS_FIRMWARE + bool "vexpress-firmware" + depends on BR2_aarch64 + help + Versatile Express firmware from ARM, with Linaro mods last + change. diff --git a/boot/vexpress-firmware/vexpress-firmware.hash b/boot/vexpress-firmware/vexpress-firmware.hash new file mode 100644 index 0000000000..40f64c7528 --- /dev/null +++ b/boot/vexpress-firmware/vexpress-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 def599c86ab3606f7f67c0190e9b237fbc0cf934a951ffb1c5fb0c47d8a8f3d2 vexpress-firmware-901f81977c3b367a2e0bf3d6444be302822d97a3.tar.gz diff --git a/boot/vexpress-firmware/vexpress-firmware.mk b/boot/vexpress-firmware/vexpress-firmware.mk new file mode 100644 index 0000000000..693a9cb862 --- /dev/null +++ b/boot/vexpress-firmware/vexpress-firmware.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# vexpress-firmware +# +################################################################################ + +VEXPRESS_FIRMWARE_VERSION = 901f81977c3b367a2e0bf3d6444be302822d97a3 +VEXPRESS_FIRMWARE_SITE = https://git.linaro.org/arm/vexpress-firmware.git +VEXPRESS_FIRMWARE_SITE_METHOD = git +# The only available license files are in PDF and RTF formats, and we +# support only plain text. +VEXPRESS_FIRMWARE_LICENSE = ARM EULA + +VEXPRESS_FIRMWARE_INSTALL_IMAGES = YES + +define VEXPRESS_FIRMWARE_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0644 $(@D)/SOFTWARE/bl30.bin $(BINARIES_DIR)/scp-fw.bin +endef + +$(eval $(generic-package)) From 81bf01cbffeb73f9db1cc67738030a00749324b7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Oct 2016 10:15:54 +0200 Subject: [PATCH 0719/3392] core/legal-info: don't generate big file with all license texts By aggregating all the license files into a single big text-only file means we have no way to use license files that are binary blobs (e.g. pdf, rtf...). Just do not generate that big file; if the user still wants it, it is very easy to create it afterwards. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Luca Ceresoli Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- Makefile | 2 -- package/pkg-generic.mk | 1 - package/pkg-utils.mk | 12 ------------ 3 files changed, 15 deletions(-) diff --git a/Makefile b/Makefile index 5e4daefae7..74b831eadf 100644 --- a/Makefile +++ b/Makefile @@ -195,8 +195,6 @@ LICENSE_FILES_DIR_TARGET = $(LEGAL_INFO_DIR)/licenses LICENSE_FILES_DIR_HOST = $(LEGAL_INFO_DIR)/host-licenses LEGAL_MANIFEST_CSV_TARGET = $(LEGAL_INFO_DIR)/manifest.csv LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv -LEGAL_LICENSES_TXT_TARGET = $(LEGAL_INFO_DIR)/licenses.txt -LEGAL_LICENSES_TXT_HOST = $(LEGAL_INFO_DIR)/host-licenses.txt LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings LEGAL_REPORT = $(LEGAL_INFO_DIR)/README diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 68ead3d1bb..1a37b12580 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -808,7 +808,6 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),) # is that the license still applies to the files distributed as part # of the rootfs, even if the sources are not themselves redistributed. ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),) - @$$(call legal-license-nofiles,$$($(2)_RAW_BASE_NAME),$$(call UPPERCASE,$(4))) @$$(call legal-warning-pkg,$$($(2)_RAW_BASE_NAME),cannot save license ($(2)_LICENSE_FILES not defined)) else @$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAW_BASE_NAME),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 28db4813e2..c5d4080c72 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -75,19 +75,7 @@ define legal-manifest # pkg, version, license, license-files, source, url, {HOST echo '"$(1)","$(2)","$(3)","$(4)","$(5)","$(6)"' >>$(LEGAL_MANIFEST_CSV_$(7)) endef -define legal-license-header # pkg, license-file, {HOST|TARGET} - printf "$(LEGAL_INFO_SEPARATOR)\n\t$(1):\ - $(2)\n$(LEGAL_INFO_SEPARATOR)\n\n\n" >>$(LEGAL_LICENSES_TXT_$(3)) -endef - -define legal-license-nofiles # pkg, {HOST|TARGET} - $(call legal-license-header,$(1),unknown license file(s),$(2)) -endef - define legal-license-file # pkg, filename, file-fullpath, {HOST|TARGET} - $(call legal-license-header,$(1),$(2) file,$(4)) && \ - cat $(3) >>$(LEGAL_LICENSES_TXT_$(4)) && \ - echo >>$(LEGAL_LICENSES_TXT_$(4)) && \ mkdir -p $(LICENSE_FILES_DIR_$(4))/$(1)/$(dir $(2)) && \ cp $(3) $(LICENSE_FILES_DIR_$(4))/$(1)/$(2) endef From 574c14f370fdc1c8c12968766775274a07119f33 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Oct 2016 10:15:53 +0200 Subject: [PATCH 0720/3392] core/legal-info: save empty string when no license file This is stored in the manifest file; it is perfectly possible to have empty fields in there. Signed-off-by: "Yann E. MORIN" Cc: Luca Ceresoli Cc: Thomas Petazzoni Reviewed-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 1a37b12580..12ae86f08e 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -779,7 +779,6 @@ endif ifneq ($$($(2)_LICENSE_FILES),) $(2)_MANIFEST_LICENSE_FILES = $$($(2)_LICENSE_FILES) endif -$(2)_MANIFEST_LICENSE_FILES ?= not saved # We need to extract and patch a package to be able to retrieve its # license files (if any) and the list of patches applied to it (if From 6fae290a94d436d24fc19d27d1a70123baa07a86 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:47 +0100 Subject: [PATCH 0721/3392] MIPS: add default CPU ISAs Meant to be used by the target architecture variants. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index fda1a1d7e7..5e97fd016f 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -1,3 +1,17 @@ +# mips default CPU ISAs +config BR2_MIPS_CPU_MIPS32 + bool +config BR2_MIPS_CPU_MIPS32R2 + bool +config BR2_MIPS_CPU_MIPS32R6 + bool +config BR2_MIPS_CPU_MIPS64 + bool +config BR2_MIPS_CPU_MIPS64R2 + bool +config BR2_MIPS_CPU_MIPS64R6 + bool + choice prompt "Target Architecture Variant" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el From f62cbd75b7f56d1842c9d59e6779b0e869d164f9 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:48 +0100 Subject: [PATCH 0722/3392] MIPS: target architecture variants select the appropriate CPU ISA Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 5e97fd016f..8771cd57d8 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -26,21 +26,27 @@ choice config BR2_mips_32 bool "mips 32" depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32 config BR2_mips_32r2 bool "mips 32r2" depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R2 config BR2_mips_32r6 bool "mips 32r6" depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R6 config BR2_mips_64 bool "mips 64" depends on BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS64 config BR2_mips_64r2 bool "mips 64r2" depends on BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS64R2 config BR2_mips_64r6 bool "mips 64r6" depends on BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS64R6 endchoice From 45c92c60b163abefb0e78fe4f992d7cbbdaa72e8 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:49 +0100 Subject: [PATCH 0723/3392] MIPS: replace every BR2_mips_* with the new MIPS CPU options Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/binutils/Config.in.host | 2 +- package/gcc/Config.in.host | 6 +++--- package/glibc/glibc.mk | 2 +- package/gmp/gmp.mk | 2 +- package/go/Config.in.host | 2 +- package/gstreamer/gst-ffmpeg/Config.in | 2 +- package/luajit/Config.in | 2 +- package/mbedtls/mbedtls.mk | 2 +- package/mongrel2/mongrel2.mk | 2 +- package/nodejs/nodejs.mk | 6 +++--- package/openblas/Config.in | 6 +++--- package/polarssl/polarssl.mk | 2 +- package/uclibc/Config.in | 6 +++--- toolchain/toolchain-buildroot/Config.in | 4 ++-- toolchain/toolchain-external/Config.in | 8 ++++---- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 5ea5f31088..889d8ceff3 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -12,7 +12,7 @@ choice # supported, but broken on Nios-II, Blackfin and powerpc64le depends on !BR2_nios2 && !BR2_powerpc64le && !BR2_bfin # Unsupported for MIPS R6 - depends on !BR2_mips_32r6 && !BR2_mips_64r6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # Unsupported ARM cores depends on !BR2_cortex_a17 bool "binutils 2.24" diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 5b847fae6f..3c4d1cd280 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -29,7 +29,7 @@ choice # Broken or unsupported x86 cores depends on !BR2_x86_jaguar && !BR2_x86_steamroller # Unsupported for MIPS R6 - depends on !BR2_mips_32r6 && !BR2_mips_64r6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) select BR2_GCC_NEEDS_MPC @@ -47,7 +47,7 @@ choice # gcc-4.8.x + binutils-2.25 is broken for MIPS depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X) # Unsupported for MIPS R6 - depends on !BR2_mips_32r6 && !BR2_mips_64r6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # musl mips64 unsupported @@ -71,7 +71,7 @@ choice # Broken or unsupported ARM cores depends on !BR2_cortex_a17 # Unsupported for MIPS R6 - depends on !BR2_mips_32r6 && !BR2_mips_64r6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # musl mips64 unsupported diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 2c32e65fdc..50154e851a 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -136,7 +136,7 @@ endef # highly unlikely. The failure mode, if it ever occurs, would be either # that a signalling NaN fails to raise an invalid operation exception or # (more likely) an ordinary NaN raises an invalid operation exception. -ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y) +ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) define GLIBC_FIX_MIPS_R6 $(SED) 's#10.0.0#4.0.0#' \ $(@D)/sysdeps/unix/sysv/linux/mips/configure \ diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 420fd2f3fd..843a7a1781 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -15,7 +15,7 @@ HOST_GMP_DEPENDENCIES = host-m4 # GMP doesn't support assembly for coldfire or mips r6 ISA yet # Disable for ARM v7m since it has different asm constraints -ifeq ($(BR2_m68k_cf)$(BR2_mips_32r6)$(BR2_mips_64r6)$(BR2_ARM_CPU_ARMV7M)$(BR2_arc),y) +ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CPU_ARMV7M)$(BR2_arc),y) GMP_CONF_OPTS += --disable-assembly endif diff --git a/package/go/Config.in.host b/package/go/Config.in.host index d79c669e0a..8d4d346bf3 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS || BR2_mips64 || BR2_mips64el depends on !BR2_ARM_CPU_ARMV4 # MIPS R6 support in Go has not yet been developed. - depends on !BR2_mips_64r6 + depends on !BR2_MIPS_CPU_MIPS64R6 config BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS bool diff --git a/package/gstreamer/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in index f3d4b3e568..2164ea2e05 100644 --- a/package/gstreamer/gst-ffmpeg/Config.in +++ b/package/gstreamer/gst-ffmpeg/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_GST_FFMPEG bool "gst-ffmpeg" # Unsupported for MIPS R6. It bundles a version of libav which # doesn't have support for MIPS R6. - depends on !BR2_mips_32r6 && !BR2_mips_64r6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # triggers https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65151 on sh depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh select BR2_PACKAGE_GST_PLUGINS_BASE diff --git a/package/luajit/Config.in b/package/luajit/Config.in index f9285e8a47..380f2472ea 100644 --- a/package/luajit/Config.in +++ b/package/luajit/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS (BR2_x86_64 && BR2_HOSTARCH='x86_64') || \ BR2_powerpc || BR2_arm || BR2_armeb || \ ((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT && \ - !BR2_mips_32r6 && !BR2_mips_64r6) + !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6) config BR2_PACKAGE_LUAJIT bool "luajit" diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 7067bebecd..d55e16b0b6 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -60,7 +60,7 @@ endef # MIPS R6 asm is not yet supported ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) MBEDTLS_POST_CONFIGURE_HOOKS += MBEDTLS_DISABLE_ASM -else ifeq ($(BR2_microblaze)$(BR2_mips_32r6)$(BR2_mips_64r6),y) +else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) MBEDTLS_POST_CONFIGURE_HOOKS += MBEDTLS_DISABLE_ASM endif diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk index d0640c9680..c69c14345f 100644 --- a/package/mongrel2/mongrel2.mk +++ b/package/mongrel2/mongrel2.mk @@ -24,7 +24,7 @@ ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THU MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM else ifeq ($(BR2_microblaze),y) MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM -else ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y) +else ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM endif diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index d6f115a510..81006f582f 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -96,12 +96,12 @@ endif # MIPS architecture specific options ifeq ($(BR2_mips)$(BR2_mipsel),y) -ifeq ($(BR2_mips_32r6),y) +ifeq ($(BR2_MIPS_CPU_MIPS32R6),y) NODEJS_MIPS_ARCH_VARIANT = r6 NODEJS_MIPS_FPU_MODE = fp64 -else ifeq ($(BR2_mips_32r2),y) +else ifeq ($(BR2_MIPS_CPU_MIPS32R2),y) NODEJS_MIPS_ARCH_VARIANT = r2 -else ifeq ($(BR2_mips_32),y) +else ifeq ($(BR2_MIPS_CPU_MIPS32),y) NODEJS_MIPS_ARCH_VARIANT = r1 endif endif diff --git a/package/openblas/Config.in b/package/openblas/Config.in index 0609a91e54..1fbed1c27a 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -27,10 +27,10 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "PPC440" if BR2_powerpc_440 default "PPC440FP2" if BR2_powerpc_440fp # P5600 is built with MSA support which is only available in Codescape toolchains - default "P5600" if BR2_mips_32r2 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - default "SICORTEX" if BR2_mips_64 + default "P5600" if BR2_MIPS_CPU_MIPS32R2 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS + default "SICORTEX" if BR2_MIPS_CPU_MIPS64 # I6400 is built with MSA support which is only available in Codescape toolchains - default "I6400" if BR2_mips_64r6 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS + default "I6400" if BR2_MIPS_CPU_MIPS64R6 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS default "SPARC" if BR2_sparc # Cortex-A15 always have a VFPv4 default "CORTEXA15" if (BR2_cortex_a15 && BR2_ARM_EABIHF) diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk index 9199f28a07..7f4c5827a0 100644 --- a/package/polarssl/polarssl.mk +++ b/package/polarssl/polarssl.mk @@ -25,7 +25,7 @@ ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THU POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM else ifeq ($(BR2_microblaze),y) POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM -else ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y) +else ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM endif diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 33969cc1ce..cbae096d6c 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -145,9 +145,9 @@ config BR2_UCLIBC_MIPS_ABI config BR2_UCLIBC_MIPS_ISA string depends on BR2_UCLIBC_TARGET_ARCH = "mips" - default "MIPS32" if BR2_mips_32 - default "MIPS32R2" if BR2_mips_32r2 - default "MIPS64" if BR2_mips_64 + default "MIPS32" if BR2_MIPS_CPU_MIPS32 + default "MIPS32R2" if BR2_MIPS_CPU_MIPS32R2 + default "MIPS64" if BR2_MIPS_CPU_MIPS64 config BR2_UCLIBC_SH_TYPE string diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 8e275c22f2..310572e502 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -35,7 +35,7 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC BR2_powerpc || BR2_sh2a || BR2_sh4 || BR2_sh4eb || \ BR2_sparc || BR2_xtensa || BR2_x86_64 # Unsupported for MIPS R6 - depends on !BR2_mips_32r6 && !BR2_mips_64r6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 help This option selects uClibc-ng as the C library for the cross-compilation toolchain. @@ -74,7 +74,7 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL BR2_sh || BR2_x86_64 depends on !BR2_powerpc_SPE # not supported, build breaks # Unsupported for MIPS R6 - depends on !BR2_mips_32r6 && !BR2_mips_64r6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # sh2 nommu is supported by musl, but we don't have support # for it in Buildroot. depends on BR2_USE_MMU diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index bcb42db6ba..15095b6d03 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -190,7 +190,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS bool "Sourcery CodeBench MIPS 2016.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on BR2_mips_32r2 || BR2_mips_64r2 + depends on BR2_MIPS_CPU_MIPS32R2 || BR2_MIPS_CPU_MIPS64R2 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_MIPS_NABI32 depends on !BR2_STATIC_LIBS @@ -283,7 +283,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS bool "Codescape IMG GNU Linux Toolchain 2016.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_mips_32r6 || (BR2_mips_64r6 && !BR2_MIPS_SOFT_FLOAT) + depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP select BR2_HOSTARCH_NEEDS_IA32_LIBS @@ -346,7 +346,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS bool "Codescape MTI GNU Linux Toolchain 2016.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_mips_32r2 || (BR2_mips_64r2 && !BR2_MIPS_SOFT_FLOAT) + depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP select BR2_HOSTARCH_NEEDS_IA32_LIBS @@ -595,7 +595,7 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS BR2_x86_64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # Unsupported for MIPS R6 - depends on !BR2_mips_32r6 && !BR2_mips_64r6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 select BR2_TOOLCHAIN_EXTERNAL_MUSL select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP From e14ce3cf295355a0af8b5b247291256a94f10c4c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:50 +0100 Subject: [PATCH 0724/3392] MIPS: state that the current architecture variants are generic Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 8771cd57d8..56b8a6bb8c 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -24,27 +24,27 @@ choice non-64bit capable: 32, 32r2, 32r6 config BR2_mips_32 - bool "mips 32" + bool "Generic MIPS32" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32 config BR2_mips_32r2 - bool "mips 32r2" + bool "Generic MIPS32R2" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R2 config BR2_mips_32r6 - bool "mips 32r6" + bool "Generic MIPS32R6" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R6 config BR2_mips_64 - bool "mips 64" + bool "Generic MIPS64" depends on BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS64 config BR2_mips_64r2 - bool "mips 64r2" + bool "Generic MIPS64R2" depends on BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS64R2 config BR2_mips_64r6 - bool "mips 64r6" + bool "Generic MIPS64R6" depends on BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS64R6 endchoice From 1feb1b77564d2c043e70f37e2c05edda72afc8a5 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:51 +0100 Subject: [PATCH 0725/3392] MIPS: add mips32r5 generic architecture variant -march=mips32r5 support started from GCC-5, so disable previous versions when the CPU is R5. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 9 ++++++++- package/gcc/Config.in.host | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 56b8a6bb8c..94f6fa3cc9 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -3,6 +3,8 @@ config BR2_MIPS_CPU_MIPS32 bool config BR2_MIPS_CPU_MIPS32R2 bool +config BR2_MIPS_CPU_MIPS32R5 + bool config BR2_MIPS_CPU_MIPS32R6 bool config BR2_MIPS_CPU_MIPS64 @@ -21,7 +23,7 @@ choice Specific CPU variant to use 64bit cabable: 64, 64r2, 64r6 - non-64bit capable: 32, 32r2, 32r6 + non-64bit capable: 32, 32r2, 32r5, 32r6 config BR2_mips_32 bool "Generic MIPS32" @@ -31,6 +33,10 @@ config BR2_mips_32r2 bool "Generic MIPS32R2" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R2 +config BR2_mips_32r5 + bool "Generic MIPS32R5" + depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R5 config BR2_mips_32r6 bool "Generic MIPS32R6" depends on !BR2_ARCH_IS_64 @@ -90,6 +96,7 @@ config BR2_ENDIAN config BR2_GCC_TARGET_ARCH default "mips32" if BR2_mips_32 default "mips32r2" if BR2_mips_32r2 + default "mips32r5" if BR2_mips_32r5 default "mips32r6" if BR2_mips_32r6 default "mips64" if BR2_mips_64 default "mips64r2" if BR2_mips_64r2 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 3c4d1cd280..3af9a24b68 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -28,6 +28,8 @@ choice depends on !BR2_sparc_leon3 # Broken or unsupported x86 cores depends on !BR2_x86_jaguar && !BR2_x86_steamroller + # Unsupported for MIPS R5 + depends on !BR2_MIPS_CPU_MIPS32R5 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl ppc64 unsupported @@ -46,6 +48,8 @@ choice depends on !BR2_powerpc_power8 # gcc-4.8.x + binutils-2.25 is broken for MIPS depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X) + # Unsupported for MIPS R5 + depends on !BR2_MIPS_CPU_MIPS32R5 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl ppc64 unsupported @@ -70,6 +74,8 @@ choice depends on !BR2_arc && !BR2_bfin # Broken or unsupported ARM cores depends on !BR2_cortex_a17 + # Unsupported for MIPS R5 + depends on !BR2_MIPS_CPU_MIPS32R5 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl ppc64 unsupported From 7ab9cf251d00735d89856e58ef1462dce20ed326 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:52 +0100 Subject: [PATCH 0726/3392] MIPS: add mips64r5 generic architecture variant -march=mips64r5 support started from GCC-5, so disable previous versions when the CPU is R5. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 9 ++++++++- package/gcc/Config.in.host | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 94f6fa3cc9..63f23b4abd 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -11,6 +11,8 @@ config BR2_MIPS_CPU_MIPS64 bool config BR2_MIPS_CPU_MIPS64R2 bool +config BR2_MIPS_CPU_MIPS64R5 + bool config BR2_MIPS_CPU_MIPS64R6 bool @@ -22,7 +24,7 @@ choice help Specific CPU variant to use - 64bit cabable: 64, 64r2, 64r6 + 64bit cabable: 64, 64r2, 64r5, 64r6 non-64bit capable: 32, 32r2, 32r5, 32r6 config BR2_mips_32 @@ -49,6 +51,10 @@ config BR2_mips_64r2 bool "Generic MIPS64R2" depends on BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS64R2 +config BR2_mips_64r5 + bool "Generic MIPS64R5" + depends on BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS64R5 config BR2_mips_64r6 bool "Generic MIPS64R6" depends on BR2_ARCH_IS_64 @@ -100,6 +106,7 @@ config BR2_GCC_TARGET_ARCH default "mips32r6" if BR2_mips_32r6 default "mips64" if BR2_mips_64 default "mips64r2" if BR2_mips_64r2 + default "mips64r5" if BR2_mips_64r5 default "mips64r6" if BR2_mips_64r6 config BR2_MIPS_OABI32 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 3af9a24b68..b6c46d85fc 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -29,7 +29,7 @@ choice # Broken or unsupported x86 cores depends on !BR2_x86_jaguar && !BR2_x86_steamroller # Unsupported for MIPS R5 - depends on !BR2_MIPS_CPU_MIPS32R5 + depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl ppc64 unsupported @@ -49,7 +49,7 @@ choice # gcc-4.8.x + binutils-2.25 is broken for MIPS depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X) # Unsupported for MIPS R5 - depends on !BR2_MIPS_CPU_MIPS32R5 + depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl ppc64 unsupported @@ -75,7 +75,7 @@ choice # Broken or unsupported ARM cores depends on !BR2_cortex_a17 # Unsupported for MIPS R5 - depends on !BR2_MIPS_CPU_MIPS32R5 + depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl ppc64 unsupported From 2373ce276309cc7de3cc238446b6fba4392435e4 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:53 +0100 Subject: [PATCH 0727/3392] MIPS: enable Codescape MTI toolchain for R5 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- toolchain/toolchain-external/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 15095b6d03..7bf63d3c7f 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -346,7 +346,8 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS bool "Codescape MTI GNU Linux Toolchain 2016.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) + depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ + BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_INSTALL_LIBSTDCPP select BR2_HOSTARCH_NEEDS_IA32_LIBS From ef3e7323ef036cff006aeac9290ce19654b8254f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:54 +0100 Subject: [PATCH 0728/3392] MIPS: add support for interAptiv cores -march=interaptiv support starts from GCC-6, so disable previous versions when selecting this core. Also disable external toolchains that don't support this core. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 5 +++++ package/gcc/Config.in.host | 8 ++++++++ toolchain/toolchain-external/Config.in | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 63f23b4abd..ac87e2cf77 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -43,6 +43,10 @@ config BR2_mips_32r6 bool "Generic MIPS32R6" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R6 +config BR2_mips_interaptiv + bool "interAptiv" + depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R2 config BR2_mips_64 bool "Generic MIPS64" depends on BR2_ARCH_IS_64 @@ -104,6 +108,7 @@ config BR2_GCC_TARGET_ARCH default "mips32r2" if BR2_mips_32r2 default "mips32r5" if BR2_mips_32r5 default "mips32r6" if BR2_mips_32r6 + default "interaptiv" if BR2_mips_interaptiv default "mips64" if BR2_mips_64 default "mips64r2" if BR2_mips_64r2 default "mips64r5" if BR2_mips_64r5 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index b6c46d85fc..a816464e1c 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -28,6 +28,8 @@ choice depends on !BR2_sparc_leon3 # Broken or unsupported x86 cores depends on !BR2_x86_jaguar && !BR2_x86_steamroller + # Unsupported MIPS cores + depends on !BR2_mips_interaptiv # Unsupported for MIPS R5 depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 # Unsupported for MIPS R6 @@ -46,6 +48,8 @@ choice depends on !BR2_cortex_a12 && !BR2_cortex_a17 # Broken or unsupported PPC cores depends on !BR2_powerpc_power8 + # Unsupported MIPS cores + depends on !BR2_mips_interaptiv # gcc-4.8.x + binutils-2.25 is broken for MIPS depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X) # Unsupported for MIPS R5 @@ -74,6 +78,8 @@ choice depends on !BR2_arc && !BR2_bfin # Broken or unsupported ARM cores depends on !BR2_cortex_a17 + # Unsupported MIPS cores + depends on !BR2_mips_interaptiv # Unsupported for MIPS R5 depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 # Unsupported for MIPS R6 @@ -93,6 +99,8 @@ choice depends on !BR2_arc && !BR2_bfin # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) + # Unsupported MIPS cores + depends on !BR2_mips_interaptiv # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_GCC_NEEDS_MPC diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 7bf63d3c7f..e3d496475b 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -191,6 +191,8 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS bool "Sourcery CodeBench MIPS 2016.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on BR2_MIPS_CPU_MIPS32R2 || BR2_MIPS_CPU_MIPS64R2 + # Unsupported MIPS cores + depends on !BR2_mips_interaptiv depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_MIPS_NABI32 depends on !BR2_STATIC_LIBS @@ -595,6 +597,8 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS BR2_sh4 || BR2_sh4eb || \ BR2_x86_64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + # Unsupported MIPS cores + depends on !BR2_mips_interaptiv # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 select BR2_TOOLCHAIN_EXTERNAL_MUSL From 067a46474ad2ebe3b335f6fecaa3816b833d0afb Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:55 +0100 Subject: [PATCH 0729/3392] MIPS: add support for M5100 cores -march=m5100 support starts from GCC-6, so disable previous versions when selecting this core. Note that M5100 implies a MIPS R5 CPU, and some GCC versions are already disabled for R5, so we don't need to disable those ones for M5100 as well. Also disable external toolchains that don't support this core. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 5 +++++ package/gcc/Config.in.host | 2 +- toolchain/toolchain-external/Config.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index ac87e2cf77..9ed42a2580 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -47,6 +47,10 @@ config BR2_mips_interaptiv bool "interAptiv" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R2 +config BR2_mips_m5100 + bool "M5100" + depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R5 config BR2_mips_64 bool "Generic MIPS64" depends on BR2_ARCH_IS_64 @@ -109,6 +113,7 @@ config BR2_GCC_TARGET_ARCH default "mips32r5" if BR2_mips_32r5 default "mips32r6" if BR2_mips_32r6 default "interaptiv" if BR2_mips_interaptiv + default "m5100" if BR2_mips_m5100 default "mips64" if BR2_mips_64 default "mips64r2" if BR2_mips_64r2 default "mips64r5" if BR2_mips_64r5 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index a816464e1c..2d853879c3 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -100,7 +100,7 @@ choice # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # Unsupported MIPS cores - depends on !BR2_mips_interaptiv + depends on !BR2_mips_interaptiv && !BR2_mips_m5100 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_GCC_NEEDS_MPC diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index e3d496475b..254a1e5c94 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -598,7 +598,7 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS BR2_x86_64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # Unsupported MIPS cores - depends on !BR2_mips_interaptiv + depends on !BR2_mips_interaptiv && !BR2_mips_m5100 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 select BR2_TOOLCHAIN_EXTERNAL_MUSL From 55a37eaa911437352c8b5ad7b7bd9cc9160229ce Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:56 +0100 Subject: [PATCH 0730/3392] MIPS: add support for M5101 cores -march=m5101 support starts from GCC-6, so disable previous versions when selecting this core. Note that M5101 implies a MIPS R5 CPU, and some GCC versions are already disabled for R5, so we don't need to disable those ones for M5101 as well. Also disable external toolchains that don't support this core. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 5 +++++ package/gcc/Config.in.host | 3 ++- toolchain/toolchain-external/Config.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 9ed42a2580..3881909f76 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -51,6 +51,10 @@ config BR2_mips_m5100 bool "M5100" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R5 +config BR2_mips_m5101 + bool "M5101" + depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R5 config BR2_mips_64 bool "Generic MIPS64" depends on BR2_ARCH_IS_64 @@ -114,6 +118,7 @@ config BR2_GCC_TARGET_ARCH default "mips32r6" if BR2_mips_32r6 default "interaptiv" if BR2_mips_interaptiv default "m5100" if BR2_mips_m5100 + default "m5101" if BR2_mips_m5101 default "mips64" if BR2_mips_64 default "mips64r2" if BR2_mips_64r2 default "mips64r5" if BR2_mips_64r5 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 2d853879c3..15b23dbeeb 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -100,7 +100,8 @@ choice # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5100 + depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && \ + !BR2_mips_m5101 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_GCC_NEEDS_MPC diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 254a1e5c94..62c2cd21b2 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -598,7 +598,7 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS BR2_x86_64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5100 + depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && !BR2_mips_m5101 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 select BR2_TOOLCHAIN_EXTERNAL_MUSL From ea52e3d01a7b79a80b635308422a9df042394008 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:57 +0100 Subject: [PATCH 0731/3392] MIPS: add support for I6400 cores -march=i6400 support starts from GCC-6, so disable previous versions when selecting this core. Note that I6400 implies a MIPS R6 CPU, and some GCC versions are already disabled for R6, so we don't need to disable those ones for I6400 as well. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 5 +++++ package/gcc/Config.in.host | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 3881909f76..73be3c9fb4 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -71,6 +71,10 @@ config BR2_mips_64r6 bool "Generic MIPS64R6" depends on BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS64R6 +config BR2_mips_i6400 + bool "I6400" + depends on BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS64R6 endchoice @@ -123,6 +127,7 @@ config BR2_GCC_TARGET_ARCH default "mips64r2" if BR2_mips_64r2 default "mips64r5" if BR2_mips_64r5 default "mips64r6" if BR2_mips_64r6 + default "i6400" if BR2_mips_i6400 config BR2_MIPS_OABI32 bool diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 15b23dbeeb..f07df7d603 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -101,7 +101,7 @@ choice depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # Unsupported MIPS cores depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && \ - !BR2_mips_m5101 + !BR2_mips_m5101 && !BR2_mips_i6400 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_GCC_NEEDS_MPC From 73e16457469f18d755c115a77c193c8cdeee00ab Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:58 +0100 Subject: [PATCH 0732/3392] MIPS: add support for P5600 cores Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 73be3c9fb4..897c9446f6 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -55,6 +55,10 @@ config BR2_mips_m5101 bool "M5101" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R5 +config BR2_mips_p5600 + bool "P5600" + depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R5 config BR2_mips_64 bool "Generic MIPS64" depends on BR2_ARCH_IS_64 @@ -123,6 +127,7 @@ config BR2_GCC_TARGET_ARCH default "interaptiv" if BR2_mips_interaptiv default "m5100" if BR2_mips_m5100 default "m5101" if BR2_mips_m5101 + default "p5600" if BR2_mips_p5600 default "mips64" if BR2_mips_64 default "mips64r2" if BR2_mips_64r2 default "mips64r5" if BR2_mips_64r5 From 3cfbeb8363e61d7652e9f67d7dffc225d9261b13 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 30 Sep 2016 10:36:59 +0100 Subject: [PATCH 0733/3392] MIPS: add support for P6600 cores -march=p6600 is not yet supported in GCC upstream, so disabling all versions when selecting this core. Note that P6600 implies a MIPS R6 CPU, and some GCC versions are already disabled for R6, so we don't need to disable those ones for P6600 as well. The external Codescape IMG GNU Linux Toolchain has support for this core. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- arch/Config.in.mips | 5 +++++ package/gcc/Config.in.host | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 897c9446f6..f7bfa21684 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -79,6 +79,10 @@ config BR2_mips_i6400 bool "I6400" depends on BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS64R6 +config BR2_mips_p6600 + bool "P6600" + depends on BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS64R6 endchoice @@ -133,6 +137,7 @@ config BR2_GCC_TARGET_ARCH default "mips64r5" if BR2_mips_64r5 default "mips64r6" if BR2_mips_64r6 default "i6400" if BR2_mips_i6400 + default "p6600" if BR2_mips_p6600 config BR2_MIPS_OABI32 bool diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index f07df7d603..2eb6133446 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -101,7 +101,7 @@ choice depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # Unsupported MIPS cores depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && \ - !BR2_mips_m5101 && !BR2_mips_i6400 + !BR2_mips_m5101 && !BR2_mips_i6400 && !BR2_mips_p6600 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_GCC_NEEDS_MPC @@ -112,6 +112,8 @@ choice bool "gcc 6.x" # Broken or unsupported architectures depends on !BR2_arc + # Unsupported MIPS cores + depends on !BR2_mips_p6600 select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_6 From b5a62990427284819d2f52607aefe2044eb4df6c Mon Sep 17 00:00:00 2001 From: Joao Pinto Date: Sat, 15 Oct 2016 10:03:42 +0200 Subject: [PATCH 0734/3392] arm-trusted-firmware: new package Signed-off-by: Joao Pinto [Thomas: - Rename the package from atfirmware to arm-trusted-firmware, in order to match upstream. - Remove option to apply custom patches. We no longer add such options, and use the global patch directory instead. - Rename the repo URL/version options, in order to not be Git specific, in case support for fetching from other VCS is added later. This is consistent with how other bootloaders handle this. - Add license information. - Do not add a weird dependency on the vexpress-firmware package in Config.in. Instead, simply use it if it's available. Of course, some configurations (such as the juno configuration) will fail to build if vexpress-image is not enabled, but it's the responsibility of the user to create a config that builds. - Simplify misc aspects in the .mk file.] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- boot/Config.in | 1 + boot/arm-trusted-firmware/Config.in | 65 +++++++++++++++++ .../arm-trusted-firmware.hash | 3 + .../arm-trusted-firmware.mk | 69 +++++++++++++++++++ 4 files changed, 138 insertions(+) create mode 100644 boot/arm-trusted-firmware/Config.in create mode 100644 boot/arm-trusted-firmware/arm-trusted-firmware.hash create mode 100644 boot/arm-trusted-firmware/arm-trusted-firmware.mk diff --git a/boot/Config.in b/boot/Config.in index 6ffacc6467..273c1c7acd 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -4,6 +4,7 @@ source "boot/afboot-stm32/Config.in" source "boot/at91bootstrap/Config.in" source "boot/at91bootstrap3/Config.in" source "boot/at91dataflashboot/Config.in" +source "boot/arm-trusted-firmware/Config.in" source "boot/barebox/Config.in" source "boot/boot-wrapper-aarch64/Config.in" source "boot/grub/Config.in" diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in new file mode 100644 index 0000000000..2df8267864 --- /dev/null +++ b/boot/arm-trusted-firmware/Config.in @@ -0,0 +1,65 @@ +config BR2_TARGET_ARM_TRUSTED_FIRMWARE + bool "ARM Trusted Firmware (ATF)" + depends on BR2_aarch64 && BR2_TARGET_UBOOT + help + Enable this option if you want to build the ATF for your ARM + based embedded device. + + https://github.com/ARM-software/arm-trusted-firmware + +if BR2_TARGET_ARM_TRUSTED_FIRMWARE +choice + prompt "ATF Version" + help + Select the specific ATF version you want to use + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + bool "v1.2" + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL + bool "Custom tarball" + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT + bool "Custom Git repository" + +endchoice + +if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION + string "URL of custom ATF tarball" + +endif + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION + string + default "v1.2" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL + default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ + if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT + +if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL + string "URL of custom repository" + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION + string "Custom repository version" + help + Revision to use in the typical format used by Git + E.G. a sha id, a tag, .. + +endif + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM + string "ATF platform" + help + Target plaform to build for. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES + string "Additional ATF build variables" + help + Additional parameters for the ATF build + E.G. 'DEBUG=1 LOG_LEVEL=20' + +endif diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..e048e0127a --- /dev/null +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 cbdd9b770ec1ab4933fc7f9f520daea5a364bb4dc964820fb017a0cf8c7df556 arm-trusted-firmware-v1.2.tar.gz +md5 fac2c08bd74337fec2e14a98fc9f748f arm-trusted-firmware-v1.2.tar.gz diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk new file mode 100644 index 0000000000..5acfab391f --- /dev/null +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -0,0 +1,69 @@ +################################################################################ +# +# arm-trusted-firmware +# +################################################################################ + +ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION)) +ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3c +ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.md + +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot + +ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom) +# Handle custom ATF tarballs as specified by the configuration +ARM_TRUSTED_FIRMWARE_TARBALL = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)) +ARM_TRUSTED_FIRMWARE_SITE = $(patsubst %/,%,$(dir $(ARM_TRUSTED_FIRMWARE_TARBALL))) +ARM_TRUSTED_FIRMWARE_SOURCE = $(notdir $(ARM_TRUSTED_FIRMWARE_TARBALL)) +BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) +else ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y) +ARM_TRUSTED_FIRMWARE_SITE = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL)) +ARM_TRUSTED_FIRMWARE_SITE_METHOD = git +else +ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION)) +endif + +ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES + +ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) + +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + BL33=$(BINARIES_DIR)/u-boot.bin \ + $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ + PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \ + all fip + +ifeq ($(BR2_TARGET_VEXPRESS_FIRMWARE),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += SCP_BL2=$(BINARIES_DIR)/scp-fw.bin +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += vexpress-firmware +endif + +define ARM_TRUSTED_FIRMWARE_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ + $(ARM_TRUSTED_FIRMWARE_MAKE_TARGET) +endef + +define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS + cp -dpf $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release/*.bin $(BINARIES_DIR)/ +endef + +# Configuration ckeck +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR_BUILDING),yy) + +ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom) +ifeq ($(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION))),) +$(error No tarball location specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)) +endif +endif + +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y) +ifeq ($(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL)),) +$(error No repository specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL) +endif +endif + +endif + +$(eval $(generic-package)) From 04a89b8fa73deea856138b98f6be1509db6bc6d5 Mon Sep 17 00:00:00 2001 From: Joao Pinto Date: Sat, 15 Oct 2016 10:03:43 +0200 Subject: [PATCH 0735/3392] configs/arm_juno: add the bootloader build Thanks to the recent addition of the vexpress-firmware and arm-trusted-firmware packages, this commit improves the ARM Juno defconfig to also build a bootloader. Signed-off-by: Joao Pinto Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- board/arm/juno/readme.txt | 21 ++++++++++++++++++--- configs/arm_juno_defconfig | 10 ++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/board/arm/juno/readme.txt b/board/arm/juno/readme.txt index 9314bb0eea..b292d9636d 100644 --- a/board/arm/juno/readme.txt +++ b/board/arm/juno/readme.txt @@ -8,8 +8,8 @@ These instructions apply to all models of the ARM Juno: - Juno r1 (supports PCIe) - Juno r2 (Big Cluster with A72) -Buildroot will generate the kernel image, device tree blob and a -minimal root filesystem. +Buildroot will generate the kernel image, device tree blob, bootloader binaries +and a minimal root filesystem. How to build it =============== @@ -44,6 +44,20 @@ After building, you should obtain this tree: +-- juno-r1.dtb (if Juno r1 is used) +-- juno-r2.dtb (if Juno r2 is used) +-- Image + +-- bl1.bin + +-- bl2.bin + +-- bl2u.bin + +-- bl31.bin + +-- fip.bin + +-- scp-fw.bin + +-- u-boot.bin + +Preparing your rootfs +====================== + +Format your pen drive as a ext3 filesystem by executing: + + $ mkfs.ext3 /dev/ Preparing your rootfs ====================== @@ -113,7 +127,8 @@ Installing kernel image and DTB 3. Open the software/ folder 4. Copy the 'Image' file to software/ 5. Copy the 'juno-r1.dtb' (r1), 'juno.dtb' (r0) or juno-r2.dtb (r2) file to software/ -6. Press the red button in the front pannel of ARM Juno +6. Copy the bootloader binaries (bl1.bin and fip.bin) to software/ +7. Press the red button in the front pannel of ARM Juno At this time, the board will erase the Flash entry for each new item and replace it with the lastest ones. diff --git a/configs/arm_juno_defconfig b/configs/arm_juno_defconfig index 75ed63cb3a..8bc3a7ae82 100644 --- a/configs/arm_juno_defconfig +++ b/configs/arm_juno_defconfig @@ -10,3 +10,13 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/arm/juno/linux-juno-defconfig" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/juno arm/juno-r1 arm/juno-r2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.03" +BR2_TARGET_VEXPRESS_FIRMWARE=y From 152e98ccab075ac373406fa676d0c1b6bfd95da1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:08 -0300 Subject: [PATCH 0736/3392] lsof: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/lsof/lsof.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 312d834b03..e5cd4bce6e 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -47,7 +47,7 @@ define LSOF_CONFIGURE_CMDS endef define LSOF_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" -C $(@D) endef define LSOF_INSTALL_TARGET_CMDS From d95db2098f12b7c5f6e7b64eab9c9f86d7214ea9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:09 -0300 Subject: [PATCH 0737/3392] wf111: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/wf111/wf111.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wf111/wf111.mk b/package/wf111/wf111.mk index e17e846fd8..ad9d89149d 100644 --- a/package/wf111/wf111.mk +++ b/package/wf111/wf111.mk @@ -25,7 +25,7 @@ endif # separately the build step and the install step and get a correct # behavior. So we do everything in the install step. define WF111_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) PWD=$(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PWD=$(@D) \ $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) \ OUTPUT=$(TARGET_DIR) install_static endef From 1b95cc2898b9f1a5a836bddb8a64fe8316aea9f0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:10 -0300 Subject: [PATCH 0738/3392] p910nd: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/p910nd/p910nd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/p910nd/p910nd.mk b/package/p910nd/p910nd.mk index 73667d7c13..a1afdb3855 100644 --- a/package/p910nd/p910nd.mk +++ b/package/p910nd/p910nd.mk @@ -11,7 +11,7 @@ P910ND_LICENSE = GPLv2 P910ND_LICENSE_FILES = COPYING define P910ND_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define P910ND_INSTALL_TARGET_CMDS From 7da80ec2c3c0e433fe0a3b6757d1018160d6a972 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:11 -0300 Subject: [PATCH 0739/3392] lz4: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/lz4/lz4.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index a5a41d359c..f96e2795e2 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -27,16 +27,16 @@ define HOST_LZ4_INSTALL_CMDS endef define LZ4_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/lib + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/lib endef define LZ4_INSTALL_STAGING_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ PREFIX=/usr install -C $(@D) endef define LZ4_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ PREFIX=/usr install -C $(@D)/lib endef From 72be5e10879ab545010e95fc06f69fe9924519e8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:12 -0300 Subject: [PATCH 0740/3392] zlog: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/zlog/zlog.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk index a60e1b0dca..4f7f46928d 100644 --- a/package/zlog/zlog.mk +++ b/package/zlog/zlog.mk @@ -11,16 +11,16 @@ ZLOG_LICENSE_FILES = COPYING ZLOG_INSTALL_STAGING = YES define ZLOG_BUILD_CMDS - $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ -C $(@D) all endef define ZLOG_INSTALL_STAGING_CMDS - $(MAKE) PREFIX=$(STAGING_DIR)/usr -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(STAGING_DIR)/usr -C $(@D) install endef define ZLOG_INSTALL_TARGET_CMDS - $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install endef $(eval $(generic-package)) From c60b11f00e3d64a441161a742a68725b535a44f9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:14 -0300 Subject: [PATCH 0741/3392] arptables: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/arptables/arptables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/arptables/arptables.mk b/package/arptables/arptables.mk index 4f101c7b12..888d396e17 100644 --- a/package/arptables/arptables.mk +++ b/package/arptables/arptables.mk @@ -10,7 +10,7 @@ ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arp ARPTABLES_LICENSE = GPLv2+ define ARPTABLES_BUILD_CMDS - $(MAKE) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" endef From 4dac7ee6b43895d7dade8da5e47f0c8d5f6496bc Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:16 -0300 Subject: [PATCH 0742/3392] wireless_tools: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/wireless_tools/wireless_tools.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk index cb15412f53..f4e0ffb440 100644 --- a/package/wireless_tools/wireless_tools.mk +++ b/package/wireless_tools/wireless_tools.mk @@ -20,20 +20,20 @@ WIRELESS_TOOLS_BUILD_TARGETS += libiw.so.$(WIRELESS_TOOLS_VERSION_MAJOR) WIRELESS_TOOLS_INSTALL_TARGETS += install-dynamic define WIRELESS_TOOLS_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" LDCONFIG=/bin/true \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" LDCONFIG=/bin/true \ install-dynamic - $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)/usr" install-hdr + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)/usr" install-hdr endef endif define WIRELESS_TOOLS_BUILD_CMDS - $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ $(WIRELESS_TOOLS_BUILD_TARGETS) endef define WIRELESS_TOOLS_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" LDCONFIG=/bin/true \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" LDCONFIG=/bin/true \ $(WIRELESS_TOOLS_INSTALL_TARGETS) endef From b2672b225d4a4b3894c9d45a560e7657972f48d1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:17 -0300 Subject: [PATCH 0743/3392] pifmrds: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pifmrds/pifmrds.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pifmrds/pifmrds.mk b/package/pifmrds/pifmrds.mk index 51797152fc..a30c0136f2 100644 --- a/package/pifmrds/pifmrds.mk +++ b/package/pifmrds/pifmrds.mk @@ -11,7 +11,7 @@ PIFMRDS_LICENSE = GPLv3+ PIFMRDS_LICENSE_FILES = LICENSE define PIFMRDS_BUILD_CMDS - $(MAKE) -C $(@D)/src CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -ffast-math -c" \ app rds_wav endef From 6e7f2e73e2c2a6c881ef2633e92ddb9a8b678f74 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:18 -0300 Subject: [PATCH 0744/3392] hans: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/hans/hans.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hans/hans.mk b/package/hans/hans.mk index bda091f33a..5111d46be5 100644 --- a/package/hans/hans.mk +++ b/package/hans/hans.mk @@ -10,7 +10,7 @@ HANS_LICENSE = GPLv3+ HANS_LICENSE_FILES = LICENSE define HANS_BUILD_CMDS - $(MAKE) GCC="$(TARGET_CC)" GPP="$(TARGET_CXX)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) GCC="$(TARGET_CC)" GPP="$(TARGET_CXX)" -C $(@D) endef define HANS_INSTALL_TARGET_CMDS From bccfde628f1265d732671eb72f6a6c46aeb8a19d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:19 -0300 Subject: [PATCH 0745/3392] irda-utils: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/irda-utils/irda-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk index 2c35dff791..4b1700798f 100644 --- a/package/irda-utils/irda-utils.mk +++ b/package/irda-utils/irda-utils.mk @@ -15,7 +15,7 @@ IRDA_UTILS_CFLAGS += -DNO_FORK=1 endif define IRDA_UTILS_BUILD_CMDS - $(MAKE) \ + $(TARGET_MAKE_ENV) $(MAKE) \ CC="$(TARGET_CC)" \ CFLAGS="$(IRDA_UTILS_CFLAGS)" \ SYS_INCLUDES= \ From 5664359e9f71c762e9e18680629fa445eb01789c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:20 -0300 Subject: [PATCH 0746/3392] xvkbd: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/xvkbd/xvkbd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk index e03f7233aa..14e3f42f67 100644 --- a/package/xvkbd/xvkbd.mk +++ b/package/xvkbd/xvkbd.mk @@ -12,12 +12,12 @@ XVKBD_LICENSE_FILES = README # Passing USRLIBDIR ensures that the stupid Makefile doesn't add # /usr/lib to the library search path. define XVKBD_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ USRLIBDIR="$(STAGING_DIR)/usr/lib" endef define XVKBD_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef XVKBD_DEPENDENCIES = \ From d60344955c1f158a7d7be559fc3928abf375f2fd Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:21 -0300 Subject: [PATCH 0747/3392] tinyalsa: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/tinyalsa/tinyalsa.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index e470b47f63..816f6839f2 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -10,7 +10,7 @@ TINYALSA_LICENSE = BSD-3c TINYALSA_INSTALL_STAGING = YES define TINYALSA_BUILD_CMDS - $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) endef define TINYALSA_INSTALL_STAGING_CMDS From a5a74fcdf25b29955e7df669a279edc0fac8a6fa Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:22 -0300 Subject: [PATCH 0748/3392] openssl: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/openssl/openssl.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index 6dc4b85c86..5f6267c682 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -106,11 +106,11 @@ define HOST_OPENSSL_BUILD_CMDS endef define OPENSSL_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define OPENSSL_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install endef define HOST_OPENSSL_INSTALL_CMDS @@ -118,7 +118,7 @@ define HOST_OPENSSL_INSTALL_CMDS endef define OPENSSL_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install rm -rf $(TARGET_DIR)/usr/lib/ssl rm -f $(TARGET_DIR)/usr/bin/c_rehash endef From 3533500075afc8e587fffdcbd6d04a1fabdfa87d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:23 -0300 Subject: [PATCH 0749/3392] mplayer: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/mplayer/mplayer.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk index 6baf500902..07307cede2 100644 --- a/package/mplayer/mplayer.mk +++ b/package/mplayer/mplayer.mk @@ -368,11 +368,11 @@ define MPLAYER_CONFIGURE_CMDS endef define MPLAYER_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define MPLAYER_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install endef $(eval $(generic-package)) From e1ff79a78c8883365223c65cb0b6b54d8a35bf51 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:24 -0300 Subject: [PATCH 0750/3392] tcping: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/tcping/tcping.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tcping/tcping.mk b/package/tcping/tcping.mk index ff43490c81..4633b98265 100644 --- a/package/tcping/tcping.mk +++ b/package/tcping/tcping.mk @@ -10,7 +10,7 @@ TCPING_LICENSE = GPLv3+ TCPING_LICENSE_FILES = LICENSE define TCPING_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ -C $(@D) tcping.linux endef From 99212c73ace9365fbf71396dec717d65852ca12d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:25 -0300 Subject: [PATCH 0751/3392] ncurses: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ncurses/ncurses.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 276482490c..9555f1ed66 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -127,9 +127,9 @@ endif # ncurses breaks with parallel build, but takes quite a while to # build single threaded. Work around it similar to how Gentoo does define NCURSES_BUILD_CMDS - $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) sources + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) sources rm -rf $(@D)/misc/pc-files - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) endef ifneq ($(BR2_STATIC_LIBS),y) From 3e546fa328a979b2a5179e8ef3a8ebaaf1df6de4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:26 -0300 Subject: [PATCH 0752/3392] smstools3: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/smstools3/smstools3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/smstools3/smstools3.mk b/package/smstools3/smstools3.mk index a1684de8df..52f9b319e9 100644 --- a/package/smstools3/smstools3.mk +++ b/package/smstools3/smstools3.mk @@ -14,7 +14,7 @@ SMSTOOLS3_CFLAGS += -D NUMBER_OF_MODEMS=$(BR2_PACKAGE_SMSTOOLS3_NB_MODEMS) SMSTOOLS3_CFLAGS += -D NOSTATS define SMSTOOLS3_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(SMSTOOLS3_CFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(SMSTOOLS3_CFLAGS)" -C $(@D) endef define SMSTOOLS3_INSTALL_INIT_SYSV From 503aabf672ed3cbe09996f5d949a3e4d1426061f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:27 -0300 Subject: [PATCH 0753/3392] rtmpdump: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/rtmpdump/rtmpdump.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rtmpdump/rtmpdump.mk b/package/rtmpdump/rtmpdump.mk index ad4308c5b6..2e3428f15e 100644 --- a/package/rtmpdump/rtmpdump.mk +++ b/package/rtmpdump/rtmpdump.mk @@ -38,7 +38,7 @@ RTMPDUMP_MAKE_FLAGS = \ $(RTMPDUMP_SHARED) define RTMPDUMP_BUILD_CMDS - $(MAKE) $(RTMPDUMP_MAKE_FLAGS) \ + $(TARGET_MAKE_ENV) $(MAKE) $(RTMPDUMP_MAKE_FLAGS) \ XCFLAGS="$(RTMPDUMP_CFLAGS)" \ XLDFLAGS="$(TARGET_LDFLAGS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ @@ -46,11 +46,11 @@ define RTMPDUMP_BUILD_CMDS endef define RTMPDUMP_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D)/librtmp install DESTDIR=$(STAGING_DIR) $(RTMPDUMP_MAKE_FLAGS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/librtmp install DESTDIR=$(STAGING_DIR) $(RTMPDUMP_MAKE_FLAGS) endef define RTMPDUMP_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D)/librtmp install DESTDIR=$(TARGET_DIR) $(RTMPDUMP_MAKE_FLAGS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/librtmp install DESTDIR=$(TARGET_DIR) $(RTMPDUMP_MAKE_FLAGS) endef $(eval $(generic-package)) From e62d6cf9c93f5ce05051c0fe3b156ac4d0c707fb Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:28 -0300 Subject: [PATCH 0754/3392] iputils: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/iputils/iputils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 0a89120384..21f5dcbe06 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -62,7 +62,7 @@ IPUTILS_MAKE_OPTS += USE_CRYPTO=no endif define IPUTILS_BUILD_CMDS - $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS) endef define IPUTILS_INSTALL_TARGET_CMDS From ddf4a30ecb3680f5aae2a166d6b94c749952967d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:29 -0300 Subject: [PATCH 0755/3392] open2300: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/open2300/open2300.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk index 323f566cb4..588692d44f 100644 --- a/package/open2300/open2300.mk +++ b/package/open2300/open2300.mk @@ -28,7 +28,7 @@ endif endif define OPEN2300_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \ CFLAGS="$(OPEN2300_CFLAGS)" CC_LDFLAGS="$(OPEN2300_LDFLAGS)" \ -C $(@D) $(OPEN2300_BINS) endef From 8c877270a5094eee9b2f483839a8ec428f49a381 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:30 -0300 Subject: [PATCH 0756/3392] opentyrian: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/opentyrian/opentyrian.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opentyrian/opentyrian.mk b/package/opentyrian/opentyrian.mk index b74e4cf3f2..6efbe4eeb8 100644 --- a/package/opentyrian/opentyrian.mk +++ b/package/opentyrian/opentyrian.mk @@ -20,7 +20,7 @@ OPENTYRIAN_NETWORK = false endif define OPENTYRIAN_BUILD_CMDS - $(MAKE) PLATFORM=UNIX \ + $(TARGET_MAKE_ENV) $(MAKE) PLATFORM=UNIX \ CC="$(TARGET_CC)" \ STRIP="/bin/true" \ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ From 4367efc87505108961e10dd42cbc641e6447674e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:33 -0300 Subject: [PATCH 0757/3392] statserial: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/statserial/statserial.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/statserial/statserial.mk b/package/statserial/statserial.mk index f0e15bc451..22b468ebb8 100644 --- a/package/statserial/statserial.mk +++ b/package/statserial/statserial.mk @@ -11,7 +11,7 @@ STATSERIAL_LICENSE = GPLv2+ STATSERIAL_LICENSE_FILES = COPYING define STATSERIAL_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) endef define STATSERIAL_INSTALL_TARGET_CMDS From 19b22278035bde768a5d67712305724dec98a46e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:34 -0300 Subject: [PATCH 0758/3392] ti-utils: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ti-utils/ti-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk index 06aca6d409..cfb0cb8769 100644 --- a/package/ti-utils/ti-utils.mk +++ b/package/ti-utils/ti-utils.mk @@ -14,7 +14,7 @@ TI_UTILS_CFLAGS = `$(PKG_CONFIG_HOST_BINARY) --cflags libnl-genl-3.0` TI_UTILS_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs libnl-genl-3.0` define TI_UTILS_BUILD_CMDS - $(MAKE1) NFSROOT="$(STAGING_DIR)" \ + $(TARGET_MAKE_ENV) $(MAKE1) NFSROOT="$(STAGING_DIR)" \ CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(TI_UTILS_CFLAGS)" \ LIBS="$(TI_UTILS_LIBS)" -C $(@D) all endef From ae50be799df603f325203cf4987a977f8c0575d4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:35 -0300 Subject: [PATCH 0759/3392] blktrace: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/blktrace/blktrace.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/blktrace/blktrace.mk b/package/blktrace/blktrace.mk index c193375bf8..de583cf844 100644 --- a/package/blktrace/blktrace.mk +++ b/package/blktrace/blktrace.mk @@ -11,11 +11,11 @@ BLKTRACE_LICENSE = GPLv2+ BLKTRACE_LICENSE_FILES = COPYING define BLKTRACE_BUILD_CMDS - $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) endef define BLKTRACE_INSTALL_TARGET_CMDS - $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) install \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) install \ DESTDIR=$(TARGET_DIR) prefix=/usr endef From dc513a797bcdce88046cec6c95736a0fe61c7435 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:36 -0300 Subject: [PATCH 0760/3392] boost: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/boost/boost.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 1bed6b250f..bb8d799c48 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -131,7 +131,7 @@ define BOOST_CONFIGURE_CMDS endef define BOOST_BUILD_CMDS - (cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -q \ + (cd $(@D) && $(TARGET_MAKE_ENV) ./bjam -j$(PARALLEL_JOBS) -q \ --user-config=$(@D)/user-config.jam \ $(BOOST_OPTS) \ --ignore-site-config \ @@ -139,7 +139,7 @@ define BOOST_BUILD_CMDS endef define BOOST_INSTALL_TARGET_CMDS - (cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \ + (cd $(@D) && $(TARGET_MAKE_ENV) ./b2 -j$(PARALLEL_JOBS) -q \ --user-config=$(@D)/user-config.jam \ $(BOOST_OPTS) \ --prefix=$(TARGET_DIR)/usr \ @@ -148,7 +148,7 @@ define BOOST_INSTALL_TARGET_CMDS endef define BOOST_INSTALL_STAGING_CMDS - (cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -q \ + (cd $(@D) && $(TARGET_MAKE_ENV) ./bjam -j$(PARALLEL_JOBS) -q \ --user-config=$(@D)/user-config.jam \ $(BOOST_OPTS) \ --prefix=$(STAGING_DIR)/usr \ From f7c7b5570534a9ca2dc81666b9481e1ce29ce411 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:37 -0300 Subject: [PATCH 0761/3392] bsdiff: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/bsdiff/bsdiff.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk index 7d2b2969db..eb903e053f 100644 --- a/package/bsdiff/bsdiff.mk +++ b/package/bsdiff/bsdiff.mk @@ -11,9 +11,9 @@ BSDIFF_LICENSE = BSD-2c BSDIFF_LICENSE_FILES = bsdiff.c define BSDIFF_BUILD_CMDS - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ $(@D)/bsdiff.c -lbz2 -o $(@D)/bsdiff - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ $(@D)/bspatch.c -lbz2 -o $(@D)/bspatch endef From be4a6bb3a334bc00ce2bf8ee2414f9b5e9a802ef Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:38 -0300 Subject: [PATCH 0762/3392] feh: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/feh/feh.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/feh/feh.mk b/package/feh/feh.mk index 0d5da0603f..03651cdb76 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -12,12 +12,12 @@ FEH_LICENSE = MIT FEH_LICENSE_FILES = COPYING define FEH_BUILD_CMDS - $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ -C $(@D) all endef define FEH_INSTALL_TARGET_CMDS - $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) " \ + $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) " \ PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install endef From a441c8ab4c64c2be599880aa6bba7f3931c52664 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:39 -0300 Subject: [PATCH 0763/3392] gadgetfs-test: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/gadgetfs-test/gadgetfs-test.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk index 655f50a564..ca47738f5c 100644 --- a/package/gadgetfs-test/gadgetfs-test.mk +++ b/package/gadgetfs-test/gadgetfs-test.mk @@ -15,11 +15,11 @@ GADGETFS_TEST_MAKEOPTS += USE_AIO=y endif define GADGETFS_TEST_BUILD_CMDS - $(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) endef define GADGETFS_TEST_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) prefix=/usr install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) prefix=/usr install endef $(eval $(generic-package)) From ce3e7a33cb6244a46879487d42883cca56ce5397 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:40 -0300 Subject: [PATCH 0764/3392] iw: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/iw/iw.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/iw/iw.mk b/package/iw/iw.mk index 6f3f309485..925a770992 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -11,7 +11,9 @@ IW_LICENSE = ISC IW_LICENSE_FILES = COPYING IW_DEPENDENCIES = host-pkgconf libnl IW_MAKE_OPTS = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)" -IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \ +IW_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \ GIT_DIR=$(IW_DIR) define IW_BUILD_CMDS From 5b3fd59f45be2304e056a7103bf01d4f9db86ae3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:41 -0300 Subject: [PATCH 0765/3392] jack2: use $(TARGET_MAKE_ENV) when calling $(MAKE) In this case in particular it's $(TARGET_CONFIGURE_OPTS), which includes $(TARGET_MAKE_ENV). Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/jack2/jack2.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index f6ab974e8b..fa9e451345 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -53,16 +53,22 @@ define JACK2_CONFIGURE_CMDS endef define JACK2_BUILD_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) endef define JACK2_INSTALL_TARGET_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) \ + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) \ install) endef define JACK2_INSTALL_STAGING_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(STAGING_DIR) \ + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(STAGING_DIR) \ install) endef From 4c1ba21a747ef3ccc76d6e44bcd1520f8d98d62c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:42 -0300 Subject: [PATCH 0766/3392] libnss: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index b4f9cce2c0..931256c567 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -45,12 +45,12 @@ endif endif define LIBNSS_BUILD_CMDS - $(MAKE1) -C $(@D)/nss coreconf \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(LIBNSS_BUILD_VARS) - $(MAKE1) -C $(@D)/nss lib/dbm all \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ From 168e3eb80dc522f20892a603e593c5cd45e187b8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:43 -0300 Subject: [PATCH 0767/3392] lmbench: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/lmbench/lmbench.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk index dc758c6faf..b62096d9f8 100644 --- a/package/lmbench/lmbench.mk +++ b/package/lmbench/lmbench.mk @@ -31,11 +31,11 @@ endef # script. So the variables override below don't take direct effect in # src/Makefile. define LMBENCH_BUILD_CMDS - $(MAKE) CFLAGS="$(LMBENCH_CFLAGS)" LDLIBS="$(LMBENCH_LDLIBS)" OS=$(ARCH) CC="$(TARGET_CC)" -C $(@D)/src + $(TARGET_MAKE_ENV) $(MAKE) CFLAGS="$(LMBENCH_CFLAGS)" LDLIBS="$(LMBENCH_LDLIBS)" OS=$(ARCH) CC="$(TARGET_CC)" -C $(@D)/src endef define LMBENCH_INSTALL_TARGET_CMDS - $(MAKE) CFLAGS="$(TARGET_CFLAGS)" OS=$(ARCH) CC="$(TARGET_CC)" BASE=$(TARGET_DIR)/usr -C $(@D)/src install + $(TARGET_MAKE_ENV) $(MAKE) CFLAGS="$(TARGET_CFLAGS)" OS=$(ARCH) CC="$(TARGET_CC)" BASE=$(TARGET_DIR)/usr -C $(@D)/src install endef $(eval $(generic-package)) From c11b9d006883dba6427781277983c46274f3a2a0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:45 -0300 Subject: [PATCH 0768/3392] mongoose: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/mongoose/mongoose.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 98f6525500..7dfa119839 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -19,8 +19,8 @@ MONGOOSE_CFLAGS += -DNS_ENABLE_SSL -lssl -lcrypto -lz endif define MONGOOSE_BUILD_CMDS - $(TARGET_CC) -c $(@D)/mongoose.c $(MONGOOSE_CFLAGS) -o $(@D)/mongoose.o - $(TARGET_AR) rcs $(@D)/libmongoose.a $(@D)/mongoose.o + $(TARGET_MAKE_ENV) $(TARGET_CC) -c $(@D)/mongoose.c $(MONGOOSE_CFLAGS) -o $(@D)/mongoose.o + $(TARGET_MAKE_ENV) $(TARGET_AR) rcs $(@D)/libmongoose.a $(@D)/mongoose.o endef define MONGOOSE_INSTALL_STAGING_CMDS From 0c5e57f973a8b1946736f21daba724a4cc32fb9f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:46 -0300 Subject: [PATCH 0769/3392] libfreeimage: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libfreeimage/libfreeimage.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfreeimage/libfreeimage.mk b/package/libfreeimage/libfreeimage.mk index 2849e94f22..fe79689fdd 100644 --- a/package/libfreeimage/libfreeimage.mk +++ b/package/libfreeimage/libfreeimage.mk @@ -22,11 +22,11 @@ define LIBFREEIMAGE_BUILD_CMDS endef define LIBFREEIMAGE_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define LIBFREEIMAGE_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From 4f3fa0cfea9b97707402568936ee9d4276bfdb65 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:47 -0300 Subject: [PATCH 0770/3392] live555: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/live555/live555.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/live555/live555.mk b/package/live555/live555.mk index 3ccba63d77..f36cce34c1 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -41,15 +41,15 @@ define LIVE555_CONFIGURE_CMDS endef define LIVE555_BUILD_CMDS - $(MAKE) -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all endef define LIVE555_INSTALL_STAGING_CMDS - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install endef define LIVE555_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install endef $(eval $(generic-package)) From eab4842c7e0b505365761486ece9c6961f4ee0da Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:48 -0300 Subject: [PATCH 0771/3392] pptp-linux: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pptp-linux/pptp-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index d7edf6cd06..1538457a12 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -12,7 +12,7 @@ PPTP_LINUX_LICENSE = GPLv2+ PPTP_LINUX_LICENSE_FILES = COPYING define PPTP_LINUX_BUILD_CMDS - $(MAKE) -C $(@D) OPTIMIZE= DEBUG= \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) OPTIMIZE= DEBUG= \ CC="$(TARGET_CC)" \ CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ From d796044eb1b03297ed96fdcb3e63359d801aa293 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:49 -0300 Subject: [PATCH 0772/3392] unrar: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/unrar/unrar.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index 68d81b7353..f5a95eacc5 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -11,13 +11,13 @@ UNRAR_LICENSE = unrar UNRAR_LICENSE_FILES = license.txt define UNRAR_BUILD_CMDS - $(MAKE) CXX="$(TARGET_CXX)" STRIP="/bin/true" \ + $(TARGET_MAKE_ENV) $(MAKE) CXX="$(TARGET_CXX)" STRIP="/bin/true" \ CXXFLAGS="$(TARGET_CXXFLAGS) -pthread" \ LDFLAGS="$(TARGET_LDFLAGS) -pthread" -C $(@D) endef define UNRAR_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install endef $(eval $(generic-package)) From a7ffe7e681a907d43eea66be08d6df85ae3f4634 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:50 -0300 Subject: [PATCH 0773/3392] mtdev2tuio: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/mtdev2tuio/mtdev2tuio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mtdev2tuio/mtdev2tuio.mk b/package/mtdev2tuio/mtdev2tuio.mk index 7b00221c6a..d2e70408f1 100644 --- a/package/mtdev2tuio/mtdev2tuio.mk +++ b/package/mtdev2tuio/mtdev2tuio.mk @@ -13,7 +13,7 @@ MTDEV2TUIO_LICENSE_FILES = COPYING # mtdev2tuio Makefile misuses $(LD) as gcc, so we need to override LD # here. Liblo uses log(3), so we need to link with -lm define MTDEV2TUIO_BUILD_CMDS - $(MAKE) \ + $(TARGET_MAKE_ENV) $(MAKE) \ $(TARGET_CONFIGURE_OPTS) \ LD="$(TARGET_CC)" \ LIBS="-lmtdev -llo -lm" \ From aa1acf642c9867feda7d6a69653084bbe3ebd301 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:51 -0300 Subject: [PATCH 0774/3392] ushare: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ushare/ushare.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk index 25f880c35f..62d269c476 100644 --- a/package/ushare/ushare.mk +++ b/package/ushare/ushare.mk @@ -26,11 +26,11 @@ define USHARE_CONFIGURE_CMDS endef define USHARE_BUILD_CMDS - $(MAKE) LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" -C $(@D) endef define USHARE_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install rm -f $(TARGET_DIR)/etc/init.d/ushare endef From c223dcb16525d2fa12dc7abb46bb42851b11afd9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:52 -0300 Subject: [PATCH 0775/3392] libtommath: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libtommath/libtommath.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libtommath/libtommath.mk b/package/libtommath/libtommath.mk index eb3b00e861..2fc8c39c6e 100644 --- a/package/libtommath/libtommath.mk +++ b/package/libtommath/libtommath.mk @@ -13,11 +13,11 @@ LIBTOMMATH_INSTALL_STAGING = YES LIBTOMMATH_INSTALL_TARGET = NO # only static library define LIBTOMMATH_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="-I./ -fPIC $(TARGET_CFLAGS)" + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="-I./ -fPIC $(TARGET_CFLAGS)" endef define LIBTOMMATH_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install endef $(eval $(generic-package)) From 39c6d150acd251b17db5b818f1e90d04c8ad2d3f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:53 -0300 Subject: [PATCH 0776/3392] odhcploc: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/odhcploc/odhcploc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/odhcploc/odhcploc.mk b/package/odhcploc/odhcploc.mk index 3995551927..bf4227ae5c 100644 --- a/package/odhcploc/odhcploc.mk +++ b/package/odhcploc/odhcploc.mk @@ -10,11 +10,11 @@ ODHCPLOC_LICENSE = ISC ODHCPLOC_LICENSE_FILES = COPYING define ODHCPLOC_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all endef define ODHCPLOC_INSTALL_TARGET_CMDS - $(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install endef $(eval $(generic-package)) From 98d693e4786cd65977c436844884924d3ca698d5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:54 -0300 Subject: [PATCH 0777/3392] espeak: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/espeak/espeak.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/espeak/espeak.mk b/package/espeak/espeak.mk index 0aa049ef07..734ec30e54 100644 --- a/package/espeak/espeak.mk +++ b/package/espeak/espeak.mk @@ -32,12 +32,12 @@ define ESPEAK_CONFIGURE_CMDS endef define ESPEAK_BUILD_CMDS - $(MAKE) -C $(@D)/src $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src $(TARGET_CONFIGURE_OPTS) \ AUDIO="$(ESPEAK_AUDIO_BACKEND)" all endef define ESPEAK_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D)/src DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package)) From 23a9d0384a7e1fe495c5f24031a3fbef8745f030 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:55 -0300 Subject: [PATCH 0778/3392] duma: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/duma/duma.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/duma/duma.mk b/package/duma/duma.mk index 5e862ab25e..a8348b95a2 100644 --- a/package/duma/duma.mk +++ b/package/duma/duma.mk @@ -18,18 +18,18 @@ DUMA_OPTIONS = \ # The dependency of some source files in duma_config.h, which is generated at # build time, is not specified in the Makefile. Force non-parallel build. define DUMA_BUILD_CMDS - $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ OS=linux \ DUMA_OPTIONS="$(DUMA_OPTIONS)" \ $(DUMA_CPP) -C $(@D) endef define DUMA_INSTALL_STAGING_CMDS - $(MAKE) OS=linux prefix=$(STAGING_DIR)/usr install -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) OS=linux prefix=$(STAGING_DIR)/usr install -C $(@D) endef define DUMA_INSTALL_TARGET_CMDS - $(MAKE) OS=linux prefix=$(TARGET_DIR)/usr install -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) OS=linux prefix=$(TARGET_DIR)/usr install -C $(@D) endef $(eval $(generic-package)) From e799d1b0a75ffe3ff4070957651d7fff2ce07d02 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:56 -0300 Subject: [PATCH 0779/3392] aufs-util: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/aufs-util/aufs-util.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/aufs-util/aufs-util.mk b/package/aufs-util/aufs-util.mk index 0ea9ee5955..a2d0bad656 100644 --- a/package/aufs-util/aufs-util.mk +++ b/package/aufs-util/aufs-util.mk @@ -46,14 +46,14 @@ define AUFS_UTIL_BUILD_CMDS CPPFLAGS="$(AUFS_UTIL_HOST_CPPFLAGS)" \ HOSTCC="$(HOSTCC)" HOSTLD="$(HOSTLD)" \ INSTALL="$(INSTALL)" c2sh c2tmac - $(MAKE1) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ $(TARGET_CONFIGURE_OPTS) \ CPPFLAGS="$(AUFS_UTIL_CPPFLAGS)" \ INSTALL="$(INSTALL)" all endef define AUFS_UTIL_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) INSTALL="$(INSTALL)" DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL="$(INSTALL)" DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package)) From a79220ab42d70eb5802f3daa0f9324255a54b509 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 13 Oct 2016 19:13:58 -0300 Subject: [PATCH 0780/3392] dmidecode: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/dmidecode/dmidecode.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk index 4298d88198..cd30aa7df5 100644 --- a/package/dmidecode/dmidecode.mk +++ b/package/dmidecode/dmidecode.mk @@ -11,11 +11,11 @@ DMIDECODE_LICENSE = GPLv2+ DMIDECODE_LICENSE_FILES = LICENSE define DMIDECODE_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) endef define DMIDECODE_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From dad86ab515e07196fd18a28557f895dd49f93d4d Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Mon, 10 Oct 2016 19:46:00 -0700 Subject: [PATCH 0781/3392] qt53d, qt5serialbus: move to technology preview section As explained in https://wiki.qt.io/New_Features_in_Qt_5.6#Technology_Preview_Modules, not only qt5quickcontrols2 is a technology preview component in Qt 5.6, but also qt53d, qt5serialbus. Signed-off-by: Matt Kraai [Thomas: improve commit log with a reference.] Signed-off-by: Thomas Petazzoni --- package/qt5/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 84cbb0fbe6..234dfdd25c 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -31,7 +31,6 @@ menuconfig BR2_PACKAGE_QT5 if BR2_PACKAGE_QT5 source "package/qt5/qt5base/Config.in" -source "package/qt5/qt53d/Config.in" source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5connectivity/Config.in" source "package/qt5/qt5declarative/Config.in" @@ -42,7 +41,6 @@ source "package/qt5/qt5location/Config.in" source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5sensors/Config.in" -source "package/qt5/qt5serialbus/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5tools/Config.in" @@ -51,7 +49,9 @@ source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" comment "technology preview" +source "package/qt5/qt53d/Config.in" source "package/qt5/qt5quickcontrols2/Config.in" +source "package/qt5/qt5serialbus/Config.in" comment "legacy compatibility" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5webkit/Config.in" From 606cc1320dcaabbb1e2721f95c31f2073accbad1 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Sat, 15 Oct 2016 12:26:12 +0100 Subject: [PATCH 0782/3392] openblas: use MIPS specific cores for P5600 and I6400 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/openblas/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openblas/Config.in b/package/openblas/Config.in index 1fbed1c27a..de26ab3b73 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -27,10 +27,10 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "PPC440" if BR2_powerpc_440 default "PPC440FP2" if BR2_powerpc_440fp # P5600 is built with MSA support which is only available in Codescape toolchains - default "P5600" if BR2_MIPS_CPU_MIPS32R2 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS + default "P5600" if BR2_mips_p5600 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS default "SICORTEX" if BR2_MIPS_CPU_MIPS64 # I6400 is built with MSA support which is only available in Codescape toolchains - default "I6400" if BR2_MIPS_CPU_MIPS64R6 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS + default "I6400" if BR2_mips_i6400 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS default "SPARC" if BR2_sparc # Cortex-A15 always have a VFPv4 default "CORTEXA15" if (BR2_cortex_a15 && BR2_ARM_EABIHF) From e5a3201bf56f2651cf15d33eb3209d2a8c4b2ccb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 15 Oct 2016 15:53:36 +0200 Subject: [PATCH 0783/3392] DEVELOPERS: update entry for gcc Refering to package/gcc/gcc-initial and package/gcc/gcc-final was not a good idea, as it doesn't notify when gcc patches are added/removed/modified, so change this to package/gcc so that it catches all changes. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index e702b2ae86..c535942bc0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1451,8 +1451,7 @@ F: package/cmake/ F: package/cramfs/ F: package/dmidecode/ F: package/flashrom/ -F: package/gcc/gcc-final/ -F: package/gcc/gcc-initial/ +F: package/gcc/ F: package/genext2fs/ F: package/genromfs/ F: package/getent/ From c09e484f6d5bb0512747e43d0449ed9f1bd0c25b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 15 Oct 2016 15:54:45 +0200 Subject: [PATCH 0784/3392] DEVELOPERS: change developer for wpa_supplicant The wpa_supplicant was in fact no introduced by Peter, but by Gustavo, and Gustavo is much more active in maintaining this package, so let's mention Gustavo as the developer for this package. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index c535942bc0..84a0844867 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -718,6 +718,7 @@ F: package/webkitgtk/ F: package/webkitgtk24/ F: package/whois/ F: package/wireshark/ +F: package/wpa_supplicant/ F: package/wpan-tools/ F: package/x11r7/xdriver_xf86-video-qxl/ F: package/xtables-addons/ @@ -1147,7 +1148,6 @@ F: package/python-ipaddr/ F: package/python-pam/ F: package/python-psutil/ F: package/triggerhappy/ -F: package/wpa_supplicant/ N: Peter Seiderer F: board/raspberrypi/ From dc77d63534b34e5fe9edfc3c2e2adfdee1a451e7 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Sat, 15 Oct 2016 14:36:21 +0100 Subject: [PATCH 0785/3392] gcc: add support for MIPS R6 Musl Backport upstream patch to add support for MIPS R6 Musl: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=83717065090bb8b954556d1216dd9dc397dc0243 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- ...41-mips-Add-support-for-mips-r6-musl.patch | 43 +++++++++++++++++++ ...41-mips-Add-support-for-mips-r6-musl.patch | 43 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 package/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch create mode 100644 package/gcc/6.2.0/941-mips-Add-support-for-mips-r6-musl.patch diff --git a/package/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch b/package/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch new file mode 100644 index 0000000000..337d376b75 --- /dev/null +++ b/package/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch @@ -0,0 +1,43 @@ +From 83717065090bb8b954556d1216dd9dc397dc0243 Mon Sep 17 00:00:00 2001 +From: nsz +Date: Thu, 25 Aug 2016 14:13:02 +0000 +Subject: [PATCH] [mips] Add support for mips*r6-*-musl + +gcc/ + * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Update. + (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Update. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239760 138bc75d-0d04-0410-961f-82ee72b054a4 + +[Vincent: tweak to not patch ChangeLog] + +Signed-off-by: Vicente Olivert Riera +--- + gcc/config/mips/linux.h | 9 ++++++--- + 1 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h +index fa253b6..dc51c45 100644 +--- a/gcc/config/mips/linux.h ++++ b/gcc/config/mips/linux.h +@@ -38,10 +38,13 @@ along with GCC; see the file COPYING3. If not see + "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" + + #undef MUSL_DYNAMIC_LINKER32 +-#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKER32 \ ++ "/lib/ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" + #undef MUSL_DYNAMIC_LINKER64 +-#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" +-#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKER64 \ ++ "/lib/ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKERN32 \ ++ "/lib/ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" + + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" + #define GNU_USER_DYNAMIC_LINKERN32 \ +-- +2.10.0 + diff --git a/package/gcc/6.2.0/941-mips-Add-support-for-mips-r6-musl.patch b/package/gcc/6.2.0/941-mips-Add-support-for-mips-r6-musl.patch new file mode 100644 index 0000000000..337d376b75 --- /dev/null +++ b/package/gcc/6.2.0/941-mips-Add-support-for-mips-r6-musl.patch @@ -0,0 +1,43 @@ +From 83717065090bb8b954556d1216dd9dc397dc0243 Mon Sep 17 00:00:00 2001 +From: nsz +Date: Thu, 25 Aug 2016 14:13:02 +0000 +Subject: [PATCH] [mips] Add support for mips*r6-*-musl + +gcc/ + * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Update. + (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Update. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239760 138bc75d-0d04-0410-961f-82ee72b054a4 + +[Vincent: tweak to not patch ChangeLog] + +Signed-off-by: Vicente Olivert Riera +--- + gcc/config/mips/linux.h | 9 ++++++--- + 1 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h +index fa253b6..dc51c45 100644 +--- a/gcc/config/mips/linux.h ++++ b/gcc/config/mips/linux.h +@@ -38,10 +38,13 @@ along with GCC; see the file COPYING3. If not see + "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" + + #undef MUSL_DYNAMIC_LINKER32 +-#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKER32 \ ++ "/lib/ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" + #undef MUSL_DYNAMIC_LINKER64 +-#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" +-#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKER64 \ ++ "/lib/ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKERN32 \ ++ "/lib/ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" + + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" + #define GNU_USER_DYNAMIC_LINKERN32 \ +-- +2.10.0 + From b890bd1f04635f3022461a73bff4ed12d5494e72 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Sat, 15 Oct 2016 14:36:22 +0100 Subject: [PATCH 0786/3392] toolchain-buildroot: enable Musl for MIPS R6 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 310572e502..c89e181611 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -73,8 +73,6 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL BR2_mips64el || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ BR2_sh || BR2_x86_64 depends on !BR2_powerpc_SPE # not supported, build breaks - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # sh2 nommu is supported by musl, but we don't have support # for it in Buildroot. depends on BR2_USE_MMU From 8c97033a01585b7de567847a6b113890001a7a0d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 15 Oct 2016 15:53:18 +0200 Subject: [PATCH 0787/3392] gcc: add patches to fix PR70473 gcc 5.x introduced a regression in the ARM build, which causes the s-automata program to consume a very significant amount of RAM during the gcc build. This causes numerous failures with our Travis-CI based testing of defconfigs. In order to address this, this commit backports a commit from the gcc master branch, to both our gcc 5.x and gcc 6.x support. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...473-Reduce-size-of-Cortex-A8-automat.patch | 68 ++++++++++++++++++ ...473-Reduce-size-of-Cortex-A8-automat.patch | 69 +++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 package/gcc/5.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch create mode 100644 package/gcc/6.2.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch diff --git a/package/gcc/5.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/package/gcc/5.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch new file mode 100644 index 0000000000..d8c74f959e --- /dev/null +++ b/package/gcc/5.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch @@ -0,0 +1,68 @@ +From 89bd94250827f887b38211ac048b4006229dc9c0 Mon Sep 17 00:00:00 2001 +From: ktkachov +Date: Fri, 26 Aug 2016 10:23:20 +0000 +Subject: [PATCH] [ARM] PR target/70473: Reduce size of Cortex-A8 automaton + + PR target/70473 + * config/arm/cortex-a8-neon.md (cortex_a8_vfp_muld): Reduce + reservation duration to 15 cycles. + (cortex_a8_vfp_macs): Likewise. + (cortex_a8_vfp_macd): Likewise. + (cortex_a8_vfp_divs): Likewise. + (cortex_a8_vfp_divd): Likewise. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239772 138bc75d-0d04-0410-961f-82ee72b054a4 + +[Backport from gcc upstream commit 79f5d5e3cd5a668d5ecb2b6b0cce80ef5706ac53.] +Signed-off-by: Thomas Petazzoni +--- + gcc/config/arm/cortex-a8-neon.md | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/gcc/config/arm/cortex-a8-neon.md b/gcc/config/arm/cortex-a8-neon.md +index 04fa01e..4e6d05d 100644 +--- a/gcc/config/arm/cortex-a8-neon.md ++++ b/gcc/config/arm/cortex-a8-neon.md +@@ -357,30 +357,34 @@ + (eq_attr "type" "fmuls")) + "cortex_a8_vfp,cortex_a8_vfplite*11") + ++;; Don't model a reservation for more than 15 cycles as this explodes the ++;; state space of the automaton for little gain. It is unlikely that the ++;; scheduler will find enough instructions to hide the full latency of the ++;; instructions. + (define_insn_reservation "cortex_a8_vfp_muld" 17 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fmuld")) +- "cortex_a8_vfp,cortex_a8_vfplite*16") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_macs" 21 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fmacs,ffmas")) +- "cortex_a8_vfp,cortex_a8_vfplite*20") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_macd" 26 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fmacd,ffmad")) +- "cortex_a8_vfp,cortex_a8_vfplite*25") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_divs" 37 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fdivs, fsqrts")) +- "cortex_a8_vfp,cortex_a8_vfplite*36") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_divd" 65 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fdivd, fsqrtd")) +- "cortex_a8_vfp,cortex_a8_vfplite*64") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + ;; Comparisons can actually take 7 cycles sometimes instead of four, + ;; but given all the other instructions lumped into type=ffarith that +-- +2.7.4 + diff --git a/package/gcc/6.2.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/package/gcc/6.2.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch new file mode 100644 index 0000000000..af9fb1d6b2 --- /dev/null +++ b/package/gcc/6.2.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch @@ -0,0 +1,69 @@ +From 07453188b18a2cbe815917dbb893b4ebfdd793b6 Mon Sep 17 00:00:00 2001 +From: ktkachov +Date: Fri, 26 Aug 2016 10:23:20 +0000 +Subject: [PATCH] [ARM] PR target/70473: Reduce size of Cortex-A8 automaton + + PR target/70473 + * config/arm/cortex-a8-neon.md (cortex_a8_vfp_muld): Reduce + reservation duration to 15 cycles. + (cortex_a8_vfp_macs): Likewise. + (cortex_a8_vfp_macd): Likewise. + (cortex_a8_vfp_divs): Likewise. + (cortex_a8_vfp_divd): Likewise. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239772 +138bc75d-0d04-0410-961f-82ee72b054a4 + +[Backport from gcc upstream commit 79f5d5e3cd5a668d5ecb2b6b0cce80ef5706ac53.] +Signed-off-by: Thomas Petazzoni +--- + gcc/config/arm/cortex-a8-neon.md | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/gcc/config/arm/cortex-a8-neon.md b/gcc/config/arm/cortex-a8-neon.md +index 45f861f..b16c299 100644 +--- a/gcc/config/arm/cortex-a8-neon.md ++++ b/gcc/config/arm/cortex-a8-neon.md +@@ -357,30 +357,34 @@ + (eq_attr "type" "fmuls")) + "cortex_a8_vfp,cortex_a8_vfplite*11") + ++;; Don't model a reservation for more than 15 cycles as this explodes the ++;; state space of the automaton for little gain. It is unlikely that the ++;; scheduler will find enough instructions to hide the full latency of the ++;; instructions. + (define_insn_reservation "cortex_a8_vfp_muld" 17 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fmuld")) +- "cortex_a8_vfp,cortex_a8_vfplite*16") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_macs" 21 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fmacs,ffmas")) +- "cortex_a8_vfp,cortex_a8_vfplite*20") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_macd" 26 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fmacd,ffmad")) +- "cortex_a8_vfp,cortex_a8_vfplite*25") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_divs" 37 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fdivs, fsqrts")) +- "cortex_a8_vfp,cortex_a8_vfplite*36") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + (define_insn_reservation "cortex_a8_vfp_divd" 65 + (and (eq_attr "tune" "cortexa8") + (eq_attr "type" "fdivd, fsqrtd")) +- "cortex_a8_vfp,cortex_a8_vfplite*64") ++ "cortex_a8_vfp,cortex_a8_vfplite*15") + + ;; Comparisons can actually take 7 cycles sometimes instead of four, + ;; but given all the other instructions lumped into type=ffarith that +-- +2.7.4 + From ab94b85a5554cef9f5744cc3d1a5715ad6404d84 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Oct 2016 15:55:41 +0200 Subject: [PATCH 0788/3392] DEVELOPPERS: add packages I'm interesting in Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- DEVELOPERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 84a0844867..e959525d59 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1585,6 +1585,7 @@ F: package/libedit/ F: package/libinput/ F: package/libiscsi/ F: package/libseccomp/ +F: package/linux-tools/ F: package/mesa3d-headers/ F: package/mke2img/ F: package/nut/ @@ -1596,11 +1597,15 @@ F: package/slirp/ F: package/snappy/ F: package/spice/ F: package/spice-protocol/ +F: package/systemd/ +F: package/systemd-bootchart/ F: package/tmux/ F: package/tvheadend/ F: package/usbredir/ F: package/vde2/ F: package/w_scan/ +F: package/wayland/ +F: package/weston/ F: support/download/ N: Yegor Yefremov From 87d265f13fd0dbab82055c22fb54aa7c7051d9da Mon Sep 17 00:00:00 2001 From: Lothar Felten Date: Fri, 23 Sep 2016 00:20:48 +0200 Subject: [PATCH 0789/3392] configs/beaglebone: update kernel/uboot, add AM335x EVM support This patch updates the target config for the beaglebone based on the AM335x CPU. It also supports the beagleboneblack, the TI evm and evmsk. Device tree blobs for am335x-evm, am335x-evmsk, am335x-bone, am335x-boneblack will be built and a sd card image is created with a post-image script. The kernel and driver versions match the ti-processor-sdk 02.00.00.00. Patches allow the use of old AM335x evm revisions (1 bit sd card) and JTAG debugging. Kernel JTAG patch: By default the kernel will disable the JTAG clock, access via the JTAG port will not work after the kernel booted. The AM335x-evm has a JTAG header fitted, this patch keeps the JTAG clock alive. Signed-off-by: Lothar Felten [Thomas: remove 1-bit MMC patch, it's causing a significant performance regression for users of BeagleBone, which are 99.99% of the users of this defconfig.] Signed-off-by: Thomas Petazzoni --- board/beaglebone/genimage.cfg | 4 +- board/beaglebone/linux-3.12.config | 251 ------------------ ...1-keep-jtag-clock-alive-for-debugger.patch | 16 ++ ...-flush-management-symbols-when-MULTI.patch | 34 --- board/beaglebone/post-image.sh | 3 +- board/beaglebone/readme.txt | 74 +++--- board/beaglebone/uEnv.txt | 3 +- configs/beaglebone_defconfig | 46 ++-- 8 files changed, 78 insertions(+), 353 deletions(-) delete mode 100644 board/beaglebone/linux-3.12.config create mode 100644 board/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch delete mode 100644 board/beaglebone/patches/linux/linux-0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 0c29a804d5..ba60297dde 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -5,8 +5,10 @@ image boot.vfat { "u-boot.img", "zImage", "uEnv.txt", + "am335x-evm.dtb", + "am335x-evmsk.dtb", "am335x-bone.dtb", - "am335x-boneblack.dtb" + "am335x-boneblack.dtb", } } size = 16M diff --git a/board/beaglebone/linux-3.12.config b/board/beaglebone/linux-3.12.config deleted file mode 100644 index 0be5722b91..0000000000 --- a/board/beaglebone/linux-3.12.config +++ /dev/null @@ -1,251 +0,0 @@ -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=16 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EXPERT=y -CONFIG_SLAB=y -CONFIG_PROFILING=y -CONFIG_KPROBES=y -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_OMAP_RESET_CLOCKS=y -CONFIG_OMAP_MUX_DEBUG=y -CONFIG_ARCH_OMAP3=y -CONFIG_ARCH_OMAP4=y -CONFIG_SOC_AM43XX=y -# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set -# CONFIG_SOC_TI81XX is not set -# CONFIG_MACH_OMAP3_BEAGLE is not set -# CONFIG_MACH_DEVKIT8000 is not set -# CONFIG_MACH_OMAP_LDP is not set -# CONFIG_MACH_OMAP3530_LV_SOM is not set -# CONFIG_MACH_OMAP3_TORPEDO is not set -# CONFIG_MACH_OVERO is not set -# CONFIG_MACH_OMAP3EVM is not set -# CONFIG_MACH_OMAP3_PANDORA is not set -# CONFIG_MACH_TOUCHBOOK is not set -# CONFIG_MACH_OMAP_3430SDP is not set -# CONFIG_MACH_NOKIA_RM680 is not set -# CONFIG_MACH_NOKIA_RX51 is not set -# CONFIG_MACH_OMAP_ZOOM2 is not set -# CONFIG_MACH_OMAP_ZOOM3 is not set -# CONFIG_MACH_CM_T35 is not set -# CONFIG_MACH_CM_T3517 is not set -# CONFIG_MACH_IGEP0020 is not set -# CONFIG_MACH_IGEP0030 is not set -# CONFIG_MACH_SBC3530 is not set -# CONFIG_MACH_OMAP_3630SDP is not set -CONFIG_ARM_THUMBEE=y -CONFIG_HAVE_ARM_ARCH_TIMER=y -CONFIG_PREEMPT=y -CONFIG_AEABI=y -CONFIG_HIGHMEM=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" -CONFIG_KEXEC=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_GENERIC_CPUFREQ_CPU0=y -# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set -CONFIG_FPE_NWFPE=y -CONFIG_VFP=y -CONFIG_NEON=y -CONFIG_BINFMT_MISC=y -CONFIG_PM_RUNTIME=y -CONFIG_PM_DEBUG=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_OMAP_OCP2SCP=y -CONFIG_CONNECTOR=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_CROSSBAR=y -CONFIG_EEPROM_93CX6=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_MD=y -CONFIG_NETDEVICES=y -# CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_CADENCE is not set -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_CIRRUS is not set -# CONFIG_NET_VENDOR_FARADAY is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SMSC is not set -# CONFIG_NET_VENDOR_STMICRO is not set -CONFIG_TI_CPSW=y -CONFIG_TI_CPTS=y -# CONFIG_NET_VENDOR_VIA is not set -# CONFIG_NET_VENDOR_WIZNET is not set -CONFIG_AT803X_PHY=y -CONFIG_SMSC_PHY=y -# CONFIG_WLAN is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=32 -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_OMAP=y -CONFIG_SERIAL_OMAP_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_OMAP=y -CONFIG_SPI=y -CONFIG_SPI_OMAP24XX=y -CONFIG_SPI_TI_QSPI=y -CONFIG_PINCTRL_SINGLE=y -CONFIG_DEBUG_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_W1=y -CONFIG_POWER_SUPPLY=y -CONFIG_THERMAL=y -CONFIG_THERMAL_GOV_FAIR_SHARE=y -CONFIG_THERMAL_GOV_USER_SPACE=y -CONFIG_CPU_THERMAL=y -CONFIG_TI_SOC_THERMAL=y -CONFIG_TI_THERMAL=y -CONFIG_WATCHDOG=y -CONFIG_OMAP_WATCHDOG=y -CONFIG_MFD_SYSCON=y -CONFIG_MFD_TPS65217=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_PBIAS=y -CONFIG_REGULATOR_TPS65023=y -CONFIG_REGULATOR_TPS6507X=y -CONFIG_REGULATOR_TPS65217=y -CONFIG_REGULATOR_TIAVSCLASS0=y -CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_DA8XX=y -CONFIG_FB_DA8XX_TDA998X=y -CONFIG_OMAP2_DSS=y -CONFIG_OMAP2_DSS_SDI=y -CONFIG_OMAP2_DSS_DSI=y -CONFIG_FB_OMAP2=y -CONFIG_DISPLAY_CONNECTOR_HDMI=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_MON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_MUSB_HDRC=m -CONFIG_USB_MUSB_OMAP2PLUS=m -CONFIG_USB_MUSB_DSPS=m -CONFIG_USB_TI_CPPI41_DMA=y -CONFIG_USB_STORAGE=y -CONFIG_AM335X_PHY_USB=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DEBUG=y -CONFIG_USB_GADGET_DEBUG_FS=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_EEM=y -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_G_MULTI=m -CONFIG_USB_G_MULTI_CDC=y -CONFIG_MMC=y -CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_SDIO_UART=y -CONFIG_MMC_OMAP=y -CONFIG_MMC_OMAP_HS=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_ONESHOT=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_OMAP=y -CONFIG_DMADEVICES=y -CONFIG_TI_EDMA=y -CONFIG_DMA_OMAP=y -CONFIG_TI_CPPI41=y -CONFIG_COMMON_CLK_DEBUG=y -CONFIG_OMAP_USB2=y -CONFIG_OMAP_PIPE3=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set -CONFIG_EXT4_FS=y -CONFIG_QUOTA=y -CONFIG_QFMT_V2=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_INFO=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -CONFIG_PROVE_LOCKING=y -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_CRYPTO_MANAGER=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_CCITT=y -CONFIG_CRC_T10DIF=y -CONFIG_CRC_ITU_T=y -CONFIG_CRC7=y -CONFIG_LIBCRC32C=y -CONFIG_AVERAGE=y diff --git a/board/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch b/board/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch new file mode 100644 index 0000000000..8e36d9abc5 --- /dev/null +++ b/board/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch @@ -0,0 +1,16 @@ +This patch keeps the debugSS clock alive, it clocks the JTAG macro and enables +access to the SoC via JTAG after the kernel booted. + +Signed-off-by: Lothar Felten +--- +diff -Naur linux-orig/arch/arm/mach-omap2/omap_hwmod_33xx_data.c linux-52c4aa7cdb93d61f8008f380135beaf7b8fa6593/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +--- linux-orig/arch/arm/mach-omap2/omap_hwmod_33xx_data.c 2015-10-02 17:30:56.000000000 +0200 ++++ linux-52c4aa7cdb93d61f8008f380135beaf7b8fa6593/arch/arm/mach-omap2/omap_hwmod_33xx_data.c 2016-08-15 11:28:55.017617612 +0200 +@@ -208,6 +208,7 @@ + .name = "debugss", + .class = &am33xx_debugss_hwmod_class, + .clkdm_name = "l3_aon_clkdm", ++ .flags = (HWMOD_INIT_NO_IDLE|HWMOD_INIT_NO_RESET), /* keep debugSS clock alive for JTAG */ + .main_clk = "trace_clk_div_ck", + .prcm = { + .omap4 = { diff --git a/board/beaglebone/patches/linux/linux-0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch b/board/beaglebone/patches/linux/linux-0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch deleted file mode 100644 index 1ca1e70ca9..0000000000 --- a/board/beaglebone/patches/linux/linux-0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 29885f2f3d700341d322274db6ad085e601c0994 Mon Sep 17 00:00:00 2001 -From: Pantelis Antoniou -Date: Fri, 4 Jan 2013 00:32:33 +0200 -Subject: [PATCH 3/3] arm: Export cache flush management symbols when - !MULTI_CACHE - -When compiling a kernel without CONFIG_MULTI_CACHE enabled the -dma access functions end up not being exported. Fix it. - -Signed-off-by: Pantelis Antoniou ---- - arch/arm/kernel/setup.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index da1d1aa..dcb678c 100644 ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -923,3 +923,12 @@ const struct seq_operations cpuinfo_op = { - .stop = c_stop, - .show = c_show - }; -+ -+/* export the cache management functions */ -+#ifndef MULTI_CACHE -+ -+EXPORT_SYMBOL(__glue(_CACHE,_dma_map_area)); -+EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area)); -+EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range)); -+ -+#endif --- -1.7.10.4 - diff --git a/board/beaglebone/post-image.sh b/board/beaglebone/post-image.sh index ceeec68520..f0c2bc7ff4 100755 --- a/board/beaglebone/post-image.sh +++ b/board/beaglebone/post-image.sh @@ -1,6 +1,7 @@ #!/bin/sh -# post-image.sh for BeagleBone +# post-image.sh for CircuitCo BeagleBone and TI am335x-evm # 2014, Marcin Jabrzyk +# 2016, Lothar Felten BOARD_DIR="$(dirname $0)" diff --git a/board/beaglebone/readme.txt b/board/beaglebone/readme.txt index 664bde2afa..de7f954de2 100644 --- a/board/beaglebone/readme.txt +++ b/board/beaglebone/readme.txt @@ -1,44 +1,50 @@ -BeagleBone +CircuitCo BeagleBone +Texas Instuments AM335x Evaluation Module (TMDXEVM3358) -Intro -===== -To be able to use BeagleBone board with the images generated by -Buildroot, you have to prepare the SDCard. +Description +=========== + +This configuration will build a complete image for the beaglebone and +the TI AM335x-EVM, the board type is identified by the on-board +EEPROM. The configuration is based on the +ti-processor-sdk-02.00.00.00. Device tree blobs for beaglebone +variants and the evm-sk are built too. How to build it =============== - $ make beaglebone_defconfig - -Then you can edit the build options using - - $ make menuconfig +Select the default configuration for the target: +$ make beaglebone_defconfig -Compile all and build rootfs image: +Optional: modify the configuration: +$ make menuconfig - $ make +Build: +$ make Result of the build -------------------- - -After building, you should get a tree like this: - - output/images/ - ├── am335x-boneblack.dtb - ├── am335x-bone.dtb - ├── MLO - ├── rootfs.ext2 - ├── sdcard.img - ├── u-boot.img - ├── uEnv.txt - └── zImage - -How to write the microSD card -============================= - -Once the build process is finished you will have an image called "sdcard.img" -in the output/images/ directory. - -Copy the bootable "sdcard.img" onto an SD card with "dd": +=================== +output/images/ +├── am335x-boneblack.dtb +├── am335x-bone.dtb +├── am335x-evm.dtb +├── am335x-evmsk.dtb +├── boot.vfat +├── MLO +├── rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.img +├── uEnv.txt +└── zImage + +To copy the image file to the sdcard use dd: +$ dd if=output/images/sdcard.img of=/dev/XXX + +Tested hardware +=============== +am335x-evm (rev. 1.1A) +beagleboneblack (rev. A5A) +beaglebone (rev. A6) - $ sudo dd if=output/images/sdcard.img of=/dev/sdX +2016, Lothar Felten diff --git a/board/beaglebone/uEnv.txt b/board/beaglebone/uEnv.txt index e09fff513d..70b3b72146 100644 --- a/board/beaglebone/uEnv.txt +++ b/board/beaglebone/uEnv.txt @@ -1,3 +1,4 @@ bootpart=0:1 bootdir= -uenvcmd=run loadimage;run loadramdisk;run findfdt;run loadfdt;run ramboot +bootargs=console=ttyO0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait +uenvcmd=run loadimage;run loadfdt;printenv bootargs;bootz ${loadaddr} - ${fdtaddr}; diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 6c49abf8a9..072719bc4d 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -1,44 +1,28 @@ -# architecture BR2_arm=y BR2_cortex_a8=y -BR2_ARM_EABIHF=y - -# system -BR2_TARGET_GENERIC_HOSTNAME="beaglebone" +BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttyO0" -# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" - -# filesystem -BR2_PACKAGE_AM33X_CM3=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52c4aa7cdb93d61f8008f380135beaf7b8fa6593" +BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-evmsk" BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Linux headers same as kernel, a 3.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y - -# bootloader BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="am335x_evm" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" +# BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="MLO" - -# host packages BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y - -# kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7f280334068b7c875ade51f8f3921ab311f0c824" -BR2_LINUX_KERNEL_PATCH="board/beaglebone/patches/linux" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/beaglebone/linux-3.12.config" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-bone am335x-boneblack" From d53b26698648b2e590b4347b6515936c4c126880 Mon Sep 17 00:00:00 2001 From: Lothar Felten Date: Fri, 23 Sep 2016 00:20:49 +0200 Subject: [PATCH 0790/3392] configs/beaglebone_qt5: new defconfig Add a target configuration for the beaglebone that supports the SGX530 graphics acceleration and builds the qt5 demos with the eglfs backend. The imagination technologies demos and fbv are also included. The Linux kernel is based on the omap2plus defconfig, a config fragment adds the required settings for SGX accelerator support. Signed-off-by: Lothar Felten Signed-off-by: Thomas Petazzoni --- board/beaglebone/linux-4.1-sgx.fragment | 12 ++++++++ board/beaglebone/readme.txt | 2 ++ configs/beaglebone_qt5_defconfig | 41 +++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 board/beaglebone/linux-4.1-sgx.fragment create mode 100644 configs/beaglebone_qt5_defconfig diff --git a/board/beaglebone/linux-4.1-sgx.fragment b/board/beaglebone/linux-4.1-sgx.fragment new file mode 100644 index 0000000000..c0d2e7b28a --- /dev/null +++ b/board/beaglebone/linux-4.1-sgx.fragment @@ -0,0 +1,12 @@ +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +CONFIG_OMAP2_DSS_INIT=y +CONFIG_OMAP_DSS_BASE=y +CONFIG_OMAP2_DSS=y +CONFIG_OMAP2_DSS_DPI=y +CONFIG_DRM_OMAP=y +CONFIG_DRM_OMAP_NUM_CRTCS=2 +CONFIG_DRM_OMAP_WB_M2M=y +CONFIG_DRM_TILCDC=y +CONFIG_DRM_I2C_NXP_TDA998X=y +CONFIG_DRM=y diff --git a/board/beaglebone/readme.txt b/board/beaglebone/readme.txt index de7f954de2..e908b22235 100644 --- a/board/beaglebone/readme.txt +++ b/board/beaglebone/readme.txt @@ -10,6 +10,8 @@ EEPROM. The configuration is based on the ti-processor-sdk-02.00.00.00. Device tree blobs for beaglebone variants and the evm-sk are built too. +For Qt5 support support use the beaglebone_qt5_defconfig. + How to build it =============== diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig new file mode 100644 index 0000000000..31ee35a3fb --- /dev/null +++ b/configs/beaglebone_qt5_defconfig @@ -0,0 +1,41 @@ +BR2_arm=y +BR2_cortex_a8=y +BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyO0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52c4aa7cdb93d61f8008f380135beaf7b8fa6593" +BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-4.1-sgx.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-evmsk" +BR2_PACKAGE_FBV=y +BR2_PACKAGE_QT5=y +BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y +BR2_PACKAGE_QT5BASE_EXAMPLES=y +BR2_PACKAGE_QT5BASE_EGLFS=y +BR2_PACKAGE_QT5QUICKCONTROLS=y +BR2_PACKAGE_TI_SGX_DEMOS=y +BR2_PACKAGE_TI_SGX_KM=y +BR2_PACKAGE_TI_SGX_UM=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="MLO" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 75fc043ce0c2ebd96051683278cb792b84ab32d1 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Sat, 15 Oct 2016 16:35:35 +0100 Subject: [PATCH 0791/3392] sqlite: bump version to 3150000 (3.15.0) Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 4 ++-- package/sqlite/sqlite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 308522bf7c..b0418af0f7 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,4 +1,4 @@ # From http://www.sqlite.org/download.html -sha1 5d3a6bccd9154963641960db61df901a4e0b3ca0 sqlite-autoconf-3140200.tar.gz +sha1 b34cb4ee9710368598c62df0222f5c24dfc9c860 sqlite-autoconf-3150000.tar.gz # Calculated based on the hash above -sha256 644f0c127f7d0cbe8765b9bbdf9ed09d6a2f2b9dfba48ddfd8ca0a42fdb5b3fc sqlite-autoconf-3140200.tar.gz +sha256 77162da9b4a0336d7e77d5252b690662850f62b47c12d9125f74ab9de78ded27 sqlite-autoconf-3150000.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index a8a36bbfaf..0a5c1bb8f9 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3140200 +SQLITE_VERSION = 3150000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2016 SQLITE_LICENSE = Public domain From 0f8433ab04a13a052b4431f54cef98326d23bf71 Mon Sep 17 00:00:00 2001 From: Sebastien Van Cauwenberghe Date: Sun, 24 Jul 2016 17:36:58 +0200 Subject: [PATCH 0792/3392] configs: add defconfig for Digilent Zybo This configuration allows out-of-the box Digilent Zybo support. It uses mainline U-boot and Linux kernel. This configuration generates a SD card image named sdcard.img. [Peter: rename genimage.cfg, cleanup post-image script, enable VFP support, use 4.6 kernel headers and add tools needed by genimage] Signed-off-by: Sebastien Van Cauwenberghe Signed-off-by: Peter Korsgaard --- board/digilent/zybo/genimage.cfg | 29 ++++++++++++ board/digilent/zybo/post-image.sh | 18 ++++++++ board/digilent/zybo/readme.txt | 76 +++++++++++++++++++++++++++++++ board/digilent/zybo/system.bit | 0 board/digilent/zybo/uEnv.txt | 5 ++ configs/zynq_zybo_defconfig | 29 ++++++++++++ 6 files changed, 157 insertions(+) create mode 100644 board/digilent/zybo/genimage.cfg create mode 100755 board/digilent/zybo/post-image.sh create mode 100644 board/digilent/zybo/readme.txt create mode 100644 board/digilent/zybo/system.bit create mode 100644 board/digilent/zybo/uEnv.txt create mode 100644 configs/zynq_zybo_defconfig diff --git a/board/digilent/zybo/genimage.cfg b/board/digilent/zybo/genimage.cfg new file mode 100644 index 0000000000..f39186d07b --- /dev/null +++ b/board/digilent/zybo/genimage.cfg @@ -0,0 +1,29 @@ +image boot.vfat { + vfat { + files = { + "BOOT.BIN", + "uEnv.txt", + "system.bit", + "zynq-zybo.dtb", + "u-boot-dtb.img", + "uImage" + } + } + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/digilent/zybo/post-image.sh b/board/digilent/zybo/post-image.sh new file mode 100755 index 0000000000..619cb9019e --- /dev/null +++ b/board/digilent/zybo/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" +OUTPUT_DIR="${O}/images" + +rm -rf "${GENIMAGE_TMP}" + +cp board/digilent/zybo/uEnv.txt ${BINARIES_DIR} +cp board/digilent/zybo/system.bit ${BINARIES_DIR} + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/digilent/zybo/readme.txt b/board/digilent/zybo/readme.txt new file mode 100644 index 0000000000..2a60a7cc17 --- /dev/null +++ b/board/digilent/zybo/readme.txt @@ -0,0 +1,76 @@ +Digilent Zybo +============= + +This is the Buildroot board support for the Digilent Zybo. The Zybo is +a development board based on the Xilinx Zynq-7000 based All-Programmable +System-On-Chip. + +Zybo information including schematics, reference designs, and manuals are +available from http://store.digilentinc.com/zybo-zynq-7000-arm-fpga-soc-trainer-board/ . + +If you want a custom FPGA bitstream to be loaded by U-Boot, copy it as +system.bit in board/digilent/zybo/. + +Steps to create a working system for Zybo: + +1) make zynq_zybo_defconfig +2) make +3) write your SD Card with the sdcard.img file using dd by doing + $ sudo dd if=output/images/sdcard.img of=/dev/sdX +4) insert the SD Card and power up your Zybo +5) Expect serial console on the second USB serial port exposed by the board + +The expected output: + + U-Boot SPL 2016.05 (May 20 2016 - 16:16:24) + mmc boot + Trying to boot from MMC1 + reading system.dtb + spl_load_image_fat_os: error reading image system.dtb, err - -1 + reading u-boot-dtb.img + reading u-boot-dtb.img + + + U-Boot 2016.05 (May 20 2016 - 16:16:24 +0200) + + Model: Zynq ZYBO Development Board + Board: Xilinx Zynq + I2C: ready + DRAM: ECC disabled 512 MiB + MMC: sdhci@e0100000: 0 + SF: Detected S25FL128S_64K with page size 256 Bytes, erase size 64 KiB, total 16 MiB + In: serial@e0001000 + Out: serial@e0001000 + Err: serial@e0001000 + Model: Zynq ZYBO Development Board + Board: Xilinx Zynq + Net: ZYNQ GEM: e000b000, phyaddr 0, interface rgmii-id + I2C EEPROM MAC address read failed + + Warning: ethernet@e000b000 (eth0) using random MAC address - 56:64:dd:a7:6d:94 + eth0: ethernet@e000b000 + ... + +Resulting system +---------------- +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +The first partition is a FAT32 partition created at the beginning of the SD Card +that contains the following files : + /BOOT.BIN + /zynq-zybo.dtb + /uEnv.txt + /system.bit + /uImage + /u-boot-dtb.img + +The second partition is an ext4 partition that contains the root filesystem. + +You can alter the booting procedure by modifying the uEnv.txt file +in first partition of the SD card. It is a plain text file in format += one per line: + +kernel_image=myimage +modeboot=myboot +myboot=... diff --git a/board/digilent/zybo/system.bit b/board/digilent/zybo/system.bit new file mode 100644 index 0000000000..e69de29bb2 diff --git a/board/digilent/zybo/uEnv.txt b/board/digilent/zybo/uEnv.txt new file mode 100644 index 0000000000..1042538a5d --- /dev/null +++ b/board/digilent/zybo/uEnv.txt @@ -0,0 +1,5 @@ +bootargs=root=/dev/mmcblk0p2 rootwait rw rootfstype=ext4 +fpga_image=system.bit +fpgaboot=if fatload mmc 0 0x1000000 ${fpga_image}; then echo Booting FPGA from ${fpga_image}; fpga info 0 && fpga loadb 0 0x1000000 $filesize; else echo FPGA image ${fpga_image} was not found, skipping...; fi; +kernel_image=uImage +sdboot=echo Booting from SD...; run fpgaboot; fatload mmc 0 0x1000000 ${kernel_image} && fatload mmc 0 0x2000000 zynq-zybo.dtb && bootm 0x1000000 - 0x2000000 diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig new file mode 100644 index 0000000000..aef1ac208c --- /dev/null +++ b/configs/zynq_zybo_defconfig @@ -0,0 +1,29 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/digilent/zybo/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.4" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zybo" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zybo" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_ZYNQ_IMAGE=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From b5f8c99aac7c4efe8b6a651a977aa05719a57709 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 15 Oct 2016 18:41:16 +0200 Subject: [PATCH 0793/3392] configs/zynq_*_defconfig: enable VFP support The A9 cores inside the Xilinx Zynq have a VFP unit, so enable it. Signed-off-by: Peter Korsgaard --- configs/zynq_microzed_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zed_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 5efc0d4f85..ca6d010e23 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" BR2_LINUX_KERNEL=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 578f042b2b..6f7215cb2c 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -2,6 +2,7 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" BR2_LINUX_KERNEL=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 7ce3365e23..e5bf3de911 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" BR2_LINUX_KERNEL=y From 95bf21910899dd0bcd7df6ecdff13914f7aa99ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Oct 2016 18:10:51 +0200 Subject: [PATCH 0794/3392] package/kodi: needs .py modules Kodi segfaults as soon as it tries to load a python module: Could not find platform independent libraries Consider setting $PYTHONHOME to [:] ImportError: No module named site Segmentation fault Turns out that keeping .py modules (with or without .pyc) fixes the issue. Currently, Kodi selects python, but since the format of modules is a choice, we can not select it. Fix that by inverting the dependency on python from Kodi: - turn it into a depends rather than a select, - add the dependency to ! pyc-only - update the comment accordingly. In addition, the !MMU and !static dependencies are updated since they are no longer needed for Python (we now depend on it rather than selecting it), but for other packages. The !MMU dependency is moved to the _ARCH_SUPPORTS symbol as well. Also, we can no longer "select BR2_PACKAGE_SAMBA4", because samba4 selects python, and we can no longer select python. Therefore, we switch to a "depends on" dependency for samba4, which is fine as a user willing to use Kodi with Samba will certainly realize that Samba should be enabled. Fixes bug #9221. Signed-off-by: "Yann E. MORIN" [Thomas: - update on latest master - take care of the !MMU/!static dependencies. - take care of the samba4 problem.] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/kodi/Config.in | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index f388a724c1..4174c6b0c5 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -1,17 +1,19 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS bool + depends on BR2_USE_MMU # libcdio, and others default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) \ && BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \ && BR2_TOOLCHAIN_HAS_SYNC_8 -comment "kodi needs a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7, host gcc >= 4.6" +comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7, host gcc >= 4.6" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_HOST_GCC_AT_LEAST_4_6 \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ - || BR2_TOOLCHAIN_USES_MUSL - depends on BR2_USE_MMU + || BR2_TOOLCHAIN_USES_MUSL \ + || !BR2_PACKAGE_PYTHON \ + || BR2_PACKAGE_PYTHON_PYC_ONLY config BR2_PACKAGE_KODI_EGL_GLES bool @@ -42,10 +44,11 @@ menuconfig BR2_PACKAGE_KODI depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL - depends on BR2_USE_MMU # python depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS # python + depends on !BR2_STATIC_LIBS # libsquish, and others depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON + depends on !BR2_PACKAGE_PYTHON_PYC_ONLY select BR2_NEEDS_HOST_JAVA select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_THREAD @@ -83,7 +86,6 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP - select BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON_BSDDB select BR2_PACKAGE_PYTHON_BZIP2 select BR2_PACKAGE_PYTHON_CURSES @@ -200,16 +202,9 @@ config BR2_PACKAGE_KODI_LIBSHAIRPLAY Enable Shairport support. Select this if you want to stream content from an Apple device. -comment "samba support needs a glibc or uClibc toolchain w/ RPC" - depends on (!BR2_TOOLCHAIN_USES_GLIBC && \ - !BR2_TOOLCHAIN_USES_UCLIBC) || !BR2_TOOLCHAIN_HAS_NATIVE_RPC - config BR2_PACKAGE_KODI_LIBSMBCLIENT bool "samba" - depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_SAMBA4 + depends on BR2_PACKAGE_SAMBA4 help Enable Samba support From 51ec1dc27e7d0bd47226f124d4791e9f6cd3cbcf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 15 Oct 2016 22:15:13 +0200 Subject: [PATCH 0795/3392] configs/arm_juno: use official kernel tarball Since commit 0924208839336f1a1bb29eb1a627005ba6b9065d ("configs/arm_juno: use 4.6 mainline kernel"), we're using a mainline kernel for the ARM Juno board. But we're still fetching it from a Git repository, which is not really efficient, so let's switch to use a tarball instead. Signed-off-by: Thomas Petazzoni --- configs/arm_juno_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/arm_juno_defconfig b/configs/arm_juno_defconfig index 8bc3a7ae82..811524ffba 100644 --- a/configs/arm_juno_defconfig +++ b/configs/arm_juno_defconfig @@ -3,9 +3,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y BR2_TARGET_GENERIC_HOSTNAME="juno-buildroot" BR2_TARGET_GENERIC_ISSUE="Welcome to SNPS Juno by Buildroot" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/arm/juno/linux-juno-defconfig" BR2_LINUX_KERNEL_DTS_SUPPORT=y From ac0d9534604213893fb43dba19f20bb957bff1bf Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 15 Oct 2016 19:28:17 +0200 Subject: [PATCH 0796/3392] qt5: bump version to 5.6.2 - qt5base: remove obsolete '-no-nis' configure parameter ([1]) - qt5base: remove upstream committed patch 0007-Remove-libudev-dependency-from-kms.pro.patch ([2]) - qt5imageformats: remove upstream committed patch 0001-tvOS-support.patch ([3]) [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=644d0e75240811212ed9fd0c21e3bd05db3ba5db [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=72492735b7b7770808fcc9fe067e8f03fab827fc [3] https://git.buildroot.net/buildroot/commit/package/qt5?id=9a55b996651fdfbc40e202cb4dd725dce624ca91 Signed-off-by: Peter Seiderer Acked-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/qt5/qt5.mk | 2 +- package/qt5/qt53d/qt53d.hash | 4 +-- ...move-libudev-dependency-from-kms.pro.patch | 33 ----------------- package/qt5/qt5base/qt5base.hash | 4 +-- package/qt5/qt5base/qt5base.mk | 1 - package/qt5/qt5canvas3d/qt5canvas3d.hash | 4 +-- .../qt5/qt5connectivity/qt5connectivity.hash | 4 +-- .../qt5/qt5declarative/qt5declarative.hash | 4 +-- package/qt5/qt5enginio/qt5enginio.hash | 4 +-- package/qt5/qt5enginio/qt5enginio.mk | 2 +- .../qt5graphicaleffects.hash | 4 +-- .../qt5imageformats/0001-tvOS-support.patch | 35 ------------------- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +-- package/qt5/qt5location/qt5location.hash | 4 +-- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +-- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +-- .../qt5quickcontrols2/qt5quickcontrols2.hash | 4 +-- package/qt5/qt5script/qt5script.hash | 4 +-- package/qt5/qt5sensors/qt5sensors.hash | 4 +-- package/qt5/qt5serialbus/qt5serialbus.hash | 4 +-- package/qt5/qt5serialport/qt5serialport.hash | 4 +-- package/qt5/qt5svg/qt5svg.hash | 4 +-- package/qt5/qt5tools/qt5tools.hash | 4 +-- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +-- package/qt5/qt5webkit/qt5webkit.hash | 2 +- package/qt5/qt5webkit/qt5webkit.mk | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +-- package/qt5/qt5x11extras/qt5x11extras.hash | 4 +-- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +-- 29 files changed, 48 insertions(+), 117 deletions(-) delete mode 100644 package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch delete mode 100644 package/qt5/qt5imageformats/0001-tvOS-support.patch diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 04bad818b3..d25f663662 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -1,5 +1,5 @@ QT5_VERSION_MAJOR = 5.6 -QT5_VERSION = $(QT5_VERSION_MAJOR).1-1 +QT5_VERSION = $(QT5_VERSION_MAJOR).2 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index fbe782d2a9..7179380aa8 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qt3d-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 6e71b6925a39056c18920350ea94e5a6b45a54f27ea2e04905e4b2acb464b7db qt3d-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qt3d-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941 qt3d-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch b/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch deleted file mode 100644 index 7ecbcd0568..0000000000 --- a/package/qt5/qt5base/0007-Remove-libudev-dependency-from-kms.pro.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0f1b4bb65abe0e36e9e4b9813e45192223509de8 Mon Sep 17 00:00:00 2001 -From: Ralf Nolden -Date: Tue, 17 May 2016 12:57:17 +0200 -Subject: [PATCH] Remove libudev dependency from kms.pro - -To compile the kms qpa plugin, only libdrm is needed. -Remove the libudev dependency for the compile check to enable -building of the qpa plugin on platforms where libudev is not present -such as BSD systems (but where KMS works) - -Change-Id: Icd0be70a8949578a6158d523428706890a9674eb -Reviewed-by: Laszlo Agocs -Reviewed-by: Oswald Buddenhagen - -Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=72492735b7b7770808fcc9fe067e8f03fab827fc -Signed-off-by: Peter Seiderer ---- - config.tests/qpa/kms/kms.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro -index 1fb7367..5147bc8 100644 ---- a/config.tests/qpa/kms/kms.pro -+++ b/config.tests/qpa/kms/kms.pro -@@ -1,4 +1,4 @@ - SOURCES = kms.cpp - CONFIG += link_pkgconfig --PKGCONFIG += libdrm libudev -+PKGCONFIG += libdrm - CONFIG -= qt --- -2.8.1 - diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 2df165bbb2..9808e9b281 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtbase-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 329678347ec5ebb404225345300a8deb1e7c991322a4c50584be550c69be7c39 qtbase-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 qtbase-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bf541b0f8e..23dba2a181 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -21,7 +21,6 @@ QT5BASE_INSTALL_STAGING = YES QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ -no-cups \ - -no-nis \ -no-iconv \ -system-zlib \ -system-pcre \ diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash index 99d4ff6be5..01819e4194 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtcanvas3d-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 84d02cc051eeda6edb8a4da00d9a35869a447f7beb04d3c39cd375a3793f228c qtcanvas3d-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtcanvas3d-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad qtcanvas3d-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 3dab371f63..4574f3d532 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtconnectivity-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 f1d714b8f359df069b9e94e72719bcb9f5340212d9ce223453b7100c6ed7266b qtconnectivity-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtconnectivity-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 qtconnectivity-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 15c0c46dfb..d8d3a681c0 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtdeclarative-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 1cdf60b52509972ac001f5402a42d9b144b344010ec6e34f528f7dfc6be98f24 qtdeclarative-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtdeclarative-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da qtdeclarative-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5enginio/qt5enginio.hash b/package/qt5/qt5enginio/qt5enginio.hash index 2105aba28d..995183484c 100644 --- a/package/qt5/qt5enginio/qt5enginio.hash +++ b/package/qt5/qt5enginio/qt5enginio.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtenginio-opensource-src-1.6.1.tar.xz.mirrorlist -sha256 0e14d5dfcae3f0b44c52751b20a8fc5f9e2c0d53aa1025ffbabbfde43fcc1a9e qtenginio-opensource-src-1.6.1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtenginio-opensource-src-1.6.2.tar.xz.mirrorlist +sha256 90ffc38d214a75ab0ef90a4760843f12bc073ae49c17de24c677d1d403bddcc3 qtenginio-opensource-src-1.6.2.tar.xz diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk index 51cc5b4165..ada5fa7dfd 100644 --- a/package/qt5/qt5enginio/qt5enginio.mk +++ b/package/qt5/qt5enginio/qt5enginio.mk @@ -6,7 +6,7 @@ # Qt5Enginio does not follow Qt versionning # see https://bugreports.qt.io/browse/QTBUG-50111 -QT5ENGINIO_VERSION = 1.6.1 +QT5ENGINIO_VERSION = 1.6.2 QT5ENGINIO_SITE = $(QT5_SITE) QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz QT5ENGINIO_DEPENDENCIES = openssl qt5base diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 7e952b4a9b..ae29e3b726 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtgraphicaleffects-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 2b9cecf8eb3e12587788fa320119cf8d7b84775211cc1d78334d27e50040c014 qtgraphicaleffects-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtgraphicaleffects-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e qtgraphicaleffects-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5imageformats/0001-tvOS-support.patch b/package/qt5/qt5imageformats/0001-tvOS-support.patch deleted file mode 100644 index 3759c10451..0000000000 --- a/package/qt5/qt5imageformats/0001-tvOS-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a9e4b41a04b8d1a6d3d687964c146b87f60f9683 Mon Sep 17 00:00:00 2001 -From: Mike Krus -Date: Mon, 28 Dec 2015 21:02:35 +0000 -Subject: [PATCH] tvOS support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -QT_ARCH for tvOS is arm64 (not arm, since it’s 64bits only) - -Change-Id: Ia03d3ee07d2543a0e70ee7d77448aff9382d8fc8 -Reviewed-by: Jake Petroules - -Upstream: https://code.qt.io/cgit/qt/qtimageformats.git/patch/?id=e4c1d9ece74de212ebe5c55b134de7cb23469e2d -Signed-off-by: Peter Seiderer ---- - src/3rdparty/libwebp.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri -index b7c1bb6..2197953 100644 ---- a/src/3rdparty/libwebp.pri -+++ b/src/3rdparty/libwebp.pri -@@ -82,7 +82,7 @@ android { - INCLUDEPATH += $$NDK_ROOT/sources/android/cpufeatures - } - --equals(QT_ARCH, arm) { -+equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { - SOURCES_FOR_NEON += \ - $$PWD/libwebp/src/dsp/dec_neon.c \ - $$PWD/libwebp/src/dsp/enc_neon.c \ --- -2.8.1 - diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index e21fb17eb8..54b58e402b 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtimageformats-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 cc45e481394dcc4eb4e565969c9bb50b87b1da23f006bf849a5f8daa375328dd qtimageformats-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtimageformats-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4 qtimageformats-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 099519f71e..374952fc1a 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtlocation-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 c9cc21ba3dd3f13376a175b092256403589a52c7851603dbfe1e15d5d9bac457 qtlocation-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtlocation-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a qtlocation-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index e2e5a2d790..56a11fb855 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtmultimedia-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 4e28dcc696a9996b03a124b0f56fc86646bc2e9d29d383dc923b926040774e5d qtmultimedia-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtmultimedia-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf qtmultimedia-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index f99626328b..6db589d6d0 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtquickcontrols-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 011047af8bc2242fa9f7e7860818ca16a62a54e06b27a6b518919f4c08725f32 qtquickcontrols-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c qtquickcontrols-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 798a8ab256..0d85d48069 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtquickcontrols2-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 4c915939f659bb5f7dc381eb011809b6030c717269d9d260fca36f8d5917ca71 qtquickcontrols2-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols2-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1 qtquickcontrols2-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 4b61d1bcf1..c8ecb75eb0 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtscript-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 9d169f447395cef5209e1e33bf1020babc035740741145705298ba81488a36be qtscript-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e qtscript-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 344cc38bae..65cd12791b 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtsensors-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 99003fbe9304f1a135c454f28cc875f553a5f2c8c98153c516cfd8bf8ddb994d qtsensors-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsensors-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427 qtsensors-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index ff87c58041..308c365433 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtserialbus-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 05cb306d450a697cb8311db1e0edde76eaea0b20a681a74e28cbeda2c1792452 qtserialbus-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialbus-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826 qtserialbus-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 7903d4215e..2458e5d8e6 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtserialport-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 a2b488fcdf076f539b601ec2c49446352d67bfe1d9fb4a57330ccc0edf5bac8c qtserialport-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialport-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376 qtserialport-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index a9df0351dc..0c9e9eb751 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtsvg-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 5c870352ecd9d0c11bfca1725999a5073c3a03e5685ba12b73aab5a81edc12f0 qtsvg-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsvg-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e qtsvg-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index 2b43fbd1f6..cc11b2845f 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qttools-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 375a528bf7141eff38cdc00c322c6d4491c8f67203fd8ee6b9a7097504605141 qttools-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index bb9f0acf65..0f9eaae342 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtwebchannel-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 878ab614b30bbf04ef3775af68acd47de9765973650c1db403464e79efd07e82 qtwebchannel-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebchannel-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 qtwebchannel-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index 8122cabb6d..96b8bdd690 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -1,2 +1,2 @@ # locally computed -sha256 e4339ee069e2817fc5bf7c2c2d9fa680874da4ba56f34afdad2b4795803cbdf1 qt5webkit-b889f460280ad98c89ede179bd3b9ce9cb02002b.tar.gz +sha256 bdd659573e7e75cd4ad57b7160a7353d98d21a6fef06e4fb9e114a5b1f1e9dab qt5webkit-b35917bcb44d7f200af0f4ac68a126fa0aa8d93d.tar.gz diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index a47a235232..f300c11d43 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBKIT_VERSION = b889f460280ad98c89ede179bd3b9ce9cb02002b +QT5WEBKIT_VERSION = b35917bcb44d7f200af0f4ac68a126fa0aa8d93d # Using GitHub since it supports downloading tarballs from random commits. # The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so. QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION)) diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 05abfef830..3443476502 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtwebsockets-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 34620ca34ca580802509b2fb3e9eb843d5ad11416d6a211400ac7f700aeae0bb qtwebsockets-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebsockets-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35 qtwebsockets-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index bfec5139ad..297c578b87 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtx11extras-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 be6cc815e9b33a20f5cd374fe77443b13ea5f1cd625616d75b3c4fdcc4f3457a qtx11extras-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced qtx11extras-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 68c859a27f..fa4e97f757 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,2 +1,2 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtxmlpatterns-opensource-src-5.6.1-1.tar.xz.mirrorlist -sha256 e1dac17a8e6cb2b03da2d666ae2a99f31c2d9b73790c79ca2c85197766cec6a4 qtxmlpatterns-opensource-src-5.6.1-1.tar.xz +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtxmlpatterns-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc qtxmlpatterns-opensource-src-5.6.2.tar.xz From 46a373e2f59356f70a551507b7b8dc2943fe49ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Sat, 15 Oct 2016 18:51:55 +0200 Subject: [PATCH 0797/3392] configs/lego_ev3: bump kernel to 4.4 series MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump kernel revision used by lego_ev3_defconfig to the latest tag from ev3dev, as suggested by Peter. This is a 4.4 series kernel, which has the added benefit of not necessitating a specific gcc to boot. We need a patch to create an empty drivers/lego/Kconfig file for the build to succeed though, as the ev3dev kernel normally expects a drivers tree to be checked out there. Signed-off-by: Vincent Stehlé Suggested-by: Peter Korsgaard Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- ...01-Create-empty-drivers-lego-Kconfig.patch | 24 +++++++++++++++++++ board/lego/ev3/readme.txt | 10 +++----- configs/lego_ev3_defconfig | 14 +++++------ 3 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 board/lego/ev3/patches/linux/0001-Create-empty-drivers-lego-Kconfig.patch diff --git a/board/lego/ev3/patches/linux/0001-Create-empty-drivers-lego-Kconfig.patch b/board/lego/ev3/patches/linux/0001-Create-empty-drivers-lego-Kconfig.patch new file mode 100644 index 0000000000..614d53dd39 --- /dev/null +++ b/board/lego/ev3/patches/linux/0001-Create-empty-drivers-lego-Kconfig.patch @@ -0,0 +1,24 @@ +From 72c5727488f10160abfadcc77dd9763c4408b5e9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Sat, 15 Oct 2016 16:23:31 +0200 +Subject: [PATCH] Create empty drivers/lego/Kconfig +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Vincent Stehlé +--- + drivers/lego/Kconfig | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 drivers/lego/Kconfig + +diff --git a/drivers/lego/Kconfig b/drivers/lego/Kconfig +new file mode 100644 +index 0000000..d7cbf4f +--- /dev/null ++++ b/drivers/lego/Kconfig +@@ -0,0 +1 @@ ++# Empty Kconfig just to make source from drivers/Kconfig succeed. +-- +2.9.3 + diff --git a/board/lego/ev3/readme.txt b/board/lego/ev3/readme.txt index 3c0bd2ec46..7d9ec4fbf0 100644 --- a/board/lego/ev3/readme.txt +++ b/board/lego/ev3/readme.txt @@ -16,11 +16,8 @@ See: The buildroot configuration uses the Linux kernel of the ev3dev project. See: -- http://botbench.com/blog/2013/07/31/lego-mindstorms-ev3-source-code-available/ -- https://github.com/mindboards/ev3sources - -Note that the EV3 configuration uses gcc 4.7, as the boot is broken with gcc -4.8. +- https://github.com/ev3dev/ev3-kernel/ +- http://www.ev3dev.org/ How it works ============ @@ -61,13 +58,12 @@ After building, you should obtain this tree: ├── rootfs.ext3 -> rootfs.ext2 └── uImage - Prepare your SDcard =================== The following µSD card layout is recommended: -- First partition formated with a FAT filesystem, containing the uImage. +- First partition formatted with a FAT filesystem, containing the uImage. - Second partition formatted as ext2 or ext3, containing the root filesystem. Create the SDcard partition table diff --git a/configs/lego_ev3_defconfig b/configs/lego_ev3_defconfig index d49fa06020..1ddc4f97b6 100644 --- a/configs/lego_ev3_defconfig +++ b/configs/lego_ev3_defconfig @@ -2,23 +2,23 @@ BR2_arm=y BR2_arm926t=y -# toolchain -# Use gcc 4.7, as gcc 4.8 breaks the boot. -BR2_GCC_VERSION_4_7_X=y +# patches +BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches" # system BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" -# Linux headers same as kernel, a 3.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_3=y +# Linux headers same as kernel, a 4.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mindboards/ev3dev-kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v3.3.0-2-ev3dev_0" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ev3dev/ev3dev-kernel.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.4.19-15-ev3dev-ev3_1" BR2_LINUX_KERNEL_DEFCONFIG="ev3dev" +BR2_LINUX_KERNEL_UIMAGE=y # filesystem BR2_TARGET_ROOTFS_EXT2=y From b3532dec3739d1f21226bc2087fd8667d87a3916 Mon Sep 17 00:00:00 2001 From: James Knight Date: Thu, 29 Sep 2016 17:26:29 -0400 Subject: [PATCH 0798/3392] rapidxml: add patch to fix usage with gcc 4.7+ The official `rapidxml` package release only supports up to GCC 4.6.x for all capabilities. Implementers attempting to include the file "rapidxml_print.hpp" will all result in a compilation failure when using a currently supported Buildroot GCC version (all 4.7+ at this time). With the provided patch, dependent packages will be able to use all of rapidxml's capabilities using a generated toolchain from Buildroot (let alone external toolchains). Signed-off-by: James Knight [Thomas: rework patch so that it contains the proper line endings, and applies properly without a pre-patch hook to convert the line endings beforehand.] Signed-off-by: Thomas Petazzoni --- ...print-operations-are-declared-before.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch diff --git a/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch b/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch new file mode 100644 index 0000000000..fcf1b3cce6 --- /dev/null +++ b/package/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch @@ -0,0 +1,38 @@ +[PATCH] ensure internal print operations are declared before use + +Stock rapidxml-1.13 does not allow implementers of the +`rapidxml_print.hpp` header to build under GCC 4.7 (or newer) due to +compliation issues. This is a result of "Name lookup changes" introduced +in GCC 4.7 [1]. The following adds forward declarations required to +compile with GCC 4.7+. + +This issue has been mentioned upstream [2], but it has yet to be fixed +in official sources. + +[1]: https://gcc.gnu.org/gcc-4.7/porting_to.html +[2]: https://sourceforge.net/p/rapidxml/bugs/16/ + +Signed-off-by: James Knight + +Index: b/rapidxml_print.hpp +=================================================================== +--- a/rapidxml_print.hpp ++++ b/rapidxml_print.hpp +@@ -101,7 +101,16 @@ + + /////////////////////////////////////////////////////////////////////////// + // Internal printing operations +- ++ ++ template inline OutIt print_cdata_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_children(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_comment_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_data_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_declaration_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_doctype_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_element_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_pi_node(OutIt out, const xml_node *node, int flags, int indent); ++ + // Print node + template + inline OutIt print_node(OutIt out, const xml_node *node, int flags, int indent) From 59f2f1a9c756f062207ba8c3ca0ec7c7e036c56e Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:50:55 +0200 Subject: [PATCH 0799/3392] configs/freescale_p1010rdb_pa: remove U-Boot build Binutils was locked down to 2.24 because U-Boot 2014.01 didn't build with more recent binutils. However, this doesn't work anymore because binutils 2.24 is deprecated. Current U-Boot 2016.09.01 does build successfully, but we don't have a board anymore to test it. Since updating U-Boot is generally not needed anyway, we just remove the U-Boot support. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- board/freescale/p1010rdb/readme.txt | 45 +++---------------------- configs/freescale_p1010rdb_pa_defconfig | 8 ----- 2 files changed, 4 insertions(+), 49 deletions(-) diff --git a/board/freescale/p1010rdb/readme.txt b/board/freescale/p1010rdb/readme.txt index b119f9a478..025c97e8a8 100644 --- a/board/freescale/p1010rdb/readme.txt +++ b/board/freescale/p1010rdb/readme.txt @@ -1,28 +1,3 @@ - -******************** WARNING ******************** -The compiled U-Boot binary is intended for NOR flash only! -It won't work for NAND or SPI and will brick those bootloaders! - -Also don't go playing around with different U-boot versions or flash targets -unless you've got the necessary hardware and/or know-how to unbrick your kit. - -2014.01 is known good for NOR on the P1010RDB-PA kit. - -Freescale released a revised version of the kit with a faster processor and -some other hardware changes named P1010RDB-PB. U-Boot needs to be configured -differently for this kit hence this default config WILL NOT WORK. -This is ONLY related to U-Boot, otherwise the configuration is the same, -you can perfectly use the generated kernel and rootfs. - -IF you want to build an U-Boot for the new kit just change -BR2_TARGET_UBOOT_BOARDNAME from P1010RDB-PA_NOR to P1010RDB-PB_NOR. -!!!!! THIS IS COMPLETELY UNTESTED BY BR DEVS SO YOU ARE ON YOUR OWN !!!!! -If it works we'd like to know so drop an email to the mailing list. Thanks. - -If your kit doesn't mention PA nor PB in their shipping inventory then it's -the old version (PA). -******************** WARNING ******************** - You'll need to program the files created by buildroot into the flash. The fast way is to tftp transfer the files via one of the network interfaces. @@ -31,37 +6,25 @@ file transfer from your terminal program by using a "loady" command from the u-boot prompt instead of the "tftp ..." commands stated below. Beware that serial console file transfers are quite slow! -Remember to set the P1010RDB switches to NOR boot if you want to use -your newly built U-Boot. - -1. Program the new U-Boot binary to NOR flash (optional) - If you don't feel confident upgrading your bootloader then don't do it, - it's unnecessary most of the time. - - => tftp $loadaddr u-boot.bin - => protect off 0xeff80000 +$filesize - => erase 0xeff80000 +$filesize - => cp.b $loadaddr 0xeff80000 $filesize - -2. Program the DTB to NOR flash +1. Program the DTB to NOR flash => tftp $loadaddr p1010rdb-pa.dtb => erase 0xee000000 +$filesize => cp.b $loadaddr 0xee000000 $filesize -3. Program the kernel to NOR flash +2. Program the kernel to NOR flash => tftp $loadaddr uImage => erase 0xee080000 +$filesize => cp.b $loadaddr 0xee080000 $filesize -4. Program the root filesystem to NOR flash +3. Program the root filesystem to NOR flash => tftp $loadaddr rootfs.jffs2 => erase 0xee800000 0xeff5ffff => cp.b $loadaddr 0xee800000 $filesize -5. Booting your new system +4. Booting your new system => setenv norboot 'setenv bootargs root=/dev/mtdblock2 rootfstype=jffs2 console=$consoledev,$baudrate;bootm 0xee080000 - 0xee000000' diff --git a/configs/freescale_p1010rdb_pa_defconfig b/configs/freescale_p1010rdb_pa_defconfig index 7f482485ce..3497275c8a 100644 --- a/configs/freescale_p1010rdb_pa_defconfig +++ b/configs/freescale_p1010rdb_pa_defconfig @@ -25,11 +25,3 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb-pa" # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Bootloader -# Lock down binutils to <2.25 to avoid U-Boot build failure -BR2_BINUTILS_VERSION_2_24_X=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="P1010RDB-PA_NOR" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.01" From 12c01e4a05c8e4f4e0c4e8b74fac7824efdc8b41 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:50:56 +0200 Subject: [PATCH 0800/3392] configs/freescale_mpc8315erdb: remove U-Boot build Binutils was locked down to 2.24 because U-Boot 2014.01 didn't build with more recent binutils. However, this doesn't work anymore because binutils 2.24 is deprecated. Current U-Boot 2016.09.01 doesn't work out of the box because the u-boot-nand.img support has been removed. Since updating U-Boot is generally not needed anyway, we just remove the U-Boot support. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- board/freescale/mpc8315erdb/readme.txt | 30 ++++--------------------- configs/freescale_mpc8315erdb_defconfig | 9 -------- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/board/freescale/mpc8315erdb/readme.txt b/board/freescale/mpc8315erdb/readme.txt index 446bd397cb..b4c87b4d4a 100644 --- a/board/freescale/mpc8315erdb/readme.txt +++ b/board/freescale/mpc8315erdb/readme.txt @@ -1,14 +1,3 @@ - -******************** WARNING ******************** -The compiled U-Boot binary is intended for NAND flash only! -It won't work for NOR and will brick that bootloader! - -Also don't go playing around with different U-boot versions or flash targets -unless you've got the necessary hardware and/or know-how to unbrick your kit. - -2014.04 is known good for NAND. -******************** WARNING ******************** - You'll need to program the files created by buildroot into the flash. The fast way is to tftp transfer the files via one of the network interfaces. @@ -17,36 +6,25 @@ file transfer from your terminal program by using a "loady" command from the u-boot prompt instead of the "tftp ..." commands stated below. Beware that serial console file transfers are quite slow! -Remember to set the MPC8315ERDB switches to NAND boot if you want to use -your newly built U-Boot. - -1. Program the new U-Boot binary to NAND flash (optional) - If you don't feel confident upgrading your bootloader then don't do it, - it's unnecessary most of the time. - - => tftp $loadaddr u-boot-nand.bin - => nand erase 0 0x80000 - => nand write $loadaddr 0 0x80000 $filesize - -2. Program the kernel to NAND flash +1. Program the kernel to NAND flash => tftp $loadaddr uImage => nand erase 0x100000 0x1e0000 => nand write $loadaddr 0x100000 0x1e0000 -3. Program the DTB to NAND flash +2. Program the DTB to NAND flash => tftp $loadaddr mpc8315erdb.dtb => nand erase 0x2e0000 0x20000 => nand write $loadaddr 0x2e0000 0x20000 -4. Program the root filesystem to NAND flash +3. Program the root filesystem to NAND flash => tftp $loadaddr rootfs.jffs2 => nand erase 0x400000 0x1c00000 => nand write $loadaddr 0x400000 $filesize -5. Booting your new system +4. Booting your new system => setenv nandboot 'setenv bootargs root=/dev/mtdblock3 rootfstype=jffs2 console=$consoledev,$baudrate;nand read $fdtaddr 0x2e0000 0x20000;nand read $loadaddr 0x100000 0x1e0000;bootm $loadaddr - $fdtaddr' diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig index 628aaade1b..de7e561352 100644 --- a/configs/freescale_mpc8315erdb_defconfig +++ b/configs/freescale_mpc8315erdb_defconfig @@ -26,12 +26,3 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb" # Serial port config BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Bootloader -# Lock down binutils to <2.25 to avoid U-Boot build failure -BR2_BINUTILS_VERSION_2_24_X=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="MPC8315ERDB_NAND" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.04" -BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y From d8878112ad3df2a3d9468cf40a2401b581e7e432 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:50:57 +0200 Subject: [PATCH 0801/3392] binutils: remove deprecated 2.24.X We will remove BR2_DEPRECATED, so remove this deprecated option. [Peter: drop binutils patches] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 + ...01-fix-enable-install-libiberty-flag.patch | 46 - ...egv-on-initial-instructions-overflow.patch | 66 -- package/binutils/2.24/120-sh-conf.patch | 29 - .../2.24/300-001_ld_makefile_patch.patch | 24 - .../2.24/300-012_check_ldrunpath_length.patch | 21 - package/binutils/2.24/500-sysroot.patch | 37 - .../2.24/600-poison-system-directories.patch | 279 ------ .../2.24/900-xtensa-trampolines.patch | 846 ------------------ .../901-xtensa-gas-first-frag-alignment.patch | 51 -- ...xtensa-gas-ld-diff-relocation-signed.patch | 133 --- ...-segfault-when-linking-linux-modules.patch | 47 - ...et-out-of-range-xtensa-ld-relaxation.patch | 79 -- ...search-code-for-conditional-branches.patch | 90 -- ...ptimize-check_section_ebb_pcrels_fit.patch | 502 ----------- ...7-xtensa-optimize-removed_by_actions.patch | 356 -------- ...xtensa-optimize-find_removed_literal.patch | 146 --- ...-replace-action-list-with-splay-tree.patch | 826 ----------------- ...ensa-optimize-trampolines-relaxation.patch | 345 ------- ...ized-symbol-refcounting-with-gc-sect.patch | 57 -- ...-segfault-with-text-section-literals.patch | 56 -- .../913-xtensa-add-auto-litpools-option.patch | 698 --------------- ...sa-fix-signedness-of-gas-relocations.patch | 99 -- ...ensa-fix-.init-.fini-literals-moving.patch | 149 --- package/binutils/Config.in.host | 11 - 25 files changed, 8 insertions(+), 4993 deletions(-) delete mode 100644 package/binutils/2.24/001-fix-enable-install-libiberty-flag.patch delete mode 100644 package/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch delete mode 100644 package/binutils/2.24/120-sh-conf.patch delete mode 100644 package/binutils/2.24/300-001_ld_makefile_patch.patch delete mode 100644 package/binutils/2.24/300-012_check_ldrunpath_length.patch delete mode 100644 package/binutils/2.24/500-sysroot.patch delete mode 100644 package/binutils/2.24/600-poison-system-directories.patch delete mode 100644 package/binutils/2.24/900-xtensa-trampolines.patch delete mode 100644 package/binutils/2.24/901-xtensa-gas-first-frag-alignment.patch delete mode 100644 package/binutils/2.24/902-xtensa-gas-ld-diff-relocation-signed.patch delete mode 100644 package/binutils/2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch delete mode 100644 package/binutils/2.24/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch delete mode 100644 package/binutils/2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch delete mode 100644 package/binutils/2.24/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch delete mode 100644 package/binutils/2.24/907-xtensa-optimize-removed_by_actions.patch delete mode 100644 package/binutils/2.24/908-xtensa-optimize-find_removed_literal.patch delete mode 100644 package/binutils/2.24/909-xtensa-replace-action-list-with-splay-tree.patch delete mode 100644 package/binutils/2.24/910-xtensa-optimize-trampolines-relaxation.patch delete mode 100644 package/binutils/2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch delete mode 100644 package/binutils/2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch delete mode 100644 package/binutils/2.24/913-xtensa-add-auto-litpools-option.patch delete mode 100644 package/binutils/2.24/914-xtensa-fix-signedness-of-gas-relocations.patch delete mode 100644 package/binutils/2.24/915-xtensa-fix-.init-.fini-literals-moving.patch diff --git a/Config.in.legacy b/Config.in.legacy index 2fae812e01..45814caee8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_BINUTILS_VERSION_2_24_X + bool "binutils version 2.24 support removed" + select BR2_LEGACY + help + Support for binutils version 2.24 has been removed. The + current default version (2.26 or later) has been selected + instead. + config BR2_PACKAGE_WESTON_RPI bool "Weston propietary RPI support is gone" select BR2_LEGACY diff --git a/package/binutils/2.24/001-fix-enable-install-libiberty-flag.patch b/package/binutils/2.24/001-fix-enable-install-libiberty-flag.patch deleted file mode 100644 index e40840194d..0000000000 --- a/package/binutils/2.24/001-fix-enable-install-libiberty-flag.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 369be6981b26787b2685e3b8c6da779dae8ce35f Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 6 Jan 2014 18:15:31 +0000 -Subject: [PATCH] libiberty: fix --enable-install-libiberty flag [PR 56780] - -Commit 199570 fixed the --disable-install-libiberty behavior, but it also -added a bug where the enable path never works because the initial clear -of target_header_dir wasn't deleted. So we end up initializing properly -at the top only to reset it at the end all the time. - -[Arnout: adapt to match 2.24 tarball] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - libiberty/configure | 1 - - libiberty/configure.ac | 1 - - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/libiberty/configure b/libiberty/configure -index 8ea54da..7bde9b3 100755 ---- a/libiberty/configure -+++ b/libiberty/configure -@@ -5507,7 +5507,6 @@ fi - - setobjs= - CHECK= --target_header_dir= - if test -n "${with_target_subdir}"; then - - # We are being configured as a target library. AC_REPLACE_FUNCS -diff --git a/libiberty/configure.ac b/libiberty/configure.ac -index 4ad88a9..d6180bc 100644 ---- a/libiberty/configure.ac -+++ b/libiberty/configure.ac -@@ -405,7 +405,6 @@ fi - - setobjs= - CHECK= --target_header_dir= - if test -n "${with_target_subdir}"; then - - # We are being configured as a target library. AC_REPLACE_FUNCS --- -1.7.1 - diff --git a/package/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch b/package/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch deleted file mode 100644 index 7881646981..0000000000 --- a/package/binutils/2.24/002-dont-segv-on-initial-instructions-overflow.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Alan Modra -Date: Fri, 20 Dec 2013 13:27:52 +0000 (+1030) -Subject: Don't segv on cie.initial_instructions[] overflow. -X-Git-Tag: gdb-7.7-release~148 -X-Git-Url: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff_plain;h=99d190fac4d2aab238cfc798dc5c28ab41456882 - -Don't segv on cie.initial_instructions[] overflow. - -Don't attempt to merge CIEs with a larger number of insns than will -fit in the buffer. - - * elf-eh-frame.c (cie_eq): Return false when initial_insn_length - is too large. - (cie_compute_hash): Don't exceed bounds of initial_instructions. - (_bfd_elf_parse_eh_frame): Always set initial_insn_length, and - save as much of insns to initial_instructions[] as will fit. ---- - -diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c -index 832a991..4b6e8ea 100644 ---- a/bfd/elf-eh-frame.c -+++ b/bfd/elf-eh-frame.c -@@ -235,6 +235,7 @@ cie_eq (const void *e1, const void *e2) - && c1->lsda_encoding == c2->lsda_encoding - && c1->fde_encoding == c2->fde_encoding - && c1->initial_insn_length == c2->initial_insn_length -+ && c1->initial_insn_length <= sizeof (c1->initial_instructions) - && memcmp (c1->initial_instructions, - c2->initial_instructions, - c1->initial_insn_length) == 0) -@@ -254,6 +255,7 @@ static hashval_t - cie_compute_hash (struct cie *c) - { - hashval_t h = 0; -+ size_t len; - h = iterative_hash_object (c->length, h); - h = iterative_hash_object (c->version, h); - h = iterative_hash (c->augmentation, strlen (c->augmentation) + 1, h); -@@ -267,7 +269,10 @@ cie_compute_hash (struct cie *c) - h = iterative_hash_object (c->lsda_encoding, h); - h = iterative_hash_object (c->fde_encoding, h); - h = iterative_hash_object (c->initial_insn_length, h); -- h = iterative_hash (c->initial_instructions, c->initial_insn_length, h); -+ len = c->initial_insn_length; -+ if (len > sizeof (c->initial_instructions)) -+ len = sizeof (c->initial_instructions); -+ h = iterative_hash (c->initial_instructions, len, h); - c->hash = h; - return h; - } -@@ -762,11 +767,10 @@ _bfd_elf_parse_eh_frame (bfd *abfd, struct bfd_link_info *info, - cie->fde_encoding = DW_EH_PE_absptr; - - initial_insn_length = end - buf; -- if (initial_insn_length <= sizeof (cie->initial_instructions)) -- { -- cie->initial_insn_length = initial_insn_length; -- memcpy (cie->initial_instructions, buf, initial_insn_length); -- } -+ cie->initial_insn_length = initial_insn_length; -+ memcpy (cie->initial_instructions, buf, -+ initial_insn_length <= sizeof (cie->initial_instructions) -+ ? initial_insn_length : sizeof (cie->initial_instructions)); - insns = buf; - buf += initial_insn_length; - ENSURE_NO_RELOCS (buf); diff --git a/package/binutils/2.24/120-sh-conf.patch b/package/binutils/2.24/120-sh-conf.patch deleted file mode 100644 index ea3d1b6068..0000000000 --- a/package/binutils/2.24/120-sh-conf.patch +++ /dev/null @@ -1,29 +0,0 @@ -r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - ---- a/configure -+++ b/configure -@@ -1495,7 +1495,7 @@ - mips*-*-*) - noconfigdirs="$noconfigdirs gprof" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; ---- a/configure.ac -+++ b/configure.ac -@@ -712,7 +712,7 @@ - mips*-*-*) - noconfigdirs="$noconfigdirs gprof" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; diff --git a/package/binutils/2.24/300-001_ld_makefile_patch.patch b/package/binutils/2.24/300-001_ld_makefile_patch.patch deleted file mode 100644 index 5cb0f614d8..0000000000 --- a/package/binutils/2.24/300-001_ld_makefile_patch.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am ---- binutils-2.17.50.0.17.oorig/ld/Makefile.am 2007-06-18 19:29:29.000000000 +0200 -+++ binutils-2.17.50.0.17/ld/Makefile.am 2007-06-25 10:00:36.000000000 +0200 -@@ -18,7 +18,7 @@ - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in ---- binutils-2.17.50.0.17.oorig/ld/Makefile.in 2007-06-18 19:29:29.000000000 +0200 -+++ binutils-2.17.50.0.17/ld/Makefile.in 2007-06-25 10:00:36.000000000 +0200 -@@ -287,7 +287,7 @@ - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include diff --git a/package/binutils/2.24/300-012_check_ldrunpath_length.patch b/package/binutils/2.24/300-012_check_ldrunpath_length.patch deleted file mode 100644 index df783109bb..0000000000 --- a/package/binutils/2.24/300-012_check_ldrunpath_length.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em ---- binutils-2.21.orig/ld/emultempl/elf32.em 2010-10-29 09:10:36.000000000 -0300 -+++ binutils-2.21/ld/emultempl/elf32.em 2010-12-10 09:26:56.746102724 -0300 -@@ -1270,6 +1270,8 @@ - && command_line.rpath == NULL) - { - lib_path = (const char *) getenv ("LD_RUN_PATH"); -+ if ((lib_path) && (strlen (lib_path) == 0)) -+ lib_path = NULL; - if (gld${EMULATION_NAME}_search_needed (lib_path, &n, - force)) - break; -@@ -1497,6 +1499,8 @@ - rpath = command_line.rpath; - if (rpath == NULL) - rpath = (const char *) getenv ("LD_RUN_PATH"); -+ if ((rpath) && (strlen (rpath) == 0)) -+ rpath = NULL; - - for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) diff --git a/package/binutils/2.24/500-sysroot.patch b/package/binutils/2.24/500-sysroot.patch deleted file mode 100644 index e49c795332..0000000000 --- a/package/binutils/2.24/500-sysroot.patch +++ /dev/null @@ -1,37 +0,0 @@ -Signed-off-by: Sven Rebhan - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -308,18 +308,25 @@ - directory first. */ - if (! entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) diff --git a/package/binutils/2.24/600-poison-system-directories.patch b/package/binutils/2.24/600-poison-system-directories.patch deleted file mode 100644 index 6a3bf6be87..0000000000 --- a/package/binutils/2.24/600-poison-system-directories.patch +++ /dev/null @@ -1,279 +0,0 @@ -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -Signed-off-by: Thomas Petazzoni - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.in (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman - -Index: b/ld/config.in -=================================================================== ---- a/ld/config.in -+++ b/ld/config.in -@@ -11,6 +11,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -Index: b/ld/configure -=================================================================== ---- a/ld/configure -+++ b/ld/configure -@@ -774,6 +774,7 @@ - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_werror -@@ -1429,6 +1430,8 @@ - (and sometimes confusing) to the casual installer - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -4339,7 +4342,18 @@ - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -Index: b/ld/configure.in -=================================================================== ---- a/ld/configure.in -+++ b/ld/configure.in -@@ -87,6 +87,16 @@ - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -Index: b/ld/ldfile.c -=================================================================== ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ - new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -Index: b/ld/ld.h -=================================================================== ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -180,6 +180,14 @@ - /* If TRUE we'll just print the default output on stdout. */ - bfd_boolean print_output_format; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -Index: b/ld/ldmain.c -=================================================================== ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -266,6 +266,8 @@ - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -Index: b/ld/ld.texinfo -=================================================================== ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2175,6 +2175,18 @@ - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -Index: b/ld/lexsup.c -=================================================================== ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -507,6 +507,14 @@ - OPTION_IGNORE_UNRESOLVED_SYMBOL}, - '\0', N_("SYMBOL"), - N_("Unresolved SYMBOL will not cause an error or warning"), TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -519,6 +527,7 @@ - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1442,9 +1451,21 @@ - einfo (_("%P%X: --hash-size needs a numeric argument\n")); - } - break; -+ -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; - } - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); -Index: b/ld/ldlex.h -=================================================================== ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -138,6 +138,8 @@ - OPTION_DEFAULT_SCRIPT, - OPTION_PRINT_OUTPUT_FORMAT, - OPTION_IGNORE_UNRESOLVED_SYMBOL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ diff --git a/package/binutils/2.24/900-xtensa-trampolines.patch b/package/binutils/2.24/900-xtensa-trampolines.patch deleted file mode 100644 index b5b934fcab..0000000000 --- a/package/binutils/2.24/900-xtensa-trampolines.patch +++ /dev/null @@ -1,846 +0,0 @@ -From a82c7d9030b67a6a76a5403d0e1641f9e42141ac Mon Sep 17 00:00:00 2001 -From: David Weatherford -Date: Fri, 21 Mar 2014 11:53:42 +0000 -Subject: [PATCH] Add support to the Xtensa target for creating trampolines for - out-of-range branches. - - * tc-xtensa.c (xtensa_check_frag_count, xtensa_create_trampoline_frag) - (xtensa_maybe_create_trampoline_frag, init_trampoline_frag) - (find_trampoline_seg, search_trampolines, get_best_trampoline) - (check_and_update_trampolines, add_jump_to_trampoline) - (dump_trampolines): New function. - (md_parse_option): Add cases for --[no-]trampolines options. - (md_assemble, finish_vinsn, xtensa_end): Add call to - xtensa_check_frag_count. - (xg_assemble_vliw_tokens): Add call to - xtensa_maybe_create_trampoline_frag. - (xtensa_relax_frag): Relax fragments with RELAX_TRAMPOLINE state. - (relax_frag_immed): Relax jump instructions that cannot reach its - target. - * tc-xtensa.h (xtensa_relax_statesE::RELAX_TRAMPOLINE): New relax - state. - - * as.texinfo: Document --[no-]trampolines command-line options. - * c-xtensa.texi: Document trampolines relaxation and command line - options. - - * frags.c (get_frag_count, clear_frag_count): New function. - (frag_alloc): Increment totalfrags counter. - * frags.h (get_frag_count, clear_frag_count): New function. - - * all.exp: Add test for trampoline relaxation. - * trampoline.d: Trampoline relaxation expected dump. - * trampoline.s: Trampoline relaxation test source. ---- -Backported from: a82c7d9030b67a6a76a5403d0e1641f9e42141ac -Changes to Changelog files are dropped. - - gas/config/tc-xtensa.c | 558 +++++++++++++++++++++++++++++++++- - gas/config/tc-xtensa.h | 5 + - gas/frags.c | 15 + - gas/frags.h | 3 + - gas/testsuite/gas/xtensa/all.exp | 1 + - gas/testsuite/gas/xtensa/trampoline.d | 26 ++ - gas/testsuite/gas/xtensa/trampoline.s | 21 ++ - 11 files changed, 753 insertions(+), 2 deletions(-) - create mode 100644 gas/testsuite/gas/xtensa/trampoline.d - create mode 100644 gas/testsuite/gas/xtensa/trampoline.s - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index fe8ec0f..ea23c96 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -468,6 +468,12 @@ static void xtensa_set_frag_assembly_state (fragS *); - static void finish_vinsn (vliw_insn *); - static bfd_boolean emit_single_op (TInsn *); - static int total_frag_text_expansion (fragS *); -+static bfd_boolean use_trampolines = TRUE; -+static void xtensa_check_frag_count (void); -+static void xtensa_create_trampoline_frag (bfd_boolean); -+static void xtensa_maybe_create_trampoline_frag (void); -+struct trampoline_frag; -+static int init_trampoline_frag (struct trampoline_frag *); - - /* Alignment Functions. */ - -@@ -520,6 +526,7 @@ static void tinsn_from_chars (TInsn *, char *, int); - static void tinsn_immed_from_frag (TInsn *, fragS *, int); - static int get_num_stack_text_bytes (IStack *); - static int get_num_stack_literal_bytes (IStack *); -+static bfd_boolean tinsn_to_slotbuf (xtensa_format, int, TInsn *, xtensa_insnbuf); - - /* vliw_insn functions. */ - -@@ -687,7 +694,10 @@ enum - option_prefer_l32r, - option_prefer_const16, - -- option_target_hardware -+ option_target_hardware, -+ -+ option_trampolines, -+ option_no_trampolines, - }; - - const char *md_shortopts = ""; -@@ -760,6 +770,9 @@ struct option md_longopts[] = - - { "target-hardware", required_argument, NULL, option_target_hardware }, - -+ { "trampolines", no_argument, NULL, option_trampolines }, -+ { "no-trampolines", no_argument, NULL, option_no_trampolines }, -+ - { NULL, no_argument, NULL, 0 } - }; - -@@ -940,6 +953,14 @@ md_parse_option (int c, char *arg) - directive_state[directive_transform] = FALSE; - return 1; - -+ case option_trampolines: -+ use_trampolines = TRUE; -+ return 1; -+ -+ case option_no_trampolines: -+ use_trampolines = FALSE; -+ return 1; -+ - default: - return 0; - } -@@ -963,7 +984,9 @@ Xtensa options:\n\ - flix bundles\n\ - --no-allow-flix neither allow hand-written nor generate\n\ - flix bundles\n\ -- --rename-section old=new Rename section 'old' to 'new'\n", stream); -+ --rename-section old=new Rename section 'old' to 'new'\n\ -+ --[no-]trampolines [Do not] generate trampolines (jumps to jumps)\n\ -+ when jumps do not reach their targets\n", stream); - } - - -@@ -5568,6 +5591,8 @@ md_assemble (char *str) - - /* We've just emitted a new instruction so clear the list of labels. */ - xtensa_clear_insn_labels (); -+ -+ xtensa_check_frag_count (); - } - - -@@ -6372,6 +6397,8 @@ finish_vinsn (vliw_insn *vinsn) - xg_assemble_vliw_tokens (vinsn); - - xg_clear_vinsn (vinsn); -+ -+ xtensa_check_frag_count (); - } - - -@@ -7140,6 +7167,7 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn) - RELAX_UNREACHABLE, - frag_now->fr_symbol, frag_now->fr_offset, NULL); - xtensa_set_frag_assembly_state (frag_now); -+ xtensa_maybe_create_trampoline_frag (); - } - else if (is_branch && do_align_targets ()) - { -@@ -7222,9 +7250,164 @@ xtensa_end (void) - xtensa_sanity_check (); - - xtensa_add_config_info (); -+ -+ xtensa_check_frag_count (); -+} -+ -+ -+struct trampoline_frag -+{ -+ struct trampoline_frag *next; -+ bfd_boolean needs_jump_around; -+ fragS *fragP; -+ fixS *fixP; -+}; -+ -+struct trampoline_seg -+{ -+ struct trampoline_seg *next; -+ asection *seg; -+ struct trampoline_frag trampoline_list; -+}; -+ -+static struct trampoline_seg trampoline_seg_list; -+#define J_RANGE (128 * 1024) -+ -+static int unreachable_count = 0; -+ -+ -+static void -+xtensa_maybe_create_trampoline_frag (void) -+{ -+ if (!use_trampolines) -+ return; -+ -+ /* We create an area for possible trampolines every 10 unreachable frags. -+ These are preferred over the ones not preceded by an unreachable frag, -+ because we don't have to jump around them. This function is called after -+ each RELAX_UNREACHABLE frag is created. */ -+ -+ if (++unreachable_count > 10) -+ { -+ xtensa_create_trampoline_frag (FALSE); -+ clear_frag_count (); -+ unreachable_count = 0; -+ } -+} -+ -+static void -+xtensa_check_frag_count (void) -+{ -+ if (!use_trampolines || frag_now->tc_frag_data.is_no_transform) -+ return; -+ -+ /* We create an area for possible trampolines every 8000 frags or so. This -+ is an estimate based on the max range of a "j" insn (+/-128K) divided -+ by a typical frag byte count (16), minus a few for safety. This function -+ is called after each source line is processed. */ -+ -+ if (get_frag_count () > 8000) -+ { -+ xtensa_create_trampoline_frag (TRUE); -+ clear_frag_count (); -+ unreachable_count = 0; -+ } -+} -+ -+static xtensa_insnbuf trampoline_buf = NULL; -+static xtensa_insnbuf trampoline_slotbuf = NULL; -+ -+#define TRAMPOLINE_FRAG_SIZE 3000 -+ -+static void -+xtensa_create_trampoline_frag (bfd_boolean needs_jump_around) -+{ -+ /* Emit a frag where we can place intermediate jump instructions, -+ in case we need to jump farther than 128K bytes. -+ Each jump instruction takes three bytes. -+ We allocate enough for 1000 trampolines in each frag. -+ If that's not enough, oh well. */ -+ -+ struct trampoline_seg *ts = trampoline_seg_list.next; -+ struct trampoline_frag *tf; -+ char *varP; -+ fragS *fragP; -+ int size = TRAMPOLINE_FRAG_SIZE; -+ -+ for ( ; ts; ts = ts->next) -+ { -+ if (ts->seg == now_seg) -+ break; -+ } -+ -+ if (ts == NULL) -+ { -+ ts = (struct trampoline_seg *)xcalloc(sizeof (struct trampoline_seg), 1); -+ ts->next = trampoline_seg_list.next; -+ trampoline_seg_list.next = ts; -+ ts->seg = now_seg; -+ } -+ -+ frag_wane (frag_now); -+ frag_new (0); -+ xtensa_set_frag_assembly_state (frag_now); -+ varP = frag_var (rs_machine_dependent, size, size, RELAX_TRAMPOLINE, NULL, 0, NULL); -+ fragP = (fragS *)(varP - SIZEOF_STRUCT_FRAG); -+ if (trampoline_buf == NULL) -+ { -+ trampoline_buf = xtensa_insnbuf_alloc (xtensa_default_isa); -+ trampoline_slotbuf = xtensa_insnbuf_alloc (xtensa_default_isa); -+ } -+ tf = (struct trampoline_frag *)xmalloc(sizeof (struct trampoline_frag)); -+ tf->next = ts->trampoline_list.next; -+ ts->trampoline_list.next = tf; -+ tf->needs_jump_around = needs_jump_around; -+ tf->fragP = fragP; -+ tf->fixP = NULL; -+} -+ -+ -+static struct trampoline_seg * -+find_trampoline_seg (asection *seg) -+{ -+ struct trampoline_seg *ts = trampoline_seg_list.next; -+ -+ for ( ; ts; ts = ts->next) -+ { -+ if (ts->seg == seg) -+ return ts; -+ } -+ -+ return NULL; - } - - -+void dump_trampolines (void); -+ -+void -+dump_trampolines (void) -+{ -+ struct trampoline_seg *ts = trampoline_seg_list.next; -+ -+ for ( ; ts; ts = ts->next) -+ { -+ asection *seg = ts->seg; -+ -+ if (seg == NULL) -+ continue; -+ fprintf(stderr, "SECTION %s\n", seg->name); -+ struct trampoline_frag *tf = ts->trampoline_list.next; -+ for ( ; tf; tf = tf->next) -+ { -+ if (tf->fragP == NULL) -+ continue; -+ fprintf(stderr, " 0x%08x: fix=%d, jump_around=%s\n", -+ (int)tf->fragP->fr_address, (int)tf->fragP->fr_fix, -+ tf->needs_jump_around ? "T" : "F"); -+ } -+ } -+} -+ - static void - xtensa_cleanup_align_frags (void) - { -@@ -8708,6 +8891,149 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - new_stretch += relax_frag_for_align (fragP, stretch); - break; - -+ case RELAX_TRAMPOLINE: -+ if (fragP->tc_frag_data.relax_seen) -+ { -+ segment_info_type *seginfo = seg_info (now_seg); -+ fragS *fP; /* The out-of-range jump. */ -+ fixS *fixP; -+ -+ /* Scan for jumps that will not reach. */ -+ for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next) -+ { -+ symbolS *s = fixP->fx_addsy; -+ xtensa_opcode opcode; -+ int target; -+ int addr; -+ int delta; -+ -+ if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP || -+ fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP) -+ continue; -+ xtensa_insnbuf_from_chars (isa, trampoline_buf, -+ (unsigned char *) fixP->fx_frag->fr_literal + fixP->fx_where, -+ 0); -+ fmt = xtensa_format_decode (isa, trampoline_buf); -+ gas_assert (fmt != XTENSA_UNDEFINED); -+ slot = fixP->tc_fix_data.slot; -+ xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf); -+ opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf); -+ if (opcode != xtensa_j_opcode) -+ continue; -+ target = S_GET_VALUE (s); -+ addr = fixP->fx_frag->fr_address; -+ delta = target - addr + stretch; -+ if (delta > J_RANGE || delta < -1 * J_RANGE) -+ { /* Found an out-of-range jump; scan the list of trampolines for the best match. */ -+ struct trampoline_seg *ts = find_trampoline_seg (now_seg); -+ struct trampoline_frag *tf = ts->trampoline_list.next; -+ struct trampoline_frag *prev = &ts->trampoline_list; -+ int lower = (target < addr) ? target : addr; -+ int upper = (target > addr) ? target : addr; -+ int midpoint = lower + (upper - lower) / 2; -+ -+ if ((upper - lower) > 2 * J_RANGE) -+ { -+ /* One trampoline won't suffice; we need multiple jumps. -+ Jump to the trampoline that's farthest, but still in -+ range relative to the original "j" instruction. */ -+ for ( ; tf; prev = tf, tf = tf->next ) -+ { -+ int this_addr = tf->fragP->fr_address + tf->fragP->fr_fix; -+ int next_addr = (tf->next) ? tf->next->fragP->fr_address + tf->next->fragP->fr_fix : 0 ; -+ -+ if (addr == lower) -+ { -+ /* Forward jump. */ -+ if (this_addr - addr < J_RANGE) -+ break; -+ } -+ else -+ { -+ /* Backward jump. */ -+ if (next_addr == 0 || addr - next_addr > J_RANGE) -+ break; -+ } -+ } -+ } -+ else -+ { -+ struct trampoline_frag *best_tf = NULL; -+ int best_delta = 0; -+ -+ for ( ; tf; prev = tf, tf = tf->next ) -+ { -+ int this_addr = tf->fragP->fr_address + tf->fragP->fr_fix; -+ int this_delta = abs (this_addr - midpoint); -+ -+ if (!best_tf || this_delta < best_delta) -+ { -+ best_tf = tf; -+ best_delta = this_delta; -+ } -+ } -+ tf = best_tf; -+ } -+ if (tf->fragP == fragP) -+ { -+ int trampaddr = fragP->fr_address + fragP->fr_fix; -+ -+ if (abs (addr - trampaddr) < J_RANGE) -+ { /* The trampoline is in range of original; fix it! */ -+ fixS *newfixP; -+ int offset; -+ TInsn insn; -+ symbolS *lsym; -+ -+ new_stretch += init_trampoline_frag (tf); -+ offset = fragP->fr_fix; /* Where to assemble the j insn. */ -+ lsym = fragP->fr_symbol; -+ fP = fixP->fx_frag; -+ /* Assemble a jump to the target label here. */ -+ tinsn_init (&insn); -+ insn.insn_type = ITYPE_INSN; -+ insn.opcode = xtensa_j_opcode; -+ insn.ntok = 1; -+ set_expr_symbol_offset (&insn.tok[0], lsym, offset); -+ fmt = xg_get_single_format (xtensa_j_opcode); -+ tinsn_to_slotbuf (fmt, 0, &insn, trampoline_slotbuf); -+ xtensa_format_set_slot (isa, fmt, 0, trampoline_buf, trampoline_slotbuf); -+ xtensa_insnbuf_to_chars (isa, trampoline_buf, (unsigned char *)fragP->fr_literal + offset, 3); -+ fragP->fr_fix += 3; -+ fragP->fr_var -= 3; -+ /* Add a fix-up for the original j insn. */ -+ newfixP = fix_new (fP, fixP->fx_where, fixP->fx_size, lsym, fragP->fr_fix - 3, TRUE, fixP->fx_r_type); -+ newfixP->fx_no_overflow = 1; -+ newfixP->tc_fix_data.X_add_symbol = lsym; -+ newfixP->tc_fix_data.X_add_number = offset; -+ newfixP->tc_fix_data.slot = slot; -+ /* Move the fix-up from the original j insn to this one. */ -+ fixP->fx_frag = fragP; -+ fixP->fx_where = fragP->fr_fix - 3; -+ fixP->tc_fix_data.slot = 0; -+ /* Adjust the jump around this trampoline (if present). */ -+ if (tf->fixP != NULL) -+ { -+ tf->fixP->fx_offset += 3; -+ } -+ new_stretch += 3; -+ fragP->tc_frag_data.relax_seen = FALSE; /* Need another pass. */ -+ /* Do we have room for more? */ -+ if (fragP->fr_var < 3) -+ { /* No, convert to fill. */ -+ frag_wane (fragP); -+ fragP->fr_subtype = 0; -+ /* Remove from the trampoline_list. */ -+ prev->next = tf->next; -+ break; -+ } -+ } -+ } -+ } -+ } -+ } -+ break; -+ - default: - as_bad (_("bad relaxation state")); - } -@@ -9146,6 +9472,200 @@ bytes_to_stretch (fragS *this_frag, - } - - -+static struct trampoline_frag * -+search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only) -+{ -+ struct trampoline_seg *ts = find_trampoline_seg (now_seg); -+ struct trampoline_frag *tf = (ts) ? ts->trampoline_list.next : NULL; -+ struct trampoline_frag *best_tf = NULL; -+ int best_delta = 0; -+ int best_addr = 0; -+ symbolS *sym = tinsn->tok[0].X_add_symbol; -+ offsetT target = S_GET_VALUE (sym) + tinsn->tok[0].X_add_number; -+ offsetT addr = fragP->fr_address; -+ offsetT lower = (addr < target) ? addr : target; -+ offsetT upper = (addr > target) ? addr : target; -+ int delta = upper - lower; -+ offsetT midpoint = lower + delta / 2; -+ int this_delta = -1; -+ int this_addr = -1; -+ -+ if (delta > 2 * J_RANGE) -+ { -+ /* One trampoline won't do; we need multiple. -+ Choose the farthest trampoline that's still in range of the original -+ and let a later pass finish the job. */ -+ for ( ; tf; tf = tf->next) -+ { -+ int next_addr = (tf->next) ? tf->next->fragP->fr_address + tf->next->fragP->fr_fix : 0; -+ -+ this_addr = tf->fragP->fr_address + tf->fragP->fr_fix; -+ if (lower == addr) -+ { -+ /* Forward jump. */ -+ if (this_addr - addr < J_RANGE) -+ break; -+ } -+ else -+ { -+ /* Backward jump. */ -+ if (next_addr == 0 || addr - next_addr > J_RANGE) -+ break; -+ } -+ if (abs (addr - this_addr) < J_RANGE) -+ return tf; -+ -+ return NULL; -+ } -+ } -+ for ( ; tf; tf = tf->next) -+ { -+ this_addr = tf->fragP->fr_address + tf->fragP->fr_fix; -+ this_delta = abs (this_addr - midpoint); -+ if (unreachable_only && tf->needs_jump_around) -+ continue; -+ if (!best_tf || this_delta < best_delta) -+ { -+ best_tf = tf; -+ best_delta = this_delta; -+ best_addr = this_addr; -+ } -+ } -+ -+ if (best_tf && -+ best_delta < J_RANGE && -+ abs(best_addr - lower) < J_RANGE && -+ abs(best_addr - upper) < J_RANGE) -+ return best_tf; -+ -+ return NULL; /* No suitable trampoline found. */ -+} -+ -+ -+static struct trampoline_frag * -+get_best_trampoline (TInsn *tinsn, fragS *fragP) -+{ -+ struct trampoline_frag *tf = NULL; -+ -+ tf = search_trampolines (tinsn, fragP, TRUE); /* Try unreachable first. */ -+ -+ if (tf == NULL) -+ tf = search_trampolines (tinsn, fragP, FALSE); /* Try ones needing a jump-around, too. */ -+ -+ return tf; -+} -+ -+ -+static void -+check_and_update_trampolines (void) -+{ -+ struct trampoline_seg *ts = find_trampoline_seg (now_seg); -+ struct trampoline_frag *tf = ts->trampoline_list.next; -+ struct trampoline_frag *prev = &ts->trampoline_list; -+ -+ for ( ; tf; prev = tf, tf = tf->next) -+ { -+ if (tf->fragP->fr_var < 3) -+ { -+ frag_wane (tf->fragP); -+ prev->next = tf->next; -+ tf->fragP = NULL; -+ } -+ } -+} -+ -+ -+static int -+init_trampoline_frag (struct trampoline_frag *trampP) -+{ -+ fragS *fp = trampP->fragP; -+ int growth = 0; -+ -+ if (fp->fr_fix == 0) -+ { -+ symbolS *lsym; -+ char label[10 + 2 * sizeof(fp)]; -+ sprintf (label, ".L0_TR_%p", fp); -+ -+ lsym = (symbolS *)local_symbol_make (label, now_seg, 0, fp); -+ fp->fr_symbol = lsym; -+ if (trampP->needs_jump_around) -+ { -+ /* Add a jump around this block of jumps, in case -+ control flows into this block. */ -+ fixS *fixP; -+ TInsn insn; -+ xtensa_format fmt; -+ xtensa_isa isa = xtensa_default_isa; -+ -+ fp->tc_frag_data.is_insn = 1; -+ /* Assemble a jump insn. */ -+ tinsn_init (&insn); -+ insn.insn_type = ITYPE_INSN; -+ insn.opcode = xtensa_j_opcode; -+ insn.ntok = 1; -+ set_expr_symbol_offset (&insn.tok[0], lsym, 3); -+ fmt = xg_get_single_format (xtensa_j_opcode); -+ tinsn_to_slotbuf (fmt, 0, &insn, trampoline_slotbuf); -+ xtensa_format_set_slot (isa, fmt, 0, trampoline_buf, trampoline_slotbuf); -+ xtensa_insnbuf_to_chars (isa, trampoline_buf, (unsigned char *)fp->fr_literal, 3); -+ fp->fr_fix += 3; -+ fp->fr_var -= 3; -+ growth = 3; -+ fixP = fix_new (fp, 0, 3, lsym, 3, TRUE, BFD_RELOC_XTENSA_SLOT0_OP); -+ trampP->fixP = fixP; -+ } -+ } -+ return growth; -+} -+ -+ -+static int -+add_jump_to_trampoline (struct trampoline_frag *trampP, fragS *origfrag) -+{ -+ fragS *tramp = trampP->fragP; -+ fixS *fixP; -+ int offset = tramp->fr_fix; /* Where to assemble the j insn. */ -+ TInsn insn; -+ symbolS *lsym; -+ symbolS *tsym; -+ int toffset; -+ xtensa_format fmt; -+ xtensa_isa isa = xtensa_default_isa; -+ int growth = 0; -+ -+ lsym = tramp->fr_symbol; -+ /* Assemble a jump to the target label in the trampoline frag. */ -+ tsym = origfrag->tc_frag_data.slot_symbols[0]; -+ toffset = origfrag-> tc_frag_data.slot_offsets[0]; -+ tinsn_init (&insn); -+ insn.insn_type = ITYPE_INSN; -+ insn.opcode = xtensa_j_opcode; -+ insn.ntok = 1; -+ set_expr_symbol_offset (&insn.tok[0], tsym, toffset); -+ fmt = xg_get_single_format (xtensa_j_opcode); -+ tinsn_to_slotbuf (fmt, 0, &insn, trampoline_slotbuf); -+ xtensa_format_set_slot (isa, fmt, 0, trampoline_buf, trampoline_slotbuf); -+ xtensa_insnbuf_to_chars (isa, trampoline_buf, (unsigned char *)tramp->fr_literal + offset, 3); -+ tramp->fr_fix += 3; -+ tramp->fr_var -= 3; -+ growth = 3; -+ /* add a fix-up for the trampoline jump. */ -+ fixP = fix_new (tramp, tramp->fr_fix - 3, 3, tsym, toffset, TRUE, BFD_RELOC_XTENSA_SLOT0_OP); -+ /* Modify the jump at the start of this trampoline to point past the newly-added jump. */ -+ fixP = trampP->fixP; -+ if (fixP) -+ fixP->fx_offset += 3; -+ /* Modify the original j to point here. */ -+ origfrag->tc_frag_data.slot_symbols[0] = lsym; -+ origfrag->tc_frag_data.slot_offsets[0] = tramp->fr_fix - 3; -+ /* If trampoline is full, remove it from the list. */ -+ check_and_update_trampolines (); -+ -+ return growth; -+} -+ -+ - static long - relax_frag_immed (segT segP, - fragS *fragP, -@@ -9284,6 +9804,37 @@ relax_frag_immed (segT segP, - if (negatable_branch && istack.ninsn > 1) - update_next_frag_state (fragP); - -+ /* If last insn is a jump, and it cannot reach its target, try to find a trampoline. */ -+ if (istack.ninsn > 2 && -+ istack.insn[istack.ninsn - 1].insn_type == ITYPE_LABEL && -+ istack.insn[istack.ninsn - 2].insn_type == ITYPE_INSN && -+ istack.insn[istack.ninsn - 2].opcode == xtensa_j_opcode) -+ { -+ TInsn *jinsn = &istack.insn[istack.ninsn - 2]; -+ -+ if (!xg_symbolic_immeds_fit (jinsn, segP, fragP, fragP->fr_offset, total_text_diff)) -+ { -+ struct trampoline_frag *tf = get_best_trampoline (jinsn, fragP); -+ -+ if (tf) -+ { -+ this_text_diff += init_trampoline_frag (tf); -+ this_text_diff += add_jump_to_trampoline (tf, fragP); -+ } -+ else -+ { -+ /* If target symbol is undefined, assume it will reach once linked. */ -+ expressionS *exp = &istack.insn[istack.ninsn - 2].tok[0]; -+ -+ if (exp->X_op == O_symbol && S_IS_DEFINED (exp->X_add_symbol)) -+ { -+ as_bad_where (fragP->fr_file, fragP->fr_line, -+ _("jump target out of range; no usable trampoline found")); -+ } -+ } -+ } -+ } -+ - return this_text_diff; - } - -@@ -9404,6 +9955,9 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT sec, fragS *fragp) - else - as_bad (_("invalid relaxation fragment result")); - break; -+ -+ case RELAX_TRAMPOLINE: -+ break; - } - - fragp->fr_var = 0; -diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h -index 0bf1240..4672bc6 100644 ---- a/gas/config/tc-xtensa.h -+++ b/gas/config/tc-xtensa.h -@@ -180,6 +180,11 @@ enum xtensa_relax_statesE - prevent the linker from changing the size of any frag between the - section start and the org frag. */ - -+ RELAX_TRAMPOLINE, -+ /* Every few thousand frags, we insert one of these, just in case we may -+ need some space for a trampoline (jump to a jump) because the function -+ has gotten too big. If not needed, it disappears. */ -+ - RELAX_NONE - }; - -diff --git a/gas/frags.c b/gas/frags.c -index 5f68480..e14099d 100644 ---- a/gas/frags.c -+++ b/gas/frags.c -@@ -24,6 +24,20 @@ - - extern fragS zero_address_frag; - extern fragS predefined_address_frag; -+ -+static int totalfrags; -+ -+int -+get_frag_count (void) -+{ -+ return totalfrags; -+} -+ -+void -+clear_frag_count (void) -+{ -+ totalfrags = 0; -+} - - /* Initialization for frag routines. */ - -@@ -70,6 +84,7 @@ frag_alloc (struct obstack *ob) - ptr = (fragS *) obstack_alloc (ob, SIZEOF_STRUCT_FRAG); - obstack_alignment_mask (ob) = oalign; - memset (ptr, 0, SIZEOF_STRUCT_FRAG); -+ totalfrags++; - return ptr; - } - -diff --git a/gas/frags.h b/gas/frags.h -index 319898f..2f9e1b5 100644 ---- a/gas/frags.h -+++ b/gas/frags.h -@@ -155,4 +155,7 @@ char *frag_var (relax_stateT type, - - bfd_boolean frag_offset_fixed_p (const fragS *, const fragS *, offsetT *); - -+int get_frag_count (void); -+void clear_frag_count (void); -+ - #endif /* FRAGS_H */ -diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp -index 2b2c294..3683b78 100644 ---- a/gas/testsuite/gas/xtensa/all.exp -+++ b/gas/testsuite/gas/xtensa/all.exp -@@ -98,6 +98,7 @@ if [istarget xtensa*-*-*] then { - run_dump_test "pcrel" - run_dump_test "weak-call" - run_dump_test "jlong" -+ run_dump_test "trampoline" - } - - if [info exists errorInfo] then { -diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d -new file mode 100644 -index 0000000..b4f65dc ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/trampoline.d -@@ -0,0 +1,26 @@ -+#as: -+#objdump: -d -+#name: trampolines relaxation -+ -+.*: +file format .*xtensa.* -+#... -+.*0:.*j.0x1194c -+.*3:.*j.0x1194f -+.*6:.*j.0x11952 -+.*9:.*j.0x1d4e4 -+#... -+.*11949:.*j.0x11955 -+.*1194c:.*j.0x24a0e -+.*1194f:.*j.0x24a0e -+.*11952:.*j.0x24a11 -+#... -+.*1d4e1:.*j.0x1d4e7 -+.*1d4e4:.*j.0x33462 -+#... -+.*24a0e:.*j.0x24a0e -+.*24a11:.*j.0x24a11 -+#... -+.*3345f:.*ret -+.*33462:.*j.0x49407 -+#... -+.*49407:.*j.0x49407 -diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s -new file mode 100644 -index 0000000..259a3bb ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/trampoline.s -@@ -0,0 +1,21 @@ -+ .text -+ j 1f -+ j 1f -+ j 2f -+ j 3f -+ .rep 25000 -+99: -+ and a2, a2, a3 -+ bne a2, a3, 99b -+ .endr -+1: -+ j 1b -+2: -+ j 2b -+ -+ .rep 25000 -+ and a2, a2, a3 -+ _ret -+ .endr -+3: -+ j 3b --- -1.8.1.4 - diff --git a/package/binutils/2.24/901-xtensa-gas-first-frag-alignment.patch b/package/binutils/2.24/901-xtensa-gas-first-frag-alignment.patch deleted file mode 100644 index e1c2d85aa8..0000000000 --- a/package/binutils/2.24/901-xtensa-gas-first-frag-alignment.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a35d5e823fdfe8a6e7e05ca8e3fb8bb5697335b1 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 15 Apr 2014 19:12:46 +0400 -Subject: [PATCH] Fix alignment for the first section frag on xtensa - -Linking object files produced by partial linking with link-time -relaxation enabled sometimes fails with the following error message: - -dangerous relocation: call8: misaligned call target: (.text.unlikely+0x63) - -This happens because no basic block with an XTENSA_PROP_ALIGN flag in the -property table is generated for the first basic block, even if the -.align directive is present. -It was believed that the first frag alignment could be derived from the -section alignment, but this was not implemented for the partial linking -case: after partial linking first frag of a section may become not -first, but no additional alignment frag is inserted before it. -Basic block for such frag may be merged with previous basic block into -extended basic block during relaxation pass losing its alignment -restrictions. - -Fix this by always recording alignment for the first section frag. - -2014-04-22 Max Filippov - -gas/ - * config/tc-xtensa.c (xtensa_handle_align): record alignment for the - first section frag. - ---- -Backported from: a35d5e823fdfe8a6e7e05ca8e3fb8bb5697335b1 -Changes to Changelog files and tests are dropped. - - gas/config/tc-xtensa.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index ea23c96..58ace38 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -5609,7 +5609,6 @@ xtensa_handle_align (fragS *fragP) - && ! fragP->tc_frag_data.is_literal - && (fragP->fr_type == rs_align - || fragP->fr_type == rs_align_code) -- && fragP->fr_address + fragP->fr_fix > 0 - && fragP->fr_offset > 0 - && now_seg != bss_section) - { --- -1.8.1.4 - diff --git a/package/binutils/2.24/902-xtensa-gas-ld-diff-relocation-signed.patch b/package/binutils/2.24/902-xtensa-gas-ld-diff-relocation-signed.patch deleted file mode 100644 index ba24f4e4b0..0000000000 --- a/package/binutils/2.24/902-xtensa-gas-ld-diff-relocation-signed.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 6a17eba5358549d0d6d195bb22b34cdbc068def2 Mon Sep 17 00:00:00 2001 -From: Volodymyr Arbatov -Date: Mon, 6 May 2013 09:43:21 -0800 -Subject: [PATCH] Use signed data type for R_XTENSA_DIFF* relocation offsets. - -R_XTENSA_DIFF relocation offsets are in fact signed. Treat them as such. -Add testcase that examines ld behaviour on R_XTENSA_DIFF relocation -changing sign during relaxation. - -2014-05-02 Volodymyr Arbatov - David Weatherford - Max Filippov - -bfd/ - * elf32-xtensa.c (relax_section): treat R_XTENSA_DIFF* relocations as - signed. - -gas/ - * config/tc-xtensa.c (md_apply_fix): mark BFD_RELOC_XTENSA_DIFF* - fixups as signed. ---- -Backported from: 1058c7532d0b012ac329219264ddad59049fb6e6 -Changes to Changelog files and tests are dropped. - - bfd/elf32-xtensa.c | 32 ++++++++++++----------- - gas/config/tc-xtensa.c | 3 +++ - 2 files changed, 20 insertions(+), 15 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index edb04b4..8818d67 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -222,11 +222,11 @@ static reloc_howto_type elf_howto_table[] = - FALSE, 0, 0, FALSE), - - /* Relocations for supporting difference of symbols. */ -- HOWTO (R_XTENSA_DIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, -+ HOWTO (R_XTENSA_DIFF8, 0, 0, 8, FALSE, 0, complain_overflow_signed, - bfd_elf_xtensa_reloc, "R_XTENSA_DIFF8", FALSE, 0, 0xff, FALSE), -- HOWTO (R_XTENSA_DIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, -+ HOWTO (R_XTENSA_DIFF16, 0, 1, 16, FALSE, 0, complain_overflow_signed, - bfd_elf_xtensa_reloc, "R_XTENSA_DIFF16", FALSE, 0, 0xffff, FALSE), -- HOWTO (R_XTENSA_DIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, -+ HOWTO (R_XTENSA_DIFF32, 0, 2, 32, FALSE, 0, complain_overflow_signed, - bfd_elf_xtensa_reloc, "R_XTENSA_DIFF32", FALSE, 0, 0xffffffff, FALSE), - - /* General immediate operand relocations. */ -@@ -9013,7 +9013,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - || r_type == R_XTENSA_DIFF16 - || r_type == R_XTENSA_DIFF32) - { -- bfd_vma diff_value = 0, new_end_offset, diff_mask = 0; -+ bfd_signed_vma diff_value = 0; -+ bfd_vma new_end_offset, diff_mask = 0; - - if (bfd_get_section_limit (abfd, sec) < old_source_offset) - { -@@ -9027,15 +9028,15 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - { - case R_XTENSA_DIFF8: - diff_value = -- bfd_get_8 (abfd, &contents[old_source_offset]); -+ bfd_get_signed_8 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_DIFF16: - diff_value = -- bfd_get_16 (abfd, &contents[old_source_offset]); -+ bfd_get_signed_16 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_DIFF32: - diff_value = -- bfd_get_32 (abfd, &contents[old_source_offset]); -+ bfd_get_signed_32 (abfd, &contents[old_source_offset]); - break; - } - -@@ -9047,24 +9048,25 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - switch (r_type) - { - case R_XTENSA_DIFF8: -- diff_mask = 0xff; -- bfd_put_8 (abfd, diff_value, -+ diff_mask = 0x7f; -+ bfd_put_signed_8 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_DIFF16: -- diff_mask = 0xffff; -- bfd_put_16 (abfd, diff_value, -+ diff_mask = 0x7fff; -+ bfd_put_signed_16 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_DIFF32: -- diff_mask = 0xffffffff; -- bfd_put_32 (abfd, diff_value, -+ diff_mask = 0x7fffffff; -+ bfd_put_signed_32 (abfd, diff_value, - &contents[old_source_offset]); - break; - } - -- /* Check for overflow. */ -- if ((diff_value & ~diff_mask) != 0) -+ /* Check for overflow. Sign bits must be all zeroes or all ones */ -+ if ((diff_value & ~diff_mask) != 0 && -+ (diff_value & ~diff_mask) != (-1 & ~diff_mask)) - { - (*link_info->callbacks->reloc_dangerous) - (link_info, _("overflow after relaxation"), -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 58ace38..7547c0a0 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -5867,12 +5867,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg) - { - case BFD_RELOC_8: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8; -+ fixP->fx_signed = 1; - break; - case BFD_RELOC_16: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16; -+ fixP->fx_signed = 1; - break; - case BFD_RELOC_32: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32; -+ fixP->fx_signed = 1; - break; - default: - break; --- -1.8.1.4 - diff --git a/package/binutils/2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch b/package/binutils/2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch deleted file mode 100644 index 6a0846ef8e..0000000000 --- a/package/binutils/2.24/903-xtensa-fix-ld-segfault-when-linking-linux-modules.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e7d17e71cdc10a2e81e454ce3b9637f1b2a587f2 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 10 Jul 2014 01:47:33 +0400 -Subject: [PATCH] Fix xtensa ld segfault when linking linux modules - -is_inconsistent_linkonce_section makes an assumption that section name -that starts with ".gnu.linkonce.prop." has one more dot in its suffix. -However gas generates such section name by insertion of "prop." right -after ".gnu.linkonce." part of the name of the original section. So, for -section named ".gnu.linkonce.this_module" corresponding property section -name does not satisfy the assumption. Such section names are common in -linux modules. This bug was exposed by the patch "a35d5e8 Fix alignment -for the first section frag on xtensa", that makes gas produce property -section for each section that has ".align" directive in it. - -Use suffix that immediately follows ".gnu.linkonce.prop." when there are -no more dots following it. - -2014-07-10 Max Filippov - -ld/ - * emultempl/xtensaelf.em (is_inconsistent_linkonce_section): - correctly handle missing dot in section name after - ".gnu.linkonce.prop.". ---- -Backported from: e7d17e71cdc10a2e81e454ce3b9637f1b2a587f2 -Changes to ld/ChangeLog file are dropped. - - ld/emultempl/xtensaelf.em | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em -index 151eea4..948d18d 100644 ---- a/ld/emultempl/xtensaelf.em -+++ b/ld/emultempl/xtensaelf.em -@@ -1310,7 +1310,7 @@ is_inconsistent_linkonce_section (asection *sec) - for Tensilica's XCC compiler. */ - name = sec_name + linkonce_len; - if (CONST_STRNEQ (name, "prop.")) -- name = strchr (name + 5, '.') + 1; -+ name = strchr (name + 5, '.') ? strchr (name + 5, '.') + 1 : name + 5; - else if (name[1] == '.' - && (name[0] == 'p' || name[0] == 'e' || name[0] == 'h')) - name += 2; --- -1.8.1.4 - diff --git a/package/binutils/2.24/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch b/package/binutils/2.24/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch deleted file mode 100644 index e4c600e542..0000000000 --- a/package/binutils/2.24/904-Fix-call8-call-target-out-of-range-xtensa-ld-relaxation.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 7fc39194f8fb48914c995f8ec3826d50086f1ec0 Mon Sep 17 00:00:00 2001 -From: Sterling Augustine -Date: Tue, 25 Jan 2011 13:59:13 -0800 -Subject: [PATCH] Fix 'call8: call target out of range' xtensa ld relaxation - bug - -During link-time relaxation distance between cross-section call site and -its target may grow, producing 'call target out of range' error for -relaxed calls. Be more conservative when calculating whether or not a -callx can be converted to a straight call. - -2014-09-23 Sterling Augustine - -bfd/ - * elf32-xtensa.c (is_resolvable_asm_expansion): for cross-section - call relaxation use furthermost addresses where call source and - destination can be to check whether it's in the range of a direct - call. - -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 41 +++++++++++++++++++++++++++++++++++++---- - 1 file changed, 37 insertions(+), 4 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 09862e3..e32496a 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -7124,10 +7124,43 @@ is_resolvable_asm_expansion (bfd *abfd, - || is_reloc_sym_weak (abfd, irel))) - return FALSE; - -- self_address = (sec->output_section->vma -- + sec->output_offset + irel->r_offset + 3); -- dest_address = (target_sec->output_section->vma -- + target_sec->output_offset + target_offset); -+ if (target_sec->output_section != sec->output_section) -+ { -+ /* If the two sections are sufficiently far away that relaxation -+ might take the call out of range, we can't simplify. For -+ example, a positive displacement call into another memory -+ could get moved to a lower address due to literal removal, -+ but the destination won't move, and so the displacment might -+ get larger. -+ -+ If the displacement is negative, assume the destination could -+ move as far back as the start of the output section. The -+ self_address will be at least as far into the output section -+ as it is prior to relaxation. -+ -+ If the displacement is postive, assume the destination will be in -+ it's pre-relaxed location (because relaxation only makes sections -+ smaller). The self_address could go all the way to the beginning -+ of the output section. */ -+ -+ dest_address = target_sec->output_section->vma; -+ self_address = sec->output_section->vma; -+ -+ if (sec->output_section->vma > target_sec->output_section->vma) -+ self_address += sec->output_offset + irel->r_offset + 3; -+ else -+ dest_address += bfd_get_section_limit (abfd, target_sec->output_section); -+ /* Call targets should be four-byte aligned. */ -+ dest_address = (dest_address + 3) & ~3; -+ } -+ else -+ { -+ -+ self_address = (sec->output_section->vma -+ + sec->output_offset + irel->r_offset + 3); -+ dest_address = (target_sec->output_section->vma -+ + target_sec->output_offset + target_offset); -+ } - - *is_reachable_p = pcrel_reloc_fits (direct_call_opcode, 0, - self_address, dest_address); --- -1.8.1.4 - diff --git a/package/binutils/2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch b/package/binutils/2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch deleted file mode 100644 index 8aeb06428a..0000000000 --- a/package/binutils/2.24/905-Fix-trampolines-search-code-for-conditional-branches.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 415480d6471e67aef97c0241d451ef2423a1da9d Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 25 Nov 2014 21:33:21 +0300 -Subject: [PATCH] Fix trampolines search code for conditional branches - -For conditional branches that need more than one trampoline to reach its -target assembler couldn't always find suitable trampoline because -post-loop condition check was placed inside the loop, resulting in -premature loop termination. Move check outside the loop. - -This fixes the following build errors seen when assembling huge files -produced by gcc: - Error: jump target out of range; no usable trampoline found - Error: operand 1 of 'j' has out of range value '307307' - -2014-11-25 Max Filippov - -gas/ - * config/tc-xtensa.c (search_trampolines): Move post-loop - condition check outside the search loop. - -gas/testsuite/ - * gas/xtensa/trampoline.d: Add expected output for branches. - * gas/xtensa/trampoline.s: Add test case for branches. - -Signed-off-by: Max Filippov ---- -Backported from: d92b6eece424f0ad35d96fdd85bf207295e8c4c3 -Changes to ChangeLogs are dropped. - - gas/config/tc-xtensa.c | 8 ++++---- - gas/testsuite/gas/xtensa/trampoline.d | 9 +++++++++ - gas/testsuite/gas/xtensa/trampoline.s | 7 +++++++ - 3 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index d11b0c7..f23ccf8 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -9514,11 +9514,11 @@ search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only) - if (next_addr == 0 || addr - next_addr > J_RANGE) - break; - } -- if (abs (addr - this_addr) < J_RANGE) -- return tf; -- -- return NULL; - } -+ if (abs (addr - this_addr) < J_RANGE) -+ return tf; -+ -+ return NULL; - } - for ( ; tf; tf = tf->next) - { -diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d -index b4f65dc..5ae32a6 100644 ---- a/gas/testsuite/gas/xtensa/trampoline.d -+++ b/gas/testsuite/gas/xtensa/trampoline.d -@@ -24,3 +24,12 @@ - .*33462:.*j.0x49407 - #... - .*49407:.*j.0x49407 -+.*4940a:.*beqz.n.a2,.0x4940f -+.*4940c:.*j.0x693d1 -+#... -+.*693d1:.*j.0x7ddd4 -+#... -+.*7ddd4:.*j.0x927f5 -+#... -+.*927f5:.*j.0x927f5 -+#... -diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s -index 259a3bb..4465786 100644 ---- a/gas/testsuite/gas/xtensa/trampoline.s -+++ b/gas/testsuite/gas/xtensa/trampoline.s -@@ -19,3 +19,10 @@ - .endr - 3: - j 3b -+ bnez a2, 4f -+ .rep 50000 -+ and a2, a2, a3 -+ _ret -+ .endr -+4: -+ j 4b --- -1.8.1.4 - diff --git a/package/binutils/2.24/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch b/package/binutils/2.24/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch deleted file mode 100644 index 8a211004f3..0000000000 --- a/package/binutils/2.24/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch +++ /dev/null @@ -1,502 +0,0 @@ -From 20c79baf82273a0b368587f761f152c4d3a593a4 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 27 Mar 2015 07:13:55 +0300 -Subject: [PATCH 1/4] xtensa: optimize check_section_ebb_pcrels_fit - -The original check_section_ebb_pcrels_fit algorithm checks that text -actions proposed for current EBB are OK for every relocation in a -section. There's no need to check every relocation, because text actions -for EBB can only change size of that EBB, thus only affecting -relocations that in any way cross that EBB. In addition EBBs are -iterated in ascending order of their VMA, making it easier to track -relevant relocations. - -Introduce a structure that can track relocations that cross the range of -VMAs of EBB and use it to only check relocations relevant to current EBB -in check_section_ebb_pcrels_fit. -It takes O(N log N) operations to build it and O(N) operations to move -current EBB VMA window through its entire range, where N is the number -of relocations in a section. The resulting complexity of -compute_text_actions is thus reduced from O(N^2) to O(N log N + N * M), -where M is the average number of relocations crossing each EBB. - -Original profile: - -% time self children called name ------------------------------------------ - 44.26 71.53 6429/6429 compute_text_actions - 50.2 44.26 71.53 6429 check_section_ebb_pcrels_fit - 1.16 20.12 347506666/347576152 pcrel_reloc_fits - 2.95 16.52 347506666/348104944 get_relocation_opnd - 2.01 9.74 347575100/361252208 r_reloc_init - 0.55 7.53 347575100/363381467 r_reloc_get_section - 5.76 0.02 695013332/695013332 xlate_offset_with_removed_text - 0.68 3.89 347575100/363483827 bfd_octets_per_byte - 0.32 0.00 347506666/349910253 is_alt_relocation - 0.18 0.11 6391/6391 build_xlate_map - 0.00 0.00 6429/19417168 get_xtensa_relax_info - 0.00 0.00 6391/6391 free_xlate_map ------------------------------------------ - -Same data, after optimization: - -% time self children called name ------------------------------------------ - 2.56 3.08 6429/6429 compute_text_actions - 8.2 2.56 3.08 6429 check_section_ebb_pcrels_fit - 0.08 0.91 17721075/17790561 pcrel_reloc_fits - 0.17 0.47 17721075/31685977 r_reloc_init - 0.43 0.00 35442150/35442150 xlate_offset_with_removed_text - 0.02 0.37 17721075/33815236 r_reloc_get_section - 0.22 0.11 6391/6391 build_xlate_map - 0.05 0.22 17721075/33917596 bfd_octets_per_byte - 0.03 0.00 17721075/20405299 is_alt_relocation - 0.01 0.00 6429/6429 reloc_range_list_update_range - 0.00 0.00 6429/19417168 get_xtensa_relax_info - 0.00 0.00 6391/6391 free_xlate_map ------------------------------------------ - -2015-04-01 Max Filippov -bfd/ - * elf32-xtensa.c (reloc_range_list, reloc_range_list_entry, - reloc_range): new typedef. - (reloc_range_list_struct, reloc_range_list_entry_struct, - reloc_range_struct): new structures. - (reloc_range_compare, build_reloc_ranges, - reloc_range_list_append, reloc_range_list_remove, - reloc_range_list_update_range, free_reloc_range_list): new - functions. - (compute_text_actions): precompute relocation opcodes before the - loop. Add relevant_relocs variable, initialize it before the - loop, pass it to the check_section_ebb_pcrels_fit. - (check_section_ebb_pcrels_fit): add new parameter: - relevant_relocs. Update address range in the relevant_relocs if - it's non-NULL and iterate only over relevant relocations. - -Backported from: b2b326d246f839ee218192ac88da2384d929a072 -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 298 insertions(+), 23 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 0b6f584..872370b 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -6619,8 +6619,10 @@ static bfd_boolean compute_text_actions - (bfd *, asection *, struct bfd_link_info *); - static bfd_boolean compute_ebb_proposed_actions (ebb_constraint *); - static bfd_boolean compute_ebb_actions (ebb_constraint *); -+typedef struct reloc_range_list_struct reloc_range_list; - static bfd_boolean check_section_ebb_pcrels_fit -- (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, const ebb_constraint *, -+ (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, -+ reloc_range_list *, const ebb_constraint *, - const xtensa_opcode *); - static bfd_boolean check_section_ebb_reduces (const ebb_constraint *); - static void text_action_add_proposed -@@ -7219,6 +7221,221 @@ build_reloc_opcodes (bfd *abfd, - return reloc_opcodes; - } - -+struct reloc_range_struct -+{ -+ bfd_vma addr; -+ bfd_boolean add; /* TRUE if start of a range, FALSE otherwise. */ -+ /* Original irel index in the array of relocations for a section. */ -+ unsigned irel_index; -+}; -+typedef struct reloc_range_struct reloc_range; -+ -+typedef struct reloc_range_list_entry_struct reloc_range_list_entry; -+struct reloc_range_list_entry_struct -+{ -+ reloc_range_list_entry *next; -+ reloc_range_list_entry *prev; -+ Elf_Internal_Rela *irel; -+ xtensa_opcode opcode; -+ int opnum; -+}; -+ -+struct reloc_range_list_struct -+{ -+ /* The rest of the structure is only meaningful when ok is TRUE. */ -+ bfd_boolean ok; -+ -+ unsigned n_range; /* Number of range markers. */ -+ reloc_range *range; /* Sorted range markers. */ -+ -+ unsigned first; /* Index of a first range element in the list. */ -+ unsigned last; /* One past index of a last range element in the list. */ -+ -+ unsigned n_list; /* Number of list elements. */ -+ reloc_range_list_entry *reloc; /* */ -+ reloc_range_list_entry list_root; -+}; -+ -+static int -+reloc_range_compare (const void *a, const void *b) -+{ -+ const reloc_range *ra = a; -+ const reloc_range *rb = b; -+ -+ if (ra->addr != rb->addr) -+ return ra->addr < rb->addr ? -1 : 1; -+ if (ra->add != rb->add) -+ return ra->add ? -1 : 1; -+ return 0; -+} -+ -+static void -+build_reloc_ranges (bfd *abfd, asection *sec, -+ bfd_byte *contents, -+ Elf_Internal_Rela *internal_relocs, -+ xtensa_opcode *reloc_opcodes, -+ reloc_range_list *list) -+{ -+ unsigned i; -+ size_t n = 0; -+ size_t max_n = 0; -+ reloc_range *ranges = NULL; -+ reloc_range_list_entry *reloc = -+ bfd_malloc (sec->reloc_count * sizeof (*reloc)); -+ -+ memset (list, 0, sizeof (*list)); -+ list->ok = TRUE; -+ -+ for (i = 0; i < sec->reloc_count; i++) -+ { -+ Elf_Internal_Rela *irel = &internal_relocs[i]; -+ int r_type = ELF32_R_TYPE (irel->r_info); -+ reloc_howto_type *howto = &elf_howto_table[r_type]; -+ r_reloc r_rel; -+ -+ if (r_type == R_XTENSA_ASM_SIMPLIFY -+ || r_type == R_XTENSA_32_PCREL -+ || !howto->pc_relative) -+ continue; -+ -+ r_reloc_init (&r_rel, abfd, irel, contents, -+ bfd_get_section_limit (abfd, sec)); -+ -+ if (r_reloc_get_section (&r_rel) != sec) -+ continue; -+ -+ if (n + 2 > max_n) -+ { -+ max_n = (max_n + 2) * 2; -+ ranges = bfd_realloc (ranges, max_n * sizeof (*ranges)); -+ } -+ -+ ranges[n].addr = irel->r_offset; -+ ranges[n + 1].addr = r_rel.target_offset; -+ -+ ranges[n].add = ranges[n].addr < ranges[n + 1].addr; -+ ranges[n + 1].add = !ranges[n].add; -+ -+ ranges[n].irel_index = i; -+ ranges[n + 1].irel_index = i; -+ -+ n += 2; -+ -+ reloc[i].irel = irel; -+ -+ /* Every relocation won't possibly be checked in the optimized version of -+ check_section_ebb_pcrels_fit, so this needs to be done here. */ -+ if (is_alt_relocation (ELF32_R_TYPE (irel->r_info))) -+ { -+ /* None of the current alternate relocs are PC-relative, -+ and only PC-relative relocs matter here. */ -+ } -+ else -+ { -+ xtensa_opcode opcode; -+ int opnum; -+ -+ if (reloc_opcodes) -+ opcode = reloc_opcodes[i]; -+ else -+ opcode = get_relocation_opcode (abfd, sec, contents, irel); -+ -+ if (opcode == XTENSA_UNDEFINED) -+ { -+ list->ok = FALSE; -+ break; -+ } -+ -+ opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info)); -+ if (opnum == XTENSA_UNDEFINED) -+ { -+ list->ok = FALSE; -+ break; -+ } -+ -+ /* Record relocation opcode and opnum as we've calculated them -+ anyway and they won't change. */ -+ reloc[i].opcode = opcode; -+ reloc[i].opnum = opnum; -+ } -+ } -+ -+ if (list->ok) -+ { -+ ranges = bfd_realloc (ranges, n * sizeof (*ranges)); -+ qsort (ranges, n, sizeof (*ranges), reloc_range_compare); -+ -+ list->n_range = n; -+ list->range = ranges; -+ list->reloc = reloc; -+ list->list_root.prev = &list->list_root; -+ list->list_root.next = &list->list_root; -+ } -+ else -+ { -+ free (ranges); -+ free (reloc); -+ } -+} -+ -+static void reloc_range_list_append (reloc_range_list *list, -+ unsigned irel_index) -+{ -+ reloc_range_list_entry *entry = list->reloc + irel_index; -+ -+ entry->prev = list->list_root.prev; -+ entry->next = &list->list_root; -+ entry->prev->next = entry; -+ entry->next->prev = entry; -+ ++list->n_list; -+} -+ -+static void reloc_range_list_remove (reloc_range_list *list, -+ unsigned irel_index) -+{ -+ reloc_range_list_entry *entry = list->reloc + irel_index; -+ -+ entry->next->prev = entry->prev; -+ entry->prev->next = entry->next; -+ --list->n_list; -+} -+ -+/* Update relocation list object so that it lists all relocations that cross -+ [first; last] range. Range bounds should not decrease with successive -+ invocations. */ -+static void reloc_range_list_update_range (reloc_range_list *list, -+ bfd_vma first, bfd_vma last) -+{ -+ /* This should not happen: EBBs are iterated from lower addresses to higher. -+ But even if that happens there's no need to break: just flush current list -+ and start from scratch. */ -+ if ((list->last > 0 && list->range[list->last - 1].addr > last) || -+ (list->first > 0 && list->range[list->first - 1].addr >= first)) -+ { -+ list->first = 0; -+ list->last = 0; -+ list->n_list = 0; -+ list->list_root.next = &list->list_root; -+ list->list_root.prev = &list->list_root; -+ fprintf (stderr, "%s: move backwards requested\n", __func__); -+ } -+ -+ for (; list->last < list->n_range && -+ list->range[list->last].addr <= last; ++list->last) -+ if (list->range[list->last].add) -+ reloc_range_list_append (list, list->range[list->last].irel_index); -+ -+ for (; list->first < list->n_range && -+ list->range[list->first].addr < first; ++list->first) -+ if (!list->range[list->first].add) -+ reloc_range_list_remove (list, list->range[list->first].irel_index); -+} -+ -+static void free_reloc_range_list (reloc_range_list *list) -+{ -+ free (list->range); -+ free (list->reloc); -+} - - /* The compute_text_actions function will build a list of potential - transformation actions for code in the extended basic block of each -@@ -7245,6 +7462,7 @@ compute_text_actions (bfd *abfd, - property_table_entry *prop_table = 0; - int ptblsize = 0; - bfd_size_type sec_size; -+ reloc_range_list relevant_relocs; - - relax_info = get_xtensa_relax_info (sec); - BFD_ASSERT (relax_info); -@@ -7277,6 +7495,12 @@ compute_text_actions (bfd *abfd, - goto error_return; - } - -+ /* Precompute the opcode for each relocation. */ -+ reloc_opcodes = build_reloc_opcodes (abfd, sec, contents, internal_relocs); -+ -+ build_reloc_ranges (abfd, sec, contents, internal_relocs, reloc_opcodes, -+ &relevant_relocs); -+ - for (i = 0; i < sec->reloc_count; i++) - { - Elf_Internal_Rela *irel = &internal_relocs[i]; -@@ -7340,17 +7564,13 @@ compute_text_actions (bfd *abfd, - ebb->start_reloc_idx = i; - ebb->end_reloc_idx = i; - -- /* Precompute the opcode for each relocation. */ -- if (reloc_opcodes == NULL) -- reloc_opcodes = build_reloc_opcodes (abfd, sec, contents, -- internal_relocs); -- - if (!extend_ebb_bounds (ebb) - || !compute_ebb_proposed_actions (&ebb_table) - || !compute_ebb_actions (&ebb_table) - || !check_section_ebb_pcrels_fit (abfd, sec, contents, -- internal_relocs, &ebb_table, -- reloc_opcodes) -+ internal_relocs, -+ &relevant_relocs, -+ &ebb_table, reloc_opcodes) - || !check_section_ebb_reduces (&ebb_table)) - { - /* If anything goes wrong or we get unlucky and something does -@@ -7372,6 +7592,8 @@ compute_text_actions (bfd *abfd, - free_ebb_constraint (&ebb_table); - } - -+ free_reloc_range_list (&relevant_relocs); -+ - #if DEBUG - if (relax_info->action_list.head) - print_action_list (stderr, &relax_info->action_list); -@@ -7974,14 +8196,17 @@ check_section_ebb_pcrels_fit (bfd *abfd, - asection *sec, - bfd_byte *contents, - Elf_Internal_Rela *internal_relocs, -+ reloc_range_list *relevant_relocs, - const ebb_constraint *constraint, - const xtensa_opcode *reloc_opcodes) - { - unsigned i, j; -+ unsigned n = sec->reloc_count; - Elf_Internal_Rela *irel; - xlate_map_t *xmap = NULL; - bfd_boolean ok = TRUE; - xtensa_relax_info *relax_info; -+ reloc_range_list_entry *entry = NULL; - - relax_info = get_xtensa_relax_info (sec); - -@@ -7992,7 +8217,40 @@ check_section_ebb_pcrels_fit (bfd *abfd, - can still be used. */ - } - -- for (i = 0; i < sec->reloc_count; i++) -+ if (relevant_relocs && constraint->action_count) -+ { -+ if (!relevant_relocs->ok) -+ { -+ ok = FALSE; -+ n = 0; -+ } -+ else -+ { -+ bfd_vma min_offset, max_offset; -+ min_offset = max_offset = constraint->actions[0].offset; -+ -+ for (i = 1; i < constraint->action_count; ++i) -+ { -+ proposed_action *action = &constraint->actions[i]; -+ bfd_vma offset = action->offset; -+ -+ if (offset < min_offset) -+ min_offset = offset; -+ if (offset > max_offset) -+ max_offset = offset; -+ } -+ reloc_range_list_update_range (relevant_relocs, min_offset, -+ max_offset); -+ n = relevant_relocs->n_list; -+ entry = &relevant_relocs->list_root; -+ } -+ } -+ else -+ { -+ relevant_relocs = NULL; -+ } -+ -+ for (i = 0; i < n; i++) - { - r_reloc r_rel; - bfd_vma orig_self_offset, orig_target_offset; -@@ -8001,7 +8259,15 @@ check_section_ebb_pcrels_fit (bfd *abfd, - reloc_howto_type *howto; - int self_removed_bytes, target_removed_bytes; - -- irel = &internal_relocs[i]; -+ if (relevant_relocs) -+ { -+ entry = entry->next; -+ irel = entry->irel; -+ } -+ else -+ { -+ irel = internal_relocs + i; -+ } - r_type = ELF32_R_TYPE (irel->r_info); - - howto = &elf_howto_table[r_type]; -@@ -8067,21 +8333,30 @@ check_section_ebb_pcrels_fit (bfd *abfd, - xtensa_opcode opcode; - int opnum; - -- if (reloc_opcodes) -- opcode = reloc_opcodes[i]; -- else -- opcode = get_relocation_opcode (abfd, sec, contents, irel); -- if (opcode == XTENSA_UNDEFINED) -+ if (relevant_relocs) - { -- ok = FALSE; -- break; -+ opcode = entry->opcode; -+ opnum = entry->opnum; - } -- -- opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info)); -- if (opnum == XTENSA_UNDEFINED) -+ else - { -- ok = FALSE; -- break; -+ if (reloc_opcodes) -+ opcode = reloc_opcodes[relevant_relocs ? -+ (unsigned)(entry - relevant_relocs->reloc) : i]; -+ else -+ opcode = get_relocation_opcode (abfd, sec, contents, irel); -+ if (opcode == XTENSA_UNDEFINED) -+ { -+ ok = FALSE; -+ break; -+ } -+ -+ opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info)); -+ if (opnum == XTENSA_UNDEFINED) -+ { -+ ok = FALSE; -+ break; -+ } - } - - if (!pcrel_reloc_fits (opcode, opnum, self_offset, target_offset)) -@@ -8778,7 +9053,7 @@ move_shared_literal (asection *sec, - /* Check all of the PC-relative relocations to make sure they still fit. */ - relocs_fit = check_section_ebb_pcrels_fit (target_sec->owner, target_sec, - target_sec_cache->contents, -- target_sec_cache->relocs, -+ target_sec_cache->relocs, NULL, - &ebb_table, NULL); - - if (!relocs_fit) --- -1.8.1.4 - diff --git a/package/binutils/2.24/907-xtensa-optimize-removed_by_actions.patch b/package/binutils/2.24/907-xtensa-optimize-removed_by_actions.patch deleted file mode 100644 index 9df8065307..0000000000 --- a/package/binutils/2.24/907-xtensa-optimize-removed_by_actions.patch +++ /dev/null @@ -1,356 +0,0 @@ -From 3e3f60207399ab29dd55af109e5ae9facc7d8e83 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 28 Mar 2015 08:46:28 +0300 -Subject: [PATCH 2/4] xtensa: optimize removed_by_actions - -The function removed_by_actions iterates through text actions to -calculate an offset applied by text actions to a given VMA. Although it -has a parameter p_start_action that allows for incremental offset -calculation, in many places it's used with p_start_action explicitly set -to the first action. After the first relaxation pass when the list of -text actions is finalized, an array of offsets sorted by VMA may be used -to speed up this function. - -Original profile: - -% time self children called name ------------------------------------------ - 0.35 0.00 33872/4808961 relax_section_symbols - 3.32 0.00 326022/4808961 relax_property_section - 12.83 0.00 1259379/4808961 offset_with_removed_text - 32.50 0.00 3189688/4808961 translate_reloc - 71.5 49.00 0.00 4808961 removed_by_actions ------------------------------------------ - -Same data, after optimization: - -% time self children called name ------------------------------------------ - 0.00 0.00 33872/4808537 relax_section_symbols - 0.01 0.00 326022/4808537 relax_property_section - 0.05 0.00 1258955/4808537 offset_with_removed_text_map - 0.13 0.00 3189688/4808537 translate_reloc - 1.0 0.20 0.00 4808537 removed_by_actions_map - 0.00 0.00 120/120 map_removal_by_action ------------------------------------------ - -2015-04-01 Max Filippov -bfd/ - * elf32-xtensa.c (removal_by_action_entry_struct, - removal_by_action_map_struct): new structures. - (removal_by_action_entry, removal_by_action_map): new typedefs. - (text_action_list_struct): add new field: map. - (map_removal_by_action, removed_by_actions_map, - offset_with_removed_text_map): new functions. - (relax_section): replace offset_with_removed_text with - offset_with_removed_text_map. - (translate_reloc, relax_property_section, relax_section_symbols): - replace removed_by_actions with removed_by_actions_map. - -Backported from: 071aa5c98a31c966f5fbfc573fcee61350fd1936 -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 181 +++++++++++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 156 insertions(+), 25 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 872370b..21b2871 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -5420,11 +5420,28 @@ struct text_action_struct - text_action *next; - }; - -+struct removal_by_action_entry_struct -+{ -+ bfd_vma offset; -+ int removed; -+ int eq_removed; -+ int eq_removed_before_fill; -+}; -+typedef struct removal_by_action_entry_struct removal_by_action_entry; -+ -+struct removal_by_action_map_struct -+{ -+ unsigned n_entries; -+ removal_by_action_entry *entry; -+}; -+typedef struct removal_by_action_map_struct removal_by_action_map; -+ - - /* List of all of the actions taken on a text section. */ - struct text_action_list_struct - { - text_action *head; -+ removal_by_action_map map; - }; - - -@@ -5636,6 +5653,101 @@ action_list_count (text_action_list *action_list) - return count; - } - -+static void -+map_removal_by_action (text_action_list *action_list) -+{ -+ text_action *r; -+ int removed = 0; -+ removal_by_action_map map; -+ bfd_boolean eq_complete; -+ -+ map.n_entries = 0; -+ map.entry = bfd_malloc (action_list_count (action_list) * -+ sizeof (removal_by_action_entry)); -+ eq_complete = FALSE; -+ -+ for (r = action_list->head; r;) -+ { -+ removal_by_action_entry *ientry = map.entry + map.n_entries; -+ -+ if (map.n_entries && (ientry - 1)->offset == r->offset) -+ { -+ --ientry; -+ } -+ else -+ { -+ ++map.n_entries; -+ eq_complete = FALSE; -+ ientry->offset = r->offset; -+ ientry->eq_removed_before_fill = removed; -+ } -+ -+ if (!eq_complete) -+ { -+ if (r->action != ta_fill || r->removed_bytes >= 0) -+ { -+ ientry->eq_removed = removed; -+ eq_complete = TRUE; -+ } -+ else -+ ientry->eq_removed = removed + r->removed_bytes; -+ } -+ -+ removed += r->removed_bytes; -+ ientry->removed = removed; -+ r = r->next; -+ } -+ action_list->map = map; -+} -+ -+static int -+removed_by_actions_map (text_action_list *action_list, bfd_vma offset, -+ bfd_boolean before_fill) -+{ -+ unsigned a, b; -+ -+ if (!action_list->map.entry) -+ map_removal_by_action (action_list); -+ -+ if (!action_list->map.n_entries) -+ return 0; -+ -+ a = 0; -+ b = action_list->map.n_entries; -+ -+ while (b - a > 1) -+ { -+ unsigned c = (a + b) / 2; -+ -+ if (action_list->map.entry[c].offset <= offset) -+ a = c; -+ else -+ b = c; -+ } -+ -+ if (action_list->map.entry[a].offset < offset) -+ { -+ return action_list->map.entry[a].removed; -+ } -+ else if (action_list->map.entry[a].offset == offset) -+ { -+ return before_fill ? -+ action_list->map.entry[a].eq_removed_before_fill : -+ action_list->map.entry[a].eq_removed; -+ } -+ else -+ { -+ return 0; -+ } -+} -+ -+static bfd_vma -+offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset) -+{ -+ int removed = removed_by_actions_map (action_list, offset, FALSE); -+ return offset - removed; -+} -+ - - /* The find_insn_action routine will only find non-fill actions. */ - -@@ -5909,6 +6021,9 @@ init_xtensa_relax_info (asection *sec) - - relax_info->action_list.head = NULL; - -+ relax_info->action_list.map.n_entries = 0; -+ relax_info->action_list.map.entry = NULL; -+ - relax_info->fix_list = NULL; - relax_info->fix_array = NULL; - relax_info->fix_array_count = 0; -@@ -9218,7 +9333,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - if (elf_hash_table (link_info)->dynamic_sections_created) - shrink_dynamic_reloc_sections (link_info, abfd, sec, irel); - irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE); -- irel->r_offset = offset_with_removed_text -+ irel->r_offset = offset_with_removed_text_map - (&relax_info->action_list, irel->r_offset); - continue; - } -@@ -9255,7 +9370,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - } - } - -- source_offset = offset_with_removed_text -+ source_offset = offset_with_removed_text_map - (&relax_info->action_list, irel->r_offset); - irel->r_offset = source_offset; - } -@@ -9352,7 +9467,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - break; - } - -- new_end_offset = offset_with_removed_text -+ new_end_offset = offset_with_removed_text_map - (&target_relax_info->action_list, - r_rel.target_offset + diff_value); - diff_value = new_end_offset - new_reloc.target_offset; -@@ -9750,7 +9865,6 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec) - xtensa_relax_info *relax_info; - removed_literal *removed; - bfd_vma target_offset, base_offset; -- text_action *act; - - *new_rel = *orig_rel; - -@@ -9803,19 +9917,26 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec) - offset. */ - - base_offset = r_reloc_get_target_offset (new_rel) - new_rel->rela.r_addend; -- act = relax_info->action_list.head; - if (base_offset <= target_offset) - { -- int base_removed = removed_by_actions (&act, base_offset, FALSE); -- int addend_removed = removed_by_actions (&act, target_offset, FALSE); -+ int base_removed = removed_by_actions_map (&relax_info->action_list, -+ base_offset, FALSE); -+ int addend_removed = removed_by_actions_map (&relax_info->action_list, -+ target_offset, FALSE) - -+ base_removed; -+ - new_rel->target_offset = target_offset - base_removed - addend_removed; - new_rel->rela.r_addend -= addend_removed; - } - else - { - /* Handle a negative addend. The base offset comes first. */ -- int tgt_removed = removed_by_actions (&act, target_offset, FALSE); -- int addend_removed = removed_by_actions (&act, base_offset, FALSE); -+ int tgt_removed = removed_by_actions_map (&relax_info->action_list, -+ target_offset, FALSE); -+ int addend_removed = removed_by_actions_map (&relax_info->action_list, -+ base_offset, FALSE) - -+ tgt_removed; -+ - new_rel->target_offset = target_offset - tgt_removed; - new_rel->rela.r_addend += addend_removed; - } -@@ -10138,9 +10259,10 @@ relax_property_section (bfd *abfd, - bfd_vma old_offset = val.r_rel.target_offset; - bfd_vma new_offset; - long old_size, new_size; -- text_action *act = target_relax_info->action_list.head; -- new_offset = old_offset - -- removed_by_actions (&act, old_offset, FALSE); -+ int removed_by_old_offset = -+ removed_by_actions_map (&target_relax_info->action_list, -+ old_offset, FALSE); -+ new_offset = old_offset - removed_by_old_offset; - - /* Assert that we are not out of bounds. */ - old_size = bfd_get_32 (abfd, size_p); -@@ -10164,9 +10286,10 @@ relax_property_section (bfd *abfd, - - /* Recompute the new_offset, but this time don't - include any fill inserted by relaxation. */ -- act = target_relax_info->action_list.head; -- new_offset = old_offset - -- removed_by_actions (&act, old_offset, TRUE); -+ removed_by_old_offset = -+ removed_by_actions_map (&target_relax_info->action_list, -+ old_offset, TRUE); -+ new_offset = old_offset - removed_by_old_offset; - - /* If it is not unreachable and we have not yet - seen an unreachable at this address, place it -@@ -10182,8 +10305,12 @@ relax_property_section (bfd *abfd, - } - } - else -- new_size -= -- removed_by_actions (&act, old_offset + old_size, TRUE); -+ { -+ int removed_by_old_offset_size = -+ removed_by_actions_map (&target_relax_info->action_list, -+ old_offset + old_size, TRUE); -+ new_size -= removed_by_old_offset_size - removed_by_old_offset; -+ } - - if (new_size != old_size) - { -@@ -10441,14 +10568,16 @@ relax_section_symbols (bfd *abfd, asection *sec) - - if (isym->st_shndx == sec_shndx) - { -- text_action *act = relax_info->action_list.head; - bfd_vma orig_addr = isym->st_value; -+ int removed = removed_by_actions_map (&relax_info->action_list, -+ orig_addr, FALSE); - -- isym->st_value -= removed_by_actions (&act, orig_addr, FALSE); -- -+ isym->st_value -= removed; - if (ELF32_ST_TYPE (isym->st_info) == STT_FUNC) - isym->st_size -= -- removed_by_actions (&act, orig_addr + isym->st_size, FALSE); -+ removed_by_actions_map (&relax_info->action_list, -+ orig_addr + isym->st_size, FALSE) - -+ removed; - } - } - -@@ -10466,15 +10595,17 @@ relax_section_symbols (bfd *abfd, asection *sec) - || sym_hash->root.type == bfd_link_hash_defweak) - && sym_hash->root.u.def.section == sec) - { -- text_action *act = relax_info->action_list.head; - bfd_vma orig_addr = sym_hash->root.u.def.value; -+ int removed = removed_by_actions_map (&relax_info->action_list, -+ orig_addr, FALSE); - -- sym_hash->root.u.def.value -= -- removed_by_actions (&act, orig_addr, FALSE); -+ sym_hash->root.u.def.value -= removed; - - if (sym_hash->type == STT_FUNC) - sym_hash->size -= -- removed_by_actions (&act, orig_addr + sym_hash->size, FALSE); -+ removed_by_actions_map (&relax_info->action_list, -+ orig_addr + sym_hash->size, FALSE) - -+ removed; - } - } - --- -1.8.1.4 - diff --git a/package/binutils/2.24/908-xtensa-optimize-find_removed_literal.patch b/package/binutils/2.24/908-xtensa-optimize-find_removed_literal.patch deleted file mode 100644 index 96d526fe30..0000000000 --- a/package/binutils/2.24/908-xtensa-optimize-find_removed_literal.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 288c2b709e5e6841484e1a129eaccd299db36877 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 4 Apr 2015 14:49:42 +0300 -Subject: [PATCH 3/4] xtensa: optimize find_removed_literal - -find_removed_literal uses linear search to find removed literal by its -VMA. The list of literals is fixed at that point, build an ordered index -array and use binary search instead. - -Original profile: - -% time self children called name ------------------------------------------ - 56.72 0.00 297578/669392 translate_reloc - 70.86 0.00 371814/669392 relax_section - 67.9 127.58 0.00 669392 find_removed_literal ------------------------------------------ - -Same data, after optimization: - -% time self children called name ------------------------------------------ - 0.00 0.00 297578/669392 translate_reloc - 0.00 0.00 371814/669392 relax_section - 0.0 0.00 0.00 669392 find_removed_literal - 0.00 0.00 23838/23838 map_removed_literal ------------------------------------------ - -2015-04-03 Max Filippov -bfd/ - * elf32-xtensa.c (removed_literal_map_entry): new typedef. - (removed_literal_map_entry_struct): new structure. - (removed_literal_list_struct): add new fields: n_map and map. - (map_removed_literal, removed_literal_compare): new functions. - (find_removed_literal): build index array for literals ordered - by VMA, use binary search to find removed literal. - -Backported from: 3439c466273378021821473d3fc84990e089ae34 -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 58 insertions(+), 6 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 21b2871..51733ad 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -5832,6 +5832,7 @@ print_action_list (FILE *fp, text_action_list *action_list) - by the "from" offset field. */ - - typedef struct removed_literal_struct removed_literal; -+typedef struct removed_literal_map_entry_struct removed_literal_map_entry; - typedef struct removed_literal_list_struct removed_literal_list; - - struct removed_literal_struct -@@ -5841,10 +5842,19 @@ struct removed_literal_struct - removed_literal *next; - }; - -+struct removed_literal_map_entry_struct -+{ -+ bfd_vma addr; -+ removed_literal *literal; -+}; -+ - struct removed_literal_list_struct - { - removed_literal *head; - removed_literal *tail; -+ -+ unsigned n_map; -+ removed_literal_map_entry *map; - }; - - -@@ -5893,6 +5903,39 @@ add_removed_literal (removed_literal_list *removed_list, - } - } - -+static void -+map_removed_literal (removed_literal_list *removed_list) -+{ -+ unsigned n_map = 0; -+ unsigned i; -+ removed_literal_map_entry *map = NULL; -+ removed_literal *r = removed_list->head; -+ -+ for (i = 0; r; ++i, r = r->next) -+ { -+ if (i == n_map) -+ { -+ n_map = (n_map * 2) + 2; -+ map = bfd_realloc (map, n_map * sizeof (*map)); -+ } -+ map[i].addr = r->from.target_offset; -+ map[i].literal = r; -+ } -+ removed_list->map = map; -+ removed_list->n_map = i; -+} -+ -+static int -+removed_literal_compare (const void *a, const void *b) -+{ -+ const removed_literal_map_entry *pa = a; -+ const removed_literal_map_entry *pb = b; -+ -+ if (pa->addr == pb->addr) -+ return 0; -+ else -+ return pa->addr < pb->addr ? -1 : 1; -+} - - /* Check if the list of removed literals contains an entry for the - given address. Return the entry if found. */ -@@ -5900,12 +5943,21 @@ add_removed_literal (removed_literal_list *removed_list, - static removed_literal * - find_removed_literal (removed_literal_list *removed_list, bfd_vma addr) - { -- removed_literal *r = removed_list->head; -- while (r && r->from.target_offset < addr) -- r = r->next; -- if (r && r->from.target_offset == addr) -- return r; -- return NULL; -+ removed_literal_map_entry *p; -+ removed_literal *r = NULL; -+ -+ if (removed_list->map == NULL) -+ map_removed_literal (removed_list); -+ -+ p = bsearch (&addr, removed_list->map, removed_list->n_map, -+ sizeof (*removed_list->map), removed_literal_compare); -+ if (p) -+ { -+ while (p != removed_list->map && (p - 1)->addr == addr) -+ --p; -+ r = p->literal; -+ } -+ return r; - } - - --- -1.8.1.4 - diff --git a/package/binutils/2.24/909-xtensa-replace-action-list-with-splay-tree.patch b/package/binutils/2.24/909-xtensa-replace-action-list-with-splay-tree.patch deleted file mode 100644 index 3090cc21e5..0000000000 --- a/package/binutils/2.24/909-xtensa-replace-action-list-with-splay-tree.patch +++ /dev/null @@ -1,826 +0,0 @@ -From e5409aedd3ee2192855018a564650ffb75c26e60 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 5 Apr 2015 17:04:22 +0300 -Subject: [PATCH 4/4] xtensa: replace action list with splay tree - -text_action_add uses linear list search to order text actions list by -action VMA. The list is used at the first relaxation pass, when it's not -fixed yet. -Replace the list with splay tree from libiberty. - -Original profile: - -% time self children called name ------------------------------------------ - 0.00 0.00 14/158225 compute_text_actions - 3.62 0.00 25211/158225 remove_dead_literal - 8.42 0.00 58645/158225 coalesce_shared_literal - 10.68 0.00 74355/158225 text_action_add_proposed - 38.8 22.73 0.00 158225 text_action_add - 0.00 0.00 144527/293246 bfd_zmalloc ------------------------------------------ - -Same data, after optimization: - -% time self children called name ------------------------------------------ - 0.00 0.00 14/158225 compute_text_actions - 0.00 0.00 25211/158225 remove_dead_literal - 0.00 0.01 58645/158225 coalesce_shared_literal - 0.00 0.01 74355/158225 text_action_add_proposed - 0.1 0.00 0.02 158225 text_action_add - 0.01 0.00 144527/144527 splay_tree_insert - 0.00 0.00 144527/195130 splay_tree_lookup - 0.00 0.00 144527/293246 bfd_zmalloc ------------------------------------------ - -2015-04-03 Max Filippov -bfd/ - * elf32-xtensa.c (splay-tree.h): include header. - (text_action_struct): drop next pointer. - (text_action_list_struct): drop head pointer, add count and - tree fields. - (find_fill_action): instead of linear search in text_action_list - search in the tree. - (text_action_compare, action_first, action_next): new functions. - (text_action_add, text_action_add_literal): instead of linear - search and insertion insert new node into the tree. - (removed_by_actions): pass additional parameter: action_list, - use it to traverse the tree. - (offset_with_removed_text): pass additional action_list parameter - to removed_by_actions. - (map_action_fn_context): new typedef. - (map_action_fn_context_struct): new structure. - (map_action_fn): new function. - (map_removal_by_action): use splay_tree_foreach to build map. - (find_insn_action): replace linear search in text_action_list - with series of splay_tree_lookups. - (print_action, print_action_list_fn): new functions. - (print_action_list): use splay_tree_foreach. - (init_xtensa_relax_info): drop action_list.head initialization. - Initialize the tree. - (compute_text_actions): use non-zero action_list_count instead of - non-NULL action list. - (xlate_map_context): new typedef. - (xlate_map_context_struct): new structure. - (xlate_map_fn): new function. - (build_xlate_map): use splay_tree_foreach to build map. - (action_remove_bytes_fn): new function. - (relax_section): use zero action_list_count instead of NULL - action list. Use splay_tree_foreach to count final section size. - Drop unused variable 'removed'. - -Backported from: 4c2af04fe8b4452bf51d2debf1bb467fafcd0f08 -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 488 +++++++++++++++++++++++++++++++---------------------- - 1 file changed, 282 insertions(+), 206 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 51733ad..53af1c6 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -28,6 +28,7 @@ - #include "libbfd.h" - #include "elf-bfd.h" - #include "elf/xtensa.h" -+#include "splay-tree.h" - #include "xtensa-isa.h" - #include "xtensa-config.h" - -@@ -5416,8 +5417,6 @@ struct text_action_struct - bfd_vma virtual_offset; /* Zero except for adding literals. */ - int removed_bytes; - literal_value value; /* Only valid when adding literals. */ -- -- text_action *next; - }; - - struct removal_by_action_entry_struct -@@ -5440,7 +5439,8 @@ typedef struct removal_by_action_map_struct removal_by_action_map; - /* List of all of the actions taken on a text section. */ - struct text_action_list_struct - { -- text_action *head; -+ unsigned count; -+ splay_tree tree; - removal_by_action_map map; - }; - -@@ -5448,20 +5448,18 @@ struct text_action_list_struct - static text_action * - find_fill_action (text_action_list *l, asection *sec, bfd_vma offset) - { -- text_action **m_p; -+ text_action a; - - /* It is not necessary to fill at the end of a section. */ - if (sec->size == offset) - return NULL; - -- for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next) -- { -- text_action *t = *m_p; -- /* When the action is another fill at the same address, -- just increase the size. */ -- if (t->offset == offset && t->action == ta_fill) -- return t; -- } -+ a.offset = offset; -+ a.action = ta_fill; -+ -+ splay_tree_node node = splay_tree_lookup (l->tree, (splay_tree_key)&a); -+ if (node) -+ return (text_action *)node->value; - return NULL; - } - -@@ -5509,6 +5507,49 @@ adjust_fill_action (text_action *ta, int fill_diff) - } - - -+static int -+text_action_compare (splay_tree_key a, splay_tree_key b) -+{ -+ text_action *pa = (text_action *)a; -+ text_action *pb = (text_action *)b; -+ static const int action_priority[] = -+ { -+ [ta_fill] = 0, -+ [ta_none] = 1, -+ [ta_convert_longcall] = 2, -+ [ta_narrow_insn] = 3, -+ [ta_remove_insn] = 4, -+ [ta_remove_longcall] = 5, -+ [ta_remove_literal] = 6, -+ [ta_widen_insn] = 7, -+ [ta_add_literal] = 8, -+ }; -+ -+ if (pa->offset == pb->offset) -+ { -+ if (pa->action == pb->action) -+ return 0; -+ return action_priority[pa->action] - action_priority[pb->action]; -+ } -+ else -+ return pa->offset < pb->offset ? -1 : 1; -+} -+ -+static text_action * -+action_first (text_action_list *action_list) -+{ -+ splay_tree_node node = splay_tree_min (action_list->tree); -+ return node ? (text_action *)node->value : NULL; -+} -+ -+static text_action * -+action_next (text_action_list *action_list, text_action *action) -+{ -+ splay_tree_node node = splay_tree_successor (action_list->tree, -+ (splay_tree_key)action); -+ return node ? (text_action *)node->value : NULL; -+} -+ - /* Add a modification action to the text. For the case of adding or - removing space, modify any current fill and assume that - "unreachable_space" bytes can be freely contracted. Note that a -@@ -5521,8 +5562,8 @@ text_action_add (text_action_list *l, - bfd_vma offset, - int removed) - { -- text_action **m_p; - text_action *ta; -+ text_action a; - - /* It is not necessary to fill at the end of a section. */ - if (action == ta_fill && sec->size == offset) -@@ -5532,34 +5573,30 @@ text_action_add (text_action_list *l, - if (action == ta_fill && removed == 0) - return; - -- for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next) -+ a.action = action; -+ a.offset = offset; -+ -+ if (action == ta_fill) - { -- text_action *t = *m_p; -+ splay_tree_node node = splay_tree_lookup (l->tree, (splay_tree_key)&a); - -- if (action == ta_fill) -+ if (node) - { -- /* When the action is another fill at the same address, -- just increase the size. */ -- if (t->offset == offset && t->action == ta_fill) -- { -- t->removed_bytes += removed; -- return; -- } -- /* Fills need to happen before widens so that we don't -- insert fill bytes into the instruction stream. */ -- if (t->offset == offset && t->action == ta_widen_insn) -- break; -+ ta = (text_action *)node->value; -+ ta->removed_bytes += removed; -+ return; - } - } -+ else -+ BFD_ASSERT (splay_tree_lookup (l->tree, (splay_tree_key)&a) == NULL); - -- /* Create a new record and fill it up. */ - ta = (text_action *) bfd_zmalloc (sizeof (text_action)); - ta->action = action; - ta->sec = sec; - ta->offset = offset; - ta->removed_bytes = removed; -- ta->next = (*m_p); -- *m_p = ta; -+ splay_tree_insert (l->tree, (splay_tree_key)ta, (splay_tree_value)ta); -+ ++l->count; - } - - -@@ -5570,7 +5607,6 @@ text_action_add_literal (text_action_list *l, - const literal_value *value, - int removed) - { -- text_action **m_p; - text_action *ta; - asection *sec = r_reloc_get_section (loc); - bfd_vma offset = loc->target_offset; -@@ -5578,14 +5614,6 @@ text_action_add_literal (text_action_list *l, - - BFD_ASSERT (action == ta_add_literal); - -- for (m_p = &l->head; *m_p != NULL; m_p = &(*m_p)->next) -- { -- if ((*m_p)->offset > offset -- && ((*m_p)->offset != offset -- || (*m_p)->virtual_offset > virtual_offset)) -- break; -- } -- - /* Create a new record and fill it up. */ - ta = (text_action *) bfd_zmalloc (sizeof (text_action)); - ta->action = action; -@@ -5594,8 +5622,10 @@ text_action_add_literal (text_action_list *l, - ta->virtual_offset = virtual_offset; - ta->value = *value; - ta->removed_bytes = removed; -- ta->next = (*m_p); -- *m_p = ta; -+ -+ BFD_ASSERT (splay_tree_lookup (l->tree, (splay_tree_key)ta) == NULL); -+ splay_tree_insert (l->tree, (splay_tree_key)ta, (splay_tree_value)ta); -+ ++l->count; - } - - -@@ -5606,7 +5636,8 @@ text_action_add_literal (text_action_list *l, - so that each search may begin where the previous one left off. */ - - static int --removed_by_actions (text_action **p_start_action, -+removed_by_actions (text_action_list *action_list, -+ text_action **p_start_action, - bfd_vma offset, - bfd_boolean before_fill) - { -@@ -5614,6 +5645,13 @@ removed_by_actions (text_action **p_start_action, - int removed = 0; - - r = *p_start_action; -+ if (r) -+ { -+ splay_tree_node node = splay_tree_lookup (action_list->tree, -+ (splay_tree_key)r); -+ BFD_ASSERT (node != NULL && r == (text_action *)node->value); -+ } -+ - while (r) - { - if (r->offset > offset) -@@ -5625,7 +5663,7 @@ removed_by_actions (text_action **p_start_action, - - removed += r->removed_bytes; - -- r = r->next; -+ r = action_next (action_list, r); - } - - *p_start_action = r; -@@ -5636,68 +5674,74 @@ removed_by_actions (text_action **p_start_action, - static bfd_vma - offset_with_removed_text (text_action_list *action_list, bfd_vma offset) - { -- text_action *r = action_list->head; -- return offset - removed_by_actions (&r, offset, FALSE); -+ text_action *r = action_first (action_list); -+ -+ return offset - removed_by_actions (action_list, &r, offset, FALSE); - } - - - static unsigned - action_list_count (text_action_list *action_list) - { -- text_action *r = action_list->head; -- unsigned count = 0; -- for (r = action_list->head; r != NULL; r = r->next) -- { -- count++; -- } -- return count; -+ return action_list->count; - } - --static void --map_removal_by_action (text_action_list *action_list) -+typedef struct map_action_fn_context_struct map_action_fn_context; -+struct map_action_fn_context_struct - { -- text_action *r; -- int removed = 0; -+ int removed; - removal_by_action_map map; - bfd_boolean eq_complete; -+}; - -- map.n_entries = 0; -- map.entry = bfd_malloc (action_list_count (action_list) * -- sizeof (removal_by_action_entry)); -- eq_complete = FALSE; -+static int -+map_action_fn (splay_tree_node node, void *p) -+{ -+ map_action_fn_context *ctx = p; -+ text_action *r = (text_action *)node->value; -+ removal_by_action_entry *ientry = ctx->map.entry + ctx->map.n_entries; - -- for (r = action_list->head; r;) -+ if (ctx->map.n_entries && (ientry - 1)->offset == r->offset) - { -- removal_by_action_entry *ientry = map.entry + map.n_entries; -+ --ientry; -+ } -+ else -+ { -+ ++ctx->map.n_entries; -+ ctx->eq_complete = FALSE; -+ ientry->offset = r->offset; -+ ientry->eq_removed_before_fill = ctx->removed; -+ } - -- if (map.n_entries && (ientry - 1)->offset == r->offset) -+ if (!ctx->eq_complete) -+ { -+ if (r->action != ta_fill || r->removed_bytes >= 0) - { -- --ientry; -+ ientry->eq_removed = ctx->removed; -+ ctx->eq_complete = TRUE; - } - else -- { -- ++map.n_entries; -- eq_complete = FALSE; -- ientry->offset = r->offset; -- ientry->eq_removed_before_fill = removed; -- } -+ ientry->eq_removed = ctx->removed + r->removed_bytes; -+ } - -- if (!eq_complete) -- { -- if (r->action != ta_fill || r->removed_bytes >= 0) -- { -- ientry->eq_removed = removed; -- eq_complete = TRUE; -- } -- else -- ientry->eq_removed = removed + r->removed_bytes; -- } -+ ctx->removed += r->removed_bytes; -+ ientry->removed = ctx->removed; -+ return 0; -+} - -- removed += r->removed_bytes; -- ientry->removed = removed; -- r = r->next; -- } -- action_list->map = map; -+static void -+map_removal_by_action (text_action_list *action_list) -+{ -+ map_action_fn_context ctx; -+ -+ ctx.removed = 0; -+ ctx.map.n_entries = 0; -+ ctx.map.entry = bfd_malloc (action_list_count (action_list) * -+ sizeof (removal_by_action_entry)); -+ ctx.eq_complete = FALSE; -+ -+ splay_tree_foreach (action_list->tree, map_action_fn, &ctx); -+ action_list->map = ctx.map; - } - - static int -@@ -5754,28 +5798,26 @@ offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset) - static text_action * - find_insn_action (text_action_list *action_list, bfd_vma offset) - { -- text_action *t; -- for (t = action_list->head; t; t = t->next) -+ static const text_action_t action[] = - { -- if (t->offset == offset) -- { -- switch (t->action) -- { -- case ta_none: -- case ta_fill: -- break; -- case ta_remove_insn: -- case ta_remove_longcall: -- case ta_convert_longcall: -- case ta_narrow_insn: -- case ta_widen_insn: -- return t; -- case ta_remove_literal: -- case ta_add_literal: -- BFD_ASSERT (0); -- break; -- } -- } -+ ta_convert_longcall, -+ ta_remove_longcall, -+ ta_widen_insn, -+ ta_narrow_insn, -+ ta_remove_insn, -+ }; -+ text_action a; -+ unsigned i; -+ -+ a.offset = offset; -+ for (i = 0; i < sizeof (action) / sizeof (*action); ++i) -+ { -+ splay_tree_node node; -+ -+ a.action = action[i]; -+ node = splay_tree_lookup (action_list->tree, (splay_tree_key)&a); -+ if (node) -+ return (text_action *)node->value; - } - return NULL; - } -@@ -5784,40 +5826,50 @@ find_insn_action (text_action_list *action_list, bfd_vma offset) - #if DEBUG - - static void --print_action_list (FILE *fp, text_action_list *action_list) -+print_action (FILE *fp, text_action *r) -+{ -+ const char *t = "unknown"; -+ switch (r->action) -+ { -+ case ta_remove_insn: -+ t = "remove_insn"; break; -+ case ta_remove_longcall: -+ t = "remove_longcall"; break; -+ case ta_convert_longcall: -+ t = "convert_longcall"; break; -+ case ta_narrow_insn: -+ t = "narrow_insn"; break; -+ case ta_widen_insn: -+ t = "widen_insn"; break; -+ case ta_fill: -+ t = "fill"; break; -+ case ta_none: -+ t = "none"; break; -+ case ta_remove_literal: -+ t = "remove_literal"; break; -+ case ta_add_literal: -+ t = "add_literal"; break; -+ } -+ -+ fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n", -+ r->sec->owner->filename, -+ r->sec->name, (unsigned long) r->offset, t, r->removed_bytes); -+} -+ -+static int -+print_action_list_fn (splay_tree_node node, void *p) - { -- text_action *r; -+ text_action *r = (text_action *)node->value; - -- fprintf (fp, "Text Action\n"); -- for (r = action_list->head; r != NULL; r = r->next) -- { -- const char *t = "unknown"; -- switch (r->action) -- { -- case ta_remove_insn: -- t = "remove_insn"; break; -- case ta_remove_longcall: -- t = "remove_longcall"; break; -- case ta_convert_longcall: -- t = "convert_longcall"; break; -- case ta_narrow_insn: -- t = "narrow_insn"; break; -- case ta_widen_insn: -- t = "widen_insn"; break; -- case ta_fill: -- t = "fill"; break; -- case ta_none: -- t = "none"; break; -- case ta_remove_literal: -- t = "remove_literal"; break; -- case ta_add_literal: -- t = "add_literal"; break; -- } -+ print_action (p, r); -+ return 0; -+} - -- fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n", -- r->sec->owner->filename, -- r->sec->name, (unsigned long) r->offset, t, r->removed_bytes); -- } -+static void -+print_action_list (FILE *fp, text_action_list *action_list) -+{ -+ fprintf (fp, "Text Action\n"); -+ splay_tree_foreach (action_list->tree, print_action_list_fn, fp); - } - - #endif /* DEBUG */ -@@ -6071,8 +6123,8 @@ init_xtensa_relax_info (asection *sec) - relax_info->removed_list.head = NULL; - relax_info->removed_list.tail = NULL; - -- relax_info->action_list.head = NULL; -- -+ relax_info->action_list.tree = splay_tree_new (text_action_compare, -+ NULL, NULL); - relax_info->action_list.map.n_entries = 0; - relax_info->action_list.map.entry = NULL; - -@@ -7762,7 +7814,7 @@ compute_text_actions (bfd *abfd, - free_reloc_range_list (&relevant_relocs); - - #if DEBUG -- if (relax_info->action_list.head) -+ if (action_list_count (&relax_info->action_list)) - print_action_list (stderr, &relax_info->action_list); - #endif - -@@ -8263,6 +8315,54 @@ xlate_offset_with_removed_text (const xlate_map_t *map, - return e->new_address - e->orig_address + offset; - } - -+typedef struct xlate_map_context_struct xlate_map_context; -+struct xlate_map_context_struct -+{ -+ xlate_map_t *map; -+ xlate_map_entry_t *current_entry; -+ int removed; -+}; -+ -+static int -+xlate_map_fn (splay_tree_node node, void *p) -+{ -+ text_action *r = (text_action *)node->value; -+ xlate_map_context *ctx = p; -+ unsigned orig_size = 0; -+ -+ switch (r->action) -+ { -+ case ta_none: -+ case ta_remove_insn: -+ case ta_convert_longcall: -+ case ta_remove_literal: -+ case ta_add_literal: -+ break; -+ case ta_remove_longcall: -+ orig_size = 6; -+ break; -+ case ta_narrow_insn: -+ orig_size = 3; -+ break; -+ case ta_widen_insn: -+ orig_size = 2; -+ break; -+ case ta_fill: -+ break; -+ } -+ ctx->current_entry->size = -+ r->offset + orig_size - ctx->current_entry->orig_address; -+ if (ctx->current_entry->size != 0) -+ { -+ ctx->current_entry++; -+ ctx->map->entry_count++; -+ } -+ ctx->current_entry->orig_address = r->offset + orig_size; -+ ctx->removed += r->removed_bytes; -+ ctx->current_entry->new_address = r->offset + orig_size - ctx->removed; -+ ctx->current_entry->size = 0; -+ return 0; -+} - - /* Build a binary searchable offset translation map from a section's - action list. */ -@@ -8270,75 +8370,40 @@ xlate_offset_with_removed_text (const xlate_map_t *map, - static xlate_map_t * - build_xlate_map (asection *sec, xtensa_relax_info *relax_info) - { -- xlate_map_t *map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t)); - text_action_list *action_list = &relax_info->action_list; - unsigned num_actions = 0; -- text_action *r; -- int removed; -- xlate_map_entry_t *current_entry; -+ xlate_map_context ctx; - -- if (map == NULL) -+ ctx.map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t)); -+ -+ if (ctx.map == NULL) - return NULL; - - num_actions = action_list_count (action_list); -- map->entry = (xlate_map_entry_t *) -+ ctx.map->entry = (xlate_map_entry_t *) - bfd_malloc (sizeof (xlate_map_entry_t) * (num_actions + 1)); -- if (map->entry == NULL) -+ if (ctx.map->entry == NULL) - { -- free (map); -+ free (ctx.map); - return NULL; - } -- map->entry_count = 0; -+ ctx.map->entry_count = 0; - -- removed = 0; -- current_entry = &map->entry[0]; -+ ctx.removed = 0; -+ ctx.current_entry = &ctx.map->entry[0]; - -- current_entry->orig_address = 0; -- current_entry->new_address = 0; -- current_entry->size = 0; -+ ctx.current_entry->orig_address = 0; -+ ctx.current_entry->new_address = 0; -+ ctx.current_entry->size = 0; - -- for (r = action_list->head; r != NULL; r = r->next) -- { -- unsigned orig_size = 0; -- switch (r->action) -- { -- case ta_none: -- case ta_remove_insn: -- case ta_convert_longcall: -- case ta_remove_literal: -- case ta_add_literal: -- break; -- case ta_remove_longcall: -- orig_size = 6; -- break; -- case ta_narrow_insn: -- orig_size = 3; -- break; -- case ta_widen_insn: -- orig_size = 2; -- break; -- case ta_fill: -- break; -- } -- current_entry->size = -- r->offset + orig_size - current_entry->orig_address; -- if (current_entry->size != 0) -- { -- current_entry++; -- map->entry_count++; -- } -- current_entry->orig_address = r->offset + orig_size; -- removed += r->removed_bytes; -- current_entry->new_address = r->offset + orig_size - removed; -- current_entry->size = 0; -- } -+ splay_tree_foreach (action_list->tree, xlate_map_fn, &ctx); - -- current_entry->size = (bfd_get_section_limit (sec->owner, sec) -- - current_entry->orig_address); -- if (current_entry->size != 0) -- map->entry_count++; -+ ctx.current_entry->size = (bfd_get_section_limit (sec->owner, sec) -+ - ctx.current_entry->orig_address); -+ if (ctx.current_entry->size != 0) -+ ctx.map->entry_count++; - -- return map; -+ return ctx.map; - } - - -@@ -9302,6 +9367,16 @@ move_shared_literal (asection *sec, - - /* Second relaxation pass. */ - -+static int -+action_remove_bytes_fn (splay_tree_node node, void *p) -+{ -+ bfd_size_type *final_size = p; -+ text_action *action = (text_action *)node->value; -+ -+ *final_size -= action->removed_bytes; -+ return 0; -+} -+ - /* Modify all of the relocations to point to the right spot, and if this - is a relaxable section, delete the unwanted literals and fix the - section size. */ -@@ -9334,7 +9409,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - - internal_relocs = retrieve_internal_relocs (abfd, sec, - link_info->keep_memory); -- if (!internal_relocs && !relax_info->action_list.head) -+ if (!internal_relocs && !action_list_count (&relax_info->action_list)) - return TRUE; - - contents = retrieve_contents (abfd, sec, link_info->keep_memory); -@@ -9412,6 +9487,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - } - /* Update the action so that the code that moves - the contents will do the right thing. */ -+ /* ta_remove_longcall and ta_remove_insn actions are -+ grouped together in the tree as well as -+ ta_convert_longcall and ta_none, so that changes below -+ can be done w/o removing and reinserting action into -+ the tree. */ -+ - if (action->action == ta_remove_longcall) - action->action = ta_remove_insn; - else -@@ -9584,13 +9665,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - - if ((relax_info->is_relaxable_literal_section - || relax_info->is_relaxable_asm_section) -- && relax_info->action_list.head) -+ && action_list_count (&relax_info->action_list)) - { - /* Walk through the planned actions and build up a table - of move, copy and fill records. Use the move, copy and - fill records to perform the actions once. */ - -- int removed = 0; - bfd_size_type final_size, copy_size, orig_insn_size; - bfd_byte *scratch = NULL; - bfd_byte *dup_contents = NULL; -@@ -9601,15 +9681,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - bfd_vma orig_dot_vo = 0; /* Virtual offset from orig_dot. */ - bfd_vma dup_dot = 0; - -- text_action *action = relax_info->action_list.head; -+ text_action *action; - - final_size = sec->size; -- for (action = relax_info->action_list.head; action; -- action = action->next) -- { -- final_size -= action->removed_bytes; -- } - -+ splay_tree_foreach (relax_info->action_list.tree, -+ action_remove_bytes_fn, &final_size); - scratch = (bfd_byte *) bfd_zmalloc (final_size); - dup_contents = (bfd_byte *) bfd_zmalloc (final_size); - -@@ -9618,8 +9695,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - print_action_list (stderr, &relax_info->action_list); - #endif - -- for (action = relax_info->action_list.head; action; -- action = action->next) -+ for (action = action_first (&relax_info->action_list); action; -+ action = action_next (&relax_info->action_list, action)) - { - virtual_action = FALSE; - if (action->offset > orig_dot) -@@ -9748,7 +9825,6 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - break; - } - -- removed += action->removed_bytes; - BFD_ASSERT (dup_dot <= final_size); - BFD_ASSERT (orig_dot <= orig_size); - } --- -1.8.1.4 - diff --git a/package/binutils/2.24/910-xtensa-optimize-trampolines-relaxation.patch b/package/binutils/2.24/910-xtensa-optimize-trampolines-relaxation.patch deleted file mode 100644 index 043ff4df1e..0000000000 --- a/package/binutils/2.24/910-xtensa-optimize-trampolines-relaxation.patch +++ /dev/null @@ -1,345 +0,0 @@ -From cbe53e134d4c3a656880a906738ce19fdcd38e8b Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 1 May 2015 11:39:12 +0300 -Subject: [PATCH] xtensa: optimize trampolines relaxation - -Currently every fixup in the current segment is checked when relaxing -trampoline frag. This is very expensive. Make a searchable array of -fixups pointing at potentially oversized jumps at the beginning of every -relaxation pass and only check subset of this cache in the reach of -single jump from the trampoline frag currently being relaxed. - -Original profile: - -% time self children called name ------------------------------------------ - 370.16 593.38 12283048/12283048 relax_segment - 98.4 370.16 593.38 12283048 xtensa_relax_frag - 58.91 269.26 2691463834/2699602236 xtensa_insnbuf_from_chars - 68.35 68.17 811266668/813338977 S_GET_VALUE - 36.85 29.51 2684369246/2685538060 xtensa_opcode_decode - 28.34 8.84 2684369246/2685538060 xtensa_format_get_slot - 12.39 5.94 2691463834/2699775044 xtensa_format_decode - 0.03 4.60 4101109/4101109 relax_frag_for_align - 0.18 1.76 994617/994617 relax_frag_immed - 0.07 0.09 24556277/24851220 new_logical_line - 0.06 0.00 12283048/14067410 as_where - 0.04 0.00 7094588/15460506 xtensa_format_num_slots - 0.00 0.00 1/712477 xtensa_insnbuf_alloc ------------------------------------------ - -Same data, after optimization: - -% time self children called name ------------------------------------------ - 0.51 7.47 12283048/12283048 relax_segment - 58.0 0.51 7.47 12283048 xtensa_relax_frag - 0.02 4.08 4101109/4101109 relax_frag_for_align - 0.18 1.39 994617/994617 relax_frag_immed - 0.01 0.98 555/555 xtensa_cache_relaxable_fixups - 0.21 0.25 7094588/16693271 xtensa_insnbuf_from_chars - 0.06 0.12 24556277/24851220 new_logical_line - 0.06 0.00 7094588/15460506 xtensa_format_num_slots - 0.02 0.04 7094588/16866079 xtensa_format_decode - 0.05 0.00 12283048/14067410 as_where - 0.00 0.00 1/712477 xtensa_insnbuf_alloc - 0.00 0.00 93808/93808 xtensa_find_first_cached_fixup ------------------------------------------ - -2015-05-02 Max Filippov -gas/ - * config/tc-xtensa.c (cached_fixupS, fixup_cacheS): New typedefs. - (struct cached_fixup, struct fixup_cache): New structures. - (fixup_order, xtensa_make_cached_fixup), - (xtensa_realloc_fixup_cache, xtensa_cache_relaxable_fixups), - (xtensa_find_first_cached_fixup, xtensa_delete_cached_fixup), - (xtensa_add_cached_fixup): New functions. - (xtensa_relax_frag): Cache fixups pointing at potentially - oversized jumps at the beginning of every relaxation pass. Only - check subset of this cache in the reach of single jump from the - trampoline frag currently being relaxed. - -Signed-off-by: Max Filippov ---- -Backported from: b76f99d702c3501ac320396ea06bc7f9237173c3 -Changes to ChangeLog are dropped. - - gas/config/tc-xtensa.c | 220 +++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 194 insertions(+), 26 deletions(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 3e85b69..31c0b6b 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -8785,6 +8785,154 @@ static long relax_frag_for_align (fragS *, long); - static long relax_frag_immed - (segT, fragS *, long, int, xtensa_format, int, int *, bfd_boolean); - -+typedef struct cached_fixup cached_fixupS; -+struct cached_fixup -+{ -+ int addr; -+ int target; -+ int delta; -+ fixS *fixP; -+}; -+ -+typedef struct fixup_cache fixup_cacheS; -+struct fixup_cache -+{ -+ cached_fixupS *fixups; -+ unsigned n_fixups; -+ unsigned n_max; -+ -+ segT seg; -+ fragS *first_frag; -+}; -+ -+static int fixup_order (const void *a, const void *b) -+{ -+ const cached_fixupS *pa = a; -+ const cached_fixupS *pb = b; -+ -+ if (pa->addr == pb->addr) -+ { -+ if (pa->target == pb->target) -+ { -+ if (pa->fixP->fx_r_type == pb->fixP->fx_r_type) -+ return 0; -+ return pa->fixP->fx_r_type < pb->fixP->fx_r_type ? -1 : 1; -+ } -+ return pa->target - pb->target; -+ } -+ return pa->addr - pb->addr; -+} -+ -+static bfd_boolean xtensa_make_cached_fixup (cached_fixupS *o, fixS *fixP) -+{ -+ xtensa_isa isa = xtensa_default_isa; -+ int addr = fixP->fx_frag->fr_address; -+ int target; -+ int delta; -+ symbolS *s = fixP->fx_addsy; -+ int slot; -+ xtensa_format fmt; -+ xtensa_opcode opcode; -+ -+ if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP || -+ fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP) -+ return FALSE; -+ target = S_GET_VALUE (s); -+ delta = target - addr; -+ -+ if (abs(delta) < J_RANGE / 2) -+ return FALSE; -+ -+ xtensa_insnbuf_from_chars (isa, trampoline_buf, -+ (unsigned char *) fixP->fx_frag->fr_literal + -+ fixP->fx_where, 0); -+ fmt = xtensa_format_decode (isa, trampoline_buf); -+ gas_assert (fmt != XTENSA_UNDEFINED); -+ slot = fixP->tc_fix_data.slot; -+ xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf); -+ opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf); -+ if (opcode != xtensa_j_opcode) -+ return FALSE; -+ -+ o->addr = addr; -+ o->target = target; -+ o->delta = delta; -+ o->fixP = fixP; -+ -+ return TRUE; -+} -+ -+static void xtensa_realloc_fixup_cache (fixup_cacheS *cache, unsigned add) -+{ -+ if (cache->n_fixups + add > cache->n_max) -+ { -+ cache->n_max = (cache->n_fixups + add) * 2; -+ cache->fixups = xrealloc (cache->fixups, -+ sizeof (*cache->fixups) * cache->n_max); -+ } -+} -+ -+static void xtensa_cache_relaxable_fixups (fixup_cacheS *cache, -+ segment_info_type *seginfo) -+{ -+ fixS *fixP; -+ -+ cache->n_fixups = 0; -+ -+ for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next) -+ { -+ xtensa_realloc_fixup_cache (cache, 1); -+ -+ if (xtensa_make_cached_fixup (cache->fixups + cache->n_fixups, fixP)) -+ ++cache->n_fixups; -+ } -+ qsort (cache->fixups, cache->n_fixups, sizeof (*cache->fixups), fixup_order); -+} -+ -+static unsigned xtensa_find_first_cached_fixup (const fixup_cacheS *cache, -+ int addr) -+{ -+ unsigned a = 0; -+ unsigned b = cache->n_fixups; -+ -+ while (b - a > 1) -+ { -+ unsigned c = (a + b) / 2; -+ -+ if (cache->fixups[c].addr < addr) -+ a = c; -+ else -+ b = c; -+ } -+ return a; -+} -+ -+static void xtensa_delete_cached_fixup (fixup_cacheS *cache, unsigned i) -+{ -+ memmove (cache->fixups + i, cache->fixups + i + 1, -+ (cache->n_fixups - i - 1) * sizeof (*cache->fixups)); -+ --cache->n_fixups; -+} -+ -+static bfd_boolean xtensa_add_cached_fixup (fixup_cacheS *cache, fixS *fixP) -+{ -+ cached_fixupS o; -+ unsigned i; -+ -+ if (!xtensa_make_cached_fixup (&o, fixP)) -+ return FALSE; -+ xtensa_realloc_fixup_cache (cache, 1); -+ i = xtensa_find_first_cached_fixup (cache, o.addr); -+ if (i < cache->n_fixups) -+ { -+ ++i; -+ memmove (cache->fixups + i + 1, cache->fixups + i, -+ (cache->n_fixups - i) * sizeof (*cache->fixups)); -+ } -+ cache->fixups[i] = o; -+ ++cache->n_fixups; -+ return TRUE; -+} - - /* Return the number of bytes added to this fragment, given that the - input has been stretched already by "stretch". */ -@@ -8896,35 +9044,42 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - case RELAX_TRAMPOLINE: - if (fragP->tc_frag_data.relax_seen) - { -- segment_info_type *seginfo = seg_info (now_seg); -- fragS *fP; /* The out-of-range jump. */ -- fixS *fixP; -+ static fixup_cacheS fixup_cache; -+ segment_info_type *seginfo = seg_info (now_seg); -+ int trampaddr = fragP->fr_address + fragP->fr_fix; -+ int searchaddr = trampaddr < J_RANGE ? 0 : trampaddr - J_RANGE; -+ unsigned i; -+ -+ if (now_seg != fixup_cache.seg || -+ fragP == fixup_cache.first_frag || -+ fixup_cache.first_frag == NULL) -+ { -+ xtensa_cache_relaxable_fixups (&fixup_cache, seginfo); -+ fixup_cache.seg = now_seg; -+ fixup_cache.first_frag = fragP; -+ } - - /* Scan for jumps that will not reach. */ -- for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next) -+ for (i = xtensa_find_first_cached_fixup (&fixup_cache, searchaddr); -+ i < fixup_cache.n_fixups; ++i) -+ - { -- symbolS *s = fixP->fx_addsy; -- xtensa_opcode opcode; -- int target; -- int addr; -- int delta; -- -- if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP || -- fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP) -- continue; -- xtensa_insnbuf_from_chars (isa, trampoline_buf, -- (unsigned char *) fixP->fx_frag->fr_literal + fixP->fx_where, -- 0); -- fmt = xtensa_format_decode (isa, trampoline_buf); -- gas_assert (fmt != XTENSA_UNDEFINED); -- slot = fixP->tc_fix_data.slot; -- xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf); -- opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf); -- if (opcode != xtensa_j_opcode) -+ fixS *fixP = fixup_cache.fixups[i].fixP; -+ int target = fixup_cache.fixups[i].target; -+ int addr = fixup_cache.fixups[i].addr; -+ int delta = fixup_cache.fixups[i].delta + stretch; -+ -+ trampaddr = fragP->fr_address + fragP->fr_fix; -+ -+ if (addr + J_RANGE < trampaddr) - continue; -- target = S_GET_VALUE (s); -- addr = fixP->fx_frag->fr_address; -- delta = target - addr + stretch; -+ if (addr > trampaddr + J_RANGE) -+ break; -+ if (abs (delta) < J_RANGE) -+ continue; -+ -+ slot = fixP->tc_fix_data.slot; -+ - if (delta > J_RANGE || delta < -1 * J_RANGE) - { /* Found an out-of-range jump; scan the list of trampolines for the best match. */ - struct trampoline_seg *ts = find_trampoline_seg (now_seg); -@@ -8978,14 +9133,13 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - } - if (tf->fragP == fragP) - { -- int trampaddr = fragP->fr_address + fragP->fr_fix; -- - if (abs (addr - trampaddr) < J_RANGE) - { /* The trampoline is in range of original; fix it! */ - fixS *newfixP; - int offset; - TInsn insn; - symbolS *lsym; -+ fragS *fP; /* The out-of-range jump. */ - - new_stretch += init_trampoline_frag (tf); - offset = fragP->fr_fix; /* Where to assemble the j insn. */ -@@ -9009,10 +9163,20 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - newfixP->tc_fix_data.X_add_symbol = lsym; - newfixP->tc_fix_data.X_add_number = offset; - newfixP->tc_fix_data.slot = slot; -+ -+ xtensa_delete_cached_fixup (&fixup_cache, i); -+ xtensa_add_cached_fixup (&fixup_cache, newfixP); -+ - /* Move the fix-up from the original j insn to this one. */ - fixP->fx_frag = fragP; - fixP->fx_where = fragP->fr_fix - 3; - fixP->tc_fix_data.slot = 0; -+ -+ xtensa_add_cached_fixup (&fixup_cache, fixP); -+ -+ /* re-do current fixup */ -+ --i; -+ - /* Adjust the jump around this trampoline (if present). */ - if (tf->fixP != NULL) - { -@@ -9027,6 +9191,8 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - fragP->fr_subtype = 0; - /* Remove from the trampoline_list. */ - prev->next = tf->next; -+ if (fragP == fixup_cache.first_frag) -+ fixup_cache.first_frag = NULL; - break; - } - } --- -1.8.1.4 - diff --git a/package/binutils/2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch b/package/binutils/2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch deleted file mode 100644 index 9ad6b3be05..0000000000 --- a/package/binutils/2.24/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 8ec76b16f62d1bf386fb2c39af5f66c3afddc5cb Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 14 May 2015 05:22:55 +0300 -Subject: [PATCH] xtensa: fix localized symbol refcounting with --gc-sections - -elf_xtensa_gc_sweep_hook doesn't correctly unreference symbols that were -made local, that results in link failure with the following message: - - BFD (GNU Binutils) 2.24 internal error, aborting at elf32-xtensa.c line - 3372 in elf_xtensa_finish_dynamic_sections - -elf_xtensa_gc_sweep_hook determines symbol reference type (PLT or GOT) by -relocation type. Relocation types are not changed when symbol becomes -local, but its PLT references are added to GOT references and -plt.refcount is set to 0. Such symbol cannot be unreferences in the -elf_xtensa_gc_sweep_hook and its extra references make calculated GOT -relocations section size not match number of GOT relocations. - -Fix it by treating PLT reference as GOT reference when plt.refcount is -not positive. - -2015-05-14 Max Filippov -bfd/ - * elf32-xtensa.c (elf_xtensa_gc_sweep_hook): Treat PLT reference - as GOT reference when plt.refcount is not positive. - -Signed-off-by: Max Filippov ---- -Backported from: e6c9a083ec5ae7a45bd71682b26aae1939849388 -Changes to ChangeLog are dropped. - - bfd/elf32-xtensa.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 53af1c6..2523670 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -1360,10 +1360,14 @@ elf_xtensa_gc_sweep_hook (bfd *abfd, - { - if (is_plt) - { -+ /* If the symbol has been localized its plt.refcount got moved -+ to got.refcount. Handle it as GOT. */ - if (h->plt.refcount > 0) - h->plt.refcount--; -+ else -+ is_got = TRUE; - } -- else if (is_got) -+ if (is_got) - { - if (h->got.refcount > 0) - h->got.refcount--; --- -1.8.1.4 - diff --git a/package/binutils/2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch b/package/binutils/2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch deleted file mode 100644 index 4a3de2c839..0000000000 --- a/package/binutils/2.24/912-xtensa-fix-gas-segfault-with-text-section-literals.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2d0522e76e4afeeb2e104e0a4332d94fa0d2fbf6 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 17 May 2015 06:46:15 +0300 -Subject: [PATCH] xtensa: fix gas segfault with --text-section-literals - -When --text-section-literals is used and code in the .init or .fini -emits literal in the absence of .literal_position, xtensa_move_literals -segfaults. - -Check that search_frag is non-NULL in the xtensa_move_literals and -report error otherwise. - -2015-05-26 Max Filippov -gas/ - * config/tc-xtensa.c (xtensa_move_literals): Check that - search_frag is non-NULL. Report error if literal frag is not - found. - -Signed-off-by: Max Filippov ---- -Backported from: 4de0562a4c69fef4952aa7e19d7bda359f02e8b4 -Changes to ChangeLog are dropped. - - gas/config/tc-xtensa.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 31c0b6b..18307c1 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -10808,13 +10808,21 @@ xtensa_move_literals (void) - frchain_to = NULL; - frag_splice = &(frchain_from->frch_root); - -- while (!search_frag->tc_frag_data.literal_frag) -+ while (search_frag && !search_frag->tc_frag_data.literal_frag) - { - gas_assert (search_frag->fr_fix == 0 - || search_frag->fr_type == rs_align); - search_frag = search_frag->fr_next; - } - -+ if (!search_frag) -+ { -+ search_frag = frchain_from->frch_root; -+ as_bad_where (search_frag->fr_file, search_frag->fr_line, -+ _("literal pool location required for text-section-literals; specify with .literal_position")); -+ continue; -+ } -+ - gas_assert (search_frag->tc_frag_data.literal_frag->fr_subtype - == RELAX_LITERAL_POOL_BEGIN); - xtensa_switch_section_emit_state (&state, segment->seg, 0); --- -1.8.1.4 - diff --git a/package/binutils/2.24/913-xtensa-add-auto-litpools-option.patch b/package/binutils/2.24/913-xtensa-add-auto-litpools-option.patch deleted file mode 100644 index f0199e1e2a..0000000000 --- a/package/binutils/2.24/913-xtensa-add-auto-litpools-option.patch +++ /dev/null @@ -1,698 +0,0 @@ -From 978adaaa4cd3921842e2be8a31c05f081fb17fcf Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 29 Jul 2015 17:42:54 +0300 -Subject: [PATCH] xtensa: add --auto-litpools option - -Auto-litpools is the automated version of text-section-literals: literal -pool candidate frags are planted every N frags and during relaxation -they are turned into actual literal pools where literals are moved to -become reachable for their first reference by L32R instruction. - -2015-08-12 David Weatherford -gas/ - * config/tc-xtensa.c (struct litpool_frag, struct litpool_seg): - New structures. - (xtensa_maybe_create_literal_pool_frag): New function. - (litpool_seg_list, auto_litpools, auto_litpool_limit) - (litpool_buf, litpool_slotbuf): New static variables. - (option_auto_litpools, option_no_auto_litpools) - (option_auto_litpool_limit): New enum identifiers. - (md_longopts): Add entries for auto-litpools, no-auto-litpools - and auto-litpool-limit. - (md_parse_option): Handle option_auto_litpools, - option_no_auto_litpools and option_auto_litpool_limit. - (md_show_usage): Add help for --[no-]auto-litpools and - --auto-litpool-limit. - (xtensa_mark_literal_pool_location): Record a place for literal - pool with a call to xtensa_maybe_create_literal_pool_frag. - (get_literal_pool_location): Find highest priority literal pool - or convert candidate to literal pool when auto-litpools are used. - (xg_assemble_vliw_tokens): Create literal pool after jump - instruction. - (xtensa_check_frag_count): Create candidate literal pool every - auto_litpool_limit frags. - (xtensa_relax_frag): Add jump around literals to non-empty - literal pool. - (xtensa_move_literals): Estimate literal pool addresses and move - unreachable literals closer to their users, converting candidate - to literal pool if needed. - (xtensa_switch_to_non_abs_literal_fragment): Only emit error - about missing .literal_position in case auto-litpools are not - used. - * config/tc-xtensa.h (xtensa_relax_statesE): New relaxation - state: RELAX_LITERAL_POOL_CANDIDATE_BEGIN. - -2015-08-12 Max Filippov -gas/testsuite/ - * gas/xtensa/all.exp: Add auto-litpools to the list of xtensa - tests. - * gas/xtensa/auto-litpools.s: New file: auto-litpools test. - * gas/xtensa/auto-litpools.s: New file: auto-litpools test - result pattern. - -Signed-off-by: Max Filippov ---- -Backported from: b46824bd49648c575372e6d9bc6a6defeabd6ed5 -Changes to ChangeLogs and documentation are dropped. - - gas/config/tc-xtensa.c | 432 ++++++++++++++++++++++++++++++- - gas/config/tc-xtensa.h | 1 + - gas/testsuite/gas/xtensa/all.exp | 1 + - gas/testsuite/gas/xtensa/auto-litpools.d | 12 + - gas/testsuite/gas/xtensa/auto-litpools.s | 13 + - 5 files changed, 454 insertions(+), 5 deletions(-) - create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.d - create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.s - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 7311a05..b8b1e7d 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -440,6 +440,29 @@ bfd_boolean directive_state[] = - #endif - }; - -+/* A circular list of all potential and actual literal pool locations -+ in a segment. */ -+struct litpool_frag -+{ -+ struct litpool_frag *next; -+ struct litpool_frag *prev; -+ fragS *fragP; -+ addressT addr; -+ short priority; /* 1, 2, or 3 -- 1 is highest */ -+ short original_priority; -+}; -+ -+/* Map a segment to its litpool_frag list. */ -+struct litpool_seg -+{ -+ struct litpool_seg *next; -+ asection *seg; -+ struct litpool_frag frag_list; -+ int frag_count; /* since last litpool location */ -+}; -+ -+static struct litpool_seg litpool_seg_list; -+ - - /* Directive functions. */ - -@@ -474,6 +497,9 @@ static void xtensa_create_trampoline_frag (bfd_boolean); - static void xtensa_maybe_create_trampoline_frag (void); - struct trampoline_frag; - static int init_trampoline_frag (struct trampoline_frag *); -+static void xtensa_maybe_create_literal_pool_frag (bfd_boolean, bfd_boolean); -+static bfd_boolean auto_litpools = FALSE; -+static int auto_litpool_limit = 10000; - - /* Alignment Functions. */ - -@@ -698,6 +724,10 @@ enum - - option_trampolines, - option_no_trampolines, -+ -+ option_auto_litpools, -+ option_no_auto_litpools, -+ option_auto_litpool_limit, - }; - - const char *md_shortopts = ""; -@@ -773,6 +803,10 @@ struct option md_longopts[] = - { "trampolines", no_argument, NULL, option_trampolines }, - { "no-trampolines", no_argument, NULL, option_no_trampolines }, - -+ { "auto-litpools", no_argument, NULL, option_auto_litpools }, -+ { "no-auto-litpools", no_argument, NULL, option_no_auto_litpools }, -+ { "auto-litpool-limit", required_argument, NULL, option_auto_litpool_limit }, -+ - { NULL, no_argument, NULL, 0 } - }; - -@@ -961,6 +995,34 @@ md_parse_option (int c, char *arg) - use_trampolines = FALSE; - return 1; - -+ case option_auto_litpools: -+ auto_litpools = TRUE; -+ use_literal_section = FALSE; -+ return 1; -+ -+ case option_no_auto_litpools: -+ auto_litpools = FALSE; -+ auto_litpool_limit = -1; -+ return 1; -+ -+ case option_auto_litpool_limit: -+ { -+ int value = 0; -+ if (auto_litpool_limit < 0) -+ as_fatal (_("no-auto-litpools is incompatible with auto-litpool-limit")); -+ if (*arg == 0 || *arg == '-') -+ as_fatal (_("invalid auto-litpool-limit argument")); -+ value = strtol (arg, &arg, 10); -+ if (*arg != 0) -+ as_fatal (_("invalid auto-litpool-limit argument")); -+ if (value < 100 || value > 10000) -+ as_fatal (_("invalid auto-litpool-limit argument (range is 100-10000)")); -+ auto_litpool_limit = value; -+ auto_litpools = TRUE; -+ use_literal_section = FALSE; -+ return 1; -+ } -+ - default: - return 0; - } -@@ -986,7 +1048,12 @@ Xtensa options:\n\ - flix bundles\n\ - --rename-section old=new Rename section 'old' to 'new'\n\ - --[no-]trampolines [Do not] generate trampolines (jumps to jumps)\n\ -- when jumps do not reach their targets\n", stream); -+ when jumps do not reach their targets\n\ -+ --[no-]auto-litpools [Do not] automatically create literal pools\n\ -+ --auto-litpool-limit=\n\ -+ (range 100-10000) Maximum number of blocks of\n\ -+ instructions to emit between literal pool\n\ -+ locations; implies --auto-litpools flag\n", stream); - } - - -@@ -4728,6 +4795,8 @@ xtensa_mark_literal_pool_location (void) - pool_location = frag_now; - frag_now->tc_frag_data.lit_frchain = frchain_now; - frag_now->tc_frag_data.literal_frag = frag_now; -+ /* Just record this frag. */ -+ xtensa_maybe_create_literal_pool_frag (FALSE, FALSE); - frag_variant (rs_machine_dependent, 0, 0, - RELAX_LITERAL_POOL_BEGIN, NULL, 0, NULL); - xtensa_set_frag_assembly_state (frag_now); -@@ -4832,6 +4901,31 @@ get_expanded_loop_offset (xtensa_opcode opcode) - static fragS * - get_literal_pool_location (segT seg) - { -+ struct litpool_seg *lps = litpool_seg_list.next; -+ struct litpool_frag *lpf; -+ for ( ; lps && lps->seg->id != seg->id; lps = lps->next) -+ ; -+ if (lps) -+ { -+ for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev) -+ { /* Skip "candidates" for now. */ -+ if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN && -+ lpf->priority == 1) -+ return lpf->fragP; -+ } -+ /* Must convert a lower-priority pool. */ -+ for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev) -+ { -+ if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN) -+ return lpf->fragP; -+ } -+ /* Still no match -- try for a low priority pool. */ -+ for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev) -+ { -+ if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_CANDIDATE_BEGIN) -+ return lpf->fragP; -+ } -+ } - return seg_info (seg)->tc_segment_info_data.literal_pool_loc; - } - -@@ -7098,6 +7192,11 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn) - frag_now->tc_frag_data.slot_symbols[slot] = tinsn->symbol; - frag_now->tc_frag_data.slot_offsets[slot] = tinsn->offset; - frag_now->tc_frag_data.literal_frags[slot] = tinsn->literal_frag; -+ if (tinsn->opcode == xtensa_l32r_opcode) -+ { -+ frag_now->tc_frag_data.literal_frags[slot] = -+ tinsn->tok[1].X_add_symbol->sy_frag; -+ } - if (tinsn->literal_space != 0) - xg_assemble_literal_space (tinsn->literal_space, slot); - frag_now->tc_frag_data.free_reg[slot] = tinsn->extra_arg; -@@ -7170,6 +7269,8 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn) - frag_now->fr_symbol, frag_now->fr_offset, NULL); - xtensa_set_frag_assembly_state (frag_now); - xtensa_maybe_create_trampoline_frag (); -+ /* Always create one here. */ -+ xtensa_maybe_create_literal_pool_frag (TRUE, FALSE); - } - else if (is_branch && do_align_targets ()) - { -@@ -7314,11 +7415,18 @@ xtensa_check_frag_count (void) - clear_frag_count (); - unreachable_count = 0; - } -+ -+ /* We create an area for a possible literal pool every N (default 5000) -+ frags or so. */ -+ xtensa_maybe_create_literal_pool_frag (TRUE, TRUE); - } - - static xtensa_insnbuf trampoline_buf = NULL; - static xtensa_insnbuf trampoline_slotbuf = NULL; - -+static xtensa_insnbuf litpool_buf = NULL; -+static xtensa_insnbuf litpool_slotbuf = NULL; -+ - #define TRAMPOLINE_FRAG_SIZE 3000 - - static void -@@ -7410,6 +7518,135 @@ dump_trampolines (void) - } - } - -+static void dump_litpools (void) __attribute__ ((unused)); -+ -+static void -+dump_litpools (void) -+{ -+ struct litpool_seg *lps = litpool_seg_list.next; -+ struct litpool_frag *lpf; -+ -+ for ( ; lps ; lps = lps->next ) -+ { -+ printf("litpool seg %s\n", lps->seg->name); -+ for ( lpf = lps->frag_list.next; lpf->fragP; lpf = lpf->next ) -+ { -+ fragS *litfrag = lpf->fragP->fr_next; -+ int count = 0; -+ while (litfrag && litfrag->fr_subtype != RELAX_LITERAL_POOL_END) -+ { -+ if (litfrag->fr_fix == 4) -+ count++; -+ litfrag = litfrag->fr_next; -+ } -+ printf(" %ld <%d:%d> (%d) [%d]: ", -+ lpf->addr, lpf->priority, lpf->original_priority, -+ lpf->fragP->fr_line, count); -+ //dump_frag(lpf->fragP); -+ } -+ } -+} -+ -+static void -+xtensa_maybe_create_literal_pool_frag (bfd_boolean create, -+ bfd_boolean only_if_needed) -+{ -+ struct litpool_seg *lps = litpool_seg_list.next; -+ fragS *fragP; -+ struct litpool_frag *lpf; -+ bfd_boolean needed = FALSE; -+ -+ if (use_literal_section || !auto_litpools) -+ return; -+ -+ for ( ; lps ; lps = lps->next ) -+ { -+ if (lps->seg == now_seg) -+ break; -+ } -+ -+ if (lps == NULL) -+ { -+ lps = (struct litpool_seg *)xcalloc (sizeof (struct litpool_seg), 1); -+ lps->next = litpool_seg_list.next; -+ litpool_seg_list.next = lps; -+ lps->seg = now_seg; -+ lps->frag_list.next = &lps->frag_list; -+ lps->frag_list.prev = &lps->frag_list; -+ } -+ -+ lps->frag_count++; -+ -+ if (create) -+ { -+ if (only_if_needed) -+ { -+ if (past_xtensa_end || !use_transform() || -+ frag_now->tc_frag_data.is_no_transform) -+ { -+ return; -+ } -+ if (auto_litpool_limit <= 0) -+ { -+ /* Don't create a litpool based only on frag count. */ -+ return; -+ } -+ else if (lps->frag_count > auto_litpool_limit) -+ { -+ needed = TRUE; -+ } -+ else -+ { -+ return; -+ } -+ } -+ else -+ { -+ needed = TRUE; -+ } -+ } -+ -+ if (needed) -+ { -+ int size = (only_if_needed) ? 3 : 0; /* Space for a "j" insn. */ -+ /* Create a potential site for a literal pool. */ -+ frag_wane (frag_now); -+ frag_new (0); -+ xtensa_set_frag_assembly_state (frag_now); -+ fragP = frag_now; -+ fragP->tc_frag_data.lit_frchain = frchain_now; -+ fragP->tc_frag_data.literal_frag = fragP; -+ frag_var (rs_machine_dependent, size, size, -+ (only_if_needed) ? -+ RELAX_LITERAL_POOL_CANDIDATE_BEGIN : -+ RELAX_LITERAL_POOL_BEGIN, -+ NULL, 0, NULL); -+ frag_now->tc_frag_data.lit_seg = now_seg; -+ frag_variant (rs_machine_dependent, 0, 0, -+ RELAX_LITERAL_POOL_END, NULL, 0, NULL); -+ xtensa_set_frag_assembly_state (frag_now); -+ } -+ else -+ { -+ /* RELAX_LITERAL_POOL_BEGIN frag is being created; -+ just record it here. */ -+ fragP = frag_now; -+ } -+ -+ lpf = (struct litpool_frag *)xmalloc(sizeof (struct litpool_frag)); -+ /* Insert at tail of circular list. */ -+ lpf->addr = 0; -+ lps->frag_list.prev->next = lpf; -+ lpf->next = &lps->frag_list; -+ lpf->prev = lps->frag_list.prev; -+ lps->frag_list.prev = lpf; -+ lpf->fragP = fragP; -+ lpf->priority = (needed) ? (only_if_needed) ? 3 : 2 : 1; -+ lpf->original_priority = lpf->priority; -+ -+ lps->frag_count = 0; -+} -+ - static void - xtensa_cleanup_align_frags (void) - { -@@ -9029,7 +9266,41 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - break; - - case RELAX_LITERAL_POOL_BEGIN: -+ if (fragP->fr_var != 0) -+ { -+ /* We have a converted "candidate" literal pool; -+ assemble a jump around it. */ -+ TInsn insn; -+ if (!litpool_slotbuf) -+ { -+ litpool_buf = xtensa_insnbuf_alloc (isa); -+ litpool_slotbuf = xtensa_insnbuf_alloc (isa); -+ } -+ new_stretch += 3; -+ fragP->tc_frag_data.relax_seen = FALSE; /* Need another pass. */ -+ fragP->tc_frag_data.is_insn = TRUE; -+ tinsn_init (&insn); -+ insn.insn_type = ITYPE_INSN; -+ insn.opcode = xtensa_j_opcode; -+ insn.ntok = 1; -+ set_expr_symbol_offset (&insn.tok[0], fragP->fr_symbol, -+ fragP->fr_fix); -+ fmt = xg_get_single_format (xtensa_j_opcode); -+ tinsn_to_slotbuf (fmt, 0, &insn, litpool_slotbuf); -+ xtensa_format_set_slot (isa, fmt, 0, litpool_buf, litpool_slotbuf); -+ xtensa_insnbuf_to_chars (isa, litpool_buf, -+ (unsigned char *)fragP->fr_literal + -+ fragP->fr_fix, 3); -+ fragP->fr_fix += 3; -+ fragP->fr_var -= 3; -+ /* Add a fix-up. */ -+ fix_new (fragP, 0, 3, fragP->fr_symbol, 0, TRUE, -+ BFD_RELOC_XTENSA_SLOT0_OP); -+ } -+ break; -+ - case RELAX_LITERAL_POOL_END: -+ case RELAX_LITERAL_POOL_CANDIDATE_BEGIN: - case RELAX_MAYBE_UNREACHABLE: - case RELAX_MAYBE_DESIRE_ALIGN: - /* No relaxation required. */ -@@ -10789,12 +11060,115 @@ xtensa_move_literals (void) - segT dest_seg; - fixS *fix, *next_fix, **fix_splice; - sym_list *lit; -+ struct litpool_seg *lps; - - mark_literal_frags (literal_head->next); - - if (use_literal_section) - return; - -+ /* Assign addresses (rough estimates) to the potential literal pool locations -+ and create new ones if the gaps are too large. */ -+ -+ for (lps = litpool_seg_list.next; lps; lps = lps->next) -+ { -+ frchainS *frchP = seg_info (lps->seg)->frchainP; -+ struct litpool_frag *lpf = lps->frag_list.next; -+ addressT addr = 0; -+ -+ for ( ; frchP; frchP = frchP->frch_next) -+ { -+ fragS *fragP; -+ for (fragP = frchP->frch_root; fragP; fragP = fragP->fr_next) -+ { -+ if (lpf && fragP == lpf->fragP) -+ { -+ gas_assert(fragP->fr_type == rs_machine_dependent && -+ (fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN || -+ fragP->fr_subtype == RELAX_LITERAL_POOL_CANDIDATE_BEGIN)); -+ /* Found a litpool location. */ -+ lpf->addr = addr; -+ lpf = lpf->next; -+ } -+ if (fragP->fr_type == rs_machine_dependent && -+ fragP->fr_subtype == RELAX_SLOTS) -+ { -+ int slot; -+ for (slot = 0; slot < MAX_SLOTS; slot++) -+ { -+ if (fragP->tc_frag_data.literal_frags[slot]) -+ { -+ /* L32R; point its literal to the nearest litpool -+ preferring non-"candidate" positions to avoid -+ the jump-around. */ -+ fragS *litfrag = fragP->tc_frag_data.literal_frags[slot]; -+ struct litpool_frag *lp = lpf->prev; -+ if (!lp->fragP) -+ { -+ break; -+ } -+ while (lp->fragP->fr_subtype == -+ RELAX_LITERAL_POOL_CANDIDATE_BEGIN) -+ { -+ lp = lp->prev; -+ if (lp->fragP == NULL) -+ { -+ /* End of list; have to bite the bullet. -+ Take the nearest. */ -+ lp = lpf->prev; -+ break; -+ } -+ /* Does it (conservatively) reach? */ -+ if (addr - lp->addr <= 128 * 1024) -+ { -+ if (lp->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN) -+ { -+ /* Found a good one. */ -+ break; -+ } -+ else if (lp->prev->fragP && -+ addr - lp->prev->addr > 128 * 1024) -+ { -+ /* This is still a "candidate" but the next one -+ will be too far away, so revert to the nearest -+ one, convert it and add the jump around. */ -+ fragS *poolbeg; -+ fragS *poolend; -+ symbolS *lsym; -+ char label[10 + 2 * sizeof (fragS *)]; -+ lp = lpf->prev; -+ poolbeg = lp->fragP; -+ lp->priority = 1; -+ poolbeg->fr_subtype = RELAX_LITERAL_POOL_BEGIN; -+ poolend = poolbeg->fr_next; -+ gas_assert (poolend->fr_type == rs_machine_dependent && -+ poolend->fr_subtype == RELAX_LITERAL_POOL_END); -+ /* Create a local symbol pointing to the -+ end of the pool. */ -+ sprintf (label, ".L0_LT_%p", poolbeg); -+ lsym = (symbolS *)local_symbol_make (label, lps->seg, -+ 0, poolend); -+ poolbeg->fr_symbol = lsym; -+ /* Rest is done in xtensa_relax_frag. */ -+ } -+ } -+ } -+ if (! litfrag->tc_frag_data.literal_frag) -+ { -+ /* Take earliest use of this literal to avoid -+ forward refs. */ -+ litfrag->tc_frag_data.literal_frag = lp->fragP; -+ } -+ } -+ } -+ } -+ addr += fragP->fr_fix; -+ if (fragP->fr_type == rs_fill) -+ addr += fragP->fr_offset; -+ } -+ } -+ } -+ - for (segment = literal_head->next; segment; segment = segment->next) - { - /* Keep the literals for .init and .fini in separate sections. */ -@@ -10839,9 +11213,6 @@ xtensa_move_literals (void) - while (search_frag != frag_now) - { - next_frag = search_frag->fr_next; -- -- /* First, move the frag out of the literal section and -- to the appropriate place. */ - if (search_frag->tc_frag_data.literal_frag) - { - literal_pool = search_frag->tc_frag_data.literal_frag; -@@ -10849,8 +11220,56 @@ xtensa_move_literals (void) - frchain_to = literal_pool->tc_frag_data.lit_frchain; - gas_assert (frchain_to); - } -+ -+ if (search_frag->fr_type == rs_fill && search_frag->fr_fix == 0) -+ { -+ /* Skip empty fill frags. */ -+ *frag_splice = next_frag; -+ search_frag = next_frag; -+ continue; -+ } -+ -+ if (search_frag->fr_type == rs_align) -+ { -+ /* Skip alignment frags, because the pool as a whole will be -+ aligned if used, and we don't want to force alignment if the -+ pool is unused. */ -+ *frag_splice = next_frag; -+ search_frag = next_frag; -+ continue; -+ } -+ -+ /* First, move the frag out of the literal section and -+ to the appropriate place. */ -+ -+ /* Insert an aligmnent frag at start of pool. */ -+ if (literal_pool->fr_next->fr_type == rs_machine_dependent && -+ literal_pool->fr_next->fr_subtype == RELAX_LITERAL_POOL_END) -+ { -+ segT pool_seg = literal_pool->fr_next->tc_frag_data.lit_seg; -+ emit_state prev_state; -+ fragS *prev_frag; -+ fragS *align_frag; -+ xtensa_switch_section_emit_state (&prev_state, pool_seg, 0); -+ prev_frag = frag_now; -+ frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL); -+ align_frag = frag_now; -+ frag_align (2, 0, 0); -+ /* Splice it into the right place. */ -+ prev_frag->fr_next = align_frag->fr_next; -+ align_frag->fr_next = literal_pool->fr_next; -+ literal_pool->fr_next = align_frag; -+ /* Insert after this one. */ -+ literal_pool->tc_frag_data.literal_frag = align_frag; -+ xtensa_restore_emit_state (&prev_state); -+ } - insert_after = literal_pool->tc_frag_data.literal_frag; - dest_seg = insert_after->fr_next->tc_frag_data.lit_seg; -+ /* Skip align frag. */ -+ if (insert_after->fr_next->fr_type == rs_align) -+ { -+ insert_after = insert_after->fr_next; -+ } - - *frag_splice = next_frag; - search_frag->fr_next = insert_after->fr_next; -@@ -11014,7 +11433,10 @@ xtensa_switch_to_non_abs_literal_fragment (emit_state *result) - && !recursive - && !is_init && ! is_fini) - { -- as_bad (_("literal pool location required for text-section-literals; specify with .literal_position")); -+ if (!auto_litpools) -+ { -+ as_bad (_("literal pool location required for text-section-literals; specify with .literal_position")); -+ } - - /* When we mark a literal pool location, we want to put a frag in - the literal pool that points to it. But to do that, we want to -diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h -index b2e43fa..290d902 100644 ---- a/gas/config/tc-xtensa.h -+++ b/gas/config/tc-xtensa.h -@@ -124,6 +124,7 @@ enum xtensa_relax_statesE - - RELAX_LITERAL_POOL_BEGIN, - RELAX_LITERAL_POOL_END, -+ RELAX_LITERAL_POOL_CANDIDATE_BEGIN, - /* Technically these are not relaxations at all but mark a location - to store literals later. Note that fr_var stores the frchain for - BEGIN frags and fr_var stores now_seg for END frags. */ -diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp -index d197ec8..db39629 100644 ---- a/gas/testsuite/gas/xtensa/all.exp -+++ b/gas/testsuite/gas/xtensa/all.exp -@@ -100,5 +100,6 @@ if [istarget xtensa*-*-*] then { - run_dump_test "jlong" - run_dump_test "trampoline" -+ run_dump_test "auto-litpools" - } - - if [info exists errorInfo] then { -diff --git a/gas/testsuite/gas/xtensa/auto-litpools.d b/gas/testsuite/gas/xtensa/auto-litpools.d -new file mode 100644 -index 0000000..4d1a690 ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/auto-litpools.d -@@ -0,0 +1,12 @@ -+#as: --auto-litpools -+#objdump: -d -+#name: auto literal pool placement -+ -+.*: +file format .*xtensa.* -+#... -+.*4:.*l32r.a2, 0 .* -+#... -+.*3e437:.*j.3e440 .* -+#... -+.*40750:.*l32r.a2, 3e43c .* -+#... -diff --git a/gas/testsuite/gas/xtensa/auto-litpools.s b/gas/testsuite/gas/xtensa/auto-litpools.s -new file mode 100644 -index 0000000..9a5b26b ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/auto-litpools.s -@@ -0,0 +1,13 @@ -+ .text -+ .align 4 -+ .literal .L0, 0x12345 -+ .literal .L1, 0x12345 -+ -+f: -+ l32r a2, .L0 -+ .rep 44000 -+ _nop -+ _nop -+ .endr -+ l32r a2, .L1 -+ ret --- -1.8.1.4 - diff --git a/package/binutils/2.24/914-xtensa-fix-signedness-of-gas-relocations.patch b/package/binutils/2.24/914-xtensa-fix-signedness-of-gas-relocations.patch deleted file mode 100644 index bd751661b8..0000000000 --- a/package/binutils/2.24/914-xtensa-fix-signedness-of-gas-relocations.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 6c7c5c477ef9ccf2d2548cf2ac3cec9bd3c9c5b6 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 2 Feb 2016 17:11:38 +0300 -Subject: [PATCH] xtensa: fix signedness of gas relocations - -Change 1058c7532d0b "Use signed data type for R_XTENSA_DIFF* relocation -offsets." changed signedness of BFD_RELOC_XTENSA_DIFF* relocations -substituted for BFD_RELOC_*. This made it impossible to encode arbitrary -8-, 16- and 32-bit values, which broke e.g. debug info encoding by .loc -directive. Revert this part and add test. - -gas/ -2016-02-03 Max Filippov - * config/tc-xtensa.c (md_apply_fix): Mark BFD_RELOC_XTENSA_DIFF* - substitutions for BFD_RELOC_* as unsigned. - -gas/testsuite/ -2016-02-03 Max Filippov - * gas/xtensa/all.exp: Add loc to list of xtensa tests. - * gas/xtensa/loc.d: New file: loc test result patterns. - * gas/xtensa/loc.s: New file: loc test. - -Signed-off-by: Max Filippov ---- - gas/config/tc-xtensa.c | 6 +++--- - gas/testsuite/gas/xtensa/all.exp | 1 + - gas/testsuite/gas/xtensa/loc.d | 10 ++++++++++ - gas/testsuite/gas/xtensa/loc.s | 7 +++++++ - 4 files changed, 21 insertions(+), 3 deletions(-) - create mode 100644 gas/testsuite/gas/xtensa/loc.d - create mode 100644 gas/testsuite/gas/xtensa/loc.s - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index a119871..36a06cc 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg) - { - case BFD_RELOC_8: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8; -- fixP->fx_signed = 1; -+ fixP->fx_signed = 0; - break; - case BFD_RELOC_16: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16; -- fixP->fx_signed = 1; -+ fixP->fx_signed = 0; - break; - case BFD_RELOC_32: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32; -- fixP->fx_signed = 1; -+ fixP->fx_signed = 0; - break; - default: - break; -diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp -index 31b725b..7ff7bd7 100644 ---- a/gas/testsuite/gas/xtensa/all.exp -+++ b/gas/testsuite/gas/xtensa/all.exp -@@ -101,6 +101,7 @@ if [istarget xtensa*-*-*] then { - run_dump_test "trampoline" - run_dump_test "first_frag_align" - run_dump_test "auto-litpools" -+ run_dump_test "loc" - } - - if [info exists errorInfo] then { -diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d -new file mode 100644 -index 0000000..71983cc ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/loc.d -@@ -0,0 +1,10 @@ -+#as: -+#objdump: -r -+#name: .loc directive relocs -+ -+.*: +file format .*xtensa.* -+ -+RELOCATION RECORDS FOR \[\.debug_line\]: -+#... -+.*R_XTENSA_DIFF16.*\.text\+0x00009c42 -+#... -diff --git a/gas/testsuite/gas/xtensa/loc.s b/gas/testsuite/gas/xtensa/loc.s -new file mode 100644 -index 0000000..029e14e ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/loc.s -@@ -0,0 +1,7 @@ -+ .text -+ .file 1 "loc.s" -+ .loc 1 3 -+ nop -+ .space 40000 -+ .loc 1 5 -+ nop --- -2.1.4 - diff --git a/package/binutils/2.24/915-xtensa-fix-.init-.fini-literals-moving.patch b/package/binutils/2.24/915-xtensa-fix-.init-.fini-literals-moving.patch deleted file mode 100644 index ead3e42b75..0000000000 --- a/package/binutils/2.24/915-xtensa-fix-.init-.fini-literals-moving.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 7db2accc3fdea0aaa0c3a76a413d8e8030e022c3 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 16 Feb 2016 02:23:28 +0300 -Subject: [PATCH] xtensa: fix .init/.fini literals moving - -Despite the documentation and the comment in xtensa_move_literals, in -the presence of --text-section-literals and --auto-litpools literals are -moved from the separate literal sections into .init and .fini, because -the check in the xtensa_move_literals is incorrect. - -This moving was broken with introduction of auto litpools: some literals -now may be lost. This happens because literal frags emitted from .init -and .fini are not closed when new .literal_position marks new literal -pool. Then frag_align(2, 0, 0) changes type of the last literal frag to -rs_align. rs_align frags are skipped in the xtensa_move_literals. As a -result fixups against such literals are not moved out of .init.literal/ -.fini.literal sections producing the following assembler error: - - test.S: Warning: fixes not all moved from .init.literal - test.S: Internal error! - -Fix check for .init.literal/.fini.literal in the xtensa_move_literals -and don't let it move literals from there in the presence of ---text-section-literals or --auto-litpools. - -2016-02-17 Max Filippov -gas/ - * config/tc-xtensa.c (xtensa_move_literals): Fix check for - .init.literal/.fini.literal section name. - * testsuite/gas/xtensa/all.exp: Add init-fini-literals to the - list of xtensa tests. - * testsuite/gas/xtensa/init-fini-literals.d: New file: - init-fini-literals test result patterns. - * testsuite/gas/xtensa/init-fini-literals.s: New file: - init-fini-literals test. - -Signed-off-by: Max Filippov ---- -Backported from: 4111950f363221c4641dc2f33bea61cc94f34906 - - gas/config/tc-xtensa.c | 12 ++++++++++-- - gas/testsuite/gas/xtensa/all.exp | 1 + - gas/testsuite/gas/xtensa/init-fini-literals.d | 24 ++++++++++++++++++++++++ - gas/testsuite/gas/xtensa/init-fini-literals.s | 19 +++++++++++++++++++ - 4 files changed, 54 insertions(+), 2 deletions(-) - create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.d - create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.s - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 36a06cc..5773634 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -11061,6 +11061,10 @@ xtensa_move_literals (void) - fixS *fix, *next_fix, **fix_splice; - sym_list *lit; - struct litpool_seg *lps; -+ const char *init_name = INIT_SECTION_NAME; -+ const char *fini_name = FINI_SECTION_NAME; -+ int init_name_len = strlen(init_name); -+ int fini_name_len = strlen(fini_name); - - mark_literal_frags (literal_head->next); - -@@ -11171,9 +11175,13 @@ xtensa_move_literals (void) - - for (segment = literal_head->next; segment; segment = segment->next) - { -+ const char *seg_name = segment_name (segment->seg); -+ - /* Keep the literals for .init and .fini in separate sections. */ -- if (!strcmp (segment_name (segment->seg), INIT_SECTION_NAME) -- || !strcmp (segment_name (segment->seg), FINI_SECTION_NAME)) -+ if ((!memcmp (seg_name, init_name, init_name_len) && -+ !strcmp (seg_name + init_name_len, ".literal")) || -+ (!memcmp (seg_name, fini_name, fini_name_len) && -+ !strcmp (seg_name + fini_name_len, ".literal"))) - continue; - - frchain_from = seg_info (segment->seg)->frchainP; -diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp -index 7ff7bd7..6b67320 100644 ---- a/gas/testsuite/gas/xtensa/all.exp -+++ b/gas/testsuite/gas/xtensa/all.exp -@@ -102,6 +102,7 @@ if [istarget xtensa*-*-*] then { - run_dump_test "first_frag_align" - run_dump_test "auto-litpools" - run_dump_test "loc" -+ run_dump_test "init-fini-literals" - } - - if [info exists errorInfo] then { -diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.d b/gas/testsuite/gas/xtensa/init-fini-literals.d -new file mode 100644 -index 0000000..19ed121 ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/init-fini-literals.d -@@ -0,0 +1,24 @@ -+#as: --text-section-literals -+#objdump: -r -+#name: check that literals for .init and .fini always go to separate sections -+ -+.*: +file format .*xtensa.* -+#... -+RELOCATION RECORDS FOR \[\.init\.literal\]: -+#... -+00000000 R_XTENSA_PLT init -+#... -+RELOCATION RECORDS FOR \[\.fini\.literal\]: -+#... -+00000000 R_XTENSA_PLT fini -+#... -+RELOCATION RECORDS FOR \[\.init\]: -+#... -+.* R_XTENSA_SLOT0_OP \.init\.literal -+.* R_XTENSA_SLOT0_OP \.init\.literal\+0x00000004 -+#... -+RELOCATION RECORDS FOR \[\.fini\]: -+#... -+.* R_XTENSA_SLOT0_OP \.fini\.literal -+.* R_XTENSA_SLOT0_OP \.fini\.literal\+0x00000004 -+#... -diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.s b/gas/testsuite/gas/xtensa/init-fini-literals.s -new file mode 100644 -index 0000000..7c9ec17 ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/init-fini-literals.s -@@ -0,0 +1,19 @@ -+ .section .init,"ax",@progbits -+ .literal_position -+ .literal .LC0, init@PLT -+ .literal_position -+ .literal .LC1, 1 -+ .align 4 -+ -+ l32r a2, .LC0 -+ l32r a2, .LC1 -+ -+ .section .fini,"ax",@progbits -+ .literal_position -+ .literal .LC2, fini@PLT -+ .literal_position -+ .literal .LC3, 1 -+ .align 4 -+ -+ l32r a2, .LC2 -+ l32r a2, .LC3 --- -2.1.4 - diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 889d8ceff3..3e0c357d99 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,16 +7,6 @@ choice help Select the version of binutils you wish to use. - config BR2_BINUTILS_VERSION_2_24_X - depends on BR2_DEPRECATED_SINCE_2016_11 - # supported, but broken on Nios-II, Blackfin and powerpc64le - depends on !BR2_nios2 && !BR2_powerpc64le && !BR2_bfin - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - # Unsupported ARM cores - depends on !BR2_cortex_a17 - bool "binutils 2.24" - config BR2_BINUTILS_VERSION_2_25_X bool "binutils 2.25.1" # supported but broken on Blackfin @@ -33,7 +23,6 @@ endchoice config BR2_BINUTILS_VERSION string default "arc-2016.09-eng015" if BR2_arc - default "2.24" if BR2_BINUTILS_VERSION_2_24_X default "2.25.1" if BR2_BINUTILS_VERSION_2_25_X default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X default "2.27" if BR2_BINUTILS_VERSION_2_27_X From a7c13c1b288b1134b06d1e14c6ff008b4ed26ff9 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:50:58 +0200 Subject: [PATCH 0802/3392] gcc: remove deprecated 4.7.x We will remove BR2_DEPRECATED, so remove this deprecated option. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 + package/gcc/4.7.4/100-uclibc-conf.patch | 13 - ...werpc-link-with-math-lib.patch.conditional | 127 ---- package/gcc/4.7.4/111-pr65730.patch | 37 -- package/gcc/4.7.4/130-pr43538.patch | 25 - .../gcc/4.7.4/301-missing-execinfo_h.patch | 11 - .../4.7.4/305-libmudflap-susv3-legacy.patch | 49 -- .../gcc/4.7.4/810-arm-softfloat-libgcc.patch | 25 - .../gcc/4.7.4/830-arm_unbreak_armv4t.patch | 13 - .../843-gcc-4.7.3-Fix-PR-target-58595.patch | 102 --- .../4.7.4/844-gcc-fix-build-with-gcc5.patch | 42 -- .../gcc/4.7.4/850-libstdcxx-uclibc-c99.patch | 273 -------- package/gcc/4.7.4/851-PR-other-56780.patch | 244 -------- package/gcc/4.7.4/900-musl-support.patch | 587 ------------------ package/gcc/Config.in.host | 27 - package/gcc/gcc-final/gcc-final.mk | 12 - package/uclibc/uclibc.mk | 7 +- 17 files changed, 10 insertions(+), 1591 deletions(-) delete mode 100644 package/gcc/4.7.4/100-uclibc-conf.patch delete mode 100644 package/gcc/4.7.4/1000-powerpc-link-with-math-lib.patch.conditional delete mode 100644 package/gcc/4.7.4/111-pr65730.patch delete mode 100644 package/gcc/4.7.4/130-pr43538.patch delete mode 100644 package/gcc/4.7.4/301-missing-execinfo_h.patch delete mode 100644 package/gcc/4.7.4/305-libmudflap-susv3-legacy.patch delete mode 100644 package/gcc/4.7.4/810-arm-softfloat-libgcc.patch delete mode 100644 package/gcc/4.7.4/830-arm_unbreak_armv4t.patch delete mode 100644 package/gcc/4.7.4/843-gcc-4.7.3-Fix-PR-target-58595.patch delete mode 100644 package/gcc/4.7.4/844-gcc-fix-build-with-gcc5.patch delete mode 100644 package/gcc/4.7.4/850-libstdcxx-uclibc-c99.patch delete mode 100644 package/gcc/4.7.4/851-PR-other-56780.patch delete mode 100644 package/gcc/4.7.4/900-musl-support.patch diff --git a/Config.in.legacy b/Config.in.legacy index 45814caee8..7d68c67d0b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_GCC_VERSION_4_7_X + bool "gcc 4.7.x support removed" + select BR2_LEGACY + help + Support for gcc version 4.7.x has been removed. The current + default version (4.9.x or later) has been selected instead. + config BR2_BINUTILS_VERSION_2_24_X bool "binutils version 2.24 support removed" select BR2_LEGACY diff --git a/package/gcc/4.7.4/100-uclibc-conf.patch b/package/gcc/4.7.4/100-uclibc-conf.patch deleted file mode 100644 index 6bad179e62..0000000000 --- a/package/gcc/4.7.4/100-uclibc-conf.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gcc/gcc/config/--- gcc/contrib/regression/objs-gcc.sh -+++ gcc/contrib/regression/objs-gcc.sh -@@ -105,6 +105,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/package/gcc/4.7.4/1000-powerpc-link-with-math-lib.patch.conditional b/package/gcc/4.7.4/1000-powerpc-link-with-math-lib.patch.conditional deleted file mode 100644 index 2554263a00..0000000000 --- a/package/gcc/4.7.4/1000-powerpc-link-with-math-lib.patch.conditional +++ /dev/null @@ -1,127 +0,0 @@ -http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html - -On glibc the libc.so carries a copy of the math function copysignl() but -on uClibc math functions like copysignl() live in libm. Since libgcc_s -contains unresolved symbols, any attempt to link against libgcc_s -without explicitely specifying -lm fails, resulting in a broken -bootstrap of the compiler. - -Forward ported to gcc 4.7.3 - -Signed-off-by: Gustavo Zacarias - -diff -Nura gcc-4.7.3.orig/libgcc/config/t-slibgcc gcc-4.7.3/libgcc/config/t-slibgcc ---- gcc-4.7.3.orig/libgcc/config/t-slibgcc 2013-04-11 15:23:46.491571116 -0300 -+++ gcc-4.7.3/libgcc/config/t-slibgcc 2013-04-11 15:25:06.241141824 -0300 -@@ -27,7 +27,7 @@ - SHLIB_OBJS = @shlib_objs@ - SHLIB_DIR = @multilib_dir@ - SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@ --SHLIB_LC = -lc -+SHLIB_LC = @libgcc_libm@ -lc - SHLIB_MAKE_SOLINK = $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK) - SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \ - $(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) -diff -Nura gcc-4.7.3.orig/libgcc/configure gcc-4.7.3/libgcc/configure ---- gcc-4.7.3.orig/libgcc/configure 2013-04-11 15:23:46.551573051 -0300 -+++ gcc-4.7.3/libgcc/configure 2013-04-11 15:25:06.243141875 -0300 -@@ -563,6 +563,7 @@ - tmake_file - sfp_machine_header - set_use_emutls -+LIBGCC_LIBM - set_have_cc_tls - vis_hide - fixed_point -@@ -4445,6 +4446,37 @@ - fi - fi - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+echo "$as_me:$LINENO: checking for library containing copysignl" >&5 -+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6 -+if test "${libgcc_cv_copysignl_lib+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ -+fi -+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 -+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac - - # Conditionalize the makefile for this target machine. - tmake_file_= -diff -Nura gcc-4.7.3.orig/libgcc/configure.ac gcc-4.7.3/libgcc/configure.ac ---- gcc-4.7.3.orig/libgcc/configure.ac 2013-04-11 15:23:46.551573051 -0300 -+++ gcc-4.7.3/libgcc/configure.ac 2013-04-11 15:25:06.244141901 -0300 -@@ -324,6 +324,27 @@ - fi - AC_SUBST(set_have_cc_tls) - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+AC_CACHE_CHECK -+ libgcc_cv_copysignl_lib, -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD) -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ ]) -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac -+AC_SUBST(LIBGCC_LIBM) -+ - # See if we have emulated thread-local storage. - GCC_CHECK_EMUTLS - set_use_emutls= -diff -Nura gcc-4.7.3.orig/libgcc/Makefile.in gcc-4.7.3/libgcc/Makefile.in ---- gcc-4.7.3.orig/libgcc/Makefile.in 2013-04-11 15:23:46.537572599 -0300 -+++ gcc-4.7.3/libgcc/Makefile.in 2013-04-11 15:25:06.241141824 -0300 -@@ -41,6 +41,7 @@ - decimal_float = @decimal_float@ - enable_decimal_float = @enable_decimal_float@ - fixed_point = @fixed_point@ -+LIBGCC_LIBM = @LIBGCC_LIBM@ - - host_noncanonical = @host_noncanonical@ - target_noncanonical = @target_noncanonical@ -@@ -928,9 +929,10 @@ - @multilib_dir@,$(MULTIDIR),$(subst \ - @shlib_objs@,$(objects) libgcc.a,$(subst \ - @shlib_base_name@,libgcc_s,$(subst \ -+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \ - @shlib_map_file@,$(mapfile),$(subst \ - @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \ -- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))) -+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))) - - libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts) - # @multilib_flags@ is still needed because this may use diff --git a/package/gcc/4.7.4/111-pr65730.patch b/package/gcc/4.7.4/111-pr65730.patch deleted file mode 100644 index f195e308da..0000000000 --- a/package/gcc/4.7.4/111-pr65730.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 10 Apr 2015 17:46:30 +0300 -Subject: [PATCH] Fix PR target/65730 - -2015-05-20 Max Filippov -gcc/ - * config/xtensa/xtensa.c (init_alignment_context): Replace MULT - by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT). - -Signed-off-by: Max Filippov ---- -Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452 -Changes to ChangeLog are dropped. - - gcc/config/xtensa/xtensa.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index eb039ba..7296e36 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -1461,8 +1461,9 @@ init_alignment_context (struct alignment_context *ac, rtx mem) - if (ac->shift != NULL_RTX) - { - /* Shift is the byte count, but we need the bitcount. */ -- ac->shift = expand_simple_binop (SImode, MULT, ac->shift, -- GEN_INT (BITS_PER_UNIT), -+ gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0); -+ ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift, -+ GEN_INT (exact_log2 (BITS_PER_UNIT)), - NULL_RTX, 1, OPTAB_DIRECT); - ac->modemask = expand_simple_binop (SImode, ASHIFT, - GEN_INT (GET_MODE_MASK (mode)), --- -1.8.1.4 - diff --git a/package/gcc/4.7.4/130-pr43538.patch b/package/gcc/4.7.4/130-pr43538.patch deleted file mode 100644 index 19e57bb059..0000000000 --- a/package/gcc/4.7.4/130-pr43538.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001 -From: glisse -Date: Fri, 25 Apr 2014 08:03:08 +0000 -Subject: [PATCH] 2014-04-25 Marc Glisse - - PR target/43538 - * mt-gnu: Don't reset CXXFLAGS_FOR_TARGET. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4 -Signed-off-by: Max Filippov ---- - config/mt-gnu | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/mt-gnu b/config/mt-gnu -index 15bf417..5c696f5 100644 ---- a/config/mt-gnu -+++ b/config/mt-gnu -@@ -1 +1 @@ --CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE -+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE --- -2.1.4 - diff --git a/package/gcc/4.7.4/301-missing-execinfo_h.patch b/package/gcc/4.7.4/301-missing-execinfo_h.patch deleted file mode 100644 index 0e2092f3fb..0000000000 --- a/package/gcc/4.7.4/301-missing-execinfo_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gcc-4.0.0/boehm-gc/include/gc.h-orig 2005-04-28 22:28:57.000000000 -0500 -+++ gcc-4.0.0/boehm-gc/include/gc.h 2005-04-28 22:30:38.000000000 -0500 -@@ -500,7 +500,7 @@ - #ifdef __linux__ - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/package/gcc/4.7.4/305-libmudflap-susv3-legacy.patch b/package/gcc/4.7.4/305-libmudflap-susv3-legacy.patch deleted file mode 100644 index 374b1f8659..0000000000 --- a/package/gcc/4.7.4/305-libmudflap-susv3-legacy.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: gcc-4.2/libmudflap/mf-hooks2.c -=================================================================== ---- gcc-4.2/libmudflap/mf-hooks2.c (revision 119834) -+++ gcc-4.2/libmudflap/mf-hooks2.c (working copy) -@@ -427,7 +427,7 @@ - { - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); -- bzero (s, n); -+ memset (s, 0, n); - } - - -@@ -437,7 +437,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); - MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); -- bcopy (src, dest, n); -+ memmove (dest, src, n); - } - - -@@ -447,7 +447,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); - MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); -- return bcmp (s1, s2, n); -+ return n == 0 ? 0 : memcmp (s1, s2, n); - } - - -@@ -456,7 +456,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); -- return index (s, c); -+ return strchr (s, c); - } - - -@@ -465,7 +465,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); -- return rindex (s, c); -+ return strrchr (s, c); - } - - /* XXX: stpcpy, memccpy */ diff --git a/package/gcc/4.7.4/810-arm-softfloat-libgcc.patch b/package/gcc/4.7.4/810-arm-softfloat-libgcc.patch deleted file mode 100644 index a3d7db014d..0000000000 --- a/package/gcc/4.7.4/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/gcc/config/arm/linux-elf.h -+++ b/gcc/config/arm/linux-elf.h -@@ -57,7 +57,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - ---- a/libgcc/config/arm/t-linux -+++ b/libgcc/config/arm/t-linux -@@ -1,6 +1,10 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _arm_addsubdf3 _arm_addsubsf3 -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. diff --git a/package/gcc/4.7.4/830-arm_unbreak_armv4t.patch b/package/gcc/4.7.4/830-arm_unbreak_armv4t.patch deleted file mode 100644 index 37f8f2a54d..0000000000 --- a/package/gcc/4.7.4/830-arm_unbreak_armv4t.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/package/gcc/4.7.4/843-gcc-4.7.3-Fix-PR-target-58595.patch b/package/gcc/4.7.4/843-gcc-4.7.3-Fix-PR-target-58595.patch deleted file mode 100644 index 656952cded..0000000000 --- a/package/gcc/4.7.4/843-gcc-4.7.3-Fix-PR-target-58595.patch +++ /dev/null @@ -1,102 +0,0 @@ -commit 4fa1f8926227d4e79975b674dc4292b9bec4b137 -Author: jakub -Date: Thu Mar 6 12:07:07 2014 +0000 - - PR target/58595 - * config/arm/arm.c (arm_tls_symbol_p): Remove. - (arm_legitimize_address): Call legitimize_tls_address for any - arm_tls_referenced_p expression, handle constant addend. Call it - before testing for !TARGET_ARM. - (thumb_legitimize_address): Don't handle arm_tls_symbol_p here. - - * gcc.dg/tls/pr58595.c: New test. - - - git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208380 138bc75d-0d04-0410-961f-82ee72b054a4 - -diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c -index ce24bfe..af5666b 100644 ---- a/gcc/config/arm/arm.c -+++ b/gcc/config/arm/arm.c -@@ -235,7 +235,6 @@ static tree arm_gimplify_va_arg_expr (tree, tree, gimple_seq *, gimple_seq *); - static void arm_option_override (void); - static unsigned HOST_WIDE_INT arm_shift_truncation_mask (enum machine_mode); - static bool arm_cannot_copy_insn_p (rtx); --static bool arm_tls_symbol_p (rtx x); - static int arm_issue_rate (void); - static void arm_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED; - static bool arm_output_addr_const_extra (FILE *, rtx); -@@ -7336,6 +7335,32 @@ legitimize_tls_address (rtx x, rtx reg) - rtx - arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode) - { -+ if (arm_tls_referenced_p (x)) -+ { -+ rtx addend = NULL; -+ -+ if (GET_CODE (x) == CONST && GET_CODE (XEXP (x, 0)) == PLUS) -+ { -+ addend = XEXP (XEXP (x, 0), 1); -+ x = XEXP (XEXP (x, 0), 0); -+ } -+ -+ if (GET_CODE (x) != SYMBOL_REF) -+ return x; -+ -+ gcc_assert (SYMBOL_REF_TLS_MODEL (x) != 0); -+ -+ x = legitimize_tls_address (x, NULL_RTX); -+ -+ if (addend) -+ { -+ x = gen_rtx_PLUS (SImode, x, addend); -+ orig_x = x; -+ } -+ else -+ return x; -+ } -+ - if (!TARGET_ARM) - { - /* TODO: legitimize_address for Thumb2. */ -@@ -7344,9 +7369,6 @@ arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode) - return thumb_legitimize_address (x, orig_x, mode); - } - -- if (arm_tls_symbol_p (x)) -- return legitimize_tls_address (x, NULL_RTX); -- - if (GET_CODE (x) == PLUS) - { - rtx xop0 = XEXP (x, 0); -@@ -7459,9 +7481,6 @@ arm_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode) - rtx - thumb_legitimize_address (rtx x, rtx orig_x, enum machine_mode mode) - { -- if (arm_tls_symbol_p (x)) -- return legitimize_tls_address (x, NULL_RTX); -- - if (GET_CODE (x) == PLUS - && CONST_INT_P (XEXP (x, 1)) - && (INTVAL (XEXP (x, 1)) >= 32 * GET_MODE_SIZE (mode) -@@ -7756,20 +7775,6 @@ thumb_legitimize_reload_address (rtx *x_p, - - /* Test for various thread-local symbols. */ - --/* Return TRUE if X is a thread-local symbol. */ -- --static bool --arm_tls_symbol_p (rtx x) --{ -- if (! TARGET_HAVE_TLS) -- return false; -- -- if (GET_CODE (x) != SYMBOL_REF) -- return false; -- -- return SYMBOL_REF_TLS_MODEL (x) != 0; --} -- - /* Helper for arm_tls_referenced_p. */ - - static int diff --git a/package/gcc/4.7.4/844-gcc-fix-build-with-gcc5.patch b/package/gcc/4.7.4/844-gcc-fix-build-with-gcc5.patch deleted file mode 100644 index b076e5438e..0000000000 --- a/package/gcc/4.7.4/844-gcc-fix-build-with-gcc5.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4fb4acf88912dd978bb63ecab79641a5795ce84f Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 27 Jul 2015 15:05:14 +0200 -Subject: [PATCH] gcc: fix build with gcc5 - -gcc < 4.8 doesn't build with gcc5. - -Patch is from DragonFlyBSD github [1] - -[1] https://github.com/DragonFlyBSD/DPorts/issues/136 - -Signed-off-by: Romain Naour ---- - gcc/cp/cfns.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h -index 62cdfab..4f63cc4 100644 ---- a/gcc/cp/cfns.h -+++ b/gcc/cp/cfns.h -@@ -53,6 +53,9 @@ __inline - static unsigned int hash (const char *, unsigned int); - #ifdef __GNUC__ - __inline -+#ifdef __GNUC_STDC_INLINE__ -+__attribute__ ((__gnu_inline__)) -+#endif - #endif - const char * libc_name_p (const char *, unsigned int); - /* maximum key range = 391, duplicates = 0 */ -@@ -96,7 +99,7 @@ hash (register const char *str, register unsigned int len) - 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, - 400, 400, 400, 400, 400, 400, 400 - }; -- register int hval = len; -+ register int hval = (int)len; - - switch (hval) - { --- -2.4.3 - diff --git a/package/gcc/4.7.4/850-libstdcxx-uclibc-c99.patch b/package/gcc/4.7.4/850-libstdcxx-uclibc-c99.patch deleted file mode 100644 index 79cd7a932a..0000000000 --- a/package/gcc/4.7.4/850-libstdcxx-uclibc-c99.patch +++ /dev/null @@ -1,273 +0,0 @@ -Allow C99-depending features of libstdc++ with uClibc - -The libstdc++ code is fairly restrictive on how it checks for C99 -compatibility: it requires *complete* C99 support to enable certain -features. For example, uClibc provides a good number of C99 features, -but not C99 complex number support. For this reason, libstdc++ -completely disables many the standard C++ methods that can in fact -work because uClibc provides the necessary functions. - -This patch is similar and highly inspired from -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in -a way that doesn't involve changing the configure.ac script, as -autoreconfiguring gcc is complicated. It simply relies on the fact -that uClibc defines the __UCLIBC__ definition. - -Signed-off-by: Thomas Petazzoni - -Index: b/libstdc++-v3/config/locale/generic/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/generic/c_locale.h -+++ b/libstdc++-v3/config/locale/generic/c_locale.h -@@ -71,7 +71,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/config/locale/gnu/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/gnu/c_locale.h -+++ b/libstdc++-v3/config/locale/gnu/c_locale.h -@@ -89,7 +89,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/include/bits/basic_string.h -=================================================================== ---- a/libstdc++-v3/include/bits/basic_string.h -+++ b/libstdc++-v3/include/bits/basic_string.h -@@ -2806,7 +2806,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if (defined(__GXX_EXPERIMENTAL_CXX0X__) && defined(_GLIBCXX_USE_C99) \ -+#if (defined(__GXX_EXPERIMENTAL_CXX0X__) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) \ - && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) - - #include -Index: b/libstdc++-v3/include/bits/locale_facets.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets.tcc -+++ b/libstdc++-v3/include/bits/locale_facets.tcc -@@ -989,7 +989,7 @@ - char __fbuf[16]; - __num_base::_S_format_float(__io, __fbuf, __mod); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough (most probably sufficient - // for non-ios_base::fixed outputs) - int __cs_size = __max_digits * 3; -Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc -+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -@@ -572,7 +572,7 @@ - { - const locale __loc = __io.getloc(); - const ctype<_CharT>& __ctype = use_facet >(__loc); --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough. - int __cs_size = 64; - char* __cs = static_cast(__builtin_alloca(__cs_size)); -Index: b/libstdc++-v3/include/c_compatibility/math.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/math.h -+++ b/libstdc++-v3/include/c_compatibility/math.h -@@ -57,7 +57,7 @@ - using std::floor; - using std::fmod; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::fpclassify; - using std::isfinite; - using std::isinf; -Index: b/libstdc++-v3/include/c_compatibility/wchar.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/wchar.h -+++ b/libstdc++-v3/include/c_compatibility/wchar.h -@@ -103,7 +103,7 @@ - using std::wmemset; - using std::wcsftime; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_global/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdlib -+++ b/libstdc++-v3/include/c_global/cstdlib -@@ -146,7 +146,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_global/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_global/cwchar -+++ b/libstdc++-v3/include/c_global/cwchar -@@ -234,7 +234,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -@@ -291,7 +291,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_std/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdio -+++ b/libstdc++-v3/include/c_std/cstdio -@@ -140,7 +140,7 @@ - using ::vsprintf; - } // namespace std - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_std/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdlib -+++ b/libstdc++-v3/include/c_std/cstdlib -@@ -143,7 +143,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_std/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_std/cwchar -+++ b/libstdc++-v3/include/c_std/cwchar -@@ -230,7 +230,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -Index: b/libstdc++-v3/include/ext/vstring.h -=================================================================== ---- a/libstdc++-v3/include/ext/vstring.h -+++ b/libstdc++-v3/include/ext/vstring.h -@@ -2537,7 +2537,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if (defined(__GXX_EXPERIMENTAL_CXX0X__) && defined(_GLIBCXX_USE_C99)) -+#if (defined(__GXX_EXPERIMENTAL_CXX0X__) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))) - - #include - -Index: b/libstdc++-v3/include/tr1/cstdio -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdio -+++ b/libstdc++-v3/include/tr1/cstdio -@@ -33,7 +33,7 @@ - - #include - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cstdlib -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdlib -+++ b/libstdc++-v3/include/tr1/cstdlib -@@ -35,7 +35,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cwchar -=================================================================== ---- a/libstdc++-v3/include/tr1/cwchar -+++ b/libstdc++-v3/include/tr1/cwchar -@@ -52,7 +52,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/tr1/stdlib.h -=================================================================== ---- a/libstdc++-v3/include/tr1/stdlib.h -+++ b/libstdc++-v3/include/tr1/stdlib.h -@@ -33,7 +33,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - using std::tr1::atoll; - using std::tr1::strtoll; -Index: b/libstdc++-v3/src/c++11/debug.cc -=================================================================== ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -783,7 +783,7 @@ - int __n __attribute__ ((__unused__)), - const char* __fmt, _Tp __s) const throw () - { --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - std::snprintf(__buf, __n, __fmt, __s); - #else - std::sprintf(__buf, __fmt, __s); -Index: b/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdio -+++ b/libstdc++-v3/include/c_global/cstdio -@@ -140,7 +140,7 @@ - using ::vsprintf; - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf diff --git a/package/gcc/4.7.4/851-PR-other-56780.patch b/package/gcc/4.7.4/851-PR-other-56780.patch deleted file mode 100644 index a4ae830975..0000000000 --- a/package/gcc/4.7.4/851-PR-other-56780.patch +++ /dev/null @@ -1,244 +0,0 @@ -From 4e318d50b876def5f97e2031926354055e442ca3 Mon Sep 17 00:00:00 2001 -From: ian -Date: Sat, 1 Jun 2013 00:20:49 +0000 -Subject: [PATCH] PR other/56780 - -* libiberty/configure.ac: Move test for --enable-install-libiberty -outside of the 'with_target_subdir' test so that it actually gets -run. Add output messages to show the test result. -* libiberty/configure: Regenerate. -* libiberty/Makefile.in (install_to_libdir): Place the -installation of the libiberty library in the same guard as that -used for the headers to prevent it being installed unless -requested via --enable-install-libiberty. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199570 138bc75d-0d04-0410-961f-82ee72b054a4 - -libiberty: fix --enable-install-libiberty flag [PR 56780] - -Commit 199570 fixed the --disable-install-libiberty behavior, but it also -added a bug where the enable path never works because the initial clear -of target_header_dir wasn't deleted. So we end up initializing properly -at the top only to reset it at the end all the time. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Romain - squash the two upstream commits - Remove the ChangeLog] -Signed-off-by: Romain Naour ---- - libiberty/Makefile.in | 24 ++++++++++----------- - libiberty/configure | 57 +++++++++++++++++++++++++++----------------------- - libiberty/configure.ac | 47 ++++++++++++++++++++++------------------- - 3 files changed, 68 insertions(+), 60 deletions(-) - -diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 5280bc1..a69c6b6 100644 ---- a/libiberty/Makefile.in -+++ b/libiberty/Makefile.in -@@ -353,19 +353,19 @@ install-strip: install - # since it will be passed the multilib flags. - MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` - install_to_libdir: all -- ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR) -- $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n -- ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ) -- mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB) - if test -n "${target_header_dir}"; then \ -- case "${target_header_dir}" in \ -- /*) thd=${target_header_dir};; \ -- *) thd=${includedir}/${target_header_dir};; \ -- esac; \ -- ${mkinstalldirs} $(DESTDIR)$${thd}; \ -- for h in ${INSTALLED_HEADERS}; do \ -- ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \ -- done; \ -+ ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ -+ $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \ -+ ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \ -+ mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \ -+ case "${target_header_dir}" in \ -+ /*) thd=${target_header_dir};; \ -+ *) thd=${includedir}/${target_header_dir};; \ -+ esac; \ -+ ${mkinstalldirs} $(DESTDIR)$${thd}; \ -+ for h in ${INSTALLED_HEADERS}; do \ -+ ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \ -+ done; \ - fi - @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install - -diff --git a/libiberty/configure b/libiberty/configure -index 6e98352..44d1f78 100755 ---- a/libiberty/configure -+++ b/libiberty/configure -@@ -675,8 +675,8 @@ with_cross_host - with_newlib - enable_maintainer_mode - enable_multilib --enable_largefile - enable_install_libiberty -+enable_largefile - ' - ac_precious_vars='build_alias - host_alias -@@ -1303,8 +1303,8 @@ Optional Features: - enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-multilib build many library versions (default) -+ --enable-install-libiberty Install headers and library for end users - --disable-largefile omit support for large files -- --enable-install-libiberty Install headers for end users - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \ - cross_compiling=maybe - fi - -+# We may wish to install the target headers somewhere. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libiberty headers and static library" >&5 -+$as_echo_n "checking whether to install libiberty headers and static library... " >&6; } -+ -+# Check whether --enable-install-libiberty was given. -+if test "${enable_install_libiberty+set}" = set; then : -+ enableval=$enable_install_libiberty; enable_install_libiberty=$enableval -+else -+ enable_install_libiberty=no -+fi -+ -+# Option parsed, now set things appropriately. -+case x"$enable_install_libiberty" in -+ xyes|x) -+ target_header_dir=libiberty -+ ;; -+ xno) -+ target_header_dir= -+ ;; -+ *) -+ # This could be sanity-checked in various ways... -+ target_header_dir="${enable_install_libiberty}" -+ ;; -+esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_libiberty" >&5 -+$as_echo "$enable_install_libiberty" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: target_header_dir = $target_header_dir" >&5 -+$as_echo "$as_me: target_header_dir = $target_header_dir" >&6;} -+ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -5475,7 +5504,6 @@ fi - - setobjs= - CHECK= --target_header_dir= - if test -n "${with_target_subdir}"; then - - # We are being configured as a target library. AC_REPLACE_FUNCS -@@ -5752,29 +5780,6 @@ _ACEOF - - esac - -- # We may wish to install the target headers somewhere. -- # Check whether --enable-install-libiberty was given. --if test "${enable_install_libiberty+set}" = set; then : -- enableval=$enable_install_libiberty; enable_install_libiberty=$enableval --else -- enable_install_libiberty=no --fi -- -- # Option parsed, now set things appropriately. -- case x"$enable_install_libiberty" in -- xyes|x) -- target_header_dir=libiberty -- ;; -- xno) -- target_header_dir= -- ;; -- *) -- # This could be sanity-checked in various ways... -- target_header_dir="${enable_install_libiberty}" -- ;; -- esac -- -- - else - - # Not a target library, so we set things up to run the test suite. -diff --git a/libiberty/configure.ac b/libiberty/configure.ac -index 754b66a..04260ec 100644 ---- a/libiberty/configure.ac -+++ b/libiberty/configure.ac -@@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \ - cross_compiling=maybe - fi - -+# We may wish to install the target headers somewhere. -+AC_MSG_CHECKING([whether to install libiberty headers and static library]) -+dnl install-libiberty is disabled by default -+ -+AC_ARG_ENABLE(install-libiberty, -+[ --enable-install-libiberty Install headers and library for end users], -+enable_install_libiberty=$enableval, -+enable_install_libiberty=no)dnl -+ -+# Option parsed, now set things appropriately. -+case x"$enable_install_libiberty" in -+ xyes|x) -+ target_header_dir=libiberty -+ ;; -+ xno) -+ target_header_dir= -+ ;; -+ *) -+ # This could be sanity-checked in various ways... -+ target_header_dir="${enable_install_libiberty}" -+ ;; -+esac -+AC_MSG_RESULT($enable_install_libiberty) -+AC_MSG_NOTICE([target_header_dir = $target_header_dir]) -+ - GCC_NO_EXECUTABLES - AC_PROG_CC - AC_SYS_LARGEFILE -@@ -379,7 +404,6 @@ fi - - setobjs= - CHECK= --target_header_dir= - if test -n "${with_target_subdir}"; then - - # We are being configured as a target library. AC_REPLACE_FUNCS -@@ -490,27 +514,6 @@ if test -n "${with_target_subdir}"; then - - esac - -- # We may wish to install the target headers somewhere. -- AC_ARG_ENABLE(install-libiberty, -- [ --enable-install-libiberty Install headers for end users], -- enable_install_libiberty=$enableval, -- enable_install_libiberty=no)dnl -- -- # Option parsed, now set things appropriately. -- case x"$enable_install_libiberty" in -- xyes|x) -- target_header_dir=libiberty -- ;; -- xno) -- target_header_dir= -- ;; -- *) -- # This could be sanity-checked in various ways... -- target_header_dir="${enable_install_libiberty}" -- ;; -- esac -- -- - else - - # Not a target library, so we set things up to run the test suite. --- -2.4.3 - diff --git a/package/gcc/4.7.4/900-musl-support.patch b/package/gcc/4.7.4/900-musl-support.patch deleted file mode 100644 index bf8fbc079a..0000000000 --- a/package/gcc/4.7.4/900-musl-support.patch +++ /dev/null @@ -1,587 +0,0 @@ -Add musl support to gcc - -This patch comes from the musl-cross project at -https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version: - - * the config.sub modifications have been removed, because Buildroot - already overwrites all config.sub with a more recent config.sub - that has musl support. - - * change to ensure that a dummy dynamic linker path - MUSL_DYNAMIC_LINKER is defined for all architectures, - otherwise building gcc for architectures not supported by musl was - causing build failure. Bug reported upstream at - https://bitbucket.org/GregorR/musl-gcc-patches/issue/4/musl-gcc-patches-break-the-build-on. - - * change the USE_PT_GNU_EH_FRAME logic to keep the existing gcc logic - and only add the musl one as an addition, not as a replacement. Not - doing this breaks C++ exception handling with glibc, because - USE_PT_GNU_EH_FRAME doesn't get defined due to the configure script - not testing dl_iterate_phdr() on any system except Solaris. - -Signed-off-by: Thomas Petazzoni ---- - -# HG changeset patch -# Parent f50bb54f331f73405131a30b4f353cfda1c70304 -Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. - -Index: b/libstdc++-v3/configure.host -=================================================================== ---- a/libstdc++-v3/configure.host -+++ b/libstdc++-v3/configure.host -@@ -243,6 +243,13 @@ - os_include_dir="os/bsd/freebsd" - ;; - gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) -+ # check for musl by target -+ case "${host_os}" in -+ *-musl*) -+ os_include_dir="os/generic" -+ ;; -+ *) -+ - if [ "$uclibc" = "yes" ]; then - os_include_dir="os/uclibc" - elif [ "$bionic" = "yes" ]; then -@@ -251,6 +258,9 @@ - os_include_dir="os/gnu-linux" - fi - ;; -+ -+ esac -+ ;; - hpux*) - os_include_dir="os/hpux" - ;; -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -522,7 +522,7 @@ - esac - - # Common C libraries. --tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" -+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" - - # Common parts for widely ported systems. - case ${target} in -@@ -625,6 +625,9 @@ - *-*-*uclibc*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" - ;; -+ *-*-*musl*) -+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" -+ ;; - *) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" - ;; -@@ -2091,6 +2094,10 @@ - powerpc*-*-linux*paired*) - tm_file="${tm_file} rs6000/750cl.h" ;; - esac -+ case ${target} in -+ *-linux*-musl*) -+ enable_secureplt=yes ;; -+ esac - if test x${enable_secureplt} = xyes; then - tm_file="rs6000/secureplt.h ${tm_file}" - fi -Index: b/gcc/config/linux.h -=================================================================== ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -33,10 +33,12 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ -@@ -54,18 +56,21 @@ - uClibc or Bionic is the default C library and whether - -muclibc or -mglibc or -mbionic has been passed to change the default. */ - --#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ -- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" -+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ -+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" - - #if DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) - #elif DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) - #elif DEFAULT_LIBC == LIBC_BIONIC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) - #else - #error "Unsupported DEFAULT_LIBC" - #endif /* DEFAULT_LIBC */ -@@ -83,23 +88,32 @@ - #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" - #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32" - -+/* Musl dynamic linker paths must be defined on a per-architecture -+ basis, for each architecture supported by Musl. However, in order -+ to let other architectures continue to build with other C -+ libraries, we provide a dummy definition of the following defines. */ -+#define MUSL_DYNAMIC_LINKER "invalid" -+#define MUSL_DYNAMIC_LINKER32 "invalid" -+#define MUSL_DYNAMIC_LINKER64 "invalid" -+#define MUSL_DYNAMIC_LINKERX32 "invalid" -+ - #define GNU_USER_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ -- BIONIC_DYNAMIC_LINKER) -+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - #define GNU_USER_DYNAMIC_LINKER32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ -- BIONIC_DYNAMIC_LINKER32) -+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ -- BIONIC_DYNAMIC_LINKER64) -+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - #define GNU_USER_DYNAMIC_LINKERX32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ -- BIONIC_DYNAMIC_LINKERX32) -+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) - - /* Determine whether the entire c99 runtime - is present in the runtime library. */ - #undef TARGET_C99_FUNCTIONS --#define TARGET_C99_FUNCTIONS (OPTION_GLIBC) -+#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL) - - /* Whether we have sincos that follows the GNU extension. */ - #undef TARGET_HAS_SINCOS -@@ -108,3 +122,74 @@ - /* Whether we have Bionic libc runtime */ - #undef TARGET_HAS_BIONIC - #define TARGET_HAS_BIONIC (OPTION_BIONIC) -+ -+/* musl avoids problematic includes by rearranging the include directories. -+ * Unfortunately, this is mostly duplicated from cppdefault.c */ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define INCLUDE_DEFAULTS_MUSL_GPP \ -+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ -+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ -+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, -+ -+#ifdef LOCAL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_LOCAL \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_LOCAL -+#endif -+ -+#ifdef PREFIX_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_PREFIX -+#endif -+ -+#ifdef CROSS_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_CROSS \ -+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#ifdef TOOL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_TOOL \ -+ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_TOOL -+#endif -+ -+#ifdef NATIVE_SYSTEM_HEADER_DIR -+#define INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_NATIVE -+#endif -+ -+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) -+# undef INCLUDE_DEFAULTS_MUSL_LOCAL -+# define INCLUDE_DEFAULTS_MUSL_LOCAL -+# undef INCLUDE_DEFAULTS_MUSL_NATIVE -+# define INCLUDE_DEFAULTS_MUSL_NATIVE -+#else -+# undef INCLUDE_DEFAULTS_MUSL_CROSS -+# define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#undef INCLUDE_DEFAULTS -+#define INCLUDE_DEFAULTS \ -+ { \ -+ INCLUDE_DEFAULTS_MUSL_GPP \ -+ INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ INCLUDE_DEFAULTS_MUSL_CROSS \ -+ INCLUDE_DEFAULTS_MUSL_TOOL \ -+ INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ -+ { 0, 0, 0, 0, 0, 0 } \ -+ } -+#endif -Index: b/gcc/config/linux.opt -=================================================================== ---- a/gcc/config/linux.opt -+++ b/gcc/config/linux.opt -@@ -30,3 +30,7 @@ - muclibc - Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) - Use uClibc C library -+ -+mmusl -+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) -+Use musl C library -Index: b/gcc/ginclude/stddef.h -=================================================================== ---- a/gcc/ginclude/stddef.h -+++ b/gcc/ginclude/stddef.h -@@ -184,6 +184,7 @@ - #ifndef _GCC_SIZE_T - #ifndef _SIZET_ - #ifndef __size_t -+#ifndef __DEFINED_size_t /* musl */ - #define __size_t__ /* BeOS */ - #define __SIZE_T__ /* Cray Unicos/Mk */ - #define _SIZE_T -@@ -200,6 +201,7 @@ - #define ___int_size_t_h - #define _GCC_SIZE_T - #define _SIZET_ -+#define __DEFINED_size_t /* musl */ - #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ - || defined(__FreeBSD_kernel__) - /* __size_t is a typedef on FreeBSD 5, must not trash it. */ -@@ -215,6 +217,7 @@ - typedef long ssize_t; - #endif /* __BEOS__ */ - #endif /* !(defined (__GNUG__) && defined (size_t)) */ -+#endif /* __DEFINED_size_t */ - #endif /* __size_t */ - #endif /* _SIZET_ */ - #endif /* _GCC_SIZE_T */ -Index: b/libgomp/config/posix/time.c -=================================================================== ---- a/libgomp/config/posix/time.c -+++ b/libgomp/config/posix/time.c -@@ -28,6 +28,8 @@ - The following implementation uses the most simple POSIX routines. - If present, POSIX 4 clocks should be used instead. */ - -+#define _POSIX_C_SOURCE 199309L /* for clocks */ -+ - #include "libgomp.h" - #include - #if TIME_WITH_SYS_TIME -Index: b/libgcc/unwind-dw2-fde-dip.c -=================================================================== ---- a/libgcc/unwind-dw2-fde-dip.c -+++ b/libgcc/unwind-dw2-fde-dip.c -@@ -71,6 +71,13 @@ - # define USE_PT_GNU_EH_FRAME - #endif - -+/* For musl libc, TARGET_DL_ITERATE_PHDR gets defined by the configure -+ script. */ -+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -+ && defined(TARGET_DL_ITERATE_PHDR) -+# define USE_PT_GNU_EH_FRAME -+#endif -+ - #if defined(USE_PT_GNU_EH_FRAME) - - #include -Index: b/gcc/configure -=================================================================== ---- a/gcc/configure -+++ b/gcc/configure -@@ -26906,6 +26910,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/configure.ac -=================================================================== ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -4767,6 +4771,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/fixincludes/mkfixinc.sh -=================================================================== ---- a/fixincludes/mkfixinc.sh -+++ b/fixincludes/mkfixinc.sh -@@ -20,7 +20,8 @@ - powerpc-*-eabi* | \ - powerpc-*-rtems* | \ - powerpcle-*-eabisim* | \ -- powerpcle-*-eabi* ) -+ powerpcle-*-eabi* | \ -+ *-musl* ) - # IF there is no include fixing, - # THEN create a no-op fixer and exit - (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} -Index: b/gcc/config/i386/linux.h -=================================================================== ---- a/gcc/config/i386/linux.h -+++ b/gcc/config/i386/linux.h -@@ -22,3 +22,5 @@ - - #define GNU_USER_LINK_EMULATION "elf_i386" - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" -Index: b/gcc/config/i386/linux64.h -=================================================================== ---- a/gcc/config/i386/linux64.h -+++ b/gcc/config/i386/linux64.h -@@ -31,3 +31,10 @@ - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" - #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -+ -+#undef MUSL_DYNAMIC_LINKER32 -+#undef MUSL_DYNAMIC_LINKER64 -+#undef MUSL_DYNAMIC_LINKERX32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" -+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" -Index: b/libitm/config/linux/x86/tls.h -=================================================================== ---- a/libitm/config/linux/x86/tls.h -+++ b/libitm/config/linux/x86/tls.h -@@ -25,16 +25,19 @@ - #ifndef LIBITM_X86_TLS_H - #define LIBITM_X86_TLS_H 1 - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - /* Use slots in the TCB head rather than __thread lookups. - GLIBC has reserved words 10 through 13 for TM. */ - #define HAVE_ARCH_GTM_THREAD 1 - #define HAVE_ARCH_GTM_THREAD_DISP 1 - #endif -+#endif - - #include "config/generic/tls.h" - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - namespace GTM HIDDEN { - - #ifdef __x86_64__ -@@ -101,5 +104,6 @@ - - } // namespace GTM - #endif /* >= GLIBC 2.10 */ -+#endif - - #endif // LIBITM_X86_TLS_H -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -64,6 +64,23 @@ - #undef GLIBC_DYNAMIC_LINKER - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" - -+/* For ARM musl currently supports four dynamic linkers: -+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI -+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI -+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB -+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB -+ musl does not support the legacy OABI mode. -+ All the dynamic linkers live in /lib. -+ We default to soft-float, EL. */ -+#undef MUSL_DYNAMIC_LINKER -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" -+#endif -+#define MUSL_DYNAMIC_LINKER \ -+ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" -+ - /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to - use the GNU/Linux version, not the generic BPABI version. */ - #undef LINK_SPEC -Index: b/libitm/config/arm/hwcap.cc -=================================================================== ---- a/libitm/config/arm/hwcap.cc -+++ b/libitm/config/arm/hwcap.cc -@@ -40,7 +40,11 @@ - - #ifdef __linux__ - #include -+#ifdef __GLIBC__ - #include -+#else -+#include -+#endif - #include - - static void __attribute__((constructor)) -Index: b/gcc/config/mips/linux.h -=================================================================== ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -19,3 +19,11 @@ - . */ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+ -+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" -Index: b/gcc/config/rs6000/linux64.h -=================================================================== ---- a/gcc/config/rs6000/linux64.h -+++ b/gcc/config/rs6000/linux64.h -@@ -362,17 +362,23 @@ - #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" - #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" - #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" -+#undef MUSL_DYNAMIC_LINKER32 -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" - #elif DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER32 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - - - #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -Index: b/gcc/config/rs6000/secureplt.h -=================================================================== ---- a/gcc/config/rs6000/secureplt.h -+++ b/gcc/config/rs6000/secureplt.h -@@ -18,3 +18,4 @@ - . */ - - #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" -+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" -Index: b/gcc/config/rs6000/sysv4.h -=================================================================== ---- a/gcc/config/rs6000/sysv4.h -+++ b/gcc/config/rs6000/sysv4.h -@@ -566,6 +566,9 @@ - #ifndef CC1_SECURE_PLT_DEFAULT_SPEC - #define CC1_SECURE_PLT_DEFAULT_SPEC "" - #endif -+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC -+#define LINK_SECURE_PLT_DEFAULT_SPEC "" -+#endif - - /* Pass -G xxx to the compiler and set correct endian mode. */ - #define CC1_SPEC "%{G*} %(cc1_cpu) \ -@@ -626,7 +629,8 @@ - %{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \ - %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \ - %{mcall-i960-old: --oformat elf32-powerpcle} \ -- }}}}" -+ }}}} \ -+%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" - - /* Any specific OS flags. */ - #define LINK_OS_SPEC "\ -@@ -804,15 +808,19 @@ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - - #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -938,6 +946,7 @@ - { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \ - { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \ - { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ -+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ - { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ - { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ - { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ -Index: b/gcc/config/mips/linux64.h -=================================================================== ---- a/gcc/config/mips/linux64.h -+++ b/gcc/config/mips/linux64.h -@@ -30,4 +30,4 @@ - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -- BIONIC_DYNAMIC_LINKERN32) -+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 2eb6133446..efe60283d5 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -13,32 +13,6 @@ choice help Select the version of gcc you wish to use. - config BR2_GCC_VERSION_4_7_X - bool "gcc 4.7.x" - depends on BR2_DEPRECATED_SINCE_2016_05 - # Broken or unsupported architectures - depends on !BR2_microblaze && !BR2_aarch64 && !BR2_arc \ - && !BR2_powerpc64le && !BR2_nios2 && !BR2_bfin - # Broken or unsupported ARM cores - depends on !BR2_cortex_a12 && !BR2_pj4 && !BR2_cortex_a17 - # Broken or unsupported PPC cores - depends on !BR2_powerpc_e5500 && !BR2_powerpc_e6500 && \ - !BR2_powerpc_power8 - # SPARC -mcpu=leon3 appeared in gcc 4.8.x - depends on !BR2_sparc_leon3 - # Broken or unsupported x86 cores - depends on !BR2_x86_jaguar && !BR2_x86_steamroller - # Unsupported MIPS cores - depends on !BR2_mips_interaptiv - # Unsupported for MIPS R5 - depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - # musl ppc64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) - select BR2_GCC_NEEDS_MPC - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - config BR2_GCC_VERSION_4_8_X bool "gcc 4.8.x" # Broken or unsupported architectures @@ -133,7 +107,6 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE config BR2_GCC_VERSION string - default "4.7.4" if BR2_GCC_VERSION_4_7_X default "4.8.5" if BR2_GCC_VERSION_4_8_X default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.4.0" if BR2_GCC_VERSION_5_X diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 36f185eccf..910427340a 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -118,18 +118,6 @@ HOST_GCC_FINAL_POST_BUILD_HOOKS += TOOLCHAIN_BUILD_WRAPPER # -cc symlink to the wrapper is not created. HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS -# In gcc 4.7.x, the ARM EABIhf library loader path for glibc was not -# correct, so we create a symbolic link to make things work -# properly. glibc installs the library loader as ld-linux-armhf.so.3, -# but gcc creates binaries that reference ld-linux.so.3. -ifeq ($(BR2_arm)$(BR2_ARM_EABIHF)$(BR2_GCC_VERSION_4_7_X)$(BR2_TOOLCHAIN_USES_GLIBC),yyyy) -define HOST_GCC_FINAL_LD_LINUX_LINK - ln -sf ld-linux-armhf.so.3 $(TARGET_DIR)/lib/ld-linux.so.3 - ln -sf ld-linux-armhf.so.3 $(STAGING_DIR)/lib/ld-linux.so.3 -endef -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_LD_LINUX_LINK -endif - # coldfire is not working without removing these object files from libgcc.a ifeq ($(BR2_m68k_cf),y) define HOST_GCC_FINAL_M68K_LIBGCC_FIXUP diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 16fc0dd77d..da83d8a8e8 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -113,10 +113,9 @@ define UCLIBC_ARM_ABI_CONFIG $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config) endef -# Thumb1 build is broken with threads with old gcc versions (4.7 and -# 4.8). Since all cores supporting Thumb1 also support ARM, we use ARM -# code in this case. -ifeq ($(BR2_GCC_VERSION_4_7_X)$(BR2_GCC_VERSION_4_8_X):$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),y:yy) +# Thumb1 build is broken with threads with old gcc versions (< 4.8). Since +# all cores supporting Thumb1 also support ARM, we use ARM code in this case. +ifeq ($(BR2_GCC_VERSION_4_8_X)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),yyy) UCLIBC_EXTRA_CFLAGS += -marm endif From 3b80ca8913a6f29664f0a16a71516f8bf532acd9 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:50:59 +0200 Subject: [PATCH 0803/3392] ipkg: remove deprecated package We will remove BR2_DEPRECATED, so remove this deprecated package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 ++ package/Config.in | 1 - package/ipkg/0001-fix-musl-build.patch | 50 ---------- package/ipkg/0002-fix-nommu.patch | 24 ----- package/ipkg/Config.in | 7 -- package/ipkg/ipkg-build | 127 ------------------------- package/ipkg/ipkg.hash | 2 - package/ipkg/ipkg.mk | 13 --- 8 files changed, 8 insertions(+), 224 deletions(-) delete mode 100644 package/ipkg/0001-fix-musl-build.patch delete mode 100644 package/ipkg/0002-fix-nommu.patch delete mode 100644 package/ipkg/Config.in delete mode 100755 package/ipkg/ipkg-build delete mode 100644 package/ipkg/ipkg.hash delete mode 100644 package/ipkg/ipkg.mk diff --git a/Config.in.legacy b/Config.in.legacy index 7d68c67d0b..c27ae3d741 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_IPKG + bool "ipkg removed" + select BR2_LEGACY + help + ipkg dates back to the early 2000s when Compaq started the + handhelds.org project and it hasn't seen development since 2006. + Use opkg as a replacement. + config BR2_GCC_VERSION_4_7_X bool "gcc 4.7.x support removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 1b0ffcfc23..0257685ccb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1651,7 +1651,6 @@ comment "* " comment "See the manual: " comment "http://buildroot.org/manual.html#faq-no-binary-packages" comment "-------------------------------------------------------" - source "package/ipkg/Config.in" source "package/opkg/Config.in" source "package/rpm/Config.in" endmenu diff --git a/package/ipkg/0001-fix-musl-build.patch b/package/ipkg/0001-fix-musl-build.patch deleted file mode 100644 index fce3ec4afb..0000000000 --- a/package/ipkg/0001-fix-musl-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -Remove __P macro usage to fix musl build - -__P() is used for compatibility with old K&R C compilers. With ANSI C -this macro has no effect. - -This fixes a compilation error with musl libc because of undeclared -__P. - -Signed-off-by: Thomas Petazzoni - -Index: b/md5.c -=================================================================== ---- a/md5.c -+++ b/md5.c -@@ -97,21 +97,21 @@ - - /* Initialize structure containing state of computation. - (RFC 1321, 3.3: Step 3) */ --static void md5_init_ctx __P ((struct md5_ctx *ctx)); -+static void md5_init_ctx (struct md5_ctx *ctx); - - /* Starting with the result of former calls of this function (or the - initialization function update the context for the next LEN bytes - starting at BUFFER. - It is necessary that LEN is a multiple of 64!!! */ --static void md5_process_block __P ((const void *buffer, size_t len, -- struct md5_ctx *ctx)); -+static void md5_process_block (const void *buffer, size_t len, -+ struct md5_ctx *ctx); - - /* Starting with the result of former calls of this function (or the - initialization function update the context for the next LEN bytes - starting at BUFFER. - It is NOT required that LEN is a multiple of 64. */ --static void md5_process_bytes __P ((const void *buffer, size_t len, -- struct md5_ctx *ctx)); -+static void md5_process_bytes (const void *buffer, size_t len, -+ struct md5_ctx *ctx); - - /* Process the remaining bytes in the buffer and put result from CTX - in first 16 bytes following RESBUF. The result is always in little -@@ -120,7 +120,7 @@ - - IMPORTANT: On some systems it is required that RESBUF is correctly - aligned for a 32 bits value. */ --static void *md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf)); -+static void *md5_finish_ctx (struct md5_ctx *ctx, void *resbuf); - - //---------------------------------------------------------------------------- - //--------end of md5.h diff --git a/package/ipkg/0002-fix-nommu.patch b/package/ipkg/0002-fix-nommu.patch deleted file mode 100644 index 64cec1e65b..0000000000 --- a/package/ipkg/0002-fix-nommu.patch +++ /dev/null @@ -1,24 +0,0 @@ -libbb: fix no MMU build - -uClibc-ng defines __ARCH_HAS_MMU__ for ARM or m68k because these -architectures may potentially have MMU. The code should test for -__ARCH_USE_MMU__, which indicates if the MMU is really in use. But -since the configure script detects the presence of fork(), using -HAVE_FORK directly is a better solution. - -Signed-off-by: Baruch Siach ---- -Patch status: no active upstream - -diff -Nuar ipkg-0.99.163-orig/libbb/libbb.h ipkg-0.99.163/libbb/libbb.h ---- ipkg-0.99.163-orig/libbb/libbb.h 2006-02-06 10:13:02.000000000 +0200 -+++ ipkg-0.99.163/libbb/libbb.h 2016-07-26 13:50:09.296988855 +0300 -@@ -341,7 +341,7 @@ - #define CONSOLE_DEV "/dev/console" - - /* Cope with mmu-less systems somewhat gracefully */ --#if defined(__UCLIBC__) && !defined(__ARCH_HAS_MMU__) -+#if !defined(HAVE_FORK) - #define fork vfork - #endif - diff --git a/package/ipkg/Config.in b/package/ipkg/Config.in deleted file mode 100644 index a987bd6183..0000000000 --- a/package/ipkg/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_IPKG - bool "ipkg" - depends on BR2_DEPRECATED_SINCE_2016_08 - help - The Itsy Package Installer from handhelds.org - - http://www.handhelds.org diff --git a/package/ipkg/ipkg-build b/package/ipkg/ipkg-build deleted file mode 100755 index f3f5d0c621..0000000000 --- a/package/ipkg/ipkg-build +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/sh - -# ipkg-build -- construct a .ipk from a directory -# Carl Worth -# based on a script by Steve Redler IV, steve@sr-tech.com 5-21-2001 -set -e - -ipkg_extract_value() { - sed -e "s/^[^:]*:[[:space:]]*//" -} - -required_field() { - field=$1 - - value=`grep "^$field:" < $CONTROL/control | ipkg_extract_value` - if [ -z "$value" ]; then - echo "ipkg-build: Error: $CONTROL/control is missing field $field" ; - PKG_ERROR=1 - fi - echo $value -} - -pkg_appears_sane() { - local pkg_dir=$1 - - local owd=`pwd` - cd $pkg_dir - - PKG_ERROR=0 - if [ ! -f "$CONTROL/control" ]; then - echo "ipkg-build: Error: Control file $pkg_dir/$CONTROL/control not found." - cd $owd - return 1 - fi - - pkg=`required_field Package` - version=`required_field Version` - arch=`required_field Architecture` - required_field Maintainer >/dev/null - required_field Description >/dev/null - - if echo $pkg | grep '[^a-z0-9.+-]'; then - echo "ipkg-build: Error: Package name $name contains illegal characters, (other than [a-z0-9.+-])" - PKG_ERROR=1; - fi - - local bad_fields=`sed -ne 's/^\([^[:space:]][^:[:space:]]\+[[:space:]]\+\)[^:].*/\1/p' < $CONTROL/control | sed -e 's/\\n//'` - if [ -n "$bad_fields" ]; then - bad_fields=`echo $bad_fields` - echo "ipkg-build: Error: The following fields in $CONTROL/control are missing a ':'" - echo " $bad_fields" - echo "ipkg-build: This may be due to a missing initial space for a multi-line field value" - PKG_ERROR=1 - fi - - for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do - if [ -f $script -a ! -x $script ]; then - echo "ipkg-build: Error: package script $script is not executable" - PKG_ERROR=1 - fi - done - - if [ -f $CONTROL/conffiles ]; then - for cf in `cat $CONTROL/conffiles`; do - if [ ! -f ./$cf ]; then - echo "ipkg-build: Error: $CONTROL/conffiles mentions conffile $cf which does not exist" - PKG_ERROR=1 - fi - done - fi - - cd $owd - return $PKG_ERROR -} - -### -# ipkg-build "main" -### - -case $# in -1) - dest_dir=. - ;; -2) - dest_dir=$2 - ;; -*) - echo "Usage: ipkg-build []" ; - exit 1 - ;; -esac - -pkg_dir=$1 - -if [ ! -d $pkg_dir ]; then - echo "ipkg-build: Error: Directory $pkg_dir does not exist" - exit 1 -fi - -# CONTROL is second so that it takes precedence -CONTROL= -[ -d $pkg_dir/DEBIAN ] && CONTROL=DEBIAN -[ -d $pkg_dir/CONTROL ] && CONTROL=CONTROL -if [ -z "$CONTROL" ]; then - echo "ipkg-build: Error: Directory $pkg_dir has no CONTROL subdirectory." - exit 1 -fi - -if ! pkg_appears_sane $pkg_dir; then - echo "Please fix the above errors and try again." - exit 1 -fi - -tmp_dir=$dest_dir/IPKG_BUILD.$$ -mkdir $tmp_dir - -tar -C $pkg_dir -czf $tmp_dir/data.tar.gz . --exclude=$CONTROL -tar -C $pkg_dir/$CONTROL -czf $tmp_dir/control.tar.gz . - -echo "2.0" > $tmp_dir/debian-binary - -pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk -tar -C $tmp_dir -czf $pkg_file debian-binary data.tar.gz control.tar.gz -rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz -rmdir $tmp_dir - -echo "Packaged contents of $pkg_dir into $pkg_file" diff --git a/package/ipkg/ipkg.hash b/package/ipkg/ipkg.hash deleted file mode 100644 index 34a2d626b8..0000000000 --- a/package/ipkg/ipkg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 405743e1ba320ed6095d42a898f1486e3af1d745cae2bd45dfe1d8403a4d8995 ipkg-0.99.163.tar.gz diff --git a/package/ipkg/ipkg.mk b/package/ipkg/ipkg.mk deleted file mode 100644 index 10ef207242..0000000000 --- a/package/ipkg/ipkg.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# ipkg -# -################################################################################ - -IPKG_VERSION = 0.99.163 -IPKG_SITE = http://www.handhelds.org/download/packages/ipkg -IPKG_INSTALL_STAGING = YES -IPKG_LICENSE = GPLv2+ -IPKG_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) From 1c2a63ad6d724d933cbb2a43d5dd08f19c5c17e7 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:51:00 +0200 Subject: [PATCH 0804/3392] kodi-addon-xvdr: remove deprecated package We will remove BR2_DEPRECATED, so remove this deprecated package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 15 ++++++++--- .../kodi-addon-xvdr/0001-xbmc-rebrand.patch | 19 -------------- package/kodi-addon-xvdr/Config.in | 16 ------------ package/kodi-addon-xvdr/kodi-addon-xvdr.hash | 2 -- package/kodi-addon-xvdr/kodi-addon-xvdr.mk | 26 ------------------- package/kodi/Config.in | 1 - 6 files changed, 12 insertions(+), 67 deletions(-) delete mode 100644 package/kodi-addon-xvdr/0001-xbmc-rebrand.patch delete mode 100644 package/kodi-addon-xvdr/Config.in delete mode 100644 package/kodi-addon-xvdr/kodi-addon-xvdr.hash delete mode 100644 package/kodi-addon-xvdr/kodi-addon-xvdr.mk diff --git a/Config.in.legacy b/Config.in.legacy index c27ae3d741..5e65d7b0f8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_KODI_ADDON_XVDR + bool "kodi-addon-xvdr removed" + select BR2_LEGACY + help + According to the github project page: + https://github.com/pipelka/xbmc-addon-xvdr + this package is discontinued. + config BR2_PACKAGE_IPKG bool "ipkg removed" select BR2_LEGACY @@ -1366,11 +1374,12 @@ config BR2_PACKAGE_STRONGSWAN_TOOLS deprecated. config BR2_PACKAGE_XBMC_ADDON_XVDR - bool "xbmc options have been renamed" + bool "xbmc-addon-xvdr removed" select BR2_LEGACY - select BR2_PACKAGE_KODI_ADDON_XVDR help - The XBMC media center project was renamed to Kodi entertainment center + According to the github project page: + https://github.com/pipelka/xbmc-addon-xvdr + this package is discontinued. config BR2_PACKAGE_XBMC_PVR_ADDONS bool "xbmc options have been renamed" diff --git a/package/kodi-addon-xvdr/0001-xbmc-rebrand.patch b/package/kodi-addon-xvdr/0001-xbmc-rebrand.patch deleted file mode 100644 index 6e87b79b64..0000000000 --- a/package/kodi-addon-xvdr/0001-xbmc-rebrand.patch +++ /dev/null @@ -1,19 +0,0 @@ -Update for Kodi - -Ported from OpenELEC: -https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/mediacenter/kodi-addon-xvdr/patches/kodi-addon-xvdr-xbmc-rebrand.patch - -Signed-off-by: Bernd Kuhls - -diff -Naur xbmc-addon-xvdr-2bf2563/configure.ac xbmc-addon-xvdr-2bf2563.patch/configure.ac ---- xbmc-addon-xvdr-2bf2563/configure.ac 2014-10-18 22:02:18.000000000 +0200 -+++ xbmc-addon-xvdr-2bf2563.patch/configure.ac 2014-10-20 03:03:20.525526996 +0200 -@@ -6,7 +6,7 @@ - AC_INIT([xbmc-addon-xvdr], [MAJOR.MINOR.MICRO], [alexander.pipelka@gmail.com]) - - AC_CONFIG_AUX_DIR(autotools) --AC_PREFIX_DEFAULT(/usr/lib/xbmc) -+AC_PREFIX_DEFAULT(/usr/lib/kodi) - - AC_CANONICAL_HOST - AC_CANONICAL_TARGET diff --git a/package/kodi-addon-xvdr/Config.in b/package/kodi-addon-xvdr/Config.in deleted file mode 100644 index 85e9d600c8..0000000000 --- a/package/kodi-addon-xvdr/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_KODI_ADDON_XVDR - bool "kodi-addon-xvdr" - # upstream discontinued the development - depends on BR2_DEPRECATED_SINCE_2016_05 - help - This is a PVR add-on for Kodi to add VDR (http://tvdr.de/) - as a TV/PVR Backend to Kodi. - - It adds support for Live TV watching, replaying of Recordings, - programming Timers and EPG TV Guide to use on same computer or - over the Network. - - https://github.com/pipelka/xbmc-addon-xvdr - - Note: since the VDR server is not packaged in Buildroot, using - this addon requires that a remote VDR server be used. diff --git a/package/kodi-addon-xvdr/kodi-addon-xvdr.hash b/package/kodi-addon-xvdr/kodi-addon-xvdr.hash deleted file mode 100644 index 933c7b8de2..0000000000 --- a/package/kodi-addon-xvdr/kodi-addon-xvdr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 783796eccc19c639c59b7a05cad1df705d557993b15cc7e29f7dbbd8388d698b kodi-addon-xvdr-ae66610bc2e1a3efe49f4fa0db55ff3a7808a247.tar.gz diff --git a/package/kodi-addon-xvdr/kodi-addon-xvdr.mk b/package/kodi-addon-xvdr/kodi-addon-xvdr.mk deleted file mode 100644 index ac7f3cb0b5..0000000000 --- a/package/kodi-addon-xvdr/kodi-addon-xvdr.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# kodi-addon-xvdr -# -################################################################################ - -# This cset is on master. When a Jarvis branch is made, we should -# follow it, as incompatible changes in the plugins API can happen -# on the master branch. -KODI_ADDON_XVDR_VERSION = ae66610bc2e1a3efe49f4fa0db55ff3a7808a247 -KODI_ADDON_XVDR_SITE = $(call github,pipelka,xbmc-addon-xvdr,$(KODI_ADDON_XVDR_VERSION)) -KODI_ADDON_XVDR_LICENSE = GPLv2+ -KODI_ADDON_XVDR_LICENSE_FILES = COPYING - -# There's no ./configure in the git tree, we need to generate it -# kodi-addon-xvdr uses a weird autogen.sh script, which -# is even incorrect (it's missing the #! ) Sigh... :-( -# Fortunately, with our little patch, it autoreconfs nicely! :-) -KODI_ADDON_XVDR_AUTORECONF = YES - -# This really is a runtime dependency, but we need KODI to be installed -# first, since we'll install files in KODI's directories _after_ KODI has -# installed his own files -KODI_ADDON_XVDR_DEPENDENCIES = kodi - -$(eval $(autotools-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 4174c6b0c5..f2a3e2e032 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -279,7 +279,6 @@ menu "Audio encoder addons" endmenu menu "PVR addons" - source "package/kodi-addon-xvdr/Config.in" source "package/kodi-pvr-argustv/Config.in" source "package/kodi-pvr-dvblink/Config.in" source "package/kodi-pvr-dvbviewer/Config.in" From 133466f5f23a6550fd136170d841c58c6581a63c Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:51:01 +0200 Subject: [PATCH 0805/3392] linux-headers: remove deprecated version 4.2 and 4.3 We will remove BR2_DEPRECATED, so remove this deprecated package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 20 ++++++++++++++++++++ package/linux-headers/Config.in.host | 12 ------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5e65d7b0f8..76365e6f72 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,26 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_KERNEL_HEADERS_4_3 + bool "kernel headers version 4.3.x are no longer supported" + select BR2_KERNEL_HEADERS_4_1 + select BR2_LEGACY + help + Version 4.3.x of the Linux kernel headers are no longer + maintained upstream and are now removed. As an alternative, + version 4.1.x of the headers have been automatically + selected in your configuration. + +config BR2_KERNEL_HEADERS_4_2 + bool "kernel headers version 4.2.x are no longer supported" + select BR2_KERNEL_HEADERS_4_1 + select BR2_LEGACY + help + Version 4.2.x of the Linux kernel headers are no longer + maintained upstream and are now removed. As an alternative, + version 4.1.x of the headers have been automatically + selected in your configuration. + config BR2_PACKAGE_KODI_ADDON_XVDR bool "kodi-addon-xvdr removed" select BR2_LEGACY diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ebb869ba69..60578b8fc8 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -60,16 +60,6 @@ choice bool "Linux 4.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 - config BR2_KERNEL_HEADERS_4_2 - bool "Linux 4.2.x kernel headers" - depends on BR2_DEPRECATED_SINCE_2016_02 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 - - config BR2_KERNEL_HEADERS_4_3 - bool "Linux 4.3.x kernel headers" - depends on BR2_DEPRECATED_SINCE_2016_05 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 - config BR2_KERNEL_HEADERS_4_4 bool "Linux 4.4.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 @@ -242,8 +232,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.34" if BR2_KERNEL_HEADERS_4_1 - default "4.2.8" if BR2_KERNEL_HEADERS_4_2 - default "4.3.6" if BR2_KERNEL_HEADERS_4_3 default "4.4.24" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 From 290166f25bfa347c80deb77ab2175a65cff5733b Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:51:02 +0200 Subject: [PATCH 0806/3392] sstrip: remove deprecated package We will remove BR2_DEPRECATED, so remove this deprecated package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 9 +++++++++ package/Config.in | 1 - package/sstrip/Config.in | 8 -------- package/sstrip/sstrip.mk | 20 -------------------- 4 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 package/sstrip/Config.in delete mode 100644 package/sstrip/sstrip.mk diff --git a/Config.in.legacy b/Config.in.legacy index 76365e6f72..1fcedfe91f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,15 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_SSTRIP + bool "sstrip removed" + select BR2_LEGACY + help + sstrip is unmaintained and potentially harmful. It doesn't + save so much compared to normal binutils strip, and there is + a big risk of binaries that don't work. Use normal strip + instead. + config BR2_KERNEL_HEADERS_4_3 bool "kernel headers version 4.3.x are no longer supported" select BR2_KERNEL_HEADERS_4_1 diff --git a/package/Config.in b/package/Config.in index 0257685ccb..47c08015bc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -143,7 +143,6 @@ menu "Development tools" source "package/patch/Config.in" source "package/pkgconf/Config.in" source "package/sed/Config.in" - source "package/sstrip/Config.in" source "package/subversion/Config.in" source "package/tree/Config.in" source "package/yasm/Config.in" diff --git a/package/sstrip/Config.in b/package/sstrip/Config.in deleted file mode 100644 index c458f8eab1..0000000000 --- a/package/sstrip/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_SSTRIP - bool "sstrip" - depends on BR2_DEPRECATED_SINCE_2016_08 - help - Small utility that removes a few bytes from an executable that - strip leaves behind. - - http://www.muppetlabs.com/~breadbox/software/elfkickers.html diff --git a/package/sstrip/sstrip.mk b/package/sstrip/sstrip.mk deleted file mode 100644 index 685ea09fbd..0000000000 --- a/package/sstrip/sstrip.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# sstrip -# -################################################################################ - -SSTRIP_SITE = svn://svn.openwrt.org/openwrt/trunk/tools/sstrip -SSTRIP_VERSION = 20154 - -define SSTRIP_BUILD_CMDS - cd $(@D) ; \ - $(TARGET_CC) $(TARGET_CFLAGS) -include endian.h -include byteswap.h \ - -o sstrip src/sstrip.c -endef - -define SSTRIP_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/sstrip $(TARGET_DIR)/usr/bin/sstrip -endef - -$(eval $(generic-package)) From ea3a7ee0c3cbbb04ac0696684e3aa3ab28a33955 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:51:03 +0200 Subject: [PATCH 0807/3392] torsmo: remove deprecated package We will remove BR2_DEPRECATED, so remove this deprecated package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/torsmo/Config.in | 11 ----------- package/torsmo/torsmo.hash | 2 -- package/torsmo/torsmo.mk | 18 ------------------ 5 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 package/torsmo/Config.in delete mode 100644 package/torsmo/torsmo.hash delete mode 100644 package/torsmo/torsmo.mk diff --git a/Config.in.legacy b/Config.in.legacy index 1fcedfe91f..a3720520c5 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_TORSMO + bool "torsmo removed" + select BR2_LEGACY + help + torsmo has been unmaintained for a long time, and nobody + seems to be interested in it. + config BR2_PACKAGE_SSTRIP bool "sstrip removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 47c08015bc..0a17ce0e49 100644 --- a/package/Config.in +++ b/package/Config.in @@ -305,7 +305,6 @@ comment "X applications" source "package/qt-webkit-kiosk/Config.in" source "package/rdesktop/Config.in" source "package/synergy/Config.in" - source "package/torsmo/Config.in" source "package/wmctrl/Config.in" source "package/x11vnc/Config.in" source "package/xdotool/Config.in" diff --git a/package/torsmo/Config.in b/package/torsmo/Config.in deleted file mode 100644 index 5c18ac6f48..0000000000 --- a/package/torsmo/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_TORSMO - bool "torsmo" - depends on BR2_DEPRECATED_SINCE_2015_11 - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - help - Torsmo is a system monitor that sits in the corner of your desktop. - - http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Torsmo diff --git a/package/torsmo/torsmo.hash b/package/torsmo/torsmo.hash deleted file mode 100644 index 8bbf9dc87a..0000000000 --- a/package/torsmo/torsmo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6a6bc82e71c841ba9359f0ffe370e57ef7b04b49a448252bb0c1c28fc10e964c torsmo-0.18.tar.gz diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk deleted file mode 100644 index 96a797603f..0000000000 --- a/package/torsmo/torsmo.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# torsmo -# -################################################################################ - -TORSMO_VERSION = 0.18 -TORSMO_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Torsmo -TORSMO_LICENSE = BSD-3c -TORSMO_LICENSE_FILES = COPYING - -# help2man doesn't work when cross compiling -TORSMO_CONF_ENV = ac_cv_path_HELP2MAN='' -TORSMO_CONF_OPTS = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries="-I$(STAGING_DIR)/usr/lib" --with-x - -TORSMO_DEPENDENCIES = xlib_libX11 xlib_libXext - -$(eval $(autotools-package)) From 79c82a35a04753cd1c4d40c8ea946e7872b2db48 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:51:04 +0200 Subject: [PATCH 0808/3392] webkitgtk24: remove deprecated package We will remove BR2_DEPRECATED, so remove this deprecated package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 9 ++ DEVELOPERS | 1 - package/Config.in | 1 - package/webkitgtk24/0001-fix-ppc32.patch | 34 ----- ...quotes-in-licence-break-Python-stdin.patch | 36 ----- package/webkitgtk24/Config.in | 83 ------------ package/webkitgtk24/webkitgtk24.hash | 4 - package/webkitgtk24/webkitgtk24.mk | 124 ------------------ 8 files changed, 9 insertions(+), 283 deletions(-) delete mode 100644 package/webkitgtk24/0001-fix-ppc32.patch delete mode 100644 package/webkitgtk24/0003-Pretty-quotes-in-licence-break-Python-stdin.patch delete mode 100644 package/webkitgtk24/Config.in delete mode 100644 package/webkitgtk24/webkitgtk24.hash delete mode 100644 package/webkitgtk24/webkitgtk24.mk diff --git a/Config.in.legacy b/Config.in.legacy index a3720520c5..0c47992b76 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,15 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_WEBKITGTK24 + bool "webkitgtk 2.4.x removed" + select BR2_LEGACY + help + This legacy package only existed because some other packages + depended on that specific version of webkitgtk. However, the + other packages have been fixed. webkitgtk 2.4 is full of + security issues so it needs to be removed. + config BR2_PACKAGE_TORSMO bool "torsmo removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index e959525d59..5bc9ba723f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -715,7 +715,6 @@ F: package/vorbis-tools/ F: package/wavpack/ F: package/wayland-protocols/ F: package/webkitgtk/ -F: package/webkitgtk24/ F: package/whois/ F: package/wireshark/ F: package/wpa_supplicant/ diff --git a/package/Config.in b/package/Config.in index 0a17ce0e49..cdaf9e347a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1012,7 +1012,6 @@ menu "Graphics" source "package/wayland/Config.in" source "package/wayland-protocols/Config.in" source "package/webkitgtk/Config.in" - source "package/webkitgtk24/Config.in" source "package/webp/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" diff --git a/package/webkitgtk24/0001-fix-ppc32.patch b/package/webkitgtk24/0001-fix-ppc32.patch deleted file mode 100644 index c655a0ecf4..0000000000 --- a/package/webkitgtk24/0001-fix-ppc32.patch +++ /dev/null @@ -1,34 +0,0 @@ -From https://bugs.webkit.org/show_bug.cgi?id=130837 - -Signed-off-by: Gustavo Zacarias - -diff -Nura webkitgtk-2.4.8/Source/WebKit2/Platform/IPC/Connection.h webkitgtk-2.4.8-ppc/Source/WebKit2/Platform/IPC/Connection.h ---- webkitgtk-2.4.8/Source/WebKit2/Platform/IPC/Connection.h 2015-01-07 06:45:43.000000000 -0300 -+++ webkitgtk-2.4.8-ppc/Source/WebKit2/Platform/IPC/Connection.h 2015-04-20 01:55:41.554547510 -0300 -@@ -216,7 +216,11 @@ - - Client* m_client; - bool m_isServer; -+#if CPU(PPC) -+ uint64_t m_syncRequestID; -+#else - std::atomic m_syncRequestID; -+#endif - - bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage; - bool m_shouldExitOnSyncMessageSendFailure; -diff -Nura webkitgtk-2.4.8/Source/WebKit2/UIProcess/StatisticsRequest.cpp webkitgtk-2.4.8-ppc/Source/WebKit2/UIProcess/StatisticsRequest.cpp ---- webkitgtk-2.4.8/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2015-01-07 06:45:43.000000000 -0300 -+++ webkitgtk-2.4.8-ppc/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2015-04-20 01:55:41.555547544 -0300 -@@ -44,7 +44,11 @@ - - uint64_t StatisticsRequest::addOutstandingRequest() - { -+#if CPU(PPC) -+ static int64_t uniqueRequestID; -+#else - static std::atomic uniqueRequestID; -+#endif - - uint64_t requestID = ++uniqueRequestID; - m_outstandingRequests.add(requestID); diff --git a/package/webkitgtk24/0003-Pretty-quotes-in-licence-break-Python-stdin.patch b/package/webkitgtk24/0003-Pretty-quotes-in-licence-break-Python-stdin.patch deleted file mode 100644 index df51078b06..0000000000 --- a/package/webkitgtk24/0003-Pretty-quotes-in-licence-break-Python-stdin.patch +++ /dev/null @@ -1,36 +0,0 @@ -Pretty quotes in licence break Python stdin. - -This patch was submitted upstream in this bug report: - -https://bugs.webkit.org/show_bug.cgi?id=128971 - -[Vincent: tweak the patch to make it apply on Buildroot] - -Signed-off-by: Vicente Olivert Riera - -Pretty quotes in licence break Python stdin. - -https://bugs.webkit.org/show_bug.cgi?id=128971 - ---- a/Source/WebCore/xml/XMLViewer.css 2014-01-23 16:49:58.000000000 +0000 -+++ b/Source/WebCore/xml/XMLViewer.css -@@ -14,7 +14,7 @@ - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS -- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. - * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ---- a/Source/WebCore/xml/XMLViewer.js 2014-01-23 16:49:58.000000000 +0000 -+++ b/Source/WebCore/xml/XMLViewer.js -@@ -15,7 +15,7 @@ - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS -- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. - * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, diff --git a/package/webkitgtk24/Config.in b/package/webkitgtk24/Config.in deleted file mode 100644 index bba3a2b9cc..0000000000 --- a/package/webkitgtk24/Config.in +++ /dev/null @@ -1,83 +0,0 @@ -config BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS - bool - # ARM needs BLX, so v5t+, BE completely untested so disabled - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 - default y if BR2_i386 || BR2_x86_64 - # Disabled on MIPS big endian due to sigbus - default y if BR2_mipsel || BR2_mips64el - # Disabled on PowerPC pending runtime testing - # Disabled on SuperH because of segfault - depends on BR2_USE_MMU # libglib2 - -comment "webkitgtk24 needs libgtk2 and a toolchain w/ C++, wchar, NPTL, gcc >=4.8" - depends on BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_LIBGTK2 || !BR2_PACKAGE_XORG7 || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_USE_MMU - depends on BR2_DEPRECATED_SINCE_2016_05 - -config BR2_PACKAGE_WEBKITGTK24 - bool "webkitgtk 2.4.x" - depends on BR2_DEPRECATED_SINCE_2016_05 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on (BR2_PACKAGE_LIBGTK2 && BR2_PACKAGE_XORG7) - depends on BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_ENCHANT - select BR2_PACKAGE_HARFBUZZ - select BR2_PACKAGE_ICU - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBSECRET - select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_WEBP - select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_HAS_LIBGL || \ - (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL) - select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_HAS_LIBGL || \ - (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL) - help - WebKit is an open source, standards compliant web browser engine. - - http://www.webkitgtk.org/ - -if BR2_PACKAGE_WEBKITGTK24 - -config BR2_PACKAGE_WEBKITGTK24_HTTPS - bool "HTTPS support" - select BR2_PACKAGE_CA_CERTIFICATES # runtime - select BR2_PACKAGE_LIBSOUP_SSL - help - Enable HTTPS protocol support. - -config BR2_PACKAGE_WEBKITGTK24_MULTIMEDIA - bool "multimedia support" - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME - select BR2_PACKAGE_GST1_PLUGINS_GOOD - select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 - select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP - select BR2_PACKAGE_GST1_LIBAV - help - This option pulls in all of the required dependencies - to enable basic multimedia (video/audio) support. - -endif diff --git a/package/webkitgtk24/webkitgtk24.hash b/package/webkitgtk24/webkitgtk24.hash deleted file mode 100644 index d3a9cca0f4..0000000000 --- a/package/webkitgtk24/webkitgtk24.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.webkitgtk.org/releases/webkitgtk-2.4.10.tar.xz.sha1 -sha1 7fe2fe07ed21d00d8a8483d68c13a8c7ff0ff320 webkitgtk-2.4.10.tar.xz -# Calculated based on the hash above -sha256 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 webkitgtk-2.4.10.tar.xz diff --git a/package/webkitgtk24/webkitgtk24.mk b/package/webkitgtk24/webkitgtk24.mk deleted file mode 100644 index 4b7d6949d4..0000000000 --- a/package/webkitgtk24/webkitgtk24.mk +++ /dev/null @@ -1,124 +0,0 @@ -################################################################################ -# -# webkitgtk 2.4.x -# -################################################################################ - -WEBKITGTK24_VERSION = 2.4.10 -WEBKITGTK24_SITE = http://www.webkitgtk.org/releases -WEBKITGTK24_SOURCE = webkitgtk-$(WEBKITGTK24_VERSION).tar.xz -WEBKITGTK24_INSTALL_STAGING = YES -WEBKITGTK24_LICENSE = LGPLv2+, BSD-2c -WEBKITGTK24_LICENSE_FILES = \ - Source/WebCore/LICENSE-APPLE \ - Source/WebCore/LICENSE-LGPL-2 -WEBKITGTK24_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \ - host-pkgconf enchant harfbuzz icu jpeg libcurl libgtk2 \ - libsecret libsoup libxml2 libxslt sqlite webp - -WEBKITGTK24_DEPENDENCIES += \ - $(if $(BR_PACKAGE_XLIB_LIBXCOMPOSITE),xlib_libXcomposite) \ - $(if $(BR_PACKAGE_XLIB_LIBXDAMAGE),xlib_libXdamage) - -# make 3.81 loops into oblivion with numjobs > 1 -ifneq ($(findstring x3.81,x$(RUNNING_MAKE_VERSION)),) -WEBKITGTK24_MAKE = $(MAKE1) -endif - -# Give explicit path to icu-config to avoid host leakage -WEBKITGTK24_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config - -# Some 32-bit architectures need libatomic support for 64-bit ops -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -WEBKITGTK24_CONF_ENV += LIBS="-latomic" -endif - -# dependency tracking is to avoid build issues in the GEN/WTF phase -WEBKITGTK24_CONF_OPTS = \ - --enable-dependency-tracking \ - --enable-spellcheck \ - --disable-geolocation \ - --disable-glibtest \ - --disable-gtk-doc-html \ - --disable-wayland-target - -ifeq ($(BR2_PACKAGE_WEBKITGTK24_MULTIMEDIA),y) -WEBKITGTK24_CONF_OPTS += \ - --enable-video \ - --enable-web-audio -WEBKITGTK24_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good -else -WEBKITGTK24_CONF_OPTS += \ - --disable-video \ - --disable-web-audio -endif - -# OpenGL -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -WEBKITGTK24_CONF_OPTS += \ - --enable-accelerated-compositing \ - --enable-glx \ - --enable-webgl \ - --disable-gles2 -WEBKITGTK24_DEPENDENCIES += libgl -# EGL + GLES -else ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy) -WEBKITGTK24_CONF_OPTS += \ - --enable-accelerated-compositing \ - --enable-gles2 \ - --enable-webgl \ - --disable-glx -WEBKITGTK24_DEPENDENCIES += libegl libgles -# Some EGL/GLES implementations needs extra help (eg. rpi-userland) -WEBKITGTK24_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) \ - `$(PKG_CONFIG_HOST_BINARY) --cflags egl` \ - `$(PKG_CONFIG_HOST_BINARY) --clfags glesv2`" -# No GL -else -WEBKITGTK24_CONF_OPTS += \ - --disable-accelerated-compositing \ - --disable-gles2 \ - --disable-glx \ - --disable-webgl -endif - -# X11 target with GTK2 (optionally GTK3) -ifeq ($(BR2_PACKAGE_XLIB_LIBXT),y) -WEBKITGTK24_CONF_OPTS += --enable-x11-target -WEBKITGTK24_DEPENDENCIES += xlib_libXt -else -WEBKITGTK24_CONF_OPTS += --disable-x11-target -endif - -# ARM needs NEON for JIT -# i386 & x86_64 don't seem to have any special requirements -ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_i386)$(BR2_x86_64),y) -WEBKITGTK24_CONF_OPTS += --enable-jit -else -WEBKITGTK24_CONF_OPTS += --disable-jit -# Disabling assembly and JIT needs an extra push sometimes (ppc) -# See https://bugs.webkit.org/show_bug.cgi?format=multiple&id=113638 -WEBKITGTK24_CONF_ENV += \ - CPPFLAGS="$(TARGET_CPPFLAGS) -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0" -endif - -# webkit1 (old API) uses gtk2, webkit2 (new API) uses gtk3 -# Both can be built simultaneously, prefer "newer" for size/time savings -# gtk2 is mandatory for plugin support -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -WEBKITGTK24_CONF_OPTS += \ - --with-gtk=3.0 \ - --disable-webkit1 -WEBKITGTK24_DEPENDENCIES += libgtk3 -define WEBKITGTK24_INSTALL_BROWSER - $(INSTALL) -D -m 0755 $(@D)/Programs/MiniBrowser \ - $(TARGET_DIR)/usr/bin/MiniBrowser -endef -WEBKITGTK24_POST_INSTALL_TARGET_HOOKS += WEBKITGTK24_INSTALL_BROWSER -else -WEBKITGTK24_CONF_OPTS += \ - --with-gtk=2.0 \ - --disable-webkit2 -endif - -$(eval $(autotools-package)) From 152d4b66c4006f297076ca170749ed25c5a33b70 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:51:05 +0200 Subject: [PATCH 0809/3392] wvdial: remove deprecated package We will remove BR2_DEPRECATED, so remove this deprecated package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 ++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/wvdial/0001-uClibc-scandir.patch | 23 ----------------- package/wvdial/Config.in | 17 ------------- package/wvdial/wvdial.hash | 2 -- package/wvdial/wvdial.mk | 32 ------------------------ 7 files changed, 7 insertions(+), 76 deletions(-) delete mode 100644 package/wvdial/0001-uClibc-scandir.patch delete mode 100644 package/wvdial/Config.in delete mode 100644 package/wvdial/wvdial.hash delete mode 100644 package/wvdial/wvdial.mk diff --git a/Config.in.legacy b/Config.in.legacy index 0c47992b76..b5fb49fe5d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_WVDIAL + bool "wvdial removed" + select BR2_LEGACY + help + wvdial is not maintained anymore since about 2009. It also + doesn't build anymore with recent compilers (GCC 5+). + config BR2_PACKAGE_WEBKITGTK24 bool "webkitgtk 2.4.x removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 5bc9ba723f..00b853d0c0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1348,7 +1348,6 @@ F: package/sconeserver/ F: package/sound-theme-borealis/ F: package/sound-theme-freedesktop/ F: package/vlc/ -F: package/wvdial/ F: package/wvstreams/ F: package/xscreensaver/ F: package/zmqpp/ diff --git a/package/Config.in b/package/Config.in index cdaf9e347a..b7cb9708e6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1628,7 +1628,6 @@ endif source "package/wireshark/Config.in" source "package/wpa_supplicant/Config.in" source "package/wpan-tools/Config.in" - source "package/wvdial/Config.in" source "package/xinetd/Config.in" source "package/xl2tp/Config.in" source "package/xtables-addons/Config.in" diff --git a/package/wvdial/0001-uClibc-scandir.patch b/package/wvdial/0001-uClibc-scandir.patch deleted file mode 100644 index b611e94a0b..0000000000 --- a/package/wvdial/0001-uClibc-scandir.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix wvdial so that it works with scandir as defined in uClibc. - -Signed-off-by: Simon Dawson - -diff -Nurp a/wvmodemscan.cc b/wvmodemscan.cc ---- a/wvmodemscan.cc 2009-09-29 18:27:28.000000000 +0100 -+++ b/wvmodemscan.cc 2012-07-28 14:03:56.359729660 +0100 -@@ -495,13 +495,13 @@ static int fileselect(const struct diren - // (no internal ISDN support) || !strncmp(e->d_name, "ttyI", 4); - } - --#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10) -+#if defined(__UCLIBC__) || (defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)) - static int filesort(const dirent **e1, const dirent **e2) - #else - static int filesort(const void *_e1, const void *_e2) - #endif - { --#if !(defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)) -+#if !(defined(__UCLIBC__) || (defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))) - dirent const * const *e1 = (dirent const * const *)_e1; - dirent const * const *e2 = (dirent const * const *)_e2; - #endif diff --git a/package/wvdial/Config.in b/package/wvdial/Config.in deleted file mode 100644 index 0c13202790..0000000000 --- a/package/wvdial/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_WVDIAL - bool "wvdial" - depends on BR2_DEPRECATED_SINCE_2016_08 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # wvstreams - depends on !BR2_STATIC_LIBS # wvstreams - depends on !BR2_TOOLCHAIN_USES_MUSL # wvstreams - select BR2_PACKAGE_WVSTREAMS - help - wvdial is an intelligent Point-to-Point Protocol dialer - - http://wvdial.googlecode.com/ - -comment "wvdial needs a glibc or uClibc toolchain w/ C++, dynamic library" - depends on BR2_DEPRECATED_SINCE_2016_08 - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/wvdial/wvdial.hash b/package/wvdial/wvdial.hash deleted file mode 100644 index ac492090bf..0000000000 --- a/package/wvdial/wvdial.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82 wvdial-1.61.tar.bz2 diff --git a/package/wvdial/wvdial.mk b/package/wvdial/wvdial.mk deleted file mode 100644 index e89dfc5887..0000000000 --- a/package/wvdial/wvdial.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# wvdial -# -################################################################################ - -WVDIAL_VERSION = 1.61 -WVDIAL_SITE = http://wvdial.googlecode.com/files -WVDIAL_SOURCE = wvdial-$(WVDIAL_VERSION).tar.bz2 -WVDIAL_DEPENDENCIES = wvstreams - -WVDIAL_LICENSE = LGPLv2 -WVDIAL_LICENSE_FILES = COPYING.LIB - -# N.B. parallel make fails -WVDIAL_MAKE = $(MAKE1) - -WVDIAL_MAKE_ENV += $(TARGET_CONFIGURE_OPTS) \ - WVSTREAMS_INC="$(STAGING_DIR)/usr/include" \ - WVSTREAMS_LIB="$(STAGING_DIR)/usr/lib" - -define WVDIAL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) -C $(@D) -endef - -define WVDIAL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) \ - prefix="$(TARGET_DIR)/usr" PPPDIR="$(TARGET_DIR)/etc/ppp/peers" \ - install -C $(@D) -endef - -$(eval $(generic-package)) From 3534399db48cfd066ff45a2bfa2ee0998024a9ab Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:51:06 +0200 Subject: [PATCH 0810/3392] wvstreams: remove deprecated package We will remove BR2_DEPRECATED, so remove this deprecated package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 + DEVELOPERS | 1 - package/Config.in | 1 - .../0001-fix-uClibc-compile-getcontext.patch | 273 ------------------ ...ix-uClibc-compile-execinfo-backtrace.patch | 31 -- .../0003-fix-uClibc-compile-misc.patch | 16 - package/wvstreams/0004-build-fixes.patch | 40 --- package/wvstreams/0005-getuid.patch | 25 -- package/wvstreams/Config.in | 19 -- package/wvstreams/wvstreams.hash | 2 - package/wvstreams/wvstreams.mk | 62 ---- 11 files changed, 7 insertions(+), 470 deletions(-) delete mode 100644 package/wvstreams/0001-fix-uClibc-compile-getcontext.patch delete mode 100644 package/wvstreams/0002-fix-uClibc-compile-execinfo-backtrace.patch delete mode 100644 package/wvstreams/0003-fix-uClibc-compile-misc.patch delete mode 100644 package/wvstreams/0004-build-fixes.patch delete mode 100644 package/wvstreams/0005-getuid.patch delete mode 100644 package/wvstreams/Config.in delete mode 100644 package/wvstreams/wvstreams.hash delete mode 100644 package/wvstreams/wvstreams.mk diff --git a/Config.in.legacy b/Config.in.legacy index b5fb49fe5d..f26f97f224 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_WVSTREAMS + bool "wvstreams removed" + select BR2_LEGACY + help + wvstreams is not maintained anymore since about 2009. It also + doesn't build anymore with recent compilers (GCC 5+). + config BR2_PACKAGE_WVDIAL bool "wvdial removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 00b853d0c0..f3d175bc76 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1348,7 +1348,6 @@ F: package/sconeserver/ F: package/sound-theme-borealis/ F: package/sound-theme-freedesktop/ F: package/vlc/ -F: package/wvstreams/ F: package/xscreensaver/ F: package/zmqpp/ F: package/zyre/ diff --git a/package/Config.in b/package/Config.in index b7cb9708e6..56813ea3ef 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1260,7 +1260,6 @@ menu "Networking" source "package/sofia-sip/Config.in" source "package/thrift/Config.in" source "package/usbredir/Config.in" - source "package/wvstreams/Config.in" source "package/zeromq/Config.in" source "package/zmqpp/Config.in" source "package/zyre/Config.in" diff --git a/package/wvstreams/0001-fix-uClibc-compile-getcontext.patch b/package/wvstreams/0001-fix-uClibc-compile-getcontext.patch deleted file mode 100644 index c78cc1893c..0000000000 --- a/package/wvstreams/0001-fix-uClibc-compile-getcontext.patch +++ /dev/null @@ -1,273 +0,0 @@ -Fix wvstreams so that it builds with uClibc, which does not have the -getcontext() and setcontext() functions. - -Signed-off-by: Simon Dawson - -diff -Nurp a/include/wvtask.h b/include/wvtask.h ---- a/include/wvtask.h 2008-07-14 20:11:35.000000000 +0100 -+++ b/include/wvtask.h 2012-07-28 12:29:53.559981240 +0100 -@@ -28,6 +28,13 @@ - - #define WVTASK_MAGIC 0x123678 - -+#undef HAVE_GETCONTEXT -+#ifdef HAVE_GETCONTEXT -+typedef ucontext_t TaskContext; -+#else -+typedef jmp_buf TaskContext; -+#endif -+ - class WvTaskMan; - - /** Represents a single thread of control. */ -@@ -54,8 +61,8 @@ class WvTask - bool running, recycled; - - WvTaskMan &man; -- ucontext_t mystate; // used for resuming the task -- ucontext_t func_call, func_return; -+ TaskContext mystate; // used for resuming the task -+ TaskContext func_call, func_return; - - TaskFunc *func; - void *userdata; -@@ -94,13 +101,13 @@ class WvTaskMan - static void call_func(WvTask *task); - - static char *stacktop; -- static ucontext_t stackmaster_task; -+ static TaskContext stackmaster_task; - - static WvTask *stack_target; -- static ucontext_t get_stack_return; -+ static TaskContext get_stack_return; - - static WvTask *current_task; -- static ucontext_t toplevel; -+ static TaskContext toplevel; - - WvTaskMan(); - virtual ~WvTaskMan(); -diff -Nurp a/utils/wvtask.cc b/utils/wvtask.cc ---- a/utils/wvtask.cc 2009-05-13 22:42:52.000000000 +0100 -+++ b/utils/wvtask.cc 2012-07-28 12:32:23.855974538 +0100 -@@ -60,12 +60,14 @@ int WvTask::taskcount, WvTask::numtasks, - WvTaskMan *WvTaskMan::singleton; - int WvTaskMan::links, WvTaskMan::magic_number; - WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks; --ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return, -+TaskContext WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return, - WvTaskMan::toplevel; - WvTask *WvTaskMan::current_task, *WvTaskMan::stack_target; - char *WvTaskMan::stacktop; - -+#ifdef HAVE_GETCONTEXT - static int context_return; -+#endif - - - static bool use_shared_stack() -@@ -198,9 +200,13 @@ WvTaskMan::WvTaskMan() - - stacktop = (char *)alloca(0); - -+#ifdef HAVE_GETCONTEXT - context_return = 0; - assert(getcontext(&get_stack_return) == 0); - if (context_return == 0) -+#else -+ if (setjmp(get_stack_return) == 0) -+#endif - { - // initial setup - start the stackmaster() task (never returns!) - stackmaster(); -@@ -257,22 +263,30 @@ int WvTaskMan::run(WvTask &task, int val - - WvTask *old_task = current_task; - current_task = &task; -- ucontext_t *state; -+ TaskContext *state; - - if (!old_task) - state = &toplevel; // top-level call (not in an actual task yet) - else - state = &old_task->mystate; - -+#ifdef HAVE_GETCONTEXT - context_return = 0; - assert(getcontext(state) == 0); - int newval = context_return; -+#else -+ int newval = setjmp(*state); -+#endif - if (newval == 0) - { - // saved the state, now run the task. -+#ifdef HAVE_GETCONTEXT - context_return = val; - setcontext(&task.mystate); - return -1; -+#else -+ longjmp(task.mystate, val); -+#endif - } - else - { -@@ -317,16 +331,24 @@ int WvTaskMan::yield(int val) - (long)current_task->stacksize); - } - #endif -- -+ -+#ifdef HAVE_GETCONTEXT - context_return = 0; - assert(getcontext(¤t_task->mystate) == 0); - int newval = context_return; -+#else -+ int newval = setjmp(current_task->mystate); -+#endif - if (newval == 0) - { - // saved the task state; now yield to the toplevel. -+#ifdef HAVE_GETCONTEXT - context_return = val; - setcontext(&toplevel); - return -1; -+#else -+ longjmp(toplevel, val); -+#endif - } - else - { -@@ -340,9 +362,13 @@ int WvTaskMan::yield(int val) - - void WvTaskMan::get_stack(WvTask &task, size_t size) - { -+#ifdef HAVE_GETCONTEXT - context_return = 0; - assert(getcontext(&get_stack_return) == 0); - if (context_return == 0) -+#else -+ if (setjmp(get_stack_return) == 0) -+#endif - { - assert(magic_number == -WVTASK_MAGIC); - assert(task.magic_number == WVTASK_MAGIC); -@@ -358,6 +384,7 @@ void WvTaskMan::get_stack(WvTask &task, - static char *next_stack_addr = NULL; - #endif - -+#ifndef HAVE_GETCONTEXT - task.stack = mmap(next_stack_addr, task.stacksize, - PROT_READ | PROT_WRITE, - #ifndef MACOS -@@ -366,12 +393,17 @@ void WvTaskMan::get_stack(WvTask &task, - MAP_PRIVATE, - #endif - -1, 0); -+#endif // !HAVE_GETCONTEXT - } - - // initial setup - stack_target = &task; -+#ifdef HAVE_GETCONTEXT - context_return = size/1024 + (size%1024 > 0); - setcontext(&stackmaster_task); -+#else -+ longjmp(stackmaster_task, size/1024 + (size%1024 > 0)); -+#endif - } - else - { -@@ -408,9 +440,13 @@ void WvTaskMan::_stackmaster() - { - assert(magic_number == -WVTASK_MAGIC); - -+#ifdef HAVE_GETCONTEXT - context_return = 0; - assert(getcontext(&stackmaster_task) == 0); - val = context_return; -+#else -+ val = setjmp(stackmaster_task); -+#endif - if (val == 0) - { - assert(magic_number == -WVTASK_MAGIC); -@@ -418,8 +454,12 @@ void WvTaskMan::_stackmaster() - // just did setjmp; save stackmaster's current state (with - // all current stack allocations) and go back to get_stack - // (or the constructor, if that's what called us) -+#ifdef HAVE_GETCONTEXT - context_return = 1; - setcontext(&get_stack_return); -+#else -+ longjmp(get_stack_return, 1); -+#endif - } - else - { -@@ -462,7 +502,9 @@ void WvTaskMan::call_func(WvTask *task) - task->func(task->userdata); - Dprintf("WvTaskMan: returning from task #%d (%s)\n", - task->tid, (const char *)task->name); -+#ifdef HAVE_GETCONTEXT - context_return = 1; -+#endif - } - - -@@ -473,9 +515,13 @@ void WvTaskMan::do_task() - assert(task->magic_number == WVTASK_MAGIC); - - // back here from longjmp; someone wants stack space. -+#ifdef HAVE_GETCONTEXT - context_return = 0; - assert(getcontext(&task->mystate) == 0); - if (context_return == 0) -+#else -+ if (setjmp(task->mystate) == 0) -+#endif - { - // done the setjmp; that means the target task now has - // a working jmp_buf all set up. Leave space on the stack -@@ -510,6 +556,7 @@ void WvTaskMan::do_task() - } - else - { -+#ifdef HAVE_GETCONTEXT - assert(getcontext(&task->func_call) == 0); - task->func_call.uc_stack.ss_size = task->stacksize; - task->func_call.uc_stack.ss_sp = task->stack; -@@ -519,11 +566,19 @@ void WvTaskMan::do_task() - task->tid, (const char *)task->name); - makecontext(&task->func_call, - (void (*)(void))call_func, 1, task); -+#else -+ assert(setjmp(task->func_call) == 0); -+#endif - -+#ifdef HAVE_GETCONTEXT - context_return = 0; - assert(getcontext(&task->func_return) == 0); - if (context_return == 0) - setcontext(&task->func_call); -+#else -+ if (setjmp(task->func_return) == 0) -+ longjmp(task->func_call, 0); -+#endif - } - - // the task's function terminated. -@@ -544,8 +599,12 @@ const void *WvTaskMan::current_top_of_st - if (use_shared_stack() || current_task == NULL) - return __libc_stack_end; - else -+#ifdef HAVE_GETCONTEXT - return (const char *)current_task->stack + current_task->stacksize; - #else -+ return 0; -+#endif -+#else - return 0; - #endif - } diff --git a/package/wvstreams/0002-fix-uClibc-compile-execinfo-backtrace.patch b/package/wvstreams/0002-fix-uClibc-compile-execinfo-backtrace.patch deleted file mode 100644 index c6317da4dc..0000000000 --- a/package/wvstreams/0002-fix-uClibc-compile-execinfo-backtrace.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix wvstreams so that it builds with uClibc: we don't have execinfo.h, -so we can't do backtrace() stuff. - -Signed-off-by: Simon Dawson - -diff -Nurp a/utils/wvcrash.cc b/utils/wvcrash.cc ---- a/utils/wvcrash.cc 2008-12-17 12:24:20.000000000 +0000 -+++ b/utils/wvcrash.cc 2012-07-27 22:00:15.456502262 +0100 -@@ -28,7 +28,9 @@ - // FIXME: this file mostly only works in Linux - #ifdef __linux - --# include -+#ifdef HAVE_EXECINFO_H -+#include -+#endif - #include - - #ifdef __USE_GNU -@@ -267,9 +269,11 @@ static void wvcrash_real(int sig, int fd - } - } - -+#ifdef HAVE_EXECINFO_H - wr(fd, "\nBacktrace:\n"); - backtrace_symbols_fd(trace, - backtrace(trace, sizeof(trace)/sizeof(trace[0])), fd); -+#endif - - if (pid > 0) - { diff --git a/package/wvstreams/0003-fix-uClibc-compile-misc.patch b/package/wvstreams/0003-fix-uClibc-compile-misc.patch deleted file mode 100644 index 690a961c12..0000000000 --- a/package/wvstreams/0003-fix-uClibc-compile-misc.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix wvstreams so that it builds with uClibc: const cast problem. - -Signed-off-by: Simon Dawson - -diff -Nurp a/crypto/wvx509.cc b/crypto/wvx509.cc ---- a/crypto/wvx509.cc 2008-10-23 21:23:49.000000000 +0100 -+++ b/crypto/wvx509.cc 2012-06-15 18:45:06.605899292 +0100 -@@ -1157,7 +1157,7 @@ WvString WvX509::get_extension(int nid) - - if (ext) - { -- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); -+ X509V3_EXT_METHOD *method = const_cast(X509V3_EXT_get(ext)); - if (!method) - { - WvDynBuf buf; diff --git a/package/wvstreams/0004-build-fixes.patch b/package/wvstreams/0004-build-fixes.patch deleted file mode 100644 index 21792d7422..0000000000 --- a/package/wvstreams/0004-build-fixes.patch +++ /dev/null @@ -1,40 +0,0 @@ -Add missing includes for proper build on Linux/glibc - -The current wvstreams code doesn't build on Linux/glibc, with error -about chmod() not being available (for wvunixdgsocket.cc) or umask() -not being available (for wvatomicfile.cc). Those errors turn out to be -missing includes. Those includes were in fact already done, but -conditionally for MacOS. We make them unconditional (it probably -breaks other platforms, but since Buildroot is Linux only, we don't -care). - -Signed-off-by: Thomas Petazzoni - -Index: b/ipstreams/wvunixdgsocket.cc -=================================================================== ---- a/ipstreams/wvunixdgsocket.cc -+++ b/ipstreams/wvunixdgsocket.cc -@@ -1,8 +1,6 @@ - #include "wvunixdgsocket.h" --#ifdef MACOS - #include - #include --#endif - - WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms) - : socketfile(filename) -Index: b/streams/wvatomicfile.cc -=================================================================== ---- a/streams/wvatomicfile.cc -+++ b/streams/wvatomicfile.cc -@@ -10,10 +10,7 @@ - #include "wvatomicfile.h" - #include "wvfileutils.h" - #include "wvstrutils.h" -- --#ifdef MACOS - #include --#endif - - WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode) - : tmp_file(WvString::null) diff --git a/package/wvstreams/0005-getuid.patch b/package/wvstreams/0005-getuid.patch deleted file mode 100644 index 60150665ce..0000000000 --- a/package/wvstreams/0005-getuid.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] wvuid.cc: getuid needs sys/types.h + unistd.h - -Otherwise the build fails with: - -utils/wvuid.cc: In function 'wvuid_t wvgetuid()': -utils/wvuid.cc:63:19: error: 'getuid' was not declared in this scope - -Signed-off-by: Peter Korsgaard ---- - utils/wvuid.cc | 2 ++ - 1 file changed, 2 insertions(+) - -Index: wvstreams-4.6.1/utils/wvuid.cc -=================================================================== ---- wvstreams-4.6.1.orig/utils/wvuid.cc -+++ wvstreams-4.6.1/utils/wvuid.cc -@@ -33,6 +33,8 @@ - - #else // not WIN32 - -+#include -+#include - - WvString wv_username_from_uid(wvuid_t uid) - { diff --git a/package/wvstreams/Config.in b/package/wvstreams/Config.in deleted file mode 100644 index a550c57b96..0000000000 --- a/package/wvstreams/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_WVSTREAMS - bool "wvstreams" - depends on BR2_DEPRECATED_SINCE_2016_08 - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_USE_MMU # fork() - # musl not supported and no upstream activity since 2011. - depends on !BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - C++ Network Programming Library. - - http://wvstreams.googlecode.com/ - -comment "wvstreams needs a glibc or uClibc toolchain w/ C++, dynamic library" - depends on BR2_DEPRECATED_SINCE_2016_08 - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/wvstreams/wvstreams.hash b/package/wvstreams/wvstreams.hash deleted file mode 100644 index 17cad6d366..0000000000 --- a/package/wvstreams/wvstreams.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633 wvstreams-4.6.1.tar.gz diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk deleted file mode 100644 index 4d344e2834..0000000000 --- a/package/wvstreams/wvstreams.mk +++ /dev/null @@ -1,62 +0,0 @@ -################################################################################ -# -# wvstreams -# -################################################################################ - -WVSTREAMS_VERSION = 4.6.1 -WVSTREAMS_SITE = http://wvstreams.googlecode.com/files -WVSTREAMS_DEPENDENCIES = openssl zlib host-pkgconf -WVSTREAMS_INSTALL_STAGING = YES - -WVSTREAMS_LICENSE = LGPLv2+ -WVSTREAMS_LICENSE_FILES = LICENSE - -# N.B. parallel make fails -WVSTREAMS_MAKE = $(MAKE1) - -# Needed to work around problem with wvassert.h -WVSTREAMS_CONF_OPTS += CPPFLAGS=-DNDEBUG - -WVSTREAMS_CONF_OPTS += \ - --with-openssl \ - --with-zlib \ - --without-pam \ - --disable-warnings \ - --without-tcl - -# needed for openssl detection when statically linking (as ssl needs lz) -WVSTREAMS_CONF_ENV += LIBS=-lz - -ifneq ($(BR2_STATIC_LIBS),y) -WVSTREAMS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC" -endif - -# wvstreams uses argp.h which can be provided by the argp-standalone -# package -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -WVSTREAMS_DEPENDENCIES += argp-standalone -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -WVSTREAMS_DEPENDENCIES += dbus -WVSTREAMS_CONF_OPTS += --with-dbus -else -WVSTREAMS_CONF_OPTS += --without-dbus -endif - -ifeq ($(BR2_PACKAGE_QT),y) -WVSTREAMS_DEPENDENCIES += qt -WVSTREAMS_CONF_OPTS += --with-qt -else -WVSTREAMS_CONF_OPTS += --without-qt -endif - -ifeq ($(BR2_PACKAGE_VALGRIND),y) -WVSTREAMS_DEPENDENCIES += valgrind -WVSTREAMS_CONF_OPTS += --with-valgrind -else -WVSTREAMS_CONF_OPTS += --without-valgrind -endif - -$(eval $(autotools-package)) From 49315f2fac540b53125b46df341f7d815bbb95cd Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 16:51:07 +0200 Subject: [PATCH 0811/3392] Remove BR2_DEPRECATED The BR2_DEPRECATED logic is a lot less useful than the legacy handling, because the symbols just disappears without warning to the user. For example, we had a few defconfigs that were using deprecated symbols (which were not actually used because BR2_DEPRECATED wasn't set) so these didn't build the expected code anymore. Also, the idea behind BR2_DEPRECATED is that you can easily revive it again if there is interest. However, it is relatively easy to revert the removal of a package as well. The deprecation is also more effort because it has to be removed twice: once when deprecating, and once when really removing. It doesn't make sense to add a legacy entry for BR2_DEPRECATED. Users who actually used it will get legacy warnings instead. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- Config.in | 30 ------------------------------ Makefile | 2 -- Makefile.legacy | 3 --- 3 files changed, 35 deletions(-) diff --git a/Config.in b/Config.in index 8d37c93806..d9fc400276 100644 --- a/Config.in +++ b/Config.in @@ -361,36 +361,6 @@ config BR2_CCACHE_USE_BASEDIR endif -config BR2_DEPRECATED - bool "Show options and packages that are deprecated or obsolete" - help - This option shows outdated/obsolete versions of packages and - options that are otherwise hidden. - -if BR2_DEPRECATED - -config BR2_DEPRECATED_SINCE_2015_11 - bool - default y - -config BR2_DEPRECATED_SINCE_2016_02 - bool - default y - -config BR2_DEPRECATED_SINCE_2016_05 - bool - default y - -config BR2_DEPRECATED_SINCE_2016_08 - bool - default y - -config BR2_DEPRECATED_SINCE_2016_11 - bool - default y - -endif - config BR2_ENABLE_DEBUG bool "build packages with debugging symbols" help diff --git a/Makefile b/Makefile index 74b831eadf..411086186b 100644 --- a/Makefile +++ b/Makefile @@ -436,9 +436,7 @@ all: world # Include legacy before the other things, because package .mk files # may rely on it. -ifneq ($(BR2_DEPRECATED),y) include Makefile.legacy -endif include package/Makefile.in include support/dependencies/dependencies.mk diff --git a/Makefile.legacy b/Makefile.legacy index 764cfcd117..800c08926c 100644 --- a/Makefile.legacy +++ b/Makefile.legacy @@ -4,9 +4,6 @@ # This file contains placeholders to detect backward-compatibility problems. # When a buildroot "API" feature is being deprecated, a rule should be added # here that issues an error when the old feature is used. -# -# This file is not included if BR2_DEPRECATED is selected, so it is possible -# to bypass the errors (although that's usually a bad idea). ifeq ($(BR2_LEGACY),y) $(error "You have legacy configuration in your .config! Please check your configuration.") From 0a7c9b6b0ac63d01ca55a75363e9c446dca19772 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Jun 2016 18:30:19 +0200 Subject: [PATCH 0812/3392] package/qt: Avoid X11 header collision with OpenGL/EGL Including X11 headers via EGL/egl.h leads to a collision of defines between Qt and X11. To fix this qt5 added DEFINES += MESA_EGL_NO_X11_HEADERS in various files: https://github.com/qtproject/qtbase/blob/dev/src/platformsupport/eglconvenience/eglconvenience.pri#L19 https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/minimalegl/minimalegl.pro#L10 https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro#L6 [...] This patch fixes a similar compile error in qt4: http://autobuild.buildroot.net/results/9b0/9b0ed92984eead89d148eaa71aff6e2f1e117837/ http://autobuild.buildroot.org/results/4fd/4fd57553336d36439fab32a7221fc8639758e887/ http://autobuild.buildroot.org/results/5cb/5cb8072f8220f7203fa79936eedcc43eab53ec66/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...penGL-EGL-Avoid-X11-header-collision.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch diff --git a/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch b/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch new file mode 100644 index 0000000000..8c65d1db38 --- /dev/null +++ b/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch @@ -0,0 +1,60 @@ +From 87c9c18fad02744238336a6cf1ce70d3ec2c89c2 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 11 Jun 2016 17:03:07 +0200 +Subject: [PATCH 1/1] OpenGL/EGL: Avoid X11 header collision + +Including X11 headers via EGL/egl.h leads to a collision of defines +between Qt and X11. To fix this qt5 added + DEFINES += MESA_EGL_NO_X11_HEADERS +in various files: + +https://github.com/qtproject/qtbase/blob/dev/src/platformsupport/eglconvenience/eglconvenience.pri#L19 +https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/minimalegl/minimalegl.pro#L10 +https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro#L6 +[...] + +This patch fixes a similar compile error in qt4: +http://autobuild.buildroot.net/results/9b0/9b0ed92984eead89d148eaa71aff6e2f1e117837/ +http://autobuild.buildroot.org/results/4fd/4fd57553336d36439fab32a7221fc8639758e887/ +http://autobuild.buildroot.org/results/5cb/5cb8072f8220f7203fa79936eedcc43eab53ec66/ + +Signed-off-by: Bernd Kuhls +(patch not sent upstream because qt4 branch is closed: + http://blog.qt.io/blog/2015/05/26/qt-4-8-7-released/) +--- + + src/gui/egl/egl.pri | 3 +++ + src/opengl/opengl.pro | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri +index 8e8664c..715ffd7 100644 +--- a/src/gui/egl/egl.pri ++++ b/src/gui/egl/egl.pri +@@ -22,6 +22,9 @@ contains(QT_CONFIG, egl): { + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL + } + ++ # Avoid X11 header collision ++ DEFINES += MESA_EGL_NO_X11_HEADERS ++ + wince*: SOURCES += egl/qegl_wince.cpp + + unix { +diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro +index ce1a5d2..65b1031 100644 +--- a/src/opengl/opengl.pro ++++ b/src/opengl/opengl.pro +@@ -149,6 +149,9 @@ embedded { + qglwindowsurface_qws_p.h \ + qgl_egl_p.h + ++ # Avoid X11 header collision ++ DEFINES += MESA_EGL_NO_X11_HEADERS ++ + contains(QT_CONFIG, fontconfig) { + include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) + } else { +-- +2.8.1 + From 026d47c7c524a026e04871084343c9a371efde65 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 7 Jul 2016 00:43:31 +0200 Subject: [PATCH 0813/3392] dependencies: check for MakeMaker Perl module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ExtUtils::MakeMaker is one of the Perl Core modules usually packaged in Perl package for a Debian/Ubuntu based system. For a Fedora based system, each Perl Core modules have their own RPM package. So install only Perl package is not enough. Fixes: >>> host-libxml-parser-perl 2.41 Configuring [...] perl `which perl` Makefile.PL Can't locate ExtUtils/MakeMaker.pm in @INC (you may need to install the ExtUtils::MakeMaker module) Add a new Perl module check in dependency.sh. Signed-off-by: Romain Naour Cc: François Perrad Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 3146401a9d..5832cf36f6 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -238,6 +238,7 @@ fi # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf +required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake # This variable will keep the modules that are missing in your system. From a2c70577ceb5c4c5812a096274efee953ab03b0b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 7 Jul 2016 00:43:32 +0200 Subject: [PATCH 0814/3392] dependencies: check for Math BigInt/BigRat Perl module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As for MakeMaker Perl module, add a check for Math BigInt/BigRat Perl Core module, which are needed by mpv. Fixes: Waf: Entering directory `output/build/mpv-0.17.0/build' [ 1/198] Compiling version.sh [ 12/198] Processing ebml_types.h: demux/ebml.c demux/demux_mkv.c -> build/ebml_types.h [ 13/198] Compiling demux/ebml.c Can't locate Math/BigRat.pm in @INC (you may need to install the Math::BigRat module) Waf: Entering directory `output/build/mpv-0.17.0/build' [ 1/198] Compiling version.sh [ 2/198] Compiling TOOLS/osxbundle/mpv.app/Contents/Resources/icon.icns [ 3/198] Compiling video/out/x11_icon.bin [ 4/198] Compiling etc/input.conf [ 5/198] Compiling sub/osd_font.otf [ 6/198] Compiling video/out/opengl/nnedi3_weights.bin [ 7/198] Compiling player/lua/defaults.lua [ 8/198] Compiling player/lua/assdraw.lua [ 9/198] Compiling player/lua/options.lua [ 10/198] Compiling player/lua/osc.lua [ 11/198] Compiling player/lua/ytdl_hook.lua [ 12/198] Processing ebml_types.h: demux/ebml.c demux/demux_mkv.c -> build/ebml_types.h [ 13/198] Compiling demux/ebml.c [ 14/198] Compiling DOCS/man/mpv.rst Can't locate Math/BigInt.pm in @INC (you may need to install the Math::BigInt module) Signed-off-by: Romain Naour Cc: François Perrad [Thomas et al.: make those perl modules only required when mpv is enabled.] Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 5832cf36f6..e632a14326 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -241,6 +241,11 @@ required_perl_modules="Data::Dumper" # Needed to build host-autoconf required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake +if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules Math::BigInt" + required_perl_modules="$required_perl_modules Math::BigRat" +fi + # This variable will keep the modules that are missing in your system. missing_perl_modules="" From 3374941965e348f932bc2a3bc7beb9a6fa7b881b Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 16 Oct 2016 09:11:31 +0200 Subject: [PATCH 0815/3392] gcc: remove BR2_GCC_NEEDS_MPC The blind option BR2_GCC_NEEDS_MPC was used to distinguish gcc versions that rely on the mpc library and the ones that don't. But since a while already, all the versions we support do need the mpc library. So this symbol isn't needed anymore. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 8 -------- package/gcc/gcc.mk | 7 ++----- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index efe60283d5..22d221c2c0 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -1,8 +1,5 @@ comment "GCC Options" -config BR2_GCC_NEEDS_MPC - bool - config BR2_GCC_SUPPORTS_GRAPHITE bool @@ -34,7 +31,6 @@ choice depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 @@ -42,7 +38,6 @@ choice bool "gcc arc (6.x)" # Only supported architecture depends on BR2_arc - select BR2_GCC_NEEDS_MPC select BR2_TOOLCHAIN_GCC_AT_LEAST_6 @@ -63,7 +58,6 @@ choice # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102 - select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 @@ -78,7 +72,6 @@ choice !BR2_mips_m5101 && !BR2_mips_i6400 && !BR2_mips_p6600 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_5 @@ -88,7 +81,6 @@ choice depends on !BR2_arc # Unsupported MIPS cores depends on !BR2_mips_p6600 - select BR2_GCC_NEEDS_MPC select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_6 diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 82050b4a59..c971151b36 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -82,6 +82,7 @@ endef HOST_GCC_COMMON_DEPENDENCIES = \ host-binutils \ host-gmp \ + host-mpc \ host-mpfr \ $(if $(BR2_BINFMT_FLAT),host-elf2flt) @@ -93,6 +94,7 @@ HOST_GCC_COMMON_CONF_OPTS = \ --disable-libssp \ --disable-multilib \ --with-gmp=$(HOST_DIR)/usr \ + --with-mpc=$(HOST_DIR)/usr \ --with-mpfr=$(HOST_DIR)/usr \ --with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \ --with-bugurl="http://bugs.buildroot.net/" @@ -161,11 +163,6 @@ else HOST_GCC_COMMON_CONF_OPTS += --enable-threads endif -ifeq ($(BR2_GCC_NEEDS_MPC),y) -HOST_GCC_COMMON_DEPENDENCIES += host-mpc -HOST_GCC_COMMON_CONF_OPTS += --with-mpc=$(HOST_DIR)/usr -endif - ifeq ($(BR2_GCC_ENABLE_GRAPHITE),y) HOST_GCC_COMMON_DEPENDENCIES += host-isl HOST_GCC_COMMON_CONF_OPTS += --with-isl=$(HOST_DIR)/usr From 7d3bbfc7dff770e481f4070f4bf9769d1f52b0ff Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 16 Oct 2016 09:11:32 +0200 Subject: [PATCH 0816/3392] gcc: gcc arc supports graphite The ARC version of gcc does support graphite. It was probably just forgotten when the BR2_GCC_VERSION_ARC symbol was introduced. While we're at it, also remove a redundant newline. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: ARC Maintainers Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 22d221c2c0..514c21b01b 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -38,9 +38,9 @@ choice bool "gcc arc (6.x)" # Only supported architecture depends on BR2_arc + select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - config BR2_GCC_VERSION_4_9_X bool "gcc 4.9.x" # Broken or unsupported architectures From 6b9d22ca4aac0c30813cd2e5b2367951b9c93ecd Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 16 Oct 2016 09:11:33 +0200 Subject: [PATCH 0817/3392] gcc: remove BR2_GCC_SUPPORTS_GRAPHITE The blind option BR2_GCC_SUPPORTS_GRAPHITE was used to distinguish gcc versions that support the graphite loop optimizer. But since a while already, all the versions we support do support graphite. So this symbol isn't needed anymore. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 514c21b01b..df60c653d3 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -1,8 +1,5 @@ comment "GCC Options" -config BR2_GCC_SUPPORTS_GRAPHITE - bool - choice prompt "GCC compiler Version" default BR2_GCC_VERSION_ARC if BR2_arc @@ -31,14 +28,12 @@ choice depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_GCC_VERSION_ARC bool "gcc arc (6.x)" # Only supported architecture depends on BR2_arc - select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_6 config BR2_GCC_VERSION_4_9_X @@ -58,7 +53,6 @@ choice # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102 - select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_GCC_VERSION_5_X @@ -72,7 +66,6 @@ choice !BR2_mips_m5101 && !BR2_mips_i6400 && !BR2_mips_p6600 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_GCC_VERSION_6_X @@ -81,7 +74,6 @@ choice depends on !BR2_arc # Unsupported MIPS cores depends on !BR2_mips_p6600 - select BR2_GCC_SUPPORTS_GRAPHITE select BR2_TOOLCHAIN_GCC_AT_LEAST_6 endchoice @@ -167,7 +159,6 @@ config BR2_GCC_ENABLE_LIBMUDFLAP config BR2_GCC_ENABLE_GRAPHITE bool "Enable graphite support" - depends on BR2_GCC_SUPPORTS_GRAPHITE help This option enables the graphite optimizations in the compiler. From 4882037d631012934ace1a6fe5f19ce66c2f3b68 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Oct 2016 10:50:32 +0200 Subject: [PATCH 0818/3392] package/linux-pam: bump to version 1.3.0 removed 0003-Conditionally-compile-per-innetgr-availability.patch, applied upstream: https://git.fedorahosted.org/cgit/linux-pam.git/commit/?id=835d64947996b7cc96fe187f9b3103db36dddf77 This bump includes https://git.fedorahosted.org/cgit/linux-pam.git/commit/?id=01e0038fa55581c4afc9d63b6180d2ea77ba2940 which fixes http://autobuild.buildroot.net/results/394/394e22be0ef986463e97b3040dad8f978262732c/ Removed comment in Config.in about broken --enable-static-modules configure option because it was removed upstream: https://git.fedorahosted.org/cgit/linux-pam.git/commit/?id=a684595c0bbd88df71285f43fb27630e3829121e Signed-off-by: Bernd Kuhls Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- ...lly-compile-per-innetgr-availability.patch | 84 ------------------- package/linux-pam/Config.in | 6 -- package/linux-pam/linux-pam.hash | 2 +- package/linux-pam/linux-pam.mk | 2 +- 4 files changed, 2 insertions(+), 92 deletions(-) delete mode 100644 package/linux-pam/0003-Conditionally-compile-per-innetgr-availability.patch diff --git a/package/linux-pam/0003-Conditionally-compile-per-innetgr-availability.patch b/package/linux-pam/0003-Conditionally-compile-per-innetgr-availability.patch deleted file mode 100644 index 4b516fa986..0000000000 --- a/package/linux-pam/0003-Conditionally-compile-per-innetgr-availability.patch +++ /dev/null @@ -1,84 +0,0 @@ -innetgr is not available/functional in uclibc, provide conditions for -compilation. - -Patch originally by Dmitry Golubovsky - porting -to linux-pam 1.2.1. - -Signed-off-by: Brendan Heading - -Upstream-status: pending - ---- - modules/pam_group/pam_group.c | 8 +++++++- - modules/pam_succeed_if/pam_succeed_if.c | 4 ++++ - modules/pam_time/pam_time.c | 8 +++++++- - 3 files changed, 18 insertions(+), 2 deletions(-) - -diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c -index be5f20f..0982de8 100644 ---- a/modules/pam_group/pam_group.c -+++ b/modules/pam_group/pam_group.c -@@ -655,8 +655,14 @@ static int check_account(pam_handle_t *pamh, const char *service, - continue; - } - /* If buffer starts with @, we are using netgroups */ -- if (buffer[0] == '@') -+ if (buffer[0] == '@') { -+#ifdef HAVE_INNETGR - good &= innetgr (&buffer[1], NULL, user, NULL); -+#else -+ good = 0; -+ pam_syslog (pamh, LOG_ERR, "pam_group does not have netgroup support"); -+#endif /* HAVE_INNETGR */ -+ } - /* otherwise, if the buffer starts with %, it's a UNIX group */ - else if (buffer[0] == '%') - good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]); -diff --git a/modules/pam_succeed_if/pam_succeed_if.c b/modules/pam_succeed_if/pam_succeed_if.c -index aa828fc..c09d669 100644 ---- a/modules/pam_succeed_if/pam_succeed_if.c -+++ b/modules/pam_succeed_if/pam_succeed_if.c -@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh, const char *user, const char *group) - static int - evaluate_innetgr(const char *host, const char *user, const char *group) - { -+#ifdef HAVE_INNETGR - if (innetgr(group, host, user, NULL) == 1) - return PAM_SUCCESS; -+#endif /* HAVE_INNETGR */ - return PAM_AUTH_ERR; - } - /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */ - static int - evaluate_notinnetgr(const char *host, const char *user, const char *group) - { -+#ifdef HAVE_INNETGR - if (innetgr(group, host, user, NULL) == 0) - return PAM_SUCCESS; -+#endif /* HAVE_INNETGR */ - return PAM_AUTH_ERR; - } - -diff --git a/modules/pam_time/pam_time.c b/modules/pam_time/pam_time.c -index c94737c..4898fd2 100644 ---- a/modules/pam_time/pam_time.c -+++ b/modules/pam_time/pam_time.c -@@ -554,8 +554,14 @@ check_account(pam_handle_t *pamh, const char *service, - continue; - } - /* If buffer starts with @, we are using netgroups */ -- if (buffer[0] == '@') -+ if (buffer[0] == '@') { -+#ifdef HAVE_INNETGR - good &= innetgr (&buffer[1], NULL, user, NULL); -+#else -+ good = 0; -+ pam_syslog (pamh, LOG_ERR, "pam_time does not have netgroup support"); -+#endif /* HAVE_INNETGR */ -+ } - else - good &= logic_field(pamh, user, buffer, count, is_same); - D(("with user: %s", good ? "passes":"fails" )); --- -2.4.3 - diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 7044073d20..5d3fd61fa4 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -3,12 +3,6 @@ config BR2_PACKAGE_LINUX_PAM select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_FLEX depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) - # While linux-pam does have some support for statically linked - # modules (through --enable-static-modules), it doesn't work - # properly due to a build cycle between libpam and - # modules. See - # https://lists.fedorahosted.org/pipermail/linux-pam-commits/2012-February/000105.html - # for details. depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork() diff --git a/package/linux-pam/linux-pam.hash b/package/linux-pam/linux-pam.hash index a6a26d1997..b9c91ef0f6 100644 --- a/package/linux-pam/linux-pam.hash +++ b/package/linux-pam/linux-pam.hash @@ -1,2 +1,2 @@ # Locally computed hashes, not provided by upstream -sha256 342b1211c0d3b203a7df2540a5b03a428a087bd8a48c17e49ae268f992b334d9 Linux-PAM-1.2.1.tar.bz2 +sha256 241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb Linux-PAM-1.3.0.tar.bz2 diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 2b94412ff6..6ce3839edc 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.2.1 +LINUX_PAM_VERSION = 1.3.0 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2 LINUX_PAM_SITE = http://linux-pam.org/library LINUX_PAM_INSTALL_STAGING = YES From 17a82fc253b00a7eab33ddc5e2bcb965610ac9d6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Oct 2016 11:58:54 +0200 Subject: [PATCH 0819/3392] package/go-bootstrap: bump version to 1.4.3 This bump includes https://go.googlesource.com/go/+/a527bdbda39c48fa772d8d54eb6b849f240442c1 which fixes a gcc6-related compile error cmd/6c /home/buildroot/br2/output/build/host-go-bootstrap-1.4.2/src/cmd/6c/txt.c: In function 'gmove': /home/buildroot/br2/output/build/host-go-bootstrap-1.4.2/src/cmd/6c/txt.c:995:28: error: left shift of negative value [-Werror=shift-negative-value] f->vconst |= (vlong)~0 << 32; ^~ /home/buildroot/br2/output/build/host-go-bootstrap-1.4.2/src/cmd/6c/txt.c:1045:28: error: left shift of negative value [-Werror=shift-negative-value] f->vconst |= (vlong)~0 << 32; ^~ cc1: all warnings being treated as errors not yet caught by autobuilders using this defconfig: http://autobuild.buildroot.net/results/394/394e22be0ef986463e97b3040dad8f978262732c/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/go-bootstrap/go-bootstrap.hash | 2 +- package/go-bootstrap/go-bootstrap.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go-bootstrap/go-bootstrap.hash b/package/go-bootstrap/go-bootstrap.hash index 1d0566a9de..8938266f2d 100644 --- a/package/go-bootstrap/go-bootstrap.hash +++ b/package/go-bootstrap/go-bootstrap.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b go1.4.2.src.tar.gz +sha256 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 go1.4.3.src.tar.gz diff --git a/package/go-bootstrap/go-bootstrap.mk b/package/go-bootstrap/go-bootstrap.mk index 29f2b03335..f403f78475 100644 --- a/package/go-bootstrap/go-bootstrap.mk +++ b/package/go-bootstrap/go-bootstrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_BOOTSTRAP_VERSION = 1.4.2 +GO_BOOTSTRAP_VERSION = 1.4.3 GO_BOOTSTRAP_SITE = https://storage.googleapis.com/golang GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).src.tar.gz From 0f4435e950240d1beff6cffae2b23ab4089b0d41 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:13 +0200 Subject: [PATCH 0820/3392] core: do not hard-code inclusion of br2-external in Kconfig Move the inclusion of br2-external's Config.in to the generated kconfig snippet. This will ultimately allow us to use more than one br2-external tree. Offload the "User-provided options" menu to the generated Kconfig snippet. We can also move the definition of the Kconfig-version of BR2_EXTERNAL into this snippet. We introduce an extra check that was not present in the previous code, to check that we do have permission on that directory. Prevciously, it was handled as a side effect of not being able to cd into there, but it is cleaner to check it expressly. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Romain Naour Signed-off-by: Peter Korsgaard --- Config.in | 11 ----- Makefile | 2 +- support/scripts/br2-external | 88 ++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 12 deletions(-) create mode 100755 support/scripts/br2-external diff --git a/Config.in b/Config.in index d9fc400276..21173b79f3 100644 --- a/Config.in +++ b/Config.in @@ -14,10 +14,6 @@ config BR2_HOSTARCH string option env="HOSTARCH" -config BR2_EXTERNAL - string - option env="BR2_EXTERNAL" - config BR2_BUILD_DIR string option env="BUILD_DIR" @@ -729,11 +725,4 @@ source "package/Config.in.host" source "Config.in.legacy" -menu "User-provided options" - depends on BR2_EXTERNAL != "support/dummy-external" - -source "$BR2_EXTERNAL/Config.in" - -endmenu - source "$BR2_BUILD_DIR/.br2-external.in" diff --git a/Makefile b/Makefile index 411086186b..5329cb26ab 100644 --- a/Makefile +++ b/Makefile @@ -879,7 +879,7 @@ endif # value of BR2_EXTERNAL is changed. .PHONY: $(BUILD_DIR)/.br2-external.in $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) - @touch $@ + $(Q)support/scripts/br2-external -o "$(@)" $(BR2_EXTERNAL) # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, diff --git a/support/scripts/br2-external b/support/scripts/br2-external new file mode 100755 index 0000000000..6c2b85b5ca --- /dev/null +++ b/support/scripts/br2-external @@ -0,0 +1,88 @@ +#!/bin/bash +set -e + +# The location of the br2-external tree, once validated. +declare BR2_EXT + +main() { + local OPT OPTARG + local br2_ext ofile + + while getopts :ho: OPT; do + case "${OPT}" in + h) help; exit 0;; + o) ofile="${OPTARG}";; + :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; + \?) error "unknown option '%s'\n" "${OPTARG}";; + esac + done + # Forget options; keep only positional args + shift $((OPTIND-1)) + + if [ ${#} -ne 1 ]; then + error "need exactly one br2-external tree to be specified\n" + fi + br2_ext="${1}" + + if [ -z "${ofile}" ]; then + error "no output file specified (-o)\n" + fi + + do_validate "${br2_ext}" + + do_kconfig >"${ofile}" +} + +# Validates the br2-external tree passed as argument. Makes it cannonical +# and store it in global variable BR2_EXT. +do_validate() { + local br2_ext="${1}" + + if [ ! -d "${br2_ext}" ]; then + error "'%s': no such file or directory\n" "${br2_ext}" + fi + if [ ! -r "${br2_ext}" -o ! -x "${br2_ext}" ]; then + error "'%s': permission denied\n" "${br2_ext}" + fi + + BR2_EXT="$(cd "${br2_ext}"; pwd -P )" +} + +# Generate the kconfig snippet for the br2-external tree. +do_kconfig() { + printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' + printf '\n' + printf 'config BR2_EXTERNAL\n' + printf '\tstring\n' + printf '\tdefault "%s"\n' "${BR2_EXT}" + printf '\n' + printf 'menu "User-provided options"\n' + printf '\tdepends on BR2_EXTERNAL != "support/dummy-external"\n' + printf '\n' + printf 'source "%s/Config.in"\n' "${BR2_EXT}" + printf '\n' + printf "endmenu # User-provided options\n" +} + +help() { + cat <<-_EOF_ + Usage: + ${my_name} -o FILE PATH + + ${my_name} generates the kconfig snippet to include the configuration + options specified in the br2-external tree passed as positional argument. + + Options: + -o FILE + FILE in which to generate the kconfig snippet. + + Returns: + 0 If no error + !0 If any error + _EOF_ +} + +error() { local fmt="${1}"; shift; printf "%s: ${fmt}" "${my_name}" "${@}" >&2; exit 1; } + +my_name="${0##*/}" +main "${@}" From 64e12a370c6d48f7a508a0add68f205943628142 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:14 +0200 Subject: [PATCH 0821/3392] core: get rid of our dummy br2-external tree Now that we generate a kconfig snippet, we can conditionally include the BR2_EXTERNAL's Config.in only when BR2_EXTERNAL is supplied by the user, which means our empty/dummy Config.in is no needed. As for external.mk, we can also include it only when BR2_EXTERNAL is supplied by the user, which means our empty/dummy external.mk is no longer needed. Ditch both of those files, and: - only generate actual content in the Kconfig snippet when we actually do have a BR2_EXTERNAL provided by the user (i.e. BR2_EXTERNAL is not empty); - add a variable that contains the path to the external.mk provided by the user, or empty if none, and include the path set in that variable (make can 'include' nothing without any problem! ;-) ) Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Romain Naour Cc: Julien CORJON Signed-off-by: Peter Korsgaard --- Makefile | 11 ++++------- support/dummy-external/Config.in | 0 support/dummy-external/external.mk | 0 support/scripts/br2-external | 18 +++++++++++++++--- 4 files changed, 19 insertions(+), 10 deletions(-) delete mode 100644 support/dummy-external/Config.in delete mode 100644 support/dummy-external/external.mk diff --git a/Makefile b/Makefile index 5329cb26ab..f5d7536dd2 100644 --- a/Makefile +++ b/Makefile @@ -147,16 +147,11 @@ $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist)) # on the command line, therefore the file is re-created every time make is run. # # When BR2_EXTERNAL is set to an empty value (e.g. explicitly in command -# line), the .br-external file is removed and we point to -# support/dummy-external. This makes sure we can unconditionally include the -# Config.in and external.mk from the BR2_EXTERNAL directory. In this case, -# override is necessary so the user can clear BR2_EXTERNAL from the command -# line, but the dummy path is still used internally. +# line), the .br-external file is removed. BR2_EXTERNAL_FILE = $(BASE_DIR)/.br-external -include $(BR2_EXTERNAL_FILE) ifeq ($(BR2_EXTERNAL),) - override BR2_EXTERNAL = support/dummy-external $(shell rm -f $(BR2_EXTERNAL_FILE)) else _BR2_EXTERNAL = $(shell cd $(BR2_EXTERNAL) >/dev/null 2>&1 && pwd) @@ -165,6 +160,7 @@ else endif override BR2_EXTERNAL := $(_BR2_EXTERNAL) $(shell echo BR2_EXTERNAL ?= $(BR2_EXTERNAL) > $(BR2_EXTERNAL_FILE)) + BR2_EXTERNAL_MK = $(BR2_EXTERNAL)/external.mk endif # To make sure that the environment variable overrides the .config option, @@ -457,7 +453,8 @@ include boot/common.mk include linux/linux.mk include fs/common.mk -include $(BR2_EXTERNAL)/external.mk +# Nothing to include if no BR2_EXTERNAL tree in use +include $(BR2_EXTERNAL_MK) # Now we are sure we have all the packages scanned and defined. We now # check for each package in the list of enabled packages, that all its diff --git a/support/dummy-external/Config.in b/support/dummy-external/Config.in deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/support/dummy-external/external.mk b/support/dummy-external/external.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 6c2b85b5ca..1c42ffafc7 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -19,9 +19,11 @@ main() { # Forget options; keep only positional args shift $((OPTIND-1)) - if [ ${#} -ne 1 ]; then - error "need exactly one br2-external tree to be specified\n" + # Accept 0 or 1 br2-external tree. + if [ ${#} -gt 1 ]; then + error "only zero or one br2-external tree allowed.\n" fi + br2_ext="${1}" if [ -z "${ofile}" ]; then @@ -38,6 +40,11 @@ main() { do_validate() { local br2_ext="${1}" + # No br2-external tree is valid + if [ -z "${br2_ext}" ]; then + return + fi + if [ ! -d "${br2_ext}" ]; then error "'%s': no such file or directory\n" "${br2_ext}" fi @@ -52,12 +59,17 @@ do_validate() { do_kconfig() { printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' printf '\n' + + if [ -z "${BR2_EXT}" ]; then + printf '# No br2-external tree defined.\n' + return + fi + printf 'config BR2_EXTERNAL\n' printf '\tstring\n' printf '\tdefault "%s"\n' "${BR2_EXT}" printf '\n' printf 'menu "User-provided options"\n' - printf '\tdepends on BR2_EXTERNAL != "support/dummy-external"\n' printf '\n' printf 'source "%s/Config.in"\n' "${BR2_EXT}" printf '\n' From 6bd19ccf0ddeb4a0d6987589bc73cc019e7798df Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:15 +0200 Subject: [PATCH 0822/3392] core: offload handling of BR2_EXTERNAL into the script Currently, we treat the case where we have no br2-external tree (BR2_EXTERNAL is empty) differently from the case where we do have one (BR2_EXTERNAL is not empty). There is now no reason to treat those two cases differently: - the kconfig snippet is always generated appropriately (i.e. it would include the br2-external tree if set, or include nothing otherwise); - we no longer have a dummy br-external tree either. Also, the Makefile code to handle BR2_EXTERNAL is currently quite readable if at least a little bit tricky. However, when we're going to add support for using multiple br2-external trees simultaneously, this code would need to get much, much more complex. To keep the Makefile (rather) simple, offload all of the handling of BR2_EXTERNAL to the recently added br2-external helper script. However, because of Makefiles idiosyncracies, we can't use a rule to generate that Makefile fragment. Instead, we use $(shell ...) to call the helper script, and include the fragment twice: once before the $(shell ...) so we can grab a previously defined BR2_EXTERNAL value, a second time to use the one passed on the command line, if any. Furthermore, we can't error out (e.g. on non-existent br2-external tree) directly from the fragment or we'd get that error on subsequent calls, with no chance to override it even from command line. Instead, we use a variable in which we store the error, set it to empty before the second inclusion, so that only the one newly generated, if any, is taken into account. Since we know the script will always be called from Makefile context first, we know validation will occur in Makefile context first. So we can assume that, if there is an error, it will be detected in Makefile context. Consequently, if the script is called to generate the kconfig fragment, validation has already occured, and there should be no error. So we change the error function to generate Makefile code, so that errors are caught as explained above. Lastly, when the value of BR2_EXTERNAL changes, we want to 'forget' about the previous value of the BR2_EXTERNAL_MK variable, especially in the case where BR2_EXTERNAL is now set to empty, so that we do not try to include it later. That's why we first generate empty version of BR2_EXTERNAL_MK, and then assign it the new value, if any. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Romain Naour Signed-off-by: Peter Korsgaard --- Makefile | 29 +++++++--------- support/scripts/br2-external | 64 +++++++++++++++++++++++++++++++----- 2 files changed, 68 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index f5d7536dd2..ff93caec1a 100644 --- a/Makefile +++ b/Makefile @@ -143,24 +143,19 @@ $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist)) # Handling of BR2_EXTERNAL. # # The value of BR2_EXTERNAL is stored in .br-external in the output directory. -# On subsequent invocations of make, it is read in. It can still be overridden -# on the command line, therefore the file is re-created every time make is run. -# -# When BR2_EXTERNAL is set to an empty value (e.g. explicitly in command -# line), the .br-external file is removed. +# The location of the external.mk makefile fragment is computed in that file. +# On subsequent invocations of make, this file is read in. BR2_EXTERNAL can +# still be overridden on the command line, therefore the file is re-created +# every time make is run. -BR2_EXTERNAL_FILE = $(BASE_DIR)/.br-external +BR2_EXTERNAL_FILE = $(BASE_DIR)/.br-external.mk -include $(BR2_EXTERNAL_FILE) -ifeq ($(BR2_EXTERNAL),) - $(shell rm -f $(BR2_EXTERNAL_FILE)) -else - _BR2_EXTERNAL = $(shell cd $(BR2_EXTERNAL) >/dev/null 2>&1 && pwd) - ifeq ($(_BR2_EXTERNAL),) - $(error BR2_EXTERNAL='$(BR2_EXTERNAL)' does not exist, relative to $(TOPDIR)) - endif - override BR2_EXTERNAL := $(_BR2_EXTERNAL) - $(shell echo BR2_EXTERNAL ?= $(BR2_EXTERNAL) > $(BR2_EXTERNAL_FILE)) - BR2_EXTERNAL_MK = $(BR2_EXTERNAL)/external.mk +$(shell support/scripts/br2-external \ + -m -o '$(BR2_EXTERNAL_FILE)' $(BR2_EXTERNAL)) +BR2_EXTERNAL_ERROR = +include $(BR2_EXTERNAL_FILE) +ifneq ($(BR2_EXTERNAL_ERROR),) +$(error $(BR2_EXTERNAL_ERROR)) endif # To make sure that the environment variable overrides the .config option, @@ -876,7 +871,7 @@ endif # value of BR2_EXTERNAL is changed. .PHONY: $(BUILD_DIR)/.br2-external.in $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) - $(Q)support/scripts/br2-external -o "$(@)" $(BR2_EXTERNAL) + $(Q)support/scripts/br2-external -k -o "$(@)" $(BR2_EXTERNAL) # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 1c42ffafc7..b2bff644b6 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -6,12 +6,14 @@ declare BR2_EXT main() { local OPT OPTARG - local br2_ext ofile + local br2_ext ofile ofmt - while getopts :ho: OPT; do + while getopts :hkmo: OPT; do case "${OPT}" in h) help; exit 0;; o) ofile="${OPTARG}";; + k) ofmt="kconfig";; + m) ofmt="mk";; :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; \?) error "unknown option '%s'\n" "${OPTARG}";; esac @@ -26,17 +28,31 @@ main() { br2_ext="${1}" + case "${ofmt}" in + mk|kconfig) + ;; + *) error "no output format specified (-m/-k)\n";; + esac if [ -z "${ofile}" ]; then error "no output file specified (-o)\n" fi + exec >"${ofile}" + do_validate "${br2_ext}" - do_kconfig >"${ofile}" + do_${ofmt} } # Validates the br2-external tree passed as argument. Makes it cannonical # and store it in global variable BR2_EXT. +# +# Note: since this script is always first called from Makefile context +# to generate the Makefile fragment before it is called to generate the +# Kconfig snippet, we're sure that any error in do_validate will be +# interpreted in Makefile context. Going up to generating the Kconfig +# snippet means that there were no error. +# do_validate() { local br2_ext="${1}" @@ -55,6 +71,26 @@ do_validate() { BR2_EXT="$(cd "${br2_ext}"; pwd -P )" } +# Generate the .mk snippet that defines makefile variables +# for the br2-external tree +do_mk() { + local BR2_EXT="${1}" + + printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' + printf '\n' + + printf 'BR2_EXTERNAL ?= %s\n' "${BR2_EXT}" + printf 'BR2_EXTERNAL_MK =\n' + printf '\n' + + if [ -z "${BR2_EXT}" ]; then + printf '# No br2-external tree defined.\n' + return + fi + + printf 'BR2_EXTERNAL_MK = %s/external.mk\n' "${BR2_EXT}" +} + # Generate the kconfig snippet for the br2-external tree. do_kconfig() { printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' @@ -79,14 +115,26 @@ do_kconfig() { help() { cat <<-_EOF_ Usage: - ${my_name} -o FILE PATH + ${my_name} <-m|-k> -o FILE PATH - ${my_name} generates the kconfig snippet to include the configuration - options specified in the br2-external tree passed as positional argument. + With -m, ${my_name} generates the makefile fragment that defines + variables related to the br2-external tree passed as positional + argument. + + With -k, ${my_name} generates the kconfig snippet to include the + configuration options specified in the br2-external tree passed + as positional argument. + + Using -k and -m together is not possible. The last one wins. Options: + -m Generate the makefile fragment. + + -k Generate the kconfig snippet. + -o FILE - FILE in which to generate the kconfig snippet. + FILE in which to generate the kconfig snippet or makefile + fragment. Returns: 0 If no error @@ -94,7 +142,7 @@ help() { _EOF_ } -error() { local fmt="${1}"; shift; printf "%s: ${fmt}" "${my_name}" "${@}" >&2; exit 1; } +error() { local fmt="${1}"; shift; printf "BR2_EXTERNAL_ERROR = ${fmt}" "${@}"; exit 1; } my_name="${0##*/}" main "${@}" From f834b0ef2146d3cbf96b126767b2699e0c7ee823 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:16 +0200 Subject: [PATCH 0823/3392] core/br2-external: validate even more A br2-external tree must provide external.mk and Config.in. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Romain Naour Signed-off-by: Peter Korsgaard --- support/scripts/br2-external | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index b2bff644b6..1a0c743462 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -67,6 +67,12 @@ do_validate() { if [ ! -r "${br2_ext}" -o ! -x "${br2_ext}" ]; then error "'%s': permission denied\n" "${br2_ext}" fi + if [ ! -f "${br2_ext}/external.mk" ]; then + error "'%s/external.mk': no such file or directory\n" "${br2_ext}" + fi + if [ ! -f "${br2_ext}/Config.in" ]; then + error "'%s/Config.in': no such file or directory\n" "${br2_ext}" + fi BR2_EXT="$(cd "${br2_ext}"; pwd -P )" } From fc34cf772cfb37b9d082e0fba480eb190c66e39c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:17 +0200 Subject: [PATCH 0824/3392] core: introduce per br2-external NAME This unique NAME is used to construct a per br2-external tree variable, BR2_EXTERNAL_$(NAME)_PATH, which contains the path to the br2-external tree. This variable is available both from Kconfig (set in the Kconfig snippet) and from the .mk files. Also, display the NAME and its path as a comment in the menuconfig. This will ultimately allow us to support multiple br2-external trees at once, with that NAME (and thus BR2_EXTERNAL_$(NAME)) uniquely defining which br2-external tree is being used. The obvious outcome is that BR2_EXTERNAL should now no longer be used to refer to the files in the br2-external tree; that location is now known from the BR2_EXTERNAL_$(NAME)_PATH variable instead. This means we no longer need to expose, and must stop from from exposing BR2_EXTERNAL as a Kconfig variable. Finally, this also fixes a latent bug in the pkg-generic infra, where we would so far always refer to BR2_EXTERNAL (even if not set) to filter the names of packages (to decide whether they are a bootloader, a toolchain or a simple package). Note: since the variables in the Makefile and in Kconfig are named the same, the one we computed early on in the Makefile will be overridden by the one in .config when we have it. Thus, even though they are set to the same raw value, the one from .config is quoted and, being included later in the Makefile, will take precedence, so we just re-include the generated Makefile fragment a third time before includeing the br2-external's Makefiles. That's unfortunate, but there is no easy way around that as we do want the two variables to be named the same in Makefile and Kconfig (and we can't ask the user to un-quote that variable himself either), hence this little dirty triple-inclusion trick. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Romain Naour Signed-off-by: Peter Korsgaard --- Makefile | 19 +++++++++++---- boot/barebox/barebox-aux/Config.in | 3 +-- boot/barebox/barebox/Config.in | 3 +-- package/Makefile.in | 3 +-- package/pkg-generic.mk | 4 ++-- support/scripts/br2-external | 38 +++++++++++++++++++++++------- 6 files changed, 48 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index ff93caec1a..e263b54b8c 100644 --- a/Makefile +++ b/Makefile @@ -448,6 +448,14 @@ include boot/common.mk include linux/linux.mk include fs/common.mk +# If using a br2-external tree, the BR2_EXTERNAL_$(NAME)_PATH variable +# is also present in the .config file. Since .config is included after +# we defined BR2_EXTERNAL_$(NAME)_PATH in the Makefile, the value in +# that variable is quoted. We just include the generated Makefile fragment +# .br2-external.mk a third time, which will set that variable to the +# un-quoted value. +include $(BR2_EXTERNAL_FILE) + # Nothing to include if no BR2_EXTERNAL tree in use include $(BR2_EXTERNAL_MK) @@ -763,7 +771,6 @@ COMMON_CONFIG_ENV = \ KCONFIG_AUTOHEADER=$(BUILD_DIR)/buildroot-config/autoconf.h \ KCONFIG_TRISTATE=$(BUILD_DIR)/buildroot-config/tristate.config \ BR2_CONFIG=$(BR2_CONFIG) \ - BR2_EXTERNAL=$(BR2_EXTERNAL) \ HOST_GCC_VERSION="$(HOSTCC_VERSION)" \ BUILD_DIR=$(BUILD_DIR) \ SKIP_LEGACY= @@ -842,7 +849,7 @@ define percent_defconfig @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) endef -$(eval $(foreach d,$(TOPDIR) $(BR2_EXTERNAL),$(call percent_defconfig,$(d))$(sep))) +$(eval $(foreach d,$(TOPDIR) $(if $(BR2_EXTERNAL_NAME),$(BR2_EXTERNAL_$(BR2_EXTERNAL_NAME)_PATH)),$(call percent_defconfig,$(d))$(sep))) savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) $< \ @@ -969,11 +976,13 @@ list-defconfigs: @echo 'Built-in configs:' @$(foreach b, $(sort $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig))), \ printf " %-35s - Build for %s\\n" $(b) $(b:_defconfig=);) -ifneq ($(wildcard $(BR2_EXTERNAL)/configs/*_defconfig),) +ifneq ($(BR2_EXTERNAL_NAME),) +ifneq ($(wildcard $(BR2_EXTERNAL_$(BR2_EXTERNAL_NAME)_PATH)/configs/*_defconfig),) @echo @echo 'User-provided configs:' - @$(foreach b, $(sort $(notdir $(wildcard $(BR2_EXTERNAL)/configs/*_defconfig))), \ + @$(foreach b, $(sort $(notdir $(wildcard $(BR2_EXTERNAL_$(BR2_EXTERNAL_NAME)_PATH)/configs/*_defconfig))), \ printf " %-35s - Build for %s\\n" $(b) $(b:_defconfig=);) +endif endif @echo @@ -994,7 +1003,7 @@ print-version: @echo $(BR2_VERSION_FULL) include docs/manual/manual.mk --include $(BR2_EXTERNAL)/docs/*/*.mk +-include $(if $(BR2_EXTERNAL_NAME),$(BR2_EXTERNAL_$(BR2_EXTERNAL_NAME)_PATH)/docs/*/*.mk) .PHONY: $(noconfig_targets) diff --git a/boot/barebox/barebox-aux/Config.in b/boot/barebox/barebox-aux/Config.in index 315e1a3fca..ec3b97cb8a 100644 --- a/boot/barebox/barebox-aux/Config.in +++ b/boot/barebox/barebox-aux/Config.in @@ -67,8 +67,7 @@ config BR2_TARGET_BAREBOX_AUX_CUSTOM_EMBEDDED_ENV_PATH invalid. This option sets the barebox Kconfig option CONFIG_DEFAULT_ENVIRONMENT_PATH to the specified path. This way it is possible to use Buildroot variables like - BR2_EXTERNAL, TOPDIR etc. to refer to the custom - environment. + TOPDIR etc. to refer to the custom environment. Depending on your setup, the custom embedded environment will probably be based on either the content of the diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in index f5e3bae8d5..3d8d014561 100644 --- a/boot/barebox/barebox/Config.in +++ b/boot/barebox/barebox/Config.in @@ -73,8 +73,7 @@ config BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH invalid. This option sets the barebox Kconfig option CONFIG_DEFAULT_ENVIRONMENT_PATH to the specified path. This way it is possible to use Buildroot variables like - BR2_EXTERNAL, TOPDIR etc. to refer to the custom - environment. + TOPDIR etc. to refer to the custom environment. Depending on your setup, the custom embedded environment will probably be based on either the content of the diff --git a/package/Makefile.in b/package/Makefile.in index 98e30b4921..5d591e9a43 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -311,8 +311,7 @@ HOST_CONFIGURE_OPTS = \ EXTRA_ENV = \ PATH=$(BR_PATH) \ BR2_DL_DIR=$(BR2_DL_DIR) \ - BUILD_DIR=$(BUILD_DIR) \ - BR2_EXTERNAL=$(BR2_EXTERNAL) + BUILD_DIR=$(BUILD_DIR) ################################################################################ # settings we need to pass to configure diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 12ae86f08e..a13e34f7de 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -767,9 +767,9 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) # kernel case, the bootloaders case, and the normal packages case. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL -else ifneq ($$(filter boot/% $(BR2_EXTERNAL)/boot/%,$(pkgdir)),) +else ifneq ($$(filter boot/% $$(if $$(BR2_EXTERNAL_NAME),$$(BR2_EXTERNAL_$$(BR2_EXTERNAL_NAME)_PATH)/boot/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_TARGET_$(2) -else ifneq ($$(filter toolchain/% $(BR2_EXTERNAL)/toolchain/%,$(pkgdir)),) +else ifneq ($$(filter toolchain/% $$(if $$(BR2_EXTERNAL_NAME),$$(BR2_EXTERNAL_$$(BR2_EXTERNAL_NAME)_PATH)/toolchain/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_$(2) else $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 1a0c743462..21d7351637 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -1,7 +1,8 @@ #!/bin/bash set -e -# The location of the br2-external tree, once validated. +# The name and location of the br2-external tree, once validated. +declare BR2_NAME declare BR2_EXT main() { @@ -55,6 +56,7 @@ main() { # do_validate() { local br2_ext="${1}" + local br2_name n # No br2-external tree is valid if [ -z "${br2_ext}" ]; then @@ -67,6 +69,20 @@ do_validate() { if [ ! -r "${br2_ext}" -o ! -x "${br2_ext}" ]; then error "'%s': permission denied\n" "${br2_ext}" fi + if [ ! -f "${br2_ext}/external.desc" ]; then + error "'%s': does not have a name (in 'external.desc')\n" "${br2_ext}" + fi + br2_name="$(sed -r -e '/^name: +(.*)$/!d; s//\1/' "${br2_ext}/external.desc")" + if [ -z "${br2_name}" ]; then + error "'%s/external.desc': does not define the name\n" "${br2_ext}" + fi + # Only ASCII chars in [A-Za-z0-9_] are permitted + n="$(sed -r -e 's/[A-Za-z0-9_]//g' <<<"${br2_name}" )" + if [ -n "${n}" ]; then + # Escape '$' so that it gets printed + error "'%s': name '%s' contains invalid chars: '%s'\n" \ + "${br2_ext}" "${br2_name//\$/\$\$}" "${n//\$/\$\$}" + fi if [ ! -f "${br2_ext}/external.mk" ]; then error "'%s/external.mk': no such file or directory\n" "${br2_ext}" fi @@ -74,27 +90,29 @@ do_validate() { error "'%s/Config.in': no such file or directory\n" "${br2_ext}" fi + BR2_NAME="${br2_name}" BR2_EXT="$(cd "${br2_ext}"; pwd -P )" } # Generate the .mk snippet that defines makefile variables # for the br2-external tree do_mk() { - local BR2_EXT="${1}" - printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' printf '\n' printf 'BR2_EXTERNAL ?= %s\n' "${BR2_EXT}" + printf 'BR2_EXTERNAL_NAME = \n' printf 'BR2_EXTERNAL_MK =\n' printf '\n' - if [ -z "${BR2_EXT}" ]; then + if [ -z "${BR2_NAME}" ]; then printf '# No br2-external tree defined.\n' return fi + printf 'BR2_EXTERNAL_NAME = %s\n' "${BR2_NAME}" printf 'BR2_EXTERNAL_MK = %s/external.mk\n' "${BR2_EXT}" + printf 'BR2_EXTERNAL_%s_PATH = %s\n' "${BR2_NAME}" "${BR2_EXT}" } # Generate the kconfig snippet for the br2-external tree. @@ -102,18 +120,20 @@ do_kconfig() { printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' printf '\n' - if [ -z "${BR2_EXT}" ]; then + if [ -z "${BR2_NAME}" ]; then printf '# No br2-external tree defined.\n' return fi - printf 'config BR2_EXTERNAL\n' + printf 'menu "User-provided options"\n' + printf '\n' + printf 'comment "%s (in %s)"\n' "${BR2_NAME}" "${BR2_EXT}" + printf '\n' + printf 'config BR2_EXTERNAL_%s_PATH\n' "${BR2_NAME}" printf '\tstring\n' printf '\tdefault "%s"\n' "${BR2_EXT}" printf '\n' - printf 'menu "User-provided options"\n' - printf '\n' - printf 'source "%s/Config.in"\n' "${BR2_EXT}" + printf 'source "$BR2_EXTERNAL_%s_PATH/Config.in"\n' "${BR2_NAME}" printf '\n' printf "endmenu # User-provided options\n" } From a88718a952762a6a14bb1e4c87739b17a657746a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:18 +0200 Subject: [PATCH 0825/3392] docs/manual: document the br2-external NAME Update the manual with the new external.desc mandatory file. Take the opportunity to add a section listing all mandatory files, Config.in, external.mk and the new external.desc, instead of just hinting about them in the external package recipes section. Change the examples to use the NAME-suffixed variable instead of the raw BR2_EXTERNAL variable. Change all references to BR2_EXTERNAL elsewhere in the manual to now use the 'br2-external tree' terminology. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Samuel Martin Cc: Romain Naour Cc: Julien CORJON Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-asciidoc.txt | 6 +- docs/manual/adding-packages-perl.txt | 2 +- docs/manual/adding-packages-python.txt | 2 +- docs/manual/customize-directory-structure.txt | 13 +- docs/manual/customize-outside-br.txt | 140 +++++++++++------- docs/manual/customize-packages.txt | 25 +--- 6 files changed, 105 insertions(+), 83 deletions(-) diff --git a/docs/manual/adding-packages-asciidoc.txt b/docs/manual/adding-packages-asciidoc.txt index a278d44cc9..d870c51088 100644 --- a/docs/manual/adding-packages-asciidoc.txt +++ b/docs/manual/adding-packages-asciidoc.txt @@ -19,9 +19,9 @@ Although Buildroot only contains one document written in AsciiDoc, there is, as for packages, an infrastructure for rendering documents using the AsciiDoc syntax. -Also as for packages, the AsciiDoc infrastructure is available from -xref:outside-br-custom[BR2_EXTERNAL]. This allows documentation for a -BR2_EXTERNAL tree to match the Buildroot documentation, as it will be +Also as for packages, the AsciiDoc infrastructure is available from a +xref:outside-br-custom[br2-external tree]. This allows documentation for +a br2-external tree to match the Buildroot documentation, as it will be rendered to the same formats and use the same layout and theme. ==== +asciidoc-document+ tutorial diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt index 63fafe6558..4f5a6a4064 100644 --- a/docs/manual/adding-packages-perl.txt +++ b/docs/manual/adding-packages-perl.txt @@ -47,7 +47,7 @@ built. Most of these data can be retrieved from https://metacpan.org/. So, this file and the Config.in can be generated by running the script +supports/scripts/scancpan Foo-Bar+ in the Buildroot directory -(or in the +BR2_EXTERNAL+ directory). +(or in a br2-external tree). This script creates a Config.in file and foo-bar.mk file for the requested package, and also recursively for all dependencies specified by CPAN. You should still manually edit the result. In particular, the diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index 94ac809fff..abcd4ca36d 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -195,7 +195,7 @@ license and license files are guessed and must be checked. You also need to manually add the package to the +package/Config.in+ file. If your Buildroot package is not in the official Buildroot tree but in -a +BR2_EXTERNAL+ tree, use the -o flag as follows: +a br2-external tree, use the -o flag as follows: ----------------------- ./support/script/scanpypi foo bar -o other_package_dir diff --git a/docs/manual/customize-directory-structure.txt b/docs/manual/customize-directory-structure.txt index 0be3f77e50..b177319f98 100644 --- a/docs/manual/customize-directory-structure.txt +++ b/docs/manual/customize-directory-structure.txt @@ -13,7 +13,8 @@ section. Orthogonal to this directory structure, you can choose _where_ you place this structure itself: either inside the Buildroot tree, or outside of -it using +BR2_EXTERNAL+. Both options are valid, the choice is up to you. +it using a br2-external tree. Both options are valid, the choice is up +to you. ----- +-- board/ @@ -38,8 +39,8 @@ it using +BR2_EXTERNAL+. Both options are valid, the choice is up to you. | +-- package/ | +-- / -| +-- Config.in (if not using BR2_EXTERNAL) -| +-- .mk (if not using BR2_EXTERNAL) +| +-- Config.in (if not using a br2-external tree) +| +-- .mk (if not using a br2-external tree) | +-- package1/ | | +-- Config.in | | +-- package1.mk @@ -47,14 +48,14 @@ it using +BR2_EXTERNAL+. Both options are valid, the choice is up to you. | +-- Config.in | +-- package2.mk | -+-- Config.in (if using BR2_EXTERNAL) -+-- external.mk (if using BR2_EXTERNAL) ++-- Config.in (if using a br2-external tree) ++-- external.mk (if using a br2-external tree) ------ Details on the files shown above are given further in this chapter. Note: if you choose to place this structure outside of the Buildroot -tree using +BR2_EXTERNAL+, the and possibly +tree but in a br2-external tree, the and possibly components may be superfluous and can be left out. ==== Implementing layered customizations diff --git a/docs/manual/customize-outside-br.txt b/docs/manual/customize-outside-br.txt index 9ad177d006..f2a83a6227 100644 --- a/docs/manual/customize-outside-br.txt +++ b/docs/manual/customize-outside-br.txt @@ -11,25 +11,27 @@ place project-specific customizations in two locations: branches in a version control system so that upgrading to a newer Buildroot release is easy. - * outside of the Buildroot tree, using the +BR2_EXTERNAL+ mechanism. + * outside of the Buildroot tree, using the _br2-external_ mechanism. This mechanism allows to keep package recipes, board support and configuration files outside of the Buildroot tree, while still - having them nicely integrated in the build logic. This section - explains how to use +BR2_EXTERNAL+. - -+BR2_EXTERNAL+ is an environment variable that can be used to point to -a directory that contains Buildroot customizations. It can be passed -to any Buildroot +make+ invocation. It is automatically saved in the -hidden +.br-external+ file in the output directory. Thanks to this, -there is no need to pass +BR2_EXTERNAL+ at every +make+ invocation. It -can however be changed at any time by passing a new value, and can be -removed by passing an empty value. + having them nicely integrated in the build logic. We call this + location a _br2-external tree_. This section explains how to use + the br2-external mechanism and what to provide in a br2-external + tree. + +One can tell Buildroot to use a br2-external tree by setting the ++BR2_EXTERNAL+ make variable set to the path of the br2-external tree +to use. It can be passed to any Buildroot +make+ invocation. It is +automatically saved in the hidden +.br-external.mk+ file in the output +directory. Thanks to this, there is no need to pass +BR2_EXTERNAL+ at +every +make+ invocation. It can however be changed at any time by +passing a new value, and can be removed by passing an empty value. .Note -The +BR2_EXTERNAL+ path can be either an absolute or a relative path, -but if it's passed as a relative path, it is important to note that it -is interpreted relative to the main Buildroot source directory, *not* -to the Buildroot output directory. +The path to a br2-external tree can be either absolute or relative. +If it is passed as a relative path, it is important to note that it is +interpreted relative to the main Buildroot source directory, *not* to +the Buildroot output directory. Some examples: @@ -37,73 +39,107 @@ Some examples: buildroot/ $ make BR2_EXTERNAL=/path/to/foobar menuconfig ----- -From now on, external definitions from the +/path/to/foobar+ -directory will be used: +From now on, definitions from the +/path/to/foobar+ br2-external tree +will be used: ----- buildroot/ $ make buildroot/ $ make legal-info ----- -We can switch to another external definitions directory at any time: +We can switch to another br2-external tree at any time: ----- buildroot/ $ make BR2_EXTERNAL=/where/we/have/barfoo xconfig ----- -Or disable the usage of external definitions: +Or disable the usage of any br2-external tree: ----- buildroot/ $ make BR2_EXTERNAL= xconfig ----- -+BR2_EXTERNAL+ allows three different things: - - * One can store all the board-specific configuration files there, - such as the kernel configuration, the root filesystem overlay, or - any other configuration file for which Buildroot allows to set its - location. The +BR2_EXTERNAL+ value is available within the - Buildroot configuration using +$(BR2_EXTERNAL)+. As an example, one - could set the +BR2_ROOTFS_OVERLAY+ Buildroot option to - +$(BR2_EXTERNAL)/board//overlay/+ (to specify a root - filesystem overlay), or the +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+ - Buildroot option to - +$(BR2_EXTERNAL)/board//kernel.config+ (to specify the - location of the kernel configuration file). - - * One can store package recipes (i.e. +Config.in+ and - +.mk+), or even custom configuration options and make - logic. Buildroot automatically includes +$(BR2_EXTERNAL)/Config.in+ to - make it appear in the top-level configuration menu, and includes - +$(BR2_EXTERNAL)/external.mk+ with the rest of the makefile logic. +A br2-external tree must contain at least those three files: + ++external.desc+:: + That file shall contain the _name_ for the br2-external tree. That name + must only use ASCII characters in the set +[A-Za-z0-9_]+; any other + character is forbidden. The format for this file is a single line with + the keyword 'name:', followed by one or more spaces, followed by the + name. + -.Note -Providing +Config.in+ and +external.mk+ is mandatory, but they can be - empty. +Buildroot sets +BR2_EXTERNAL_$(NAME)_PATH+ to the absolute path of the + br2-external tree, so that you can use it to refer to your br2-external + tree. This variable is available both in Kconfig, so you can use it + to source your Kconfig files (see below) and in the Makefile, so that + you can use it to include other Makefiles (see below) or refer to other + files (like data files) from your br2-external tree. ++ +Example of an +external.desc+ file that declares the name +FOO+: ++ +---- +$ cat external.desc +name: FOO +---- ++ +Examples of names and the corresponding +BR2_EXTERNAL_$(NAME)_PATH+ +variables: ++ + * +FOO+ -> +BR2_EXTERNAL_FOO_PATH+ + * +BAR_42+ -> +BR2_EXTERNAL_BAR_42_PATH+ ++ +In the following examples, it is assumed the name to be set to +BAR_42+. + ++Config.in+:: ++external.mk+:: + Those files (which may each be empty) can be used to define package + recipes, like for packages bundled in Buildroot itself, or other + custom configuration options. + +Using a br2-external tree then allows three different things: + + * One can store all the board-specific configuration files there, such + as the kernel configuration, the root filesystem overlay, or any other + configuration file for which Buildroot allows to set the location (by + using the +BR2_EXTERNAL_$(NAME)_PATH+ variable). For example, you + could set the paths to a global patch directory, to a rootfs overlay + and to the kernel configuration file as follows (e.g. by running + `make menuconfig` and filling in these options): ++ +---- +BR2_GLOBAL_PATCH_DIR=$(BR2_EXTERNAL_BAR_42_PATH)/patches/ +BR2_ROOTFS_OVERLAY=$(BR2_EXTERNAL_BAR_42_PATH)/board//overlay/ +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_FOO)/board//kernel.config +---- + + * One can store package recipes (i.e. +Config.in+ and +.mk+), + or even custom configuration options and make logic. Buildroot + automatically includes +Config.in+ to make it appear in the top-level + configuration menu, and includes +external.mk+ with the rest of the + makefile logic. + -The main usage of this is to store package recipes. The recommended - way to do this is to write a +$(BR2_EXTERNAL)/Config.in+ file that - looks like: +The main usage of this is to store package recipes. The recommended way + to do this is to write a +Config.in+ file that looks like: + ------ -source "$BR2_EXTERNAL/package/package1/Config.in" -source "$BR2_EXTERNAL/package/package2/Config.in" +source "$BR2_EXTERNAL_BAR_42_PATH/package/package1/Config.in" +source "$BR2_EXTERNAL_BAR_42_PATH/package/package2/Config.in" ------ + -Then, have a +$(BR2_EXTERNAL)/external.mk+ file that looks like: +Then, have an +external.mk+ file that looks like: + ------ -include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk)) +include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk)) ------ + -And then in +$(BR2_EXTERNAL)/package/package1+ and - +$(BR2_EXTERNAL)/package/package2+ create normal Buildroot - package recipes, as explained in xref:adding-packages[]. +And then in +$(BR2_EXTERNAL_FOO_42_PATH)/package/package1+ and + +$(BR2_EXTERNAL_FOO_42_PATH)/package/package2+ create normal + Buildroot package recipes, as explained in xref:adding-packages[]. If you prefer, you can also group the packages in subdirectories called and adapt the above paths accordingly. * One can store Buildroot defconfigs in the +configs+ subdirectory of - +$(BR2_EXTERNAL)+. Buildroot will automatically show them in the + the br2-external tree. Buildroot will automatically show them in the output of +make list-defconfigs+ and allow them to be loaded with the normal +make _defconfig+ command. They will be visible under the +User-provided configs+' label in the 'make list-defconfigs' output. diff --git a/docs/manual/customize-packages.txt b/docs/manual/customize-packages.txt index 9a5e8c5bce..b57280ea10 100644 --- a/docs/manual/customize-packages.txt +++ b/docs/manual/customize-packages.txt @@ -14,8 +14,9 @@ packages in a project-specific directory. As shown in xref:customize-dir-structure[], the recommended location for project-specific packages is +package//+. If you are using the -+BR2_EXTERNAL+ feature (see xref:outside-br-custom[]) the recommended -location is +$(BR2_EXTERNAL)/package/+. +br2-external tree feature (see xref:outside-br-custom[]) the recommended +location is to put them in a sub-directory named +package/+ in your +br2-external tree. However, Buildroot will not be aware of the packages in this location, unless we perform some additional steps. As explained in @@ -37,14 +38,6 @@ have only one extra directory level below +package//+): include $(sort $(wildcard package//*/*.mk)) ----- -If you are using +BR2_EXTERNAL+, create a file -+$(BR2_EXTERNAL)/external.mk+ with following contents (again assuming only -one extra level): - ------ -include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk)) ------ - For the +Config.in+ files, create a file +package//Config.in+ that includes the +Config.in+ files of all your packages. An exhaustive list has to be provided since wildcards are not supported in the source command of kconfig. @@ -59,13 +52,5 @@ Include this new file +package//Config.in+ from +package/Config.in+, preferably in a company-specific menu to make merges with future Buildroot versions easier. -If you are using +BR2_EXTERNAL+, create a file -+$(BR2_EXTERNAL)/Config.in+ with similar contents: - ------ -source "$BR2_EXTERNAL/package/package1/Config.in" -source "$BR2_EXTERNAL/package/package2/Config.in" ------ - -You do not have to add an include for this +$(BR2_EXTERNAL)/Config.in+ -file as it is included automatically. +If using a br2-external tree, refer to xref:outside-br-custom[] for how +to fill in those files. From a71e311df62505bf69b74e9f16b43a5f91bb4623 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:19 +0200 Subject: [PATCH 0826/3392] docs/manual: add appendix to convert old br2-external trees Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Samuel Martin Cc: Romain Naour Cc: Julien CORJON [Peter: slightly reword] Signed-off-by: Peter Korsgaard --- docs/manual/appendix.txt | 1 + docs/manual/br2-external-converting.txt | 36 +++++++++++++++++++++++++ docs/manual/customize-outside-br.txt | 5 ++++ support/scripts/br2-external | 7 ++++- 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 docs/manual/br2-external-converting.txt diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt index 03dbbd1134..4d4bbecc18 100644 --- a/docs/manual/appendix.txt +++ b/docs/manual/appendix.txt @@ -3,3 +3,4 @@ include::makedev-syntax.txt[] include::makeusers-syntax.txt[] +include::br2-external-converting.txt[] diff --git a/docs/manual/br2-external-converting.txt b/docs/manual/br2-external-converting.txt new file mode 100644 index 0000000000..73bd878ce5 --- /dev/null +++ b/docs/manual/br2-external-converting.txt @@ -0,0 +1,36 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +[[br2-external-converting]] +== Converting old br2-external trees + +Buildroot 2016.11 introduced a backward-incompatible change in the way +br2-external trees are handled. A minor change has to be made: adding +a name to your br2-external tree, see xref:outside-br-custom[]. + +This can be done very easily in just a few steps: + + * First, create a new file named +external.desc+, at the root of your + br2-external tree, with a single line defining the name of your + br2-external tree: ++ +---- +$ echo 'name: NAME_OF_YOUR_TREE' >external.desc +---- ++ +.Note +Be careful when choosing a name: It has to be unique and be made +with only ASCII characters from the set +[A-Za-z0-9_]+. + + * Then, change every occurence of +BR2_EXTERNAL+ in your br2-external + tree with the new variable: ++ +---- +$ find . -type f | xargs sed -i 's/BR2_EXTERNAL/BR2_EXTERNAL_NAME_OF_YOUR_TREE_PATH/g' +---- + +Now, your br2-external tree can be used with Buildroot 2016.11 onward. + +.Note: +This change makes your br2-external tree incompatible with Buildroot +before 2016.11. diff --git a/docs/manual/customize-outside-br.txt b/docs/manual/customize-outside-br.txt index f2a83a6227..3ad0bc0478 100644 --- a/docs/manual/customize-outside-br.txt +++ b/docs/manual/customize-outside-br.txt @@ -33,6 +33,11 @@ If it is passed as a relative path, it is important to note that it is interpreted relative to the main Buildroot source directory, *not* to the Buildroot output directory. +.Note: +If using an br2-external tree from before Buildroot 2016.11, you need to +convert it before you can use it with Buildroot 2016.11 onward. See +xref:br2-external-converting[] for help on doing so. + Some examples: ----- diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 21d7351637..281a0847b8 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -5,6 +5,10 @@ set -e declare BR2_NAME declare BR2_EXT +# URL to manual for help in converting old br2-external trees. +# Escape '#' so that make does not consider it a comment. +MANUAL_URL='https://buildroot.org/manual/manual.html\#br2-external-converting' + main() { local OPT OPTARG local br2_ext ofile ofmt @@ -70,7 +74,8 @@ do_validate() { error "'%s': permission denied\n" "${br2_ext}" fi if [ ! -f "${br2_ext}/external.desc" ]; then - error "'%s': does not have a name (in 'external.desc')\n" "${br2_ext}" + error "'%s': does not have a name (in 'external.desc'). See %s\n" \ + "${br2_ext}" "${MANUAL_URL}" fi br2_name="$(sed -r -e '/^name: +(.*)$/!d; s//\1/' "${br2_ext}/external.desc")" if [ -z "${br2_name}" ]; then From 20cd49738781b79d42183b7298829887a284708e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:20 +0200 Subject: [PATCH 0827/3392] core: add support for multiple br2-external trees Currently, we only support at most one br2-external tree. Being able to use more than one br2-external tree can be very useful. A use-case would be for having a br2-external to contain the basic packages, basic board defconfigs and board files, provided by one team responsible for the "board-bringup", while other teams consume that br2-external as a base, and complements it each with their own set of packages, defconfigs and extra board files. Another use-case would be for third-parties to provide their own Buildroot packaging in a br2-external tree, along-side the archives for their stuff. Finally, another use-case is to be able to add FLOSS packages in a br2-external tree, and proprietary packages in another. This allows to not touch the Buildroot tree at all, and still be able to get in compliance by providing only that br2-external tree(s) that contains FLOSS packages, leaving aside the br2-external tree(s) with the proprietary bits. What we do is to treat BR2_EXTERNAL as a colon-separated (space- separated also work, and we use that internally) list of paths, on which we iterate to construct: - the list of all br2-external names, BR2_EXTERNAL_NAMES, - the per-br2-external tree BR2_EXTERNAL_$(NAME) variables, which point each to the actual location of the corresponding tree, - the list of paths to all the external.mk files, BR2_EXTERNAL_MKS, - the space-separated list of absolute paths to the external trees, BR2_EXTERNAL_DIRS. Once we have all those variables, we replace references to BR2_EXTERNAL with either one of those. This cascades into how we display the list of defconfigs, so that it is easy to see what br2-external tree provides what defconfigs. As suggested by Arnout, tweak the comment from "User-provided configs" to "External configs", on the assumption that some br2-external trees could be provided by vendors, so not necessarily user-provided. Ditto the menu in Kconfig, changed from "User-provided options" to "External options". Now, when more than one br2-external tree is used, each gets its own sub-menu in the "User-provided options" menu. The sub-menu is labelled with that br2-external tree's name and the sub-menu's first item is a comment with the path to that br2-external tree. If there's only one br2-external tree, then there is no sub-menu; there is a single comment that contains the name and path to the br2-external tree. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Romain Naour Cc: Julien CORJON Signed-off-by: Peter Korsgaard --- Makefile | 57 ++++++++++------- package/pkg-generic.mk | 4 +- support/scripts/br2-external | 115 +++++++++++++++++++++++------------ 3 files changed, 112 insertions(+), 64 deletions(-) diff --git a/Makefile b/Makefile index e263b54b8c..249cee85d3 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist)) # Handling of BR2_EXTERNAL. # # The value of BR2_EXTERNAL is stored in .br-external in the output directory. -# The location of the external.mk makefile fragment is computed in that file. +# The location of the external.mk makefile fragments is computed in that file. # On subsequent invocations of make, this file is read in. BR2_EXTERNAL can # still be overridden on the command line, therefore the file is re-created # every time make is run. @@ -448,16 +448,15 @@ include boot/common.mk include linux/linux.mk include fs/common.mk -# If using a br2-external tree, the BR2_EXTERNAL_$(NAME)_PATH variable -# is also present in the .config file. Since .config is included after -# we defined BR2_EXTERNAL_$(NAME)_PATH in the Makefile, the value in -# that variable is quoted. We just include the generated Makefile fragment -# .br2-external.mk a third time, which will set that variable to the -# un-quoted value. +# If using a br2-external tree, the BR2_EXTERNAL_$(NAME)_PATH variables +# are also present in the .config file. Since .config is included after +# we defined them in the Makefile, the values for those variables are +# quoted. We just include the generated Makefile fragment .br2-external.mk +# a third time, which will set those variables to the un-quoted values. include $(BR2_EXTERNAL_FILE) # Nothing to include if no BR2_EXTERNAL tree in use -include $(BR2_EXTERNAL_MK) +include $(BR2_EXTERNAL_MKS) # Now we are sure we have all the packages scanned and defined. We now # check for each package in the list of enabled packages, that all its @@ -849,7 +848,7 @@ define percent_defconfig @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) endef -$(eval $(foreach d,$(TOPDIR) $(if $(BR2_EXTERNAL_NAME),$(BR2_EXTERNAL_$(BR2_EXTERNAL_NAME)_PATH)),$(call percent_defconfig,$(d))$(sep))) +$(eval $(foreach d,$(TOPDIR) $(BR2_EXTERNAL_DIRS),$(call percent_defconfig,$(d))$(sep))) savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) $< \ @@ -972,19 +971,33 @@ help: @echo 'it on-line at http://buildroot.org/docs.html' @echo +# List the defconfig files +# $(1): base directory +# $(2): br2-external name, empty for bundled +define list-defconfigs + @first=true; \ + for defconfig in $(1)/configs/*_defconfig; do \ + [ -f "$${defconfig}" ] || continue; \ + if $${first}; then \ + if [ "$(2)" ]; then \ + printf "External configs in $(2):\n"; \ + else \ + printf "Built-in configs:\n"; \ + fi; \ + first=false; \ + fi; \ + defconfig="$${defconfig##*/}"; \ + printf " %-35s - Build for %s\n" "$${defconfig}" "$${defconfig%_defconfig}"; \ + done; \ + $${first} || printf "\n" +endef + +# We iterate over BR2_EXTERNAL_NAMES rather than BR2_EXTERNAL_DIRS, +# because we want to display the name of the br2-external tree. list-defconfigs: - @echo 'Built-in configs:' - @$(foreach b, $(sort $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig))), \ - printf " %-35s - Build for %s\\n" $(b) $(b:_defconfig=);) -ifneq ($(BR2_EXTERNAL_NAME),) -ifneq ($(wildcard $(BR2_EXTERNAL_$(BR2_EXTERNAL_NAME)_PATH)/configs/*_defconfig),) - @echo - @echo 'User-provided configs:' - @$(foreach b, $(sort $(notdir $(wildcard $(BR2_EXTERNAL_$(BR2_EXTERNAL_NAME)_PATH)/configs/*_defconfig))), \ - printf " %-35s - Build for %s\\n" $(b) $(b:_defconfig=);) -endif -endif - @echo + $(call list-defconfigs,$(TOPDIR)) + $(foreach name,$(BR2_EXTERNAL_NAMES),\ + $(call list-defconfigs,$(BR2_EXTERNAL_$(name)_PATH),$(name))$(sep)) release: OUT = buildroot-$(BR2_VERSION) @@ -1003,7 +1016,7 @@ print-version: @echo $(BR2_VERSION_FULL) include docs/manual/manual.mk --include $(if $(BR2_EXTERNAL_NAME),$(BR2_EXTERNAL_$(BR2_EXTERNAL_NAME)_PATH)/docs/*/*.mk) +-include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(dir)/docs/*/*.mk) .PHONY: $(noconfig_targets) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index a13e34f7de..e726ac5ef1 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -767,9 +767,9 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) # kernel case, the bootloaders case, and the normal packages case. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL -else ifneq ($$(filter boot/% $$(if $$(BR2_EXTERNAL_NAME),$$(BR2_EXTERNAL_$$(BR2_EXTERNAL_NAME)_PATH)/boot/%),$(pkgdir)),) +else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_TARGET_$(2) -else ifneq ($$(filter toolchain/% $$(if $$(BR2_EXTERNAL_NAME),$$(BR2_EXTERNAL_$$(BR2_EXTERNAL_NAME)_PATH)/toolchain/%),$(pkgdir)),) +else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_$(2) else $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 281a0847b8..d634e693ce 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -1,9 +1,9 @@ #!/bin/bash set -e -# The name and location of the br2-external tree, once validated. -declare BR2_NAME -declare BR2_EXT +# The names and locations of the br2-external trees, once validated. +declare -a BR2_EXT_NAMES +declare -A BR2_EXT_PATHS # URL to manual for help in converting old br2-external trees. # Escape '#' so that make does not consider it a comment. @@ -26,13 +26,6 @@ main() { # Forget options; keep only positional args shift $((OPTIND-1)) - # Accept 0 or 1 br2-external tree. - if [ ${#} -gt 1 ]; then - error "only zero or one br2-external tree allowed.\n" - fi - - br2_ext="${1}" - case "${ofmt}" in mk|kconfig) ;; @@ -44,13 +37,14 @@ main() { exec >"${ofile}" - do_validate "${br2_ext}" + do_validate ${@//:/ } do_${ofmt} } -# Validates the br2-external tree passed as argument. Makes it cannonical -# and store it in global variable BR2_EXT. +# Validates the br2-external trees passed as arguments. Makes each of +# them canonical and store them in the global arrays BR2_EXT_NAMES +# and BR2_EXT_PATHS. # # Note: since this script is always first called from Makefile context # to generate the Makefile fragment before it is called to generate the @@ -59,14 +53,22 @@ main() { # snippet means that there were no error. # do_validate() { - local br2_ext="${1}" - local br2_name n + local br2_ext - # No br2-external tree is valid - if [ -z "${br2_ext}" ]; then + if [ ${#} -eq 0 ]; then + # No br2-external tree is valid return fi + for br2_ext in "${@}"; do + do_validate_one "${br2_ext}" + done +} + +do_validate_one() { + local br2_ext="${1}" + local br2_name n + if [ ! -d "${br2_ext}" ]; then error "'%s': no such file or directory\n" "${br2_ext}" fi @@ -88,6 +90,10 @@ do_validate() { error "'%s': name '%s' contains invalid chars: '%s'\n" \ "${br2_ext}" "${br2_name//\$/\$\$}" "${n//\$/\$\$}" fi + if [ -n "${BR2_EXT_PATHS["${br2_name}"]}" ]; then + error "'%s': name '%s' is already used in '%s'\n" \ + "${br2_ext}" "${br2_name}" "${BR2_EXT_PATHS["${br2_name}"]}" + fi if [ ! -f "${br2_ext}/external.mk" ]; then error "'%s/external.mk': no such file or directory\n" "${br2_ext}" fi @@ -95,51 +101,80 @@ do_validate() { error "'%s/Config.in': no such file or directory\n" "${br2_ext}" fi - BR2_NAME="${br2_name}" - BR2_EXT="$(cd "${br2_ext}"; pwd -P )" + # Register this br2-external tree + BR2_EXT_NAMES+=( "${br2_name}" ) + BR2_EXT_PATHS["${br2_name}"]="${br2_ext}" } # Generate the .mk snippet that defines makefile variables # for the br2-external tree do_mk() { + local br2_name br2_ext + printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' printf '\n' - printf 'BR2_EXTERNAL ?= %s\n' "${BR2_EXT}" - printf 'BR2_EXTERNAL_NAME = \n' - printf 'BR2_EXTERNAL_MK =\n' + # We can't use ${BR2_EXT_NAMES[@]} directly: it is not guaranteed + # to be in the order paths were added (because it is an associative + # array). So we need to iterate on BR2_EXT_NAMES, which is sorted + # in the order names were added (because it is an indexed array). + printf 'BR2_EXTERNAL ?=' + for br2_name in "${BR2_EXT_NAMES[@]}"; do + printf ' %s' "${BR2_EXT_PATHS["${br2_name}"]}" + done printf '\n' - if [ -z "${BR2_NAME}" ]; then + printf 'BR2_EXTERNAL_NAMES = \n' + printf 'BR2_EXTERNAL_DIRS = \n' + printf 'BR2_EXTERNAL_MKS = \n' + + if [ ${#BR2_EXT_NAMES[@]} -eq 0 ]; then + printf '\n' printf '# No br2-external tree defined.\n' return fi - printf 'BR2_EXTERNAL_NAME = %s\n' "${BR2_NAME}" - printf 'BR2_EXTERNAL_MK = %s/external.mk\n' "${BR2_EXT}" - printf 'BR2_EXTERNAL_%s_PATH = %s\n' "${BR2_NAME}" "${BR2_EXT}" + for br2_name in "${BR2_EXT_NAMES[@]}"; do + br2_ext="${BR2_EXT_PATHS["${br2_name}"]}" + printf '\n' + printf 'BR2_EXTERNAL_NAMES += %s\n' "${br2_name}" + printf 'BR2_EXTERNAL_%s_PATH = %s\n' "${br2_name}" "${br2_ext}" + printf 'BR2_EXTERNAL_DIRS += %s\n' "${br2_ext}" + printf 'BR2_EXTERNAL_MKS += %s/external.mk\n' "${br2_ext}" + done } # Generate the kconfig snippet for the br2-external tree. do_kconfig() { + local br2_name br2_ext + printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' printf '\n' - if [ -z "${BR2_NAME}" ]; then + if [ ${#BR2_EXT_NAMES[@]} -eq 0 ]; then printf '# No br2-external tree defined.\n' return fi - printf 'menu "User-provided options"\n' - printf '\n' - printf 'comment "%s (in %s)"\n' "${BR2_NAME}" "${BR2_EXT}" - printf '\n' - printf 'config BR2_EXTERNAL_%s_PATH\n' "${BR2_NAME}" - printf '\tstring\n' - printf '\tdefault "%s"\n' "${BR2_EXT}" - printf '\n' - printf 'source "$BR2_EXTERNAL_%s_PATH/Config.in"\n' "${BR2_NAME}" + printf 'menu "External options"\n' printf '\n' + + for br2_name in "${BR2_EXT_NAMES[@]}"; do + br2_ext="${BR2_EXT_PATHS["${br2_name}"]}" + if [ ${#BR2_EXT_NAMES[@]} -gt 1 ]; then + printf 'menu "%s"\n' "${br2_name}" + fi + printf 'comment "%s (in %s)"\n' "${br2_name}" "${br2_ext}" + printf 'config BR2_EXTERNAL_%s_PATH\n' "${br2_name}" + printf '\tstring\n' + printf '\tdefault "%s"\n' "${br2_ext}" + printf 'source "%s/Config.in"\n' "${br2_ext}" + if [ ${#BR2_EXT_NAMES[@]} -gt 1 ]; then + printf 'endmenu # %s\n' "${br2_name}" + fi + printf '\n' + done + printf "endmenu # User-provided options\n" } @@ -149,12 +184,12 @@ help() { ${my_name} <-m|-k> -o FILE PATH With -m, ${my_name} generates the makefile fragment that defines - variables related to the br2-external tree passed as positional - argument. + variables related to the br2-external trees passed as positional + arguments. With -k, ${my_name} generates the kconfig snippet to include the - configuration options specified in the br2-external tree passed - as positional argument. + configuration options specified in the br2-external trees passed + as positional arguments. Using -k and -m together is not possible. The last one wins. From 1b496d40e3457e42fcf35004c677af4dc91dd935 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:21 +0200 Subject: [PATCH 0828/3392] docs/manual: document multi br2-external Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Samuel Martin Cc: Romain Naour Cc: Julien CORJON Signed-off-by: Peter Korsgaard --- docs/manual/br2-external-converting.txt | 9 +++-- docs/manual/customize-outside-br.txt | 49 ++++++++++++++++++------- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/docs/manual/br2-external-converting.txt b/docs/manual/br2-external-converting.txt index 73bd878ce5..831addf5af 100644 --- a/docs/manual/br2-external-converting.txt +++ b/docs/manual/br2-external-converting.txt @@ -4,9 +4,12 @@ [[br2-external-converting]] == Converting old br2-external trees -Buildroot 2016.11 introduced a backward-incompatible change in the way -br2-external trees are handled. A minor change has to be made: adding -a name to your br2-external tree, see xref:outside-br-custom[]. +Before Buildroot 2016.11, it was possible to use only one br2-external +tree at once. With Buildroot 2016.11 came the possibility to use more +than one simultaneously (for details, see xref:outside-br-custom[]). + +This however means that older br2-external trees are not usable as-is. +A minor change has to be made: adding a name to your br2-external tree. This can be done very easily in just a few steps: diff --git a/docs/manual/customize-outside-br.txt b/docs/manual/customize-outside-br.txt index 3ad0bc0478..09977e050e 100644 --- a/docs/manual/customize-outside-br.txt +++ b/docs/manual/customize-outside-br.txt @@ -19,10 +19,10 @@ place project-specific customizations in two locations: the br2-external mechanism and what to provide in a br2-external tree. -One can tell Buildroot to use a br2-external tree by setting the -+BR2_EXTERNAL+ make variable set to the path of the br2-external tree -to use. It can be passed to any Buildroot +make+ invocation. It is -automatically saved in the hidden +.br-external.mk+ file in the output +One can tell Buildroot to use one or more br2-external trees by setting +the +BR2_EXTERNAL+ make variable set to the path(s) of the br2-external +tree(s) to use. It can be passed to any Buildroot +make+ invocation. It +is automatically saved in the hidden +.br-external.mk+ file in the output directory. Thanks to this, there is no need to pass +BR2_EXTERNAL+ at every +make+ invocation. It can however be changed at any time by passing a new value, and can be removed by passing an empty value. @@ -41,10 +41,10 @@ xref:br2-external-converting[] for help on doing so. Some examples: ----- -buildroot/ $ make BR2_EXTERNAL=/path/to/foobar menuconfig +buildroot/ $ make BR2_EXTERNAL=/path/to/foo menuconfig ----- -From now on, definitions from the +/path/to/foobar+ br2-external tree +From now on, definitions from the +/path/to/foo+ br2-external tree will be used: ----- @@ -55,9 +55,15 @@ buildroot/ $ make legal-info We can switch to another br2-external tree at any time: ----- -buildroot/ $ make BR2_EXTERNAL=/where/we/have/barfoo xconfig +buildroot/ $ make BR2_EXTERNAL=/where/we/have/bar xconfig ----- +We can also use multiple br2-external trees: + +---- +buildroot/ $ make BR2_EXTERNAL=/path/to/foo:/where/we/have/bar menuconfig +---- + Or disable the usage of any br2-external tree: ----- @@ -73,13 +79,23 @@ A br2-external tree must contain at least those three files: the keyword 'name:', followed by one or more spaces, followed by the name. + -Buildroot sets +BR2_EXTERNAL_$(NAME)_PATH+ to the absolute path of the +Buildroot sets +BR2_EXTERNAL_$(NAME)_PATH+ to the absolute path of each br2-external tree, so that you can use it to refer to your br2-external tree. This variable is available both in Kconfig, so you can use it to source your Kconfig files (see below) and in the Makefile, so that you can use it to include other Makefiles (see below) or refer to other files (like data files) from your br2-external tree. + +.Note: +Since it is possible to use multiple br2-external trees at once, this + name is used by Buildroot to generate variables for each of those trees. + That name is used to identify your br2-external tree, so try to come up + with a name that really describes your br2-external tree, in order for + it to be relatively unique, so that it does not clash with another name + from another br2-external tree, especially if you are planning on + somehow sharing your br2-external tree with third parties or using + br2-external trees from third parties. ++ Example of an +external.desc+ file that declares the name +FOO+: + ---- @@ -119,9 +135,10 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_FOO)/board/ * One can store package recipes (i.e. +Config.in+ and +.mk+), or even custom configuration options and make logic. Buildroot - automatically includes +Config.in+ to make it appear in the top-level - configuration menu, and includes +external.mk+ with the rest of the - makefile logic. + automatically includes the +Config.in+ from each br2-external tree to + make it appear in the top-level configuration menu, and includes the + +external.mk+ from each br2-external tree with the rest of the makefile + logic. + The main usage of this is to store package recipes. The recommended way to do this is to write a +Config.in+ file that looks like: @@ -146,5 +163,11 @@ And then in +$(BR2_EXTERNAL_FOO_42_PATH)/package/package1+ and * One can store Buildroot defconfigs in the +configs+ subdirectory of the br2-external tree. Buildroot will automatically show them in the output of +make list-defconfigs+ and allow them to be loaded with the - normal +make _defconfig+ command. They will be visible under the - +User-provided configs+' label in the 'make list-defconfigs' output. + normal +make _defconfig+ command. They will be visible in the + 'make list-defconfigs' output, below an +External configs+ label that + contains the name of the br2-extermnal tree they are defined in. ++ +.Note: +If a defconfig file is present in more than one br2-external tree, then + the first one is used. It is not possible to override a defconfig + bundled in Buildroot. From 339e1c9500cd1057118576c51be4953c23bc7a40 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:22 +0200 Subject: [PATCH 0829/3392] core: allow a br2-external tree to override a defconfig Currently, it is not possible for a br2-external tree to override a defconfig bundled in Buildroot, nor is it possible to override one from a previous br2-external tree in the stack. However, it is interesting that a latter br2-external tree be able to override a defconfig: - the ones bundled in Buildroot are minimalist, and almost always build a toolchain, so a br2-external tree may want to provide a "better" defconfig (better, in the sense "suited for the project"); - similarly for a defconfig from a previous br2-external tree. But we can't do that, as the rules for the defconfigs are generated in the order the br2-external trees are specified, all after the bundled defconfigs. Those rule are patten-matching rules, which means that the first one to match is used, and the following ones are ignored. Add a new utility macro, 'reverse', inspired from GMSL, that does what it says: reverse a list of words. Use that macro to reverse the list of br2-external trees, so that the latters win over the formers, and even over bundled ones. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Samuel Martin Cc: Romain Naour Cc: Julien CORJON Signed-off-by: Peter Korsgaard --- Makefile | 2 +- docs/manual/customize-outside-br.txt | 5 +++-- support/misc/utils.mk | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 249cee85d3..c8f1fece9b 100644 --- a/Makefile +++ b/Makefile @@ -848,7 +848,7 @@ define percent_defconfig @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) endef -$(eval $(foreach d,$(TOPDIR) $(BR2_EXTERNAL_DIRS),$(call percent_defconfig,$(d))$(sep))) +$(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep))) savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig @$(COMMON_CONFIG_ENV) $< \ diff --git a/docs/manual/customize-outside-br.txt b/docs/manual/customize-outside-br.txt index 09977e050e..4c0f56813f 100644 --- a/docs/manual/customize-outside-br.txt +++ b/docs/manual/customize-outside-br.txt @@ -169,5 +169,6 @@ And then in +$(BR2_EXTERNAL_FOO_42_PATH)/package/package1+ and + .Note: If a defconfig file is present in more than one br2-external tree, then - the first one is used. It is not possible to override a defconfig - bundled in Buildroot. + the one from the last br2-external tree is used. It is thus possible + to override a defconfig bundled in Buildroot or another br2-external + tree. diff --git a/support/misc/utils.mk b/support/misc/utils.mk index 990a3d1fd6..c44319338e 100644 --- a/support/misc/utils.mk +++ b/support/misc/utils.mk @@ -46,6 +46,10 @@ endef $(eval $(call caseconvert-helper,UPPERCASE,$(join $(addsuffix :,$([FROM])),$([TO])))) $(eval $(call caseconvert-helper,LOWERCASE,$(join $(addsuffix :,$([TO])),$([FROM])))) +# Reverse the orders of words in a list. Again, inspired by the gmsl +# 'reverse' macro. +reverse = $(if $(1),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1))) + # Sanitize macro cleans up generic strings so it can be used as a filename # and in rules. Particularly useful for VCS version strings, that can contain # slashes, colons (OK in filenames but not in rules), and spaces. From 49117c1028033b80394eb1d0ef3d58009151ca8d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:23 +0200 Subject: [PATCH 0830/3392] core: support description for br2-external trees Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- Makefile | 5 +++-- support/scripts/br2-external | 12 +++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c8f1fece9b..a860218746 100644 --- a/Makefile +++ b/Makefile @@ -980,7 +980,7 @@ define list-defconfigs [ -f "$${defconfig}" ] || continue; \ if $${first}; then \ if [ "$(2)" ]; then \ - printf "External configs in $(2):\n"; \ + printf 'External configs in "$(call qstrip,$(2))":\n'; \ else \ printf "Built-in configs:\n"; \ fi; \ @@ -997,7 +997,8 @@ endef list-defconfigs: $(call list-defconfigs,$(TOPDIR)) $(foreach name,$(BR2_EXTERNAL_NAMES),\ - $(call list-defconfigs,$(BR2_EXTERNAL_$(name)_PATH),$(name))$(sep)) + $(call list-defconfigs,$(BR2_EXTERNAL_$(name)_PATH),\ + $(BR2_EXTERNAL_$(name)_DESC))$(sep)) release: OUT = buildroot-$(BR2_VERSION) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index d634e693ce..038525e01d 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -4,6 +4,7 @@ set -e # The names and locations of the br2-external trees, once validated. declare -a BR2_EXT_NAMES declare -A BR2_EXT_PATHS +declare -A BR2_EXT_DESCS # URL to manual for help in converting old br2-external trees. # Escape '#' so that make does not consider it a comment. @@ -67,7 +68,7 @@ do_validate() { do_validate_one() { local br2_ext="${1}" - local br2_name n + local br2_name br2_desc n if [ ! -d "${br2_ext}" ]; then error "'%s': no such file or directory\n" "${br2_ext}" @@ -94,6 +95,7 @@ do_validate_one() { error "'%s': name '%s' is already used in '%s'\n" \ "${br2_ext}" "${br2_name}" "${BR2_EXT_PATHS["${br2_name}"]}" fi + br2_desc="$(sed -r -e '/^desc: +(.*)$/!d; s//\1/' "${br2_ext}/external.desc")" if [ ! -f "${br2_ext}/external.mk" ]; then error "'%s/external.mk': no such file or directory\n" "${br2_ext}" fi @@ -104,6 +106,7 @@ do_validate_one() { # Register this br2-external tree BR2_EXT_NAMES+=( "${br2_name}" ) BR2_EXT_PATHS["${br2_name}"]="${br2_ext}" + BR2_EXT_DESCS["${br2_name}"]="${br2_desc:-${br2_name}}" } # Generate the .mk snippet that defines makefile variables @@ -135,10 +138,12 @@ do_mk() { fi for br2_name in "${BR2_EXT_NAMES[@]}"; do + br2_desc="${BR2_EXT_DESCS["${br2_name}"]}" br2_ext="${BR2_EXT_PATHS["${br2_name}"]}" printf '\n' printf 'BR2_EXTERNAL_NAMES += %s\n' "${br2_name}" printf 'BR2_EXTERNAL_%s_PATH = %s\n' "${br2_name}" "${br2_ext}" + printf 'BR2_EXTERNAL_%s_DESC = %s\n' "${br2_name}" "${br2_desc}" printf 'BR2_EXTERNAL_DIRS += %s\n' "${br2_ext}" printf 'BR2_EXTERNAL_MKS += %s/external.mk\n' "${br2_ext}" done @@ -160,11 +165,12 @@ do_kconfig() { printf '\n' for br2_name in "${BR2_EXT_NAMES[@]}"; do + br2_desc="${BR2_EXT_DESCS["${br2_name}"]}" br2_ext="${BR2_EXT_PATHS["${br2_name}"]}" if [ ${#BR2_EXT_NAMES[@]} -gt 1 ]; then - printf 'menu "%s"\n' "${br2_name}" + printf 'menu "%s"\n' "${br2_desc}" fi - printf 'comment "%s (in %s)"\n' "${br2_name}" "${br2_ext}" + printf 'comment "%s (in %s)"\n' "${br2_desc}" "${br2_ext}" printf 'config BR2_EXTERNAL_%s_PATH\n' "${br2_name}" printf '\tstring\n' printf '\tdefault "%s"\n' "${br2_ext}" From 4c75c3b80744bd67cf76dd54613d5be71b2af702 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 14 Oct 2016 16:39:24 +0200 Subject: [PATCH 0831/3392] docs/manual: document the br2-external desc: field Docuement the new, optional desc: field for an external.desc file. That part of the manual was starting to be a bit of a mess, so reorganise it. Provide a complete br2-external tree example. Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- docs/manual/customize-outside-br.txt | 280 ++++++++++++++++++++------- 1 file changed, 206 insertions(+), 74 deletions(-) diff --git a/docs/manual/customize-outside-br.txt b/docs/manual/customize-outside-br.txt index 4c0f56813f..56c2c8ada6 100644 --- a/docs/manual/customize-outside-br.txt +++ b/docs/manual/customize-outside-br.txt @@ -70,21 +70,40 @@ Or disable the usage of any br2-external tree: buildroot/ $ make BR2_EXTERNAL= xconfig ----- -A br2-external tree must contain at least those three files: - -+external.desc+:: - That file shall contain the _name_ for the br2-external tree. That name - must only use ASCII characters in the set +[A-Za-z0-9_]+; any other - character is forbidden. The format for this file is a single line with - the keyword 'name:', followed by one or more spaces, followed by the - name. -+ -Buildroot sets +BR2_EXTERNAL_$(NAME)_PATH+ to the absolute path of each - br2-external tree, so that you can use it to refer to your br2-external - tree. This variable is available both in Kconfig, so you can use it - to source your Kconfig files (see below) and in the Makefile, so that - you can use it to include other Makefiles (see below) or refer to other - files (like data files) from your br2-external tree. +==== Layout of a br2-external tree + +A br2-external tree must contain at least those three files, described +in the following chapters: + + * +external.desc+ + * +external.mk+ + * +Config.in+ + +Apart from those mandatory files, there may be additional and optional +content that may be present in a br2-external tree, like the +configs/+ +directory. They are described in the following chapters as well. + +A complete example br2-external tree layout is also described later. + +===== The +external.desc+ file + +That file describes the br2-external tree: the _name_ and _description_ +for that br2-external tree. + +The format for this file is line based, with each line starting by a +keyword, followed by a colon and one or more spaces, followed by the +value assigned to that keyword. There are two keywords currently +recognised: + + * +name+, mandatory, defines the name for that br2-external tree. That + name must only use ASCII characters in the set +[A-Za-z0-9_]+; any + other character is forbidden. Buildroot sets the variable + +BR2_EXTERNAL_$(NAME)_PATH+ to the absolute path of the br2-external + tree, so that you can use it to refer to your br2-external tree. This + variable is available both in Kconfig, so you can use it to source your + Kconfig files (see below) and in the Makefile, so that you can use it + to include other Makefiles (see below) or refer to other files (like + data files) from your br2-external tree. + .Note: Since it is possible to use multiple br2-external trees at once, this @@ -95,80 +114,193 @@ Since it is possible to use multiple br2-external trees at once, this from another br2-external tree, especially if you are planning on somehow sharing your br2-external tree with third parties or using br2-external trees from third parties. -+ -Example of an +external.desc+ file that declares the name +FOO+: -+ ----- -$ cat external.desc -name: FOO ----- -+ + + * +desc+, optional, provides a short description for that br2-external + tree. It shall fit on a single line, is mostly free-form (see below), + and is used when displaying information about a br2-external tree (e.g. + above the list of defconfig files, or as the prompt in the menuconfig); + as such, it should relatively brief (40 chars is probably a good upper + limit). + Examples of names and the corresponding +BR2_EXTERNAL_$(NAME)_PATH+ variables: -+ + * +FOO+ -> +BR2_EXTERNAL_FOO_PATH+ * +BAR_42+ -> +BR2_EXTERNAL_BAR_42_PATH+ -+ + In the following examples, it is assumed the name to be set to +BAR_42+. -+Config.in+:: -+external.mk+:: - Those files (which may each be empty) can be used to define package - recipes, like for packages bundled in Buildroot itself, or other - custom configuration options. - -Using a br2-external tree then allows three different things: - - * One can store all the board-specific configuration files there, such - as the kernel configuration, the root filesystem overlay, or any other - configuration file for which Buildroot allows to set the location (by - using the +BR2_EXTERNAL_$(NAME)_PATH+ variable). For example, you - could set the paths to a global patch directory, to a rootfs overlay - and to the kernel configuration file as follows (e.g. by running - `make menuconfig` and filling in these options): -+ ----- -BR2_GLOBAL_PATCH_DIR=$(BR2_EXTERNAL_BAR_42_PATH)/patches/ -BR2_ROOTFS_OVERLAY=$(BR2_EXTERNAL_BAR_42_PATH)/board//overlay/ -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_FOO)/board//kernel.config ----- +===== The +Config.in+ and +external.mk+ files + +Those files (which may each be empty) can be used to define package +recipes (i.e. +foo/Config.in+ and +foo/foo.mk+ like for packages bundled +in Buildroot itself) or other custom configuration options or make logic. + +Buildroot automatically includes the +Config.in+ from each br2-external +tree to make it appear in the top-level configuration menu, and includes +the +external.mk+ from each br2-external tree with the rest of the +makefile logic. - * One can store package recipes (i.e. +Config.in+ and +.mk+), - or even custom configuration options and make logic. Buildroot - automatically includes the +Config.in+ from each br2-external tree to - make it appear in the top-level configuration menu, and includes the - +external.mk+ from each br2-external tree with the rest of the makefile - logic. -+ The main usage of this is to store package recipes. The recommended way - to do this is to write a +Config.in+ file that looks like: -+ +to do this is to write a +Config.in+ file that looks like: + ------ source "$BR2_EXTERNAL_BAR_42_PATH/package/package1/Config.in" source "$BR2_EXTERNAL_BAR_42_PATH/package/package2/Config.in" ------ -+ + Then, have an +external.mk+ file that looks like: -+ + ------ include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk)) ------ -+ -And then in +$(BR2_EXTERNAL_FOO_42_PATH)/package/package1+ and - +$(BR2_EXTERNAL_FOO_42_PATH)/package/package2+ create normal - Buildroot package recipes, as explained in xref:adding-packages[]. - If you prefer, you can also group the packages in subdirectories - called and adapt the above paths accordingly. - - * One can store Buildroot defconfigs in the +configs+ subdirectory of - the br2-external tree. Buildroot will automatically show them in the - output of +make list-defconfigs+ and allow them to be loaded with the - normal +make _defconfig+ command. They will be visible in the - 'make list-defconfigs' output, below an +External configs+ label that - contains the name of the br2-extermnal tree they are defined in. -+ + +And then in +$(BR2_EXTERNAL_BAR_42_PATH)/package/package1+ and ++$(BR2_EXTERNAL_BAR_42_PATH)/package/package2+ create normal +Buildroot package recipes, as explained in xref:adding-packages[]. +If you prefer, you can also group the packages in subdirectories +called and adapt the above paths accordingly. + +You can also define custom configuration options in +Config.in+ and +custom make logic in +external.mk+. + +===== The +configs/+ directory + +One can store Buildroot defconfigs in the +configs+ subdirectory of +the br2-external tree. Buildroot will automatically show them in the +output of +make list-defconfigs+ and allow them to be loaded with the +normal +make _defconfig+ command. They will be visible in the +'make list-defconfigs' output, below an +External configs+ label that +contains the name of the br2-extermnal tree they are defined in. + .Note: If a defconfig file is present in more than one br2-external tree, then - the one from the last br2-external tree is used. It is thus possible - to override a defconfig bundled in Buildroot or another br2-external - tree. +the one from the last br2-external tree is used. It is thus possible +to override a defconfig bundled in Buildroot or another br2-external +tree. + +===== Free-form content + +One can store all the board-specific configuration files there, such +as the kernel configuration, the root filesystem overlay, or any other +configuration file for which Buildroot allows to set the location (by +using the +BR2_EXTERNAL_$(NAME)_PATH+ variable). For example, you +could set the paths to a global patch directory, to a rootfs overlay +and to the kernel configuration file as follows (e.g. by running +`make menuconfig` and filling in these options): + +---- +BR2_GLOBAL_PATCH_DIR=$(BR2_EXTERNAL_BAR_42_PATH)/patches/ +BR2_ROOTFS_OVERLAY=$(BR2_EXTERNAL_BAR_42_PATH)/board//overlay/ +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_FOO)/board//kernel.config +---- + +===== Example layout + +Here is an example layout using all features of br2-external (the sample +content is shown for the file above it, when it is relevant to explain +the br2-external tree; this is all entirely made up just for the sake of +illustration, of course): + +---- +/path/to/br2-ext-tree/ + |- external.desc + | |name: BAR_42 + | |desc: Example br2-external tree + | `---- + | + |- Config.in + | |source "$BR2_EXTERNAL_BAR_42_DIR/package/pkg-1/Config.in + | |source "$BR2_EXTERNAL_BAR_42_DIR/package/pkg-2/Config.in + | | + | |config BAR_42_FLASH_ADDR + | | hex "my-board flash address" + | | default 0x10AD + | `---- + | + |- external.mk + | |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk)) + | | + | |flash-my-board: + | | $(BR2_EXTERNAL_BAR_42_DIR)/board/my-board/flash-image \ + | | --image $(BINARIES_DIR)/image.bin \ + | | --address $(BAR_42_FLASH_ADDR) + | `---- + | + |- package/pkg-1/Config.in + | |config BR2_PACKAGE_PKG_1 + | | bool "pkg-1" + | | help + | | Some help about pkg-1 + | `---- + |- package/pkg-1/pkg-1.hash + |- package/pkg-1/pkg-1.mk + | |PKG_1_VERSION = 1.2.3 + | |PKG_1_SITE = /some/where/to/get/pkg-1 + | |PKG_1_LICENSE = blabla + | | + | |define PKG_1_INSTALL_INIT_SYSV + | | $(INSTALL) -D -m 0755 $(PKG_1_PKGDIR)/S99my-daemon \ + | | $(TARGET_DIR)/etc/init.d/S99my-daemon + | |endef + | | + | |$(eval $(autotools-package)) + | `---- + |- package/pkg-1/S99my-daemon + | + |- package/pkg-2/Config.in + |- package/pkg-2/pkg-2.hash + |- package/pkg-2/pkg-2.mk + | + |- configs/my-board_defconfig + | |BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BAR_42_PATH)/patches/" + | |BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/overlay/" + | |BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/post-image.sh" + | |BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BAR_42_FOO)/board/my-board/kernel.config" + | `---- + | + |- patches/linux/0001-some-change.patch + |- patches/linux/0002-some-other-change.patch + |- patches/busybox/0001-fix-something.patch + | + |- board/my-board/kernel.config + |- board/my-board/overlay/var/www/index.html + |- board/my-board/overlay/var/www/my.css + |- board/my-board/flash-image + `- board/my-board/post-image.sh + |#!/bin/sh + |generate-my-binary-image \ + | --root ${BINARIES_DIR}/rootfs.tar \ + | --kernel ${BINARIES_DIR}/zImage \ + | --dtb ${BINARIES_DIR}/my-board.dtb \ + | --output ${BINARIES_DIR}/image.bin + `---- +---- + +The br2-external tree will then be visible in the menuconfig (with +the layout expanded): + +---- +External options ---> + *** Example br2-external tree (in /path/to/br2-ext-tree/) + [ ] pkg-1 + [ ] pkg-2 + (0x10AD) my-board flash address +---- + +If you are using more than one br2-external tree, it would look like +(with the layout expanded and the second one with name +FOO_27+ but no ++desc:+ field in +external.desc+): + +---- +External options ---> + Example br2-external tree ---> + *** Example br2-external tree (in /path/to/br2-ext-tree) + [ ] pkg-1 + [ ] pkg-2 + (0x10AD) my-board flash address + FOO_27 ---> + *** FOO_27 (in /path/to/another-br2-ext) + [ ] foo + [ ] bar +---- From 2206a0c0a7381cbfb53f6997e6c2405e96b391f8 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Sun, 16 Oct 2016 11:25:26 +0100 Subject: [PATCH 0832/3392] libiscsi: bump version to 1.18.0 Also... - Switch to GitHub. - Remove LD=CC logic in libscsi.mk. This is now handled by the configure script. - Add patch to fix unsafe include paths issues. This patch has been sent upstream as a pull request. - Use a hook to create the m4 directory so autoreconf doesn't fail. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- ...-This-is-unsafe-when-cross-compiling.patch | 67 +++++++++++++++++++ package/libiscsi/libiscsi.hash | 2 +- package/libiscsi/libiscsi.mk | 13 ++-- 3 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 package/libiscsi/0001-Do-not-use-I-usr-include.-This-is-unsafe-when-cross-compiling.patch diff --git a/package/libiscsi/0001-Do-not-use-I-usr-include.-This-is-unsafe-when-cross-compiling.patch b/package/libiscsi/0001-Do-not-use-I-usr-include.-This-is-unsafe-when-cross-compiling.patch new file mode 100644 index 0000000000..dc047ef49c --- /dev/null +++ b/package/libiscsi/0001-Do-not-use-I-usr-include.-This-is-unsafe-when-cross-compiling.patch @@ -0,0 +1,67 @@ +From f27bdf64f0c375352ca42928071a9178a5a04c46 Mon Sep 17 00:00:00 2001 +From: Vicente Olivert Riera +Date: Sun, 16 Oct 2016 10:53:13 +0100 +Subject: [PATCH] Do not use -I/usr/include. This is unsafe when cross-compiling. + +Upstream status: PR sent (https://github.com/sahlberg/libiscsi/pull/219) + +Signed-off-by: Vicente Olivert Riera +--- + examples/Makefile.am | 2 +- + lib/Makefile.am | 2 +- + tests/Makefile.am | 2 +- + utils/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 0de0b1f..42ad818 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,6 +1,6 @@ + AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ + "-D_R_(A,B)=__attribute__((format(printf,A,B)))" +-AM_CFLAGS=$(WARN_CFLAGS) -I/usr/include ++AM_CFLAGS=$(WARN_CFLAGS) + LDADD = ../lib/libiscsi.la + + noinst_PROGRAMS = iscsiclient iscsi-dd +diff --git a/lib/Makefile.am b/lib/Makefile.am +index d612fb7..47ffc33 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -29,7 +29,7 @@ libiscsi_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \ + "-D_U_=__attribute__((unused))" \ + "-D_R_(A,B)=__attribute__((format(printf,A,B)))" + +-AM_CFLAGS=$(WARN_CFLAGS) -I/usr/include ++AM_CFLAGS=$(WARN_CFLAGS) + + dist_noinst_DATA = libiscsi.syms libiscsi.def + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 9d699fc..b4cbf21 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,6 +1,6 @@ + AM_CPPFLAGS = -I../include "-D_U_=__attribute__((unused))" \ + "-D_R_(A,B)=__attribute__((format(printf,A,B)))" +-AM_CFLAGS = $(WARN_CFLAGS) -I/usr/include ++AM_CFLAGS = $(WARN_CFLAGS) + LDADD = ../lib/libiscsi.la + + noinst_PROGRAMS = prog_reconnect prog_reconnect_timeout prog_noop_reply \ +diff --git a/utils/Makefile.am b/utils/Makefile.am +index 657ca9d..bde1c81 100644 +--- a/utils/Makefile.am ++++ b/utils/Makefile.am +@@ -1,6 +1,6 @@ + AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ + "-D_R_(A,B)=__attribute__((format(printf,A,B)))" +-AM_CFLAGS = $(WARN_CFLAGS) -I/usr/include ++AM_CFLAGS = $(WARN_CFLAGS) + LDADD = ../lib/libiscsi.la + + bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-perf iscsi-readcapacity16 \ +-- +2.10.0 + diff --git a/package/libiscsi/libiscsi.hash b/package/libiscsi/libiscsi.hash index 8ccc264784..4f7d1af50e 100644 --- a/package/libiscsi/libiscsi.hash +++ b/package/libiscsi/libiscsi.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 26aa5583053d4fe0d4686f76a76c216c7dce00130f008e652ece305b88758ff1 libiscsi-1.15.0.tar.gz +sha256 464d104e12533dc11f0dd7662cbc2f01c132f94aa4f5bd519e3413ef485830e8 libiscsi-1.18.0.tar.gz diff --git a/package/libiscsi/libiscsi.mk b/package/libiscsi/libiscsi.mk index 71c10c1014..4c8a229265 100644 --- a/package/libiscsi/libiscsi.mk +++ b/package/libiscsi/libiscsi.mk @@ -4,14 +4,17 @@ # ################################################################################ -LIBISCSI_VERSION = 1.15.0 -LIBISCSI_SITE = https://sites.google.com/site/libiscsitarballs/libiscsitarballs +LIBISCSI_VERSION = 1.18.0 +LIBISCSI_SITE = $(call github,sahlberg,libiscsi,$(LIBISCSI_VERSION)) LIBISCSI_LICENSE = GPLv2+, LGPLv2.1+ LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt LIBISCSI_INSTALL_STAGING = YES +LIBISCSI_AUTORECONF = YES -# Force libiscsi to use gcc as the linker, otherwise it uses directly -# ld, which doesn't work for certain architectures. -LIBISCSI_CONF_ENV = LD="$(TARGET_CC)" +# We need to create the m4 directory to make autoreconf work properly. +define LIBISCSI_CREATE_M4_DIR + mkdir -p $(@D)/m4 +endef +LIBISCSI_POST_PATCH_HOOKS += LIBISCSI_CREATE_M4_DIR $(eval $(autotools-package)) From 3411db085d1f2c987d012e43fbc4bd003ff601d4 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 11 Oct 2016 23:04:57 +0200 Subject: [PATCH 0833/3392] toolchain/external: bump Linaro ARM to 2016.05 for i686 hosts This Linaro release provide a new toolchain archive for i686 hosts, so update our old 2014.09. Tested with Qemu qemu-2.4.1-11.fc23 and with HOSTARCH set to x86 in the Buildroot main Makefile. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 29 +------------------ .../toolchain-external.hash | 3 +- .../toolchain-external/toolchain-external.mk | 7 ++--- 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 62c2cd21b2..964cc01d4b 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -11,38 +11,11 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS -# Note: we use the same symbol for both Linaro toolchains. -# Since they have different dependencies (the host), we can -# give them different prompts and different help texts. -config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM - bool "Linaro ARM 2014.09" - depends on BR2_arm - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_HOSTARCH = "x86" - depends on BR2_ARM_EABIHF - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Linaro toolchain for the ARM architecture. It uses Linaro - GCC 2014.09 (based on gcc 4.9), Linaro GDB 2013.10 (based on - GDB 7.6), eglibc 2.19, Binutils 2014.09 (based on 2.24). It - generates code that runs on all Cortex-A profile devices, - but tuned for the Cortex-A9. The code generated is Thumb 2, - with the hard floating point calling convention, and uses - the VFPv3-D16 FPU instructions. - -# See the note above. config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM bool "Linaro ARM 2016.05" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A - depends on BR2_HOSTARCH = "x86_64" + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 9059175034..b89b3464c8 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -35,8 +35,7 @@ sha256 254af7d02eb3bcc8345c78e131700bc995d65b68232caaed21150a5fd1456070 arago-2 sha256 25fbf0513ad7322b15cbaae964cafadcbb4c939f2708f57f40b8f9f2d601122b arago-toolchain-2011.09-sources.tar.bz2 # ARM and Aarch64 toolchains from Linaro -sha256 0cffac0caea0eb3c8bdddfa14be011ce366680f40aeddbefc7cf23cb6d4f1891 gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz -sha256 eafeb3a5247e9ce31aa35d812e296fba5d5f1443e106d9bef9e38d3ee3ade006 gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_src.tar.bz2 +sha256 f1421c580ce977226f4fefc9c409b3b423260cc65a6e9dc6da88bb3478a521a0 gcc-linaro-5.3.1-2016.05-i686_arm-linux-gnueabihf.tar.xz sha256 987941c9fffdf56ffcbe90e8984673c16648c477b537fcf43add22fa62f161cd gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz sha256 4bc9d86390f8fa67a693ba4768ba5b12faaf7dd37c706c05ccd9321e765226e4 gcc-linaro-armeb-linux-gnueabihf-4.9-2014.09_linux.tar.xz sha256 bf5d3111dad5aa9aef0e955875fb7fc9e918cb24519af7014dd67a9e581a49b1 gcc-linaro-armeb-linux-gnueabihf-4.9-2014.09_src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 6fd274201e..d7fa9dfba1 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -329,13 +329,10 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM),y) +TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/arm-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/14.09/components/toolchain/binaries -TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz -TOOLCHAIN_EXTERNAL_ACTUAL_SOURCE_TARBALL = gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_src.tar.bz2 -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_LINARO_SYMLINK +TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-i686_arm-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/arm-linux-gnueabihf TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz endif else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB),y) From 9c9ddc4a2ca839217832c3432d8f8df5f6afd494 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 11 Oct 2016 23:04:58 +0200 Subject: [PATCH 0834/3392] toolchain/external: bump Linaro ARMeb to 2016.05 for i686 hosts Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 27 +------------------ .../toolchain-external.hash | 3 +-- .../toolchain-external/toolchain-external.mk | 7 ++--- 3 files changed, 4 insertions(+), 33 deletions(-) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 964cc01d4b..eb01cf387f 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -34,36 +34,11 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM with the hard floating point calling convention, and uses the VFPv3-D16 FPU instructions. -# See the note above. -config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB - bool "Linaro armeb 2014.09" - depends on BR2_armeb - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_HOSTARCH = "x86" - depends on BR2_ARM_EABIHF - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Linaro toolchain for the ARM big endian architecture. It - uses Linaro GCC 2014.09 (based on gcc 4.9), Linaro GDB - 2013.10 (based on GDB 7.6), eglibc 2.19, Binutils 2014.09 - (based on 2.24). It generates code that runs on all Cortex-A - profile devices, but tuned for the Cortex-A9. The code - generated is Thumb 2, with the hard floating point calling - convention, and uses the VFPv3-D16 FPU instructions. - -# See the note above. config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB bool "Linaro armeb 2016.05" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A - depends on BR2_HOSTARCH = "x86_64" + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index b89b3464c8..65be7ddd39 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -37,8 +37,7 @@ sha256 25fbf0513ad7322b15cbaae964cafadcbb4c939f2708f57f40b8f9f2d601122b arago-t # ARM and Aarch64 toolchains from Linaro sha256 f1421c580ce977226f4fefc9c409b3b423260cc65a6e9dc6da88bb3478a521a0 gcc-linaro-5.3.1-2016.05-i686_arm-linux-gnueabihf.tar.xz sha256 987941c9fffdf56ffcbe90e8984673c16648c477b537fcf43add22fa62f161cd gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz -sha256 4bc9d86390f8fa67a693ba4768ba5b12faaf7dd37c706c05ccd9321e765226e4 gcc-linaro-armeb-linux-gnueabihf-4.9-2014.09_linux.tar.xz -sha256 bf5d3111dad5aa9aef0e955875fb7fc9e918cb24519af7014dd67a9e581a49b1 gcc-linaro-armeb-linux-gnueabihf-4.9-2014.09_src.tar.bz2 +sha256 f6e9c0d3320760fe8f89e9ec3acdd7b4da7eff889c094b4a2acc286fd46f334f gcc-linaro-5.3.1-2016.05-i686_armeb-linux-gnueabihf.tar.xz sha256 6cf41c8944be56279cc14992aa075174b7a4c5938502536266eaaeef048f9440 gcc-linaro-5.3.1-2016.05-x86_64_armeb-linux-gnueabihf.tar.xz sha256 3954f496ab01de67241109e82abfaa9b7625fdab4f05e79e7902e9814a07b832 gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz sha256 a7b8f842fdc9d9be22ca4e0c999429780fc6f16ea798b032421b5ec0cfa53b3e gcc-linaro-aarch64-linux-gnu-4.9-2014.09_src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index d7fa9dfba1..fd1e75a9ed 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -336,13 +336,10 @@ else TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz endif else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB),y) +TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/armeb-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/14.09/components/toolchain/binaries -TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-armeb-linux-gnueabihf-4.9-2014.09_linux.tar.xz -TOOLCHAIN_EXTERNAL_ACTUAL_SOURCE_TARBALL = gcc-linaro-armeb-linux-gnueabihf-4.9-2014.09_src.tar.bz2 -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_LINARO_SYMLINK +TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-i686_armeb-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/armeb-linux-gnueabihf TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-x86_64_armeb-linux-gnueabihf.tar.xz endif else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS),y) From fe3f9ecfecbe745112a73b377c2f22a744f620ac Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 11 Oct 2016 23:04:59 +0200 Subject: [PATCH 0835/3392] toolchain/external: bump Linaro AArch64 to 2016.05 for i686 hosts Tested with Qemu 2.6.1 and qemu_aarch64_virt_defconfig and with HOSTARCH set to x86 in the Buildroot main Makefile. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 20 +------------------ .../toolchain-external.hash | 3 +-- .../toolchain-external/toolchain-external.mk | 7 ++----- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index eb01cf387f..cdf01c9aa5 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -483,28 +483,10 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX Toolchain for the Blackfin architecture, from http://blackfin.uclinux.org. -# See note about Linaro ARM/ARMEB toolchains, above. -config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 - bool "Linaro AArch64 14.09" - depends on BR2_aarch64 - depends on BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Toolchain for the AArch64 architecture, from - http://www.linaro.org/engineering/armv8/ - -# See note about Linaro ARM/ARMEB toolchains, above. config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 bool "Linaro AArch64 2016.05" depends on BR2_aarch64 - depends on BR2_HOSTARCH = "x86_64" + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 65be7ddd39..41c2ab3ace 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -39,8 +39,7 @@ sha256 f1421c580ce977226f4fefc9c409b3b423260cc65a6e9dc6da88bb3478a521a0 gcc-lin sha256 987941c9fffdf56ffcbe90e8984673c16648c477b537fcf43add22fa62f161cd gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz sha256 f6e9c0d3320760fe8f89e9ec3acdd7b4da7eff889c094b4a2acc286fd46f334f gcc-linaro-5.3.1-2016.05-i686_armeb-linux-gnueabihf.tar.xz sha256 6cf41c8944be56279cc14992aa075174b7a4c5938502536266eaaeef048f9440 gcc-linaro-5.3.1-2016.05-x86_64_armeb-linux-gnueabihf.tar.xz -sha256 3954f496ab01de67241109e82abfaa9b7625fdab4f05e79e7902e9814a07b832 gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz -sha256 a7b8f842fdc9d9be22ca4e0c999429780fc6f16ea798b032421b5ec0cfa53b3e gcc-linaro-aarch64-linux-gnu-4.9-2014.09_src.tar.bz2 +sha256 d43227248f282a652da42322fcf4abfd3021f2a2f62e0cf6e242d82f55966ba9 gcc-linaro-5.3.1-2016.05-i686_aarch64-linux-gnu.tar.xz sha256 1941dcf6229d6706bcb89b7976d5d43d170efdd17c27d5fe1738e7ecf22adc37 gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu.tar.xz # Codescape toolchains from Imagination Technologies diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index fd1e75a9ed..39c5734d7a 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -376,13 +376,10 @@ TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2014R1-RC2.i TOOLCHAIN_EXTERNAL_STRIP_COMPONENTS = 3 TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64),y) +TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/aarch64-linux-gnu ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/14.09/components/toolchain/binaries -TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz -TOOLCHAIN_EXTERNAL_ACTUAL_SOURCE_TARBALL = gcc-linaro-aarch64-linux-gnu-4.9-2014.09_src.tar.bz2 -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_LINARO_SYMLINK +TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-i686_aarch64-linux-gnu.tar.xz else -TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/aarch64-linux-gnu TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu.tar.xz endif else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64),y) From 70f76e05b90e39a92b95393c2e8ad6aeb3ed2ad6 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 11 Oct 2016 23:05:00 +0200 Subject: [PATCH 0836/3392] toolchain/external: remove unused Linaro symlink hook This hook was needed by 1014.09 Linaro toolchains. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/toolchain-external.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 39c5734d7a..141dd10fd4 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -257,14 +257,6 @@ ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) TOOLCHAIN_EXTERNAL_DEPENDENCIES += musl-compat-headers endif -# The Linaro toolchain expects the libraries in -# {/usr,}/lib/, but Buildroot copies them to -# {/usr,}/lib, so we need to create a symbolic link. -define TOOLCHAIN_EXTERNAL_LINARO_SYMLINK - ln -snf . $(TARGET_DIR)/lib/$(TOOLCHAIN_EXTERNAL_PREFIX) - ln -snf . $(TARGET_DIR)/usr/lib/$(TOOLCHAIN_EXTERNAL_PREFIX) -endef - # The Codescape toolchain uses a sysroot layout that places them # side-by-side instead of nested like multilibs. A symlink is needed # much like for the nested sysroots which are handled in From 1ae8d415e60fec75997b9d9a533ab5103d4d93d0 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 15 Oct 2016 23:14:11 +0200 Subject: [PATCH 0837/3392] gzip: force shell shebang to /bin/sh gzip's configure uses $SHELL to find a POSIX-compliant shell to put in the shebang of its shell scripts (zcat, gzexe, ...). However, we set $SHELL to /bin/bash in the Makefile, which may not be present on the target. We do make sure that /bin/sh always points to a valid shell on the target so we can use that. The configure discovery is completely broken for cross-compilation. The same $SHELL is used during the build (it is used by make to run the commands in rules) and on the target. Also, the checks for a valid shell use the host shell, not the target shell. We could try to patch gzip to fix that, but the checks can anyway not be run for the target shell, so we'll have to override it with a cache value anyway. So we can just as well do exactly that, without patching. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reported-by: Pascal Speck Signed-off-by: Thomas Petazzoni --- package/gzip/gzip.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 6dc910ec15..c4e91b07cc 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -14,5 +14,12 @@ GZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) GZIP_LICENSE = GPLv3+ GZIP_LICENSE_FILES = COPYING GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes +# configure substitutes $(SHELL) for the shell shebang in scripts like +# gzexe. Unfortunately, the same $(SHELL) variable will also be used by +# make to run its commands. Fortunately, /bin/sh is always a POSIX shell +# on both the target and host systems that we support. Even with this, +# the configure check is slightly broken and prints a bogus warning: +# "using /bin/sh, even though it may have file descriptor bugs" +GZIP_CONF_ENV += ac_cv_path_shell=/bin/sh $(eval $(autotools-package)) From b3c894414a06e0c13f1d9b63760a52cb1e8884c1 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Sun, 16 Oct 2016 14:02:20 +0100 Subject: [PATCH 0838/3392] lighttpd: bump version to 1.4.42 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/lighttpd/lighttpd.hash | 2 +- package/lighttpd/lighttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index 1ed0095778..edec58f0ea 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,2 +1,2 @@ # From http://www.lighttpd.net/ -sha256 4bcc383ef6d6dc7b284f68882d71a178e2986c83c4e85eeb3c8f3b882e346b6c lighttpd-1.4.41.tar.xz +sha256 b2c9069ed0bade9362c27b469a9b884641786aea1c3d686f9fd9f01d15e2a15f lighttpd-1.4.42.tar.xz diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 37ab939da7..537604aa08 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).41 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).42 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3c From 8355f50b51d1a7bf2aa8372d9eb54bb3e23f3092 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Sep 2016 21:27:28 +0200 Subject: [PATCH 0839/3392] package/transmission: Use libsystemd instead of libsystemd-daemon Fixes http://autobuild.buildroot.net/results/78a/78af581f24758f7c2b19305a801e4c6c943730fb/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/transmission/0006-libsystemd.patch | 133 +++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 package/transmission/0006-libsystemd.patch diff --git a/package/transmission/0006-libsystemd.patch b/package/transmission/0006-libsystemd.patch new file mode 100644 index 0000000000..b32aff211d --- /dev/null +++ b/package/transmission/0006-libsystemd.patch @@ -0,0 +1,133 @@ +From 0862099d0bf5a3ec8b2e9d538458d612897741a2 Mon Sep 17 00:00:00 2001 +From: Mike Gelfand +Date: Sat, 23 Apr 2016 16:13:25 +0000 +Subject: [PATCH] #5921: Use libsystemd instead of libsystemd-daemon (original + patches by Sandro Tosi and Mike Gilbert) + +In systemd v209, released over two years ago, the various libsystemd-* +libraries (libsystemd-journal.so, libsystemd-login.so, libsystem-daemon.so, +libsystemd-id128.so) were merged into a single libsystemd.so library to +reduce code duplication and avoid cyclic dependencies. + +Downloaded from upstream commit: +https://github.com/transmission/transmission/commit/0862099d0bf5a3ec8b2e9d538458d612897741a2 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 4 ++-- + configure.ac | 16 ++++++++-------- + daemon/CMakeLists.txt | 8 ++++---- + daemon/Makefile.am | 4 ++-- + daemon/daemon.c | 2 +- + 5 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b324dc..356fc2f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,9 +398,9 @@ endif() + if(WITH_SYSTEMD) + tr_get_required_flag(WITH_SYSTEMD SYSTEMD_IS_REQUIRED) + +- pkg_check_modules(SYSTEMD_DAEMON ${SYSTEMD_IS_REQUIRED} libsystemd-daemon) ++ pkg_check_modules(SYSTEMD ${SYSTEMD_IS_REQUIRED} libsystemd) + +- tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_DAEMON_FOUND SYSTEMD_IS_REQUIRED) ++ tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_FOUND SYSTEMD_IS_REQUIRED) + endif() + + include_directories(${CMAKE_BINARY_DIR}) +diff --git a/configure.ac b/configure.ac +index 92e4372..b64f2a3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -240,15 +240,15 @@ dnl + dnl file monitoring for the daemon + + # Check whether to enable systemd startup notification. +-# This requires libsystemd-daemon. +-AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], ++# This requires libsystemd. ++AC_ARG_WITH([systemd], AS_HELP_STRING([--with-systemd], + [Add support for systemd startup notification (default is autodetected)]), +- [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) +-AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ +- PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], +- [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], +- [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], +- [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] ++ [USE_SYSTEMD=$withval], [USE_SYSTEMD=auto]) ++AS_IF([test "x$USE_SYSTEMD" != "xno"], [ ++ PKG_CHECK_MODULES([SYSTEMD], [libsystemd], ++ [AC_DEFINE(USE_SYSTEMD,1,[Use systemd startup notification])], ++ [AS_IF([test "x$USE_SYSTEMD" = "xyes"], ++ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] + )] + ) + ]) +diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt +index e8f8b34..8ec3b95 100644 +--- a/daemon/CMakeLists.txt ++++ b/daemon/CMakeLists.txt +@@ -1,7 +1,7 @@ + project(trdaemon) + + if(WITH_SYSTEMD) +- add_definitions(-DUSE_SYSTEMD_DAEMON) ++ add_definitions(-DUSE_SYSTEMD) + endif() + + include_directories( +@@ -37,14 +37,14 @@ add_executable(${TR_NAME}-daemon + ${${PROJECT_NAME}_WIN32_RC_FILE}) + + set_target_properties(${TR_NAME}-daemon PROPERTIES +- COMPILE_FLAGS "${SYSTEMD_DAEMON_CFLAGS}" +- LINK_FLAGS "${SYSTEMD_DAEMON_LDFLAGS}" ++ COMPILE_FLAGS "${SYSTEMD_CFLAGS}" ++ LINK_FLAGS "${SYSTEMD_LDFLAGS}" + ) + + target_link_libraries(${TR_NAME}-daemon + ${TR_NAME} + ${EVENT2_LIBRARIES} +- ${SYSTEMD_DAEMON_LIBRARIES} ++ ${SYSTEMD_LIBRARIES} + ) + + tr_win32_app_info(${PROJECT_NAME}_remote_WIN32_RC_FILE +diff --git a/daemon/Makefile.am b/daemon/Makefile.am +index 677f765..34d7076 100644 +--- a/daemon/Makefile.am ++++ b/daemon/Makefile.am +@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I@top_srcdir@ -DEMBEDDED + AM_CFLAGS = \ + @LIBEVENT_CFLAGS@ \ + @LIBCURL_CFLAGS@ \ +- @SYSTEMD_DAEMON_CFLAGS@ \ ++ @SYSTEMD_CFLAGS@ \ + @ZLIB_CFLAGS@ \ + @PTHREAD_CFLAGS@ + +@@ -29,7 +29,7 @@ LDADD = \ + @LIBCURL_LIBS@ \ + @CRYPTO_LIBS@ \ + @INTLLIBS@ \ +- @SYSTEMD_DAEMON_LIBS@ \ ++ @SYSTEMD_LIBS@ \ + @ZLIB_LIBS@ \ + @PTHREAD_LIBS@ \ + ${LIBM} +diff --git a/daemon/daemon.c b/daemon/daemon.c +index 40ac5a6..62ac715 100644 +--- a/daemon/daemon.c ++++ b/daemon/daemon.c +@@ -33,7 +33,7 @@ + #include + #include + +-#ifdef USE_SYSTEMD_DAEMON ++#ifdef USE_SYSTEMD + #include + #else + static void sd_notify (int status UNUSED, const char * str UNUSED) { } From 0e10c7324c7273163bd4abc6128e85e9f790793a Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sat, 9 Jul 2016 22:16:06 -0300 Subject: [PATCH 0840/3392] util-linux: clean up libraries and tools selections Fix several problems in the package recipe: - Make 'bool "lib"' the first item in each block - Move the depends before the selects - Add missing dependencies on BR2_USE_MMU, for fork() - Improve help for cramfs utilities and login utilities Signed-off-by: Carlos Santos [Thomas: - remove capitalization of prompts, for consistency - add missing dependencies on libsmartcols, and therefore !MMU] Signed-off-by: Thomas Petazzoni --- package/util-linux/Config.in | 55 +++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index b2307f4f4d..8945b7f101 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -12,22 +12,22 @@ menuconfig BR2_PACKAGE_UTIL_LINUX if BR2_PACKAGE_UTIL_LINUX config BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - depends on BR2_USE_MMU # fork bool "libblkid" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Install libblkid. config BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - depends on BR2_USE_MMU # util-linux/libblkid bool "libmount" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID help Install libmount. config BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS bool "libsmartcols" - depends on BR2_USE_MMU # fork + depends on BR2_USE_MMU # fork() help Install libsmartcols. @@ -50,6 +50,7 @@ if BR2_PACKAGE_UTIL_LINUX_BINARIES config BR2_PACKAGE_UTIL_LINUX_AGETTY bool "agetty" + depends on BR2_USE_MMU # fork() help Alternative linux getty @@ -76,10 +77,14 @@ config BR2_PACKAGE_UTIL_LINUX_CRAMFS bool "cramfs utilities" select BR2_PACKAGE_ZLIB help - Build fsck.cramfs and mkfs.cramfs + Utilities for compressed ROM file system (fsck.cramfs, mkfs.cramfs) config BR2_PACKAGE_UTIL_LINUX_EJECT bool "eject" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Eject removable media @@ -95,6 +100,10 @@ config BR2_PACKAGE_UTIL_LINUX_FDFORMAT config BR2_PACKAGE_UTIL_LINUX_FSCK bool "fsck" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Check and repair a linux filesystem @@ -120,13 +129,14 @@ config BR2_PACKAGE_UTIL_LINUX_LINE config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS bool "login utilities" + depends on BR2_USE_MMU # fork() (login, runuser, su, sulogin) depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # linux-pam select BR2_PACKAGE_LINUX_PAM help - Build login utilities (last, login, su, sulogin) + Login utilities (last, login, runuser, su, sulogin) comment "login utilities needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ @@ -134,6 +144,8 @@ comment "login utilities needs a uClibc or glibc toolchain w/ wchar, locale, dyn config BR2_PACKAGE_UTIL_LINUX_LOSETUP bool "losetup" + depends on BR2_USE_MMU # libsmartcols + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS help Set up and control loop devices @@ -149,17 +161,26 @@ config BR2_PACKAGE_UTIL_LINUX_MINIX config BR2_PACKAGE_UTIL_LINUX_MORE bool "more" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES help File perusal filter for crt viewing config BR2_PACKAGE_UTIL_LINUX_MOUNT bool "mount/umount" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Mount/unmount filesystems config BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT bool "mountpoint" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help See if a directory is a mountpoint @@ -175,17 +196,21 @@ config BR2_PACKAGE_UTIL_LINUX_NOLOGIN config BR2_PACKAGE_UTIL_LINUX_NSENTER bool "nsenter" + depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 help - Enter the namespaces of another process. + Enter the namespaces of another process comment "nsenter needs a toolchain w/ headers >= 3.0" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 config BR2_PACKAGE_UTIL_LINUX_PARTX bool "partition utilities" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help - Partition tools (addpart, delpart, partx) + Partition utilities (addpart, delpart, partx) config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT bool "pivot_root" @@ -208,7 +233,7 @@ config BR2_PACKAGE_UTIL_LINUX_RESET Reset the terminal config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS - bool "schedutils" + bool "scheduling utilities" help Scheduling utilities (chrt, ionice, taskset) @@ -226,6 +251,7 @@ config BR2_PACKAGE_UTIL_LINUX_SETTERM config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT bool "switch_root" + depends on BR2_USE_MMU # fork() help Switch to another filesystem as the root of the mount tree @@ -243,6 +269,7 @@ config BR2_PACKAGE_UTIL_LINUX_UL config BR2_PACKAGE_UTIL_LINUX_UNSHARE bool "unshare" + depends on BR2_USE_MMU # fork() help Run program with some namespaces unshared from parent @@ -253,21 +280,27 @@ config BR2_PACKAGE_UTIL_LINUX_UTMPDUMP config BR2_PACKAGE_UTIL_LINUX_UUIDD bool "uuidd" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help UUID generation daemon config BR2_PACKAGE_UTIL_LINUX_VIPW bool "vipw" + depends on BR2_USE_MMU # fork() help Edit the password, group, shadow-password or shadow-group file config BR2_PACKAGE_UTIL_LINUX_WALL bool "wall" + depends on BR2_USE_MMU # fork() help Send a message to everybody's terminal config BR2_PACKAGE_UTIL_LINUX_WDCTL bool "wdctl" + depends on BR2_USE_MMU # libsmartcols + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS help Shows hardware watchdog status @@ -278,6 +311,8 @@ config BR2_PACKAGE_UTIL_LINUX_WRITE config BR2_PACKAGE_UTIL_LINUX_ZRAMCTL bool "zramctl" + depends on BR2_USE_MMU # libsmartcols + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS help Set up and control zram devices From cc2d5d3ec71db904213131df56c749acfa9874cf Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sat, 9 Jul 2016 22:16:08 -0300 Subject: [PATCH 0841/3392] util-linux: expand selection of libraries and utilities - Add option to control installation of libfdisk - Add libfdisk license to the comment in util-linux.mk - List all utilities provided by the basic set and document that linux32, linux64, uname26, i386 and x86_64 are symlinks to setarch - Add options to install cal, ipcrm, ipcs, logger, lslogin and pg Signed-off-by: Carlos Santos [Thomas: add missing dependency of the new lslogins option on libsmartcols, and therefore !MMU.] Signed-off-by: Thomas Petazzoni --- package/util-linux/Config.in | 53 ++++++++++++++++++++++++++++++++ package/util-linux/util-linux.mk | 9 +++++- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 8945b7f101..917a53d850 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -18,6 +18,14 @@ config BR2_PACKAGE_UTIL_LINUX_LIBBLKID help Install libblkid. +config BR2_PACKAGE_UTIL_LINUX_LIBFDISK + bool "libfdisk" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Install libfdisk. + config BR2_PACKAGE_UTIL_LINUX_LIBMOUNT bool "libmount" depends on BR2_USE_MMU # fork() @@ -41,11 +49,23 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES depends on BR2_USE_MMU # fork() select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Install the basic set of util-linux binaries. + blkdiscard, blkid, blockdev, cfdisk, chcpu, col, colcrt, + colrm, column, ctrlaltdel, dmesg, fdisk, findfs, findmnt, + flock, fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize, + ldattach, look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie, + mkfs, mkswap, namei, prlimit, readprofile, renice, rev, + rtcwake, script, scriptreplay, setarch, setsid, sfdisk, + swaplabel, swapoff, swapon, tailf, uuidgen, whereis, wipefs + + The setarch utility also installs architecture-specific + symlinks like linux32, linux64, uname26, i386 and x86_64. + if BR2_PACKAGE_UTIL_LINUX_BINARIES config BR2_PACKAGE_UTIL_LINUX_AGETTY @@ -59,6 +79,11 @@ config BR2_PACKAGE_UTIL_LINUX_BFS help SCO bfs filesystem support +config BR2_PACKAGE_UTIL_LINUX_CAL + bool "cal" + help + Display a calendar, or some part of it + config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH bool "chfn/chsh" depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam @@ -112,6 +137,16 @@ config BR2_PACKAGE_UTIL_LINUX_HWCLOCK help Query or set the hardware clock (RTC) +config BR2_PACKAGE_UTIL_LINUX_IPCRM + bool "ipcrm" + help + Remove certain IPC resources + +config BR2_PACKAGE_UTIL_LINUX_IPCS + bool "ipcs" + help + Show information on IPC facilities + config BR2_PACKAGE_UTIL_LINUX_KILL bool "kill" help @@ -142,6 +177,11 @@ comment "login utilities needs a uClibc or glibc toolchain w/ wchar, locale, dyn depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL +config BR2_PACKAGE_UTIL_LINUX_LOGGER + bool "logger" + help + Enter messages into the system log + config BR2_PACKAGE_UTIL_LINUX_LOSETUP bool "losetup" depends on BR2_USE_MMU # libsmartcols @@ -149,6 +189,13 @@ config BR2_PACKAGE_UTIL_LINUX_LOSETUP help Set up and control loop devices +config BR2_PACKAGE_UTIL_LINUX_LSLOGINS + bool "lslogins" + depends on BR2_USE_MMU # libsmartcols + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + help + Display information about known users in the system + config BR2_PACKAGE_UTIL_LINUX_MESG bool "mesg" help @@ -204,6 +251,12 @@ config BR2_PACKAGE_UTIL_LINUX_NSENTER comment "nsenter needs a toolchain w/ headers >= 3.0" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 +config BR2_PACKAGE_UTIL_LINUX_PG + bool "pg" + depends on BR2_USE_MMU # fork() + help + Browse pagewise through text files + config BR2_PACKAGE_UTIL_LINUX_PARTX bool "partition utilities" depends on BR2_USE_MMU # fork() diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index f648155445..ca00f308a8 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -11,7 +11,7 @@ UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERS # README.licensing claims that some files are GPLv2-only, but this is not true. # Some files are GPLv3+ but only in tests. -UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, libblkid and libmount LGPLv2.1+, libuuid BSD-3c +UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, libblkid, libfdisk and libmount LGPLv2.1+, libuuid BSD-3c UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = host-pkgconf @@ -73,6 +73,7 @@ UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam) UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \ $(if $(BR2_PACKAGE_UTIL_LINUX_BFS),--enable-bfs,--disable-bfs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_CAL),--enable-cal,--disable-cal) \ $(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \ $(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \ $(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \ @@ -80,15 +81,20 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \ $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \ $(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_IPCRM),--enable-ipcrm,--disable-ipcrm) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_IPCS),--enable-ipcs,--disable-ipcs) \ $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last,--disable-last) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),--enable-libfdisk,--disable-libfdisk) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS),--enable-libsmartcols,--disable-libsmartcols) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-runuser --enable-su --enable-sulogin,--disable-last --disable-login --disable-runuser --disable-su --disable-sulogin) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \ @@ -98,6 +104,7 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),--enable-nologin,--disable-nologin) \ $(if $(BR2_PACKAGE_UTIL_LINUX_NSENTER),--enable-nsenter,--disable-nsenter) \ $(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx,--disable-partx) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_PG),--enable-pg,--disable-pg) \ $(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \ $(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \ $(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \ From bd1e5ba54b253c43d66f1401dc0975d86ef82196 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 16 Oct 2016 14:52:48 +0200 Subject: [PATCH 0842/3392] util-linux: improve license description Use the recommended format for describing the license of different components. Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index ca00f308a8..4dadc3f41f 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -11,7 +11,7 @@ UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERS # README.licensing claims that some files are GPLv2-only, but this is not true. # Some files are GPLv3+ but only in tests. -UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, libblkid, libfdisk and libmount LGPLv2.1+, libuuid BSD-3c +UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, LGPLv2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid) UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = host-pkgconf From e8ddc0de9eb1ee6dc0c255ef03ba654f42453433 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sat, 9 Jul 2016 22:16:09 -0300 Subject: [PATCH 0843/3392] util-linux: allow disabling the basic set of tools When even a single extra util-linux utility is enabled, the default build and install will install many more programs, including many that overlap with those offered by busybox. Fix by reworking the install-utilies menu to take advantage of the new --disable-all-programs config option. This option make it possible to disable the basic set of apps, and then enable only the desired apps. Original patch by Danomi Manchego, visible at http://patchwork.ozlabs.org/patch/494866/ Signed-off-by: Carlos Santos [Thomas/Arnout: remove the choice between all/custom/no, and simply have a list of options with the basic set of tools, and then one option for each tool. This gives the same flexibility, but avoids the choice, which is never nice to have.] Signed-off-by: Thomas Petazzoni --- package/util-linux/Config.in | 20 ++++++++------------ package/util-linux/util-linux.mk | 7 +------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 917a53d850..38d68ca251 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -45,7 +45,7 @@ config BR2_PACKAGE_UTIL_LINUX_LIBUUID Install libuuid. config BR2_PACKAGE_UTIL_LINUX_BINARIES - bool "install utilities" + bool "basic set" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT @@ -55,19 +55,17 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES help Install the basic set of util-linux binaries. - blkdiscard, blkid, blockdev, cfdisk, chcpu, col, colcrt, - colrm, column, ctrlaltdel, dmesg, fdisk, findfs, findmnt, - flock, fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize, - ldattach, look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie, - mkfs, mkswap, namei, prlimit, readprofile, renice, rev, - rtcwake, script, scriptreplay, setarch, setsid, sfdisk, - swaplabel, swapoff, swapon, tailf, uuidgen, whereis, wipefs + blkdiscard, blkid, blockdev, chcpu, col, colcrt, colrm, + column, ctrlaltdel, dmesg, fdisk, findfs, findmnt, flock, + fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize, ldattach, + look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie, mkfs, + mkswap, namei, prlimit, readprofile, renice, rev, rtcwake, + script, scriptreplay, setarch, setsid, sfdisk, swaplabel, + swapoff, swapon, tailf, uuidgen, whereis, wipefs The setarch utility also installs architecture-specific symlinks like linux32, linux64, uname26, i386 and x86_64. -if BR2_PACKAGE_UTIL_LINUX_BINARIES - config BR2_PACKAGE_UTIL_LINUX_AGETTY bool "agetty" depends on BR2_USE_MMU # fork() @@ -371,7 +369,5 @@ config BR2_PACKAGE_UTIL_LINUX_ZRAMCTL endif -endif - comment "util-linux needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 4dadc3f41f..bd6508ce44 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -71,6 +71,7 @@ UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam) # Disable/Enable utilities UTIL_LINUX_CONF_OPTS += \ + $(if $(BR2_PACKAGE_UTIL_LINUX_BINARIES),--enable-all-programs,--disable-all-programs) \ $(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \ $(if $(BR2_PACKAGE_UTIL_LINUX_BFS),--enable-bfs,--disable-bfs) \ $(if $(BR2_PACKAGE_UTIL_LINUX_CAL),--enable-cal,--disable-cal) \ @@ -142,12 +143,6 @@ else HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs endif -# Avoid building the tools if they are disabled since we can't install on -# a per-directory basis. -ifeq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES),) -UTIL_LINUX_CONF_OPTS += --disable-all-programs -endif - # Install libmount Python bindings ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) UTIL_LINUX_CONF_OPTS += --with-python From 15c950731d6cd950bd74748ed121a994d65305f0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 16 Oct 2016 17:49:50 +0200 Subject: [PATCH 0844/3392] fwup: add dependency on host-pkgconf The fwup configure.ac uses PKG_CHECK_MODULES(), and we're autoreconfiguring this package, so we should depend on host-pkgconf. Signed-off-by: Thomas Petazzoni --- package/fwup/fwup.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fwup/fwup.mk b/package/fwup/fwup.mk index 3d3e3befb3..d87bdca96d 100644 --- a/package/fwup/fwup.mk +++ b/package/fwup/fwup.mk @@ -8,8 +8,8 @@ FWUP_VERSION = v0.8.2 FWUP_SITE = $(call github,fhunleth,fwup,$(FWUP_VERSION)) FWUP_LICENSE = Apache-2.0 FWUP_LICENSE_FILES = LICENSE -FWUP_DEPENDENCIES = libconfuse libarchive libsodium -HOST_FWUP_DEPENDENCIES = host-libconfuse host-libarchive host-libsodium +FWUP_DEPENDENCIES = host-pkgconf libconfuse libarchive libsodium +HOST_FWUP_DEPENDENCIES = host-pkgconf host-libconfuse host-libarchive host-libsodium FWUP_AUTORECONF = YES FWUP_CONF_ENV = ac_cv_path_HELP2MAN="" From 878a9892ceb52d665e6cceca75304a72d2705de1 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Wed, 12 Oct 2016 20:42:45 -0700 Subject: [PATCH 0845/3392] libite: new package Signed-off-by: Ryan Coe [Thomas: - rewrap Config.in help text - improve license description] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libite/Config.in | 17 +++++++++++++++++ package/libite/libite.hash | 2 ++ package/libite/libite.mk | 14 ++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 package/libite/Config.in create mode 100644 package/libite/libite.hash create mode 100644 package/libite/libite.mk diff --git a/package/Config.in b/package/Config.in index 56813ea3ef..9399f63b26 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1309,6 +1309,7 @@ menu "Other" source "package/libgee/Config.in" source "package/libglib2/Config.in" source "package/libical/Config.in" + source "package/libite/Config.in" source "package/liblinear/Config.in" source "package/libnspr/Config.in" source "package/libpfm4/Config.in" diff --git a/package/libite/Config.in b/package/libite/Config.in new file mode 100644 index 0000000000..80d29791db --- /dev/null +++ b/package/libite/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBITE + bool "libite" + help + Libite is a lightweight library of frog DNA. It can be used + to fill the gaps in any dinosaur project. It holds useful + functions and macros developed by both Finit and the OpenBSD + project. Most notably the string functions: strlcpy(3), + strlcat(3) and the highly useful *BSD sys/queue.h and + sys/tree.h API's. + + Libite is the frog DNA missing in GNU libc. However, -lite + does not aim to become another GLIB! One noticeable gap in + GLIBC is the missing _SAFE macros in the BSD sys/queue.h API + - highly recommended when traversing lists to delete/free + nodes. + + https://github.com/troglobit/libite diff --git a/package/libite/libite.hash b/package/libite/libite.hash new file mode 100644 index 0000000000..67ad009bf5 --- /dev/null +++ b/package/libite/libite.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b27e4af69e9e5b4d00924538d3a41b53752082cc439b9246edec5501aff2f22f libite-v1.8.2.tar.gz diff --git a/package/libite/libite.mk b/package/libite/libite.mk new file mode 100644 index 0000000000..b56c430b06 --- /dev/null +++ b/package/libite/libite.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# libite +# +################################################################################ + +LIBITE_VERSION = v1.8.2 +LIBITE_SITE = $(call github,troglobit,libite,$(LIBITE_VERSION)) +LIBITE_LICENSE = MIT, X11, ISC, BSD-2c +LIBITE_LICENSE_FILES = LICENSE chomp.c pidfile.c +LIBITE_INSTALL_STAGING = YES +LIBITE_AUTORECONF = YES + +$(eval $(autotools-package)) From f5f45e17ee98a0ebad7836ade2b34ceec909d751 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 16 Oct 2016 18:04:22 +0200 Subject: [PATCH 0846/3392] DEVELOPERS: add entry for libite Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f3d175bc76..ed89b0971c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1262,6 +1262,9 @@ F: package/python-pysnmp-apps/ F: package/python-pysnmp-mibs/ F: package/python-tornado/ +N: Ryan Coe +F: package/libite/ + N: Ryan Wilkins F: package/biosdevname/ From 345e2db8549145df87f100f9e66f6955b4908fb1 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 17 Oct 2016 23:20:27 +0200 Subject: [PATCH 0847/3392] filemq: disable documentation generation The parameter to disable asciidoc documentation generation changed from 'fmq_have_asciidoc' to 'filemq_have_asciidoc'. Fixes [1], [2], [3]: File "/usr/bin/asciidoc", line 101 except KeyError, k: raise AttributeError, k ^ SyntaxError: invalid syntax [1] http://autobuild.buildroot.net/results/5f0/5f0558235756419eff15b8e909b5d630712f5141 [2] http://autobuild.buildroot.net/results/a23/a23d92b09dadc12b3753c951900e28fc19bd14cd [3] http://autobuild.buildroot.net/results/a45/a450ff5c6008ccf290a028e6eab7ff26369243e7 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/filemq/filemq.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/filemq/filemq.mk b/package/filemq/filemq.mk index 0e735914ea..d57208ec72 100644 --- a/package/filemq/filemq.mk +++ b/package/filemq/filemq.mk @@ -8,7 +8,7 @@ FILEMQ_VERSION = e59951489045825d6fc5bdc6a5a5ecf1abf51943 FILEMQ_SITE = $(call github,zeromq,filemq,$(FILEMQ_VERSION)) FILEMQ_AUTORECONF = YES -FILEMQ_CONF_ENV = fmq_have_asciidoc=no +FILEMQ_CONF_ENV = filemq_have_asciidoc=no FILEMQ_INSTALL_STAGING = YES FILEMQ_DEPENDENCIES = czmq openssl zeromq FILEMQ_LICENSE = LGPLv3+ with exceptions From d49fed8fe21d0b9173157b7d096ace43a8964992 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Mon, 17 Oct 2016 21:51:46 -0400 Subject: [PATCH 0848/3392] libwebsockets: bump to version 2.1.0 Fixes: http://autobuild.buildroot.net/results/d88/d88889ba30444e73cfb12ae1357db25ff6a3a4fb/ Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- package/libwebsockets/libwebsockets.hash | 2 +- package/libwebsockets/libwebsockets.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index dc44da5334..cbd1101d75 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 43865604debd06686ac4d8d0783976c4e10dd519ccd5c94e1b53878ec6178a59 libwebsockets-v2.0.2.tar.gz +sha256 bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66 libwebsockets-v2.1.0.tar.gz diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index a9b4a25634..bf46291ad4 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = v2.0.2 +LIBWEBSOCKETS_VERSION = v2.1.0 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE From 8ae6e3bc9f54bfc94f003e3ad81a98c738b78572 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 17 Oct 2016 22:44:48 +0200 Subject: [PATCH 0849/3392] motion: fix sdl-config detection Overwrite ac_cv_path_CONFIG_SDL in case sdl development is installed on the host. Fixes [1]: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include/SDL' [1] http://autobuild.buildroot.net/results/459/4592eb83efa393f77f5ee014f93a271f2313bee6 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/motion/motion.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/motion/motion.mk b/package/motion/motion.mk index de29a2a8e2..cf9be7602a 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -54,6 +54,9 @@ endif ifeq ($(BR2_PACKAGE_SDL),y) MOTION_DEPENDENCIES += sdl MOTION_CONF_OPTS += --with-sdl=$(STAGING_DIR)/usr +# overwrite ac_cv_path_CONFIG_SDL in case sdl development is +# installed on the host +MOTION_CONF_ENV += ac_cv_path_CONFIG_SDL=$(STAGING_DIR)/usr/bin/sdl-config else MOTION_CONF_OPTS += --without-sdl endif From cdf47aff42ad968a9987110cc2688dd4f947a258 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Tue, 18 Oct 2016 07:51:58 -0700 Subject: [PATCH 0850/3392] qt5base: improve message if directfb is disabled Signed-off-by: Matt Kraai Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 64a7f65386..7244fbedc6 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -180,7 +180,7 @@ config BR2_PACKAGE_QT5BASE_DIRECTFB bool "directfb support" depends on BR2_PACKAGE_DIRECTFB -comment "directfb backend if directb is enabled" +comment "directfb backend available if directfb is enabled" depends on !BR2_PACKAGE_DIRECTFB config BR2_PACKAGE_QT5BASE_XCB From 638f0a817cc96da5ea983e41d75a0c447e121141 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 18 Oct 2016 20:05:39 +0200 Subject: [PATCH 0851/3392] wireshark: fix libgtk2 dependency typo Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 8dc72da940..9cd92c4879 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -32,7 +32,7 @@ WIRESHARK_CONF_OPTS += --with-gtk=3 WIRESHARK_DEPENDENCIES += libgtk3 else ifeq ($(BR2_PACKAGE_LIBGTK2),y) WIRESHARK_CONF_OPTS += --with-gtk=2 -WIRESHARK_DEPENDECIES += libgtk2 +WIRESHARK_DEPENDENCIES += libgtk2 else WIRESHARK_CONF_OPTS += --with-gtk=no endif From 70f5fb8c697126bd6470d9b9a53c709ec816aa2f Mon Sep 17 00:00:00 2001 From: Lothar Felten Date: Tue, 18 Oct 2016 21:51:53 +0200 Subject: [PATCH 0852/3392] beaglebone: defconfigs: select ext4 as rootfs Select ext4 as root file system as the genimage config expects ext4 not ext2. Tested on beaglebone, beagleboneblack and AM335x EVM [Peter: reworded slightly] Signed-off-by: Lothar Felten Signed-off-by: Peter Korsgaard --- configs/beaglebone_defconfig | 1 + configs/beaglebone_qt5_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 072719bc4d..a3efabf8cc 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-evmsk" BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 31ee35a3fb..18ee139952 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -25,6 +25,7 @@ BR2_PACKAGE_TI_SGX_DEMOS=y BR2_PACKAGE_TI_SGX_KM=y BR2_PACKAGE_TI_SGX_UM=y BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y From 6d9791f059a404ad9d99f6823420a442a4c80241 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 07:04:12 -0300 Subject: [PATCH 0853/3392] linux-headers: bump 4.{4, 7, 8}.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 60578b8fc8..759959f5a5 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -232,9 +232,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.34" if BR2_KERNEL_HEADERS_4_1 - default "4.4.24" if BR2_KERNEL_HEADERS_4_4 + default "4.4.25" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 - default "4.7.7" if BR2_KERNEL_HEADERS_4_7 - default "4.8.1" if BR2_KERNEL_HEADERS_4_8 + default "4.7.8" if BR2_KERNEL_HEADERS_4_7 + default "4.8.2" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 6029a25a9055cbf9ab80111e5e0ae7c5cdf86f37 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 07:04:13 -0300 Subject: [PATCH 0854/3392] linux: bump default to version 4.8.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index d8294cab89..e0e24e6843 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.1)" + bool "Latest version (4.8.2)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.2" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 7c4b3bc734c1c0ed759cf7a040c4f4e0b6e2356c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 18 Oct 2016 12:06:55 +0100 Subject: [PATCH 0855/3392] ci20_defconfig: update kernel version to ToT Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- configs/ci20_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 0455170dab..bd30cbd423 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -13,7 +13,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="93b4df0786f07643eb61daee8934a3f3a05fd280" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fbf929bc733b82b15f6996d4262a45870f19d214" BR2_LINUX_KERNEL_DEFCONFIG="ci20" # u-boot From ef99f585803bcbde838d2b65389833fd2b2b8b2c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 18 Oct 2016 22:35:25 +0300 Subject: [PATCH 0856/3392] lirc-tools: fix build with kernel headers v4.8+ Backport upstream path that removes references to macros that are no longer in the kernel lirc.h headers. Fixes: http://autobuild.buildroot.net/results/f01/f015d52faa214f7786dd3169628ce74b738a8b46/ http://autobuild.buildroot.net/results/55f/55f1ac19736499ef536561bd65c011d2649f43da/ http://autobuild.buildroot.net/results/c68/c689786b6b0867cea2e45df1c5556cccdd377b33/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...-of-functions-killed-in-kernel-4.8.0.patch | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 package/lirc-tools/0005-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch diff --git a/package/lirc-tools/0005-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch b/package/lirc-tools/0005-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch new file mode 100644 index 0000000000..9fe5256ceb --- /dev/null +++ b/package/lirc-tools/0005-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch @@ -0,0 +1,105 @@ +From 45c590f64dd79e8e1704d5c94ce3456a5cdbfa5f Mon Sep 17 00:00:00 2001 +From: Alec Leamas +Date: Fri, 19 Aug 2016 04:48:02 +0200 +Subject: [PATCH] lircd: Remove use of functions killed in kernel 4.8.0 + +From 4.8.0 the kernel no longer supports LIRC_NOTIFY_DECODE, +LIRC_SETUP_START/LIRC_SETUP_END and several constants related +to initiating filters. Remove corresponding calls from lircd. + +[baruch: move DRVCTL_NOTIFY_DECODE into lircd.cpp] +Signed-off-by: Baruch Siach +--- +Patch status: backported from upstream 31fcc8aa39f62c5c +--- + daemons/lircd.cpp | 53 ++++------------------------------------------------- + 1 file changed, 4 insertions(+), 49 deletions(-) + +diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp +index 782b6d3f8342..d778aa19308b 100644 +--- a/daemons/lircd.cpp ++++ b/daemons/lircd.cpp +@@ -78,6 +78,8 @@ + #define lirc_gid gid_t + #endif + ++#define DRVCTL_NOTIFY_DECODE 7 ++ + #ifdef DARWIN + #include + #define CLOCK_REALTIME 0 +@@ -462,50 +464,6 @@ static int setup_timeout(void) + } + + +-static int setup_filter(void) +-{ +- int ret1, ret2; +- lirc_t min_pulse_supported = 0, max_pulse_supported = 0; +- lirc_t min_space_supported = 0, max_space_supported = 0; +- +- if (!(curr_driver->features & LIRC_CAN_SET_REC_FILTER)) +- return 1; +- if (curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_PULSE, +- &min_pulse_supported) == -1 || +- curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_PULSE, &max_pulse_supported) == -1 +- || curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_SPACE, &min_space_supported) == -1 +- || curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_SPACE, &max_space_supported) == -1) { +- log_error("could not get filter range"); +- log_perror_err(__func__); +- } +- +- if (setup_min_pulse > max_pulse_supported) +- setup_min_pulse = max_pulse_supported; +- else if (setup_min_pulse < min_pulse_supported) +- setup_min_pulse = 0; /* disable filtering */ +- +- if (setup_min_space > max_space_supported) +- setup_min_space = max_space_supported; +- else if (setup_min_space < min_space_supported) +- setup_min_space = 0; /* disable filtering */ +- +- ret1 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_PULSE, &setup_min_pulse); +- ret2 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_SPACE, &setup_min_space); +- if (ret1 == -1 || ret2 == -1) { +- if (curr_driver-> +- drvctl_func(LIRC_SET_REC_FILTER, +- setup_min_pulse < setup_min_space ? &setup_min_pulse : &setup_min_space) == -1) { +- log_error("could not set filter"); +- log_perror_err(__func__); +- return 0; +- } +- } +- return 1; +-} +- +- +- +- + static int setup_hardware(void) + { + int ret = 1; +@@ -514,10 +472,7 @@ static int setup_hardware(void) + if ((curr_driver->features & LIRC_CAN_SET_REC_CARRIER) + || (curr_driver->features & LIRC_CAN_SET_REC_TIMEOUT) + || (curr_driver->features & LIRC_CAN_SET_REC_FILTER)) { +- (void)curr_driver->drvctl_func(LIRC_SETUP_START, NULL); +- ret = setup_frequency() && setup_timeout() +- && setup_filter(); +- (void)curr_driver->drvctl_func(LIRC_SETUP_END, NULL); ++ ret = setup_frequency() && setup_timeout(); + } + } + return ret; +@@ -2162,7 +2117,7 @@ void loop(void) + int reps; + + if (curr_driver->drvctl_func && (curr_driver->features & LIRC_CAN_NOTIFY_DECODE)) +- curr_driver->drvctl_func(LIRC_NOTIFY_DECODE, NULL); ++ curr_driver->drvctl_func(DRVCTL_NOTIFY_DECODE, NULL); + + get_release_data(&remote_name, &button_name, &reps); + +-- +2.9.3 + From 4614229fda7f32da52bea4e400e452be343682c1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 18 Oct 2016 23:06:52 +0300 Subject: [PATCH 0857/3392] lirc-tools: bump to version 0.9.4b Drop upstream patches. Renumber the rest. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- ...inking-method-to-avoid-parallel-buil.patch | 46 ---------------- ...rel_symlink.py-can-also-use-python2.patch} | 0 ...re-check-for-clock_gettime-in-librt.patch} | 0 ...d-commandir-unless-we-have-usb.h-191.patch | 54 ------------------- ...of-functions-killed-in-kernel-4.8.0.patch} | 0 package/lirc-tools/lirc-tools.hash | 6 +-- package/lirc-tools/lirc-tools.mk | 6 +-- 7 files changed, 5 insertions(+), 107 deletions(-) delete mode 100644 package/lirc-tools/0001-lib-use-proper-linking-method-to-avoid-parallel-buil.patch rename package/lirc-tools/{0002-tools-make_rel_symlink.py-can-also-use-python2.patch => 0001-tools-make_rel_symlink.py-can-also-use-python2.patch} (100%) rename package/lirc-tools/{0004-configure-check-for-clock_gettime-in-librt.patch => 0002-configure-check-for-clock_gettime-in-librt.patch} (100%) delete mode 100644 package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch rename package/lirc-tools/{0005-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch => 0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch} (100%) diff --git a/package/lirc-tools/0001-lib-use-proper-linking-method-to-avoid-parallel-buil.patch b/package/lirc-tools/0001-lib-use-proper-linking-method-to-avoid-parallel-buil.patch deleted file mode 100644 index 5863128551..0000000000 --- a/package/lirc-tools/0001-lib-use-proper-linking-method-to-avoid-parallel-buil.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f2fc8c48e5e55a91b309225f377b6cb3783fc6f6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 25 May 2016 15:21:57 +0200 -Subject: [PATCH] lib: use proper linking method to avoid parallel build issue - -Using _LDFLAGS = -l is correct when is an -external library. However, when it is built by the same package, and -especially in the same directory, this is wrong and can cause parallel -build issues. In lib/Makefile.am, there was: - -libirrecord_la_LDFLAGS = -llirc - -But the liblirc library is built in the same directory. Or, due to the -using of _LDFLAGS, make is not aware of the build dependency -between libirrecord and liblirc. - -To solve this, _LIBADD should be used instead, as follows: - -libirrecord_la_LIBADD = liblirc.la - -This fixes parallel build issues seen by automated build tests -conducted by the Buildroot project, such as: - - http://autobuild.buildroot.org/results/eb4/eb47d57de8182d25b1dacbf0ac3726ed20063d04/build-end.log - -Signed-off-by: Thomas Petazzoni ---- - lib/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Makefile.am b/lib/Makefile.am -index ce5c94c..8780f88 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -29,7 +29,7 @@ liblirc_la_SOURCES = config_file.c \ - transmit.c \ - util.c - --libirrecord_la_LDFLAGS = -llirc -+libirrecord_la_LIBADD = liblirc.la - libirrecord_la_SOURCES = irrecord.c - - liblirc_client_la_LDFLAGS = -version-info 4:0:4 --- -2.7.4 - diff --git a/package/lirc-tools/0002-tools-make_rel_symlink.py-can-also-use-python2.patch b/package/lirc-tools/0001-tools-make_rel_symlink.py-can-also-use-python2.patch similarity index 100% rename from package/lirc-tools/0002-tools-make_rel_symlink.py-can-also-use-python2.patch rename to package/lirc-tools/0001-tools-make_rel_symlink.py-can-also-use-python2.patch diff --git a/package/lirc-tools/0004-configure-check-for-clock_gettime-in-librt.patch b/package/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch similarity index 100% rename from package/lirc-tools/0004-configure-check-for-clock_gettime-in-librt.patch rename to package/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch diff --git a/package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch b/package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch deleted file mode 100644 index a3f2f3ba86..0000000000 --- a/package/lirc-tools/0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f346045e0f63289909322a3264e69b967a911636 Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Tue, 24 May 2016 19:56:09 +0200 -Subject: [PATCH] Don't build commandir unless we have usb.h (#191). - -Signed-off-by: Bernd Kuhls -(backported from git master: - https://sourceforge.net/p/lirc/git/ci/f346045e0f63289909322a3264e69b967a911636/tree/plugins/Makefile.am?diff=4b26eb383291576b3f56820c6cec5f6a75814807) ---- - plugins/Makefile.am | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 3bd89ed..2116658 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -14,6 +14,7 @@ EXTRA_DIST = pluginlist.am make-pluginlist.sh - plugin_LTLIBRARIES = - - if BUILD_USB -+ - plugin_LTLIBRARIES += atilibusb.la - atilibusb_la_SOURCES = atilibusb.c - atilibusb_la_LDFLAGS = $(AM_LDFLAGS) @usb_libs@ -@@ -33,6 +34,14 @@ plugin_LTLIBRARIES += srm7500libusb.la - srm7500libusb_la_SOURCES = srm7500libusb.c - srm7500libusb_la_LDFLAGS = $(AM_LDFLAGS) @usb_libs@ - srm7500libusb_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_CFLAGS) -+ -+if !BSD -+plugin_LTLIBRARIES += commandir.la -+commandir_la_SOURCES = commandir.c -+commandir_la_LDFLAGS = $(AM_LDFLAGS) @usb_libs@ -+commandir_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_CFLAGS) -+endif -+ - endif - - if BUILD_FTDI -@@ -99,11 +108,6 @@ if !BSD - plugin_LTLIBRARIES += default.la - default_la_SOURCES = default.c - --plugin_LTLIBRARIES += commandir.la --commandir_la_SOURCES = commandir.c --commandir_la_LDFLAGS = $(AM_LDFLAGS) @usb_libs@ --commandir_la_CFLAGS = $(AM_CFLAGS) $(LIBUSB_CFLAGS) -- - plugin_LTLIBRARIES += hiddev.la - hiddev_la_SOURCES = hiddev.c - --- -2.8.1 - diff --git a/package/lirc-tools/0005-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch b/package/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch similarity index 100% rename from package/lirc-tools/0005-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch rename to package/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch diff --git a/package/lirc-tools/lirc-tools.hash b/package/lirc-tools/lirc-tools.hash index afbca6e19d..239c7664d3 100644 --- a/package/lirc-tools/lirc-tools.hash +++ b/package/lirc-tools/lirc-tools.hash @@ -1,3 +1,3 @@ -# hash from http://sourceforge.net/projects/lirc/files/LIRC/0.9.4/ -sha1 79d2300b4864ed85d6468d554ac777f39b6740ac lirc-0.9.4.tar.bz2 -md5 da6aca942154256bff696d1ffa3ef646 lirc-0.9.4.tar.bz2 +# hash from http://sourceforge.net/projects/lirc/files/LIRC/0.9.4b/ +sha1 7cb2867de1b486708781413aa33568e0612fb912 lirc-0.9.4b.tar.bz2 +md5 9e3f2869a47bbd7c973dd63f30c13fc2 lirc-0.9.4b.tar.bz2 diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 547df46e64..bd0f96f337 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -4,16 +4,14 @@ # ################################################################################ -LIRC_TOOLS_VERSION = 0.9.4 +LIRC_TOOLS_VERSION = 0.9.4b LIRC_TOOLS_SOURCE = lirc-$(LIRC_TOOLS_VERSION).tar.bz2 LIRC_TOOLS_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(LIRC_TOOLS_VERSION) LIRC_TOOLS_LICENSE = GPLv2+ LIRC_TOOLS_LICENSE_FILES = COPYING LIRC_TOOLS_DEPENDENCIES = host-libxslt host-pkgconf host-python3 LIRC_TOOLS_INSTALL_STAGING = YES -# 0001-lib-use-proper-linking-method-to-avoid-parallel-buil.patch -# 0003-Don-t-build-commandir-unless-we-have-usb.h-191.patch -# 0004-configure-check-for-clock_gettime-in-librt.patch +# 0002-configure-check-for-clock_gettime-in-librt.patch LIRC_TOOLS_AUTORECONF = YES LIRC_TOOLS_CONF_ENV = XSLTPROC=yes From b5d9f376ae1f0d9d67ba28b3902ae394ec76b783 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Mon, 17 Oct 2016 21:46:56 +0530 Subject: [PATCH 0858/3392] trinity: not available on musl After fixing following build failures with musl: * error: unknown type name __uint32_t and __uint64_t * error: unknown type name pid_t and uid_t * error: fatal error: bits/sockaddr.h: No such file or directory it fails with fds/files.c: In function 'file_tree_callback': fds/files.c:172:10: error: 'FTW_CONTINUE' undeclared (first use in this function) return FTW_CONTINUE; ^ fds/files.c:172:10: note: each undeclared identifier is reported only once for each function it appears in fds/files.c:178:10: error: 'FTW_SKIP_SUBTREE' undeclared (first use in this function) return FTW_SKIP_SUBTREE; ^ fds/files.c:185:10: error: 'FTW_STOP' undeclared (first use in this function) return FTW_STOP; ^ fds/files.c: In function 'open_fds_from_path': fds/files.c:197:26: error: 'FTW_ACTIONRETVAL' undeclared (first use in this function) int flags = FTW_DEPTH | FTW_ACTIONRETVAL | FTW_MOUNT; As per ftw man-page, flag FTW_ACTIONRETVAL is specific to glibc. It is not available on musl. Since package uses it unconditionally, we mark it not available on musl. Fixes: http://autobuild.buildroot.net/results/cb4/cb4a665746652679487dee2c2e4bca881be3724b/ Cc: Vicente Olivert Riera Signed-off-by: Rahul Bedarkar Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/trinity/Config.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/trinity/Config.in b/package/trinity/Config.in index 2495e5d473..02cd20a842 100644 --- a/package/trinity/Config.in +++ b/package/trinity/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TRINITY bool "trinity" depends on BR2_USE_MMU # fork() + depends on !BR2_TOOLCHAIN_USES_MUSL # FTW_ACTIONRETVAL depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \ BR2_powerpc64le || BR2_sparc || BR2_x86_64 @@ -8,3 +9,10 @@ config BR2_PACKAGE_TRINITY A Linux System call fuzz tester http://codemonkey.org.uk/projects/trinity/ + +comment "trinity needs a uClibc or glibc toolchain" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_USES_MUSL + depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ + BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \ + BR2_powerpc64le || BR2_sparc || BR2_x86_64 From 053e1c7930e586b182e6f447226788766b1c8d0e Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 19 Oct 2016 00:53:23 -0400 Subject: [PATCH 0859/3392] runc: bump version to v1.0.0-rc2 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index c409a664e2..5b5400eeea 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 196b78c6caf1a4c6257314b393381baffa7c82bb2690ac02a7b3d6cd6cfe7776 runc-cc29e3dded8e27ba8f65738f40d251c885030a28.tar.gz +sha256 638742c48426b9a3281aeb619e27513d972de228bdbd43b478baea99c186d491 runc-v1.0.0-rc2.tar.gz diff --git a/package/runc/runc.mk b/package/runc/runc.mk index e2ab5edf2d..ef151ede25 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = cc29e3dded8e27ba8f65738f40d251c885030a28 +RUNC_VERSION = v1.0.0-rc2 RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE From fef19b44f1c15680836b6eaf0e71c2048a592138 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 19 Oct 2016 00:53:24 -0400 Subject: [PATCH 0860/3392] docker-containerd: bump to v0.2.4 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash index ec9c13e5ad..533157e5da 100644 --- a/package/docker-containerd/docker-containerd.hash +++ b/package/docker-containerd/docker-containerd.hash @@ -1,2 +1,2 @@ # Computed locally -sha256 5c1bcd8e3b7bc6034e7523b6eca7de974562b7fdc72c440494234ae10a0e545b docker-containerd-0ac3cd1be170d180b2baed755e8f0da547ceb267.tar.gz +sha256 34805aef6300fbf37adcf4362a2315fac1ea57a9ceb8b0c7b1a0859cba975428 docker-containerd-v0.2.4.tar.gz diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 06432e9ac9..17cc9be13d 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 0ac3cd1be170d180b2baed755e8f0da547ceb267 +DOCKER_CONTAINERD_VERSION = v0.2.4 DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code From cd73cac9d57dc8583bc810902596e0b59cc7ed75 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 19 Oct 2016 00:53:25 -0400 Subject: [PATCH 0861/3392] docker-engine: bump to v1.12.2 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 6078fbfd40..13e28bda2f 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f8139acba98248eb1fdb0b6d94efee89b876f9a50d00e263dc144fd2b0c372d4 docker-engine-v1.12.0.tar.gz +sha256 29bc203e483c81c9a337b4a4186e6b0a23984c518b09478d8718c616b5923e88 docker-engine-v1.12.2.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 3d39aac4cb..f895dcc7a0 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = v1.12.0 +DOCKER_ENGINE_VERSION = v1.12.2 DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 6358949de973441697e481b6cd5ce0cd3df05aac Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 18 Oct 2016 23:16:22 +0200 Subject: [PATCH 0862/3392] package/efl: bump to 1.18.2 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 37354fbf09..18393a43e6 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,2 +1,2 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.1.tar.xz.sha256 -sha256 0c6bd150d8e838f849effd462d91d86255e3aaade47a6077d0aa80d2b8e9d222 efl-1.18.1.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.2.tar.xz.sha256 +sha256 292faf76557fe56a6bc15b48b5ea3eb1f0790e2ed7f2ade4ae79ef7973d67bed efl-1.18.2.tar.xz diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 949da2dd4d..777ef3c848 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.18.1 +EFL_VERSION = 1.18.2 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+ From 26a37a26e16a2fa6d3d0d7ceb097d42e2342841c Mon Sep 17 00:00:00 2001 From: Marcin Nowakowski Date: Wed, 19 Oct 2016 09:45:54 +0200 Subject: [PATCH 0863/3392] kexec: bump to 2.0.13 Signed-off-by: Marcin Nowakowski Signed-off-by: Peter Korsgaard --- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 24a71e7a45..90a7ce9ab4 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 b1097986ffdb928cf41a94e8a5dfddc981a8fa710cccf13298e7f8dd939a2ee3 kexec-tools-2.0.11.tar.xz +sha256 874baf421171dbfca0084af2da71ccf5a67749dd2a27c3023da5f72460bae5cc kexec-tools-2.0.13.tar.xz diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 0e64c0d4f3..4ca55e5bc3 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.11 +KEXEC_VERSION = 2.0.13 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPLv2 From 8ec6dae302e31af3869be5ad0af79e8d18416ff7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 19 Oct 2016 11:24:12 +0300 Subject: [PATCH 0864/3392] bind: don't lookup zlib.h in host headers configure.in looks in host headers for zlib.h, unless given a headers directory as --with-zlib parameter. Note: a bug in the zlib.h header lookup logic causes configure.in to add -l$(STAGING_DIR)/usr/include/include, and -L$(STAGING_DIR)/usr/include/lib. But this does not affect us. Fixes: http://autobuild.buildroot.net/results/e96/e96a36c4da3c3be4b79a27af75a70bb8955c31a9/ http://autobuild.buildroot.net/results/e0b/e0bd7df5c19c7c65ce0009b7c2b4d4104a5c3109/ http://autobuild.buildroot.net/results/e99/e993940067f7ae841132765f91bfee7248ab125f/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/bind/bind.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index cda9fed875..9b5d8c56de 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -33,7 +33,7 @@ BIND_CONF_OPTS = \ --enable-filter-aaaa ifeq ($(BR2_PACKAGE_ZLIB),y) -BIND_CONF_OPTS += --with-zlib +BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr/include BIND_DEPENDENCIES += zlib else BIND_CONF_OPTS += --without-zlib From 244ab37fbc591146bc2e117b08acf9d54681d0cb Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 19 Oct 2016 00:50:38 -0400 Subject: [PATCH 0865/3392] go: bump to 1.7.2 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 6826891b26..ff0e8f7a8c 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc go1.6.2.src.tar.gz +sha256 ce4f331352313ad7ba9db5daf6f7f81581f3ca9c862d272ae02ee5a3cb294023 go1.7.2.src.tar.gz diff --git a/package/go/go.mk b/package/go/go.mk index d5d964f2e2..057d9fd1d9 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.6.2 +GO_VERSION = 1.7.2 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 801f834ea0b6f1a17efc67d80212f46eee597b91 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 19 Oct 2016 07:05:18 -0300 Subject: [PATCH 0866/3392] gvfs: bump to version 1.30.1.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gvfs/gvfs.hash | 4 ++-- package/gvfs/gvfs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index a7f0b8997b..f54d23902c 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.30/gvfs-1.30.1.sha256sum -sha256 e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b gvfs-1.30.1.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.30/gvfs-1.30.1.1.sha256sum +sha256 585b5de66eb99a09c020f34955db31e4764c8260a8afbb761ae264a958152ecc gvfs-1.30.1.1.tar.xz diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 897b1a9769..60bfb59b92 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -5,7 +5,7 @@ ################################################################################ GVFS_VERSION_MAJOR = 1.30 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).1.1 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 a899cb8b8c8e1942708150f260472df3691ad75c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 19 Oct 2016 12:03:25 -0300 Subject: [PATCH 0867/3392] linux-headers: bump 3.12.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 759959f5a5..ec8c389a86 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -226,7 +226,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.82" if BR2_KERNEL_HEADERS_3_2 default "3.4.112" if BR2_KERNEL_HEADERS_3_4 default "3.10.103" if BR2_KERNEL_HEADERS_3_10 - default "3.12.64" if BR2_KERNEL_HEADERS_3_12 + default "3.12.65" if BR2_KERNEL_HEADERS_3_12 default "3.14.79" if BR2_KERNEL_HEADERS_3_14 default "3.18.43" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 From f6dfbfeb53b6ff63ce97ccd95b3aca409ee4ccf4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 19 Oct 2016 12:12:34 -0300 Subject: [PATCH 0868/3392] nginx: bump to version 1.10.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/nginx/nginx.hash | 2 +- package/nginx/nginx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index c4b0f89299..7db2adabfc 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801 nginx-1.10.1.tar.gz +sha256 1045ac4987a396e2fa5d0011daf8987b612dd2f05181b67507da68cbe7d765c2 nginx-1.10.2.tar.gz diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index d57f3d00bc..656362788f 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.10.1 +NGINX_VERSION = 1.10.2 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2c NGINX_LICENSE_FILES = LICENSE From d4b494b71e33a52db55b01c4c8f02d184b708615 Mon Sep 17 00:00:00 2001 From: Johan Derycke Date: Wed, 19 Oct 2016 16:35:24 +0200 Subject: [PATCH 0869/3392] qt5webkit: do not overwrite target python This commit fixes an issue introduced in commit ac16793eaaabfced0312420759e3a66cdaa1ea8e. This commit creates a link $(@D)/bin/python pointing to the host Python 2, and adds $(@D)/bin/ to the PATH. However, the QT5WEBKIT_INSTALL_TARGET_CMDS variable copies the contents of $(@D)/bin/ to the target filesystem, in order to install binaries produced by the qt5webkit build. By doing this, we overwrite the 'python' symbolic link on the target. In order to fix this, we simply create the 'python' symbolic link used to trick qt5webkit to use python2 on the host in the $(@D)/host-bin/ sub-directory. Signed-off-by: Johan Derycke Tested-by: Yegor Yefremov [Thomas: rework commit log.] Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webkit/qt5webkit.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index f300c11d43..378cdf7857 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -36,10 +36,10 @@ endif # QtWebkit's build system uses python, but only supports python2. We work # around this by forcing python2 early in the PATH, via a python->python2 # symlink. -QT5WEBKIT_ENV = PATH=$(@D)/bin:$(BR_PATH) +QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH) define QT5WEBKIT_PYTHON2_SYMLINK - mkdir -p $(@D)/bin - ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python + mkdir -p $(@D)/host-bin + ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python endef QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK From ae2dc85b89b644dd59ea7ef4c6d51d0070a024bb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 19 Oct 2016 17:52:57 +0200 Subject: [PATCH 0870/3392] beaglebone: defconfigs: u-boot needs dtc Fixes: https://travis-ci.org/buildroot/buildroot-defconfig-testing/jobs/168763221 Signed-off-by: Peter Korsgaard --- configs/beaglebone_defconfig | 1 + configs/beaglebone_qt5_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index a3efabf8cc..eefa81cb83 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -18,6 +18,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" +BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 18ee139952..a9ab5a240f 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -31,6 +31,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" +BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From 59b6eb96b0a34b3b36d725b49d463bbf41feb1dc Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 19 Oct 2016 16:23:06 +0200 Subject: [PATCH 0871/3392] imx-kobs: switch to open source version The tools "kobs-ng" will be maintained as a open source project. The repository location is https://github.com/NXPmicro/imx-kobs This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-freescale/commit/c23736b3 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-kobs/imx-kobs.hash | 2 +- package/freescale-imx/imx-kobs/imx-kobs.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-kobs/imx-kobs.hash b/package/freescale-imx/imx-kobs/imx-kobs.hash index b942bd35a0..258d08c7e9 100644 --- a/package/freescale-imx/imx-kobs/imx-kobs.hash +++ b/package/freescale-imx/imx-kobs/imx-kobs.hash @@ -1 +1 @@ -sha256 85171b46068ac47c42fedb8104167bf9afd33dd9527ed127e1ca2eb29d7a86bf imx-kobs-5.4.tar.gz +sha256 5b040de6e3db5d47371b311e7068380926827a7a6ef02e45fb2ba08b680d0ec5 imx-kobs-b402243a04e5a6760a860445e5ff6a931d86f794.tar.gz diff --git a/package/freescale-imx/imx-kobs/imx-kobs.mk b/package/freescale-imx/imx-kobs/imx-kobs.mk index b80d5bdef0..8f490c2499 100644 --- a/package/freescale-imx/imx-kobs/imx-kobs.mk +++ b/package/freescale-imx/imx-kobs/imx-kobs.mk @@ -4,8 +4,8 @@ # ################################################################################ -IMX_KOBS_VERSION = 5.4 -IMX_KOBS_SITE = $(FREESCALE_IMX_SITE) +IMX_KOBS_VERSION = b402243a04e5a6760a860445e5ff6a931d86f794 +IMX_KOBS_SITE = $(call github,NXPmicro,imx-kobs,$(IMX_KOBS_VERSION)) IMX_KOBS_LICENSE = GPLv2+ IMX_KOBS_LICENSE_FILES = COPYING From 318a3bade5249c1b5ca010e6f0f801f86549a29a Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 19 Oct 2016 16:23:07 +0200 Subject: [PATCH 0872/3392] imx-uuc: switch to open source version The tool will be maintained as an open source project. The repository can be found at: https://github.com/NXPmicro/imx-uuc This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-freescale/commit/9b56bf13 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-uuc/imx-uuc.hash | 2 +- package/freescale-imx/imx-uuc/imx-uuc.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freescale-imx/imx-uuc/imx-uuc.hash b/package/freescale-imx/imx-uuc/imx-uuc.hash index 05501c8b7c..d6e4d97ea0 100644 --- a/package/freescale-imx/imx-uuc/imx-uuc.hash +++ b/package/freescale-imx/imx-uuc/imx-uuc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 95d7f7b075f58fedc07602fbc0e5bf5212d28deea3d09cdbcbd80992dcd18482 imx-uuc-0.5.1.tar.gz +sha256 eac0c3e288c845cd9b82d02993f8358731a7a03e51591b27feeb453b143beb73 imx-uuc-3440b1108373e79669cc17ba1d2be91a123a2053.tar.gz diff --git a/package/freescale-imx/imx-uuc/imx-uuc.mk b/package/freescale-imx/imx-uuc/imx-uuc.mk index 58e749e42d..12d9312155 100644 --- a/package/freescale-imx/imx-uuc/imx-uuc.mk +++ b/package/freescale-imx/imx-uuc/imx-uuc.mk @@ -4,8 +4,8 @@ # ################################################################################ -IMX_UUC_VERSION = 0.5.1 -IMX_UUC_SITE = $(FREESCALE_IMX_SITE) +IMX_UUC_VERSION = 3440b1108373e79669cc17ba1d2be91a123a2053 +IMX_UUC_SITE = $(call github,NXPmicro,imx-uuc,$(IMX_UUC_VERSION)) IMX_UUC_LICENSE = GPLv2+ IMX_UUC_LICENSE_FILES = COPYING From 223b676ff034548af245a0aa06758392545ea861 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 19 Oct 2016 16:23:08 +0200 Subject: [PATCH 0873/3392] imx-usb-loader: bump version Main additions are: - Support for i.MX6SX, i.MX6UL and i.MX7 - Support for secure booting on i.MX6/i.MX7 - Various bug fixes Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/imx-usb-loader/imx-usb-loader.hash | 2 +- package/imx-usb-loader/imx-usb-loader.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imx-usb-loader/imx-usb-loader.hash b/package/imx-usb-loader/imx-usb-loader.hash index aa8ff491fe..3e02038997 100644 --- a/package/imx-usb-loader/imx-usb-loader.hash +++ b/package/imx-usb-loader/imx-usb-loader.hash @@ -1,2 +1,2 @@ # locally computed -sha256 1e7ee8af34e7d0a3b9761c25a4edfc7140d23132129818d288c74fc0d58796e5 imx-usb-loader-f96aee286ea17c832b7ec922dd76842deb5ce299.tar.gz +sha256 40e1e36791e91366b13f57b16b32e75cf05e7177b2813f1bf2446419d0ed44eb imx-usb-loader-9b0e81cf9511c3a27cf635407714caa2793b570c.tar.gz diff --git a/package/imx-usb-loader/imx-usb-loader.mk b/package/imx-usb-loader/imx-usb-loader.mk index c85562578e..0cd9637c50 100644 --- a/package/imx-usb-loader/imx-usb-loader.mk +++ b/package/imx-usb-loader/imx-usb-loader.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_USB_LOADER_VERSION = f96aee286ea17c832b7ec922dd76842deb5ce299 +IMX_USB_LOADER_VERSION = 9b0e81cf9511c3a27cf635407714caa2793b570c IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION)) IMX_USB_LOADER_LICENSE = LGPLv2.1+ IMX_USB_LOADER_LICENSE_FILES = COPYING From 6820b555afc911ec7032277b66418ba50dd00f9c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 19 Oct 2016 12:00:33 +0300 Subject: [PATCH 0874/3392] liburcu: bump to version 0.9.2 Drop aarch64 support patch; no longer needed. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/liburcu/0002-support-aarch64.patch | 21 --------------------- package/liburcu/liburcu.hash | 6 +++--- package/liburcu/liburcu.mk | 3 +-- 3 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 package/liburcu/0002-support-aarch64.patch diff --git a/package/liburcu/0002-support-aarch64.patch b/package/liburcu/0002-support-aarch64.patch deleted file mode 100644 index 6830e25ebe..0000000000 --- a/package/liburcu/0002-support-aarch64.patch +++ /dev/null @@ -1,21 +0,0 @@ -libucru: recognize aarch64 - -Make the same as "arm" internally. - -Upstream-Status: Pending - -Signed-off-by: joe.slater@windriver.com -[moved to buildroot from openembedded-core] -Signed-off-by: Ben Shelton - - ---- a/configure.ac -+++ b/configure.ac -@@ -77,6 +77,7 @@ AS_CASE([$host_cpu], - [alpha*], [ARCHTYPE="alpha"], - [ia64], [ARCHTYPE="gcc"], - [arm*], [ARCHTYPE="arm"], -+ [aarch64], [ARCHTYPE="arm"], - [mips*], [ARCHTYPE="mips"], - [tile*], [ARCHTYPE="gcc"], - [ARCHTYPE="unknown"] diff --git a/package/liburcu/liburcu.hash b/package/liburcu/liburcu.hash index 64ba90195a..5866d805ca 100644 --- a/package/liburcu/liburcu.hash +++ b/package/liburcu/liburcu.hash @@ -1,4 +1,4 @@ -# http://www.lttng.org/files/urcu/userspace-rcu-0.8.7.tar.bz2.sha1 -sha1 5306999b8a3296f3dea91246d92e0a993d732898 userspace-rcu-0.8.7.tar.bz2 +# http://www.lttng.org/files/urcu/userspace-rcu-0.9.2.tar.bz2.sha1 +sha1 61d1d0d1b955c7a67a7253317647304d04b400a0 userspace-rcu-0.9.2.tar.bz2 # Locally generated -sha256 b523f22c4726ca6bb77a77d258e76d8c33c89724433bd65313024b98e55c4295 userspace-rcu-0.8.7.tar.bz2 +sha256 8f7fa313b1e0a3f742cea24ce63a39c0efe63e615a769e2961e55bd2663ecaa3 userspace-rcu-0.9.2.tar.bz2 diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk index c886a1cf0e..33a301df17 100644 --- a/package/liburcu/liburcu.mk +++ b/package/liburcu/liburcu.mk @@ -4,13 +4,12 @@ # ################################################################################ -LIBURCU_VERSION = 0.8.7 +LIBURCU_VERSION = 0.9.2 LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE; GPLv2+ for test; GPLv3 for few *.m4 files LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE -LIBURCU_AUTORECONF = YES LIBURCU_INSTALL_STAGING = YES $(eval $(autotools-package)) From 7a25ecc3c9f6b3b5e93e70e2be376e5c82d935a9 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 19 Oct 2016 12:35:02 +0300 Subject: [PATCH 0875/3392] liburcu: needs MMU The test_urcu_fork.c test calls fork(). Upstream provides no easy way to disable tests build. Fixes: http://autobuild.buildroot.net/results/9eb/9eb182ab2d0b396eeff3d637a040da5a4d5bdcd7/ http://autobuild.buildroot.net/results/47a/47aabc219a2fd50105881b1e2715f7eeb1a6a588/ http://autobuild.buildroot.net/results/566/56631605f76b8623c9674f25c529ac67d0de12a8/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/liburcu/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/liburcu/Config.in b/package/liburcu/Config.in index 49510da495..b5b6326878 100644 --- a/package/liburcu/Config.in +++ b/package/liburcu/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS bool depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64 + depends on BR2_USE_MMU # fork() in test default y config BR2_PACKAGE_LIBURCU From 6294204686b93ffecdc2a0e486aea86b96a691c4 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 17 Oct 2016 23:53:02 +0200 Subject: [PATCH 0876/3392] support/misc/Vagrantfile: bump to ubuntu 16.04 * Updating to ubuntu 16.04 * Fixing dependencies * Fixing locale complaints * Removing unused packages Signed-off-by: Angelo Compagnucci Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- support/misc/Vagrantfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index cf269fea0a..5e56d5d8a1 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -12,7 +12,7 @@ VM_MEMORY=2048 VM_CORES=1 Vagrant.configure('2') do |config| - config.vm.box = 'ubuntu/trusty64' + config.vm.box = 'bento/ubuntu-16.04' config.vm.provider :vmware_fusion do |v, override| v.vmx['memsize'] = VM_MEMORY @@ -44,10 +44,13 @@ Vagrant.configure('2') do |config| config.vm.provision 'shell', inline: "sudo dpkg --add-architecture i386 sudo apt-get -q update + sudo apt-get purge -q -y snapd lxcfs lxd ubuntu-core-launcher snap-confine + sudo apt-get -q -y upgrade sudo apt-get -q -y install build-essential libncurses5-dev \ - git bzr cvs mercurial subversion libc6:i386 unzip + git bzr cvs mercurial subversion libc6:i386 unzip bc sudo apt-get -q -y autoremove - sudo apt-get -q -y clean" + sudo apt-get -q -y clean + sudo update-locale LC_ALL=C" config.vm.provision 'shell', privileged: false, inline: "echo 'Downloading and extracting buildroot #{RELEASE}' From 32e25af8c1e8a30301a9178a25185c319cfa24b6 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 18 Oct 2016 14:26:30 +0300 Subject: [PATCH 0877/3392] wireshark: use https for download and homepage link Saves a redirect. Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/wireshark/Config.in | 2 +- package/wireshark/wireshark.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index defeb4b3e4..4982c1f8d5 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_WIRESHARK help Network traffic sniffer and protocol decoder. - http://www.wireshark.org + https://www.wireshark.org comment "wireshark needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 9cd92c4879..ce83d5230e 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -6,7 +6,7 @@ WIRESHARK_VERSION = 2.2.1 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 -WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions +WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license WIRESHARK_LICENSE_FILES = COPYING WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2 From d06e17cd0f83cf2cf5bffef900003c88966ad25a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 18 Oct 2016 14:26:31 +0300 Subject: [PATCH 0878/3392] wireshark: avoid host qtchooser Some distros provide a 'qtchooser' utility to select Qt library version. Make sure not to use that host provided utility. Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index ce83d5230e..b1ef3f55c4 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -41,6 +41,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) WIRESHARK_CONF_OPTS += --with-qt=5 WIRESHARK_DEPENDENCIES += qt5base +WIRESHARK_CONF_ENV += ac_cv_path_QTCHOOSER="" # Seems it expects wrappers and passes a -qt=X parameter for version WIRESHARK_MAKE_OPTS += \ MOC="$(HOST_DIR)/usr/bin/moc" \ From fa6feffa0def0ee88c7c1ac05e7d14deec0e2db1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 18 Oct 2016 14:26:32 +0300 Subject: [PATCH 0879/3392] wireshark: needs the qt5tools lrelease utility Fixes: http://autobuild.buildroot.net/results/0a4/0a4ccf752ed1e81e2416d33a78984b47087f68bd/ http://autobuild.buildroot.net/results/196/196b96e28a2cd5983a58948df4a2c3eb3bccdfa4/ http://autobuild.buildroot.net/results/056/056b3299ce45552fe3e7cbf5aa68b223f8fa458e/ Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/wireshark/Config.in | 2 ++ package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index 4982c1f8d5..959fb5b4f7 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_WIRESHARK bool "wireshark" select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_QT5TOOLS if BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS if BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_USE_MMU # fork(), glib2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index b1ef3f55c4..f7cc8f8424 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -40,7 +40,7 @@ endif # Qt4 needs accessibility, we don't support it ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) WIRESHARK_CONF_OPTS += --with-qt=5 -WIRESHARK_DEPENDENCIES += qt5base +WIRESHARK_DEPENDENCIES += qt5base qt5tools WIRESHARK_CONF_ENV += ac_cv_path_QTCHOOSER="" # Seems it expects wrappers and passes a -qt=X parameter for version WIRESHARK_MAKE_OPTS += \ From 0b1b2c47ba2bc3f41797fb8c21229bb437e5879e Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Mon, 17 Oct 2016 23:05:41 +0200 Subject: [PATCH 0880/3392] core: split variables definition related to in/out-of-tree build from O itself This change uncorrolates the CONFIG_DIR and NEED_WRAPPER definition from the presence of the O variable in the command line. Now, the condition used to set these variables is the value of O itself. This change is a preparatory work since the O definition will need to be moved around when we will make Buildroot run with absolute canonical paths for both its root directory and the output location. This will be addressed in a follow-up patch. Signed-off-by: Samuel Martin Tested-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a860218746..2c0ac231fe 100644 --- a/Makefile +++ b/Makefile @@ -109,10 +109,11 @@ endif # Include some helper macros and variables include support/misc/utils.mk +# Set O variable if not already done on the command line; +# or avoid confusing packages that can use the O= syntax for out-of-tree +# build by preventing it from being forwarded to sub-make calls. ifneq ("$(origin O)", "command line") O := output -CONFIG_DIR := $(TOPDIR) -NEED_WRAPPER = else # other packages might also support Linux-style out of tree builds # with the O= syntax (E.G. BusyBox does). As make automatically @@ -125,9 +126,16 @@ MAKEOVERRIDES = # Unfortunately some packages don't look at origin (E.G. uClibc 0.9.31+) # To really make O go away, we have to override it. override O := $(O) -CONFIG_DIR := $(O) # we need to pass O= everywhere we call back into the toplevel makefile EXTRAMAKEARGS = O=$(O) +endif + +# Set variables related to in-tree or out-of-tree build. +ifeq ($(O),output) +CONFIG_DIR := $(TOPDIR) +NEED_WRAPPER = +else +CONFIG_DIR := $(O) NEED_WRAPPER = y endif From 916e614b7fdcb1ba4b7ce77868e84818b1373494 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Mon, 17 Oct 2016 23:05:42 +0200 Subject: [PATCH 0881/3392] core: reorder top-level Makefile and document things This change only moves things around and comments what is done in the top-level Makefile file, in order to prepare the next changes. Note that moving the definition of $(O) before or after re-entering make does not change anything on the buildroot behavior. This change also renames the variable UMASK to REQ_UMASK. Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Samuel Martin Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- Makefile | 59 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 2c0ac231fe..717b2db92f 100644 --- a/Makefile +++ b/Makefile @@ -29,16 +29,46 @@ SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ else echo sh; fi; fi) -# Trick for always running with a fixed umask -UMASK = 0022 -ifneq ($(shell umask),$(UMASK)) +# Set O variable if not already done on the command line; +# or avoid confusing packages that can use the O= syntax for out-of-tree +# build by preventing it from being forwarded to sub-make calls. +ifneq ("$(origin O)", "command line") +O := output +else +# Other packages might also support Linux-style out of tree builds +# with the O= syntax (E.G. BusyBox does). As make automatically +# forwards command line variable definitions those packages get very +# confused. Fix this by telling make to not do so. +MAKEOVERRIDES := +# Strangely enough O is still passed to submakes with MAKEOVERRIDES +# (with make 3.81 atleast), the only thing that changes is the output +# of the origin function (command line -> environment). +# Unfortunately some packages don't look at origin (E.G. uClibc 0.9.31+) +# To really make O go away, we have to override it. +override O := $(O) +endif + +# Check if the current Buildroot execution meets all the pre-requisites. +# If they are not met, Buildroot will actually do its job in a sub-make meeting +# its pre-requisites, which is: +# 1- Permissive enough umask: +# Wrong or too restrictive umask will prevent Buildroot and packages from +# creating files and directories. + +REQ_UMASK = 0022 + +# we need to pass O= everywhere we call back into the toplevel makefile +EXTRAMAKEARGS = O=$(O) + +# Check Buildroot execution pre-requisites here. +ifneq ($(shell umask),$(REQ_UMASK)) .PHONY: _all $(MAKECMDGOALS) $(MAKECMDGOALS): _all @: _all: - @umask $(UMASK) && $(MAKE) --no-print-directory $(MAKECMDGOALS) + @umask $(REQ_UMASK) && $(MAKE) --no-print-directory $(MAKECMDGOALS) else # umask @@ -109,27 +139,6 @@ endif # Include some helper macros and variables include support/misc/utils.mk -# Set O variable if not already done on the command line; -# or avoid confusing packages that can use the O= syntax for out-of-tree -# build by preventing it from being forwarded to sub-make calls. -ifneq ("$(origin O)", "command line") -O := output -else -# other packages might also support Linux-style out of tree builds -# with the O= syntax (E.G. BusyBox does). As make automatically -# forwards command line variable definitions those packages get very -# confused. Fix this by telling make to not do so -MAKEOVERRIDES = -# strangely enough O is still passed to submakes with MAKEOVERRIDES -# (with make 3.81 atleast), the only thing that changes is the output -# of the origin function (command line -> environment). -# Unfortunately some packages don't look at origin (E.G. uClibc 0.9.31+) -# To really make O go away, we have to override it. -override O := $(O) -# we need to pass O= everywhere we call back into the toplevel makefile -EXTRAMAKEARGS = O=$(O) -endif - # Set variables related to in-tree or out-of-tree build. ifeq ($(O),output) CONFIG_DIR := $(TOPDIR) From 173135df5b69dfd5ae6fe6cf2de8833c6f74c143 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Mon, 17 Oct 2016 23:05:43 +0200 Subject: [PATCH 0882/3392] core: re-enter make if $(CURDIR) or $(O) are not canonical paths When $(CURDIR) and/or $(O) contain symlinks in their paths, they can be resolved differently, depending on each package build-system (whether it uses the given paths or get the absolute canonical ones). Using absolute canonical paths will help achieving reproducible builds and will make easier tracking down host machine paths leaking into the host, target or staging trees. So, this change ensures the build takes place with the CURDIR and O variables are set to their absolute canonical paths. In order to recall the toplevel makefile with absolute canonical paths for $(CURDIR) and $(O), we need to: 1- Compute the absolute canonical paths for $(CURDIR) and $(O) that will be passed to the sub-make. This is achieved using the 'realpath' make primitive. However, some care must be taken when manipulating O: - the out-of-tree makefile wrapper happens a trailing "/.", we need to strip this part away to not break the comparison driving the sub-make call; - the user can leave a trailing '/' to $(O); - according to [1,2], realpath returns an empty string in case of non-existing entry. So, to avoid passing an empty O= variable to sub-make, it is necessary to define the output directory and create it prior to call realpath on it (because on the first invocation, $(O) usually does not yet exists), hence the trick doing the mkdir right before calling realpath. 2- Update EXTRAMAKEARGS with the absolute canonical $(O) and use it when call recalling the top-level makefile with umask and paths correctly set. 3- Lastly, update the condition for setting the CONFIG_DIR and NEED_WRAPPER variables. Note: * This change takes care of the makefile wrapper installed in $(O) to avoid unneeded make recursion. [1] https://www.gnu.org/software/make/manual/html_node/File-Name-Functions.html [2] http://man7.org/linux/man-pages/man3/realpath.3.html Reported-by: Matthew Weber Cc: Matthew Weber Cc: "Yann E. MORIN" Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Samuel Martin Acked-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- Makefile | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 717b2db92f..3ba149050c 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ # or avoid confusing packages that can use the O= syntax for out-of-tree # build by preventing it from being forwarded to sub-make calls. ifneq ("$(origin O)", "command line") -O := output +O := $(CURDIR)/output else # Other packages might also support Linux-style out of tree builds # with the O= syntax (E.G. BusyBox does). As make automatically @@ -50,27 +50,46 @@ endif # Check if the current Buildroot execution meets all the pre-requisites. # If they are not met, Buildroot will actually do its job in a sub-make meeting -# its pre-requisites, which is: +# its pre-requisites, which are: # 1- Permissive enough umask: # Wrong or too restrictive umask will prevent Buildroot and packages from # creating files and directories. +# 2- Absolute canonical CWD (i.e. $(CURDIR)): +# Otherwise, some packages will use CWD as-is, others will compute its +# absolute canonical path. This makes harder tracking and fixing host +# machine path leaks. +# 3- Absolute canonical output location (i.e. $(O)): +# For the same reason as the one for CWD. + +# Remove the trailing '/.' from $(O) as it can be added by the makefile wrapper +# installed in the $(O) directory. +# Also remove the trailing '/' the user can set when on the command line. +override O := $(patsubst %/,%,$(patsubst %.,%,$(O))) +# Make sure $(O) actually exists before calling realpath on it; this is to +# avoid empty CANONICAL_O in case on non-existing entry. +CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) + +CANONICAL_CURDIR = $(realpath $(CURDIR)) REQ_UMASK = 0022 -# we need to pass O= everywhere we call back into the toplevel makefile -EXTRAMAKEARGS = O=$(O) +# Make sure O= is passed (with its absolute canonical path) everywhere the +# toplevel makefile is called back. +EXTRAMAKEARGS := O=$(CANONICAL_O) # Check Buildroot execution pre-requisites here. -ifneq ($(shell umask),$(REQ_UMASK)) +ifneq ($(shell umask):$(CURDIR):$(O),$(REQ_UMASK):$(CANONICAL_CURDIR):$(CANONICAL_O)) .PHONY: _all $(MAKECMDGOALS) $(MAKECMDGOALS): _all @: _all: - @umask $(REQ_UMASK) && $(MAKE) --no-print-directory $(MAKECMDGOALS) + @umask $(REQ_UMASK) && \ + $(MAKE) -C $(CANONICAL_CURDIR) --no-print-directory \ + $(MAKECMDGOALS) $(EXTRAMAKEARGS) -else # umask +else # umask / $(CURDIR) / $(O) # This is our default rule, so must come first all: @@ -140,8 +159,9 @@ endif include support/misc/utils.mk # Set variables related to in-tree or out-of-tree build. -ifeq ($(O),output) -CONFIG_DIR := $(TOPDIR) +# Here, both $(O) and $(CURDIR) are absolute canonical paths. +ifeq ($(O),$(CURDIR)/output) +CONFIG_DIR := $(CURDIR) NEED_WRAPPER = else CONFIG_DIR := $(O) @@ -1038,4 +1058,4 @@ include docs/manual/manual.mk .PHONY: $(noconfig_targets) -endif #umask +endif #umask / $(CURDIR) / $(O) From 092d3e5e0c28f131e1a6bf375273f4d8f7c2f16d Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 19 Oct 2016 17:05:15 -0400 Subject: [PATCH 0883/3392] docker-engine: add iptables runtime dependency The Docker engine calls iptables internally: https://github.com/docker/libnetwork/blob/2c921b/iptables/iptables.go#L400 Signed-off-by: Christian Stewart [Thomas: fix indentation.] Signed-off-by: Thomas Petazzoni --- package/docker-engine/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index b9b9aac16b..5c4e0eed1c 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DAEMON depends on BR2_USE_MMU # docker-containerd depends on BR2_USE_WCHAR # docker-containerd select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency + select BR2_PACKAGE_IPTABLES # runtime dependency select BR2_PACKAGE_SQLITE # runtime dependency default y help From 5feff4403833a4aa7cddb99c5da6083c090cd15f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 19 Oct 2016 21:53:02 +0200 Subject: [PATCH 0884/3392] core/br2-external: export paths and descriptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that we support multiple br2-external trees, BR2_EXTERNAL is no longer exported in the environment. This means that post-build scripts in a br2-external tree can no longer find their own files (well, they could re-invent the path by stripping their known-relative path, but that'd be ugly, especially since we can very well provide it). Export the path for each br2-external trees as environment variables. Do so for the description as well, as a courtesy. Also, re-order variable definitions to be more logical: first, purely internal variables, then exported variables. Reported-by: Benoît Allard Signed-off-by: "Yann E. MORIN" Cc: Benoît Allard Signed-off-by: Thomas Petazzoni --- support/scripts/br2-external | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 038525e01d..848c851ba9 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -142,10 +142,10 @@ do_mk() { br2_ext="${BR2_EXT_PATHS["${br2_name}"]}" printf '\n' printf 'BR2_EXTERNAL_NAMES += %s\n' "${br2_name}" - printf 'BR2_EXTERNAL_%s_PATH = %s\n' "${br2_name}" "${br2_ext}" - printf 'BR2_EXTERNAL_%s_DESC = %s\n' "${br2_name}" "${br2_desc}" printf 'BR2_EXTERNAL_DIRS += %s\n' "${br2_ext}" printf 'BR2_EXTERNAL_MKS += %s/external.mk\n' "${br2_ext}" + printf 'export BR2_EXTERNAL_%s_PATH = %s\n' "${br2_name}" "${br2_ext}" + printf 'export BR2_EXTERNAL_%s_DESC = %s\n' "${br2_name}" "${br2_desc}" done } From e30fa61d80b957fea9e22667bf83a2ccc3f35726 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 19 Oct 2016 21:58:30 +0200 Subject: [PATCH 0885/3392] core/br2-external: fix link to manual for converting old trees MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To be noted: that link will only be valid once we have a released manual. In the meantime, it's accessible on the nightly manual: http://nightly.buildroot.org/#br2-external-converting Reported-by: Benoît Allard Signed-off-by: "Yann E. MORIN" Cc: Benoît Allard Signed-off-by: Thomas Petazzoni --- support/scripts/br2-external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 848c851ba9..055dc08555 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -8,7 +8,7 @@ declare -A BR2_EXT_DESCS # URL to manual for help in converting old br2-external trees. # Escape '#' so that make does not consider it a comment. -MANUAL_URL='https://buildroot.org/manual/manual.html\#br2-external-converting' +MANUAL_URL='https://buildroot.org/manual.html\#br2-external-converting' main() { local OPT OPTARG From 29673c8b1e5d5764fce58b2dcef839d412286552 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 19 Oct 2016 22:56:05 +0200 Subject: [PATCH 0886/3392] docs/manual: document both user-facing br2-external variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While BR2_EXTERNAL__PATH was already documented, it was not made obvious that it could be reused in post-biuld, post-image and in-fakeroot scripts. The BR2_EXTERNAL__DESC variable was not documented at all. Update the manual to fix this. Note: a2x chokes on this: .Note: Both +BR2_EXTERNAL_$(NAME)_PATH+ and +BR2_EXTERNAL_$(NAME)_DESC+ are available [...] and spits out a totally useless error message: a2x: ERROR: "xsltproc" --stringparam toc.section.depth 1 --stringparam callout.graphics 0 --stringparam navig.graphics 0 --stringparam admon.textlabel 1 --stringparam admon.graphic 0 --stringparam chunk.section.depth 0 --output "/home/ymorin/dev/buildroot/O/docs/manual/manual.html" "/etc/asciidoc/docbook-xsl/xhtml.xsl" "/home/ymorin/dev/buildroot/O/docs/manual/manual.xml" returned non-zero exit status 6 So, we had to resort to using different quoting styles for each variables. They are not semantically equivalent, but the rendering is the same with the default CSS (which we are using). That's gonna be good-enough for now... Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Benoît Allard Signed-off-by: Thomas Petazzoni --- docs/manual/customize-outside-br.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/manual/customize-outside-br.txt b/docs/manual/customize-outside-br.txt index 56c2c8ada6..70efabe228 100644 --- a/docs/manual/customize-outside-br.txt +++ b/docs/manual/customize-outside-br.txt @@ -120,7 +120,8 @@ Since it is possible to use multiple br2-external trees at once, this and is used when displaying information about a br2-external tree (e.g. above the list of defconfig files, or as the prompt in the menuconfig); as such, it should relatively brief (40 chars is probably a good upper - limit). + limit). The description is available in the +BR2_EXTERNAL_$(NAME)_DESC+ + variable. Examples of names and the corresponding +BR2_EXTERNAL_$(NAME)_PATH+ variables: @@ -130,6 +131,12 @@ variables: In the following examples, it is assumed the name to be set to +BAR_42+. +.Note: +Both +BR2_EXTERNAL_$(NAME)_PATH+ and `BR2_EXTERNAL_$(NAME)_DESC` are + available in the Kconfig files and the Makefiles. They are also + exported in the environment so are available in post-build, post-image + and in-fakeroot scripts. + ===== The +Config.in+ and +external.mk+ files Those files (which may each be empty) can be used to define package From 1ab240a14b9149fff4832ef6a9cf3798639b5dfd Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Wed, 19 Oct 2016 23:11:54 +0530 Subject: [PATCH 0887/3392] kmod: annotate licenses with components library libkmod.so is licensed under LGPLv2.1+ and kmod tools are licensed under GPLv2+. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/kmod/kmod.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index 1753b1d5eb..7492b926f0 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -12,7 +12,7 @@ KMOD_DEPENDENCIES = host-pkgconf HOST_KMOD_DEPENDENCIES = host-pkgconf # license info for libkmod only, conditionally add more below -KMOD_LICENSE = LGPLv2.1+ +KMOD_LICENSE = LGPLv2.1+ (library) KMOD_LICENSE_FILES = libkmod/COPYING # static linking not supported, see @@ -40,7 +40,7 @@ endif ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y) # add license info for kmod tools -KMOD_LICENSE += GPLv2+ +KMOD_LICENSE := $(KMOD_LICENSE), GPLv2+ (tools) KMOD_LICENSE_FILES += COPYING # take precedence over busybox implementation From af2658da2092be3417260bf67f5ac15575181e21 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Wed, 19 Oct 2016 23:11:55 +0530 Subject: [PATCH 0888/3392] dtc: update legal info library libdtc is dual licensed under BSD-2c or GPLv2+ and dtc programs are licensed under GPLv2+. This patch annotates licenses with components and uses correct format to specify dual licensing that is separating licenses with 'or' keyword instead of '/'. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/dtc/dtc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk index 8fdcdbed77..9dbca0a46b 100644 --- a/package/dtc/dtc.mk +++ b/package/dtc/dtc.mk @@ -7,7 +7,7 @@ DTC_VERSION = 1.4.1 DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz DTC_SITE = https://www.kernel.org/pub/software/utils/dtc -DTC_LICENSE = GPLv2+/BSD-2c +DTC_LICENSE = GPLv2+ or BSD-2c (library) DTC_LICENSE_FILES = README.license GPL DTC_INSTALL_STAGING = YES DTC_DEPENDENCIES = host-bison host-flex @@ -19,7 +19,7 @@ endef ifeq ($(BR2_PACKAGE_DTC_PROGRAMS),y) -DTC_LICENSE += (for the library), GPLv2+ (for the executables) +DTC_LICENSE := $(DTC_LICENSE), GPLv2+ (programs) DTC_INSTALL_GOAL = install ifeq ($(BR2_PACKAGE_BASH),) DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF From f7d305fd294a122d982a974314a81a4c57a08067 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Wed, 19 Oct 2016 23:11:56 +0530 Subject: [PATCH 0889/3392] usbredir: improve license description For consistency use 'libraries' and 'program' as component names and adjust license string for readability when we conditionally specify license for server program. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/usbredir/usbredir.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk index 926a1fffd5..6765a9baac 100644 --- a/package/usbredir/usbredir.mk +++ b/package/usbredir/usbredir.mk @@ -7,14 +7,14 @@ USBREDIR_VERSION = 0.7.1 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2 USBREDIR_SITE = http://spice-space.org/download/usbredir -USBREDIR_LICENSE = LGPLv2.1+ +USBREDIR_LICENSE = LGPLv2.1+ (libraries) USBREDIR_LICENSE_FILES = COPYING.LIB USBREDIR_INSTALL_STAGING = YES USBREDIR_DEPENDENCIES = host-pkgconf libusb ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y) -USBREDIR_LICENSE += (for the library), GPLv2+ (for the server) +USBREDIR_LICENSE := $(USBREDIR_LICENSE), GPLv2+ (program) USBREDIR_LICENSE_FILES += COPYING else # BR2_PACKAGE_USBREDIR_SERVER != y From 1b974425d12e38225ce2313c048f854f82f766ed Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 18 Oct 2016 16:55:25 +0100 Subject: [PATCH 0890/3392] MIPS: add support for M6201 cores -march=m6201 is not yet supported in GCC upstream, so disabling all versions when selecting this core. Note that M6201 implies a MIPS R6 CPU, and some GCC versions are already disabled for R6, so we don't need to disable those ones for M6201 as well. The external Codescape IMG GNU Linux Toolchain has support for this core. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- arch/Config.in.mips | 5 +++++ package/gcc/Config.in.host | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index f7bfa21684..3662fedca8 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -55,6 +55,10 @@ config BR2_mips_m5101 bool "M5101" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R5 +config BR2_mips_m6201 + bool "M6201" + depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R6 config BR2_mips_p5600 bool "P5600" depends on !BR2_ARCH_IS_64 @@ -131,6 +135,7 @@ config BR2_GCC_TARGET_ARCH default "interaptiv" if BR2_mips_interaptiv default "m5100" if BR2_mips_m5100 default "m5101" if BR2_mips_m5101 + default "m6201" if BR2_mips_m6201 default "p5600" if BR2_mips_p5600 default "mips64" if BR2_mips_64 default "mips64r2" if BR2_mips_64r2 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index df60c653d3..d204bf7deb 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -63,7 +63,8 @@ choice depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # Unsupported MIPS cores depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && \ - !BR2_mips_m5101 && !BR2_mips_i6400 && !BR2_mips_p6600 + !BR2_mips_m5101 && !BR2_mips_m6201 && !BR2_mips_i6400 && \ + !BR2_mips_p6600 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_TOOLCHAIN_GCC_AT_LEAST_5 @@ -73,7 +74,7 @@ choice # Broken or unsupported architectures depends on !BR2_arc # Unsupported MIPS cores - depends on !BR2_mips_p6600 + depends on !BR2_mips_m6201 && !BR2_mips_p6600 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 endchoice From eb34bf9f6e02b9584181a97970b2f2bab0cf66e6 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Mon, 17 Oct 2016 13:14:30 -0700 Subject: [PATCH 0891/3392] inadyn: bump to version 2.0 Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni --- package/inadyn/Config.in | 2 ++ package/inadyn/inadyn.conf | 14 +++++++------- package/inadyn/inadyn.hash | 4 ++-- package/inadyn/inadyn.mk | 13 ++++++++++--- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package/inadyn/Config.in b/package/inadyn/Config.in index 65f6851cb2..d03db83e3a 100644 --- a/package/inadyn/Config.in +++ b/package/inadyn/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_INADYN bool "inadyn" depends on BR2_USE_MMU # Uses fork() depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_LIBCONFUSE + select BR2_PACKAGE_LIBITE help INADYN is a free DynDNS client. It gives the possibility to have your own fixed hostname registered on the internet, diff --git a/package/inadyn/inadyn.conf b/package/inadyn/inadyn.conf index ab8aa3611c..1b29027606 100644 --- a/package/inadyn/inadyn.conf +++ b/package/inadyn/inadyn.conf @@ -1,11 +1,11 @@ # Basic configuration file for inadyn # # /etc/inadyn.conf -pidfile /var/run/inadyn.pid -update_period_sec 600 # Check for a new IP every 600 seconds -username test # replace 'test' with your username -password test # replace 'test' with your password -dyndns_system default@dyndns.org # replace w/ your provider +iface = eth0 +period = 300 -alias test.homeip.net -# replace 'test.homeip.net' with yourdomainname for actual (non-test) use +provider default@dyndns.org { + username = test + password = test + hostname = test +} diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash index 940bd16fba..a4e60c96c7 100644 --- a/package/inadyn/inadyn.hash +++ b/package/inadyn/inadyn.hash @@ -1,2 +1,2 @@ -# From https://github.com/troglobit/inadyn/releases/download/1.99.12/inadyn-1.99.12.tar.xz.md5 -md5 a620c9eab9cd31c8923e7264b08376f3 inadyn-1.99.12.tar.xz +# Locally computed +sha256 763c53eb3856decfe8b921cab8a54b428b079a62264fbcf6c89690713d63529a inadyn-v2.0.tar.gz diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk index 8ceca4c352..f23955bbaf 100644 --- a/package/inadyn/inadyn.mk +++ b/package/inadyn/inadyn.mk @@ -4,11 +4,18 @@ # ################################################################################ -INADYN_VERSION = 1.99.12 -INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/$(INADYN_VERSION) -INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz +INADYN_VERSION = v2.0 +INADYN_SITE = $(call github,troglobit,inadyn,$(INADYN_VERSION)) INADYN_LICENSE = GPLv2+ INADYN_LICENSE_FILES = COPYING +INADYN_AUTORECONF = YES +INADYN_DEPENDENCIES = host-pkgconf libconfuse libite + +# Needed for autoreconf to work properly, see ./autogen.sh +define INADYN_FIXUP_M4_DIR + mkdir $(@D)/m4 +endef +INADYN_POST_EXTRACT_HOOKS += INADYN_FIXUP_M4_DIR ifeq ($(BR2_PACKAGE_OPENSSL),y) INADYN_CONF_OPTS += --enable-openssl From b905df0df790ddf462e25bede08da84e048a28e1 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Mon, 17 Oct 2016 13:14:31 -0700 Subject: [PATCH 0892/3392] DEVELOPERS: add entry for inadyn Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index ed89b0971c..16d9b552e2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1263,6 +1263,7 @@ F: package/python-pysnmp-mibs/ F: package/python-tornado/ N: Ryan Coe +F: package/inadyn/ F: package/libite/ N: Ryan Wilkins From 1092c8f612229aeca7ef7453debdb0e7b501004b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 17 Oct 2016 22:01:28 +0200 Subject: [PATCH 0893/3392] motion: fix postgresql support The commandline paramter to enable/disable postgresql support is called '--with-pgsql/--without-pgsql' and not '--with-postgresql/ --without-postgresql'. Fixes [1] in case postgresql development files are installed on the host: checking for PostgreSQL... testing checking autodect pgsql headers... yes /usr/include/postgresql checking autodect pgsql libs... /usr/lib64 checking for PQconnectStart in -lpq... no configure: error: PostgreSQL support can't build without PostgreSQL libraries [1] http://autobuild.buildroot.net/results/749/7497730da2affffe0e5b9b790081de10c269f416 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/motion/motion.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/motion/motion.mk b/package/motion/motion.mk index cf9be7602a..16ce406f84 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -44,11 +44,11 @@ endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) MOTION_DEPENDENCIES += postgresql MOTION_CONF_OPTS += \ - --with-postgresql \ + --with-pgsql \ --with-pgsql-include=$(STAGING_DIR)/usr/include \ --with-pgsql-lib=$(STAGING_DIR)/usr/lib else -MOTION_CONF_OPTS += --without-postgresql +MOTION_CONF_OPTS += --without-pgsql endif ifeq ($(BR2_PACKAGE_SDL),y) From a1d12fe93935234ae3b635cc01665cb0c4ebb583 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Mon, 17 Oct 2016 22:31:31 +0530 Subject: [PATCH 0894/3392] get-developers: use --cc instead of --to for developers Output of get-developers script in our manual uses --cc for developers, but actual output of get-developers script uses --to. This patch makes code consistent with documentation, by using --cc for developers. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- support/scripts/get-developers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/get-developers b/support/scripts/get-developers index f73512f17a..8b1891d999 100755 --- a/support/scripts/get-developers +++ b/support/scripts/get-developers @@ -74,7 +74,7 @@ def __main__(): result = "--to buildroot@buildroot.org" for dev in matching_devs: - result += " --to \"%s\"" % dev + result += " --cc \"%s\"" % dev if result != "": print("git send-email %s" % result) From 7d6d365190dcef1c4a2de4e462f46733b555e499 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Mon, 17 Oct 2016 22:31:32 +0530 Subject: [PATCH 0895/3392] openswan: remove duplicate word toolchain from comment Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/openswan/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openswan/Config.in b/package/openswan/Config.in index ba5d53df71..5db665c6f7 100644 --- a/package/openswan/Config.in +++ b/package/openswan/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_OPENSWAN http://www.openswan.org -comment "openswan needs a uClibc or glibc toolchain toolchain w/ headers >= 3.0" +comment "openswan needs a uClibc or glibc toolchain w/ headers >= 3.0" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || \ BR2_TOOLCHAIN_USES_MUSL From 556e9f327893eab613f13952a0adc861513889e9 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Sun, 16 Oct 2016 13:15:05 -0400 Subject: [PATCH 0896/3392] docs/manual: fix scanpypi path typos Signed-off-by: Danomi Manchego Reviewed-by: Yegor Yefremov Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-python.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index abcd4ca36d..19d31e28c8 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -178,7 +178,7 @@ your host. When at the root of your buildroot directory just do : ----------------------- -./support/script/scanpypi foo bar -o package +./support/scripts/scanpypi foo bar -o package ----------------------- This will generate packages +python-foo+ and +python-bar+ in the package @@ -198,7 +198,7 @@ If your Buildroot package is not in the official Buildroot tree but in a br2-external tree, use the -o flag as follows: ----------------------- -./support/script/scanpypi foo bar -o other_package_dir +./support/scripts/scanpypi foo bar -o other_package_dir ----------------------- This will generate packages +python-foo+ and +python-bar+ in the @@ -207,7 +207,7 @@ This will generate packages +python-foo+ and +python-bar+ in the Option +-h+ will list the available options: ----------------------- -./support/script/scanpypi -h +./support/scripts/scanpypi -h ----------------------- [[python-package-cffi-backend]] From d7b74f07a51da6da51bb0669eb3dba874e9dec73 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Oct 2016 23:01:25 +0200 Subject: [PATCH 0897/3392] package/vlc: renumber patch 0008 -> 0009 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/vlc/{0008-ffmpeg-3.0.patch => 0009-ffmpeg-3.0.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/vlc/{0008-ffmpeg-3.0.patch => 0009-ffmpeg-3.0.patch} (100%) diff --git a/package/vlc/0008-ffmpeg-3.0.patch b/package/vlc/0009-ffmpeg-3.0.patch similarity index 100% rename from package/vlc/0008-ffmpeg-3.0.patch rename to package/vlc/0009-ffmpeg-3.0.patch From 70dbd3227db8b6856cc95b3afbecd36e9a1847a6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Oct 2016 23:01:26 +0200 Subject: [PATCH 0898/3392] package/vlc: backport upstream patches to fix compat function for static_assert Fixes http://autobuild.buildroot.net/results/3b9/3b9d15f226057706c185270788050dace7b7b535/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/vlc/0010-static-assert.patch | 25 +++++++++++++++++++++++++ package/vlc/0011-static-assert.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 package/vlc/0010-static-assert.patch create mode 100644 package/vlc/0011-static-assert.patch diff --git a/package/vlc/0010-static-assert.patch b/package/vlc/0010-static-assert.patch new file mode 100644 index 0000000000..87fd56bda2 --- /dev/null +++ b/package/vlc/0010-static-assert.patch @@ -0,0 +1,25 @@ +From: Thomas Guillem +Date: Thu, 30 Apr 2015 13:29:50 +0000 (+0200) +Subject: Fix build when using C99 and C++11 +X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=51ce6cdaf598754e617900994c1943c6cba6d604 + +Fix build when using C99 and C++11 + +Indeed, C99 doesn't have static_assert and C++11 has it. + +Signed-off-by: Bernd Kuhls +--- + +diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h +index b949d24..ee168d7 100644 +--- a/include/vlc_fixups.h ++++ b/include/vlc_fixups.h +@@ -239,7 +239,7 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base) + } + #endif + +-#if !defined (HAVE_STATIC_ASSERT) ++#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert) + # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) + # define static_assert _Static_assert + #endif diff --git a/package/vlc/0011-static-assert.patch b/package/vlc/0011-static-assert.patch new file mode 100644 index 0000000000..3ce23e1384 --- /dev/null +++ b/package/vlc/0011-static-assert.patch @@ -0,0 +1,28 @@ +From: Thomas Guillem +Date: Mon, 14 Dec 2015 09:08:25 +0000 (+0100) +Subject: compat: fix static_assert +X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=6faf9066670db6e0d241ead6a3926b2d9cc6a041 + +compat: fix static_assert + +It was not possible to use it outside of functions. + +Signed-off-by: Rémi Denis-Courmont +Signed-off-by: Bernd Kuhls +--- + +diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h +index 213d3f3..bd798d0 100644 +--- a/include/vlc_fixups.h ++++ b/include/vlc_fixups.h +@@ -273,7 +273,9 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base) + #endif + + #if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert) +-# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) ++# define STATIC_ASSERT_CONCAT_(a, b) a##b ++# define STATIC_ASSERT_CONCAT(a, b) STATIC_ASSERT_CONCAT_(a, b) ++# define _Static_assert(x, s) extern char STATIC_ASSERT_CONCAT(static_assert_, __LINE__)[sizeof(struct { unsigned:-!(x); })] + # define static_assert _Static_assert + #endif + From 03f6e005e6a9617767b24a9026da9477848020cc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Oct 2016 23:01:27 +0200 Subject: [PATCH 0899/3392] package/vlc: use BR2_TOOLCHAIN_HAS_LIBATOMIC While fixing http://autobuild.buildroot.net/results/d95/d9572bcafc1776eebe88bbcaf031a05cd6ee4b23/ by using http://patchwork.ozlabs.org/patch/674337/ the build stopped at a later stage with /home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_fetch_add_4' /home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_fetch_sub_4' /home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_fetch_or_1' /home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_compare_exchange_4' /home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_exchange_1' collect2: error: ld returned 1 exit status so libatomic must be pulled in if necessary. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/vlc/vlc.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 8efbecb74e..cf0b557bb1 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -56,6 +56,11 @@ VLC_CONF_OPTS += \ --disable-addonmanagermodules \ --enable-run-as-root \ +# Uses __atomic_fetch_add_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +VLC_CONF_ENV += LIBS="-latomic" +endif + # Building static and shared doesn't work, so force static off. ifeq ($(BR2_STATIC_LIBS),) VLC_CONF_OPTS += --disable-static From 49f7c3220a69e3b5bfa3b6c057357e933b0a67ee Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 19 Oct 2016 22:28:53 +0200 Subject: [PATCH 0900/3392] website: update Free Electrons logo This commit updates the Free Electrons logo of the Buildroot website to the new logo of the company. Signed-off-by: Thomas Petazzoni --- docs/website/images/free-electrons-logo.png | Bin 9968 -> 9174 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/website/images/free-electrons-logo.png b/docs/website/images/free-electrons-logo.png index a5c7d8a85121faad767d00f741f7af7c220e7f28..0a774041f1b2f29946793b547294ba95f4648933 100644 GIT binary patch literal 9174 zcmV;{BPra8P)bJK2e%>~Zn4M{D2# zU}fLM~)mJJ3E`=;^M&NB49n>0ba66Xyasr3z!Co!{LyGgao-Mh=Wb?c-dF>BVWz-+P#NVBPJ<3z(?z~8fH&pNA9kz(1hW#V$V1o#0+wn=W| zM6x;L;)^eq#>T>h3neBdMu0bLvfDTj&UhrO za>;=M2jp1dcfb2xfJp}1U0|cBVuZutkR?l&$nikmzI_E)6B83-_k@imhd3a2%MTQL91{Oc@#1qogke8PyZQ8UE;3~VDY#c8n z0{imw^Q9?b(4avlT#S}&gPdGQ>(Zr5tK{Um2hxfN<>lp+l$5Z3{d!ieT*>a;yYYIx zh)9DpZp@f50Nnw5Y2C(gLDuNeqw6KzXV0E3=VqQ)>D>x^nl*1FF|Qk7EIwrkg}&IOB#iYP29Wk@F%{Z5S`+Np?kLUOEw z85bo|@`tuGcllVcV&zdcGBYzX8hFxX5F5uDPdJ@U>SKSDm6cKE^^z9vpu%UeOMnW$ z@aZ-$2TR~De>wVbt=C{K0v6Z|V&hn$9WYWUMQm(roeNh~R8ZmbkrY#NIF$Rqy)chn zy?c|HnR(O=EiW$*{Cgd6SyLx$ls&di3fzoNl;HFE>RebUg+k%8c&ik!U_%Mpa(ygb z@G$Z5@eRo!4&WK!1O2@pa4B#m#(wr(j7*Mi0b6Vau~A<_ zb2}8|mkPJPlh5eUqq*dgOB$o?9e{;EFQrt6goFfKE*DOx6Q9pVNlD4o#l^+5fepY! zjEpIMn?Y>U1@~KLgSsLyF_FZCIKDr40EYwc!I3gy(2ECYeQHPM%$d`0I=!QY8h82S zmtW4*ap!)2EM|mg*GmgXxlgZ(AABEmiM@P%z#f$4D z+5hvO{}?OhE{6d1uBSHme7?%)-=o>*-m_;){jfp;e`qW_Fva&MS zzkh#3<&PXWQe#{1s8OSYs&y0_Hmc!%3v-kL;&!{6+&++1t5!+-_U+}!kt5X@a^}pL z(y?Pl`S#my!`3l%>QqThO_goiwpISNYu7FTN|jQLc7TuV#X50ej)>g=qyiUw{q@&P zuA%qba}Q(2j3F_x>gW)k&&T@p>)F12JDWCb3R}mH9XrU&%VWom9hJXjWMnXA%ovx5 zTxt&o8&-U;XO2x&9a@tJ9PxU+O=kAkzkj~~vTN6_8rR-`|9x@0-E!#Ap|JI=Sg}I> z_{Tqr_1!ja-YmeU*n8b=Sa1mA^x4x)zqx>w3l=PBG7R$e+iy$Ho;~Yq5BYq)i0q=G zq9W{u?I&qN*Oa*qBek%i3J^b*)O{S4+)~w;i8*hyG{x{xugR$doq2It? zGV;o6m_7R;4j(=o@_v`gMfdLA9l$T_Az{OewzYY;Hf`E;+-DEJ-!H?550A(Q7ZK^! zt($<73FpSiE7zvT1A`JJ8sw8tK8fV0h5PLp#D*DrL;SuRIJ98F@!yZMe*JnDEm}m! zjvXVqzh#>Y?zt$A=SMYXRL^*3^iSfP*6`zxKh|2VYuBzQrLt@Wu@NcmeeJc^C@Cp9 zZVf0dE~bC~{wSp)&WiH;d+*`lm0q^)E63*-%6$;+go1*CTFYf*WB{bo2*)hg403W} z&epA44=r7~^td(Pjyvw4prC-d9G)|H@L>8~*q2fB4^r*}zX)C*)!f6u5D0+82!*#( z3fYJV_a`MKHTnv9sPsOuu|~LjTwGk8PSwrN&zF>xRGE|+C*B9srG0Gpko#rJmWfg- zuwdH3?s^-M;1nRgAyW0!6;q~6sa)ZYiHWK6vD2G3Zhr@5c}Xz z8xiBqxVSjkxN+k#V-By^TO&TKKIgKpUcFjcv~DY%I(Lrf=xGy!6xrQwqb^v{zJ2=| z?$^dryZ!2zJ@d>n)@Sy#jdU9kK`C`hPEJno6<1urx^?Tw znmCE{4yV()-D%u1;a2wS*>hC&7Zw&$QBhI(ec7^Q=F5wK7gnyUU&6V>#6+e{nG*Is z9n1AS5J;KQ*Y0^6b-`Grltjn4BqbL4$2BSP+I6YYKG`Ah@d-iWq{89Qp+j=vg%?U< zQj#PkCCS*aV?{*Fr&oOkIDttMCQR@*rb^epe}4hm17r2GpR~K&M&z@IvFa|Dc5zAh ztaK@VFkQS4w3WRx+eq)W(bA%ITglGOj(AY6Sg}F?X`h5lIxk*EpA{#~qL8HI)W8`a z`+-0RdY{TgTWVIkRs;bK!3W~hK zWiKBjhje!5{1~>f4I4J_i#``{MzWWW$ET4Ts}O;GMSiZHe~7R5Q~+E8d}Jzic*&9_ z&4vyg+Tbtu`s=TA-F4T!gs}z^FdNRt*p6)5AU49{N}%`a*Qb&YU0ojf1>&L=|GGX6 zU+zu@3>Z*rMcLWeoORY&oRwO}n#nCmh*4Dd!6(on-od+LTX0&c6W}?F)2;$|wjpzC znK5(bOh46k75W>BIcx^`dEn7|`X|z}bu_*Z5g%=n9K1F1WzFLiFJ74n&`}wg5Ce{a2S5J!V>w!ffEBO4`YJni>^Kq?74?2& z5zl6jlN+N_VjUUd&yABalCkC3Vw-<(QbSrk9Rhe9-(?#p4*!>YxeZ2RjWAT zj5F|hz4-n9h>mP{6YKPF*S2lj`W3(OT<48D7Q z6}%ggV;!$-{Y@*H#VUM$I9w_W@a&^Q<|TZzcu^&jeD>LA3>-L+mF^at*DeOHcEiQT zIym!*eQY{V@qfT}*$yuwUOt3?52#3q zb+~p+Z$)gBv087Qt@aiA$$ahrhl>4)G-8OmZG+gT3l`{48{kx+-N9mi*Mr60bUl_1 z0N-dMe|wPfeOo6uXp`uyu`Z*4VVzx^o)*OqhbrCy{!~!rU-_$7^5Q1^B91{FU1X$I z4cEnMi^(nVSJ24&KkCCEPF*fwvsGYlyp71{9ctFDsDllByz!I%)D`P~D)f_`@1teB z1Eq{`7oT4!C=-77Q2{?3ssQ*s@SR_1u{^u%&E?r;1Ayp+80AcF=5%D|`TXTR@d6W$ zfqEJ-9DrNvv8MqE7zvYev~l+@d;Eu`-{KHLsT8<9gw#FB%pu-wljIzcnGuc4smLq! zvn{uR>^xr~#{Q8%W1MblMjFQHw;h2bjEs_BVeA2E5=aET*4_vS^103)|6$QR1nmSk zs5|~=;xph};6C6HV6qV{D;L%?IkMEAG5IestLC{9q5DM z1siI2V@+IPVUA~kmOyj;caTk@h-cvzT3zU))r0^|XExz>?*&S9JMXf)u_itu~D9uni-~Y#zo6t{HI{ ztF}|M>Xr@^0!x7hG5qVn-~_q=w*r@IrY_gskUwE;|Ey?W+NJ7e-J%D40oZ-q@ z)r!uV7`2rNmg2sJp4oi0l$%S#E{ficu?`UGd3!X&hJx30ZzNgC&%$!#bCA!JTATwr z!<2o%bpOBV(D(B!o~Lvz{KAzBmYIGQMod_!GIs{?a@`WavzFB|i|-9n_S;|uuhbWP z)O73mOdrAU>zi?QgoL%0>teZHp$)@g%fR1<5$0f)s#`7X3zYL(>da^$=6EKEN3U2* zWb^MIg(%|gqK)R?inK;!#+xC^S=&A$2yOOT-mO&Awai4<5y7PD4n4({YRS?=|GpL@zQ$=% zYt~!J4zzs#KyzWPeqgdT^ro8bX#;$2`u;62U8@dd7`cvK*4L8tbiLE$KnTo4`+yn1 zyLv$N#aMVs*4Ho41U(vD2i#`*{*?CWeXl$31FDjiWoVVLBuE_r93b>LAA#BY6RHC8 z{)Z8r`>7rbH|g0i;5g}yk&gN=>~xOA*FA!OuN-4dX1=CHGSE${h++4-A2M;-pCTAQZ&@U3B#wdmOl5LHI0^#S3$?m| zmO^GJ(bZBe-ZHxkX@J?|M^k;lT%OOGu74B4<7aNuhA^t%3lzydc86$eY#T}+= zM@(a?PH1K!^3@S|y#8mp|J4Yev%i)>d?xUP>H2of;nCWN3jF?vrQ9hPd!fzKbMjF# z$0ervex&-!cN}nyMdf)agi%;#y62Tzo|k5!%}qgQv(R*Xr|H^a3uC3%@m*uIM6PSb zbn|$*Ey5YuTxLKJA-BoA|8<+%~9;p{AFdzab2_fCF zcrQ9yjJgP6#8fmuC%o6ndFt&$zuR|+s$ac}sY-wUr(FQA80{_w?)$5vXC(1(K zNL15{P5+nafgKJ*E$XIKWmA?hY952;v(a~IhA`7A)%1OdrQU^F$OX<4>7Zx-BCVE> ziNx#qqQy9F7v}y8EL<5E0f8d%Lin^QVopfhGD2f8C&WOl4-Q4}ygaRDhFVO$({g`p zvzj@AAyf>UA7fkW2#d$dd{2E=>4#co-xd*+dAg3XmJ9e#7>y&%Vyv4T8fIiZAvXwJ*969IZ8OMV)Bi;g=%H7d{@+OG-Dy@AtrexfZf*E3*J~h~wXRy* z%vY`%d5iYMEYb#RZUZq$u)&f!|357>2+-k{ zAdKXIVpnI8Ii=Z9#knYMeiD>hE6wwDAkdM~2-I?%-tIs%qj`oF)v)>{vH zvwE3nD*L=e1vE!{^s#tSFS0y$o^~KuwHLRgEwu*WUQhJ}x*ics$>znH0d*L7%Y*2E zhcMP-N=!O!TgxDr7o^-_UC!+KJgb2iqG2C2J{;E@o` zYisxeb$sFZ76z${OSPNUtHTkgLl7hD^9aga(|~H$o25ZP?!);{HU81+rkYSrPXK7ZL?UPv(Tb71kg)+u)fvr*307ET&1sVre^G3GVlirgPA`sSR4nH1Kbh9y(qxV z^%z7)vvsnC_AIoiW4XXOOgoMp+H2iDwH{?#h8O^~Ax#^zbuAaA4e3_Y%ydWu0x%<- z%FzIb!&u`v{TTIKoPJjKFoJ^9v{4q=1aFp9Kh>i%Y}h!dFr^O0kqsL^J7fo8j1ufj zB{poJw9Y?98=oZ@5tVP*q_JV+1cbO7ppLA%)mfisHbgsZoQwl_a-$5kcH-tmaW|aH zR5mb{V2)~a0$(Uk#7PRw=my+O9FrQXp?*4{m_eveZU-?KE6qzW)(q-{>w(df zGrby(JRoj{0Uhu&PrYEt6r&i1v7U4))%STc?qIwHg_El>+@DdFzWcZGu;G~700ynn zG2HiGD^El*eodD_G=^a;(tT`tMl{9(&Byf`&d|`Qoz3w|p-{%rCFb@LI?(TGjG(&t z)J&!H6-H*1ykk8cF%}*#!dMZn%3h;b1;?I2H15ENvHB&EMTs|g1_2P|shO%$ZU$nA z!cRKJ0$UWqPwIJgi<=f0i*H`#G4@uAd3%33iQ=XM;KRu#^&I7r1>}Ny1GEYj$n*Mx z@{ljr0?k3q1#uIPu^8n?g6~%mH(fCn9rMl1BkoFR)(Ru+r4;y9c@Vi4NCPzo#7$d_ zg|%FaMYh@&O(n$abr?T?LWi-78yChxU$U%!P9SJhAMYS%jGJ}6NhHflyq1Wpw<6+oWy7{WvMS1Lv<+fL=F5z}^5 zIHreqN*1VjfS)XkfU|FauTgv_Zr;Jzd$1PxM%=8D>rm?X%HlqJY|+=(;o}>bNP?Pc z_~FD&JAG}fmcZ-8&AGJE%rUVtuIYckIuvi4CAW+xTHGwrQgXHad$wh&zZ@f+W|gjI zxwuKBc_nk)t>0la#=eyC^_qcvbi@dkXr+I79wX%DfBNqa;%2h)RF-f9b1b#IkAuO= zLxsM!$YcxM0j$6obasT(;$;@;pZ!0J3=#E$K%!BKbpHRHi->a9u&g)7<(ZC9UBL{13aocI58p+ z`T*ng?9>lqZ~RlrgQ9|Fx|8b@cH=bWq{{ZS2KFfrO1J&5z~97O8Ri{F&7;Utsft6p z5hGmu*OEm#Mxwc^DrexDNR%ut(0w;pva0Royasqk+;kB)H(*3=&rlwG`gv_huI$%~ zfU_y*UG<_NWPsO!!}?vKFxKH7lPse3jB+~ghX4)r3<9tUKdteTgr8YjlW+sSR2~xb z^X8vO45ASJg76T+Lm0t`R{cDHKWQ6fmzLJ=Y3W`)Q%QT?(ARgPQxZuQ-DCpIfk6n9 zX4fFLSvtbw zy6+ywZ$#8;HE6Y-(NDlTsanoKVkf9lBrreB6#u1GX zA$=iI83C=(yGPZ$YPOjV2Zibd3e^jEsmjeY()6B(8rtjC*fz+8R+pVgEl`!x)z3a0 zD5{5vAHW(|cYr7pV{O#~Jp-jTzbL*jy^&eJZ>epV?<`W@~ z;znsEUa7CAqjOT3-qS(joEmjR50E5_fgMt{Mfg~&eZ94J&D5EZl+*F={~MJ z4VydqnA#vAI;6@=W!1!MS5E@jPzq356;fP;q6>=7`fnipXR#IswVh*u(s=2;%cpSEz{~{sP_yuKvB;d_iMrM zl(sWcP&(FYWgEhFZEpk;D6G*; zQd@?P_t0ljrR8KOm0e&HFRIq1jTV+0Q zJBq7;LE`47aP748U4SkZ0Kdk_Fmf002XS+;RaKK2AXzBjGQh7qe62i{N2_I4_LK41 zrsmeVzOh$3ETSY!Gj^0_RzG>l!%G+m2+yH`_y07OiWLJWakI+ujDvcOB!=pH&s7k$ zC*Jh31|yg9rnotX&|4dGW;gOEV4=7f0c=7@!$>Rhr1Fp>Zf*nSh?|}mVf|eLYMypM zJ`D5~H-#7{YPqyJ@?Xs~UyGZ+X|Kz>2)Wu>@O$9D%EJP2GXz+yJ#vS&-##vc7>WT- z!@=h!PnU?BM-VnvQ$Y<{#arkVOVvW`m)e_?FK*t|_qPWeaw`gBvGc>gBCWWY4!k68 zzSP3S3>VN#+FX~c ze1PbI5k)S-P|W9KC@v>(gn;lL6n!xE6ej~8<7bh2fx~jMev4?{rJUy4SnhzZ48^-9 z_3j^XD<9xsB*H1$!;}SV)H6VixH%u;JQV%40r&!bBeR7}0m_($@HC2%KpcwK@w2*8 zx;nU3GujBPTHFmRRWAl{^(r2wDiMTvFl+{LQ4G;`7{D}CH6K0US^F+et5laFd{Oz%iW?CIq3~C} ziEs{zUjtvE7^~(QYc^V${s1Rwz^@S6W9-gcsA-aikrZNEHQVQT_KKU1x^JDpzfl~( z&mT}^>b~j&tPe929e>F6VXj|g`93j(Q5pFEx8dWvYSE|bR8E2%Dl9L6TwB#ywbpfW zEk<%J-y?2cR?YVe{1%LkHR_rGa!dW&Qlq}xYP9tnao2Q8RO`=)k@a7-GVZ$5%7%@m gCmcgC$cc>q2Uoavp)sx<1poj507*qoM6N<$g2tTUl>h($ literal 9968 zcmWlf1yCDp5QdTB?vxfO?oM$j#T|+U*Wm8%T8g`s;skf66o&w%xVyVM{P$-j$t3e- z?y}$B?)yG_Q7TH(7^ozuFfcF}vN95C!21yJR6#}rUiIt*YJj(QF5Ldw(VW%68Ju-0 zL;?dt0V6B%Mcp&|B*()uS!4Ehz?3}aFm=W?St2&dI~nmb#^7Lj#pWsn@JN^>rSPlxFpYu7h#mt$Az2C5utsq4GKHQ#5zF(Ze2$KI z@p*aSN?KTfEgL_ZJ&><Oz-(Zg#=s--^6(Y~630r7jG+EK za^r1d!nAklJ0UtSaBcHe%3U5Vk_R&|j{Iuji`d-MLq~)c&&T%ga1auDK0iOFRyNX>5!XM}F&P2C;7(&JwqLaK4e$tQ&G6ikK_iGV{F$x!pA z-6=?fBC)bI-7xSrCuV1l*q+Wm9>U8^mLP1&5t}*)3j4b_aAojx`k>PWi)l_k< z^UfQ)&1^Rgsza`M?vRYf^NYSMqt7EZCTy$hev_c()9u7UqYVpN_cN! zLn*C~DRR+iXspuHU@VGnrQC0sbT%E(3 zz`rTB8ut^>v~^=Aq!}earZ1Xc^u3TLyXfnEx6t)pdEP>DeHzYxA*-F8FnlhwanaEN z;aFHw6oJ{0T7ueI=%8sy=)JH& zALYl!MsIXPDwxw#R9eMDtNO+h&EHid+Y#icCYGR!jtT1(qYxH4#iPlB^K0s#z(9n*+8z4}nW;1GMI6uO|7vS%Te3I;g__M)=mahVUF1iQiBl#tXy0B8 zl7ml|=jOWugr|x-|CQYyE6U2o?pSoCK0l|fm|tF&mzI{+3+(RFHa}OZ%SFaq)pw+g zeh2_Hg6waIpfN3qqwvJBw4vg#CbigLFoT8$rcLI`yY0XEXYW5ByPKGpfS!e@sNgG` zE(Y0HSx;ScOO$fzo(&BRm1Sj7R##V9Qr$c}z=zYKHTEmsWS;8}S$}?|q-acTvX`@< zqGqD0hlHU~Q2yzhaY>Ow!HxPWC-(fTe*e%&rnPm*=z@&wjvJqxoV2}Le6bPnX4|OX z=*Uh+MutyBgolm&`+TEUaK*sVvUKNdwbN(o;9$Yx0i5d<&SNv{cs&1E>bvL9sgqS1 z{~Qn9N%mGm8CixV&L@KyF$%G22j;vKjW4RIZjc=t>+4E?cP3*ZSbkqmyxiPeq5Jia z%2XWGu;aDvJpFce4&QsnZD%it`4SZ^ZMb9%VM20pA2fq&Dd!rCggesz< z+{|G+&knRet!i3a0-kj#k3rUKQA07;1|rn3^dT9nK9f)U{3)KE>0{j{wL0}=qV}`+ zIywZ~+v=NpC3O{EdR=}UK zpoi_=@q)|r3@=FW9UQEwRNQVX@7nh5lEaxbuPS8b`fw&@divW5(J7*un%vMR7nT!< z>%u_Z!h+w;4H4$@5_Fq1GDHvV4M*$ifA|H|Yo~<#nb~hDKY@!9E;^=?ZqwYnG4)bJ zWW1$yxD3LjqNes$P3;p zP~pMOZWVk^@f*DnE`#YD9Z#!1=p@{w@_wYBZHXb8e$m5b5)>_6wUlLLq`Wp@3(fe9 z1^-Ypb92(C+oA=%Y9;V~O~!*}k-SHgrtTL>Nfcopcaaw*eSK0>pCQjXB_gtYnv%4% zbf*o@SCQq6zCB^jhVH}_pIb+uDOI@=1a|p7nXvCKbO-pQ9XUJN{H4LDvs<$M-9bF3 zb9i`^5TolJl@^1L&Bl&RNMe!}*%$8b|Mr6WcuN|Vm8F$-)R2OLM~RGF!}6=9t}eH_ zi&GRkIArEK`5HWXdxY(xs|&xu>*_%RVp%z(=~|ZqY}@v%fuUhs0|CbiLu=~Pf*Um8 z1*31XO1Ds7e~fl=5yS$~nrQay6tK)76JE{`;*TCqDu|4`vv~_$`;^ml zbMBgndZngwT1?ncpdShQ^oj`YjJ5`fB&4y5D=H#;BX|>Ya^#GSKYMqQ<*P(WZG`|r z6drL|QEyqh9Yp~IdJh!+`J$>~ZvFeCAD2x=KPY$__erK^J|n;dje!iQagEqrUls*u zD3CCHrSm9Yk^fFkKQvUdmw33+)FMe=DfGJNBUjb}j77eDQKl9h_{pSORhMFLXv`s662 zqy)D}O&CEOiIWhvA2H|X^7!67*ekBES) z)t2${B9)Y!$>vL#QsC+zeA1b92Ab;7D8yu4EWp<{8z(9>IdwKZK3-8Xwb4zPBCv+t z%i;&`UdCxe2)pa%OM?&k)Q+`3SZWoW&R_7L2kxc z3Z9=X{@XM7Xgn?_-wHiig}%>>^P)slxM!5DTfxZ42(rgw&=I*ansznt!NGCk4~_*i zJx*?C*81T{vfEz-op>EgaCdghT;$=v_NR9xYo*k>ak)-rK2U}J_vk1JptypA^%ejT z0JE`iDpM4jsauqouQogcWiI(C79;+t$rFhQA9vt8irp?Lb4oNZZKo}xK^z*N@HXVvQBs6%m5;a~f(HeSh@t=ZH&$kh`ojG1# z8J}M?vPE)i2(C<+NOKGKw)JRv@1kdFt6HiC`?1y)x*i5r+**GO8>Zr5m*GK}LKCk^kH)-*RZ|2g3`gIFBCAtxrqFfiHp;bLj)q~PM# z$tp0{Wc$3ms9JK%sWZMeHn!JmQxC4L9!YGes#2O5h$UiyTyt=&qLY1uN#~K4ljD$; z4U3e3ljk<^@?zPWAZnN=YSmK!z8@a$$0xMrAWw2l918MCP%_5=7r1|v0vWIMWyDOO!>F9^9p2p`|x7saB+?D`|?ed=hm>_8IJPv zTrpe50U^MnbN?(jO8^@c7l*W-azbz&7i)Uf^|C_w5eAKr`S;9Bir>?%n>HUw{OFGD z;x(1Oe=f5Q=ZBDufj-6i$4m#*q~X34rlQm>+N9wT{lbm1h3UQWpFbCY-xIOoCnl={ zhB7Q?#8OQc0)BgSb#`HzJc0UGqM2hdQ~u3vm(nH{(<&Yc#RmkOu3;M`1t4XHb~q6+ zKK2!lWvQ06f$vK5{2!wVq~o0T|9>z|R3dSZp)n8)ryHO$>9wlKnV1A={7$cQl?gF3)3d$s zw6d~_8MOPtOn7zI-Ti0QZmCTXuqZ5mN&ToSe1rcr9KBXPM?^%#_q^xHcBL&kI2d}X zY#D6eP}l~VJA?>xS$^F_&{Zje@>);PRdvqkfN=MV@t#vFtQ6~|QNw~Q_}c`6CoN4@ z+9Z^6M(k#ZVh4n@vN(&MKMQ=qrsMV0+*RM_d7M?>t1;G`HL@5Yw&JFy)VsBS z?gcPnNYAcYYF!CJe0=tC^pK3cb#rjN8;DQ2Uh#U;wC_;LEU+#=%0K$VS zEq#zYAp88>@$hibkVZ*anU0e)QJUOu+F5}D`+U*Hh2PJcZD&W){mjP(I3hD|tu}LC zzhroiQA3A1W7!Vkq$SiPzL>Y7y7~s=Xlo1l{XK_59$ByOoy2@moMMDDN$fwl5ZHH! zpR00GQk(4JE#q>9d9Dw(B=bae*K4!08EES6@FoF+oR9UpnTEiiXC( z%uLP8J9l^w$nJ})tF6EJ(!N7cA^owzo|lZ?0gCfR=W9+$!hS z2^%Xl3qL=PhOM*uaYCM_z1!owtW9{9hmTved*hD?$A)cWY}Vpr3$2j%#RWa1Vor z&Ng9*+y@Gtbxa+$0N^PDY*FjDLH8LgQjNiC=5{Txfd^~ckl#-r4v_oFawvekfMzeG zwF!jGBt2g4sQsH7n=M!b3707EaazXf5Cea{7FioUCFLetWaS>lQlRzr!f7`_`q6P; zC0y}~hEzdRUck87W}nPExU0p9UM$`T>G%ZI@fk=?UN0Oq4FN9kezcg8d(H7=FKOqh zB?`a&zB0H%`!iN;!y>>Xm@Y0+x0M6Dk@EivVcy+fNS3KzTuq32v|OAHSaJj0Lxff_ zb9!@+%K~b&+Trzi?(VMpE$8*+iC0j>>K`>KnoC=Q=e(+`0KDk4V?u|}6Z_NX$_WR!+E<2r3HhnB50=o&ttpnS=&$7 zJZZT(U8d)Lyzf0Q`u)4}?TP$Xh+TFT4*_OnQ|?N8wTjB$3t{H5TyrroG3u+`#@qoe z!6)3a?lf|>G}e{)6HL(7@k0Ie(OevpR+aY7KkJx(|I}uy z^ySsma9LSd`vwL$9oNNzLqc?g2Q9fbcX!9(u{wt0Ki$nko<4uVMm|4h-&;=^?N3gd zOGwk2DVN2E60*cfMS)nPt9jKxpd}09nyf6ifB=G<8$?bnCIO)+B2sLR@|>0_nUPV ze_+|oh9pwi0>Xp=CoxFsF~6K}YOyz-W64dD6GCGxxGho_$WI6nKG|$67{cH-)}wL?S-e}b{>w?56crk3M|#u{l112#Dgz{|>41Xi zLY+A^HT8VGb(T(z5iH`@0+#MCNv@&)!;&2)>lvl;bva03+$O?{VK)x+4#rA+?tf zWpf`)w6uC%T~8_Nu9VKjH~{+e&`%@9&Pt?uXP7Q;yW7w=2nW{5=>$ziR@QXh(*87M z?K#x}6FRRiX2yvSaNqlJJXd%L>T?U=5;F^TC{G7fVNsDz>uO9t?#Rf+!~)j_yJJ~{5b5bHv*f<3 z3`69*x0|$kpACkl%e!7;ON>Jjwz8ZI2|8u6K+WLERlg;P!XIu-cC@G1Mk?|gy{eV~x z4hYt(>ZtP9!ED27KTTT2FPKE8r4om=O)s}Fvn*)89#VPl;jam8sWs)hzrx|pOua+z zCIr;nR-EW~CXWsA)YtKx7yWsU#^g96w#_%qs^6j5yu56=0k3%YsPzjo6Ku)AD8=;% zQPe_O5f%sMC4M*=An;kot1lYOjeF~llXfI#cc;}YjvK^=B4#WfVLn;oWR8`EjCU3!`CtpicZ7=vdfMIq-A)!NPUUxbLC)cM2S zTjNoq{wP2orChHmMlsu7p5k`%BMgpbKa=W_w@HeXmygUhxzQ*OFr?4d?_BsO$EK5$ zJMC<;?WI5Lei+wXwat31uoN`ubKIm3XQL6ejY5Adj0V8{$*m;Zc9-6d|5y}liP)#N=6sc@*W z$U~tE(G(_=W(6R$Lqz;QtFs_xLQYeu?=ukaL{mgEWkTS4E|Ut*goX&Ig6#z9iX7Pw zi}o_he@UvUoGqY{wQ`(9I2+@BcRFWJxFqEk{|d*?5L{SZ9v`&**uItAHtDXwOit#W zAQm@9tRNJ2b)~{1&0aklA&{6q&4?1S>^<}-J#VFG@wx7+)K5%g^Y_+IKuy%sv*XUJ z1d$vo@7hkVAdOs;XX&Xu&}_aeaMzu|*dLFh6=>n!0Wy&q_tWbuD>p{%#kD$UCjl1~0RW5? zglLs@Irk4`@p6)>X6Q!aV*5vsI_*WEt+(Pv)#w!C*J{r*|LCZwNS&TG0hFdVf0??3 z(N73Xh^$y(Oi^z5L`bk6z|TIV#js@Heu$R|wQLj^y{mJxu}*RpUtY!s4)Rl7j@iw} z`}6J{r!JE|3l=Ug1*xtErXaib={+IvEIxI7g7PS6E=M)L=lv3MlUxu&dWMEnmh$}1 zmJj}1*plL%l1)6%tx+>FMh6DMuo`wj>+4^?gRITQLhO<4BKy6!FbUS^2(Gr`-bSGr z)$rH^Jn=#BgI9Z^6PwGe^)f}IG1d05dwFk6WMux!PJ<2ZqmPdQx}3Ip9oiBTxnvR& zo+>&z5$)~4zkXS(Gco}5&vwbez^r5I2m7@*6>SpvT0lSoFxzl)PyMALGc;bcK3~gR ztZ*Rd*V)4uaMI!=%-o}b0eHzkfW!cdL{$|7u!Amu{Y+Pw|46gHkzc4x?!chH@M}Jb?Z`Wp{T3(}B=B`xQ1#S?0w*rzC|vD}n=q?y>}E8*zRF>Y5r{ z;PH=u{*rimeetp!!IzVZ)_JOdC@vyX{FdxXUR6uoKT8+(`HX}`whb^Ev#kMg&+P;)mW@HXd=(j$vcghzwNVvX(eCKj4{X1t-UAkW zeZ2=A@?0w&XHo04B?)AUrx!mC*{PC$SL*Vz+^+)RiwjjCvldz|C`*(wOow-zIeL1k zY*(}Y1i|mRDv0L?0($oHsu2h&E{_z+-WnM1_gFU>Gb zYU9rxJ>&y2DREJl*8so+D9u_2LlOW2sB0ZDqmTk9S+}{^d0k8Z07Aee0St;##VYnK z>y3ex7h}9pdMzrUla`b`jl@6#iy4hixZOKiWKE{dnRsBRsU^m!GygH-HvX}1mj~*M z!jN?<)nDEI8$#;(jvl2c-y;4M1k$tn2(zUGihcfjV1M-H34s@`~;*4L;cm0i%_qhg~XST^1yr+r{xESI9@1XFQmKo5k1 z48taTJMu+>!~&V=u`yv_5RL!87eJdCu)ETVvAHi#Q`k|Vsqfr!R;s_2aB&a&n!Hv@ zQU+-V0pgv-@=Re&v2NCToXO)5tyU~(%+TrSFx#-rXk`mPv0NVs8 z?HJh$XBWtP2Y=YQkrpBbDj?7rGQsztV^)gZ@Rh+ICwUh=L5!>9YqtXe-c+{Al{FFB^d9REvueY3X z8R?<}Lqn{APFn-D0H?7S&t9lt1$rv<{giB{DWPX=KhgDstgU6 z89m<*{M`@NYXOXu47Iqm_4V<*Q^uh+DS-Zdsx@Bcip#O_Y zeg+=KcIXO+85upIXJ$5@E;aJM|Fkgj^rb)*va1AhvP9ni~IYh(3n001o|Cf zo0`hc{uTW%z+l(!>EHPckAwIWc5|n{A8t@k)%Kp&#%Wc}Kk9>no#eC<(CU%v?mOh2 z9k*1Qf7Wj43IK~m_3lgneu#|h_=yPu2e46)oiG5o0e|&tDg#dh*g|>2{urW|O6Tj$ z04_Wv%tD}$_V0|+0F5bOv>({?|J^$nTqcPZ@Zv@Z>^e0qAutsRQDdkb(F3L{=0Ft& z#zVFXiP2I8)C^^&C~bD**8gy>AH8vLn_L{<1gZ-4EpJ=ZDL=8ZCz5T{qLaAt!onu7 z%qC@eN1MwVNYIvUP5N_MTz|veS!hxKYY-E6biB)3f9*IAcKhxtD@*3k;V=3|R1R)Fb*=9F;9V^4rfeGe-XsR zr_tZz{?;<2F-W@=NSP_5itJYl$IR*bo1Zi^-X$R^$w8SwoUan9cN$vlKu@Xqq$n-X z$GMj>G2h`uBaeGqvtN@c))?w3isR&u8$4}7O&O1jF#SQnH%q&BcUu5m3N|3)Qmy{c z-PZ7HOMCjDNmj%LYwrG^qKTNOv$eFR5+Ma+W1OX?*FO2)>?{{#i(@zhHEOh-iN{fFi^^#|6+Z}fLW5W_f)uSVXmL8 zPwY3?i%#w@YG5$t5i8g394#sprOQnuA6f$l`Hh6~ixRRY3*7y=veC2rV^l7iybOpc`@ zE#5+F#{I2b6$S}58bawdrG3o%{$vKW^*y5TcEiqzOfGL)spu9#ak-i-un~RkuWMUt~=?8Ruude7;kmJRK0Q(c+;}#+kX684# qKNVl>_XtVt`5phF&ir0_!$PWEBVVZ^Jpk@bgOQa~lBg0l3jPmQ40}`n From 6bb30bd7e5711b72c5ab33afa68272dd462bece9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 19 Oct 2016 22:28:54 +0200 Subject: [PATCH 0901/3392] website: add Free Electrons as a current sponsor Free Electrons sponsored the Buildroot Developers Meeting at ELCE 2016 in Berlin by making a donation to IN-Berlin, the organization who hosted the 3-day event. Signed-off-by: Thomas Petazzoni --- docs/website/sponsors.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index 0a4373d408..6d97ca529c 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -26,6 +26,23 @@
+
+
+
+
+ + + +
+
+ Free + Electrons is sponsoring the Buildroot + Developers Meeting at ELCE 2016 in Berlin, by making a donation to the + IN-Berlin organization who hosted the event. +
+
+
+
From 114d1f7729ffe9d4e0c4b858fd00a953001af4c7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 20 Oct 2016 07:42:53 -0300 Subject: [PATCH 0902/3392] libgpgme: bump to version 1.7.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libgpgme/libgpgme.hash | 2 +- package/libgpgme/libgpgme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index 9b96fd2ce4..5ef7b0e5ce 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 71f55fed0f2b3eaf7a606e59772aa645ce3ffff322d361ce359951b3f755cc48 gpgme-1.7.0.tar.bz2 +sha256 d0abe1449395315eac37e4e45076bbb82732cedf94210937b37776e10cdc2bb6 gpgme-1.7.1.tar.bz2 diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index c581a3c496..84f4d22977 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPGME_VERSION = 1.7.0 +LIBGPGME_VERSION = 1.7.1 LIBGPGME_SITE = ftp://ftp.gnupg.org/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPLv2.1+ From 8f3762716f8e0d322f87facb0205d0dc8bd53b8a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 20 Oct 2016 07:43:13 -0300 Subject: [PATCH 0903/3392] iw: bump to version 4.9 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/iw/iw.hash | 2 +- package/iw/iw.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iw/iw.hash b/package/iw/iw.hash index f22ceb1547..414f34225f 100644 --- a/package/iw/iw.hash +++ b/package/iw/iw.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 d1720c04bc26661d42e71d13746d5c3aeedb6bdf743f7d6b7b056f0abd345ee8 iw-4.7.tar.xz +sha256 324cc805fad52cba2c16b9ab569906889fb645cc962aac4cfda1db85d2de97ce iw-4.9.tar.xz diff --git a/package/iw/iw.mk b/package/iw/iw.mk index 925a770992..faff5fc717 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -4,7 +4,7 @@ # ################################################################################ -IW_VERSION = 4.7 +IW_VERSION = 4.9 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC From f77c00ac999843420b9d1e14f790fd370186b3aa Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 20 Oct 2016 10:31:43 -0300 Subject: [PATCH 0904/3392] hdparm: bump to version 9.50 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/hdparm/hdparm.hash | 4 ++-- package/hdparm/hdparm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/hdparm/hdparm.hash b/package/hdparm/hdparm.hash index 7d70f0b4fd..96f8650b7e 100644 --- a/package/hdparm/hdparm.hash +++ b/package/hdparm/hdparm.hash @@ -1,3 +1,3 @@ # From http://sourceforge.net/projects/hdparm/files/hdparm/ -md5 213efdbe7471fad3408198918e164354 hdparm-9.48.tar.gz -sha1 1efce086ef47667cf8016861d3ce958969e70dfc hdparm-9.48.tar.gz +md5 d380062ad6c4b40076736efbb640f1f5 hdparm-9.50.tar.gz +sha1 2acfb9ab9f6aae0d1d69e302ae2861342e4a374e hdparm-9.50.tar.gz diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index a2b3e8c73e..e9a208830b 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -4,7 +4,7 @@ # ################################################################################ -HDPARM_VERSION = 9.48 +HDPARM_VERSION = 9.50 HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm HDPARM_LICENSE = BSD-Style HDPARM_LICENSE_FILES = LICENSE.TXT From 730185643214d804c0b6154951215930ee2e5f35 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 20 Oct 2016 13:33:19 -0300 Subject: [PATCH 0905/3392] linux-headers: bump 4.{4, 7, 8}.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ec8c389a86..d1e2ecfe04 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -232,9 +232,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.34" if BR2_KERNEL_HEADERS_4_1 - default "4.4.25" if BR2_KERNEL_HEADERS_4_4 + default "4.4.26" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 - default "4.7.8" if BR2_KERNEL_HEADERS_4_7 - default "4.8.2" if BR2_KERNEL_HEADERS_4_8 + default "4.7.9" if BR2_KERNEL_HEADERS_4_7 + default "4.8.3" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From ccf41a3bbab53dfd0f06102808b85fa434495da1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 20 Oct 2016 13:33:20 -0300 Subject: [PATCH 0906/3392] linux: bump default to version 4.8.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index e0e24e6843..dc79d4274d 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.2)" + bool "Latest version (4.8.3)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.2" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.3" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From b29b7f4187aae7d6c60d7e35b301dd9f214f265f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 20 Oct 2016 20:48:22 +0300 Subject: [PATCH 0907/3392] wireshark: don't overwrite WIRESHARK_CONF_ENV Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index f7cc8f8424..593b19645e 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -78,7 +78,7 @@ WIRESHARK_CONF_OPTS += --with-gnutls=no endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config +WIRESHARK_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config WIRESHARK_CONF_OPTS += --with-gcrypt=yes WIRESHARK_DEPENDENCIES += libgcrypt else From 151c4ba71abbaf6b3f40fae1f177d7e322e483ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 20 Oct 2016 18:28:25 +0200 Subject: [PATCH 0908/3392] package/wireshark: fix kconfig dependencies Commit fa6feff (wireshark: needs the qt5tools lrelease utility) introduced a circular dependency chain in Kconfig: package/qt5/qt5base/Config.in:118:error: recursive dependency detected! package/qt5/qt5base/Config.in:118: symbol BR2_PACKAGE_QT5BASE_GUI is selected by BR2_PACKAGE_QT5TOOLS_PIXELTOOL package/qt5/qt5tools/Config.in:19: symbol BR2_PACKAGE_QT5TOOLS_PIXELTOOL depends on BR2_PACKAGE_QT5TOOLS package/qt5/qt5tools/Config.in:1: symbol BR2_PACKAGE_QT5TOOLS is selected by BR2_PACKAGE_QT5BASE_WIDGETS package/qt5/qt5base/Config.in:131: symbol BR2_PACKAGE_QT5BASE_WIDGETS is selected by BR2_PACKAGE_QT5X11EXTRAS package/qt5/qt5x11extras/Config.in:1: symbol BR2_PACKAGE_QT5X11EXTRAS depends on BR2_PACKAGE_QT5BASE_XCB package/qt5/qt5base/Config.in:186: symbol BR2_PACKAGE_QT5BASE_XCB depends on BR2_PACKAGE_QT5BASE_GUI Fix that by dropping the select on the Qt5Tools, and introduce an intermediate kconfig-level variable to represent the new condition, to simplify the .mk file. That would make the condition for enabling/disabling the GUI to be a little bit more complex by adding yet another (long-ish) variable. So we also introduce an intermediate kconfig-level variable that represent the condition to enable the GUI. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Baruch Siach Tested-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/wireshark/Config.in | 15 +++++++++++++-- package/wireshark/wireshark.mk | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index 959fb5b4f7..b5a874b640 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -2,8 +2,6 @@ config BR2_PACKAGE_WIRESHARK bool "wireshark" select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_QT5TOOLS if BR2_PACKAGE_QT5BASE_WIDGETS - select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS if BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_USE_MMU # fork(), glib2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 @@ -12,6 +10,19 @@ config BR2_PACKAGE_WIRESHARK https://www.wireshark.org +config BR2_PACKAGE_WIRESHARK_QT + bool + default y + depends on BR2_PACKAGE_QT5BASE_WIDGETS + depends on BR2_PACKAGE_QT5TOOLS + select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS + +config BR2_PACKAGE_WIRESHARK_GUI + bool + default y if BR2_PACKAGE_LIBGTK2 + default y if BR2_PACKAGE_LIBGTK3 + default y if BR2_PACKAGE_WIRESHARK_QT + comment "wireshark needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 593b19645e..227ead6a92 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -38,7 +38,7 @@ WIRESHARK_CONF_OPTS += --with-gtk=no endif # Qt4 needs accessibility, we don't support it -ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) +ifeq ($(BR2_PACKAGE_WIRESHARK_QT),y) WIRESHARK_CONF_OPTS += --with-qt=5 WIRESHARK_DEPENDENCIES += qt5base qt5tools WIRESHARK_CONF_ENV += ac_cv_path_QTCHOOSER="" @@ -52,7 +52,7 @@ WIRESHARK_CONF_OPTS += --with-qt=no endif # No GUI at all -ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS),) +ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),) WIRESHARK_CONF_OPTS += --disable-wireshark endif From 448d1d1e69e5f0e04a4553571bcebeedd2ad135c Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Mon, 17 Oct 2016 15:08:07 +0200 Subject: [PATCH 0909/3392] pkg-download: use raw basename for repo archiving to remove host- prefix For packages that use a version control repository rather than a pre-made tarball, the directory prefix used inside the tarball is currently FOO_BASE_NAME, which can be 'foo' or 'host-foo'. This means that the hash of such tarball will be different for target and host packages, even though the contents are exactly the same. Hence, if the hash file is created based on 'foo', and later a fresh build is made where 'host-foo' happens to be built before 'foo' (with a different config, for example), the hash will be detected as incorrect and a new download is started. This problem does not affect many packages/users, due to the number of conditions to be met: - the package should be available for target _and_ host - the package needs to use a VCS download method, e.g. git, hg, svn, ... This does not include standard github downloads, which download a pre-made archive. - there should be a hash file containing the hash of the downloaded archive. Since normally there is no hash file for packages with sources coming from a version control system, this restricts even further. Some examples of packages in this category that do have a hash file (but not necessarily match the earlier conditions): expedite, vexpress-firmware, squashfs, ... - the archive needs to be stored in a 'primary site' after initial archiving and thus be downloaded later using a non-version-controlled method, like wget or scp. This is because the version control download methods do not receive a '-H' parameter pointing to the hash file and thus no hashes are checked at all even if the file is present. While packages matching the third condition could be considered to be 'wrong' and need to be fixed, it does actually makes sense to have a hash file for packages from version control, in particular if they are stored in a primary site as mentioned in the last condition. Regardless of any different opinions on the previous paragraph, it is also not conceptually correct that a tarball of a package source can contain a Buildroot-specific directory prefix 'host-'. Therefore, use FOO_RAW_BASE_NAME instead of FOO_BASE_NAME when calling the dl-wrapper. Example test scenario that exhibits the problem: $ rm -rf /tmp/dl dl/squashfs-9c1db6d13a51a2e009f0027ef336ce03624eac0d.tar.gz $ make qemu_x86_64_defconfig $ make host-squashfs-dirclean host-squashfs-source $ mkdir /tmp/dl $ mv dl/squashfs-9c1db6d13a51a2e009f0027ef336ce03624eac0d.tar.gz /tmp/dl/ $ sed -i -e 's,BR2_PRIMARY_SITE=.*,BR2_PRIMARY_SITE="file:///tmp/dl",' \ -e '/BR2_PRIMARY_SITE/aBR2_PRIMARY_SITE_ONLY=y' .config $ make host-squashfs-dirclean host-squashfs-source Signed-off-by: Thomas De Schampheleire Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pkg-download.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 3b6561bd1e..0f542e6882 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -81,7 +81,7 @@ define DOWNLOAD_GIT -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_BASE_NAME) \ + $($(PKG)_RAW_BASE_NAME) \ $($(PKG)_DL_OPTS) endef @@ -98,7 +98,7 @@ define DOWNLOAD_BZR -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_BASE_NAME) \ + $($(PKG)_RAW_BASE_NAME) \ $($(PKG)_DL_OPTS) endef @@ -114,7 +114,7 @@ define DOWNLOAD_CVS $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \ $($(PKG)_DL_VERSION) \ $($(PKG)_RAWNAME) \ - $($(PKG)_BASE_NAME) \ + $($(PKG)_RAW_BASE_NAME) \ $($(PKG)_DL_OPTS) endef @@ -130,7 +130,7 @@ define DOWNLOAD_SVN -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_BASE_NAME) \ + $($(PKG)_RAW_BASE_NAME) \ $($(PKG)_DL_OPTS) endef @@ -162,7 +162,7 @@ define DOWNLOAD_HG -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ - $($(PKG)_BASE_NAME) \ + $($(PKG)_RAW_BASE_NAME) \ $($(PKG)_DL_OPTS) endef From 1854018b01df9cbb24911f617753b8ebe217b965 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 17 Oct 2016 09:33:41 -0200 Subject: [PATCH 0910/3392] util-linux: select libsmartcols when partx is selected Fixes http://autobuild.buildroot.net/results/be2/be2e81b27a21355d7a453316d9df1cd4b0da2106/ Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/util-linux/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 38d68ca251..0c33919858 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -259,6 +259,7 @@ config BR2_PACKAGE_UTIL_LINUX_PARTX bool "partition utilities" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS select BR2_PACKAGE_UTIL_LINUX_LIBUUID help Partition utilities (addpart, delpart, partx) From 6b815d621bb82e5c9f38f05bc431e8f050def632 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 20 Oct 2016 21:56:41 +0200 Subject: [PATCH 0911/3392] package/wireshark: properly guard sub-options ... otherwise we would end up forcefully enabling the linguist tool even when wireshark would not be enabled. Signed-off-by: "Yann E. MORIN" Cc: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/wireshark/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index b5a874b640..c5b5c3e3ae 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -10,6 +10,8 @@ config BR2_PACKAGE_WIRESHARK https://www.wireshark.org +if BR2_PACKAGE_WIRESHARK + config BR2_PACKAGE_WIRESHARK_QT bool default y @@ -23,6 +25,8 @@ config BR2_PACKAGE_WIRESHARK_GUI default y if BR2_PACKAGE_LIBGTK3 default y if BR2_PACKAGE_WIRESHARK_QT +endif # BR2_PACKAGE_WIRESHARK + comment "wireshark needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS From 84dea98064c91324b23a3f9a2f7549dd57012d01 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Tue, 18 Oct 2016 23:33:07 +0530 Subject: [PATCH 0912/3392] libglib2: fix static linking with libgio When statically linking with libgio, application needs to link with all internal libraries that libgio uses. This commit adds patch which includes libmount as Libs.private. Fixes: http://autobuild.buildroot.net/results/fdf/fdf26abbed0014606a7788ce5d60828a0e871186 http://autobuild.buildroot.net/results/1d6/1d69b8ea34cf57255be54de0c87fc83590fb1337 Cc: Gustavo Zacarias Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- ....pc-include-libmount-in-Libs.private.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch diff --git a/package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch b/package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch new file mode 100644 index 0000000000..364e179345 --- /dev/null +++ b/package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch @@ -0,0 +1,32 @@ +From ee32416dec8462ee27c3c254100cf980b0889ce0 Mon Sep 17 00:00:00 2001 +From: Rahul Bedarkar +Date: Tue, 18 Oct 2016 23:04:50 +0530 +Subject: [PATCH] gio-2.0.pc: include libmount in Libs.private + +This helps with static linking. When application statically links with +libgio, it needs to link against libmount explicitly. When it is +mentioned in Libs.private, build system can figure out with which extra +libs to link against with help of pkg-config. + +This build failure is detected by Buildroot autobuilder: +http://autobuild.buildroot.net/results/fdf/fdf26abbed0014606a7788ce5d60828a0e871186 + +Signed-off-by: Rahul Bedarkar +--- + gio-2.0.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in +index 899af0c..7574eb7 100644 +--- a/gio-2.0.pc.in ++++ b/gio-2.0.pc.in +@@ -14,5 +14,5 @@ Version: @VERSION@ + Requires: glib-2.0 gobject-2.0 + Requires.private: gmodule-no-export-2.0 + Libs: -L${libdir} -lgio-2.0 +-Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ ++Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @LIBMOUNT_LIBS@ + Cflags: +-- +2.6.2 + From 035567b2793f3649e2ddc6cd34b75dd643f47d73 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 20 Oct 2016 22:57:11 +0200 Subject: [PATCH 0913/3392] pppd: fix build with Linux 4.8 headers This commit fixes the build of pppd with toolchain using Linux 4.8 headers. The patch has been taken from a pull request pending on the Github project, which is unfortunately somewhat dead. The fix is not the most beautiful one, but it does the job, in a piece of source code that's anyway rather messy in terms of mixing userspace headers and kernel headers. Fixes: http://autobuild.buildroot.net/results/bdc4f274e527c5aebf9bd1b2ca85ba8e7da57e9d/ and numerous similar other build failures Signed-off-by: Thomas Petazzoni --- .../0001-fix-building-with-linux-4.8.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/pppd/0001-fix-building-with-linux-4.8.patch diff --git a/package/pppd/0001-fix-building-with-linux-4.8.patch b/package/pppd/0001-fix-building-with-linux-4.8.patch new file mode 100644 index 0000000000..d09e39291b --- /dev/null +++ b/package/pppd/0001-fix-building-with-linux-4.8.patch @@ -0,0 +1,39 @@ +From 492e240a651e3d32b84cac66e4675ee99dcbe05a Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Thu, 13 Oct 2016 13:41:43 +0800 +Subject: [PATCH] ppp: fix building with linux-4.8 + +Fix a build error when using the linux-4.8 headers that results in: + +In file included from pppoe.h:87:0, + from plugin.c:29: +../usr/include/netinet/in.h:211:8: note: originally defined here + struct in6_addr + ^~~~~~~~ +In file included from ../usr/include/linux/if_pppol2tp.h:20:0, + from ../usr/include/linux/if_pppox.h:26, + from plugin.c:52: +../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' + struct sockaddr_in6 { + ^~~~~~~~~~~~ + +Signed-off-by: Jackie Huang +[Thomas: downloaded from https://github.com/paulusmack/ppp/pull/69.] +Signed-off-by: Thomas Petazzoni +--- + pppd/plugins/rp-pppoe/pppoe.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +index 9ab2eee..96d2794 100644 +--- a/pppd/plugins/rp-pppoe/pppoe.h ++++ b/pppd/plugins/rp-pppoe/pppoe.h +@@ -84,7 +84,7 @@ typedef unsigned long UINT32_t; + #include + #endif + +-#include ++#include + + #ifdef HAVE_NETINET_IF_ETHER_H + #include From 50db688e38b224382d34f780a929b20ff864c064 Mon Sep 17 00:00:00 2001 From: Volkov Viacheslav Date: Thu, 20 Oct 2016 19:43:11 +0300 Subject: [PATCH 0914/3392] package/zbar: fix zbar build Fixes: http://autobuild.buildroot.net/results/913/913662f10330b79f7769d05493438676939d9c7e/ Signed-off-by: Viacheslav Volkov Signed-off-by: Thomas Petazzoni --- package/zbar/zbar.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index 54e11e3eed..aba78d1be0 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -12,6 +12,8 @@ ZBAR_LICENSE_FILES = LICENSE ZBAR_INSTALL_STAGING = YES ZBAR_AUTORECONF = YES ZBAR_DEPENDENCIES = libv4l jpeg +# add host-gettext for AM_ICONV macro +ZBAR_DEPENDENCIES += host-gettext ZBAR_CONF_OPTS = \ --without-imagemagick \ --without-qt \ From 630708155498a4a4c4e1f90e25eabd23951982d9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 20 Oct 2016 23:26:21 +0200 Subject: [PATCH 0915/3392] qemu: fix build of target variant Similar to what was done in commit 524b6b85595274ca13bd7d01adb61ce2dddd786c for the host variant, this commit fixes the build of qemu's host variant. Qemu expects that the cpp it is passed behave like cc: it passes the -c option, which is not allowed by cpp, but is allowed for cc. Fix that by overriding CPP when calling configure. Fixes: http://autobuild.buildroot.net/results/0850e80ba62294397b44d8adea197a244a9a8205/ Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 9815f76cf2..cf23f16a3c 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -196,11 +196,14 @@ else QEMU_OPTS += --disable-fdt endif +# Override CPP, as it expects to be able to call it like it'd +# call the compiler. define QEMU_CONFIGURE_CMDS ( cd $(@D); \ LIBS='$(QEMU_LIBS)' \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ + CPP="$(TARGET_CC) -E" \ $(QEMU_VARS) \ ./configure \ --prefix=/usr \ From 02e11d02f40ad2ec236bdcc6359729dbf2604069 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 16 Oct 2016 09:42:22 +0200 Subject: [PATCH 0916/3392] uboot: add option to optionally depend on host-openssl Some U-Boot board configurations have CONFIG_FIT_SIGNATURE=y. In this case, when U-Boot builds its tools, it requires OpenSSL support on the host system. Since we clearly don't want to unconditionally depend on host-openssl, we introduce a new option to explicitly enable the dependency on host-openssl. This is exactly identical to the existing BR2_TARGET_UBOOT_NEEDS_DTC, for the dependency on host-dtc. It is therefore the responsibility of the user to enable this option if his board configuration uses CONFIG_FIT_SIGNATURE=y. Necessary to fix bug #9316. Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 8 ++++++++ boot/uboot/uboot.mk | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index d46a757680..fabf27db73 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -137,6 +137,14 @@ config BR2_TARGET_UBOOT_NEEDS_DTC Select this option if your U-Boot board configuration requires the Device Tree compiler to be available. +config BR2_TARGET_UBOOT_NEEDS_OPENSSL + bool "U-Boot needs OpenSSL" + help + Select this option if your U-Boot board configuration + requires OpenSSL to be available on the host. This is + typically the case when the board configuration has + CONFIG_FIT_SIGNATURE enabled. + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 86e5b84d90..ae7539d512 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -133,6 +133,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y) +UBOOT_DEPENDENCIES += host-openssl +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE From 59b9cc7a2dffcd5eb192609eebe3f6a9a9293462 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 20 Oct 2016 23:30:14 +0200 Subject: [PATCH 0917/3392] configs/zynq_*: add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y The U-Boot configuration for Zynq boards have CONFIG_FIT_SIGNATURE=y, so they need OpenSSL to be available on the host system. In order to add OpenSSL to the build this commit adds the BR2_TARGET_UBOOT_NEEDS_OPENSSL=y to the relevant defconfigs. Fixes #9316. Signed-off-by: Thomas Petazzoni --- configs/zynq_microzed_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index ca6d010e23..dd580ab9eb 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -23,6 +23,7 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_microzed" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 6f7215cb2c..3f7fd8c4f2 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -24,6 +24,7 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zc706" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index e5bf3de911..0febf82594 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -23,6 +23,7 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zed" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index aef1ac208c..ee6fa060b6 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -21,6 +21,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zybo" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_ZYNQ_IMAGE=y From 9d08404d9afa211b2da4449ee12b2e89dcedc208 Mon Sep 17 00:00:00 2001 From: Stefan Nickl Date: Thu, 20 Oct 2016 23:12:37 +0200 Subject: [PATCH 0918/3392] pppd: better fix for the Linux 4.8 kernel headers issue Commit 035567b2793f3649e2ddc6cd34b75dd643f47d73 solved the build issue of pppd with Linux 4.8 kernel headers, but in the process broke the build with older kernel headers such as 3.10. This commit takes a different approach, by moving the include above linux header includes. Linux uapi headers try to avoid redeclaring things from libc via linux/libc-compat.h. However that only works if the libc header is included first. Signed-off-by: Stefan Nickl Signed-off-by: Thomas Petazzoni --- ...net-in.h-above-linux-header-includes.patch | 22 +++++++++++ .../0001-fix-building-with-linux-4.8.patch | 39 ------------------- 2 files changed, 22 insertions(+), 39 deletions(-) create mode 100644 package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch delete mode 100644 package/pppd/0001-fix-building-with-linux-4.8.patch diff --git a/package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch b/package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch new file mode 100644 index 0000000000..2f6933f5e5 --- /dev/null +++ b/package/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch @@ -0,0 +1,22 @@ +diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h +index 9ab2eee..b827620 100644 +--- a/pppd/plugins/rp-pppoe/pppoe.h ++++ b/pppd/plugins/rp-pppoe/pppoe.h +@@ -47,6 +47,8 @@ + #include + #endif + ++#include ++ + /* Ugly header files on some Linux boxes... */ + #if defined(HAVE_LINUX_IF_H) + #include +@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t; + #include + #endif + +-#include +- + #ifdef HAVE_NETINET_IF_ETHER_H + #include + diff --git a/package/pppd/0001-fix-building-with-linux-4.8.patch b/package/pppd/0001-fix-building-with-linux-4.8.patch deleted file mode 100644 index d09e39291b..0000000000 --- a/package/pppd/0001-fix-building-with-linux-4.8.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 492e240a651e3d32b84cac66e4675ee99dcbe05a Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Thu, 13 Oct 2016 13:41:43 +0800 -Subject: [PATCH] ppp: fix building with linux-4.8 - -Fix a build error when using the linux-4.8 headers that results in: - -In file included from pppoe.h:87:0, - from plugin.c:29: -../usr/include/netinet/in.h:211:8: note: originally defined here - struct in6_addr - ^~~~~~~~ -In file included from ../usr/include/linux/if_pppol2tp.h:20:0, - from ../usr/include/linux/if_pppox.h:26, - from plugin.c:52: -../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' - struct sockaddr_in6 { - ^~~~~~~~~~~~ - -Signed-off-by: Jackie Huang -[Thomas: downloaded from https://github.com/paulusmack/ppp/pull/69.] -Signed-off-by: Thomas Petazzoni ---- - pppd/plugins/rp-pppoe/pppoe.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..96d2794 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -84,7 +84,7 @@ typedef unsigned long UINT32_t; - #include - #endif - --#include -+#include - - #ifdef HAVE_NETINET_IF_ETHER_H - #include From 2974b64f199a99d1c1dc26870d8505e40fef620a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 21 Oct 2016 09:54:48 +0300 Subject: [PATCH 0919/3392] kexec: fix build for arm Add a patch equivalent to upstream commit 1574ff1aae4 (arm: include phys_to_virt.h and iomem.h in distribution). Fixes: http://autobuild.buildroot.net/results/bf9/bf939477cce6a5c333ee579006b9aa4856acd604/ http://autobuild.buildroot.net/results/8a7/8a7407afcf47326aadbce0b9157442dae9558ded/ http://autobuild.buildroot.net/results/ec2/ec26f1dd97f1e861e401d2709a243ae55bd6f022/ Cc: Marcin Nowakowski Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...002-arm-add-phys_to_virt.h-and-iomem.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/kexec/0002-arm-add-phys_to_virt.h-and-iomem.patch diff --git a/package/kexec/0002-arm-add-phys_to_virt.h-and-iomem.patch b/package/kexec/0002-arm-add-phys_to_virt.h-and-iomem.patch new file mode 100644 index 0000000000..748acbde18 --- /dev/null +++ b/package/kexec/0002-arm-add-phys_to_virt.h-and-iomem.patch @@ -0,0 +1,35 @@ +arm: add iomem.h and phys_to_virt.h + +Fixes build for arm. + +This patch is equivalent to upstream commit 1574ff1aae4f3 (arm: include +phys_to_virt.h and iomem.h in distribution) when applied to the tarball. + +Signed-off-by: Baruch Siach + +--- +diff -Nuar kexec-tools-2.0.13-orig/kexec/arch/arm/iomem.h kexec-tools-2.0.13/kexec/arch/arm/iomem.h +--- kexec-tools-2.0.13-orig/kexec/arch/arm/iomem.h 1970-01-01 02:00:00.000000000 +0200 ++++ kexec-tools-2.0.13/kexec/arch/arm/iomem.h 2016-10-21 09:45:27.495689269 +0300 +@@ -0,0 +1,9 @@ ++#ifndef IOMEM_H ++#define IOMEM_H ++ ++#define SYSTEM_RAM "System RAM\n" ++#define SYSTEM_RAM_BOOT "System RAM (boot alias)\n" ++#define CRASH_KERNEL "Crash kernel\n" ++#define CRASH_KERNEL_BOOT "Crash kernel (boot alias)\n" ++ ++#endif +diff -Nuar kexec-tools-2.0.13-orig/kexec/arch/arm/phys_to_virt.h kexec-tools-2.0.13/kexec/arch/arm/phys_to_virt.h +--- kexec-tools-2.0.13-orig/kexec/arch/arm/phys_to_virt.h 1970-01-01 02:00:00.000000000 +0200 ++++ kexec-tools-2.0.13/kexec/arch/arm/phys_to_virt.h 2016-10-21 09:45:27.495689269 +0300 +@@ -0,0 +1,8 @@ ++#ifndef PHYS_TO_VIRT_H ++#define PHYS_TO_VIRT_H ++ ++#include ++ ++extern uint64_t phys_offset; ++ ++#endif From 342ef8e3ca81dba8d6ea9515b9f4c74df720bedf Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 21 Oct 2016 17:11:14 +0100 Subject: [PATCH 0920/3392] nmap: bump version to 7.31 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/nmap/nmap.hash | 4 ++-- package/nmap/nmap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 94e189ed5f..2a26557b73 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,2 +1,2 @@ -# From https://nmap.org/dist/sigs/nmap-7.30.tar.bz2.digest.txt -sha256 ba38a042ec67e315d903d28a4976b74999da94c646667c0c63f31e587d6d8d0f nmap-7.30.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.31.tar.bz2.digest.txt +sha256 cb9f4e03c0771c709cd47dc8fc6ac3421eadbdd313f0aae52276829290583842 nmap-7.31.tar.bz2 diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 2cc7604785..3087903a92 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMAP_VERSION = 7.30 +NMAP_VERSION = 7.31 NMAP_SITE = http://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = libpcap pcre From 4da424cfbe040c88f65773e0a1db58a6f396522d Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Fri, 21 Oct 2016 23:15:56 +0530 Subject: [PATCH 0921/3392] pppd: fix config file name When radius plugin is enabled, we get following error: /usr/bin/install: cannot stat '/home/rahul.bedarkar/buildroot/output/build/pppd-2.4.7/pppd/plugins/radius/etc/server': No such file or directory Name of config file is 'servers' instead of 'server'. Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/pppd/pppd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 92897be9d9..3741f92c47 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -18,7 +18,7 @@ PPPD_TARGET_BINS = chat pppd pppdump pppstats PPPD_RADIUS_CONF = \ dictionary dictionary.ascend dictionary.compat \ dictionary.merit dictionary.microsoft \ - issue port-id-map realms server radiusclient.conf + issue port-id-map realms servers radiusclient.conf ifeq ($(BR2_PACKAGE_PPPD_FILTER),y) PPPD_DEPENDENCIES += libpcap From cd6448d501c770e48607c27ffe402409a84c555c Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 22 Oct 2016 00:41:13 +0530 Subject: [PATCH 0922/3392] libfastjson: bump version to 0.99.4 Drop upstream patch and rename remaining one. Also fixes: http://autobuild.buildroot.net/results/bfe/bfe8ebe3966324b16ca572bfba0a1a8ddc275db9 Cc: Peter Korsgaard Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- .../0001-fix-missing-config.h.patch | 29 ------------------- ...=> 0001-m4-fix-detection-of-atomics.patch} | 0 package/libfastjson/libfastjson.hash | 2 +- package/libfastjson/libfastjson.mk | 2 +- 4 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 package/libfastjson/0001-fix-missing-config.h.patch rename package/libfastjson/{0002-m4-fix-detection-of-atomics.patch => 0001-m4-fix-detection-of-atomics.patch} (100%) diff --git a/package/libfastjson/0001-fix-missing-config.h.patch b/package/libfastjson/0001-fix-missing-config.h.patch deleted file mode 100644 index 8663e23d66..0000000000 --- a/package/libfastjson/0001-fix-missing-config.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3e017fe8da1e821d4fcd801c75467c8ec2a81eb4 Mon Sep 17 00:00:00 2001 -From: Rainer Gerhards -Date: Tue, 19 Apr 2016 08:21:50 +0200 -Subject: [PATCH] fix missing config.h - -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: "Yann E. MORIN" - ---- - json_object_iterator.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/json_object_iterator.c b/json_object_iterator.c -index 6ab3a85..fb51f6e 100644 ---- a/json_object_iterator.c -+++ b/json_object_iterator.c -@@ -17,8 +17,8 @@ - ******************************************************************************* - */ - -+#include "config.h" - #include -- - #include "json.h" - #include "json_object_private.h" - #include "json_object_iterator.h" --- -2.7.4 - diff --git a/package/libfastjson/0002-m4-fix-detection-of-atomics.patch b/package/libfastjson/0001-m4-fix-detection-of-atomics.patch similarity index 100% rename from package/libfastjson/0002-m4-fix-detection-of-atomics.patch rename to package/libfastjson/0001-m4-fix-detection-of-atomics.patch diff --git a/package/libfastjson/libfastjson.hash b/package/libfastjson/libfastjson.hash index 8531dac3ae..427db9c702 100644 --- a/package/libfastjson/libfastjson.hash +++ b/package/libfastjson/libfastjson.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 fcdca0c4702362de3db3f02c8da05f985b54a9eccd618af41730409b75d10a8f libfastjson-v0.99.2.tar.gz +sha256 03ef63dcc88417e71c19ce4436804159e3397e3a20d3529efef6a43c3bef5c8d libfastjson-v0.99.4.tar.gz diff --git a/package/libfastjson/libfastjson.mk b/package/libfastjson/libfastjson.mk index ec5390c5f1..b1cdd6a158 100644 --- a/package/libfastjson/libfastjson.mk +++ b/package/libfastjson/libfastjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFASTJSON_VERSION = v0.99.2 +LIBFASTJSON_VERSION = v0.99.4 LIBFASTJSON_SITE = $(call github,rsyslog,libfastjson,$(LIBFASTJSON_VERSION)) LIBFASTJSON_INSTALL_STAGING = YES # From git From 7828bf001c4470ac4049400310854b97aa2c8fd2 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sat, 22 Oct 2016 00:41:14 +0530 Subject: [PATCH 0923/3392] rsyslog: bump version to 8.22.0 Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/rsyslog/rsyslog.hash | 2 +- package/rsyslog/rsyslog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 7dc341ad37..4fe6a0e261 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,2 +1,2 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e rsyslog-8.19.0.tar.gz +sha256 06e2884181333dccecceaca82827ae24ca7a258b4fbf7b1e07a80d4caae640ca rsyslog-8.22.0.tar.gz diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 18a57372fd..a0875b7447 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.19.0 +RSYSLOG_VERSION = 8.22.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPLv3, LGPLv3, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 From ebd73fab3e0c0a5bef351d1d6f14ed2323b6e24f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:48 -0300 Subject: [PATCH 0924/3392] pppd: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pppd/pppd.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 3741f92c47..55630a8a8d 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -46,11 +46,11 @@ PPPD_POST_EXTRACT_HOOKS += PPPD_SET_RESOLV_CONF define PPPD_CONFIGURE_CMDS $(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux $(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux - ( cd $(@D); ./configure --prefix=/usr ) + ( cd $(@D); $(TARGET_MAKE_ENV) ./configure --prefix=/usr ) endef define PPPD_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \ -C $(@D) $(PPPD_MAKE_OPTS) endef @@ -104,7 +104,7 @@ define PPPD_INSTALL_TARGET_CMDS endef define PPPD_INSTALL_STAGING_CMDS - $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel + $(TARGET_MAKE_ENV) $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel endef $(eval $(generic-package)) From 4ffca9a66da6d7bbd5dc65dc1144bd200bfdb977 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:49 -0300 Subject: [PATCH 0925/3392] poco: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/poco/poco.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 79452c02fb..4b82c500a5 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -47,7 +47,7 @@ POCO_MAKE_TARGET = all_release endif define POCO_CONFIGURE_CMDS - (cd $(@D); ./configure \ + (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ --config=Linux \ --prefix=/usr \ --omit="$(POCO_OMIT)" \ @@ -58,19 +58,19 @@ define POCO_CONFIGURE_CMDS endef define POCO_BUILD_CMDS - $(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ + $(TARGET_MAKE_ENV) $(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D) endef define POCO_INSTALL_STAGING_CMDS - $(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \ + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D) endef define POCO_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \ + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D) endef From 82fdffc7a9d016f6d0371ac73a2ecaec00189add Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:50 -0300 Subject: [PATCH 0926/3392] ocrad: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ocrad/ocrad.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk index 8a038e2ca2..7e4f8c1bb9 100644 --- a/package/ocrad/ocrad.mk +++ b/package/ocrad/ocrad.mk @@ -13,19 +13,19 @@ OCRAD_INSTALL_STAGING = YES # This is not a true autotools package. define OCRAD_CONFIGURE_CMDS cd $(@D) && \ - ./configure --prefix=/usr --sysconfdir=/etc $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) ./configure --prefix=/usr --sysconfdir=/etc $(TARGET_CONFIGURE_OPTS) endef define OCRAD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define OCRAD_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define OCRAD_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From bca16d96b53527389acab33fa2c3d2d1e2b180f7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:51 -0300 Subject: [PATCH 0927/3392] moarvm: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/moarvm/moarvm.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index ee58f76600..fd054682b5 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -29,19 +29,19 @@ MOARVM_CONF_OPTS += --big-endian endif define MOARVM_CONFIGURE_CMDS - (cd $(@D); perl Configure.pl $(MOARVM_CONF_OPTS)) + (cd $(@D); $(TARGET_MAKE_ENV) perl Configure.pl $(MOARVM_CONF_OPTS)) endef define MOARVM_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define MOARVM_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define MOARVM_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From da006138cdf84dcd0ae7d9b30e159c2831bad295 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:52 -0300 Subject: [PATCH 0928/3392] librtas: use $(TARGET_CONFIGURE_OPTS) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/librtas/librtas.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/librtas/librtas.mk b/package/librtas/librtas.mk index 6e1ebd1f0c..46c4cb4bb7 100644 --- a/package/librtas/librtas.mk +++ b/package/librtas/librtas.mk @@ -15,11 +15,11 @@ define LIBRTAS_BUILD_CMDS endef define LIBRTAS_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define LIBRTAS_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From ca3ae3bd35cf08f45b4ac06c6a09bcae35cbaa09 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:53 -0300 Subject: [PATCH 0929/3392] ed: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ed/ed.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ed/ed.mk b/package/ed/ed.mk index f3bcb749b6..36f2f2ed29 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -14,18 +14,18 @@ ED_LICENSE_FILES = COPYING define ED_CONFIGURE_CMDS (cd $(@D); \ - ./configure \ + $(TARGET_MAKE_ENV) ./configure \ --prefix=/usr \ $(TARGET_CONFIGURE_OPTS) \ ) endef define ED_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define ED_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package)) From 1889786650da4815378224e5706b34a1c7f8ba06 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:54 -0300 Subject: [PATCH 0930/3392] botan: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/botan/botan.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 69c973eab0..94f1edd2c8 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -44,19 +44,19 @@ BOTAN_CONF_OPTS += --with-zlib endif define BOTAN_CONFIGURE_CMDS - (cd $(@D); ./configure.py $(BOTAN_CONF_OPTS)) + (cd $(@D); $(TARGET_MAKE_ENV) ./configure.py $(BOTAN_CONF_OPTS)) endef define BOTAN_BUILD_CMDS - $(MAKE) -C $(@D) AR="$(TARGET_AR) crs" + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) AR="$(TARGET_AR) crs" endef define BOTAN_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install endef define BOTAN_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install endef $(eval $(generic-package)) From 7073047608f6bbd9cc6047d136abd0a3ed010af2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:55 -0300 Subject: [PATCH 0931/3392] zip: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/zip/zip.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zip/zip.mk b/package/zip/zip.mk index 5338f88166..d2487b714e 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -27,14 +27,14 @@ ZIP_TARGET_CFLAGS = \ $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) define ZIP_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(ZIP_TARGET_CFLAGS) $(ZIP_CFLAGS)" \ AS="$(TARGET_CC) -c" \ -f unix/Makefile generic endef define ZIP_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ prefix=$(TARGET_DIR)/usr endef From 5e2c37221c12409cfaac82b6a8b3a1c1b375a58b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:56 -0300 Subject: [PATCH 0932/3392] zip: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/zip/zip.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zip/zip.mk b/package/zip/zip.mk index d2487b714e..66d94b3c68 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -39,14 +39,14 @@ define ZIP_INSTALL_TARGET_CMDS endef define HOST_ZIP_BUILD_CMDS - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \ AS="$(HOSTCC) -c" \ -f unix/Makefile generic endef define HOST_ZIP_INSTALL_CMDS - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ prefix=$(HOST_DIR)/usr endef From a7bb73d0fb9c30e84f973234c4bccacf4bea6b26 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:57 -0300 Subject: [PATCH 0933/3392] ncurses: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ncurses/ncurses.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 9555f1ed66..343909fe3f 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -169,8 +169,8 @@ endef # NCURSES_INSTALL_TARGET_CMDS # ourselves, and use that during installation. # define HOST_NCURSES_BUILD_CMDS - $(MAKE1) -C $(@D) sources - $(MAKE) -C $(@D)/progs tic + $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) sources + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/progs tic endef HOST_NCURSES_CONF_OPTS = \ From 017e9f3344affd522724338eb0e1339f5366fe74 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:58 -0300 Subject: [PATCH 0934/3392] lz4: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/lz4/lz4.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index f96e2795e2..9d7f56bbf6 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -18,11 +18,11 @@ LZ4_POST_PATCH_HOOKS += LZ4_DISABLE_SHARED endif define HOST_LZ4_BUILD_CMDS - $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) endef define HOST_LZ4_INSTALL_CMDS - $(MAKE) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr \ + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr \ install -C $(@D) endef From e290ae72024c3db1f1213012bcf8c25f25056be1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:05:59 -0300 Subject: [PATCH 0935/3392] openssl: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/openssl/openssl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index 5f6267c682..814c435054 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -102,7 +102,7 @@ OPENSSL_POST_CONFIGURE_HOOKS += OPENSSL_FIXUP_STATIC_MAKEFILE endif define HOST_OPENSSL_BUILD_CMDS - $(MAKE) -C $(@D) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) endef define OPENSSL_BUILD_CMDS @@ -114,7 +114,7 @@ define OPENSSL_INSTALL_STAGING_CMDS endef define HOST_OPENSSL_INSTALL_CMDS - $(MAKE) -C $(@D) install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install endef define OPENSSL_INSTALL_TARGET_CMDS From cee121d0f732e5c0235c1f259447ad502fcb9858 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:00 -0300 Subject: [PATCH 0936/3392] jimtcl: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/jimtcl/jimtcl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index fe35223b43..1c1a6b82a3 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -51,7 +51,7 @@ endef define JIMTCL_BUILD_CMDS SH_CFLAGS="-fPIC" \ SHOBJ_CFLAGS="-fPIC" \ - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define JIMTCL_INSTALL_STAGING_CMDS From 354554418bf4e9ec4d6f079deb854c5b9ee66995 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:01 -0300 Subject: [PATCH 0937/3392] mysql: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/mysql/mysql.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk index 7af47113e1..92bf45a590 100644 --- a/package/mysql/mysql.mk +++ b/package/mysql/mysql.mk @@ -47,13 +47,13 @@ HOST_MYSQL_CONF_OPTS = \ --disable-mysql-maintainer-mode define HOST_MYSQL_BUILD_CMDS - $(MAKE) -C $(@D)/include my_config.h - $(MAKE) -C $(@D)/mysys libmysys.a - $(MAKE) -C $(@D)/strings libmystrings.a - $(MAKE) -C $(@D)/vio libvio.a - $(MAKE) -C $(@D)/dbug libdbug.a - $(MAKE) -C $(@D)/regex libregex.a - $(MAKE) -C $(@D)/sql gen_lex_hash + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/include my_config.h + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/mysys libmysys.a + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/strings libmystrings.a + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/vio libvio.a + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/dbug libdbug.a + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/regex libregex.a + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sql gen_lex_hash endef define HOST_MYSQL_INSTALL_CMDS From e849c62bc624fb427d774da1441f21d33c37f991 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:02 -0300 Subject: [PATCH 0938/3392] dvb-apps: use $(TARGET_CONFIGURE_OPTS) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/dvb-apps/dvb-apps.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk index b5b8a1f09c..c52252c816 100644 --- a/package/dvb-apps/dvb-apps.mk +++ b/package/dvb-apps/dvb-apps.mk @@ -30,11 +30,13 @@ define DVB_APPS_BUILD_CMDS endef define DVB_APPS_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) $(DVB_APPS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(DVB_APPS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endef define DVB_APPS_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) $(DVB_APPS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(DVB_APPS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From 4d4c32bc9b4fd9efcd730038f94a103425c71a1a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:03 -0300 Subject: [PATCH 0939/3392] mrouted: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/mrouted/mrouted.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index 01b4a9f303..2969e36cdc 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -17,11 +17,11 @@ define MROUTED_CONFIGURE_CMDS endef define MROUTED_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define MROUTED_INSTALL_TARGET_CMDS - $(MAKE) prefix=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) prefix=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install endef $(eval $(generic-package)) From a3e496bcfb7a8370f4e59705aee32857b31ac4be Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:04 -0300 Subject: [PATCH 0940/3392] nanocom: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/nanocom/nanocom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nanocom/nanocom.mk b/package/nanocom/nanocom.mk index 293dd091fc..caab3680e4 100644 --- a/package/nanocom/nanocom.mk +++ b/package/nanocom/nanocom.mk @@ -12,7 +12,7 @@ NANOCOM_LICENSE = GPLv2+ NANOCOM_LICENSE_FILES = COPYING define NANOCOM_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" -C $(@D) endef define NANOCOM_INSTALL_TARGET_CMDS From d90b8ec383abdfc6587176b4eca79e801fa82a98 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:06 -0300 Subject: [PATCH 0941/3392] libpfm4: use $(MAKE) rather than make directly Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libpfm4/libpfm4.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpfm4/libpfm4.mk b/package/libpfm4/libpfm4.mk index 147be7c2b9..358fd9d637 100644 --- a/package/libpfm4/libpfm4.mk +++ b/package/libpfm4/libpfm4.mk @@ -21,11 +21,11 @@ define LIBPFM4_BUILD_CMDS endef define LIBPFM4_INSTALL_STAGING_CMDS - make -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(STAGING_DIR)/usr install + $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(STAGING_DIR)/usr install endef define LIBPFM4_INSTALL_TARGET_CMDS - make -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(TARGET_DIR)/usr install + $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(TARGET_DIR)/usr install endef $(eval $(generic-package)) From 78cefe7e60d13c88c565839d7264d8cc52d7b7a6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:07 -0300 Subject: [PATCH 0942/3392] libpfm4: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libpfm4/libpfm4.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpfm4/libpfm4.mk b/package/libpfm4/libpfm4.mk index 358fd9d637..913fc35831 100644 --- a/package/libpfm4/libpfm4.mk +++ b/package/libpfm4/libpfm4.mk @@ -17,15 +17,15 @@ LIBPFM4_FLAGS = SYS=Linux ARCH=$(BR2_ARCH) \ DBG= define LIBPFM4_BUILD_CMDS - $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) endef define LIBPFM4_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(STAGING_DIR)/usr install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(STAGING_DIR)/usr install endef define LIBPFM4_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(TARGET_DIR)/usr install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(TARGET_DIR)/usr install endef $(eval $(generic-package)) From c842b72e10602e31a14dbfbeb1f23fd6db5239ca Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:09 -0300 Subject: [PATCH 0943/3392] tekui: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/tekui/tekui.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tekui/tekui.mk b/package/tekui/tekui.mk index 60b48e07db..f9ae849033 100644 --- a/package/tekui/tekui.mk +++ b/package/tekui/tekui.mk @@ -56,11 +56,11 @@ endif endif define TEKUI_BUILD_CMDS - $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all endef define TEKUI_INSTALL_TARGET_CMDS - $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install endef $(eval $(generic-package)) From 25e808f06aae0fc546039040384955182923ae1b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:10 -0300 Subject: [PATCH 0944/3392] vim: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/vim/vim.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/vim/vim.mk b/package/vim/vim.mk index d55e905321..d4a1f82028 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -49,15 +49,15 @@ endif define VIM_INSTALL_TARGET_CMDS cd $(@D)/src; \ - $(MAKE) DESTDIR=$(TARGET_DIR) installvimbin; \ - $(MAKE) DESTDIR=$(TARGET_DIR) installtools; \ - $(MAKE) DESTDIR=$(TARGET_DIR) installlinks + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installvimbin; \ + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installtools; \ + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installlinks endef define VIM_INSTALL_RUNTIME_CMDS cd $(@D)/src; \ - $(MAKE) DESTDIR=$(TARGET_DIR) installrtbase; \ - $(MAKE) DESTDIR=$(TARGET_DIR) installmacros + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installrtbase; \ + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installmacros endef define VIM_REMOVE_DOCS From f1b52dad267ede052a8555bc0447c4af17ba8c53 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:11 -0300 Subject: [PATCH 0945/3392] tvheadend: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 516cbd32c9..af90a822d9 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -88,11 +88,11 @@ define TVHEADEND_CONFIGURE_CMDS endef define TVHEADEND_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define TVHEADEND_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install endef # Remove documentation and source files that are not needed because we From d21fc79a4d2e5d961d5c0fb1ab1bebe99acc3a21 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:12 -0300 Subject: [PATCH 0946/3392] snowball-hdmiservice: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/snowball-hdmiservice/snowball-hdmiservice.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/snowball-hdmiservice/snowball-hdmiservice.mk b/package/snowball-hdmiservice/snowball-hdmiservice.mk index 267b5ad9b8..4aa1a2749b 100644 --- a/package/snowball-hdmiservice/snowball-hdmiservice.mk +++ b/package/snowball-hdmiservice/snowball-hdmiservice.mk @@ -11,15 +11,15 @@ SNOWBALL_HDMISERVICE_LICENSE_FILES = debian/copyright SNOWBALL_HDMISERVICE_INSTALL_STAGING = YES define SNOWBALL_HDMISERVICE_BUILD_CMDS - $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" endef define SNOWBALL_HDMISERVICE_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" DESTDIR=$(STAGING_DIR) install endef define SNOWBALL_HDMISERVICE_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From 802711aaeab599fce98e0971ddbeb07178ef34e9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:13 -0300 Subject: [PATCH 0947/3392] input-event-daemon: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/input-event-daemon/input-event-daemon.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/input-event-daemon/input-event-daemon.mk b/package/input-event-daemon/input-event-daemon.mk index 0d23037ff6..e61c8cc4b5 100644 --- a/package/input-event-daemon/input-event-daemon.mk +++ b/package/input-event-daemon/input-event-daemon.mk @@ -11,7 +11,7 @@ INPUT_EVENT_DAEMON_LICENSE_FILES = README define INPUT_EVENT_DAEMON_BUILD_CMDS touch $(@D)/input-event-table.h - $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) endef From f734cc79554be0aad1e29168a1a610693a7b64ab Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:14 -0300 Subject: [PATCH 0948/3392] am335x-pru-package: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/am335x-pru-package/am335x-pru-package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/am335x-pru-package/am335x-pru-package.mk b/package/am335x-pru-package/am335x-pru-package.mk index a97e8a49ea..d6bffb4f51 100644 --- a/package/am335x-pru-package/am335x-pru-package.mk +++ b/package/am335x-pru-package/am335x-pru-package.mk @@ -19,19 +19,19 @@ AM335X_MAKE_TARGET = release $(if $(BR2_STATIC_LIBS),,sorelease) endif define AM335X_PRU_PACKAGE_BUILD_CMDS - $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \ -C $(@D)/pru_sw/app_loader/interface $(AM335X_MAKE_TARGET) endef # 'install' installs whatever was built, and our patch removes the dependency # on the release build, so we can use it to install whatever we built above. define AM335X_PRU_PACKAGE_INSTALL_STAGING_CMDS - $(MAKE1) DESTDIR="$(STAGING_DIR)" PREFIX="/usr" \ + $(TARGET_MAKE_ENV) $(MAKE1) DESTDIR="$(STAGING_DIR)" PREFIX="/usr" \ -C $(@D)/pru_sw/app_loader/interface install endef define AM335X_PRU_PACKAGE_INSTALL_TARGET_CMDS - $(MAKE1) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" \ + $(TARGET_MAKE_ENV) $(MAKE1) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" \ -C $(@D)/pru_sw/app_loader/interface install endef From 3282f2eb2f85050bd83b04f9742128dd9c0363a4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:15 -0300 Subject: [PATCH 0949/3392] proxychains-ng: use $(TARGET_CONFIGURE_OPTS) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/proxychains-ng/proxychains-ng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index ca2664ef8c..54e7dcd631 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -20,7 +20,7 @@ define PROXYCHAINS_NG_BUILD_CMDS endef define PROXYCHAINS_NG_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install install-config + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install install-config endef $(eval $(generic-package)) From 9e71dd6ec76b62bb1938cd68edbcd5540c59b23b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:16 -0300 Subject: [PATCH 0950/3392] ux500-firmware: use $(TARGET_MAKE_ENV) when calling $(MAKE) And remove whitespace. Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ux500-firmware/ux500-firmware.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ux500-firmware/ux500-firmware.mk b/package/ux500-firmware/ux500-firmware.mk index 7e947f35af..428ed34277 100644 --- a/package/ux500-firmware/ux500-firmware.mk +++ b/package/ux500-firmware/ux500-firmware.mk @@ -8,13 +8,13 @@ UX500_FIRMWARE_VERSION = 1.1.3-6 UX500_FIRMWARE_SOURCE = ux500-firmware_$(UX500_FIRMWARE_VERSION)linaro1.tar.gz UX500_FIRMWARE_SITE = https://launchpad.net/~igloocommunity-maintainers/+archive/snowball/+files UX500_FIRMWARE_LICENSE = Snowball click-wrap license -UX500_FIRMWARE_LICENSE_FILES = license.txt +UX500_FIRMWARE_LICENSE_FILES = license.txt UX500_FIRMWARE_REDISTRIBUTE = NO # The CG2900 linux driver has to load firmware named CG29XX_* but the firmware # filenames contained in this package are CG2900_* hence the code below define UX500_FIRMWARE_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install for f in $(TARGET_DIR)/lib/firmware/CG2900* ; do \ mv $$f $${f/CG2900/CG29XX}; \ done From fccd0599cd8c3daf7958f918b8ee721362a659a2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:17 -0300 Subject: [PATCH 0951/3392] lua: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/lua/lua.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index be3328434b..a7c2ef7293 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -66,7 +66,7 @@ HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX HOST_LUA_MYLIBS = -ldl define LUA_BUILD_CMDS - $(MAKE) \ + $(TARGET_MAKE_ENV) $(MAKE) \ CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \ CFLAGS="$(TARGET_CFLAGS) $(LUA_CFLAGS)" \ MYLIBS="$(LUA_MYLIBS)" AR="$(TARGET_CROSS)ar rcu" \ @@ -84,13 +84,13 @@ define HOST_LUA_BUILD_CMDS endef define LUA_INSTALL_STAGING_CMDS - $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc endef define LUA_INSTALL_TARGET_CMDS - $(MAKE) INSTALL_TOP="$(TARGET_DIR)/usr" -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(TARGET_DIR)/usr" -C $(@D) install endef define HOST_LUA_INSTALL_CMDS From 7089eba70a47f602c9ec70ad68447367c05180d7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:18 -0300 Subject: [PATCH 0952/3392] lua: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/lua/lua.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index a7c2ef7293..131b88d042 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -75,7 +75,7 @@ define LUA_BUILD_CMDS endef define HOST_LUA_BUILD_CMDS - $(MAKE) \ + $(HOST_MAKE_ENV) $(MAKE) \ CFLAGS="$(HOST_LUA_CFLAGS)" \ MYLDFLAGS="$(HOST_LDFLAGS)" \ MYLIBS="$(HOST_LUA_MYLIBS)" \ @@ -94,7 +94,7 @@ define LUA_INSTALL_TARGET_CMDS endef define HOST_LUA_INSTALL_CMDS - $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install + $(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ $(HOST_DIR)/usr/lib/pkgconfig/lua.pc endef From beb1c8cb5e7b5c2fcb7263d108d30f6eeaf30eb7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:19 -0300 Subject: [PATCH 0953/3392] tidsp-binaries: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/tidsp-binaries/tidsp-binaries.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tidsp-binaries/tidsp-binaries.mk b/package/tidsp-binaries/tidsp-binaries.mk index bc542cdf11..9736bc7231 100644 --- a/package/tidsp-binaries/tidsp-binaries.mk +++ b/package/tidsp-binaries/tidsp-binaries.mk @@ -10,7 +10,7 @@ TIDSP_BINARIES_LICENSE = TI Proprietary License TIDSP_BINARIES_LICENSE_FILES = LICENSE define TIDSP_BINARIES_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From f716a41bdaf28be42deb2faad005882d2c84d7d6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:20 -0300 Subject: [PATCH 0954/3392] lrzsz: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/lrzsz/lrzsz.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 453ef6250d..a283dd1a30 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -16,7 +16,7 @@ define LRZSZ_POST_CONFIGURE_HOOKS endef define LRZSZ_BUILD_HOOKS - $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(@D) endef define LRZSZ_INSTALL_TARGET_CMDS From a0261d3368f009c5c2a076e0a205c67d86460b39 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:21 -0300 Subject: [PATCH 0955/3392] ca-certificates: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ca-certificates/ca-certificates.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 393c8cdd83..f26be64264 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -22,7 +22,7 @@ endef define CA_CERTIFICATES_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/ca-certificates $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs - $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates # Remove any existing certificates under /etc/ssl/certs From 8fec991c78270ac3fe00e11ad1203ffc26e1f9cb Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:22 -0300 Subject: [PATCH 0956/3392] softether: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/softether/softether.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/softether/softether.mk b/package/softether/softether.mk index 9f987744f3..da7d129723 100644 --- a/package/softether/softether.mk +++ b/package/softether/softether.mk @@ -34,9 +34,9 @@ HOST_SOFTETHER_DEPENDENCIES = host-pkgconf host-openssl host-readline # target build creates the file hamcore.se2 which needs the host variant of # hamcorebuilder, for details see http://www.vpnusers.com/viewtopic.php?p=5426 define HOST_SOFTETHER_BUILD_CMDS - $(MAKE) -C $(@D)/src/Mayaqua - $(MAKE) -C $(@D)/src/Cedar - $(MAKE) -C $(@D)/src/hamcorebuilder + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/src/Mayaqua + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/src/Cedar + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/src/hamcorebuilder endef define HOST_SOFTETHER_INSTALL_CMDS From 330dd92423c49692b21dbe90dabba34866fd6913 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:23 -0300 Subject: [PATCH 0957/3392] 4th: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/4th/4th.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/4th/4th.mk b/package/4th/4th.mk index 071c2d4df2..7828592815 100644 --- a/package/4th/4th.mk +++ b/package/4th/4th.mk @@ -17,9 +17,9 @@ 4TH_CFLAGS = $(TARGET_CFLAGS) -DUNIX -fsigned-char ifeq ($(BR2_STATIC_LIBS),y) -4TH_MAKE_ENV = STATIC=1 +4TH_MAKE_ENV = $(TARGET_MAKE_ENV) STATIC=1 else -4TH_MAKE_ENV = SHARED=1 +4TH_MAKE_ENV = $(TARGET_MAKE_ENV) SHARED=1 4TH_CFLAGS += -fPIC endif From 2742bd3388e1e9d09a7d9c3408919e9e008fe027 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:24 -0300 Subject: [PATCH 0958/3392] 4th: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/4th/4th.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/4th/4th.mk b/package/4th/4th.mk index 7828592815..0d82614f36 100644 --- a/package/4th/4th.mk +++ b/package/4th/4th.mk @@ -54,14 +54,14 @@ define 4TH_INSTALL_TARGET_CMDS endef define HOST_4TH_BUILD_CMDS - $(MAKE) -C $(@D)/sources all \ + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources all \ CFLAGS="$(HOST_CFLAGS) -DUNIX -fsigned-char" endef define HOST_4TH_INSTALL_CMDS mkdir -p $(HOST_DIR)/usr/bin mkdir -p $(HOST_DIR)/usr/lib - $(MAKE) -C $(@D)/sources mostlyinstall \ + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources mostlyinstall \ BINARIES=$(HOST_DIR)/usr/bin \ LIBRARIES=$(HOST_DIR)/usr/lib endef From 9fc51ef91bb4d5bc9d28c792ad7e07b21b51ab92 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:25 -0300 Subject: [PATCH 0959/3392] latencytop: use $(TARGET_CONFIGURE_OPTS) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/latencytop/latencytop.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/latencytop/latencytop.mk b/package/latencytop/latencytop.mk index 935b2a3c04..644a84f162 100644 --- a/package/latencytop/latencytop.mk +++ b/package/latencytop/latencytop.mk @@ -17,7 +17,7 @@ define LATENCYTOP_BUILD_CMDS endef define LATENCYTOP_INSTALL_TARGET_CMDS - $(MAKE) install -C $(@D) DESTDIR=$(TARGET_DIR) HAS_GTK_GUI= + $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) DESTDIR=$(TARGET_DIR) HAS_GTK_GUI= endef $(eval $(generic-package)) From 9702249d98a88bc22f11a361206fe279149e8cd1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:26 -0300 Subject: [PATCH 0960/3392] libsemanage: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libsemanage/libsemanage.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index beb34ba3c0..9effea052f 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -16,15 +16,15 @@ LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) define LIBSEMANAGE_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. - $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all endef define LIBSEMANAGE_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endef define LIBSEMANAGE_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install endef HOST_LIBSEMANAGE_DEPENDENCIES = host-bison host-audit host-libsepol host-libselinux \ From 0547150d9131bda611c9362ca555f32cd2dbb526 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:27 -0300 Subject: [PATCH 0961/3392] libsemanage: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libsemanage/libsemanage.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index 9effea052f..005b8222df 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -49,13 +49,13 @@ endif define HOST_LIBSEMANAGE_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) all - $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) all + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap endef define HOST_LIBSEMANAGE_INSTALL_CMDS - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) install - $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap endef $(eval $(generic-package)) From bf263619284f1b10d2c3211e9a4ed20c6ff85c0c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:28 -0300 Subject: [PATCH 0962/3392] memstat: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/memstat/memstat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/memstat/memstat.mk b/package/memstat/memstat.mk index 7ee4d6081d..e11b4ae643 100644 --- a/package/memstat/memstat.mk +++ b/package/memstat/memstat.mk @@ -11,7 +11,7 @@ MEMSTAT_LICENSE = GPL MEMSTAT_LICENSE_FILES = debian/copyright define MEMSTAT_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" CFLAGS="$(TARGET_CFLAGS)" \ -C $(@D) memstat endef From 16fa28058b73b92bc33164e81fcc5ee52a0ea7da Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:29 -0300 Subject: [PATCH 0963/3392] am33x-cm3: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/am33x-cm3/am33x-cm3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/am33x-cm3/am33x-cm3.mk b/package/am33x-cm3/am33x-cm3.mk index 01cb9a02ca..629a83238c 100644 --- a/package/am33x-cm3/am33x-cm3.mk +++ b/package/am33x-cm3/am33x-cm3.mk @@ -14,7 +14,7 @@ AM33X_CM3_LICENSE_FILES = License.txt # The build command below will use the standard cross-compiler (normally # build for Cortex-A8, to build the FW for the Cortex-M3. define AM33X_CM3_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all endef # Not all of the firmware files are used From 966358d2992393935f318ca325b6fd2299731448 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:30 -0300 Subject: [PATCH 0964/3392] fio: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/fio/fio.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fio/fio.mk b/package/fio/fio.mk index 32706292a3..5c02bc92ee 100644 --- a/package/fio/fio.mk +++ b/package/fio/fio.mk @@ -22,11 +22,11 @@ FIO_DEPENDENCIES += zlib endif define FIO_CONFIGURE_CMDS - (cd $(@D); ./configure --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)") + (cd $(@D); $(TARGET_MAKE_ENV) ./configure --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)") endef define FIO_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define FIO_INSTALL_TARGET_CMDS From 30b69cc2526d35e477931de6aee97700918b60f5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:31 -0300 Subject: [PATCH 0965/3392] lm-sensors: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/lm-sensors/lm-sensors.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index d2080d88f0..314d107dc3 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -38,16 +38,16 @@ LM_SENSORS_MAKE_OPTS += BUILD_STATIC_LIB=1 endif define LM_SENSORS_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPTS) -C $(@D) endef define LM_SENSORS_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install rm -f $(addprefix $(STAGING_DIR)/usr/,$(LM_SENSORS_BINS_) $(LM_SENSORS_BINS_y)) endef define LM_SENSORS_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install rm -f $(addprefix $(TARGET_DIR)/usr/,$(LM_SENSORS_BINS_)) endef From 91e469a31c8ef7000cfb8b6ccfeb3838d2239252 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:32 -0300 Subject: [PATCH 0966/3392] shapelib: use $(TARGET_CONFIGURE_OPTS) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/shapelib/shapelib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/shapelib/shapelib.mk b/package/shapelib/shapelib.mk index 1e9c16f336..2e8fe6d7b2 100644 --- a/package/shapelib/shapelib.mk +++ b/package/shapelib/shapelib.mk @@ -15,11 +15,11 @@ define SHAPELIB_BUILD_CMDS endef define SHAPELIB_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) PREFIX=$(STAGING_DIR)/usr/ lib_install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(STAGING_DIR)/usr/ lib_install endef define SHAPELIB_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR)/usr/ bin_install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR)/usr/ bin_install endef $(eval $(generic-package)) From 636faaa0c1aafbd4fe906280848a04c08c55fc0f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:33 -0300 Subject: [PATCH 0967/3392] rt-tests: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/rt-tests/rt-tests.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index 19f1021a8a..addc15e6fd 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -15,14 +15,14 @@ RT_TESTS_DEPENDENCIES = python endif define RT_TESTS_BUILD_CMDS - $(MAKE) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ CC="$(TARGET_CC)" \ CFLAGS="$(TARGET_CFLAGS)" \ prefix=/usr endef define RT_TESTS_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ DESTDIR="$(TARGET_DIR)" \ prefix=/usr \ $(if $(BR2_PACKAGE_PYTHON),PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/,PYLIB="") \ From 16473dde4c4e2f174a4c8f95bbdf0c935366a754 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:34 -0300 Subject: [PATCH 0968/3392] dmalloc: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/dmalloc/dmalloc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index ffa9a3979e..6ebb44c5c0 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -48,7 +48,7 @@ DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH # both DESTDIR and PREFIX are ignored.. define DMALLOC_INSTALL_STAGING_CMDS - $(MAKE) includedir="$(STAGING_DIR)/usr/include" \ + $(TARGET_MAKE_ENV) $(MAKE) includedir="$(STAGING_DIR)/usr/include" \ bindir="$(STAGING_DIR)/usr/bin" \ libdir="$(STAGING_DIR)/usr/lib" \ shlibdir="$(STAGING_DIR)/usr/lib" \ From 61a237e98fdfa2a51eeddf03e5f38212b76d0655 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:35 -0300 Subject: [PATCH 0969/3392] checkpolicy: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/checkpolicy/checkpolicy.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index f1b76d0a20..a21b39e766 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -17,11 +17,11 @@ HOST_CHECKPOLICY_MAKE_OPTS = $(HOST_CONFIGURE_OPTS) \ # DESTDIR is used at build time to find host-libselinux define HOST_CHECKPOLICY_BUILD_CMDS - $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(HOST_DIR) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(HOST_DIR) endef define HOST_CHECKPOLICY_INSTALL_CMDS - $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(HOST_DIR) install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(HOST_DIR) install endef $(eval $(host-generic-package)) From a819d69f5981ab83490629e8947ad333a374aa4f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:38 -0300 Subject: [PATCH 0970/3392] rs485conf: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/rs485conf/rs485conf.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rs485conf/rs485conf.mk b/package/rs485conf/rs485conf.mk index 7fda39cc44..8749268fd5 100644 --- a/package/rs485conf/rs485conf.mk +++ b/package/rs485conf/rs485conf.mk @@ -10,11 +10,11 @@ RS485CONF_LICENSE = BSD-3c RS485CONF_LICENSE_FILES = LICENSE define RS485CONF_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define RS485CONF_INSTALL_TARGET_CMDS - $(MAKE) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install endef $(eval $(generic-package)) From 15c229ea4232e052063a65f9f57153ba1ba0579b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:39 -0300 Subject: [PATCH 0971/3392] netplug: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/netplug/netplug.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk index aeebcad2ee..a165192f8b 100644 --- a/package/netplug/netplug.mk +++ b/package/netplug/netplug.mk @@ -11,11 +11,11 @@ NETPLUG_LICENSE = GPLv2 NETPLUG_LICENSE_FILES = COPYING define NETPLUG_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define NETPLUG_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install endef define NETPLUG_INSTALL_INIT_SYSV From 4e1c87bdb1037a9918bb3d521ca7b5c47ee3eeec Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:40 -0300 Subject: [PATCH 0972/3392] axel: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/axel/axel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/axel/axel.mk b/package/axel/axel.mk index 25357a379b..6cf0fa8d75 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -31,12 +31,12 @@ define AXEL_CONFIGURE_CMDS endef define AXEL_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ LFLAGS="$(TARGET_LDFLAGS) $(AXEL_LDFLAGS)" -C $(@D) endef define AXEL_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install endef $(eval $(generic-package)) From ae8f0a375fc72e43b8797729ca23a3ab1b471a09 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:41 -0300 Subject: [PATCH 0973/3392] libtomcrypt: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libtomcrypt/libtomcrypt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libtomcrypt/libtomcrypt.mk b/package/libtomcrypt/libtomcrypt.mk index 53dbfd504b..8cc02b28d3 100644 --- a/package/libtomcrypt/libtomcrypt.mk +++ b/package/libtomcrypt/libtomcrypt.mk @@ -17,11 +17,11 @@ LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE -DLTM_DESC \ $(if $(BR2_USE_WCHAR),,-DLTC_NO_WCHAR) define LIBTOMCRYPT_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(LIBTOMCRYPT_CFLAGS)" + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(LIBTOMCRYPT_CFLAGS)" endef define LIBTOMCRYPT_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" NODOCS=1 INSTALL_USER=$(shell id -u) INSTALL_GROUP=$(shell id -g) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" NODOCS=1 INSTALL_USER=$(shell id -u) INSTALL_GROUP=$(shell id -g) install endef $(eval $(generic-package)) From cc5e9fe4bb0322f7e26fa369cd23923f32c1eeb4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:42 -0300 Subject: [PATCH 0974/3392] xtables-addons: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/xtables-addons/xtables-addons.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index 7fc7312a22..54d15173f5 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -23,11 +23,11 @@ endef XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_DISABLE_GEOIP_HELPERS define XTABLES_ADDONS_BUILD_CMDS - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) endef define XTABLES_ADDONS_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install endef $(eval $(autotools-package)) From 99f1e508f07b3d8a1869fb5a87e4cd71d6747ca0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:43 -0300 Subject: [PATCH 0975/3392] binutils: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/binutils/binutils.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 966cc793f7..ca481d25b1 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -108,16 +108,16 @@ endef # We just want libbfd, libiberty and libopcodes, # not the full-blown binutils in staging define BINUTILS_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install - $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install - $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef # If we don't want full binutils on target ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) define BINUTILS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install - $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install endef endif From 8c4daa55fe21857ca09842c23a6050b3310a85e9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:44 -0300 Subject: [PATCH 0976/3392] directfb: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/directfb/directfb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index d51094f850..595d5906c1 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -161,7 +161,7 @@ HOST_DIRECTFB_CONF_OPTS = \ --with-inputdrivers=none HOST_DIRECTFB_BUILD_CMDS = \ - $(MAKE) -C $(@D)/tools directfb-csource + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools directfb-csource HOST_DIRECTFB_INSTALL_CMDS = \ $(INSTALL) -m 0755 $(@D)/tools/directfb-csource $(HOST_DIR)/usr/bin From 047547d3a6c6e9c9afa68f1d6f4a2455eb9c5388 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:45 -0300 Subject: [PATCH 0977/3392] p7zip: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/p7zip/p7zip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/p7zip/p7zip.mk b/package/p7zip/p7zip.mk index 4bac859ea6..15d5138149 100644 --- a/package/p7zip/p7zip.mk +++ b/package/p7zip/p7zip.mk @@ -14,7 +14,7 @@ P7ZIP_LICENSE_FILES = DOC/License.txt # CXXFLAGS, so we can't pass them. Instead, it accepts ALLFLAGS_C # and ALLFLAGS_CPP as variables to pass the CFLAGS and CXXFLAGS. define P7ZIP_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" ALLFLAGS_C="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" ALLFLAGS_C="$(TARGET_CFLAGS)" \ CXX="$(TARGET_CXX)" ALLFLAGS_CPP="$(TARGET_CXXFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ -C $(@D) 7zr From aa9ee8138f0c2c77edef100fbb8370ea7683dc5b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:46 -0300 Subject: [PATCH 0978/3392] lshw: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/lshw/lshw.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk index 9227584b15..32c0bc0d69 100644 --- a/package/lshw/lshw.mk +++ b/package/lshw/lshw.mk @@ -16,7 +16,9 @@ endif LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \ RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all -LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" +LSHW_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) define LSHW_BUILD_CMDS From 2f3bbbc5b114ad082b06e8d01d6c72782b503a4b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:47 -0300 Subject: [PATCH 0979/3392] ti-gfx: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ti-gfx/ti-gfx.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ti-gfx/ti-gfx.mk b/package/ti-gfx/ti-gfx.mk index 47eb474c00..428878a08b 100644 --- a/package/ti-gfx/ti-gfx.mk +++ b/package/ti-gfx/ti-gfx.mk @@ -101,7 +101,7 @@ define TI_GFX_EXTRACT_CMDS endef define TI_GFX_BUILD_KM_CMDS - $(MAKE) $(TI_GFX_KM_MAKE_OPTS) -C $(@D)/GFX_Linux_KM all + $(TARGET_MAKE_ENV) $(MAKE) $(TI_GFX_KM_MAKE_OPTS) -C $(@D)/GFX_Linux_KM all endef ifeq ($(BR2_PACKAGE_TI_GFX_DEMOS),y) @@ -156,7 +156,7 @@ define TI_GFX_INSTALL_STAGING_CMDS endef define TI_GFX_INSTALL_KM_CMDS - $(MAKE) $(TI_GFX_KM_MAKE_OPTS) -C $(@D)/GFX_Linux_KM install + $(TARGET_MAKE_ENV) $(MAKE) $(TI_GFX_KM_MAKE_OPTS) -C $(@D)/GFX_Linux_KM install endef define TI_GFX_INSTALL_BINS_CMDS From 856459aca6dad68eecd7d6557a8ecb5f57161f68 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:48 -0300 Subject: [PATCH 0980/3392] memtester: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/memtester/memtester.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk index d12babca30..802c1e4902 100644 --- a/package/memtester/memtester.mk +++ b/package/memtester/memtester.mk @@ -13,11 +13,11 @@ MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr define MEMTESTER_BUILD_CMDS $(SED) "s,^cc,$(TARGET_CC)," $(@D)/conf-* - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define MEMTESTER_INSTALL_TARGET_CMDS - $(MAKE) $(MEMTESTER_TARGET_INSTALL_OPTS) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) $(MEMTESTER_TARGET_INSTALL_OPTS) -C $(@D) install endef $(eval $(generic-package)) From 8ab3e0fcec83d53924888fb7d95832c28450b2d8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:51 -0300 Subject: [PATCH 0981/3392] linux-backports: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/linux-backports/linux-backports.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk index 58cd50f2c4..6f599a8a85 100644 --- a/package/linux-backports/linux-backports.mk +++ b/package/linux-backports/linux-backports.mk @@ -46,7 +46,7 @@ LINUX_BACKPORTS_MODULE_MAKE_OPTS = $(LINUX_BACKPORTS_MAKE_OPTS) # generated by running silentoldconfig, but that's not the case for # linux-backports: it uses a hand-crafted rule to generate that file. define LINUX_BACKPORTS_KCONFIG_FIXUP_CMDS - $(MAKE) -C $(@D) $(LINUX_BACKPORTS_MAKE_OPTS) backport-include/backport/autoconf.h + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_BACKPORTS_MAKE_OPTS) backport-include/backport/autoconf.h endef # Checks to give errors that the user can understand From 50dfeb8e5a54dc3b1c983b5a335c0eb5946d8707 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:52 -0300 Subject: [PATCH 0982/3392] keyutils: use $(TARGET_CONFIGURE_OPTS) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/keyutils/keyutils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk index 7a30ba644d..4a8dbace04 100644 --- a/package/keyutils/keyutils.mk +++ b/package/keyutils/keyutils.mk @@ -28,11 +28,11 @@ define KEYUTILS_BUILD_CMDS endef define KEYUTILS_INSTALL_STAGING_CMDS - $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_CONFIGURE_OPTS) $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define KEYUTILS_INSTALL_TARGET_CMDS - $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_CONFIGURE_OPTS) $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From d059e8cca6f784e7eae49a897ed96afde3aaec82 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:53 -0300 Subject: [PATCH 0983/3392] libsepol: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libsepol/libsepol.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 3b02175f79..650e36d2ac 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -22,15 +22,15 @@ endif define LIBSEPOL_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. - $(MAKE) -C $(@D) $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR) endef define LIBSEPOL_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR) endef define LIBSEPOL_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(TARGET_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(TARGET_DIR) endef define HOST_LIBSEPOL_BUILD_CMDS From e4d0c3f96af6f59bf9a02df7dd1378a8979f13dd Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:54 -0300 Subject: [PATCH 0984/3392] libsepol: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libsepol/libsepol.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 650e36d2ac..bf85eef37d 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -34,11 +34,11 @@ define LIBSEPOL_INSTALL_TARGET_CMDS endef define HOST_LIBSEPOL_BUILD_CMDS - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) endef define HOST_LIBSEPOL_INSTALL_CMDS - $(MAKE) -C $(@D) install $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) mv $(HOST_DIR)/lib/libsepol.so.1 $(HOST_DIR)/usr/lib (cd $(HOST_DIR)/usr/lib; rm -f libsepol.so; ln -s libsepol.so.1 libsepol.so) -rmdir $(HOST_DIR)/lib From 1b787528b66a0a22be3ca8490fa8a5e71634f087 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:55 -0300 Subject: [PATCH 0985/3392] luajit: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/luajit/luajit.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 81a26603cb..24909fb8c2 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -36,7 +36,7 @@ endif # We unfortunately can't use TARGET_CONFIGURE_OPTS, because the luajit # build system uses non conventional variable names. define LUAJIT_BUILD_CMDS - $(MAKE) PREFIX="/usr" \ + $(TARGET_MAKE_ENV) $(MAKE) PREFIX="/usr" \ STATIC_CC="$(TARGET_CC)" \ DYNAMIC_CC="$(TARGET_CC) -fPIC" \ TARGET_LD="$(TARGET_CC)" \ @@ -52,11 +52,11 @@ define LUAJIT_BUILD_CMDS endef define LUAJIT_INSTALL_STAGING_CMDS - $(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" LDCONFIG=true -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" LDCONFIG=true -C $(@D) install endef define LUAJIT_INSTALL_TARGET_CMDS - $(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" LDCONFIG=true -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" LDCONFIG=true -C $(@D) install endef define LUAJIT_INSTALL_SYMLINK From bfe64eab73ed4b1ca3379f1fedc6054431ed7eea Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:56 -0300 Subject: [PATCH 0986/3392] luajit: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/luajit/luajit.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 24909fb8c2..d3ef3b7599 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -66,13 +66,13 @@ LUAJIT_POST_INSTALL_TARGET_HOOKS += LUAJIT_INSTALL_SYMLINK # host-efl package needs host-luajit to be linked dynamically. define HOST_LUAJIT_BUILD_CMDS - $(MAKE) PREFIX="$(HOST_DIR)/usr" BUILDMODE=dynamic \ + $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" BUILDMODE=dynamic \ TARGET_LDFLAGS="$(HOST_LDFLAGS)" \ -C $(@D) amalg endef define HOST_LUAJIT_INSTALL_CMDS - $(MAKE) PREFIX="$(HOST_DIR)/usr" LDCONFIG=true -C $(@D) install + $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" LDCONFIG=true -C $(@D) install endef $(eval $(generic-package)) From b9894b11792212944cb4f478c6fa3a3644329ab2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:57 -0300 Subject: [PATCH 0987/3392] collectd: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index b9422f3a9c..4846ee4cb2 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -180,7 +180,7 @@ endef COLLECTD_POST_PATCH_HOOKS += COLLECTD_DROP_WERROR define COLLECTD_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install rm -f $(TARGET_DIR)/usr/bin/collectd-nagios rm -f $(TARGET_DIR)/usr/share/collectd/postgresql_default.conf endef From 943f0219cc8981486403127ba0d22707579f0e5e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:58 -0300 Subject: [PATCH 0988/3392] dstat: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/dstat/dstat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dstat/dstat.mk b/package/dstat/dstat.mk index f02e908123..180031f20a 100644 --- a/package/dstat/dstat.mk +++ b/package/dstat/dstat.mk @@ -11,7 +11,7 @@ DSTAT_LICENSE = GPLv2 DSTAT_LICENSE_FILES = COPYING define DSTAT_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From 781808d6d79dd72b83f12c7d84f78140915a7188 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:59 -0300 Subject: [PATCH 0989/3392] mii-diag: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/mii-diag/mii-diag.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk index ae8defd9df..6efd5be80d 100644 --- a/package/mii-diag/mii-diag.mk +++ b/package/mii-diag/mii-diag.mk @@ -22,11 +22,11 @@ endef MII_DIAG_POST_PATCH_HOOKS = MII_DIAG_DEBIAN_PATCHES define MII_DIAG_BUILD_CMDS - $(MAKE) $(MII_DIAG_MAKE_OPTS) -C $(@D) mii-diag + $(TARGET_MAKE_ENV) $(MAKE) $(MII_DIAG_MAKE_OPTS) -C $(@D) mii-diag endef define MII_DIAG_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install-mii-diag + $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install-mii-diag endef $(eval $(generic-package)) From 5b5ddccfc69c188bc71d4f60054d65eb7ee2f0b1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:00 -0300 Subject: [PATCH 0990/3392] ti-sgx-um: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ti-sgx-um/ti-sgx-um.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ti-sgx-um/ti-sgx-um.mk b/package/ti-sgx-um/ti-sgx-um.mk index d9ff2dfe3c..d5c50a0166 100644 --- a/package/ti-sgx-um/ti-sgx-um.mk +++ b/package/ti-sgx-um/ti-sgx-um.mk @@ -15,11 +15,11 @@ TI_SGX_UM_INSTALL_STAGING = YES TI_SGX_UM_DEPENDENCIES = libdrm define TI_SGX_UM_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DISCIMAGE=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(STAGING_DIR) install endef define TI_SGX_UM_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DISCIMAGE=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DISCIMAGE=$(TARGET_DIR) install endef # libs use the following file for configuration From 6fa39e2162b95a1ed8037af3e1f6bebc381429ea Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:04 -0300 Subject: [PATCH 0991/3392] dtc: use $(HOST_CONFIGURE_OPTS) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/dtc/dtc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk index 9dbca0a46b..0a486441a3 100644 --- a/package/dtc/dtc.mk +++ b/package/dtc/dtc.mk @@ -51,7 +51,7 @@ define HOST_DTC_BUILD_CMDS endef define HOST_DTC_INSTALL_CMDS - $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install-bin + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install-bin endef $(eval $(generic-package)) From bddb0b1c449c45a07b20fe7e7bb91a03dd736e1f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:05 -0300 Subject: [PATCH 0992/3392] omap-u-boot-utils: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/omap-u-boot-utils/omap-u-boot-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk index 7cfed65088..b8a342bfbd 100644 --- a/package/omap-u-boot-utils/omap-u-boot-utils.mk +++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk @@ -10,7 +10,7 @@ OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+ OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS - $(MAKE) -C $(@D) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) endef define HOST_OMAP_U_BOOT_UTILS_INSTALL_CMDS From b9b1e6edc3aec38fd3171464fbabc31f1bca5255 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:06 -0300 Subject: [PATCH 0993/3392] iodine: use $(TARGET_CONFIGURE_OPTS) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/iodine/iodine.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/iodine/iodine.mk b/package/iodine/iodine.mk index 9de54e041e..711d709c1d 100644 --- a/package/iodine/iodine.mk +++ b/package/iodine/iodine.mk @@ -26,7 +26,7 @@ define IODINE_BUILD_CMDS endef define IODINE_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) install DESTDIR="$(TARGET_DIR)" prefix=/usr + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install DESTDIR="$(TARGET_DIR)" prefix=/usr endef $(eval $(generic-package)) From 049384f36d59cf671358fe25ee9b86b309d0f1bc Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:07 -0300 Subject: [PATCH 0994/3392] bitstream: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/bitstream/bitstream.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bitstream/bitstream.mk b/package/bitstream/bitstream.mk index a76c3c44b5..9c8c6f5ca2 100644 --- a/package/bitstream/bitstream.mk +++ b/package/bitstream/bitstream.mk @@ -15,7 +15,7 @@ BITSTREAM_INSTALL_STAGING = YES BITSTREAM_INSTALL_TARGET = NO define BITSTREAM_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr install endef $(eval $(generic-package)) From 825802b412ecbcd8471c5d2688f62f0e77add5ee Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:08 -0300 Subject: [PATCH 0995/3392] vsftpd: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/vsftpd/vsftpd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index db969f4352..fd92346064 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -39,7 +39,7 @@ VSFTPD_LIBS += -lpam endif define VSFTPD_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(@D) endef From 1d2103d6e87f59cb9b48a7e7a8af895b2a5a3350 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:09 -0300 Subject: [PATCH 0996/3392] liblockfile: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/liblockfile/liblockfile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index 8de598f19b..e42b83066c 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -18,7 +18,7 @@ LIBLOCKFILE_CONF_OPTS = --mandir=/usr/share/man define LIBLOCKFILE_INSTALL_STAGING_CMDS mkdir -p $(addprefix $(STAGING_DIR)/usr/share/man/man,1 3) rm -f $(STAGING_DIR)/usr/lib/liblockfile.so - $(MAKE) -C $(LIBLOCKFILE_DIR) ROOT=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(LIBLOCKFILE_DIR) ROOT=$(STAGING_DIR) install ln -sf liblockfile.so $(STAGING_DIR)/usr/lib/liblockfile.so.1 endef From 6614054ff6d6450ec5cefff763d5bfc8e6969390 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:11 -0300 Subject: [PATCH 0997/3392] qwt: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/qwt/qwt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index da30dd24a2..d1bb5245b1 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -54,13 +54,13 @@ endef # that when building with qmake, -L$(STAGING_DIR)/usr/lib is used and # not -L/usr/lib. define QWT_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR) $(SED) "s%QWT_INSTALL_PREFIX = .*%QWT_INSTALL_PREFIX = $(STAGING_DIR)/usr%" \ $(STAGING_DIR)/usr/mkspecs/features/qwtconfig.pri endef define QWT_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR) rm -Rf $(TARGET_DIR)/usr/mkspecs endef From acd088c23d94c91930599452284376731903ff8c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:12 -0300 Subject: [PATCH 0998/3392] sepolgen: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/sepolgen/sepolgen.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sepolgen/sepolgen.mk b/package/sepolgen/sepolgen.mk index 7c958662c4..efecee7567 100644 --- a/package/sepolgen/sepolgen.mk +++ b/package/sepolgen/sepolgen.mk @@ -20,11 +20,11 @@ HOST_SEPOLGEN_MAKE_CMDS = $(HOST_CONFIGURE_OPTS) \ endif define HOST_SEPOLGEN_BUILD_CMDS - $(MAKE) -C $(@D) $(HOST_SEPOLGEN_MAKE_CMDS) DESTDIR=$(HOST_DIR) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_SEPOLGEN_MAKE_CMDS) DESTDIR=$(HOST_DIR) endef define HOST_SEPOLGEN_INSTALL_CMDS - $(MAKE) -C $(@D) $(HOST_SEPOLGEN_MAKE_CMDS) DESTDIR=$(HOST_DIR) install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_SEPOLGEN_MAKE_CMDS) DESTDIR=$(HOST_DIR) install endef $(eval $(host-generic-package)) From b163c3267c6b8c83faff18de8afaf5ad84c73604 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:13 -0300 Subject: [PATCH 0999/3392] qtuio: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/qtuio/qtuio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk index 5fa10a76b7..6238b50f8b 100644 --- a/package/qtuio/qtuio.mk +++ b/package/qtuio/qtuio.mk @@ -32,7 +32,7 @@ endef ifeq ($(BR2_QTUIO_EXAMPLES),y) define QTUIO_BUILD_EXAMPLES for example in $(QTUIO_EXAMPLES) ; do \ - $(MAKE) -C $(@D)/examples/$${example} || exit 1; \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/examples/$${example} || exit 1; \ done endef endif From 87cb3ed07e4c1da1a19cd599a19fb118abae947d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:15 -0300 Subject: [PATCH 1000/3392] wiringpi: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/wiringpi/wiringpi.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk index baa8753b5c..87b1b6a80f 100644 --- a/package/wiringpi/wiringpi.mk +++ b/package/wiringpi/wiringpi.mk @@ -40,13 +40,13 @@ define WIRINGPI_BUILD_CMDS endef define WIRINGPI_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true - $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true endef define WIRINGPI_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true - $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true $(INSTALL) -D -m 0755 $(@D)/gpio/gpio $(TARGET_DIR)/usr/bin/gpio $(INSTALL) -D -m 0755 $(@D)/gpio/pintest $(TARGET_DIR)/usr/bin/pintest endef From fef4059ee27d14161d99087ab935c7b312b63496 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:16 -0300 Subject: [PATCH 1001/3392] tinyhttpd: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/tinyhttpd/tinyhttpd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk index 194249bd1f..058f6bd186 100644 --- a/package/tinyhttpd/tinyhttpd.mk +++ b/package/tinyhttpd/tinyhttpd.mk @@ -10,7 +10,7 @@ TINYHTTPD_LICENSE = GPL TINYHTTPD_LICENSE_FILES = README define TINYHTTPD_BUILD_CMDS - $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" endef From 2fd8cde1ffb43e38cdacc2f349224edfa1afdd59 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:17 -0300 Subject: [PATCH 1002/3392] turbolua: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/turbolua/turbolua.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/turbolua/turbolua.mk b/package/turbolua/turbolua.mk index bf6d4918fb..bf9e27f16c 100644 --- a/package/turbolua/turbolua.mk +++ b/package/turbolua/turbolua.mk @@ -22,11 +22,11 @@ TURBOLUA_MAKE_OPTS += SSL=none endif define TURBOLUA_BUILD_CMDS - $(MAKE) $(TURBOLUA_MAKE_OPTS) -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE) $(TURBOLUA_MAKE_OPTS) -C $(@D) all endef define TURBOLUA_INSTALL_TARGET_CMDS - $(MAKE) $(TURBOLUA_MAKE_OPTS) LDCONFIG=true \ + $(TARGET_MAKE_ENV) $(MAKE) $(TURBOLUA_MAKE_OPTS) LDCONFIG=true \ PREFIX="$(TARGET_DIR)/usr" -C $(@D) install endef From b1d218b7447d60c00aff8f71a29206a526b400d2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:19 -0300 Subject: [PATCH 1003/3392] aufs-util: use $(HOST_MAKE_ENV) when calling $(MAKE) In this case in particular a host tool is built inside the target build step. Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/aufs-util/aufs-util.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/aufs-util/aufs-util.mk b/package/aufs-util/aufs-util.mk index a2d0bad656..d41b4ac4fd 100644 --- a/package/aufs-util/aufs-util.mk +++ b/package/aufs-util/aufs-util.mk @@ -41,7 +41,7 @@ AUFS_UTIL_POST_PATCH_HOOKS += AUFS_UTIL_REMOVE_RDU64 # First, we build the host tools, needed to build the target tools. define AUFS_UTIL_BUILD_CMDS - $(MAKE) -C $(@D) \ + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ $(HOST_CONFIGURE_OPTS) \ CPPFLAGS="$(AUFS_UTIL_HOST_CPPFLAGS)" \ HOSTCC="$(HOSTCC)" HOSTLD="$(HOSTLD)" \ From 4b7a1de720b0f6ec0d0c4c0e0e9fd34f4135e4b1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:07:20 -0300 Subject: [PATCH 1004/3392] cryptodev-linux: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/cryptodev-linux/cryptodev-linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk index d23b6474f8..e23e1e3e32 100644 --- a/package/cryptodev-linux/cryptodev-linux.mk +++ b/package/cryptodev-linux/cryptodev-linux.mk @@ -13,7 +13,7 @@ CRYPTODEV_LINUX_LICENSE_FILES = COPYING CRYPTODEV_LINUX_PROVIDES = cryptodev define CRYPTODEV_LINUX_MODULE_GEN_VERSION_H - $(MAKE) -C $(@D) version.h + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) version.h endef CRYPTODEV_LINUX_PRE_BUILD_HOOKS += CRYPTODEV_LINUX_MODULE_GEN_VERSION_H From d2aa98b1de6a60c3482c43ab494ba13bcf83420e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:08 -0300 Subject: [PATCH 1005/3392] xl2tp: use $(TARGET_CONFIGURE_OPTS) when calling $(MAKE) Signed-off-by: Gustavo Zacarias [Thomas: fix commit title.] Signed-off-by: Thomas Petazzoni --- package/xl2tp/xl2tp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk index a8237164a2..29e2f281e0 100644 --- a/package/xl2tp/xl2tp.mk +++ b/package/xl2tp/xl2tp.mk @@ -20,7 +20,7 @@ define XL2TP_BUILD_CMDS endef define XL2TP_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install + $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install endef $(eval $(generic-package)) From 00a44f89575317bef010d03eea28e617cf56aa90 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 17 Oct 2016 13:06:37 -0300 Subject: [PATCH 1006/3392] lzip: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/lzip/lzip.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index 7b1fdf48af..c6f054319b 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -20,7 +20,7 @@ define HOST_LZIP_CONFIGURE_CMDS endef define LZIP_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define HOST_LZIP_BUILD_CMDS @@ -28,7 +28,7 @@ define HOST_LZIP_BUILD_CMDS endef define LZIP_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install endef define HOST_LZIP_INSTALL_CMDS From 5ef0b0dabf904c281f131858372378a3ee387adb Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 21 Oct 2016 21:10:12 +0200 Subject: [PATCH 1007/3392] wiringpi: bump version to 2.32 - change back to original download site Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/wiringpi/wiringpi.hash | 2 +- package/wiringpi/wiringpi.mk | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash index 65e1f9cdf0..abddaf9b27 100644 --- a/package/wiringpi/wiringpi.hash +++ b/package/wiringpi/wiringpi.hash @@ -1,2 +1,2 @@ # locally computed -sha256 00a4770c113a1a5f52480a30bcfad00d2087f42854f1791204af2e60ffe1ac8c wiringpi-78b5c323b74de782df58ee558c249e4e4fadd25f.tar.gz +sha256 0775e3bfa2df2131746c75d611ad354e5c884661be0d9de9fd786fc96f6ad918 wiringPi-2.32.tar.gz diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk index 87b1b6a80f..ce0819dace 100644 --- a/package/wiringpi/wiringpi.mk +++ b/package/wiringpi/wiringpi.mk @@ -4,16 +4,8 @@ # ################################################################################ -# original site is down (2016-06-03) -# -# WIRINGPI_VERSION = 2.31 -# WIRINGPI_SITE = git://git.drogon.net/wiringPi -# -# so change to alternative location (verifyed that commit 78b5c323 -# has the same content as local copy of wiringpi-2.31.tar.gz) -# -WIRINGPI_VERSION = 78b5c323b74de782df58ee558c249e4e4fadd25f -WIRINGPI_SITE = $(call github,WiringPi,WiringPi,$(WIRINGPI_VERSION)) +WIRINGPI_VERSION = 2.32 +WIRINGPI_SITE = git://git.drogon.net/wiringPi WIRINGPI_LICENSE = LGPLv3+ WIRINGPI_LICENSE_FILES = COPYING.LESSER From 0603b9ea3eff9e11aba2b7408215e03d9247b977 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 20 Oct 2016 21:49:32 +0200 Subject: [PATCH 1008/3392] postgresql: bump version to 9.6.0 For release notes see [1]. [1] https://www.postgresql.org/docs/9.6/static/release-9-6.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 0d54890d2c..5e73badec6 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,2 +1,2 @@ -# From https://ftp.postgresql.org/pub/source/v9.5.4/postgresql-9.5.4.tar.bz2.sha256 -sha256 cf5e571164ad66028ecd7dd8819e3765470d45bcd440d258b686be7e69c76ed0 postgresql-9.5.4.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v9.6.0/postgresql-9.6.0.tar.bz2.sha256 +sha256 3b5fe9634b80a4511aac1832a087586a7caa8c3413619562bdda009a015863ce postgresql-9.6.0.tar.bz2 diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 7179bbe88b..e2756bf10d 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 9.5.4 +POSTGRESQL_VERSION = 9.6.0 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From f6428eacf70dd931c106215606d0e77bca09d497 Mon Sep 17 00:00:00 2001 From: Jan Heylen Date: Thu, 20 Oct 2016 19:13:29 +0200 Subject: [PATCH 1009/3392] protobuf: bump to version 3.0.0 It also changes the python-protobuf.hash file to be a symbolic link to ../protobuf/protobuf.hash so that both hash files don't have to be updated when protobuf is bumped. In addition, the 0001-disable-unneeded-build-dependencies.patch patch from package/python-protobuf/ is removed because it has been merged upstream. Signed-off-by: Jan Heylen [Thomas: fix the build of python-protobuf.] Signed-off-by: Thomas Petazzoni --- ...ROTOBUF_ATOMICOPS_ERROR-syntax-error.patch | 61 ------------------- ...ure.ac-check-if-libatomic-is-needed.patch} | 4 +- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 2 +- ...-disable-unneeded-build-dependencies.patch | 37 ----------- package/python-protobuf/python-protobuf.hash | 3 +- 6 files changed, 5 insertions(+), 104 deletions(-) delete mode 100644 package/protobuf/0001-Fix-GOOGLE_PROTOBUF_ATOMICOPS_ERROR-syntax-error.patch rename package/protobuf/{0002-configure.ac-check-if-libatomic-is-needed.patch => 0001-configure.ac-check-if-libatomic-is-needed.patch} (85%) delete mode 100644 package/python-protobuf/0001-disable-unneeded-build-dependencies.patch mode change 100644 => 120000 package/python-protobuf/python-protobuf.hash diff --git a/package/protobuf/0001-Fix-GOOGLE_PROTOBUF_ATOMICOPS_ERROR-syntax-error.patch b/package/protobuf/0001-Fix-GOOGLE_PROTOBUF_ATOMICOPS_ERROR-syntax-error.patch deleted file mode 100644 index c271ea45d7..0000000000 --- a/package/protobuf/0001-Fix-GOOGLE_PROTOBUF_ATOMICOPS_ERROR-syntax-error.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 50982f711de6ad58f6e0bef01a75d2b9cf35f5dc Mon Sep 17 00:00:00 2001 -From: George Redivo -Date: Mon, 6 Jul 2015 16:56:41 -0300 -Subject: [PATCH 1/2] Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It's not possible to define "#error" inside a define. -It causes 'error: stray ‘#’ in program' compilation error. - -Now the define GOOGLE_PROTOBUF_ATOMICOPS_ERROR is the error message -and it's used along the code together "#error". ---- - src/google/protobuf/stubs/atomicops.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h -index b1336e3..a130b38 100644 ---- a/src/google/protobuf/stubs/atomicops.h -+++ b/src/google/protobuf/stubs/atomicops.h -@@ -162,7 +162,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); - - // Include our platform specific implementation. - #define GOOGLE_PROTOBUF_ATOMICOPS_ERROR \ --#error "Atomic operations are not supported on your platform" -+"Atomic operations are not supported on your platform" - - // ThreadSanitizer, http://clang.llvm.org/docs/ThreadSanitizer.html. - #if defined(THREAD_SANITIZER) -@@ -172,7 +172,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); - #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64) - #include - #else --GOOGLE_PROTOBUF_ATOMICOPS_ERROR -+#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR - #endif - - // Solaris -@@ -203,15 +203,15 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR - #if __has_extension(c_atomic) - #include - #else --GOOGLE_PROTOBUF_ATOMICOPS_ERROR -+#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR - #endif - #else --GOOGLE_PROTOBUF_ATOMICOPS_ERROR -+#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR - #endif - - // Unknown. - #else --GOOGLE_PROTOBUF_ATOMICOPS_ERROR -+#error GOOGLE_PROTOBUF_ATOMICOPS_ERROR - #endif - - // On some platforms we need additional declarations to make AtomicWord --- -2.5.0 - diff --git a/package/protobuf/0002-configure.ac-check-if-libatomic-is-needed.patch b/package/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch similarity index 85% rename from package/protobuf/0002-configure.ac-check-if-libatomic-is-needed.patch rename to package/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch index a70a23e74e..fffdf49fac 100644 --- a/package/protobuf/0002-configure.ac-check-if-libatomic-is-needed.patch +++ b/package/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch @@ -20,8 +20,8 @@ diff --git a/configure.ac b/configure.ac index c07067c..88d4a0d 100644 --- a/configure.ac +++ b/configure.ac -@@ -139,6 +139,8 @@ AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"]) - ACX_PTHREAD +@@ -160,6 +160,8 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test "x$acx_pthread_ok" = "xyes"]) + # We still keep this for improving pbconfig.h for unsupported platforms. AC_CXX_STL_HASH +AC_SEARCH_LIBS([__atomic_load_4], [atomic]) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index 78285b72d2..b681650a13 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 protobuf-v2.6.1.tar.gz +sha256 f5b3563f118f1d3d6e001705fa7082e8fc3bda50038ac3dff787650795734146 protobuf-v3.0.0.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 3eeadfc454..b4a19471ff 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROTOBUF_VERSION = v2.6.1 +PROTOBUF_VERSION = v3.0.0 PROTOBUF_SITE = $(call github,google,protobuf,$(PROTOBUF_VERSION)) PROTOBUF_LICENSE = BSD-3c PROTOBUF_LICENSE_FILES = LICENSE diff --git a/package/python-protobuf/0001-disable-unneeded-build-dependencies.patch b/package/python-protobuf/0001-disable-unneeded-build-dependencies.patch deleted file mode 100644 index 3f0eabd23a..0000000000 --- a/package/python-protobuf/0001-disable-unneeded-build-dependencies.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7e7db7225e227905acabfa2149152ece21c93e70 Mon Sep 17 00:00:00 2001 -From: Steven Noonan -Date: Sun, 8 Nov 2015 09:03:00 -0800 -Subject: [PATCH] python-protobuf: don't require google-apputils - -This dependency is totally superfluous for successfully building/running -python-protobuf. It's only "required" at build time and is not staged into the -install directory, but it isn't even really required for a successful build. - -Signed-off-by: Steven Noonan ---- - python/setup.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/python/setup.py b/python/setup.py -index 2450a77..db6f497 100755 ---- a/python/setup.py -+++ b/python/setup.py -@@ -160,7 +160,6 @@ if __name__ == '__main__': - packages = [ 'google' ], - namespace_packages = [ 'google' ], - test_suite = 'setup.MakeTestSuite', -- google_test_dir = "google/protobuf/internal", - # Must list modules explicitly so that we don't install tests. - py_modules = [ - 'google.protobuf.internal.api_implementation', -@@ -189,7 +188,6 @@ if __name__ == '__main__': - 'google.protobuf.text_format'], - cmdclass = { 'clean': clean, 'build_py': build_py }, - install_requires = ['setuptools'], -- setup_requires = ['google-apputils'], - ext_modules = ext_module_list, - url = 'https://developers.google.com/protocol-buffers/', - maintainer = maintainer_email, --- -2.6.2 - diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash deleted file mode 100644 index ab4bf5bf28..0000000000 --- a/package/python-protobuf/python-protobuf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 protobuf-v2.6.1.tar.gz diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash new file mode 120000 index 0000000000..57a40ce5bd --- /dev/null +++ b/package/python-protobuf/python-protobuf.hash @@ -0,0 +1 @@ +../protobuf/protobuf.hash \ No newline at end of file From d10d5b08261485b09a848609ec36720fae8055d6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 22 Oct 2016 16:00:19 +0200 Subject: [PATCH 1010/3392] protobuf: add a comment about python-protobuf Signed-off-by: Thomas Petazzoni --- package/protobuf/protobuf.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index b4a19471ff..dabbfb7a4a 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -4,6 +4,9 @@ # ################################################################################ +# When bumping this package, make sure to also verify if the +# python-protobuf package still works, as they share the same +# version/site variables. PROTOBUF_VERSION = v3.0.0 PROTOBUF_SITE = $(call github,google,protobuf,$(PROTOBUF_VERSION)) PROTOBUF_LICENSE = BSD-3c From 0a076414af9bf81c24da11d0f1d1a5bff8b1ba94 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 22 Oct 2016 16:10:24 +0200 Subject: [PATCH 1011/3392] trinity: refactor dependencies using BR2_PACKAGE_TRINITY_ARCH_SUPPORTS In order to avoid duplicating architecture dependencies in the trinity Config.in file, this commit introduces a BR2_PACKAGE_TRINITY_ARCH_SUPPORTS Config.in variable. Signed-off-by: Thomas Petazzoni --- package/trinity/Config.in | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/trinity/Config.in b/package/trinity/Config.in index 02cd20a842..4a31ba0a49 100644 --- a/package/trinity/Config.in +++ b/package/trinity/Config.in @@ -1,18 +1,20 @@ -config BR2_PACKAGE_TRINITY - bool "trinity" +config BR2_PACKAGE_TRINITY_ARCH_SUPPORTS + bool + default y depends on BR2_USE_MMU # fork() - depends on !BR2_TOOLCHAIN_USES_MUSL # FTW_ACTIONRETVAL depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \ BR2_powerpc64le || BR2_sparc || BR2_x86_64 + +config BR2_PACKAGE_TRINITY + bool "trinity" + depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_MUSL # FTW_ACTIONRETVAL help A Linux System call fuzz tester http://codemonkey.org.uk/projects/trinity/ comment "trinity needs a uClibc or glibc toolchain" - depends on BR2_USE_MMU + depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_MUSL - depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ - BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_sparc || BR2_x86_64 From 637c1372bb9b5d7874cb2b365547ab12dbf0ad9f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Oct 2016 15:24:11 +0200 Subject: [PATCH 1012/3392] package/trinity: needs headers >= 3.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit IPV6_UNICAST_IF was added with kernel 3.4: https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/include/linux/in6.h?id=refs/tags/v3.4.112 To prove this compare with kernel 3.3: https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/log/include/linux/in6.h?h=linux-3.3.y The trinity package contains some compat code in https://github.com/kernelslacker/trinity/blob/master/include/compat.h but it does not trigger for IPV6_UNICAST_IF https://github.com/kernelslacker/trinity/blob/master/include/compat.h#L662 Instead of hacking compat.h to death just depend on headers >= 3.4. Fixes a build error net/proto-ipv6.c: At top level: net/proto-ipv6.c:157:12: error: ‘IPV6_UNICAST_IF’ undeclared here (not in a function) { .name = IPV6_UNICAST_IF, }, not yet caught by autobuilders using this defconfig: http://autobuild.buildroot.net/results/394/394e22be0ef986463e97b3040dad8f978262732c/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/trinity/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/trinity/Config.in b/package/trinity/Config.in index 4a31ba0a49..35b54d8306 100644 --- a/package/trinity/Config.in +++ b/package/trinity/Config.in @@ -10,11 +10,13 @@ config BR2_PACKAGE_TRINITY bool "trinity" depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_USES_MUSL # FTW_ACTIONRETVAL + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # IPV6_UNICAST_IF help A Linux System call fuzz tester http://codemonkey.org.uk/projects/trinity/ -comment "trinity needs a uClibc or glibc toolchain" +comment "trinity needs a uClibc or glibc toolchain w/ headers >= 3.4" depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 From 104bb29e0490bfb487e2e665448dd3ca07fcc2b5 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 16 Oct 2016 13:12:37 +0200 Subject: [PATCH 1013/3392] Revert "package/cmake: with BR2_ENABLE_DEBUG use RelWithDebInfo" This reverts commit 4b0120183404913f7f7788ef4f0f6b51498ef363. Before reverting this patch, CMake packages are built with the following options: * if BR2_ENABLE_DEBUG is set: The CMake build type is set to RelWithDebInfo, which means: - Optimization level is forced to: -O2; - no log nor assert due to -DNDEBUG; - BR2_DEBUG_{1..3} effect is unchanged; * otherwise: The CMake build type is set to Release, which means: - Optimization level is forced to: -O3; - no log nor assert due to -DNDEBUG (as expected). In any case, the optimization WRT the binary size is always ignored and forced. Reverting to the previous situation, so Buildroot now chooses between the 'Debug' and 'Release' config types, which are semantically closer to what Buildroot does everywhere else: * if BR2_ENABLE_DEBUG is set: The CMake build type is set to Debug, which means: - only -g option is passed by CMake; - optimization is not forced, nor debug level, so they are kept as-is; * otherwise: The CMake build type is set to Release, so no change in this case: - Optimization level is forced to: -O3; - no log nor assert due to -DNDEBUG (as expected); - size optimization is ignored. Follow-up patches will fix the CMake flag variables that are appended by CMake. Cc: Charles Hardin Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Maxime Hadjinlian Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pkg-cmake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index aca9e61e04..4883b3b35a 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -87,7 +87,7 @@ define $(2)_CONFIGURE_CMDS PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ - -DCMAKE_BUILD_TYPE=$$(if $$(BR2_ENABLE_DEBUG),RelWithDebInfo,Release) \ + -DCMAKE_BUILD_TYPE=$$(if $$(BR2_ENABLE_DEBUG),Debug,Release) \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ From a471150a7b773b40af5585fa0c49275549014791 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 16 Oct 2016 13:12:38 +0200 Subject: [PATCH 1014/3392] package/pkg-cmake.mk: move CMAKE_BUILD_TYPE definition into toolchainfile.cmake The chosen CMAKE_BUILD_TYPE encodes an option of the Buildroot configuration, so it makes more sense to save it in the toolchainfile.cmake than to pass it during configure. It is still possible to override the build type on the cmake command line. Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Maxime Hadjinlian Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: reword description in the CHANGES file.] Signed-off-by: Thomas Petazzoni --- CHANGES | 7 +++++++ package/pkg-cmake.mk | 2 +- support/misc/toolchainfile.cmake.in | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index b4bd5feaea..284a65460a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +2016.11-rc1, + + CMake support: + + The toolchainfile.cmake file now provides a definition of the + CMAKE_BUILD_TYPE variable. + 2016.08, Released September 1st, 2016 Minor fixes. diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 4883b3b35a..4e0e8382de 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -87,7 +87,6 @@ define $(2)_CONFIGURE_CMDS PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ - -DCMAKE_BUILD_TYPE=$$(if $$(BR2_ENABLE_DEBUG),Debug,Release) \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ @@ -247,5 +246,6 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: -e 's#@@TARGET_FC@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_FC)))#' \ -e 's#@@CMAKE_SYSTEM_PROCESSOR@@#$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR))#' \ -e 's#@@TOOLCHAIN_HAS_FORTRAN@@#$(if $(BR2_TOOLCHAIN_HAS_FORTRAN),1,0)#' \ + -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \ $(TOPDIR)/support/misc/toolchainfile.cmake.in \ > $@ diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index 649b52d72a..1c5031f26a 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -13,6 +13,9 @@ string(REPLACE "/usr/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) +# Build type from the Buildroot configuration +set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") + set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@ ${CMAKE_C_FLAGS}" CACHE STRING "Buildroot CFLAGS") set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@ ${CMAKE_CXX_FLAGS}" CACHE STRING "Buildroot CXXFLAGS") set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@ ${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "Buildroot LDFLAGS") From 12494ef48f893684d0800e7f6fe39a2ceaed0451 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 16 Oct 2016 13:12:39 +0200 Subject: [PATCH 1015/3392] toolchainfile.cmake: set per-config appended {C, CXX}FLAGS When a build type is set, CMake does append some flags that can override those set by Buildroot due to the gcc option parser (in which the last argument controling an option wins). Hereafter is a summary of the optimization and debug flags set by Buildroot and appended by CMake. * Flags set by Buildroot depending on the configuration: BR2_ENABLE_DEBUG | Optim. level | Buildroot {C,CXX}FLAGS =================+=====================+======================= y | BR2_OPTIMIZE_S | -Os -gx y | BR2_OPTIMIZE_G | -Og -gx y | BR2_OPTIMIZE_{0..3} | -On -gx n | BR2_OPTIMIZE_S | -Os n | BR2_OPTIMIZE_G | -Og n | BR2_OPTIMIZE_{0..3} | -On * Default flags appended by CMake depending on the build type: Build type | Flags | Effects on {C,CXX}FLAGS ===============+=================+=========================================== Debug | -g | Force -g, compatible with BR2_ENABLE_DEBUG MinSizeRel | -Os -DNDEBUG | Set -Os, compatible with BR2_OPTIMIZE_S Release | -O3 -DNDEBUG | Set -O3, closest to the others cases, | | though the optimization level is forced. RelWithDebInfo | -O2 -g -DNDEBUG | Force -g and set -O2, not friendly with BR To avoid the CMake flags take precedence over the Buildroot ones, this change sets in toolchainfile.cmake the per-config compiler flags CMake can append depending on the build type Buildroot defined. So, CMake does not mess up with the compilation flags Buildroot sets. It is still possible to override these per-config flags on the cmake command line. Note: If a CMake-based project forces the compiler and/or linker flag definitions (the default ones or the per-config ones - e.g. CMAKE_C_FLAGS/CMAKE_C_FLAGS_{DEBUG,RELEASE}), there is not much Buildroot can do about it. So, the flags will be overwritten anyway in these cases. Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Maxime Hadjinlian Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: - adjust comment in toolchainfile.cmake.in, as suggested by Arnout. - also handle CMAKE_Fortran_FLAGS_*, as suggested by Arnout.] Signed-off-by: Thomas Petazzoni --- support/misc/toolchainfile.cmake.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index 1c5031f26a..a8476d99e9 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -13,6 +13,21 @@ string(REPLACE "/usr/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) +# Set the {C,CXX}FLAGS appended by CMake depending on the build type +# defined by Buildroot. CMake defaults these variables with -g and/or +# -O options, and they are appended at the end of the argument list, +# so the Buildroot options are overridden. Therefore these variables +# have to be cleared, so that the options passed in CMAKE_C_FLAGS do +# apply. +# +# Note: +# if the project forces some of these flag variables, Buildroot is +# screwed up and there is nothing Buildroot can do about that :( +set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") +set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") +set(CMAKE_C_FLAGS_RELEASE " -DNEBUG" CACHE STRING "Release CFLAGS") +set(CMAKE_CXX_FLAGS_RELEASE " -DNEBUG" CACHE STRING "Release CXXFLAGS") + # Build type from the Buildroot configuration set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") @@ -34,6 +49,8 @@ set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") if(@@TOOLCHAIN_HAS_FORTRAN@@) + set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") + set(CMAKE_Fortran_FLAGS_RELEASE " -DNEBUG" CACHE STRING "Release CFLAGS") set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@ ${CMAKE_Fortran_FLAGS}" CACHE STRING "Buildroot FCFLAGS") set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") endif() From b353ce1315270e228d8c24f209f2037eec41b601 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 16 Oct 2016 13:12:40 +0200 Subject: [PATCH 1016/3392] package/gflags: include TARGET_CXXFLAGS to the overloaded CXXFLAGS Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/gflags/gflags.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gflags/gflags.mk b/package/gflags/gflags.mk index 9dc4e15b6f..89111ed987 100644 --- a/package/gflags/gflags.mk +++ b/package/gflags/gflags.mk @@ -11,7 +11,8 @@ GFLAGS_LICENSE = BSD-3c GFLAGS_LICENSE_FILES = COPYING.txt ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -GFLAGS_CONF_OPTS = -DBUILD_gflags_LIB=OFF -DCMAKE_CXX_FLAGS=-DNO_THREADS +GFLAGS_CONF_OPTS = -DBUILD_gflags_LIB=OFF \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -DNO_THREADS" endif $(eval $(cmake-package)) From 1255d0080ccecebfa4d53dfd36d0cbde8a3c6e61 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 16 Oct 2016 13:12:41 +0200 Subject: [PATCH 1017/3392] package/gnuradio: include TARGET_CFLAGS to the overloaded CFLAGS Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/gnuradio/gnuradio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 972f7a494e..5cb00d2416 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -36,7 +36,7 @@ GNURADIO_INSTALL_STAGING = YES # CFLAGS to decide whether to build the NEON functions or not, and # wants to see the string 'armv7' in the CFLAGS. ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_ARM_CPU_HAS_NEON),yy) -GNURADIO_CONF_OPTS += -DCMAKE_C_FLAGS="-march=armv7-a" +GNURADIO_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -march=armv7-a" endif # As soon as -mfpu=neon is supported by the compiler, gnuradio will try From d1a312d2097bad24fb1c0639c6801c2a4f6c2e7f Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 16 Oct 2016 13:12:42 +0200 Subject: [PATCH 1018/3392] package/libcec: include TARGET_{C, CXX}FLAGS to the overloaded {C, CXX}FLAGS Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/libcec/libcec.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index b762d88d71..55c5fbb83d 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -29,8 +29,9 @@ endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) LIBCEC_DEPENDENCIES += rpi-userland LIBCEC_CONF_OPTS += \ - -DCMAKE_C_FLAGS="-lvcos -lvchiq_arm" \ - -DCMAKE_CXX_FLAGS="-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -lvcos -lvchiq_arm" \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) \ + -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux \ -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads" endif From eb26296666d81c4f85355a94c16dc190d3f2015d Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Sun, 16 Oct 2016 13:12:43 +0200 Subject: [PATCH 1019/3392] package/opencv3: fix CMAKE_CXX_FLAGS The commit 4904c4c "package/opencv3: use BR2_TOOLCHAIN_HAS_LIBATOMIC" overrides CMAKE_CXX_FLAGS with the single -latomic, losing all ABI CFLAGS that are passed there by default. This breaks build on xtensa where ABI CFLAGS contain important code generation options. Append $(TARGET_CXXFLAGS) to CMAKE_CXX_FLAGS along with -latomic. Fixes: http://autobuild.buildroot.net/results/7f1c96abd8fbb5b358a07100ab623316e9bb9dcd http://autobuild.buildroot.net/results/e0c93d0f6d1da0d62d4dbba211a275bfe75e9645 http://autobuild.buildroot.net/results/53e7e4b4b6a7b48b8012799d7507f7594dbf01b2 Signed-off-by: Max Filippov Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/opencv3/opencv3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 2529de9f4b..10660a90fb 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -12,7 +12,7 @@ OPENCV3_LICENSE_FILES = LICENSE # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -OPENCV3_CONF_OPTS += -DCMAKE_CXX_FLAGS="-latomic" +OPENCV3_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" endif # OpenCV component options From 8e84b9003d8259472f9c79b385443b1b4975203e Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 16 Oct 2016 13:12:44 +0200 Subject: [PATCH 1020/3392] package/rpi-userland: include TARGET_CFLAGS to the overloaded CFLAGS Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/rpi-userland/rpi-userland.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 86cde873d4..4a6eb41372 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -10,7 +10,8 @@ RPI_USERLAND_LICENSE = BSD-3c RPI_USERLAND_LICENSE_FILES = LICENCE RPI_USERLAND_INSTALL_STAGING = YES RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr \ - -DCMAKE_C_FLAGS="-DVCFILED_LOCKFILE=\\\"/var/run/vcfiled.pid\\\"" + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) \ + -DVCFILED_LOCKFILE=\\\"/var/run/vcfiled.pid\\\"" RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg From 10a6756fa13fe8ffea9804e41e275a9b54b66299 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 16 Oct 2016 13:12:45 +0200 Subject: [PATCH 1021/3392] toochainfile.cmake: rework the way Buildroot sets flags From the build configuration, Buildroot defines and set some compiler and linker flags that should be passed to any packages build-system. For package using the cmake-package infrastructure, this is achieved via the toolchainfile.cmake. This change simplifies the way the toolchainfile.cmake file handles these flags: it now just sets them, without any attempt to extend them with those Buildroot defined. This change still allows overriding these flags from the configure command line. So, now, when a CMake-based package needs to extend them, they should be fully set from the package *.mk file. This behavior is consistent with what is done for others package infrastructures. This change should not pull any regression WRT the bug #7280 [1]. However, now, when someone uses the toolchainfile.cmake file outside of Buildroot, he/she must overload all compiler/linker flags (including the ones Buildroot sets since they no longer get automatically added). [1] https://bugs.busybox.net/show_bug.cgi?id=7280 Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Max Filippov Cc: Thomas Petazzoni Signed-off-by: Samuel Martin Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- CHANGES | 3 ++- support/misc/toolchainfile.cmake.in | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 284a65460a..fd5abcb8ef 100644 --- a/CHANGES +++ b/CHANGES @@ -3,7 +3,8 @@ CMake support: The toolchainfile.cmake file now provides a definition of the - CMAKE_BUILD_TYPE variable. + CMAKE_BUILD_TYPE variable. The toolchainfile.cmake also no + longer passes the compiler/linker flags defined by Buildroot. 2016.08, Released September 1st, 2016 diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index a8476d99e9..8674653b69 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -31,9 +31,17 @@ set(CMAKE_CXX_FLAGS_RELEASE " -DNEBUG" CACHE STRING "Release CXXFLAGS") # Build type from the Buildroot configuration set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") -set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@ ${CMAKE_C_FLAGS}" CACHE STRING "Buildroot CFLAGS") -set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@ ${CMAKE_CXX_FLAGS}" CACHE STRING "Buildroot CXXFLAGS") -set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@ ${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "Buildroot LDFLAGS") +# Buildroot defaults flags. +# If you are using this toolchainfile.cmake file outside of Buildroot and +# want to customize the compiler/linker flags, then: +# * set them all on the cmake command line, e.g.: +# cmake -DCMAKE_C_FLAGS="@@TARGET_CFLAGS@@ -Dsome_custom_flag" ... +# * and make sure the project's CMake code extendsthem like this if needed: +# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") +set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") +set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") +set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") + set(CMAKE_INSTALL_SO_NO_EXE 0) set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/usr/bin") @@ -51,6 +59,6 @@ set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") if(@@TOOLCHAIN_HAS_FORTRAN@@) set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") set(CMAKE_Fortran_FLAGS_RELEASE " -DNEBUG" CACHE STRING "Release CFLAGS") - set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@ ${CMAKE_Fortran_FLAGS}" CACHE STRING "Buildroot FCFLAGS") + set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") endif() From 7d2407b3e72b86807983f56c3b2ccdc1bec3a29b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 22 Oct 2016 16:44:06 +0200 Subject: [PATCH 1022/3392] toolchainfile.cmake: fix description of CMAKE_Fortran_FLAGS_{DEBUG,RELEASE} Signed-off-by: Thomas Petazzoni --- support/misc/toolchainfile.cmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index 8674653b69..e095356b79 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -57,8 +57,8 @@ set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") if(@@TOOLCHAIN_HAS_FORTRAN@@) - set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") - set(CMAKE_Fortran_FLAGS_RELEASE " -DNEBUG" CACHE STRING "Release CFLAGS") + set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") + set(CMAKE_Fortran_FLAGS_RELEASE " -DNEBUG" CACHE STRING "Release Fortran FLAGS") set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") endif() From 731b3c51aa6d4715f8a96801ebb78992e14294c2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 28 Sep 2016 22:13:58 -0300 Subject: [PATCH 1023/3392] libtasn1: clarify licensing info The library is LGPLv2.1+, the tests and tools are GPLv3+ so clarify to avoid confusion. Signed-off-by: Gustavo Zacarias Reviewed-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/libtasn1/libtasn1.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk index 6b7e6b3364..79223a46d6 100644 --- a/package/libtasn1/libtasn1.mk +++ b/package/libtasn1/libtasn1.mk @@ -7,7 +7,7 @@ LIBTASN1_VERSION = 4.9 LIBTASN1_SITE = http://ftp.gnu.org/gnu/libtasn1 LIBTASN1_DEPENDENCIES = host-bison -LIBTASN1_LICENSE = GPLv3+, LGPLv2.1+ +LIBTASN1_LICENSE = GPLv3+ (tests, tools), LGPLv2.1+ (library) LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB LIBTASN1_INSTALL_STAGING = YES # 'missing' fallback logic botched so disable it completely From da90437be784fa88e1f149067056096dd6847c26 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 22 Oct 2016 22:26:32 +0200 Subject: [PATCH 1024/3392] cryptopp: bump to 5.6.5 This commit bumps cryptopp from 5.6.3 to 5.6.5 in order to fix bug The commit f707b9ef1688d4429ca6239cf2dc236440974681, which Buildroot was downloading as a patch to fix build with older gcc versions, has been merged upstream as of 5.6.4, is therefore no longer necessary, and dropped in this commit. In addition, Andrey Volkov in the bug report #9321, proposed to add a number of patches to cryptopp to solve issues when using tegrarcm. Those patches are the following ones: - patch 0: moving to autotools as the build system. This is not strictly a bug fix, and is not necessary. - patch 1: merged upstream in "3941be18891a6a87626b7c70f715ca91c61c08c3 Fixed hang on ARM platforms in Integer::DivideThreeWordsByTwo", which is part of 5.6.5. - patch 2: merged upstream in "9fca0c28023a177106cf58a3de6da610f185a6e4 Work around issue on ARMEL in MultiplyTop and GCC. ARMHF is OK", which is part of 5.6.5. - patch 3: merged upstream in "dce2317195a7d9aa77b159fd1beddaf8358f6243 Increase range for GCC workaround on ARMEL. After speaking with AP from GCC, he states some issues are still likely present in Master, which is GCC 6.0", which is part of 5.6.5 - patch 4: merged upstream in "605744d8260c6ada033805c13ae0b2646acf18d6 Fixed SecBlock append when "this == t", fixed assert, added validation test (Issue 92)", which is part of 5.6.5 - patch 5: merged upstream in "9f335d719ebc27f58251559240de0077ec42c583 Fix the Rijndael timing attack counter measure", which is part of 5.6.5 - patch 6: merged upstream in "d8b02cfaafd7350ed0f876cd5da405cff330d537 Fixed m68k detection (Issue 153)", which is part of 5.6.5 - patch 7: merged upstream in "c82fd655ed7465db8d21a0e0559c304a7a86d298 Cleared assert in debug builds (Issue 138)", which is part of 5.6.5 Bottom line: none of the patches proposed by Andrey Volkov are necessary if we bump to 5.6.5. Signed-off-by: Thomas Petazzoni --- package/cryptopp/cryptopp.hash | 3 +-- package/cryptopp/cryptopp.mk | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package/cryptopp/cryptopp.hash b/package/cryptopp/cryptopp.hash index bf59c0451d..577638c1c9 100644 --- a/package/cryptopp/cryptopp.hash +++ b/package/cryptopp/cryptopp.hash @@ -1,3 +1,2 @@ # Locally computed -sha256 9390670a14170dd0f48a6b6b06f74269ef4b056d4718a1a329f6f6069dc957c9 cryptopp563.zip -sha256 74b88c2caf7cf843bdc74d3331adaf83e516167cc8eebe66a79612189549cfa4 f707b9ef1688d4429ca6239cf2dc236440974681.patch +sha256 a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34 cryptopp565.zip diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index df07cf607f..86a2da1e8e 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -4,11 +4,9 @@ # ################################################################################ -CRYPTOPP_VERSION = 5.6.3 +CRYPTOPP_VERSION = 5.6.5 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip CRYPTOPP_SITE = http://cryptopp.com/ -# Upstream patch needed to fix the build with gcc < 4.5 -CRYPTOPP_PATCH = https://github.com/weidai11/cryptopp/commit/f707b9ef1688d4429ca6239cf2dc236440974681.patch CRYPTOPP_LICENSE = Boost-v1.0 CRYPTOPP_LICENSE_FILES = License.txt CRYPTOPP_INSTALL_STAGING = YES From 5858973eaf767fcb08adc917cc9a4e13b782c0fb Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sat, 22 Oct 2016 09:08:31 -0300 Subject: [PATCH 1025/3392] linux-headers: bump 3.{2, 10, 12}.x and 4.{4, 7, 8}.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index d1e2ecfe04..ae2a3cde71 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -223,18 +223,18 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.82" if BR2_KERNEL_HEADERS_3_2 + default "3.2.83" if BR2_KERNEL_HEADERS_3_2 default "3.4.112" if BR2_KERNEL_HEADERS_3_4 - default "3.10.103" if BR2_KERNEL_HEADERS_3_10 - default "3.12.65" if BR2_KERNEL_HEADERS_3_12 + default "3.10.104" if BR2_KERNEL_HEADERS_3_10 + default "3.12.66" if BR2_KERNEL_HEADERS_3_12 default "3.14.79" if BR2_KERNEL_HEADERS_3_14 default "3.18.43" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.34" if BR2_KERNEL_HEADERS_4_1 - default "4.4.26" if BR2_KERNEL_HEADERS_4_4 + default "4.4.27" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 - default "4.7.9" if BR2_KERNEL_HEADERS_4_7 - default "4.8.3" if BR2_KERNEL_HEADERS_4_8 + default "4.7.10" if BR2_KERNEL_HEADERS_4_7 + default "4.8.4" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 1f84b980d9018db355bc80ead28f7c8617dc9468 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sat, 22 Oct 2016 09:08:32 -0300 Subject: [PATCH 1026/3392] linux: bump default to version 4.8.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index dc79d4274d..df8baf5f95 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.3)" + bool "Latest version (4.8.4)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.3" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.4" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 446debc47ef42db10e96973355f441da7685929a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Oct 2016 14:19:05 +0200 Subject: [PATCH 1027/3392] uclibc: update to 1.0.19 All patches are upstream. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- ...e-building-for-the-host-as-it-breaks.patch | 48 ---------- ...-remove-unneeded-and-false-linker-sc.patch | 89 ------------------- package/uclibc/0003-cleanup-libc.a.patch | 42 --------- ...de-copysgnl.c-if-UCLIBC_HAS_LONG_DOU.patch | 31 ------- ...-mips-mips64-build-for-old-compilers.patch | 28 ------ package/uclibc/uclibc.hash | 2 +- package/uclibc/uclibc.mk | 2 +- 7 files changed, 2 insertions(+), 240 deletions(-) delete mode 100644 package/uclibc/0001-locale-remove-building-for-the-host-as-it-breaks.patch delete mode 100644 package/uclibc/0002-ubacktrace-uargp-remove-unneeded-and-false-linker-sc.patch delete mode 100644 package/uclibc/0003-cleanup-libc.a.patch delete mode 100644 package/uclibc/0004-ppc-do-not-include-copysgnl.c-if-UCLIBC_HAS_LONG_DOU.patch delete mode 100644 package/uclibc/0005-fix-mips-mips64-build-for-old-compilers.patch diff --git a/package/uclibc/0001-locale-remove-building-for-the-host-as-it-breaks.patch b/package/uclibc/0001-locale-remove-building-for-the-host-as-it-breaks.patch deleted file mode 100644 index a04c6c6338..0000000000 --- a/package/uclibc/0001-locale-remove-building-for-the-host-as-it-breaks.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8c53e7524dfb9127b006e773307fdaa4df899a04 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Thu, 29 Sep 2016 11:40:52 +0200 -Subject: [PATCH] locale: remove building for the host, as it breaks - -Signed-off-by: Waldemar Brodkorb ---- - utils/Makefile.in | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/utils/Makefile.in b/utils/Makefile.in -index 5457776..8666f89 100644 ---- a/utils/Makefile.in -+++ b/utils/Makefile.in -@@ -64,10 +64,6 @@ BUILD_CFLAGS-ldd.host := \ - -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \ - -I$(top_srcdir)ldso/include \ - -include $(top_srcdir)include/elf.h --BUILD_CFLAGS-locale.host := \ -- -DNOT_IN_libc \ -- -I$(top_srcdir)utils/ \ -- -I. - BUILD_CFLAGS-iconv.host := \ - -include $(top_builddir)extra/locale/c8tables.h \ - -I$(top_srcdir)libc/misc/wchar -DL_iconv_main -@@ -97,7 +93,6 @@ endif - utils_OBJ := $(patsubst %,$(utils_OUT)/%,$(utils_OBJ)) - - hostutils_OBJ := $(patsubst %,%.host,$(utils_OBJ)) --hostutils_LOCALE_OBJ := $(patsubst %,%.host,$(utils_LOCALE_OBJ)) - - utils: $(utils_OBJ) $(utils_LOCALE_OBJ) - -@@ -109,10 +104,7 @@ $(utils_OBJ): $(utils_OUT)/% : $(utils_DIR)/%.c | $(libc) - $(utils_OUT)/locale: $(top_srcdir)extra/locale/programs/locale.c | $(libc) - $(compile.u) - --$(utils_OUT)/locale.host: $(top_srcdir)extra/locale/programs/locale.c | $(libc) -- $(hcompile.u) -- --hostutils: $(hostutils_OBJ) $(hostutils_LOCALE_OBJ) -+hostutils: $(hostutils_OBJ) - - $(hostutils_OBJ): $(utils_OUT)/%.host : $(utils_DIR)/%.c - $(hcompile.u) --- -2.1.4 - diff --git a/package/uclibc/0002-ubacktrace-uargp-remove-unneeded-and-false-linker-sc.patch b/package/uclibc/0002-ubacktrace-uargp-remove-unneeded-and-false-linker-sc.patch deleted file mode 100644 index dbb65c6bf6..0000000000 --- a/package/uclibc/0002-ubacktrace-uargp-remove-unneeded-and-false-linker-sc.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 15186b99774df74cf8ab02acd1a3f0ffd4c54ca1 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 30 Sep 2016 04:49:58 +0200 -Subject: [PATCH] ubacktrace/uargp: remove unneeded and false linker scripts - -Signed-off-by: Waldemar Brodkorb ---- - Rules.mak | 28 ---------------------------- - extra/Configs/Config.in | 9 +++------ - 2 files changed, 3 insertions(+), 34 deletions(-) - -diff --git a/Rules.mak b/Rules.mak -index 15dfa37..67189ff 100644 ---- a/Rules.mak -+++ b/Rules.mak -@@ -140,7 +140,6 @@ export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL - - LIBC := libc - SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) --UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION) - - UCLIBC_LDSO_NAME := ld-uClibc - ARCH_NATIVE_BIT := 32 -@@ -548,33 +547,6 @@ link.asneeded = $(if $(CC_FLAG_ASNEEDED),$(if $(CC_FLAG_NO_ASNEEDED),$(CC_FLAG_A - # Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it) - ifndef ASNEEDED - export ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(UCLIBC_LDSO) )" || echo "$(UCLIBC_LDSO)") -- --# Only used in installed libc.so linker script --ifeq ($(UCLIBC_HAS_BACKTRACE),y) --ifeq ($(HARDWIRED_ABSPATH),y) --UBACKTRACE_FULL_NAME := $(subst //,/,$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(UBACKTRACE_DSO)) --else --UBACKTRACE_FULL_NAME := $(UBACKTRACE_DSO) --endif --export UBACKTRACE_ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -q -- --as-needed && \ -- echo "GROUP ( AS_NEEDED ( $(UBACKTRACE_FULL_NAME) ) )" || \ -- echo "GROUP ( $(UBACKTRACE_FULL_NAME) )") --else --export UBACKTRACE_ASNEEDED:="" --endif --ifeq ($(UCLIBC_HAS_ARGP),y) --ifeq ($(HARDWIRED_ABSPATH),y) --# Only used in installed libc.so linker script --UARGP_FULL_NAME := $(subst //,/,$(RUNTIME_PREFIX)$(MULTILIB_DIR)/libuargp.so.$(MAJOR_VERSION)) --else --UARGP_FULL_NAME := libuargp.so.$(MAJOR_VERSION) --endif --export UARGP_ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -q -- --as-needed && \ -- echo "GROUP ( AS_NEEDED ( $(UARGP_FULL_NAME) ) )" || \ -- echo "GROUP ( $(UARGP_FULL_NAME) )") --else --export UARGP_ASNEEDED:="" --endif - endif - - # Add a bunch of extra pedantic annoyingly strict checks -diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in -index fc6669b..c5e54e1 100644 ---- a/extra/Configs/Config.in -+++ b/extra/Configs/Config.in -@@ -1896,8 +1896,6 @@ config UCLIBC_HAS_ARGP - `--help' and `--version' options. - A library can export an argp option parser, which programs can easily - use in conjunction with their own option parser. -- A new shared object "libuargp" is created. The "libc.so" linker script -- contains the AS_NEEDED entry for getting the libuargp linked automatically. - Argp support is needed by elfutils libdw. - - Most people can safely answer N. -@@ -2391,12 +2389,11 @@ config UCLIBC_HAS_BACKTRACE - bool "Add support for application self-debugging" - depends on HAVE_SHARED - help -- Answer Y here to compile support for application self-debugging, by adding -- a new shared object "libubacktrace.so" that provides the following new -- functions: -+ Answer Y here to compile support for application self-debugging that -+ provides the following new functions: - backtrace, backtrace_symbols, backtrace_symbols_fd - -- The backtrace functionality is currently supported on SH platform, and it -+ The backtrace functionality is currently supported on some platforms, and it - based on dwarf2 informations to properly work, so any application that - want to use backtrace needs to be built with -fexceptions flag. - --- -2.1.4 - diff --git a/package/uclibc/0003-cleanup-libc.a.patch b/package/uclibc/0003-cleanup-libc.a.patch deleted file mode 100644 index 5fa27092f8..0000000000 --- a/package/uclibc/0003-cleanup-libc.a.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9b1077dc70e52ee85a718bce3fcfec7ae9af2967 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Sat, 8 Oct 2016 05:43:09 +0200 -Subject: [PATCH] cleanup libc.a - -The nested libpthread_nonshared.a and libdl.os shouldn't be included -in the static libc.a. Fixes compile issues for static builds. - -Signed-off-by: Waldemar Brodkorb ---- - libc/Makefile.in | 1 - - libpthread/nptl/Makefile.in | 2 -- - 2 files changed, 3 deletions(-) - -diff --git a/libc/Makefile.in b/libc/Makefile.in -index 55fd3d3..85986a7 100644 ---- a/libc/Makefile.in -+++ b/libc/Makefile.in -@@ -44,7 +44,6 @@ endif - - libc-a-y += $(libnsl-a-y) - libc-a-y += $(libresolv-a-y) --libc-a-$(HAVE_SHARED) += $(libdl-a-y) - libc-a-y += $(libm-a-y) - libc-a-$(UCLIBC_HAS_LIBUTIL) += $(libutil-a-y) - libc-a-$(UCLIBC_HAS_CRYPT) += $(libcrypt-a-y) -diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in -index 0fc83e2..068eee4 100644 ---- a/libpthread/nptl/Makefile.in -+++ b/libpthread/nptl/Makefile.in -@@ -41,8 +41,6 @@ else - libpthread-a-y := $(libpthread-static-y) - endif - --libpthread-a-y += $(top_builddir)lib/libpthread_nonshared.a -- - libc-shared-routines-y := $(filter-out $(notdir $(libpthread_libc_OBJS:.o=.c)), $(libc-shared-routines-y)) - libc-static-routines-y := $(filter-out $(notdir $(libpthread_libc_OBJS:.o=.c)), $(libc-static-routines-y)) - libc-shared-routines-y := $(addprefix $(libpthread_OUT)/,$(libc-shared-routines-y:.c=.oS)) --- -2.1.4 - diff --git a/package/uclibc/0004-ppc-do-not-include-copysgnl.c-if-UCLIBC_HAS_LONG_DOU.patch b/package/uclibc/0004-ppc-do-not-include-copysgnl.c-if-UCLIBC_HAS_LONG_DOU.patch deleted file mode 100644 index 686e15fc76..0000000000 --- a/package/uclibc/0004-ppc-do-not-include-copysgnl.c-if-UCLIBC_HAS_LONG_DOU.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7136bb422a0681d787d07dc2936f08395b8a1007 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Sat, 8 Oct 2016 18:03:27 +0200 -Subject: [PATCH] ppc: do not include copysgnl.c if - UCLIBC_HAS_LONG_DOUBLE_MATH enabled - -Fixes compilation of uClibc-ng when UCLIBC_HAS_LONG_DOUBLE_MATH is -used. - -Signed-off-by: Waldemar Brodkorb ---- - libc/sysdeps/linux/powerpc/Makefile.arch | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libc/sysdeps/linux/powerpc/Makefile.arch b/libc/sysdeps/linux/powerpc/Makefile.arch -index 7c09c87..f0144e7 100644 ---- a/libc/sysdeps/linux/powerpc/Makefile.arch -+++ b/libc/sysdeps/linux/powerpc/Makefile.arch -@@ -5,7 +5,8 @@ - # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - # - --CSRC-y := __syscall_error.c ioctl.c copysignl.c -+CSRC-y := __syscall_error.c ioctl.c -+CSRC-$(if $(UCLIBC_HAS_LONG_DOUBLE_MATH),,y) += copysignl.c - - SSRC-y := \ - __longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \ --- -2.1.4 - diff --git a/package/uclibc/0005-fix-mips-mips64-build-for-old-compilers.patch b/package/uclibc/0005-fix-mips-mips64-build-for-old-compilers.patch deleted file mode 100644 index 1475132681..0000000000 --- a/package/uclibc/0005-fix-mips-mips64-build-for-old-compilers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 43c4bbf3e0e61f5f487a00a0066816913503656c Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Sun, 9 Oct 2016 20:15:00 +0200 -Subject: [PATCH] fix mips/mips64 build for old compilers - -Signed-off-by: Waldemar Brodkorb ---- - Rules.mak | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Rules.mak b/Rules.mak -index 67189ff..b9dbf25 100644 ---- a/Rules.mak -+++ b/Rules.mak -@@ -404,8 +404,8 @@ ifeq ($(TARGET_ARCH),mips) - CPU_CFLAGS-$(CONFIG_MIPS_N64_ABI)+=-mabi=64 - CPU_CFLAGS-$(CONFIG_MIPS_O32_ABI)+=-mabi=32 - CPU_CFLAGS-$(CONFIG_MIPS_N32_ABI)+=-mabi=n32 -- CPU_CFLAGS-$(CONFIG_MIPS_NAN_LEGACY)+=-mnan=legacy -- CPU_CFLAGS-$(CONFIG_MIPS_NAN_2008)+=-mnan=2008 -+ CPU_CFLAGS-$(CONFIG_MIPS_NAN_LEGACY)+=$(call check_gcc,-mnan=legacy) -+ CPU_CFLAGS-$(CONFIG_MIPS_NAN_2008)+=$(call check_gcc,-mnan=2008) - CPU_LDFLAGS-y += $(CPU_CFLAGS) - endif - --- -2.1.4 - diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index ebc2dc064e..227c78304c 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,2 +1,2 @@ # From http://www.uclibc-ng.org/ -sha256 5430bb3acde31d70db906be33e3e2a022beba42b50f2c56695d37344560e253f uClibc-ng-1.0.18.tar.xz +sha256 b3f94d67e9afcefb158a37011584e0d41ef3bd55ad72255a26abb25ad49b77a1 uClibc-ng-1.0.19.tar.xz diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index da83d8a8e8..3f383a8033 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.18 +UCLIBC_VERSION = 1.0.19 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPLv2.1+ From 91f8f41dab07362224e1537436f594ae45871f03 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 Oct 2016 11:25:10 +0200 Subject: [PATCH 1028/3392] package/ffmpeg: renumber patch 0013 -> 0001 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...le-optimization.patch => 0001-bfin-disable-optimization.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/ffmpeg/{0013-bfin-disable-optimization.patch => 0001-bfin-disable-optimization.patch} (100%) diff --git a/package/ffmpeg/0013-bfin-disable-optimization.patch b/package/ffmpeg/0001-bfin-disable-optimization.patch similarity index 100% rename from package/ffmpeg/0013-bfin-disable-optimization.patch rename to package/ffmpeg/0001-bfin-disable-optimization.patch From 5dc5f08a0940ade2977023f4ee772c4dffa87b16 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 Oct 2016 11:25:11 +0200 Subject: [PATCH 1029/3392] package/ffmpeg: bump version to 3.1.5 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 160e31d8e9..7b1e1400eb 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a80cb378dda5c9bbcdbd62a99bdec0e4eedbcb47f290e72845af4855c1146b5b ffmpeg-3.1.4.tar.xz +sha256 49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a ffmpeg-3.1.5.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 52a39dee0e..52d2f38cfd 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.1.4 +FFMPEG_VERSION = 3.1.5 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From 4419eb90423d0fad999b0d7e3d6bc9fc7f85e18f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 23 Oct 2016 11:26:59 +0200 Subject: [PATCH 1030/3392] lua-csnappy: bump to version 0.1.4 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-csnappy/lua-csnappy.hash | 2 +- package/lua-csnappy/lua-csnappy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lua-csnappy/lua-csnappy.hash b/package/lua-csnappy/lua-csnappy.hash index 2864c3fd9c..136363497f 100644 --- a/package/lua-csnappy/lua-csnappy.hash +++ b/package/lua-csnappy/lua-csnappy.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3504789c7832f4ed3d7aef47ba9d62940985cde7556284db2233842bfb7d8876 lua-csnappy-0.1.3-1.src.rock +sha256 855331feb8e09a32eea8366ab9bcd4386db6392de82383f08ae5e59adbb7d8a6 lua-csnappy-0.1.4-1.src.rock diff --git a/package/lua-csnappy/lua-csnappy.mk b/package/lua-csnappy/lua-csnappy.mk index 60b92acfc5..073925917d 100644 --- a/package/lua-csnappy/lua-csnappy.mk +++ b/package/lua-csnappy/lua-csnappy.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CSNAPPY_VERSION_UPSTREAM = 0.1.3 +LUA_CSNAPPY_VERSION_UPSTREAM = 0.1.4 LUA_CSNAPPY_VERSION = $(LUA_CSNAPPY_VERSION_UPSTREAM)-1 LUA_CSNAPPY_SUBDIR = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM) LUA_CSNAPPY_LICENSE = BSD-3c From d250914f3c17866f0f4a4715b0cced9f26ca756b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 23 Oct 2016 11:27:00 +0200 Subject: [PATCH 1031/3392] lua-messagepack: bump to version 0.3.5 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-messagepack/lua-messagepack.hash | 4 ++-- package/lua-messagepack/lua-messagepack.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-messagepack/lua-messagepack.hash b/package/lua-messagepack/lua-messagepack.hash index b46b686f81..87e42d898d 100644 --- a/package/lua-messagepack/lua-messagepack.hash +++ b/package/lua-messagepack/lua-messagepack.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 be6827c93383c8d7214c9ac9b7a62ab04186db4c6c2a3a7b36036157784f58b8 lua-messagepack-0.3.4-1.src.rock -sha256 5ab74601696973a66802de1fec614859db0d93d5fa960fac0f70cb04a490e5e5 lua-messagepack-lua53-0.3.4-1.src.rock +sha256 7136e47a37f01960c244fe0ad42215e2cf6e96f50cb7292c5295fa3e93fd50c1 lua-messagepack-0.3.5-1.src.rock +sha256 b8d1c3cff8eef0b8ef1a3287228cfac4149933744235d3a5d88d65d4e3b048bb lua-messagepack-lua53-0.3.5-1.src.rock diff --git a/package/lua-messagepack/lua-messagepack.mk b/package/lua-messagepack/lua-messagepack.mk index 18a4e4ab29..f8cc132dcf 100644 --- a/package/lua-messagepack/lua-messagepack.mk +++ b/package/lua-messagepack/lua-messagepack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.3.4 +LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.3.5 ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_MESSAGEPACK_VERSION = lua53-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 else From 873d4019f7fb00f6a80592224236b3ba7d657865 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Oct 2016 00:04:22 +0200 Subject: [PATCH 1032/3392] package/gcc: disable libmpx for gcc6-based musl builds Building this minimal defconfig BR2_TOOLCHAIN_BUILDROOT_MUSL=y BR2_GCC_VERSION_6_X=y fails: In file included from ../../../../libmpx/mpxrt/mpxrt.c:54:0: ../../../../libmpx/mpxrt/mpxrt.c: In function 'read_mpx_status_sig': ../../../../libmpx/mpxrt/mpxrt.h:52:42: error: invalid application of 'sizeof' to incomplete type 'struct _libc_fpstate' #define XSAVE_OFFSET_IN_FPMEM sizeof (struct _libc_fpstate) To fix disable libmpx for musl builds, other projects did the same: https://github.com/crosstool-ng/crosstool-ng/commit/3ec2211548a853203e070af6810f49825ec46a6a http://git.alpinelinux.org/cgit/aports/commit/main/gcc/APKBUILD?id=1830e485126ea9a95d763317fb0c508c1ff297d2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/gcc/gcc.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index c971151b36..464e4c98e2 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -116,6 +116,11 @@ ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) HOST_GCC_COMMON_CONF_OPTS += --disable-libitm endif +# libmpx uses secure_getenv and struct _libc_fpstate not present in musl +ifeq ($(BR2_TOOLCHAIN_BUILDROOT_MUSL)$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),yy) +HOST_GCC_COMMON_CONF_OPTS += --disable-libmpx +endif + # quadmath support requires wchar ifeq ($(BR2_USE_WCHAR)$(BR2_TOOLCHAIN_HAS_LIBQUADMATH),yy) HOST_GCC_COMMON_CONF_OPTS += --enable-libquadmath From 8740f321fcd2b245e3585b319e2a87aa361656cd Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 21 Oct 2016 22:27:15 +0200 Subject: [PATCH 1033/3392] pkg-download: fix fetching URLs with ? from PRIMARY/BACKUP Some packages download files (especially patches) with a ? in the URL. The ? marks the query part of the URL. However, the downloaded file still contains the ? but from then on it doesn't designate a query part anymore. Therefore, when fetching from PRIMARY or BACKUP site over http, the server will report a 404 Not Found. To fix, we need to replace the ? with %3F. Obviously, this should be done only when fetching from PRIMARY or BACKUP. For fetching from the real upstream, the ? really does designate the query part. Fixes #9371. Reported-by: Johan Derycke Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: replace 'SECONDARY' by 'BACKUP'.] Signed-off-by: Thomas Petazzoni --- package/pkg-download.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 0f542e6882..cfc550e77b 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -210,6 +210,10 @@ endef # # E.G. use like this: # $(call DOWNLOAD,$(FOO_SITE)) +# +# For PRIMARY and BACKUP site, any ? in the URL is replaced by %3F. A ? in +# the URL is used to separate query arguments, but the PRIMARY and BACKUP +# sites serve just plain files. ################################################################################ define DOWNLOAD @@ -226,7 +230,7 @@ define DOWNLOAD_INNER 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 ;; \ + *) $(call $(3)_WGET,$(BR2_PRIMARY_SITE)/$(subst ?,%3F,$(2)),$(2)) && exit ;; \ esac ; \ fi ; \ if test "$(BR2_PRIMARY_SITE_ONLY)" = "y" ; then \ @@ -245,7 +249,7 @@ define DOWNLOAD_INNER esac ; \ fi ; \ if test -n "$(call qstrip,$(BR2_BACKUP_SITE))" ; then \ - $(call $(3)_WGET,$(BR2_BACKUP_SITE)/$(2),$(2)) && exit ; \ + $(call $(3)_WGET,$(BR2_BACKUP_SITE)/$(subst ?,%3F,$(2)),$(2)) && exit ; \ fi ; \ exit 1 endef From c457213fbca5f3493544c8a4335b623620458b0c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 12 Sep 2016 23:31:07 +0200 Subject: [PATCH 1034/3392] php: rework selection of interfaces Following suggestion of Yann Morin, rework selection of php interfaces: use booleans instead of choice to be able to select multiple interfaces as they are not exclusive. We make sure at least one of the options is selected. It should be noted that previously CGI and FPM could not be selected at the same time. This is now possible. Bug that prevented compilation of CGI and FPM binaries at the same time has been fixed since PHP 5.4 (https://github.com/php-build/php-build/issues/101). Legacy handling is added for the two options that are removed, and the appropriate new options are selected. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 16 +++++++++++++++ package/php/Config.in | 46 ++++++------------------------------------- package/php/php.mk | 8 ++++---- 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f26f97f224..50ccedd056 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,22 @@ endif ############################################################################### comment "Legacy options removed in 2016.11" +config BR2_PACKAGE_PHP_SAPI_CLI_CGI + bool "PHP CGI and CLI options are now seperate" + select BR2_PACKAGE_PHP_SAPI_CLI + select BR2_PACKAGE_PHP_SAPI_CGI + help + The PHP Interface options have been split up into a + separate option for each interface. + +config BR2_PACKAGE_PHP_SAPI_CLI_FPM + bool "PHP CLI and FPM options are now separate" + select BR2_PACKAGE_PHP_SAPI_CLI + select BR2_PACKAGE_PHP_SAPI_FPM + help + The PHP Interface options have been split up into a + separate option for each interface. + config BR2_PACKAGE_WVSTREAMS bool "wvstreams removed" select BR2_LEGACY diff --git a/package/php/Config.in b/package/php/Config.in index eee8d264d6..2e9e344339 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_PHP bool "php" + select BR2_PACKAGE_PHP_SAPI_CGI if \ + !BR2_PACKAGE_PHP_SAPI_CLI && \ + !BR2_PACKAGE_PHP_SAPI_FPM help PHP is a widely-used general-purpose scripting language that is especially suited for Web development @@ -9,61 +12,24 @@ config BR2_PACKAGE_PHP if BR2_PACKAGE_PHP -config BR2_PACKAGE_PHP_CLI - bool - -config BR2_PACKAGE_PHP_CGI - bool - -config BR2_PACKAGE_PHP_FPM - bool - -choice - prompt "Interface" - default BR2_PACKAGE_PHP_SAPI_CGI - help - Select the PHP interface(s). - config BR2_PACKAGE_PHP_SAPI_CGI - bool "CGI" + bool "CGI interface" # CGI uses fork() depends on BR2_USE_MMU - select BR2_PACKAGE_PHP_CGI help Common Gateway Interface config BR2_PACKAGE_PHP_SAPI_CLI - bool "CLI" - select BR2_PACKAGE_PHP_CLI + bool "CLI interface" help Command Line Interface config BR2_PACKAGE_PHP_SAPI_FPM - bool "FPM" + bool "FPM interface" depends on BR2_USE_MMU - select BR2_PACKAGE_PHP_FPM help PHP-FPM (FastCGI Process Manager) -config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "CGI and CLI" - # CGI uses fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_PHP_CLI - select BR2_PACKAGE_PHP_CGI - help - Command line and Common gateway interfaces - -config BR2_PACKAGE_PHP_SAPI_CLI_FPM - bool "FPM and CLI" - depends on BR2_USE_MMU - select BR2_PACKAGE_PHP_CLI - select BR2_PACKAGE_PHP_FPM - help - Command line and PHP-FPM (FastCGI Process Manager) - -endchoice - source "package/php/Config.ext" endif diff --git a/package/php/php.mk b/package/php/php.mk index f925ec1eba..f85cb371c2 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -77,9 +77,9 @@ else PHP_CONF_ENV += ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=no endif -PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli) -PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi) -PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm) +PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CLI),--enable-cli,--disable-cli) +PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CGI),--enable-cgi,--disable-cgi) +PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_FPM),--enable-fpm,--disable-fpm) ### Extensions PHP_CONF_OPTS += \ @@ -285,7 +285,7 @@ PHP_CONF_OPTS += \ PHP_DEPENDENCIES += jpeg libpng freetype endif -ifeq ($(BR2_PACKAGE_PHP_FPM),y) +ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y) define PHP_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(@D)/sapi/fpm/init.d.php-fpm \ $(TARGET_DIR)/etc/init.d/S49php-fpm From 90e38737a699a25f577684742c767375e74683c5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 24 Oct 2016 05:21:51 +0200 Subject: [PATCH 1035/3392] uclibc: fix pthread.h Fixes: bfin: http://autobuild.buildroot.net/results/fbf/fbf63bbe0974b490b875a95fb930ba601364b85a/ m68k: http://autobuild.buildroot.net/results/cc9/cc9b87c4c695f97a056cc53f19e7662750dffeff/ microblazeel: http://autobuild.buildroot.net/results/941/941c06e29f6542e258f20799dc6f3f94b2f8af88/ Reported-by: Thomas Petazzoni Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../0001-linuxthreads-add-back-signal.h.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/uclibc/0001-linuxthreads-add-back-signal.h.patch diff --git a/package/uclibc/0001-linuxthreads-add-back-signal.h.patch b/package/uclibc/0001-linuxthreads-add-back-signal.h.patch new file mode 100644 index 0000000000..1a957c5bca --- /dev/null +++ b/package/uclibc/0001-linuxthreads-add-back-signal.h.patch @@ -0,0 +1,28 @@ +From 543308f6c46cf2edf8a524bc9c631e472570fe72 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Mon, 24 Oct 2016 05:15:07 +0200 +Subject: [PATCH] linuxthreads: add back signal.h + +Somehow this got removed with f1d7505e40654a185843bdc8f1cf1fd00ab55c04. + +Reported-by: Thomas Petazzoni +Signed-off-by: Waldemar Brodkorb +--- + libpthread/linuxthreads/sysdeps/pthread/pthread.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libpthread/linuxthreads/sysdeps/pthread/pthread.h b/libpthread/linuxthreads/sysdeps/pthread/pthread.h +index cf043b5..cc13a52 100644 +--- a/libpthread/linuxthreads/sysdeps/pthread/pthread.h ++++ b/libpthread/linuxthreads/sysdeps/pthread/pthread.h +@@ -20,6 +20,7 @@ + #include + #include + ++#include + #include + #include + +-- +2.1.4 + From 548b0d541c8bdd890d7af5eb3094c4a606304c63 Mon Sep 17 00:00:00 2001 From: Chris Frederick Date: Mon, 24 Oct 2016 09:13:18 -0500 Subject: [PATCH 1036/3392] postgresql: enable ldap support for pg_service.conf Just needed to add --with-ldap to POSTGRESQL_CONF_OPTS and add openldap to POSTGRESQL_DEPENDENCIES when BR2_PACKAGE_OPENLDAP is on Signed-off-by: Chris Frederick Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index e2756bf10d..1b184e71e1 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -57,6 +57,13 @@ POSTGRESQL_DEPENDENCIES += openssl POSTGRESQL_CONF_OPTS += --with-openssl endif +ifeq ($(BR2_PACKAGE_OPENLDAP),y) +POSTGRESQL_DEPENDENCIES += openldap +POSTGRESQL_CONF_OPTS += --with-ldap +else +POSTGRESQL_CONF_OPTS += --without-ldap +endif + define POSTGRESQL_USERS postgres -1 postgres -1 * /var/lib/pgsql /bin/sh - PostgreSQL Server endef From c77f7c689ffc8c5fd139e4622bd6f9d315bbc254 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 23 Oct 2016 19:59:11 +0200 Subject: [PATCH 1037/3392] openzwave: fix compilation of MinOZW LIBDIR was used in cpp/examples/MinOZW/Makefile to add dynamic libraries. However, as it was unset by default, the cross-compilation could fail if the host had a library such as libnss3.so in /. To fix this issue, this patch sets LIBDIR to top_buildir if it is unset Fixes: http://autobuild.buildroot.net/results/68719fdf1320a69310bada6d3c47654dacdb5898 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/openzwave/openzwave.hash | 1 + package/openzwave/openzwave.mk | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/package/openzwave/openzwave.hash b/package/openzwave/openzwave.hash index cd1231f80d..d07961edb6 100644 --- a/package/openzwave/openzwave.hash +++ b/package/openzwave/openzwave.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 abfb4c7e7728e86ba374c2e0ef7de912594eb24a8c44935457352df844530238 openzwave-V1.5.tar.gz +sha256 98851964fd8de3dd40f00d0032b47c61c17a4cf789ad5792e14149da5ab8755e 599e2a11c6f48dde744012ec45686c08e15f3059.patch diff --git a/package/openzwave/openzwave.mk b/package/openzwave/openzwave.mk index 2723086b82..199d9e1bd0 100644 --- a/package/openzwave/openzwave.mk +++ b/package/openzwave/openzwave.mk @@ -13,6 +13,12 @@ OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \ OPENZWAVE_DEPENDENCIES = host-pkgconf udev OPENZWAVE_INSTALL_STAGING = YES +# This patch fixes incorrect default value of LIBDIR: +# http://autobuild.buildroot.net/results/68719fdf1320a69310bada6d3c47654dacdb5898 +# This patch is currently in dev branch and will be a part of v1.6 +OPENZWAVE_PATCH = \ + https://github.com/OpenZWave/open-zwave/commit/599e2a11c6f48dde744012ec45686c08e15f3059.patch + # Set instlibdir to install libopenzwave.so* in the correct directory # otherwise openzwave will check that /lib64 exists (on the host) to # know if the library should be installed in $(PREFIX)/lib or $(PREFIX)/lib64. From c087cbe5c09f70657ca7f2b2061c37afdf109ed1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Oct 2016 18:46:00 +0200 Subject: [PATCH 1038/3392] legacy: add missing select When adding a boolean option to legacy, it should slect BR2_LEGACY, to trigger the legacy warning. Signed-off-by: "Yann E. MORIN" Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Config.in.legacy b/Config.in.legacy index 50ccedd056..8c41b05095 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -149,6 +149,7 @@ config BR2_PACKAGE_PHP_SAPI_CLI_CGI bool "PHP CGI and CLI options are now seperate" select BR2_PACKAGE_PHP_SAPI_CLI select BR2_PACKAGE_PHP_SAPI_CGI + select BR2_LEGACY help The PHP Interface options have been split up into a separate option for each interface. @@ -157,6 +158,7 @@ config BR2_PACKAGE_PHP_SAPI_CLI_FPM bool "PHP CLI and FPM options are now separate" select BR2_PACKAGE_PHP_SAPI_CLI select BR2_PACKAGE_PHP_SAPI_FPM + select BR2_LEGACY help The PHP Interface options have been split up into a separate option for each interface. From b976195d995ecd2d82c5cf76af2e4f0ef8521133 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 24 Oct 2016 16:51:06 -0200 Subject: [PATCH 1039/3392] util-linux: select ncurses when "pg" is selected Fixes: http://autobuild.buildroot.net/results/63374203f32d2e9407531b53cd5d8f2665944fbe http://autobuild.buildroot.net/results/6279cd6f45f54ed5857a2fc08a21d9e257b6bc4b http://autobuild.buildroot.net/results/5604c56c0c92483d28e51eb4e70a9741c3c4effe Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/util-linux/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 0c33919858..9b70f9f58d 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -252,6 +252,7 @@ comment "nsenter needs a toolchain w/ headers >= 3.0" config BR2_PACKAGE_UTIL_LINUX_PG bool "pg" depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_NCURSES help Browse pagewise through text files From 8087b02bdf42f0caa434ef1faa1fa124b1cbb1a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 28 Sep 2016 10:00:56 +0200 Subject: [PATCH 1040/3392] toolchain/wrapper: fix 'reinstall' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit toolchain-wrapper was not reinstalled. So rules toolchain-external-reinstall, gcc-initial-reinstall, gcc-final-reinstall didn't work as expected. In add, normalize variable name: s/TOOLCHAIN_BUILD_WRAPPER/TOOLCHAIN_WRAPPER_BUILD/ Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-final/gcc-final.mk | 3 ++- package/gcc/gcc-initial/gcc-initial.mk | 3 ++- toolchain/toolchain-external/toolchain-external.mk | 3 ++- toolchain/toolchain-wrapper.mk | 11 +++++++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 910427340a..c9ee476fb7 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -113,7 +113,8 @@ endef HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_CREATE_CC_SYMLINKS HOST_GCC_FINAL_TOOLCHAIN_WRAPPER_ARGS += $(HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS) -HOST_GCC_FINAL_POST_BUILD_HOOKS += TOOLCHAIN_BUILD_WRAPPER +HOST_GCC_FINAL_POST_BUILD_HOOKS += TOOLCHAIN_WRAPPER_BUILD +HOST_GCC_FINAL_POST_INSTALL_HOOKS += TOOLCHAIN_WRAPPER_INSTALL # Note: this must be done after CREATE_CC_SYMLINKS, otherwise the # -cc symlink to the wrapper is not created. HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index aa88a6808f..7bb988bdf7 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -61,7 +61,8 @@ HOST_GCC_INITIAL_INSTALL_OPTS += install-target-libgcc endif HOST_GCC_INITIAL_TOOLCHAIN_WRAPPER_ARGS += $(HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS) -HOST_GCC_INITIAL_POST_BUILD_HOOKS += TOOLCHAIN_BUILD_WRAPPER +HOST_GCC_INITIAL_POST_BUILD_HOOKS += TOOLCHAIN_WRAPPER_BUILD +HOST_GCC_INITIAL_POST_INSTALL_HOOKS += TOOLCHAIN_WRAPPER_INSTALL HOST_GCC_INITIAL_POST_INSTALL_HOOKS += HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS $(eval $(host-autotools-package)) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 141dd10fd4..d3608d082b 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -770,9 +770,10 @@ define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO fi endef -TOOLCHAIN_EXTERNAL_BUILD_CMDS = $(TOOLCHAIN_BUILD_WRAPPER) +TOOLCHAIN_EXTERNAL_BUILD_CMDS = $(TOOLCHAIN_WRAPPER_BUILD) define TOOLCHAIN_EXTERNAL_INSTALL_STAGING_CMDS + $(TOOLCHAIN_WRAPPER_INSTALL) $(TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK) $(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS) $(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC) diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index af39071cf3..e7aa5fb829 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -30,11 +30,14 @@ ifeq ($(BR2_CCACHE_USE_BASEDIR),y) TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"' endif -# For simplicity, build directly into the install location -define TOOLCHAIN_BUILD_WRAPPER - $(Q)mkdir -p $(HOST_DIR)/usr/bin +define TOOLCHAIN_WRAPPER_BUILD $(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \ -s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \ toolchain/toolchain-wrapper.c \ - -o $(HOST_DIR)/usr/bin/toolchain-wrapper + -o $(@D)/toolchain-wrapper +endef + +define TOOLCHAIN_WRAPPER_INSTALL + $(INSTALL) -D -m 0755 $(@D)/toolchain-wrapper \ + $(HOST_DIR)/usr/bin/toolchain-wrapper endef From 1cbef932b9c5bda880dcb49509252519ac6aa880 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Mon, 24 Oct 2016 23:00:46 +0200 Subject: [PATCH 1041/3392] package/ts4900-fpga: remove the default value of the _INSTALL_{IMAGES, TARGET} variables Signed-off-by: Jerzy Grzegorek Signed-off-by: Thomas Petazzoni --- package/ts4900-fpga/ts4900-fpga.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index e0d351fad9..ed951b8c8f 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -10,9 +10,6 @@ TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900- # No license file provided, Yocto recipe from the vendor claims MIT. # https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 -TS4900_FPGA_INSTALL_IMAGES = NO -TS4900_FPGA_INSTALL_TARGET = YES - define TS4900_FPGA_EXTRACT_CMDS cp $(DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) endef From 8a5224415ceb61e5340e4dd92028b37ce57ca849 Mon Sep 17 00:00:00 2001 From: Chris Frederick Date: Thu, 20 Oct 2016 12:54:13 -0500 Subject: [PATCH 1042/3392] firejail: new package Firejail Security Sandbox https://firejail.wordpress.com/ Lightweight application sandboxing system using seccomp and kernel namespaces. Signed-off-by: Chris Frederick Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/firejail/Config.in | 12 ++++++++++++ package/firejail/firejail.hash | 2 ++ package/firejail/firejail.mk | 24 ++++++++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 package/firejail/Config.in create mode 100644 package/firejail/firejail.hash create mode 100644 package/firejail/firejail.mk diff --git a/package/Config.in b/package/Config.in index 9399f63b26..be204783b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1710,6 +1710,7 @@ menu "System tools" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" source "package/emlog/Config.in" + source "package/firejail/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" source "package/htop/Config.in" diff --git a/package/firejail/Config.in b/package/firejail/Config.in new file mode 100644 index 0000000000..8b5b66a73c --- /dev/null +++ b/package/firejail/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_FIREJAIL + bool "firejail" + help + Firejail is a SUID program that reduces the risk of security + breaches by restricting the running environment of untrusted + applications using Linux namespaces and seccomp-bpf. It + allows a process and all its descendants to have their own + private view of the globally shared kernel resources, such + as the network stack, process table, mount table. + + https://firejail.wordpress.com/ + diff --git a/package/firejail/firejail.hash b/package/firejail/firejail.hash new file mode 100644 index 0000000000..dc2eb809a7 --- /dev/null +++ b/package/firejail/firejail.hash @@ -0,0 +1,2 @@ +# From http://download.sourceforge.net/firejail/firejail-0.9.42.asc +sha256 4f3bceee973b84fdf13a5d5ab0060d140ecc8e42c19c945e7fb93f0fd8499b47 firejail-0.9.42.tar.xz diff --git a/package/firejail/firejail.mk b/package/firejail/firejail.mk new file mode 100644 index 0000000000..ec02ea4024 --- /dev/null +++ b/package/firejail/firejail.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# firejail +# +################################################################################ + +FIREJAIL_VERSION = 0.9.42 +FIREJAIL_SITE = http://download.sourceforge.net/firejail +FIREJAIL_SOURCE = firejail-$(FIREJAIL_VERSION).tar.xz +FIREJAIL_LICENSE = GPLv2 +FIREJAIL_LICENSE_FILES = COPYING +FIREJAIL_CONF_OPTS = \ + --enable-bind \ + --enable-busybox-workaround \ + --enable-file-transfer \ + --enable-network \ + --enable-seccomp \ + --enable-userns + +define FIREJAIL_PERMISSIONS + /usr/bin/firejail f 4755 0 0 - - - - - +endef + +$(eval $(autotools-package)) From cebf8219f319d1153fa10a1d43d02577bff5b966 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 22 Oct 2016 15:03:17 +0200 Subject: [PATCH 1043/3392] rp-pppoe: pass the appropriate path for various tools The rp-pppoe configure script uses AC_PATH_PROG() to find the path of a number of tools on the build machine. But in fact, those paths are not used to call the tools on the build machine, but rather to replace variables in scripts that are executed in the target. Due to this, if those tools on the build machine are not located at the same place as their equivalent in the target, the scripts will fail to run. To address this, we pass the necessary cache variables to override the autoconf checks. The path from pppd has been taken from the build result of the pppd package. The path for setsid, id and echo have been taken from the build result of Busybox, assuming that full-blown variants of those tools would be installed at the same location. Fixes bug #8811. Signed-off-by: Thomas Petazzoni --- package/rp-pppoe/rp-pppoe.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index 43062549b8..99d231e579 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -15,8 +15,16 @@ RP_PPPOE_TARGET_SCRIPTS = pppoe-connect pppoe-init pppoe-setup pppoe-start \ pppoe-status pppoe-stop RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION) RP_PPPOE_CONF_OPTS = --disable-debugging + +# The pppd, echo, setsid and id paths must be the ones on the +# target. Indeed, the result of these checks is used to replace +# variables in scripts that are installed in the target. RP_PPPOE_CONF_ENV = \ rpppoe_cv_pack_bitfields=normal \ + ac_cv_path_PPPD=/usr/sbin/pppd \ + ac_cv_path_ECHO=/bin/echo \ + ac_cv_path_SETSID=/usr/bin/setsid \ + ac_cv_path_ID=/usr/bin/id \ PPPD_H=$(PPPD_DIR)/pppd/pppd.h define RP_PPPOE_INSTALL_TARGET_CMDS From 63ed0574e50cea85c3cc203c7e9cc999d28ea845 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 24 Oct 2016 23:43:18 +0200 Subject: [PATCH 1044/3392] Revert "firejail: new package" This reverts commit 8a5224415ceb61e5340e4dd92028b37ce57ca849. It was kept applied by mistake. Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 - package/firejail/Config.in | 12 ------------ package/firejail/firejail.hash | 2 -- package/firejail/firejail.mk | 24 ------------------------ 4 files changed, 39 deletions(-) delete mode 100644 package/firejail/Config.in delete mode 100644 package/firejail/firejail.hash delete mode 100644 package/firejail/firejail.mk diff --git a/package/Config.in b/package/Config.in index be204783b4..9399f63b26 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1710,7 +1710,6 @@ menu "System tools" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" source "package/emlog/Config.in" - source "package/firejail/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" source "package/htop/Config.in" diff --git a/package/firejail/Config.in b/package/firejail/Config.in deleted file mode 100644 index 8b5b66a73c..0000000000 --- a/package/firejail/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_FIREJAIL - bool "firejail" - help - Firejail is a SUID program that reduces the risk of security - breaches by restricting the running environment of untrusted - applications using Linux namespaces and seccomp-bpf. It - allows a process and all its descendants to have their own - private view of the globally shared kernel resources, such - as the network stack, process table, mount table. - - https://firejail.wordpress.com/ - diff --git a/package/firejail/firejail.hash b/package/firejail/firejail.hash deleted file mode 100644 index dc2eb809a7..0000000000 --- a/package/firejail/firejail.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://download.sourceforge.net/firejail/firejail-0.9.42.asc -sha256 4f3bceee973b84fdf13a5d5ab0060d140ecc8e42c19c945e7fb93f0fd8499b47 firejail-0.9.42.tar.xz diff --git a/package/firejail/firejail.mk b/package/firejail/firejail.mk deleted file mode 100644 index ec02ea4024..0000000000 --- a/package/firejail/firejail.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# firejail -# -################################################################################ - -FIREJAIL_VERSION = 0.9.42 -FIREJAIL_SITE = http://download.sourceforge.net/firejail -FIREJAIL_SOURCE = firejail-$(FIREJAIL_VERSION).tar.xz -FIREJAIL_LICENSE = GPLv2 -FIREJAIL_LICENSE_FILES = COPYING -FIREJAIL_CONF_OPTS = \ - --enable-bind \ - --enable-busybox-workaround \ - --enable-file-transfer \ - --enable-network \ - --enable-seccomp \ - --enable-userns - -define FIREJAIL_PERMISSIONS - /usr/bin/firejail f 4755 0 0 - - - - - -endef - -$(eval $(autotools-package)) From 2d1ceeba0264c32b782d3a27ffbf532230274efd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 25 Oct 2016 12:32:46 +0200 Subject: [PATCH 1045/3392] php: fix selection of interfaces depending on BR2_USE_MMU Commit c457213fbca5f3493544c8a4335b623620458b0c reworked the selection of PHP interfaces, moving from a choice..endchoice to a three independent sub-options. Thanks to how choices are handled by kconfig, an option suitable for noMMU platforms was automatically chosen by default. When the choice...endchoice got removed in c457213fbca5f3493544c8a4335b623620458b0c, we introduced a "select" for one of the interfaces, to make sure at least one interface is selected. Unfortunately, the selected interface does not build on noMMU platforms. In order to preserve the previous behavior (CGI interface is selected by default on MMU capable platforms), this commit makes the select logic a bit more complicated: - CGI is selected on MMU-capable platforms if neither CLI or FPM are selected - CLI is selected on MMU-less platforms, since this is anyway the only available interface. Fixes: http://autobuild.buildroot.net/results/85ea09188f1e996cb14b4b83a17736c096c569a8/ Signed-off-by: Thomas Petazzoni --- package/php/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/php/Config.in b/package/php/Config.in index 2e9e344339..3020bccd8f 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -2,7 +2,9 @@ config BR2_PACKAGE_PHP bool "php" select BR2_PACKAGE_PHP_SAPI_CGI if \ !BR2_PACKAGE_PHP_SAPI_CLI && \ - !BR2_PACKAGE_PHP_SAPI_FPM + !BR2_PACKAGE_PHP_SAPI_FPM && \ + BR2_USE_MMU + select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU help PHP is a widely-used general-purpose scripting language that is especially suited for Web development From 8513ffee43f473e8134fa48755837722926123b0 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 29 Sep 2016 15:16:44 -0300 Subject: [PATCH 1046/3392] configs/warp7: Use common script for generating boot image Use the common board/freescale/common/post-image.sh script instead of a custom one. As the final image binary is called "sdcard.img" update the documentation accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/warp7/genimage.cfg | 41 --------------------------------------- board/warp7/post-image.sh | 14 ------------- board/warp7/readme.txt | 8 ++++---- configs/warp7_defconfig | 2 +- 4 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 board/warp7/genimage.cfg delete mode 100755 board/warp7/post-image.sh diff --git a/board/warp7/genimage.cfg b/board/warp7/genimage.cfg deleted file mode 100644 index 6d963acd5d..0000000000 --- a/board/warp7/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -# Minimal eMMC image for the Warp board -# -# We mimic the .sdcard Freescale's image format for i.MX7S: -# * the eMMC card must have 1 kB free space at the beginning, -# * U-Boot is dumped as is, -# * a FAT partition at offset 8 MB is containing zImage and dtbs, -# * a single root filesystem partition is required (Ext4 in this case). -# - -image boot.vfat { - vfat { - files = { - "imx7s-warp.dtb", - "zImage" - } - } - size = 16M -} - -image emmc.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.imx" - offset = 1024 - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 8M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/warp7/post-image.sh b/board/warp7/post-image.sh deleted file mode 100755 index b4ac4608ff..0000000000 --- a/board/warp7/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/warp7/readme.txt b/board/warp7/readme.txt index 00325e72aa..47458e9b56 100644 --- a/board/warp7/readme.txt +++ b/board/warp7/readme.txt @@ -19,7 +19,7 @@ You will find in output/images/ the following files: - imx7s-warp.dtb - rootfs.ext4 - rootfs.tar - - emmc.img + - sdcard.img - u-boot.imx - zImage @@ -37,11 +37,11 @@ To determine the device associated to the eMMC have a look in the cat /proc/partitions -Buildroot prepares a bootable "emmc.img" image in the output/images/ +Buildroot prepares a bootable "sdcard.img" image in the output/images/ directory, ready to be dumped into the eMMC. Launch the following command: -sudo dd if=output/images/emmc.img of=/dev/ +sudo dd if=output/images/sdcard.img of=/dev/ *** WARNING! This will destroy all the eMMC content. Use it with care! *** @@ -77,7 +77,7 @@ Use the default environment variables: => saveenv => ums 0 mmc 0 -sudo dd if=output/images/emmc.img of=/dev/ +sudo dd if=output/images/sdcard.img of=/dev/ Put warp7 back in eMMC boot mode by placing switch 2 in the lower position and reboot the board. diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 63a9592819..31251f4645 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -38,7 +38,7 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y # Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/warp7/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y From 1b0df8f23c690d9464d82f4d3e57fe2a334b5d98 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 22 Sep 2016 00:29:14 +0530 Subject: [PATCH 1047/3392] scripts/get-developers: correct type of patches argument Current type for 'patches' argument is str. It supposed to only contain names of files. If we specify FileType as type, then we don't need to open file ourself and it allows script to read patch from standard input as well. e.g. $ git show -1 | ./support/scripts/get-developers - Cc: Thomas Petazzoni Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- support/scripts/get-developers | 4 ++-- support/scripts/getdeveloperlib.py | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/support/scripts/get-developers b/support/scripts/get-developers index 8b1891d999..83f1e5b9b2 100755 --- a/support/scripts/get-developers +++ b/support/scripts/get-developers @@ -5,8 +5,8 @@ import getdeveloperlib def parse_args(): parser = argparse.ArgumentParser() - parser.add_argument('patches', metavar='P', type=str, nargs='*', - help='list of patches') + parser.add_argument('patches', metavar='P', type=argparse.FileType('r'), nargs='*', + help='list of patches (use - to read patches from stdin)') parser.add_argument('-a', dest='architecture', action='store', help='find developers in charge of this architecture') parser.add_argument('-p', dest='package', action='store', diff --git a/support/scripts/getdeveloperlib.py b/support/scripts/getdeveloperlib.py index 7b390417fc..65191073a3 100644 --- a/support/scripts/getdeveloperlib.py +++ b/support/scripts/getdeveloperlib.py @@ -16,19 +16,18 @@ def analyze_patch(patch): removed by the patch.""" files = set() infras = set() - with open(patch, "r") as f: - for line in f: - # If the patch is adding a package, find which infra it is - m = FIND_INFRA_IN_PATCH.match(line) - if m: - infras.add(m.group(2)) - if not line.startswith("+++ "): - continue - line.strip() - fname = line[line.find("/") + 1 : ].strip() - if fname == "dev/null": - continue - files.add(fname) + for line in patch: + # If the patch is adding a package, find which infra it is + m = FIND_INFRA_IN_PATCH.match(line) + if m: + infras.add(m.group(2)) + if not line.startswith("+++ "): + continue + line.strip() + fname = line[line.find("/") + 1 : ].strip() + if fname == "dev/null": + continue + files.add(fname) return (files, infras) FIND_INFRA_IN_MK = re.compile("^\$\(eval \$\((host-)?([^-]*)-package\)\)$") From 515ced20087407189bc5523a2bf7c19b239cb78d Mon Sep 17 00:00:00 2001 From: Jordan Yelloz Date: Sun, 24 Jul 2016 16:27:36 -0700 Subject: [PATCH 1048/3392] swupdate: allow luajit to enable HAVE_LUA Until now, HAVE_LUA=y was only passed when BR2_PACKAGE_LUA=y. However, swupdate can also use LuaJIT instead of the classic Lua. Therefore, this commit updates the package to use BR2_PACKAGE_HAS_LUAINTERPRETER and the luainterpreter virtual package. Note that the swupdate configuration needs to be updated separately (via swupdate-menuconfig) to enable Lua support, and to specify the Lua version (which should be jit-5.1 to link against LuaJIT). Signed-off-by: Jordan Yelloz [Thomas: use the luainterpreter virtual package, expand commit log.] Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 313a54febd..d442810b21 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -39,8 +39,8 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBCURL=n endif -ifeq ($(BR2_PACKAGE_LUA),y) -SWUPDATE_DEPENDENCIES += lua host-pkgconf +ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y) +SWUPDATE_DEPENDENCIES += luainterpreter host-pkgconf SWUPDATE_MAKE_ENV += HAVE_LUA=y else SWUPDATE_MAKE_ENV += HAVE_LUA=n From cea81b6925de166e2fd2c75a51aea94420f7f06a Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Tue, 25 Oct 2016 21:18:59 +0530 Subject: [PATCH 1049/3392] rsyslog: not available on musl With musl C library, we get following error when building rsyslog: imfile.c: In function 'in_setupFileWatchStatic': imfile.c:1614:28: error: 'GLOB_BRACE' undeclared (first use in this function) GLOB_MARK|GLOB_NOSORT|GLOB_BRACE, NULL, &files); ^ flag GLOB_BRACE is not available on musl. Since package uses it unconditionally, we mark it not available for musl. Fixes: http://autobuild.buildroot.net/results/6d4/6d480bb1e1466809d8ff119f6b35bb91df00785c/ Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/rsyslog/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in index b3c146dc86..c4dc97af33 100644 --- a/package/rsyslog/Config.in +++ b/package/rsyslog/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_RSYSLOG depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # modules + depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE # Propagate the exact same dependency from libfastjson, # even though rsyslog already depends on threads for itself: depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS @@ -16,8 +17,9 @@ config BR2_PACKAGE_RSYSLOG http://www.rsyslog.com -comment "rsyslog needs a toolchain w/ threads, dynamic library" +comment "rsyslog needs a uClibc or glibc toolchain w/ threads, dynamic library" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS From c490f3b08f12a53a70899fe9fbbf07d3e4f6e4be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 25 Oct 2016 17:27:42 +0200 Subject: [PATCH 1050/3392] motion: bump to version 4.0.1 [Peter: adjust autoreconf comment] Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/motion/motion.hash | 4 +--- package/motion/motion.mk | 12 ++---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/motion/motion.hash b/package/motion/motion.hash index 27f66b52fb..e8591179ed 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,4 +1,2 @@ # Locally computed: -sha256 0d1702c7958fd03b99bf4fdcb45d8e604864e5867034f825f2fc543e8be64549 motion-release-3.4.1.tar.gz -sha256 24e7150b753da04f3477276c36ce5664453965f279196f892668063ca4d6e975 709f626b7ef83a2bb3ef1f77205276207ab27196.patch -sha256 45ddb1599b850176a319afbcebb7f0bec309c918331da6d5fd6c3cba35387405 72193ccaff83fcb074c9aaa37c5691a8d8a18c7c.patch +sha256 2f67669a09ce0481ecd987028dae1c5cb135dfdc3c254c06ab7c9ca0c6c183f0 motion-release-4.0.1.tar.gz diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 16ce406f84..49c0c6a047 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,22 +4,14 @@ # ################################################################################ -MOTION_VERSION = release-3.4.1 +MOTION_VERSION = release-4.0.1 MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION)) MOTION_LICENSE = GPLv2 MOTION_LICENSE_FILES = COPYING MOTION_DEPENDENCIES = host-pkgconf jpeg -# From git and configure.ac is patched +# From git MOTION_AUTORECONF = YES -# This patch fixes detection of sqlite when cross-compiling -MOTION_PATCH = \ - https://github.com/Motion-Project/motion/commit/709f626b7ef83a2bb3ef1f77205276207ab27196.patch - -# This patch adds --with-sdl=[DIR] option to fix detection of sdl-config -MOTION_PATCH += \ - https://github.com/Motion-Project/motion/commit/72193ccaff83fcb074c9aaa37c5691a8d8a18c7c.patch - # motion does not use any specific function of jpeg-turbo, so just relies on # jpeg selection MOTION_CONF_OPTS += --without-jpeg-turbo From 23e0f3350fbeccf727dd4e87889d9b2875e8e615 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 25 Oct 2016 14:21:39 -0200 Subject: [PATCH 1051/3392] imx28evk: Fix the first partition location When the SD card is connected to the host PC it can be mounted as /dev/mmcblk0 or /dev/sdX, depending on how the SD controller is connected to /the PC. In this case the first partition is /dev/mmcblk0p1, not /dev/mmcblk01. So use the ${PART1} variable to correctly assign this location. [Peter: extend commit meesage] Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- board/freescale/imx28evk/create-boot-sd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/imx28evk/create-boot-sd.sh b/board/freescale/imx28evk/create-boot-sd.sh index 5e050cbada..bce221237c 100755 --- a/board/freescale/imx28evk/create-boot-sd.sh +++ b/board/freescale/imx28evk/create-boot-sd.sh @@ -71,7 +71,7 @@ sync # Copy the bootloader at offset 2048 # (We need to skip the partition table in the .sd, too.) -dd if=output/images/u-boot.sd of=${DEV}1 bs=1M +dd if=output/images/u-boot.sd of=${PART1} bs=1M # Prepare a temp dir for mounting partitions TMPDIR=$(mktemp -d) From dc7eed474068f6d1cbd0ba47caf415c81c3a4225 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 25 Oct 2016 14:21:40 -0200 Subject: [PATCH 1052/3392] configs/imx28evk: Update U-Boot and kernel versions Update U-Boot to 2016.09.01 and kernel to 4.8.4 version. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/freescale_imx28evk_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/freescale_imx28evk_defconfig b/configs/freescale_imx28evk_defconfig index 9a430f743f..a6384626d7 100644 --- a/configs/freescale_imx28evk_defconfig +++ b/configs/freescale_imx28evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 3.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -11,7 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.4" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" @@ -20,5 +20,5 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx28evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_FORMAT_SD=y From 15a6c8290a9d6976dc8a2b5b1330511392e36816 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Tue, 25 Oct 2016 23:06:41 +0530 Subject: [PATCH 1053/3392] zyre: disable docs Fixes: http://autobuild.buildroot.net/results/c30/c307cfae46b800603b76f623840bd0fd950f0e3f/ Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/zyre/zyre.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zyre/zyre.mk b/package/zyre/zyre.mk index 8647456f9a..e47da975af 100644 --- a/package/zyre/zyre.mk +++ b/package/zyre/zyre.mk @@ -11,6 +11,7 @@ ZYRE_LICENSE_FILES = LICENSE ZYRE_INSTALL_STAGING = YES ZYRE_DEPENDENCIES = czmq zeromq host-pkgconf ZYRE_AUTORECONF = YES +ZYRE_CONF_OPTS = --without-docs define ZYRE_CREATE_CONFIG_DIR mkdir -p $(@D)/config From bfde3b3d47a3af26bc52ccdc30597874b6a1e91b Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 25 Oct 2016 11:49:07 -0400 Subject: [PATCH 1054/3392] rabbitmq-server: new package [Peter: simplify init script, use relative symlinks] Signed-off-by: Frank Hunleth Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/rabbitmq-server/Config.in | 13 +++++ package/rabbitmq-server/S50rabbitmq-server | 28 ++++++++++ package/rabbitmq-server/rabbitmq-server.hash | 2 + package/rabbitmq-server/rabbitmq-server.mk | 55 +++++++++++++++++++ .../rabbitmq-server/rabbitmq-server.service | 15 +++++ 6 files changed, 114 insertions(+) create mode 100644 package/rabbitmq-server/Config.in create mode 100755 package/rabbitmq-server/S50rabbitmq-server create mode 100644 package/rabbitmq-server/rabbitmq-server.hash create mode 100644 package/rabbitmq-server/rabbitmq-server.mk create mode 100644 package/rabbitmq-server/rabbitmq-server.service diff --git a/package/Config.in b/package/Config.in index 9399f63b26..e8ec723eb0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1576,6 +1576,7 @@ endif source "package/pure-ftpd/Config.in" source "package/putty/Config.in" source "package/quagga/Config.in" + source "package/rabbitmq-server/Config.in" source "package/radvd/Config.in" source "package/rp-pppoe/Config.in" source "package/rpcbind/Config.in" diff --git a/package/rabbitmq-server/Config.in b/package/rabbitmq-server/Config.in new file mode 100644 index 0000000000..6a323aff92 --- /dev/null +++ b/package/rabbitmq-server/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_RABBITMQ_SERVER + bool "rabbitmq-server" + depends on BR2_PACKAGE_ERLANG + select BR2_PACKAGE_LIBXSLT + select BR2_PACKAGE_OPENSSL # Required to build Erlang's crypto and ssl + # applications + help + High-performance AMQP-compliant message broker written in Erlang. + + http://www.rabbitmq.com + +comment "rabbitmq-server needs erlang" + depends on !BR2_PACKAGE_ERLANG diff --git a/package/rabbitmq-server/S50rabbitmq-server b/package/rabbitmq-server/S50rabbitmq-server new file mode 100755 index 0000000000..faf248ded2 --- /dev/null +++ b/package/rabbitmq-server/S50rabbitmq-server @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Start/stop rabbitmq-server +# + +INSTALLUSER=rabbitmq +RUNDIR=/var/run/rabbitmq + +case "$1" in + start) + install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1 + printf "Starting rabbitmq-server: " + su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + stop) + printf "Stopping rabbitmq-server: " + su -c "/usr/sbin/rabbitmqctl stop" - "$INSTALLUSER" + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + restart|reload) + "$0" stop || true + "$0" start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash new file mode 100644 index 0000000000..be21477ff7 --- /dev/null +++ b/package/rabbitmq-server/rabbitmq-server.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 c696134e863f99191a301288c12d69ff00b7e648107ee52c8686ae047dde1bee rabbitmq-server-3.6.1.tar.xz diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk new file mode 100644 index 0000000000..6af62f6586 --- /dev/null +++ b/package/rabbitmq-server/rabbitmq-server.mk @@ -0,0 +1,55 @@ +############################################################# +# +# rabbitmq-server +# +############################################################# + +RABBITMQ_SERVER_VERSION = 3.6.1 +RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION) +RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz +RABBITMQ_SERVER_LICENSE = MPLv1.1, Apache-2.0, BSD-2c, EPL, MIT, MPLv2.0 +RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \ + LICENSE LICENSE-APACHE2-ExplorerCanvas \ + LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \ + LICENSE-BSD-base64js LICENSE-BSD-glMatrix \ + LICENSE-EPL-OTP LICENSE-MIT-EJS10 \ + LICENSE-MIT-Flot LICENSE-MIT-jQuery164 \ + LICENSE-MIT-Mochi LICENSE-MIT-Mochiweb \ + LICENSE-MIT-Sammy060 LICENSE-MIT-SockJS \ + LICENSE-MPL2 +RABBITMQ_SERVER_DEPENDS = erlang libxslt +RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults + +define RABBITMQ_SERVER_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define RABBITMQ_SERVER_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install + + for bin in $(RABBITMQ_SERVER_TARGET_BINS); do \ + ln -sf ../lib/erlang/lib/rabbitmq_server-$(RABBITMQ_SERVER_VERSION)/sbin/$$bin \ + $(TARGET_DIR)/usr/sbin/$$bin; \ + done +endef + +define RABBITMQ_SERVER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 package/rabbitmq-server/rabbitmq-server.service \ + $(TARGET_DIR)/usr/lib/systemd/system/rabbitmq-server.service + + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + + ln -fs ../../../../usr/lib/systemd/system/rabbitmq-server.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rabbitmq-server.service +endef + +define RABBITMQ_SERVER_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/rabbitmq-server/S50rabbitmq-server \ + $(TARGET_DIR)/etc/init.d/S50rabbitmq-server +endef + +define RABBITMQ_SERVER_USERS + rabbitmq -1 rabbitmq -1 * /var/lib/rabbitmq /bin/sh - rabbitmq-server daemon +endef + +$(eval $(generic-package)) diff --git a/package/rabbitmq-server/rabbitmq-server.service b/package/rabbitmq-server/rabbitmq-server.service new file mode 100644 index 0000000000..268b4bdcd2 --- /dev/null +++ b/package/rabbitmq-server/rabbitmq-server.service @@ -0,0 +1,15 @@ +[Unit] +Description=RabbitMQ Messaging Server +After=syslog.target network.target + +[Service] +Type=simple +User=rabbitmq +Group=rabbitmq +Environment=HOME=/var/lib/rabbitmq +WorkingDirectory=/var/lib/rabbitmq +ExecStart=/usr/sbin/rabbitmq-server +ExecStop=/usr/sbin/rabbitmqctl stop + +[Install] +WantedBy=multi-user.target From fcbdfd7416b9ceabd5edffa9f5c94781efb2d1d3 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 25 Oct 2016 11:49:08 -0400 Subject: [PATCH 1055/3392] DEVELOPERS: add entry for rabbitmq-server Signed-off-by: Frank Hunleth Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 16d9b552e2..5359b9ebff 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -520,6 +520,7 @@ F: package/libdmtx/ F: package/libsodium/ F: package/php-amqp/ F: package/python-cherrypy/ +F: package/rabbitmq-server/ F: package/sane-backends/ F: package/ucl/ F: package/upx/ From 7d55462df8495502738a3b7ffe1be56582ce79ae Mon Sep 17 00:00:00 2001 From: Jordan Yelloz Date: Sun, 24 Jul 2016 16:27:37 -0700 Subject: [PATCH 1056/3392] swupdate: update lua check for libconfig Most probably this was missed in commit 65b2ae49feb310d3272a47c44cf3b406646b25c1 which removed pinning to Lua 5.2. Signed-off-by: Jordan Yelloz Signed-off-by: Thomas Petazzoni --- package/swupdate/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in index 5f5e1e77b9..d7217af1c4 100644 --- a/package/swupdate/Config.in +++ b/package/swupdate/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_SWUPDATE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() # swupdate requires a parser and uses libconfig as default - select BR2_PACKAGE_LIBCONFIG if !BR2_PACKAGE_JSON_C && !BR2_PACKAGE_LUA_5_2 + select BR2_PACKAGE_LIBCONFIG if !BR2_PACKAGE_JSON_C && \ + !BR2_PACKAGE_HAS_LUAINTERPRETER help swupdate provides a reliable way to update the software on an embedded system. From 02549bd9182f9d333dc47682d51c277786001467 Mon Sep 17 00:00:00 2001 From: Jordan Yelloz Date: Sun, 24 Jul 2016 16:27:38 -0700 Subject: [PATCH 1057/3392] swupdate: improved help text for Lua support It now explains limitations of building against Lua < 5.2 interpreters and how to link to LuaJIT library. Signed-off-by: Jordan Yelloz Signed-off-by: Thomas Petazzoni --- package/swupdate/Config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in index d7217af1c4..d9ef1bc7a4 100644 --- a/package/swupdate/Config.in +++ b/package/swupdate/Config.in @@ -19,7 +19,11 @@ config BR2_PACKAGE_SWUPDATE use your own modified configuration, you have to select the necessary packages manually: - * Select BR2_PACKAGE_LUA if you want to have Lua support. + * Select BR2_PACKAGE_LUA or BR2_PACKAGE_LUAJIT if you want + to have Lua support. + CONFIG_HANDLER_IN_LUA is not supported in LuaJIT or Lua 5.1. + Note that for LuaJIT support, you need to set + CONFIG_LUAVERSION="jit-5.1". * Select BR2_LIBCURL if you want to use the download feature. * Select BR2_PACKAGE_OPENSSL is you want to add encryption support. * Select BR2_PACKAGE_MTD if you want to use swupdate with UBI From 26d2b410c0321782f6912d8125ace86811ded28e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Mon, 1 Aug 2016 21:58:36 +0200 Subject: [PATCH 1058/3392] libglob: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libglob is the OpenBSD implementation of glob(3). Signed-off-by: Jörg Krause [Thomas: slightly rework how the make targets are calculated.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/libglob/Config.in | 4 +++ package/libglob/libglob.hash | 2 ++ package/libglob/libglob.mk | 48 ++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 package/libglob/Config.in create mode 100644 package/libglob/libglob.hash create mode 100644 package/libglob/libglob.mk diff --git a/package/Config.in b/package/Config.in index e8ec723eb0..f90336b607 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1308,6 +1308,7 @@ menu "Other" source "package/libffi/Config.in" source "package/libgee/Config.in" source "package/libglib2/Config.in" + source "package/libglob/Config.in" source "package/libical/Config.in" source "package/libite/Config.in" source "package/liblinear/Config.in" diff --git a/package/libglob/Config.in b/package/libglob/Config.in new file mode 100644 index 0000000000..029ed6a1d3 --- /dev/null +++ b/package/libglob/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_LIBGLOB + bool "libglob" + help + OpenBSD implementation of glob(3). diff --git a/package/libglob/libglob.hash b/package/libglob/libglob.hash new file mode 100644 index 0000000000..0b394075f4 --- /dev/null +++ b/package/libglob/libglob.hash @@ -0,0 +1,2 @@ +# Locally calculated: +sha256 4f1b204dad065689941c64828a92441fb316c9c7539b39525fa728125da65e22 libglob-1.0.tar.gz diff --git a/package/libglob/libglob.mk b/package/libglob/libglob.mk new file mode 100644 index 0000000000..534f936cc6 --- /dev/null +++ b/package/libglob/libglob.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# libglob +# +################################################################################ + +LIBGLOB_VERSION = 1.0 +LIBGLOB_SITE = $(call github,voidlinux,libglob,$(LIBGLOB_VERSION)) +LIBGLOB_LICENSE = BSD-3c +LIBGLOB_LICENSE_FILE = LICENSE +LIBGLOB_INSTALL_STAGING = YES + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBGLOB_MAKE_TARGETS += libglob.so +# $1: destination directory +define LIBGLOB_INSTALL_SHARED + $(INSTALL) -m 0755 -D $(@D)/libglob.so.0.0.0 \ + $(1)/usr/lib/libglob.so.0.0.0 + ln -sf libglob.so.0.0.0 $(1)/usr/lib/libglob.so.0 + ln -sf libglob.so.0.0.0 $(1)/usr/lib/libglob.so +endef +endif + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBGLOB_MAKE_TARGETS += libglob.a +# $1: destination directory +define LIBGLOB_INSTALL_STATIC + $(INSTALL) -m 0644 -D $(@D)/libglob.a $(1)/usr/lib/libglob.a +endef +endif + +define LIBGLOB_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(LIBGLOB_MAKE_TARGETS) +endef + +define LIBGLOB_INSTALL_STAGING_CMDS + $(INSTALL) -m 0644 -D $(@D)/glob.h \ + $(STAGING_DIR)/usr/include/libglob/glob.h + $(call LIBGLOB_INSTALL_SHARED,$(STAGING_DIR)) + $(call LIBGLOB_INSTALL_STATIC,$(STAGING_DIR)) +endef + +define LIBGLOB_INSTALL_TARGET_CMDS + $(call LIBGLOB_INSTALL_SHARED,$(TARGET_DIR)) +endef + +$(eval $(generic-package)) From 815e4f1a333b789ffd416e2a82f4e542d09cbcbb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Aug 2016 09:41:58 +0200 Subject: [PATCH 1059/3392] package/vdr: new package Signed-off-by: Bernd Kuhls [Thomas: minor tweaks.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/vdr/0001-getloadavg.patch | 55 ++++++++++++++++++++++++++ package/vdr/0002-libjpeg.patch | 40 +++++++++++++++++++ package/vdr/Config.in | 25 ++++++++++++ package/vdr/vdr.hash | 4 ++ package/vdr/vdr.mk | 66 +++++++++++++++++++++++++++++++ 6 files changed, 191 insertions(+) create mode 100644 package/vdr/0001-getloadavg.patch create mode 100644 package/vdr/0002-libjpeg.patch create mode 100644 package/vdr/Config.in create mode 100644 package/vdr/vdr.hash create mode 100644 package/vdr/vdr.mk diff --git a/package/Config.in b/package/Config.in index f90336b607..0a0cd6d69a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1618,6 +1618,7 @@ endif source "package/ushare/Config.in" source "package/ussp-push/Config.in" source "package/vde2/Config.in" + source "package/vdr/Config.in" source "package/vnstat/Config.in" source "package/vpnc/Config.in" source "package/vsftpd/Config.in" diff --git a/package/vdr/0001-getloadavg.patch b/package/vdr/0001-getloadavg.patch new file mode 100644 index 0000000000..3937c83dd8 --- /dev/null +++ b/package/vdr/0001-getloadavg.patch @@ -0,0 +1,55 @@ +Fix compilation with uClibc + +Ported from +https://github.com/stschake/buildroot-grasshopper/blob/master/package/torsmo/torsmo-0.18-uclibc-getloadavg.patch + +Signed-off-by: Bernd Kuhls + +diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c +--- vdr-2.3.1.org/skinlcars.c 2015-09-01 12:07:07.000000000 +0200 ++++ vdr-2.3.1/skinlcars.c 2016-07-31 21:00:11.000000000 +0200 +@@ -1099,6 +1099,44 @@ + } + } + ++/* uclibc and dietlibc do not have this junk -ReneR */ ++#if defined (__UCLIBC__) || defined (__dietlibc__) ++static int getloadavg (double loadavg[], int nelem) ++{ ++ int fd; ++ ++ fd = open ("/proc/loadavg", O_RDONLY); ++ if (fd < 0) ++ return -1; ++ else ++ { ++ char buf[65], *p; ++ ssize_t nread; ++ int i; ++ ++ nread = read (fd, buf, sizeof buf - 1); ++ close (fd); ++ if (nread <= 0) ++ return -1; ++ buf[nread - 1] = '\0'; ++ ++ if (nelem > 3) ++ nelem = 3; ++ p = buf; ++ for (i = 0; i < nelem; ++i) ++ { ++ char *endp; ++ loadavg[i] = strtod (p, &endp); ++ if (endp == p) ++ return -1; ++ p = endp; ++ } ++ ++ return i; ++ } ++} ++#endif ++ + void cSkinLCARSDisplayMenu::DrawLoad(void) + { + if (yb04) { diff --git a/package/vdr/0002-libjpeg.patch b/package/vdr/0002-libjpeg.patch new file mode 100644 index 0000000000..dbd1f12838 --- /dev/null +++ b/package/vdr/0002-libjpeg.patch @@ -0,0 +1,40 @@ +Fix compilation with libjpeg + +Patch inspired by upstream board: +http://www.vdr-portal.de/board16-video-disk-recorder/board4-vdr-installation/p1189959-vdr-2-05-mit-libjpeg-9a-kommt-nicht-aus/#post1189959 + +Signed-off-by: Bernd Kuhls + +diff -uNr vdr-2.3.1.org/tools.c vdr-2.3.1/tools.c +--- vdr-2.3.1.org/tools.c 2015-09-10 15:17:55.000000000 +0200 ++++ vdr-2.3.1/tools.c 2016-08-01 06:37:44.000000000 +0200 +@@ -1254,15 +1254,15 @@ + } + else { + esyslog("ERROR: out of memory"); +- return false; ++ return FALSE; + } + if (jcd->mem) { + cinfo->dest->next_output_byte = jcd->mem + Used; + cinfo->dest->free_in_buffer = jcd->size - Used; +- return true; ++ return TRUE; + } + } +- return false; ++ return FALSE; + } + + static void JpegCompressTermDestination(j_compress_ptr cinfo) +@@ -1307,8 +1307,8 @@ + cinfo.in_color_space = JCS_RGB; + + jpeg_set_defaults(&cinfo); +- jpeg_set_quality(&cinfo, Quality, true); +- jpeg_start_compress(&cinfo, true); ++ jpeg_set_quality(&cinfo, Quality, TRUE); ++ jpeg_start_compress(&cinfo, TRUE); + + int rs = Width * 3; + JSAMPROW rp[Height]; diff --git a/package/vdr/Config.in b/package/vdr/Config.in new file mode 100644 index 0000000000..d283b462b1 --- /dev/null +++ b/package/vdr/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_VDR + bool "vdr" + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_TOOLCHAIN_USES_MUSL # _nl_msg_cat_cntr + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + help + This project describes how to build your own digital + satellite receiver and Video Disk Recorder. + + http://www.tvdr.de + +comment "vdr needs a glibc or uClibc toolchain w/ C++, dynamic library, NPTL, wchar" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + BR2_TOOLCHAIN_USES_MUSL || !BR2_USE_WCHAR diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash new file mode 100644 index 0000000000..f076e58ea0 --- /dev/null +++ b/package/vdr/vdr.hash @@ -0,0 +1,4 @@ +# From https://www.linuxtv.org/pipermail/vdr/2015-September/028872.html +md5 391c2ed60e2f7d24563fe3ed5854bc4f vdr-2.3.1.tar.bz2 +# Locally computed +sha256 456d3f0ceb699b92ebeaf9ff4c0c68979724d10b01a89d5250133e6f4c262fa7 vdr-2.3.1.tar.bz2 diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk new file mode 100644 index 0000000000..1894defb22 --- /dev/null +++ b/package/vdr/vdr.mk @@ -0,0 +1,66 @@ +################################################################################ +# +# vdr +# +################################################################################ + +VDR_VERSION = 2.3.1 +VDR_SOURCE = vdr-$(VDR_VERSION).tar.bz2 +VDR_SITE = ftp://ftp.tvdr.de/vdr/Developer +VDR_LICENSE = GPLv2+ +VDR_LICENSE_FILES = COPYING +VDR_INSTALL_STAGING = YES +VDR_DEPENDENCIES = \ + freetype \ + fontconfig \ + jpeg \ + libcap + +VDR_INCLUDE_DIRS = -I$(STAGING_DIR)/usr/include/freetype2 +VDR_MAKE_FLAGS = \ + NO_KBD=yes \ + PLUGINLIBDIR=/usr/lib/vdr \ + PREFIX=/usr \ + VIDEODIR=/var/lib/vdr + +ifeq ($(BR2_NEEDS_GETTEXT),y) +VDR_DEPENDENCIES += gettext +VDR_LDFLAGS += -lintl +endif + +ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) +VDR_DEPENDENCIES += libfribidi +VDR_INCLUDE_DIRS += -I$(STAGING_DIR)/usr/include/fribidi +VDR_LDFLAGS += -lfribidi +VDR_MAKE_FLAGS += BIDI=1 +endif + +ifeq ($(BR2_PACKAGE_LIBICONV),y) +VDR_DEPENDENCIES += libiconv +VDR_LDFLAGS += -liconv +endif + +VDR_MAKE_ENV = \ + INCLUDES="$(VDR_INCLUDE_DIRS)" \ + LDFLAGS="$(VDR_LDFLAGS)" \ + $(VDR_MAKE_FLAGS) + +define VDR_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(VDR_MAKE_ENV) \ + vdr vdr.pc include-dir +endef + +define VDR_INSTALL_STAGING_CMDS + $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(VDR_MAKE_ENV) \ + DESTDIR=$(STAGING_DIR) \ + install-dirs install-bin install-conf install-includes \ + install-pc +endef + +define VDR_INSTALL_TARGET_CMDS + $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(VDR_MAKE_ENV) \ + DESTDIR=$(TARGET_DIR) \ + install-dirs install-bin install-conf +endef + +$(eval $(generic-package)) From 120de6a2a4e6f94978a27766c260942bfde33ac5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 25 Oct 2016 22:36:03 +0200 Subject: [PATCH 1060/3392] DEVELOPERS: add Bernd for the vdr package Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5359b9ebff..b096c810c1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -253,6 +253,7 @@ F: package/tor/ F: package/transmission/ F: package/tvheadend/ F: package/unixodbc/ +F: package/vdr/ F: package/vlc/ F: package/vnstat/ F: package/x11r7/ From 700b729dccaad20fe24a223d0e5e21b5de323e9e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Aug 2016 09:41:59 +0200 Subject: [PATCH 1061/3392] package/vdr-plugin-vnsiserver: new package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/vdr-plugin-vnsiserver/Config.in | 9 +++++++ .../vdr-plugin-vnsiserver.hash | 2 ++ .../vdr-plugin-vnsiserver.mk | 25 +++++++++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 package/vdr-plugin-vnsiserver/Config.in create mode 100644 package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash create mode 100644 package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk diff --git a/package/Config.in b/package/Config.in index 0a0cd6d69a..0f6260b2d2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1619,6 +1619,7 @@ endif source "package/ussp-push/Config.in" source "package/vde2/Config.in" source "package/vdr/Config.in" + source "package/vdr-plugin-vnsiserver/Config.in" source "package/vnstat/Config.in" source "package/vpnc/Config.in" source "package/vsftpd/Config.in" diff --git a/package/vdr-plugin-vnsiserver/Config.in b/package/vdr-plugin-vnsiserver/Config.in new file mode 100644 index 0000000000..0a0ab8d376 --- /dev/null +++ b/package/vdr-plugin-vnsiserver/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_VDR_PLUGIN_VNSISERVER + bool "vdr-plugin-vnsiserver" + depends on BR2_PACKAGE_VDR + help + VDR plugin to handle KODI clients. + The vdr-plugin-vnsiserver is able to handle serveral KODI + clients connecting via the VNSI addon. + + https://github.com/FernetMenta/vdr-plugin-vnsiserver diff --git a/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash b/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash new file mode 100644 index 0000000000..cf403f50c8 --- /dev/null +++ b/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 fd00fb6d833cad6a32a0d8259bb125abdf1716680650ba24b34bca2201745877 vdr-plugin-vnsiserver-v1.5.0.tar.gz diff --git a/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk b/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk new file mode 100644 index 0000000000..aaa0859e58 --- /dev/null +++ b/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# vdr-plugin-vnsiserver +# +################################################################################ + +VDR_PLUGIN_VNSISERVER_VERSION = v1.5.0 +VDR_PLUGIN_VNSISERVER_SITE = $(call github,FernetMenta,vdr-plugin-vnsiserver,$(VDR_PLUGIN_VNSISERVER_VERSION)) +VDR_PLUGIN_VNSISERVER_LICENSE = GPLv2+ +VDR_PLUGIN_VNSISERVER_LICENSE_FILES = COPYING +VDR_PLUGIN_VNSISERVER_DEPENDENCIES = vdr + +VDR_PLUGIN_VNSISERVER_CXXFLAGS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC" + +define VDR_PLUGIN_VNSISERVER_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + $(VDR_PLUGIN_VNSISERVER_CXXFLAGS) +endef + +define VDR_PLUGIN_VNSISERVER_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + install DESTDIR=$(TARGET_DIR) LIBDIR=/usr/lib/vdr +endef + +$(eval $(generic-package)) From 0292ec5f34d209f2571a1d2c3286b265e44f8bff Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 25 Oct 2016 22:49:09 +0200 Subject: [PATCH 1062/3392] DEVELOPERS: add Bernd for the vdr-plugin-vnsiserver package Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index b096c810c1..85dbb36c38 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -254,6 +254,7 @@ F: package/transmission/ F: package/tvheadend/ F: package/unixodbc/ F: package/vdr/ +F: package/vdr-plugin-vnsiserver/ F: package/vlc/ F: package/vnstat/ F: package/x11r7/ From 56cf5612937f14bcc7f2f339b6fb28ea3d635a67 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 23 Oct 2016 17:28:51 +0200 Subject: [PATCH 1063/3392] pkg-infra: allow dumping reverse dependencies of a package Finding the packages that select another one in a specific configuration is not very trivial: - when optional, the dependency is not expressed in Kconfig - looking at the .mk files is not very nice. Introduce a way to dump reverse dependencies of packages, i.e. the list of packages that directly depend on that package. Like for direct dependencies, we limit the list to the first-order reverse dependencies. Document it in the main help; use the opportunity to also document foo-show-depends. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- Makefile | 2 ++ package/pkg-generic.mk | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 3ba149050c..5c65f90fbb 100644 --- a/Makefile +++ b/Makefile @@ -974,6 +974,8 @@ help: @echo ' -depends - Build '\''s dependencies' @echo ' -configure - Build up to the configure step' @echo ' -build - Build up to the build step' + @echo ' -show-depends - List packages on which depends' + @echo ' -show-rdepends - List packages which have as a dependency' @echo ' -graph-depends - Generate a graph of '\''s dependencies' @echo ' -dirclean - Remove build directory' @echo ' -reconfigure - Restart the build from the configure step' diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index e726ac5ef1..81bb82c2c4 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -698,6 +698,9 @@ $(1)-show-version: $(1)-show-depends: @echo $$($(2)_FINAL_ALL_DEPENDENCIES) +$(1)-show-rdepends: + @echo $$($(2)_RDEPENDENCIES) + $(1)-graph-depends: graph-depends-requirements @$$(INSTALL) -d $$(GRAPHS_DIR) @cd "$$(CONFIG_DIR)"; \ @@ -854,6 +857,10 @@ $$(foreach pkg,$$($(2)_PROVIDES),\ $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) endif +# Register package as a reverse-dependencies of all its dependencies +$$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ + $$(call UPPERCASE,$$(p))_RDEPENDENCIES += $(1)$$(sep))) + # Ensure unified variable name conventions between all packages Some # of the variables are used by more than one infrastructure; so, # rather than duplicating the checks in each infrastructure, we check From f33fcdf2254beb07677a86416ff46ee6d7aed866 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Oct 2016 17:34:03 +0200 Subject: [PATCH 1064/3392] package/erlang: add optional dependency to unixodbc Quote from erlang configure without unixodbc: checking for odbc in standard locations... no configure: WARNING: No odbc library found skipping odbc configure: WARNING: "ODBC library - header check failed" configure: WARNING: "ODBC library - link check failed" Quote from erlang configure with unixodbc: checking for odbc in standard locations... -L/home/buildroot/br3_couchdb/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/lib checking for SQLAllocHandle in -lodbc... yes To check for unixodbc support used by erlang use readelf: $ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/lib/erlang/lib/odbc-2.11.1/priv/bin/odbcserver | grep NEEDED 0x00000001 (NEEDED) Shared library: [libodbc.so.2] 0x00000001 (NEEDED) Shared library: [libc.so.0] Tested using this minimal defconfig: BR2_PACKAGE_ERLANG=y BR2_PACKAGE_ERLANG_SMP=y BR2_PACKAGE_UNIXODBC=y Signed-off-by: Bernd Kuhls Tested-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/erlang/erlang.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 6efffde498..c9d7b22670 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -55,6 +55,10 @@ else ERLANG_CONF_OPTS += --without-ssl endif +ifeq ($(BR2_PACKAGE_UNIXODBC),y) +ERLANG_DEPENDENCIES += unixodbc +endif + ifeq ($(BR2_PACKAGE_ZLIB),y) ERLANG_CONF_OPTS += --enable-shared-zlib ERLANG_DEPENDENCIES += zlib From 2a2eb55ca73cbe8536a9d9bdd29feaf70a462961 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 23 Oct 2016 19:19:44 +0200 Subject: [PATCH 1065/3392] core/graph-depends: add option to graph reverse dependencies Now that we can dump the reverse dependencies of a package, add the ability to graph those. It does not make sense to do a full reverse graph, as it would be semantically equivalent to the direct graph. So we only provide a per-package reverse graph. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- Makefile | 3 ++- package/pkg-generic.mk | 21 ++++++++++++++------- support/scripts/graph-depends | 18 ++++++++++++++++-- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 5c65f90fbb..c00e2008d1 100644 --- a/Makefile +++ b/Makefile @@ -761,7 +761,7 @@ graph-depends: graph-depends-requirements @$(INSTALL) -d $(GRAPHS_DIR) @cd "$(CONFIG_DIR)"; \ $(TOPDIR)/support/scripts/graph-depends $(BR2_GRAPH_DEPS_OPTS) \ - -o $(GRAPHS_DIR)/$(@).dot + --direct -o $(GRAPHS_DIR)/$(@).dot dot $(BR2_GRAPH_DOT_OPTS) -T$(BR_GRAPH_OUT) \ -o $(GRAPHS_DIR)/$(@).$(BR_GRAPH_OUT) \ $(GRAPHS_DIR)/$(@).dot @@ -977,6 +977,7 @@ help: @echo ' -show-depends - List packages on which depends' @echo ' -show-rdepends - List packages which have as a dependency' @echo ' -graph-depends - Generate a graph of '\''s dependencies' + @echo ' -graph-rdepends - Generate a graph of '\''s reverse dependencies' @echo ' -dirclean - Remove build directory' @echo ' -reconfigure - Restart the build from the configure step' @echo ' -rebuild - Restart the build from the build step' diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 81bb82c2c4..33490929b0 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -317,6 +317,16 @@ be selected at a time. Please fix your configuration) endif endef +define pkg-graph-depends + @$$(INSTALL) -d $$(GRAPHS_DIR) + @cd "$$(CONFIG_DIR)"; \ + $$(TOPDIR)/support/scripts/graph-depends $$(BR2_GRAPH_DEPS_OPTS) \ + -p $(1) $(2) -o $$(GRAPHS_DIR)/$$(@).dot + dot $$(BR2_GRAPH_DOT_OPTS) -T$$(BR_GRAPH_OUT) \ + -o $$(GRAPHS_DIR)/$$(@).$$(BR_GRAPH_OUT) \ + $$(GRAPHS_DIR)/$$(@).dot +endef + ################################################################################ # inner-generic-package -- generates the make targets needed to build a # generic package @@ -702,13 +712,10 @@ $(1)-show-rdepends: @echo $$($(2)_RDEPENDENCIES) $(1)-graph-depends: graph-depends-requirements - @$$(INSTALL) -d $$(GRAPHS_DIR) - @cd "$$(CONFIG_DIR)"; \ - $$(TOPDIR)/support/scripts/graph-depends $$(BR2_GRAPH_DEPS_OPTS) \ - -p $(1) -o $$(GRAPHS_DIR)/$$(@).dot - dot $$(BR2_GRAPH_DOT_OPTS) -T$$(BR_GRAPH_OUT) \ - -o $$(GRAPHS_DIR)/$$(@).$$(BR_GRAPH_OUT) \ - $$(GRAPHS_DIR)/$$(@).dot + $(call pkg-graph-depends,$(1),--direct) + +$(1)-graph-rdepends: graph-depends-requirements + $(call pkg-graph-depends,$(1),--reverse) $(1)-all-source: $(1)-source $(1)-all-source: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index cb00383c0f..c3c97cb389 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -63,6 +63,10 @@ parser.add_argument("--transitive", dest="transitive", action='store_true', default=False) parser.add_argument("--no-transitive", dest="transitive", action='store_false', help="Draw (do not draw) transitive dependencies") +parser.add_argument("--direct", dest="direct", action='store_true', default=True, + help="Draw direct dependencies (the default)") +parser.add_argument("--reverse", dest="direct", action='store_false', + help="Draw reverse dependencies") args = parser.parse_args() check_only = args.check_only @@ -95,6 +99,16 @@ else: transitive = args.transitive +if args.direct: + rule = "show-depends" + arrow_dir = "forward" +else: + if mode == MODE_FULL: + sys.stderr.write("--reverse needs a package\n") + sys.exit(1) + rule = "show-rdepends" + arrow_dir = "back" + # Get the colours: we need exactly three colours, # so no need not split more than 4 # We'll let 'dot' validate the colours... @@ -151,7 +165,7 @@ def get_depends(pkgs): sys.stderr.write("Getting dependencies for %s\n" % pkgs) cmd = ["make", "-s", "--no-print-directory" ] for pkg in pkgs: - cmd.append("%s-show-depends" % pkg) + cmd.append("%s-%s" % (pkg, rule)) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True) output = p.communicate()[0] if p.returncode != 0: @@ -418,7 +432,7 @@ def print_pkg_deps(depth, pkg): add = False break if add: - outfile.write("%s -> %s\n" % (pkg_node_name(pkg), pkg_node_name(d))) + outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), arrow_dir)) print_pkg_deps(depth+1, d) # Start printing the graph data From 6874d691cea4a37f1cfcec0e7cf124f283fc30ef Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 Aug 2016 00:33:56 +0200 Subject: [PATCH 1066/3392] package/lvm2: disable for musl toolchains lvm2 doesn't build with musl toolchains due to several assignment of read-only variable like stdin, stdout and stderr. Also, it use mallinfo function which is not available with musl. These issues has been reported upstream [2] but some of them remains even with the latest stable release 2.02.163. Fixes: http://autobuild.buildroot.net/results/3d4df873a3d4fa199e03d8aa8694eafeac474e5a [...] [1] http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html [2] https://www.redhat.com/archives/linux-lvm/2016-February/msg00024.html Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/cryptsetup/Config.in | 6 ++++-- package/dmraid/Config.in | 6 ++++-- package/docker-engine/Config.in | 1 + package/lvm2/Config.in | 6 ++++-- package/udisks/Config.in | 5 +++-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in index cd95956856..d2bf3b43a1 100644 --- a/package/cryptsetup/Config.in +++ b/package/cryptsetup/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_CRYPTSETUP depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 depends on BR2_USE_MMU # lvm2 depends on !BR2_STATIC_LIBS # lvm2 + depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 depends on BR2_USE_WCHAR # util-linux select BR2_PACKAGE_POPT select BR2_PACKAGE_LVM2 @@ -15,6 +16,7 @@ config BR2_PACKAGE_CRYPTSETUP https://gitlab.com/cryptsetup/cryptsetup -comment "cryptsetup needs a toolchain w/ wchar, threads, dynamic library" +comment "cryptsetup needs a glibc or uClibc toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in index 4a8cf61686..583f3f272c 100644 --- a/package/dmraid/Config.in +++ b/package/dmraid/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DMRAID depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 depends on BR2_USE_MMU # lvm2 depends on !BR2_STATIC_LIBS # lvm2 + depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 select BR2_PACKAGE_LVM2 help dmraid discovers, activates, deactivates and displays properties @@ -11,6 +12,7 @@ config BR2_PACKAGE_DMRAID dmraid uses the Linux device-mapper to create devices with respective mappings for the ATARAID sets discovered. -comment "dmraid needs a toolchain w/ threads, dynamic library" +comment "dmraid needs a glibc or uClibc toolchain w/ threads, dynamic library" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ + || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 5c4e0eed1c..b99b121ab6 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -42,6 +42,7 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 depends on BR2_USE_MMU # lvm2 depends on !BR2_STATIC_LIBS # lvm2 + depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 select BR2_PACKAGE_LVM2 select BR2_PACKAGE_LVM2_APP_LIBRARY help diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in index b3a6593609..23dff707cc 100644 --- a/package/lvm2/Config.in +++ b/package/lvm2/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_LVM2 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # needs fork() depends on !BR2_STATIC_LIBS # It fails to build statically + # http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html + depends on !BR2_TOOLCHAIN_USES_MUSL help This is LVM2, the rewrite of The Linux Logical Volume Manager. LVM supports enterprise level volume management of disk and disk @@ -34,6 +36,6 @@ config BR2_PACKAGE_LVM2_APP_LIBRARY endif -comment "lvm2 needs a toolchain w/ threads, dynamic library" +comment "lvm2 needs a glibc or uClibc toolchain w/ threads, dynamic library" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 8b8fd2880e..029860fc5c 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_UDISKS depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2 depends on BR2_USE_MMU # lvm2 depends on !BR2_STATIC_LIBS # lvm2 + depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB depends on BR2_USE_WCHAR # dbus-glib -> glib2 @@ -39,7 +40,7 @@ comment "udisks needs udev /dev management" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV -comment "udisks needs a toolchain w/ wchar, threads, dynamic library" +comment "udisks needs a glibc or uClibc toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL From 8218ab8019bbab0538b484c663df4469e44fecf1 Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Mon, 8 Aug 2016 11:34:59 -0700 Subject: [PATCH 1067/3392] toolchain: configs: improve toolchain config readability Add (or move) comment lines in toolchain-related Config.in files to improve readability of the toolchain config section. Source linux-headers/Config.in.host after toolchain-buildroot items. For toolchain-buildroot case, the config file now looks like this: * * Toolchain * * * Toolchain Buildroot Options * * * Kernel Header Options * * * uClibc Options * * * Binutils Options * * * GCC Options * * * Host GDB Options * * * Toolchain Generic Options * Signed-off-by: Petri Gynther Signed-off-by: Thomas Petazzoni --- package/gdb/Config.in.host | 2 ++ package/linux-headers/Config.in.host | 4 ++-- package/uclibc/Config.in | 4 ++-- toolchain/toolchain-buildroot/Config.in | 5 +++-- toolchain/toolchain-common.in | 2 ++ toolchain/toolchain-external/Config.in | 2 ++ 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 081073b9a7..a36dc0f0f0 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -1,3 +1,5 @@ +comment "Host GDB Options" + config BR2_PACKAGE_HOST_GDB bool "Build cross gdb for the host" # When the external toolchain gdbserver is used, we shouldn't diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ae2a3cde71..47ef25df22 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -1,8 +1,8 @@ +comment "Kernel Header Options" + config BR2_PACKAGE_HOST_LINUX_HEADERS bool -comment "Kernel Header Options" - choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index cbae096d6c..fdf007e601 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -1,12 +1,12 @@ if BR2_TOOLCHAIN_BUILDROOT_UCLIBC +comment "uClibc Options" + config BR2_PACKAGE_UCLIBC bool default y select BR2_PACKAGE_LINUX_HEADERS -comment "uClibc Options" - config BR2_UCLIBC_CONFIG string "uClibc configuration file to use?" default "package/uclibc/uClibc-ng.config" diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index c89e181611..c8436cc3be 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -2,6 +2,8 @@ if BR2_TOOLCHAIN_BUILDROOT +comment "Toolchain Buildroot Options" + config BR2_TOOLCHAIN_BUILDROOT_VENDOR string "custom toolchain vendor name" default "buildroot" @@ -18,8 +20,6 @@ config BR2_TOOLCHAIN_BUILDROOT_VENDOR If you're not sure, just leave the default "buildroot" value. -source "package/linux-headers/Config.in.host" - choice prompt "C library" default BR2_TOOLCHAIN_UCLIBC @@ -89,6 +89,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LIBC default "glibc" if BR2_TOOLCHAIN_BUILDROOT_GLIBC default "musl" if BR2_TOOLCHAIN_BUILDROOT_MUSL +source "package/linux-headers/Config.in.host" source "package/linux-headers/Config.in" source "package/musl/Config.in" source "package/uclibc/Config.in" diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index b682e4d701..bf9dc7b93f 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -5,6 +5,8 @@ # so put it here instead source "package/gdb/Config.in.host" +comment "Toolchain Generic Options" + # https://sourceware.org/bugzilla/show_bug.cgi?id=19405 config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 bool diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index cdf01c9aa5..5324599bf7 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -1,5 +1,7 @@ if BR2_TOOLCHAIN_EXTERNAL +comment "Toolchain External Options" + choice prompt "Toolchain" From 4f87aa7db5eef544f04659edffb04dfb1ab181df Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 1 Aug 2016 00:35:55 +0200 Subject: [PATCH 1068/3392] support/download: make the git wrapper more robust Currently, there are two failure paths in the wrapper: - if the tar fails, then the error is ignored because it is on the left-hand-side of a pipe; - if the find fails, then the error is ignored because it is a process substitution (and there is a pipe, too). While the former could be fixed with "set -o pipefail", the latter can not be fixed thusly and we must use an intemediate file for it. So, fix both issues by using intermediate files, both to generate the list of files to include in the archive, and generate the archive in a temporary tarball. Fixes the following build issue, where the find is failing for whatever unknown reason: http://autobuild.buildroot.net/results/20f/20fd76d2256eee81837f7e9bbaefbe79d7645ae9/ And this one, where the process substitution failed, also for an unknown reason: http://autobuild.buildroot.org/results/018/018971ea9227b386fe25d3c264c7e80b843a9f68/ Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/download/git | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/support/download/git b/support/download/git index 281db61a9a..7921411835 100755 --- a/support/download/git +++ b/support/download/git @@ -92,6 +92,8 @@ rm -rf .git popd >/dev/null # Generate the archive, sort with the C locale so that it is reproducible +find "${basename}" -not -type d >"${basename}.list" +LC_ALL=C sort <"${basename}.list" >"${basename}.list.sorted" tar cf - --numeric-owner --owner=0 --group=0 --mtime="${date}" \ - -T <(find "${basename}" -not -type d |LC_ALL=C sort) \ -|gzip -n >"${output}" + -T "${basename}.list.sorted" >"${output}.tar" +gzip -n <"${output}.tar" >"${output}" From ae3bb50a6c0075f9c1ac432ae101011446096aad Mon Sep 17 00:00:00 2001 From: Hollis Blanchard Date: Fri, 7 Oct 2016 15:45:04 -0700 Subject: [PATCH 1069/3392] boot-wrapper-aarch64: Allow users to select the PSCI SMP boot method Signed-off-by: Hollis Blanchard [Thomas: - remove "default n" - pass explicit --disable-psci] Signed-off-by: Thomas Petazzoni --- boot/boot-wrapper-aarch64/Config.in | 6 ++++++ boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/boot/boot-wrapper-aarch64/Config.in b/boot/boot-wrapper-aarch64/Config.in index c4e63e23df..73d790fede 100644 --- a/boot/boot-wrapper-aarch64/Config.in +++ b/boot/boot-wrapper-aarch64/Config.in @@ -32,4 +32,10 @@ config BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS Kernel bootargs to embed inside the image generated by the boot wrapper. +config BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI + bool "Boot secondary SMP cores using PSCI" + help + Boot secondary SMP cores using PSCI firmware calls. If + disabled, the spin-table method is used instead. + endif diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index c56bdeeeab..a46937538d 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -30,6 +30,12 @@ BOOT_WRAPPER_AARCH64_CONF_OPTS = \ --with-kernel-dir=$(LINUX_DIR) \ --with-cmdline=$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS) +ifeq ($(BR2_TARGET_BOOT_WRAPPER_AARCH64_PSCI),y) +BOOT_WRAPPER_AARCH64_CONF_OPTS += --enable-psci +else +BOOT_WRAPPER_AARCH64_CONF_OPTS += --disable-psci +endif + # We need to convince the configure script that the Linux kernel tree # exists, as well as the DTB and the kernel Image. Even though those # are available on the build machine, the configure script uses From 679e133bfd6ec062659bb8cfe09b593e8081fef8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 26 Oct 2016 12:18:00 +0200 Subject: [PATCH 1070/3392] util-linux: fix host build when ncurses is not installed lib/colors.c uses HAVE_LIBTINFO to decide whether term.h and ncurses.h should be included. However, the configure.ac check is bogus: it checks for tinfo using pkg-config, and then if it fails, checks with AC_CHECK_LIB(). So, if you have tinfo installed, but not the corresponding development package, the pkg-config test will fail, but the AC_CHECK_LIB test will succeed, even though the headers are not available. To address this, we explicitly tell host-util-linux that tinfo is not available, like we're already doing for ncurses. Fixes: http://autobuild.buildroot.net/results/3c447e601a7b728860e78cabf2191ab206e6480d/ Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index bd6508ce44..cf03fd44ac 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -133,7 +133,8 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --enable-libblkid \ --enable-libmount \ --enable-libuuid \ - --without-ncurses + --without-ncurses \ + --without-tinfo ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown From 0eccbcf81440d9d20fce07f405c53b3b0375b83b Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Wed, 26 Oct 2016 11:19:07 +0200 Subject: [PATCH 1071/3392] package/nvidia-driver: indentation cleanup Signed-off-by: Jerzy Grzegorek Signed-off-by: Thomas Petazzoni --- package/nvidia-driver/nvidia-driver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index c1fc9863bb..36f6e133e4 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -160,7 +160,7 @@ define NVIDIA_DRIVER_INSTALL_LIBS $(foreach lib,$(NVIDIA_DRIVER_LIBS),\ $(INSTALL) -D -m 0644 $(@D)/$(lib) $(1)/usr/lib/$(notdir $(lib)) libsoname="$$( $(TARGET_READELF) -d "$(@D)/$(lib)" \ - |sed -r -e '/.*\(SONAME\).*\[(.*)\]$$/!d; s//\1/;' )"; \ + |sed -r -e '/.*\(SONAME\).*\[(.*)\]$$/!d; s//\1/;' )"; \ if [ -n "$${libsoname}" -a "$${libsoname}" != "$(notdir $(lib))" ]; then \ ln -sf $(notdir $(lib)) \ $(1)/usr/lib/$${libsoname}; \ From 8dd0b2beace34a4f56471362a2b5a682699ec443 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Wed, 26 Oct 2016 11:19:08 +0200 Subject: [PATCH 1072/3392] package/ti-sgx-km: indentation cleanup Signed-off-by: Jerzy Grzegorek Signed-off-by: Thomas Petazzoni --- package/ti-sgx-km/ti-sgx-km.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ti-sgx-km/ti-sgx-km.mk b/package/ti-sgx-km/ti-sgx-km.mk index 58ba3f0960..48c8a6d1fa 100644 --- a/package/ti-sgx-km/ti-sgx-km.mk +++ b/package/ti-sgx-km/ti-sgx-km.mk @@ -31,7 +31,7 @@ TI_SGX_KM_SUBDIR = eurasia_km/eurasiacon/build/linux2/$(TI_SGX_KM_PLATFORM_NAME) define TI_SGX_KM_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TI_SGX_KM_MAKE_OPTS) \ - -C $(@D)/$(TI_SGX_KM_SUBDIR) + -C $(@D)/$(TI_SGX_KM_SUBDIR) endef define TI_SGX_KM_INSTALL_TARGET_CMDS From f63b2a4e9c1807c787c648cc7cdb0fd9fcc9dfe9 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 26 Oct 2016 11:02:45 +0100 Subject: [PATCH 1073/3392] file: bump version to 5.29 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/file/file.hash | 2 +- package/file/file.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/file/file.hash b/package/file/file.hash index 21067b5f87..9a4c9f1197 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 0ecb5e146b8655d1fa84159a847ee619fc102575205a0ff9c6cc60fc5ee2e012 file-5.28.tar.gz +sha256 ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0 file-5.29.tar.gz diff --git a/package/file/file.mk b/package/file/file.mk index 201651cdbc..3309c95fa8 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.28 +FILE_VERSION = 5.29 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib From 4f4657985d0643017d037fd50eaf8cef439d6c9b Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 26 Oct 2016 11:02:46 +0100 Subject: [PATCH 1074/3392] tcpdump: bump version to 4.8.1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/tcpdump/tcpdump.hash | 2 +- package/tcpdump/tcpdump.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index 997cd424e6..21fb83f418 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 177385d9d17d1d99ba6aa3ea63a8400a5f4c54db62b83ac6d4da56944bee623b tcpdump-4.8.0.tar.gz +sha256 20e4341ec48fcf72abcae312ea913e6ba6b958617b2f3fb496d51f0ae88d831c tcpdump-4.8.1.tar.gz diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 559b816a6e..3773fcb9c0 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.8.0 +TCPDUMP_VERSION = 4.8.1 TCPDUMP_SITE = http://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3c TCPDUMP_LICENSE_FILES = LICENSE From 76e10967e1fbf2ff28dd70df5e0e8970542ca7df Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Tue, 25 Oct 2016 19:02:16 -0700 Subject: [PATCH 1075/3392] board: fix indentation in zybo readme.txt Signed-off-by: Matt Kraai Signed-off-by: Thomas Petazzoni --- board/digilent/zybo/readme.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/digilent/zybo/readme.txt b/board/digilent/zybo/readme.txt index 2a60a7cc17..4e7454c50d 100644 --- a/board/digilent/zybo/readme.txt +++ b/board/digilent/zybo/readme.txt @@ -58,12 +58,12 @@ in the output/images/ directory. The first partition is a FAT32 partition created at the beginning of the SD Card that contains the following files : - /BOOT.BIN - /zynq-zybo.dtb + /BOOT.BIN + /zynq-zybo.dtb /uEnv.txt /system.bit - /uImage - /u-boot-dtb.img + /uImage + /u-boot-dtb.img The second partition is an ext4 partition that contains the root filesystem. From e1b344070c607f9a3f0a7004650f00c9e6e83c7b Mon Sep 17 00:00:00 2001 From: Cyril Bur Date: Wed, 26 Oct 2016 14:19:15 +1100 Subject: [PATCH 1076/3392] kvm-unit-tests: Fix x86_64 to use host compiler kvm-unit-tests requires a multilib compiler for x86_64 as it compiles 32bit boot code. This patch uses the BR2_HOSTARCH_NEEDS_IA32_COMPILER option to enforce this and avoids using TARGET_CROSS for x86_64 targets and uses the host 32bit (and 64bit) capable compiler. Signed-off-by: Cyril Bur [Thomas: reword comment in .mk file.] Signed-off-by: Thomas Petazzoni --- package/kvm-unit-tests/Config.in | 1 + package/kvm-unit-tests/kvm-unit-tests.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index f77189601d..d72c734e78 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KVM_UNIT_TESTS bool "kvm-unit-tests" + select BR2_HOSTARCH_NEEDS_IA32_COMPILER if BR2_x86_64=y depends on BR2_arm || BR2_i386 || BR2_powerpc64 || \ BR2_powerpc64le || BR2_x86_64 help diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 7fd03add7d..1ace2e721a 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -28,9 +28,16 @@ endif KVM_UNIT_TESTS_CONF_OPTS =\ --arch="$(KERNEL_ARCH)" \ - --cross-prefix="$(TARGET_CROSS)" \ --endian="$(KVM_UNIT_TESTS_ENDIAN)" +# For all architectures but x86-64, we use the target +# compiler. However, for x86-64, we use the host compiler, as +# kvm-unit-tests builds 32 bit code, which Buildroot toolchains for +# x86-64 cannot do. +ifneq ($(BR2_x86_64),y) +KVM_UNIT_TESTS_CONF_OPTS += --cross-prefix="$(TARGET_CROSS)" +endif + define KVM_UNIT_TESTS_CONFIGURE_CMDS cd $(@D) && ./configure $(KVM_UNIT_TESTS_CONF_OPTS) endef From 0f416f55c471e1337474e3410e507b4e90b98de2 Mon Sep 17 00:00:00 2001 From: Cyril Bur Date: Wed, 26 Oct 2016 14:19:16 +1100 Subject: [PATCH 1077/3392] kvm-unit-tests: Bump version This version bump includes several fixes for x86 and a significant fix to powerpc transactional memory tests. Signed-off-by: Cyril Bur Signed-off-by: Thomas Petazzoni --- package/kvm-unit-tests/kvm-unit-tests.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 1ace2e721a..1b5ce787ef 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,7 +4,7 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = 0b04ed0610035792514fd8499eb4dacc185520d9 +KVM_UNIT_TESTS_VERSION = 5731572b2ac23eb410732110b93425b5bb7f27dd KVM_UNIT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/scm/virt/kvm/kvm-unit-tests.git KVM_UNIT_TESTS_SITE_METHOD = git KVM_UNIT_TESTS_LICENSE = LGPLv2 From 6c042622e1f1aeda4c6de8b04a5853657377302a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 26 Oct 2016 16:24:41 +0200 Subject: [PATCH 1078/3392] python-pyqt5: fix the build with Qt 5.6.2 This commit adds a patch to the python-pyqt5 package that fixes the build with Qt 5.6.2. It has been verified to fix: http://autobuild.buildroot.net/results/8ca61ec09cf0e6577d72fe5d809867aa284c8f1e/ And it should also fix: http://autobuild.buildroot.net/results/4e0c5776264a7382c842f04e333fe4ded7d14f8a/ http://autobuild.buildroot.net/results/0306710e0f39591dba74f24aff40f7f094bcfa6e/ Signed-off-by: Thomas Petazzoni --- package/python-pyqt5/0002-fix-qt-5.6.2.patch | 28 ++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/python-pyqt5/0002-fix-qt-5.6.2.patch diff --git a/package/python-pyqt5/0002-fix-qt-5.6.2.patch b/package/python-pyqt5/0002-fix-qt-5.6.2.patch new file mode 100644 index 0000000000..a56af09025 --- /dev/null +++ b/package/python-pyqt5/0002-fix-qt-5.6.2.patch @@ -0,0 +1,28 @@ +Fix the build with Qt 5.6.2 + +Building PyQt 5.7 with versions of Qt older than Qt 5.7 is supposed to +work, but currently fails in practice. In fact, this is due to the +fact that the %Timeline variable in QtCoremod.sip didn't contain the +5.6.2 Qt version, so if this version was used, PyQt was assuming it +was the later version 5.7, and therefore started enabling APIs only +available in Qt 5.7, causing build failures when building against Qt +5.6.2. + +Adding Qt_5_6_2 to the timeline fixes this problem. This fix was +suggested by Phil Thompson . + +Signed-off-by: Thomas Petazzoni + +Index: PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip +=================================================================== +--- PyQt5_gpl-5.7.orig/sip/QtCore/QtCoremod.sip 2016-07-25 15:55:37.000000000 +0200 ++++ PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip 2016-10-26 15:45:43.577153825 +0200 +@@ -22,7 +22,7 @@ + + %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1) + +-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0} ++%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_7_0} + + %Platforms {WS_X11 WS_WIN WS_MACX} + From e488b56cffa33ae4cd2bb4f7dd954dde0e28b2d3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 26 Oct 2016 21:11:34 +0200 Subject: [PATCH 1079/3392] Config.in: add BR2_HOST_GCC_AT_LEAST_4_5 In preparation to the addition of new dependencies in the kvm-unit-tests package, add the BR2_HOST_GCC_AT_LEAST_4_5 symbol. Signed-off-by: Thomas Petazzoni --- Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Config.in b/Config.in index 21173b79f3..5cf0c4d290 100644 --- a/Config.in +++ b/Config.in @@ -23,9 +23,14 @@ config BR2_HOST_GCC_VERSION string option env="HOST_GCC_VERSION" +config BR2_HOST_GCC_AT_LEAST_4_5 + bool + default y if BR2_HOST_GCC_VERSION = "4 5" + config BR2_HOST_GCC_AT_LEAST_4_6 bool default y if BR2_HOST_GCC_VERSION = "4 6" + select BR2_HOST_GCC_AT_LEAST_4_5 config BR2_HOST_GCC_AT_LEAST_4_7 bool From bde0250f069d80a6f823766566d9b146d7559dce Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 26 Oct 2016 21:12:03 +0200 Subject: [PATCH 1080/3392] kvm-unit-tests: add gcc version dependencies On x86 (both i386 and x86_64), the kvm-unit-tests code uses __builtin_reachable, which appeared in gcc 4.5. This commit adds the relevant dependencies to kvm-unit-tests: - on i386, we need gcc 4.5 as the target compiler - on x86-64, we need gcc 4.5 as the host compiler, because we use the host compiler to build kvm-unit-tests for this architecture Fixes: http://autobuild.buildroot.net/results/21340a7e6494e23adb2fe8dc6253ab220c380fec/ Signed-off-by: Thomas Petazzoni --- package/kvm-unit-tests/Config.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index d72c734e78..f704a8e0c3 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -1,8 +1,14 @@ config BR2_PACKAGE_KVM_UNIT_TESTS bool "kvm-unit-tests" select BR2_HOSTARCH_NEEDS_IA32_COMPILER if BR2_x86_64=y - depends on BR2_arm || BR2_i386 || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_x86_64 + # on i386 and x86-64, __builtin_reachable is used, so we need + # gcc 4.5 at least. on i386, we use the target gcc, while on + # x86-64 we use the host gcc (see .mk file for details) + depends on BR2_arm || \ + (BR2_i386 && BR2_TOOLCHAIN_GCC_AT_LEAST_4_5) || \ + BR2_powerpc64 || \ + BR2_powerpc64le || \ + (BR2_x86_64 && BR2_HOST_GCC_AT_LEAST_4_5) help kvm-unit-tests is a project as old as KVM. As its name suggests, it's purpose is to provide unit tests for KVM. The From 5debaf1bebcd96e40e7b1fc7e0b9ee02194e7960 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 26 Oct 2016 18:08:02 +0200 Subject: [PATCH 1081/3392] mfgtools: new package This package contains the Freescale manufacturing tool. It is designed to program firmware to i.MX boards during production. The communication is done over USB using the Freescale UTP protocol. The project is maintained on NXPMicro Github repository: https://github.com/NXPmicro/mfgtools Signed-off-by: Gary Bisson [Thomas: - remove dependency on host-cmake, this is handled by the host-cmake-package infrastructure - add quotes around $(HOSTCXX) - add CPOL.htm to _LICENSE_FILES. - tweaks to the readme.txt file.] Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/mfgtools/Config.in.host | 10 +++++ package/mfgtools/mfgtools.hash | 2 + package/mfgtools/mfgtools.mk | 34 ++++++++++++++++ package/mfgtools/readme.txt | 69 +++++++++++++++++++++++++++++++++ 5 files changed, 116 insertions(+) create mode 100644 package/mfgtools/Config.in.host create mode 100644 package/mfgtools/mfgtools.hash create mode 100644 package/mfgtools/mfgtools.mk create mode 100644 package/mfgtools/readme.txt diff --git a/package/Config.in.host b/package/Config.in.host index 1140c70c82..e33cbb57e9 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -22,6 +22,7 @@ menu "Host utilities" source "package/jq/Config.in.host" source "package/jsmin/Config.in.host" source "package/lpc3250loader/Config.in.host" + source "package/mfgtools/Config.in.host" source "package/mke2img/Config.in.host" source "package/mkpasswd/Config.in.host" source "package/mtd/Config.in.host" diff --git a/package/mfgtools/Config.in.host b/package/mfgtools/Config.in.host new file mode 100644 index 0000000000..8bba9e2444 --- /dev/null +++ b/package/mfgtools/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_MFGTOOLS + bool "host mfgtools" + depends on BR2_arm + help + This package contains the Freescale manufacturing tool. + It is designed to program firmware to i.MX boards during + production. The communication is done over USB using the + Freescale UTP protocol. + + https://github.com/NXPmicro/mfgtools diff --git a/package/mfgtools/mfgtools.hash b/package/mfgtools/mfgtools.hash new file mode 100644 index 0000000000..e73a7fa13a --- /dev/null +++ b/package/mfgtools/mfgtools.hash @@ -0,0 +1,2 @@ +# locally computed +sha256 6ce93a33c269282df305cf7e517d2d14fde78203537d8ea75b064966afe48464 mfgtools-b219fc219a35c365010897ed093c40750f8cdac6.tar.gz diff --git a/package/mfgtools/mfgtools.mk b/package/mfgtools/mfgtools.mk new file mode 100644 index 0000000000..cc24352462 --- /dev/null +++ b/package/mfgtools/mfgtools.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# mfgtools +# +################################################################################ + +MFGTOOLS_VERSION = b219fc219a35c365010897ed093c40750f8cdac6 +MFGTOOLS_SITE = $(call github,NXPmicro,mfgtools,$(MFGTOOLS_VERSION)) +MFGTOOLS_SUBDIR = MfgToolLib +MFGTOOLS_LICENSE = BSD-3c or CPOL +MFGTOOLS_LICENSE_FILES = LICENSE CPOL.htm +HOST_MFGTOOLS_DEPENDENCIES = host-libusb + +HOST_MFGTOOLS_CFLAGS = \ + $(HOST_CFLAGS) $(HOST_LDFLAGS) -std=c++11 -lpthread \ + -L$(@D)/MfgToolLib -lMfgToolLib -I$(@D)/MfgToolLib \ + -lusb-1.0 -I$(HOST_DIR)/usr/include/libusb-1.0 \ + -fpermissive -Wno-write-strings + +define HOST_MFGTOOLS_CLI_BUILD + $(HOST_CONFIGURE_OPTS) $(MAKE) CC="$(HOSTCXX)" \ + CFLAGS="$(HOST_MFGTOOLS_CFLAGS)" -C $(@D)/TestPrgm +endef + +HOST_MFGTOOLS_POST_BUILD_HOOKS += HOST_MFGTOOLS_CLI_BUILD + +define HOST_MFGTOOLS_INSTALL_CMDS + $(INSTALL) -D -m 755 $(@D)/MfgToolLib/libMfgToolLib.so \ + $(HOST_DIR)/usr/lib/libMfgToolLib.so + $(INSTALL) -D -m 755 $(@D)/TestPrgm/mfgtoolcli \ + $(HOST_DIR)/usr/bin/mfgtoolcli +endef + +$(eval $(host-cmake-package)) diff --git a/package/mfgtools/readme.txt b/package/mfgtools/readme.txt new file mode 100644 index 0000000000..d54781f1f9 --- /dev/null +++ b/package/mfgtools/readme.txt @@ -0,0 +1,69 @@ +MfgTools Howto +============== + +1. Build your mfgtool image + +Make sure to enable the following Buildroot options: + +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_IMX_UUC=y +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y + +Also modify your kernel configuration to have: + +CONFIG_USB_GADGET=y +CONFIG_USB_MASS_STORAGE=y +CONFIG_FSL_UTP=y +CONFIG_MMC_BLOCK_MINORS=16 + +2. Go into the output and create the necessary folders + +$ cd output +$ mkdir -p "Profiles/Linux/OS Firmware/firmware" + +3. Create your XML update script named ucl2.xml + +You can find a sample XML at: + +$ wget https://storage.googleapis.com/boundarydevices.com/ucl2.xml \ + -O Profiles/Linux/OS\ Firmware/ucl2.xml + +4. Copy the U-Boot, Kernel and initramfs images to the appropriate +folder + +$ cp images/u-boot.imx images/zImage images/imx6q-sabrelite.dtb \ + images/rootfs.cpio.uboot Profiles/Linux/OS\ Firmware/firmware/ + +5. Copy the prebuilt binaries to be flashed + +Depending on your ucl2.xml file, the sample doesn't flash anything. + +6. Run the MfgTools client: + +$ ./host/usr/bin/mfgtoolcli -l mmc -s uboot_defconfig=imx \ + -s dtbname=imx6q-sabrelite.dtb -s initramfs=rootfs.cpio.uboot \ + -s mmc=1 -p 1 + +For more information about the tools options, please read the +"Manufacturing Tool V2 Quick Start Guide.docx" documentation contained +in every mfgtools package from NXP website[1]. + +Note: All the above commands require your Linux host user to have +permissions to access the USB devices. Please make sure to have udev +rules that allow the user to communicate with the BootROM IDs +(Freescale USB recovery) as well as the one used for the UTP Linux +image (0x066F:0x37FF). Using 'sudo' in front of the mfgtoolcli +command would also grant you the necessary permission but it is *not* +recommended. + +Also, if your U-Boot environment doesn't include mfgtools bootargs, +make sure to set the following: + +setenv bootargs "console=${console},${baudrate} g_mass_storage.stall=0 \ + g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F \ + g_mass_storage.idProduct=0x37FF g_mass_storage.iSerialNumber=\"\" \ + g_mass_storage.file=/fat" + +[1] http://www.nxp.com/products/software-and-tools/software-development-tools/i.mx-software-and-tools/i.mx-6-series-software-and-development-tool-resources:IMX6_SW From 20f73c2ecb3feb5f6014196e40ba2615f4e1c633 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 26 Oct 2016 18:08:03 +0200 Subject: [PATCH 1082/3392] DEVELOPERS: add entry for mfgtools Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 85dbb36c38..d0a51da3fb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -534,6 +534,7 @@ F: configs/nitrogen* F: package/freescale-imx/ F: package/gstreamer1/gst1-imx/ F: package/libimxvpuapi/ +F: package/mfgtools/ F: package/sshpass/ N: Geoff Levand From a2d9202f6f9119e1cea44a913306e361b03d90e5 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 26 Oct 2016 20:03:09 +0300 Subject: [PATCH 1083/3392] libpcap: drop libnl headers patch We can avoid host headers using a --with-libnl parameter to override the default host headers path. The configure script adds /include suffix to the include path. So we still need to manually add -I with the correct path to CFLAGS because libnl headers are under the libnl3/ directory. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- .../0001-remove-libnl-include-path.patch | 25 ------------------- package/libpcap/libpcap.mk | 1 + 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 package/libpcap/0001-remove-libnl-include-path.patch diff --git a/package/libpcap/0001-remove-libnl-include-path.patch b/package/libpcap/0001-remove-libnl-include-path.patch deleted file mode 100644 index d0760d4f9d..0000000000 --- a/package/libpcap/0001-remove-libnl-include-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -Remove hardcoded path to libnl3 include directory - -Signed-off-by: Thomas Petazzoni -[Gustavo: update for 1.7.2] - -diff -Nura libpcap-1.7.2.orig/configure.in libpcap-1.7.2/configure.in ---- libpcap-1.7.2.orig/configure.in 2015-03-14 08:02:05.538706347 -0300 -+++ libpcap-1.7.2/configure.in 2015-03-14 08:17:22.637519050 -0300 -@@ -461,14 +461,13 @@ - # - # Yes, we have libnl 3.x. - # -- LIBS="${libnldir} -lnl-genl-3 -lnl-3 $LIBS" -+ LIBS="-lnl-genl-3 -lnl-3 $LIBS" - AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) - AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x]) - AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE]) - AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api]) -- V_INCLS="$V_INCLS ${incdir}" - have_any_nl="yes" -- ],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 ) -+ ],[], -lnl-genl-3 -lnl-3 ) - - if test x$have_any_nl = xno ; then - # diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 4c7a66c09d..0a74de7b8e 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -51,6 +51,7 @@ endif ifeq ($(BR2_PACKAGE_LIBNL),y) LIBPCAP_DEPENDENCIES += libnl LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3" +LIBPCAP_CONF_OPTS += --with-libnl=$(STAGING_DIR)/usr else LIBPCAP_CONF_OPTS += --without-libnl endif From b35e87f0dd9e057647d8e3bb29a524fa5477a98c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 26 Oct 2016 20:03:10 +0300 Subject: [PATCH 1084/3392] libpcap: bump to version 1.8.1 Drop upstream patch. Also remove ac_cv_linux_vers caching since this check was remove in upstream commit f3e011b18c55ae. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...ix-detect-of-if_bonding.h-on-uclinux.patch | 30 ------------------- package/libpcap/libpcap.hash | 2 +- package/libpcap/libpcap.mk | 5 +--- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch diff --git a/package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch b/package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch deleted file mode 100644 index 7838c6f256..0000000000 --- a/package/libpcap/0002-configure.in-fix-detect-of-if_bonding.h-on-uclinux.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5b8dc4eaeab60d5effc33055e5bce9ac0d98d339 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 2 Jun 2015 21:39:15 +0300 -Subject: [PATCH] configure.in: fix detect of if_bonding.h on uclinux - -noMMU Linux (uClinux) is also Linux - -Upstream status: https://github.com/the-tcpdump-group/libpcap/pull/440 - -Signed-off-by: Baruch Siach ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index be4b29e2f8ba..31287d0dbe61 100644 ---- a/configure.in -+++ b/configure.in -@@ -149,7 +149,7 @@ struct rtentry; - fi - - case "$host_os" in --linux*) -+linux*|uclinux*) - AC_CHECK_HEADERS(linux/sockios.h linux/if_bonding.h,,, - [ - #include --- -2.1.4 - diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index 5ce53673b8..6894046aff 100644 --- a/package/libpcap/libpcap.hash +++ b/package/libpcap/libpcap.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7f448b0 libpcap-1.7.4.tar.gz +sha256 673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e libpcap-1.8.1.tar.gz diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 0a74de7b8e..2583087953 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,17 +4,14 @@ # ################################################################################ -LIBPCAP_VERSION = 1.7.4 +LIBPCAP_VERSION = 1.8.1 LIBPCAP_SITE = http://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3c LIBPCAP_LICENSE_FILES = LICENSE LIBPCAP_INSTALL_STAGING = YES LIBPCAP_DEPENDENCIES = zlib host-flex host-bison -# We're patching configure.in -LIBPCAP_AUTORECONF = YES LIBPCAP_CONF_ENV = \ - ac_cv_linux_vers=2 \ ac_cv_header_linux_wireless_h=yes \ CFLAGS="$(LIBPCAP_CFLAGS)" LIBPCAP_CFLAGS = $(TARGET_CFLAGS) From 09feb408f2d239d1146141453ad85df866bc4158 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 26 Oct 2016 22:02:43 +0200 Subject: [PATCH 1085/3392] olsr: bump to 0.9.0.3 Signed-off-by: Thomas Petazzoni --- package/olsr/olsr.hash | 4 ++-- package/olsr/olsr.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/olsr/olsr.hash b/package/olsr/olsr.hash index e14d52cd9e..c6b14153e3 100644 --- a/package/olsr/olsr.hash +++ b/package/olsr/olsr.hash @@ -1,2 +1,2 @@ -# From http://www.olsr.org/releases/0.9/SHA256SUM-0.9.0.2 -sha256 cc464b29c7740354d815d5faa753fd27c0677d71e8eb42e78abc382996892845 olsrd-0.9.0.2.tar.bz2 +# From http://www.olsr.org/releases/0.9/SHA256SUM-0.9.0.3 +sha256 1f038ed3ea72e4f73dfc9701de83de7313f5049161c8df17b9aaeba8e9711e92 olsrd-0.9.0.3.tar.bz2 diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk index 60c80988d0..5a456a953e 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -5,7 +5,7 @@ ################################################################################ OLSR_VERSION_MAJOR = 0.9 -OLSR_VERSION = $(OLSR_VERSION_MAJOR).0.2 +OLSR_VERSION = $(OLSR_VERSION_MAJOR).0.3 OLSR_SOURCE = olsrd-$(OLSR_VERSION).tar.bz2 OLSR_SITE = http://www.olsr.org/releases/$(OLSR_VERSION_MAJOR) OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \ From 4bca88c839e54a9140c06010666f5e034127b8b1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 26 Oct 2016 22:02:58 +0200 Subject: [PATCH 1086/3392] olsr: disable in musl configurations olsr doesn't build on musl, so let's disable it. The issue has been reported upstream at https://github.com/OLSR/olsrd/issues/6. Fixes: http://autobuild.buildroot.net/results/74cff8fc87d95d70840394fc049fc038797b9888/ Signed-off-by: Thomas Petazzoni --- package/olsr/Config.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/olsr/Config.in b/package/olsr/Config.in index a49c4e0f10..2f3d024bd6 100644 --- a/package/olsr/Config.in +++ b/package/olsr/Config.in @@ -3,6 +3,9 @@ config BR2_PACKAGE_OLSR depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + # doesn't build with musl, + # https://github.com/OLSR/olsrd/issues/6 + depends on !BR2_TOOLCHAIN_USES_MUSL help The Optimized Link State Routing protocol (OLSR) is a routing protocol that is optimised for mobile ad-hoc @@ -13,6 +16,7 @@ config BR2_PACKAGE_OLSR http://www.olsr.org/ -comment "olsr needs a toolchain w/ threads, dynamic library" +comment "olsr needs a uClibc or glibc toolchain w/ threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + BR2_TOOLCHAIN_USES_MUSL From 9687e7435b76707afcf8b9aef15c98ea5287da75 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Tue, 25 Oct 2016 23:21:09 +0200 Subject: [PATCH 1087/3392] perl: update cnf/config.{sub, guess} using autotools hook perl may fail to build on newer host architectures such as aarch64 due to its inability to guess the host architecture to build 'miniperl', which is built during the process. An error message looks like this: Configuring build-time miniperl for unknown ERROR: No $target defined (?!) ERROR: configure --mode=buildmini failed This happens because the config.sub and config.guess files from perl are not modified and may become outdated. These files are normally updated automatically by a Buildroot hook for autotools packages, to avoid problems like these. Although perl uses the config.sub and config.guess files, it is not a strict autotools package, so it is not defined as an "autotools-package" in Buildroot and so it doesn't inherit the hook. This commit makes perl borrow the hook from the autotools infrastructure so that it can build on newer build architectures. This has been tested by building it on an aarch64 host machine. Signed-off-by: Erico Nunes Acked-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/perl/perl.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 29b4455932..a8768b216c 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -33,6 +33,12 @@ define PERL_CROSS_EXTRACT endef PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT +# Even though perl is not an autotools-package, it uses config.sub and +# config.guess. Up-to-date versions of these files may be needed to build perl +# on newer host architectures, so we borrow the hook which updates them from the +# autotools infrastructure. +PERL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK + define PERL_CROSS_SET_POD $(SED) s/$(PERL_CROSS_OLD_POD)/$(PERL_CROSS_NEW_POD)/g $(@D)/Makefile endef From df8534455472b4257d57b88162a8fb8402fc50ff Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Oct 2016 18:38:47 +0200 Subject: [PATCH 1088/3392] package/xdriver_xf86-input-evdev: fix install paths Get rid of the borked sdkdir variable. Fixes (partially): https://bugs.busybox.net/show_bug.cgi?id=8696 Reported-by: buildroot@netsolux.ch Signed-off-by: "Yann E. MORIN" Cc: buildroot@netsolux.ch Cc: Gustavo Zacarias Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- .../0001-build-get-rid-of-sdkdir.patch | 87 +++++++++++++++++++ .../xdriver_xf86-input-evdev.mk | 2 + 2 files changed, 89 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch diff --git a/package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch b/package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch new file mode 100644 index 0000000000..b342295440 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch @@ -0,0 +1,87 @@ +From 1ad5e1593556f767150c2ca75176453bee4771e6 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 23 Oct 2016 22:00:10 +0200 +Subject: [PATCH] build: get rid of sdkdir + +Use of sdkdir causes problems during cross-compilation, where the full +path is then appended to the DESTDIR, leading to host paths being +appended in the target: + https://bugs.busybox.net/show_bug.cgi?id=8696 + +Other drivers (e.g. keyboard) got rid of sdkdir. Do the same. + +Signed-off-by: "Yann E. MORIN" +--- + Makefile.am | 4 ---- + configure.ac | 9 --------- + include/Makefile.am | 5 ++++- + xorg-evdev.pc.in | 10 ++++++++-- + 4 files changed, 12 insertions(+), 16 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 1cc3ea6..1ae042a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,10 +18,6 @@ + # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +- +-# Provide an sdk location that is writable by the evdev module +-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' +- + SUBDIRS = src man include + MAINTAINERCLEANFILES = ChangeLog INSTALL + +diff --git a/configure.ac b/configure.ac +index e4887a3..4adfa43 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -66,15 +66,6 @@ AC_ARG_WITH(xorg-conf-dir, + [xorgconfdir="$prefix/share/X11/xorg.conf.d"]) + AC_SUBST(xorgconfdir) + +-# X Server SDK location is required to install evdev header files +-# This location is also relayed in the xorg-evdev.pc file +-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` +- +-# Workaround overriding sdkdir to be able to create a tarball when user has no +-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am +-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) +-AC_SUBST([sdkdir]) +- + DRIVER_NAME=evdev + AC_SUBST([DRIVER_NAME]) + +diff --git a/include/Makefile.am b/include/Makefile.am +index 0e3fc1b..afc96ed 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -1 +1,4 @@ +-sdk_HEADERS = evdev-properties.h ++# location formerly known as 'sdkdir': ++xorgincludedir = $(includedir)/xorg ++ ++xorginclude_HEADERS = evdev-properties.h +diff --git a/xorg-evdev.pc.in b/xorg-evdev.pc.in +index 20710a6..fcbf511 100644 +--- a/xorg-evdev.pc.in ++++ b/xorg-evdev.pc.in +@@ -1,6 +1,12 @@ +-sdkdir=@sdkdir@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++datarootdir=@datarootdir@ ++moduledir=@moduledir@ ++sysconfigdir=@sysconfigdir@ + + Name: xorg-evdev + Description: X.Org evdev input driver. + Version: @PACKAGE_VERSION@ +-Cflags: -I${sdkdir} ++Cflags: -I${includedir}/xorg +-- +2.7.4 + 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 606f1bed25..9ec893b4e1 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 @@ -9,6 +9,8 @@ XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VE XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_EVDEV_LICENSE = MIT XDRIVER_XF86_INPUT_EVDEV_LICENSE_FILES = COPYING +XDRIVER_XF86_INPUT_EVDEV_AUTORECONF = YES + XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = \ host-pkgconf \ libevdev \ From e07338fa99f7807fafd32dc6b811d313bd14327b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Oct 2016 18:38:48 +0200 Subject: [PATCH 1089/3392] package/xdriver_xf86-input-joystick: fix install paths Get rid of the borked sdkdir variable. Fixes (partially): https://bugs.busybox.net/show_bug.cgi?id=8696 Reported-by: buildroot@netsolux.ch Signed-off-by: "Yann E. MORIN" Cc: buildroot@netsolux.ch Cc: Gustavo Zacarias Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- .../0001-build-get-rid-of-sdkdir.patch | 78 +++++++++++++++++++ .../xdriver_xf86-input-joystick.mk | 1 + 2 files changed, 79 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch diff --git a/package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch b/package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch new file mode 100644 index 0000000000..a611f1536d --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch @@ -0,0 +1,78 @@ +From 2826691dcd01f470d30dc8eb3bbd24a96cd3a93c Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 23 Oct 2016 22:29:29 +0200 +Subject: [PATCH] build: get rid of sdkdir + +Use of sdkdir causes problems during cross-compilation, where the full +path is then appended to the DESTDIR, leading to host paths being +appended in the target: + https://bugs.busybox.net/show_bug.cgi?id=8696 + +Other drivers (e.g. keyboard) got rid of sdkdir. Do the same. + +Signed-off-by: "Yann E. MORIN" +--- + Makefile.am | 1 - + configure.ac | 9 --------- + include/Makefile.am | 5 ++++- + xorg-joystick.pc.in | 2 +- + 4 files changed, 5 insertions(+), 12 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 13946b8..c1567ae 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,7 +18,6 @@ + # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir=\$${includedir}/xorg + SUBDIRS = src man config include + MAINTAINERCLEANFILES = ChangeLog INSTALL + +diff --git a/configure.ac b/configure.ac +index b5834a5..44b9d27 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -66,15 +66,6 @@ AC_ARG_WITH(xorg-module-dir, + inputdir=${moduledir}/input + AC_SUBST(inputdir) + +-# Define a configure option for an alternate X Server SDK Headers +-# X Server SDK location is required to install joystick header files +-AC_ARG_WITH(sdkdir, +- AS_HELP_STRING([--with-sdkdir=], +- [Xorg X Server sdk headers (default is autodetected)]), +- [sdkdir="$withval"], +- [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`]) +-AC_SUBST(sdkdir) +- + # Define a configure option to enable code debugging + AC_ARG_ENABLE(debug, AS_HELP_STRING([--disable-debug], + [Disable debugging code (default: enabled)]), +diff --git a/include/Makefile.am b/include/Makefile.am +index ed618c2..d656568 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -18,4 +18,7 @@ + # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-sdk_HEADERS = joystick-properties.h ++# Location formerly known as 'sdkdir' ++xorgincludedir = $(includedir)/xorg ++ ++xorginclude_HEADERS = joystick-properties.h +diff --git a/xorg-joystick.pc.in b/xorg-joystick.pc.in +index 76bb92f..a5972c7 100644 +--- a/xorg-joystick.pc.in ++++ b/xorg-joystick.pc.in +@@ -4,4 +4,4 @@ includedir=@includedir@ + Name: xorg-joystick + Description: X.Org joystick input driver. + Version: @PACKAGE_VERSION@ +-Cflags: -I${includedir} ++Cflags: -I${includedir}/xorg +-- +2.7.4 + diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk index 2696e2b7d2..76f257727f 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk @@ -10,6 +10,7 @@ XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individu XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT XDRIVER_XF86_INPUT_JOYSTICK_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto +XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = YES define XDRIVER_XF86_INPUT_JOYSTICK_CONF $(INSTALL) -m 0644 -D \ From b8bd2bea3b1ce2cdb0c510e2aee889ae9b3f2c92 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Oct 2016 18:38:49 +0200 Subject: [PATCH 1090/3392] package/xdriver_xf86-input-libinput: fix install paths Get rid of the borked sdkdir variable. Fixes (partially): https://bugs.busybox.net/show_bug.cgi?id=8696 Reported-by: buildroot@netsolux.ch Signed-off-by: "Yann E. MORIN" Cc: buildroot@netsolux.ch Cc: Gustavo Zacarias Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- .../0001-build-get-rid-of-sdkdir.patch | 78 +++++++++++++++++++ .../xdriver_xf86-input-libinput.mk | 1 + 2 files changed, 79 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch diff --git a/package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch b/package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch new file mode 100644 index 0000000000..2f9784c283 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch @@ -0,0 +1,78 @@ +From 1b2cf6e6c2640e08166af36eee775542a45325af Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 23 Oct 2016 22:36:40 +0200 +Subject: [PATCH] build: get rid of sdkdir + +Use of sdkdir causes problems during cross-compilation, where the full +path is then appended to the DESTDIR, leading to host paths being +appended in the target: + https://bugs.busybox.net/show_bug.cgi?id=8696 + +Other drivers (e.g. keyboard) got rid of sdkdir. Do the same. + +Signed-off-by: "Yann E. MORIN" +--- + Makefile.am | 2 -- + configure.ac | 8 -------- + include/Makefile.am | 4 +++- + xorg-libinput.pc.in | 5 +++-- + 4 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index a447d61..7aa5523 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -19,8 +19,6 @@ + # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' +- + SUBDIRS = src include man test + MAINTAINERCLEANFILES = ChangeLog INSTALL + +diff --git a/configure.ac b/configure.ac +index 9894817..fe198cb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -63,14 +63,6 @@ AC_ARG_WITH(xorg-conf-dir, + [xorgconfdir='${prefix}/share/X11/xorg.conf.d']) + AC_SUBST(xorgconfdir) + +-# X Server SDK location is required to install header files +-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` +- +-# Workaround overriding sdkdir to be able to create a tarball when user has no +-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am +-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) +-AC_SUBST([sdkdir]) +- + DRIVER_NAME=libinput + AC_SUBST([DRIVER_NAME]) + +diff --git a/include/Makefile.am b/include/Makefile.am +index 0d52b9b..271ffac 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -1 +1,3 @@ +-sdk_HEADERS = libinput-properties.h ++# Location formerly known as 'sdkdir' ++xorgincludedir = $(includedir)/xorg ++xorginclude_HEADERS = libinput-properties.h +diff --git a/xorg-libinput.pc.in b/xorg-libinput.pc.in +index ff98189..9c0f506 100644 +--- a/xorg-libinput.pc.in ++++ b/xorg-libinput.pc.in +@@ -1,6 +1,7 @@ +-sdkdir=@sdkdir@ ++prefix=@prefix@ ++includedir=@includedir@ + + Name: xorg-libinput + Description: X.Org libinput input driver. + Version: @PACKAGE_VERSION@ +-Cflags: -I${sdkdir} ++Cflags: -I${includedir}/xorg +-- +2.7.4 + 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 c096032726..eacacea162 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 @@ -10,5 +10,6 @@ XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individu XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xproto_inputproto xproto_xproto +XDRIVER_XF86_INPUT_LIBINPUT_AUTORECONF = YES $(eval $(autotools-package)) From 3065189a0a64cd3382a67115b2119d773e02e697 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Oct 2016 18:38:50 +0200 Subject: [PATCH 1091/3392] package/xdriver_xf86-input-mouse: fix install paths Get rid of the borked sdkdir variable. Fixes (partially): https://bugs.busybox.net/show_bug.cgi?id=8696 Reported-by: buildroot@netsolux.ch Signed-off-by: "Yann E. MORIN" Cc: buildroot@netsolux.ch Cc: Gustavo Zacarias Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- .../0001-build-get-rid-of-sdkdir.patch | 81 +++++++++++++++++++ .../xdriver_xf86-input-mouse.mk | 1 + 2 files changed, 82 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch diff --git a/package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch b/package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch new file mode 100644 index 0000000000..d5f97f98c1 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch @@ -0,0 +1,81 @@ +From aef3d9bca4d77db833f71d50b1c84b16c69d7deb Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 23 Oct 2016 22:53:21 +0200 +Subject: [PATCH] build: get rid of sdkdir + +Use of sdkdir causes problems during cross-compilation, where the full +path is then appended to the DESTDIR, leading to host paths being +appended in the target: + https://bugs.busybox.net/show_bug.cgi?id=8696 + +Other drivers (e.g. keyboard) got rid of sdkdir. Do the same. + +Signed-off-by: "Yann E. MORIN" +--- + Makefile.am | 3 --- + configure.ac | 10 ---------- + include/Makefile.am | 4 +++- + xorg-mouse.pc.in | 3 +-- + 4 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 7142485..efe66cb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,9 +34,6 @@ ChangeLog: + + dist-hook: ChangeLog INSTALL + +-# Provide an sdk location that is writable by this module +-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' +- + if LINT + # Check source code with tools like lint & sparse + lint: +diff --git a/configure.ac b/configure.ac +index 15d9047..515681d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -60,16 +60,6 @@ AC_ARG_WITH(xorg-module-dir, + inputdir=${moduledir}/input + AC_SUBST(inputdir) + +-# X Server SDK location is required to install xf86-mouse-properties.h +-# This location is also relayed in the xorg-mouse.pc file +-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` +- +-# Workaround overriding sdkdir to be able to create a tarball when user has no +-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am +-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) +-AC_SUBST([sdkdir]) +- +- + # Work out which OS mouse driver we need to build + case $host_os in + linux*) +diff --git a/include/Makefile.am b/include/Makefile.am +index 27ce0fb..2b85e4e 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -1 +1,3 @@ +-sdk_HEADERS = xf86-mouse-properties.h ++# Location formerly known as 'sdkdir' ++xorgincludedir = $(includedir)/xorg ++xorginclude_HEADERS = xf86-mouse-properties.h +diff --git a/xorg-mouse.pc.in b/xorg-mouse.pc.in +index 57df596..8355e61 100644 +--- a/xorg-mouse.pc.in ++++ b/xorg-mouse.pc.in +@@ -1,6 +1,7 @@ prefix=@prefix@ +-sdkdir=@sdkdir@ ++prefix=@prefix@ ++includedir=@includedir@ + + Name: xorg-mouse + Description: X.Org mouse input driver for non-evdev OS'es + Version: @PACKAGE_VERSION@ +-Cflags: -I${sdkdir} ++Cflags: -I${includedir}/xorg +-- +2.7.4 + diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index 0e19467d5d..e1bd81a55f 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -10,5 +10,6 @@ XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/ XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT XDRIVER_XF86_INPUT_MOUSE_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto +XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = YES $(eval $(autotools-package)) From b63951da35f56a2c606b9383e6e39bfd61e92b34 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Oct 2016 18:38:51 +0200 Subject: [PATCH 1092/3392] package/xdriver_xf86-input-synaptics: fix install paths Get rid of the borked sdkdir variable. Fixes (partially): https://bugs.busybox.net/show_bug.cgi?id=8696 Reported-by: buildroot@netsolux.ch Signed-off-by: "Yann E. MORIN" Cc: buildroot@netsolux.ch Cc: Gustavo Zacarias Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- .../0001-build-get-rid-of-sdkdir.patch | 88 +++++++++++++++++++ .../xdriver_xf86-input-synaptics.mk | 1 + 2 files changed, 89 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch diff --git a/package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch b/package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch new file mode 100644 index 0000000000..62950b0667 --- /dev/null +++ b/package/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch @@ -0,0 +1,88 @@ +From 231a35e99fee8aba23f18cce21dfb5fa8bef0c36 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 23 Oct 2016 23:07:33 +0200 +Subject: [PATCH] build: get rid of sdkdir + +Use of sdkdir causes problems during cross-compilation, where the full +path is then appended to the DESTDIR, leading to host paths being +appended in the target: + https://bugs.busybox.net/show_bug.cgi?id=8696 + +Other drivers (e.g. keyboard) got rid of sdkdir. Do the same. + +Signed-off-by: "Yann E. MORIN" +--- + Makefile.am | 1 - + configure.ac | 9 --------- + include/Makefile.am | 4 +++- + xorg-synaptics.pc.in | 5 +++-- + 4 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 678124c..c48c5c8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -21,7 +21,6 @@ + # During distcheck, system locations (as provided by pkg-config) may + # not be writable; provide instead relative locations. + DISTCHECK_CONFIGURE_FLAGS = \ +- --with-sdkdir='$${includedir}/xorg' \ + --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d' + + SUBDIRS = include src man tools conf +diff --git a/configure.ac b/configure.ac +index 970dd5f..574353b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,11 +55,6 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) + # Obtain compiler/linker options for the Synaptics driver dependencies + PKG_CHECK_MODULES(XORG, [inputproto >= 2.1.99.3] [xorg-server >= 1.12] xproto inputproto $REQUIRED_MODULES) + +-# X Server SDK location is required to install Synaptics header files +-# This location is also relayed in the xorg-synaptics.pc file +-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` +-AC_SUBST([sdkdir]) +- + # ----------------------------------------------------------------------------- + # Configuration options + # ----------------------------------------------------------------------------- +@@ -154,10 +149,6 @@ if test "x$have_libxtst" = "xyes" ; then + fi + # ----------------------------------------------------------------------------- + +-# Workaround overriding sdkdir to be able to create a tarball when user has no +-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am +-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) +- + AC_CONFIG_FILES([Makefile + src/Makefile + man/Makefile +diff --git a/include/Makefile.am b/include/Makefile.am +index 8234020..565868b 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -18,4 +18,6 @@ + # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-sdk_HEADERS = synaptics-properties.h ++# Location formerly known as 'sdkdir' ++xorgincludedir = $(includedir)/xorg ++xorginclude_HEADERS = synaptics-properties.h +diff --git a/xorg-synaptics.pc.in b/xorg-synaptics.pc.in +index 159cfbf..68e0fbe 100644 +--- a/xorg-synaptics.pc.in ++++ b/xorg-synaptics.pc.in +@@ -1,6 +1,7 @@ +-sdkdir=@sdkdir@ ++prefix=@prefix@ ++includedir=@includedir@ + + Name: synaptics + Description: X.Org synaptics input driver. + Version: @PACKAGE_VERSION@ +-Cflags: -I${sdkdir} ++Cflags: -I${includedir}/xorg +-- +2.7.4 + 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 b6ade4c86e..d6164d0daf 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 @@ -10,5 +10,6 @@ XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individ XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE = MIT XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = libevdev xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto mtdev +XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = YES $(eval $(autotools-package)) From 938f47c7e89362e7b824dbd0bd1ee9839d56d603 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Oct 2016 18:38:52 +0200 Subject: [PATCH 1093/3392] core/pkg-generic: check proper package installation Some packages misbehave, and install files in either $(STAGING_DIR)/$(O) or in $(TARGET_DIR)/$(O) . One common reason for that is that pkgconf now prepends the sysroot path to all the paths it returns. Other reasons vary, but are mostly due to poorly writen generic-packages. And a new step hooks to check that no file gets installed in either location, called after the install-target and install-staging steps. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 33490929b0..827de627e8 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -95,6 +95,21 @@ define check_host_rpath endef GLOBAL_INSTRUMENTATION_HOOKS += check_host_rpath +define step_check_build_dir_one + if [ -d $(2) ]; then \ + printf "%s: installs files in %s\n" $(1) $(2) >&2; \ + exit 1; \ + fi +endef + +define step_check_build_dir + $(if $(filter install-staging,$(2)),\ + $(if $(filter end,$(1)),$(call step_check_build_dir_one,$(3),$(STAGING_DIR)/$(O)))) + $(if $(filter install-target,$(2)),\ + $(if $(filter end,$(1)),$(call step_check_build_dir_one,$(3),$(TARGET_DIR)/$(O)))) +endef +GLOBAL_INSTRUMENTATION_HOOKS += step_check_build_dir + # User-supplied script ifneq ($(BR2_INSTRUMENTATION_SCRIPTS),) define step_user From c7551450da6c1ec1db6203b70c761c07d247bfbf Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 25 Oct 2016 23:29:46 +0200 Subject: [PATCH 1094/3392] valgrind: bump version to 3.12.0 See [1] for release notes. - removed 0003-mips-replace-addi-with-addiu.patch (applied upstream, see [2]) [1] http://valgrind.org/docs/manual/dist.news.html [2] https://bugs.kde.org/show_bug.cgi?id=356112 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- .../0003-mips-replace-addi-with-addiu.patch | 137 ------------------ package/valgrind/valgrind.hash | 2 +- package/valgrind/valgrind.mk | 2 +- 3 files changed, 2 insertions(+), 139 deletions(-) delete mode 100644 package/valgrind/0003-mips-replace-addi-with-addiu.patch diff --git a/package/valgrind/0003-mips-replace-addi-with-addiu.patch b/package/valgrind/0003-mips-replace-addi-with-addiu.patch deleted file mode 100644 index 624f6fa39b..0000000000 --- a/package/valgrind/0003-mips-replace-addi-with-addiu.patch +++ /dev/null @@ -1,137 +0,0 @@ -mips: replace addi with addiu - -ADDI instruction has been removed in R6 so let's use ADDIU instead. - -This patch has been sent upstream: - - https://bugs.kde.org/show_bug.cgi?id=356112 - -Signed-off-by: Vicente Olivert Riera - -Index: valgrind/coregrind/m_dispatch/dispatch-mips32-linux.S -=================================================================== ---- valgrind/coregrind/m_dispatch/dispatch-mips32-linux.S (revision 15740) -+++ valgrind/coregrind/m_dispatch/dispatch-mips32-linux.S (working copy) -@@ -196,7 +196,7 @@ - addu $13, $13, $14 - - lw $12, 0($13) /* t3 = VG_(tt_fast)[hash] :: ULong* */ -- addi $13, $13, 4 -+ addiu $13, $13, 4 - lw $25, 0($13) /* little-endian, so comparing 1st 32bit word */ - nop - -Index: valgrind/coregrind/m_dispatch/dispatch-mips64-linux.S -=================================================================== ---- valgrind/coregrind/m_dispatch/dispatch-mips64-linux.S (revision 15740) -+++ valgrind/coregrind/m_dispatch/dispatch-mips64-linux.S (working copy) -@@ -196,7 +196,7 @@ - daddu $13, $13, $14 - - ld $12, 0($13) /* t3 = VG_(tt_fast)[hash] :: ULong* */ -- daddi $13, $13, 8 -+ daddiu $13, $13, 8 - ld $25, 0($13) /* little-endian, so comparing 1st 32bit word */ - nop - -Index: valgrind/coregrind/m_libcsetjmp.c -=================================================================== ---- valgrind/coregrind/m_libcsetjmp.c (revision 15740) -+++ valgrind/coregrind/m_libcsetjmp.c (working copy) -@@ -594,7 +594,7 @@ - /* Checking whether second argument is zero. */ - " bnez $a1, 1f \n\t" - " nop \n\t" --" addi $a1, $a1, 1 \n\t" /* We must return 1 if val=0. */ -+" addiu $a1, $a1, 1 \n\t" /* We must return 1 if val=0. */ - "1: \n\t" - " move $v0, $a1 \n\t" /* Return value of second argument. */ - " j $ra \n\t" -Index: valgrind/coregrind/m_syswrap/syswrap-mips64-linux.c -=================================================================== ---- valgrind/coregrind/m_syswrap/syswrap-mips64-linux.c (revision 15740) -+++ valgrind/coregrind/m_syswrap/syswrap-mips64-linux.c (working copy) -@@ -173,7 +173,7 @@ - " ld $30, 8($29)\n" - " ld $28, 16($29)\n" - " jr $31\n" --" daddi $29,$29, 32\n" -+" daddiu $29,$29, 32\n" - ".previous\n" - ); - -Index: valgrind/coregrind/m_trampoline.S -=================================================================== ---- valgrind/coregrind/m_trampoline.S (revision 15740) -+++ valgrind/coregrind/m_trampoline.S (working copy) -@@ -1254,8 +1254,8 @@ - //la $a0, string - j strlen_cond - strlen_loop: -- addi $v0, $v0, 1 -- addi $a0, $a0, 1 -+ addiu $v0, $v0, 1 -+ addiu $a0, $a0, 1 - strlen_cond: - lbu $t0, ($a0) - bne $t0, $zero, strlen_loop -Index: valgrind/helgrind/tests/tc08_hbl2.c -=================================================================== ---- valgrind/helgrind/tests/tc08_hbl2.c (revision 15740) -+++ valgrind/helgrind/tests/tc08_hbl2.c (working copy) -@@ -125,11 +125,11 @@ - # define INC(_lval,_lqual) \ - __asm__ __volatile__ ( \ - "L1xyzzy1" _lqual":\n" \ -- " move $t0, %0\n" \ -- " ll $t1, 0($t0)\n" \ -- " addi $t1, $t1, 1\n" \ -- " sc $t1, 0($t0)\n" \ -- " beqz $t1, L1xyzzy1" _lqual \ -+ " move $t0, %0\n" \ -+ " ll $t1, 0($t0)\n" \ -+ " addiu $t1, $t1, 1\n" \ -+ " sc $t1, 0($t0)\n" \ -+ " beqz $t1, L1xyzzy1" _lqual \ - : /*out*/ : /*in*/ "r"(&(_lval)) \ - : /*trash*/ "t0", "t1", "memory" \ - ) -Index: valgrind/VEX/priv/guest_mips_toIR.c -=================================================================== ---- valgrind/VEX/priv/guest_mips_toIR.c (revision 3206) -+++ valgrind/VEX/priv/guest_mips_toIR.c (working copy) -@@ -16794,6 +16794,7 @@ - mkU64(0x0) : mkU32(0x0)))), imm); - break; - -+#if defined(__mips__) && ((defined(__mips_isa_rev) && __mips_isa_rev < 6)) - case 0x08: { /* ADDI */ - DIP("addi r%u, r%u, %u", rt, rs, imm); - IRTemp tmpRs32 = newTemp(Ity_I32); -@@ -16831,6 +16832,8 @@ - putIReg(rt, mkWidenFrom32(ty, mkexpr(t0), True)); - break; - } -+#endif -+ - case 0x09: /* ADDIU */ - DIP("addiu r%u, r%u, %u", rt, rs, imm); - if (mode64) { -@@ -16888,7 +16891,8 @@ - mkU32(extend_s_16to32(imm))))); - break; - -- case 0x18: { /* Doubleword Add Immidiate - DADD; MIPS64 */ -+#if defined(__mips__) && ((defined(__mips_isa_rev) && __mips_isa_rev < 6)) -+ case 0x18: { /* Doubleword Add Immidiate - DADDI; MIPS64 */ - DIP("daddi r%u, r%u, %u", rt, rs, imm); - IRTemp tmpRs64 = newTemp(Ity_I64); - assign(tmpRs64, getIReg(rs)); -@@ -16926,6 +16930,7 @@ - putIReg(rt, mkexpr(t0)); - break; - } -+#endif - - case 0x19: /* Doubleword Add Immidiate Unsigned - DADDIU; MIPS64 */ - DIP("daddiu r%u, r%u, %u", rt, rs, imm); diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash index f2cd6e84bc..5d7da19a86 100644 --- a/package/valgrind/valgrind.hash +++ b/package/valgrind/valgrind.hash @@ -1,2 +1,2 @@ # From http://valgrind.org/downloads/current.html -md5 4ea62074da73ae82e0162d6550d3f129 valgrind-3.11.0.tar.bz2 +md5 6eb03c0c10ea917013a7622e483d61bb valgrind-3.12.0.tar.bz2 diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index b97d446062..09f711662b 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALGRIND_VERSION = 3.11.0 +VALGRIND_VERSION = 3.12.0 VALGRIND_SITE = http://valgrind.org/downloads VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPLv2 GFDLv1.2 From 652a8b3e907a0b73a57fbb028590f5c6139bc88c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Sep 2016 19:31:57 +0200 Subject: [PATCH 1095/3392] package/opencv: Do not add libdl to LINKER_LIBS for static builds Fixes http://autobuild.buildroot.net/results/765/7657e01481995a4f0d725467e935a83928a59a04/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...o-not-add-libdl-to-LINKER_LIBS-for-s.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/opencv/0004-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch diff --git a/package/opencv/0004-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch b/package/opencv/0004-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch new file mode 100644 index 0000000000..6d63411b01 --- /dev/null +++ b/package/opencv/0004-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch @@ -0,0 +1,39 @@ +From 22e03ef8a9e3adcbc6b2f16c3cc98e4e14443eed Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 24 Sep 2016 17:51:22 +0200 +Subject: [PATCH 1/1] CMakeLists.txt: Do not add libdl to LINKER_LIBS for + static builds + +Without this patch -ldl is present in opencv.pc which breaks OpenCV +detection by ffmpeg, detected by buildroot autobuilders: + +http://autobuild.buildroot.net/results/765/7657e01481995a4f0d725467e935a83928a59a04//ffmpeg-3.1.3/config.log + +/home/peko/autobuild/instance-1/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.9.4/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -ldl + +Patch sent upstream: https://github.com/opencv/opencv/pull/7337 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 007b80d..99b047d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -457,7 +457,10 @@ if(UNIX) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX") + set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m) + else() +- set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt) ++ if(BUILD_SHARED_LIBS) ++ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl) ++ endif() ++ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread rt) + endif() + else() + set(HAVE_LIBPTHREAD YES) +-- +2.9.3 + From 2c877590b3b18df4853989a66378c184713ccd55 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 26 Oct 2016 23:47:58 +0200 Subject: [PATCH 1096/3392] glibc: install libmvec.so when available On some architectures (namely x86-64), glibc may provide a libmvec library since glibc 2.22, which programs built with gcc OpenMP support might get linked to. In order for these programs to work on the target, we need to copy this library to the target filesystem. This commit takes care of this for the glibc package (used for the internal toolchain backend). Note that libraries listed in GLIBC_LIBS_LIB are silently ignored if they don't exist. Therefore, we don't need to have any condition on the architecture or glibc version. For more details on libmvec, see https://sourceware.org/glibc/wiki/libmvec. Fixes bug #9111. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/glibc/glibc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 50154e851a..c11f7cd867 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -103,7 +103,7 @@ endef GLIBC_LIBS_LIB = \ ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* \ libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.* \ - libnss_files.so.* libnss_dns.so.* + libnss_files.so.* libnss_dns.so.* libmvec.so.* ifeq ($(BR2_PACKAGE_GDB),y) GLIBC_LIBS_LIB += libthread_db.so.* From 447e9051f32936a3a185af926c7ec394cbd61962 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 26 Oct 2016 23:47:59 +0200 Subject: [PATCH 1097/3392] toolchain-external: install libmvec.so from glibc toolchains On some architectures (namely x86-64), glibc may provide a libmvec library since glibc 2.22, which programs built with gcc OpenMP support might get linked to. In order for these programs to work on the target, we need to copy this library to the target filesystem. This commit takes care of this for the external toolchain situation. Note that libraries listed in TOOLCHAIN_EXTERNAL_LIBS are silently ignored if they don't exist. Therefore, we don't need to have any condition on the architecture or glibc version. For more details on libmvec, see https://sourceware.org/glibc/wiki/libmvec. Fixes bug #9111. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- toolchain/toolchain-external/toolchain-external.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index d3608d082b..f7c6a1969d 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -79,7 +79,7 @@ endif # ! no threads endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y) -TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* +TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) From d54d05bde4c474194330528a91c2d7554e6a37d3 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 27 Oct 2016 08:04:04 +0300 Subject: [PATCH 1098/3392] ngrep: don't use pcap_restart libpcap since version 1.8.1 does not export the pcap_restart symbol. Disable use of this symbol. Fixes: http://autobuild.buildroot.net/results/647/647061a6fe8cffe3b083c911a986fa7683cdb8f6/ http://autobuild.buildroot.net/results/d90/d90e4d7c62e5b860f1f0ffb5e4dc545928f91734/ http://autobuild.buildroot.net/results/560/56076caede5c7bfc8a57da3a9dc47d0d22309e79/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/ngrep/ngrep.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk index c4ad528292..8daaf2d8ac 100644 --- a/package/ngrep/ngrep.mk +++ b/package/ngrep/ngrep.mk @@ -21,7 +21,8 @@ NGREP_CONF_OPTS = \ --with-pcap-includes=$(STAGING_DIR)/usr/include/pcap \ --enable-pcre \ --with-pcre=$(STAGING_DIR)/usr \ - --disable-dropprivs + --disable-dropprivs \ + --disable-pcap-restart NGREP_DEPENDENCIES = libpcap pcre From 048ec8ae4cf67ec88bef3dec9b2ef354e8f3c85a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 26 Oct 2016 23:01:51 -0300 Subject: [PATCH 1099/3392] samba4: bump to version 4.4.7 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 2 +- package/samba4/samba4.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index e48d5c80b7..d6433f74f0 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 37c423dd590c63099d952b06c07bf399da7cc6c2e72739b831eedd7dbe8cc18c samba-4.4.6.tar.gz +sha256 a69d6612e4a421640242ca66c4dbb0e4c20281e77dc24970a332770814d45c7c samba-4.4.7.tar.gz diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 6d84f532cf..71cb4261e3 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.4.6 +SAMBA4_VERSION = 4.4.7 SAMBA4_SITE = http://ftp.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From dff1c61132c709cd0fc7d2f0ac7824fd68370038 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Oct 2016 06:53:53 -0300 Subject: [PATCH 1100/3392] vala: bump to version 0.34.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index 78367d0df7..95566d1317 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,2 +1,2 @@ -# From https://download.gnome.org/sources/vala/0.34/vala-0.34.1.sha256sum -sha256 f5ccfcfc460a0c6797bfbd7e739042bf5988a0f44d82278dbe1880c0e5f29299 vala-0.34.1.tar.xz +# From https://download.gnome.org/sources/vala/0.34/vala-0.34.2.sha256sum +sha256 765e9c2b429a66db93247940f8588319b43f35c173d057bcae5717a97d765c41 vala-0.34.2.tar.xz diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 3333cf4a9c..a208bdc8cb 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ################################################################################ VALA_VERSION_MAJOR = 0.34 -VALA_VERSION = $(VALA_VERSION_MAJOR).1 +VALA_VERSION = $(VALA_VERSION_MAJOR).2 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPLv2.1+ From b389f9d23bc3080f092aa5ab5b67807cd45ad7b8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Oct 2016 06:54:09 -0300 Subject: [PATCH 1101/3392] harfbuzz: bump to version 1.3.3 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 cf8913331a..aa864c637f 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.3.2.tar.bz2.sha256 -sha256 8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027 harfbuzz-1.3.2.tar.bz2 +# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.3.3.tar.bz2.sha256 +sha256 2620987115a4122b47321610dccbcc18f7f121115fd7b88dc8a695c8b66cb3c9 harfbuzz-1.3.3.tar.bz2 diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index a014d7dad3..2290eebc21 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.3.2 +HARFBUZZ_VERSION = 1.3.3 HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 342c42672fda0a8fa997bb8834b828708736fe29 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Oct 2016 06:54:32 -0300 Subject: [PATCH 1102/3392] libgtk3: bump to version 3.22.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index b449d1ed7d..b60671753c 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.1.sha256sum -sha256 127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471 gtk+-3.22.1.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.2.sha256sum +sha256 2343dcaed2fc237ef718136ff4110fef7eb1ebfe178a9b064aa21cd74ecb6946 gtk+-3.22.2.tar.xz diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 9edb99926c..b7cea7dd37 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.22 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).1 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).2 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPLv2+ From f37ecd6c612b60edfcb49284dffe5a9ab8186e8f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Oct 2016 07:35:51 -0300 Subject: [PATCH 1103/3392] btrfs-progs: bump to version 4.8.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index c21cd3b605..de9c56b930 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 836e6d707abfc155319c072f53d296261cbd17f0e03484a3694b8af48640db83 btrfs-progs-v4.8.1.tar.xz +sha256 81c023f519c8565b23eddb90e6d0eec2be63ee52e440708e418539dbaa635c5f btrfs-progs-v4.8.2.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index d9bd6e645e..2dd9246352 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.8.1 +BTRFS_PROGS_VERSION = 4.8.2 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib From 21db6fe246016266ba033c6b802aeb35944f613b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Oct 2016 07:36:19 -0300 Subject: [PATCH 1104/3392] lft: bump to version 3.77 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/lft/lft.hash | 2 +- package/lft/lft.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lft/lft.hash b/package/lft/lft.hash index 714b7bd56e..b045e7c96a 100644 --- a/package/lft/lft.hash +++ b/package/lft/lft.hash @@ -1,2 +1,2 @@ # Locally calculated, matches download from fossies.org and pwhois.org -sha256 fa163f8eaa9c27e12ecf533e79d8606895a301d2a75b9a77f0df29ef9a20c561 lft-3.76.tar.gz +sha256 d182d6774e64dcdeb19ed1a598fa588e57ddb6cbb6847d9277c405d3a4597d89 lft-3.77.tar.gz diff --git a/package/lft/lft.mk b/package/lft/lft.mk index d2b82b2bc3..72f43fa209 100644 --- a/package/lft/lft.mk +++ b/package/lft/lft.mk @@ -4,7 +4,7 @@ # ################################################################################ -LFT_VERSION = 3.76 +LFT_VERSION = 3.77 LFT_SITE = http://pwhois.org/get LFT_DEPENDENCIES = libpcap LFT_LICENSE = VOSTROM Public License for Open Source From bf71286871edb090c18a10512e7e053e9b5a7668 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 27 Oct 2016 07:36:50 -0300 Subject: [PATCH 1105/3392] linux-headers: bump 3.{4, 18}.x and 4.1.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 47ef25df22..37936f645c 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -224,14 +224,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.83" if BR2_KERNEL_HEADERS_3_2 - default "3.4.112" if BR2_KERNEL_HEADERS_3_4 + default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.104" if BR2_KERNEL_HEADERS_3_10 default "3.12.66" if BR2_KERNEL_HEADERS_3_12 default "3.14.79" if BR2_KERNEL_HEADERS_3_14 - default "3.18.43" if BR2_KERNEL_HEADERS_3_18 + default "3.18.44" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.34" if BR2_KERNEL_HEADERS_4_1 + default "4.1.35" if BR2_KERNEL_HEADERS_4_1 default "4.4.27" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 From f57fd30e62032921e8146ad79076fdef88c4e507 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 27 Oct 2016 11:44:23 +0100 Subject: [PATCH 1106/3392] ser2net: bump version to 3.0 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/ser2net/ser2net.hash | 2 +- package/ser2net/ser2net.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ser2net/ser2net.hash b/package/ser2net/ser2net.hash index a02a981a5d..3e62f1c3f2 100644 --- a/package/ser2net/ser2net.hash +++ b/package/ser2net/ser2net.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 cee4ad8fb3531281e8761751694dfab39d681022b2363b1edeba764d397c3c99 ser2net-2.10.1.tar.gz +sha256 e8aaf6c629c78bbc424e8a6810758061f9c68a4ffea0faf7c5031de26ce1c3e1 ser2net-3.0.tar.gz diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk index 85b23aeaf7..01aee95d6d 100644 --- a/package/ser2net/ser2net.mk +++ b/package/ser2net/ser2net.mk @@ -4,7 +4,7 @@ # ################################################################################ -SER2NET_VERSION = 2.10.1 +SER2NET_VERSION = 3.0 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPLv2+ SER2NET_LICENSE_FILES = COPYING From 3d0c08da2258e76439845b07740c6b2b8aabd5c6 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Thu, 27 Oct 2016 13:28:30 -0400 Subject: [PATCH 1107/3392] rabbitmq-server: DEPENDS->DEPENDENCIES Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/rabbitmq-server/rabbitmq-server.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk index 6af62f6586..4a389557b3 100644 --- a/package/rabbitmq-server/rabbitmq-server.mk +++ b/package/rabbitmq-server/rabbitmq-server.mk @@ -17,7 +17,7 @@ RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \ LICENSE-MIT-Mochi LICENSE-MIT-Mochiweb \ LICENSE-MIT-Sammy060 LICENSE-MIT-SockJS \ LICENSE-MPL2 -RABBITMQ_SERVER_DEPENDS = erlang libxslt +RABBITMQ_SERVER_DEPENDENCIES = erlang libxslt RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults define RABBITMQ_SERVER_BUILD_CMDS From be8c8d8d71ec9df826dc5d20d4fea7255f2cb156 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Thu, 27 Oct 2016 13:28:31 -0400 Subject: [PATCH 1108/3392] rabbitmq-server: add missing host dependencies Fixes: http://autobuild.buildroot.net/results/0ec785b8fa876d879934af618851d77a3ce70f55 http://autobuild.buildroot.net/results/03eb39eb9498eb42202ac8b16c1ffc175c0b69d3 http://autobuild.buildroot.net/results/199b04408fa8d9c94b9bed42fdcaafb03278f03c Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/rabbitmq-server/rabbitmq-server.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk index 4a389557b3..7e13c2d719 100644 --- a/package/rabbitmq-server/rabbitmq-server.mk +++ b/package/rabbitmq-server/rabbitmq-server.mk @@ -17,7 +17,7 @@ RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \ LICENSE-MIT-Mochi LICENSE-MIT-Mochiweb \ LICENSE-MIT-Sammy060 LICENSE-MIT-SockJS \ LICENSE-MPL2 -RABBITMQ_SERVER_DEPENDENCIES = erlang libxslt +RABBITMQ_SERVER_DEPENDENCIES = host-libxslt host-zip erlang libxslt RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults define RABBITMQ_SERVER_BUILD_CMDS From 7c740bf9c5937cc93746ac0300cb33b8aeb6abf6 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 27 Oct 2016 21:00:03 +0300 Subject: [PATCH 1109/3392] bridge-utils: bump to version 1.6 Drop upstream patches. Change download and homepage to kernel.org, and use .xz tarball. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- .../0002-fix-for-kernel-headers-3.8+.patch | 30 ------- .../bridge-utils/0003-sysfs-write-fixes.patch | 81 ------------------- package/bridge-utils/Config.in | 2 +- package/bridge-utils/bridge-utils.hash | 5 +- package/bridge-utils/bridge-utils.mk | 5 +- 5 files changed, 6 insertions(+), 117 deletions(-) delete mode 100644 package/bridge-utils/0002-fix-for-kernel-headers-3.8+.patch delete mode 100644 package/bridge-utils/0003-sysfs-write-fixes.patch diff --git a/package/bridge-utils/0002-fix-for-kernel-headers-3.8+.patch b/package/bridge-utils/0002-fix-for-kernel-headers-3.8+.patch deleted file mode 100644 index 0455a9085c..0000000000 --- a/package/bridge-utils/0002-fix-for-kernel-headers-3.8+.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d -Author: Russell Senior -Date: Wed Mar 6 12:49:42 2013 -0800 - - bridge-utils: Fix compile against linux-3.8.x - - Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a - struct in6_addr but doesn't define it. The trivial seeming fix of - including the header that does define it causes more problems. The - problem was discussed on mailing lists in January 2013. The final - suggestion I found was here: - - http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html - - This is intended to implement that suggestion. - - Signed-off-by: Russell Senior - -diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h -index 39964f2..dd14bae 100644 ---- a/libbridge/libbridge.h -+++ b/libbridge/libbridge.h -@@ -20,6 +20,7 @@ - #define _LIBBRIDGE_H - - #include -+#include - #include - #include - diff --git a/package/bridge-utils/0003-sysfs-write-fixes.patch b/package/bridge-utils/0003-sysfs-write-fixes.patch deleted file mode 100644 index a7ff1979f5..0000000000 --- a/package/bridge-utils/0003-sysfs-write-fixes.patch +++ /dev/null @@ -1,81 +0,0 @@ -commit bb9970a9df95837e39d680021b1f73d231e85406 -Author: Stephen Hemminger -Date: Tue May 3 09:52:43 2011 -0700 - - Check error returns from write to sysfs - - Add helper function to check write to sysfs files. - - Fix incorrect sysfs path in br_set. - -[Thomas De Schampheleire: update commit message only] -Signed-off-by: Thomas De Schampheleire - -diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c -index aa8bc36..1e83925 100644 ---- a/libbridge/libbridge_devif.c -+++ b/libbridge/libbridge_devif.c -@@ -280,25 +280,38 @@ fallback: - return old_get_port_info(brname, port, info); - } - -+static int set_sysfs(const char *path, unsigned long value) -+{ -+ int fd, ret = 0, cc; -+ char buf[32]; -+ -+ fd = open(path, O_WRONLY); -+ if (fd < 0) -+ return -1; -+ -+ cc = snprintf(buf, sizeof(buf), "%lu\n", value); -+ if (write(fd, buf, cc) < 0) -+ ret = -1; -+ close(fd); -+ -+ return ret; -+} -+ - - static int br_set(const char *bridge, const char *name, - unsigned long value, unsigned long oldcode) - { - int ret; - char path[SYSFS_PATH_MAX]; -- FILE *f; - -- snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name); -+ snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s", -+ bridge, name); - -- f = fopen(path, "w"); -- if (f) { -- ret = fprintf(f, "%ld\n", value); -- fclose(f); -- } else { -+ if ((ret = set_sysfs(path, value)) < 0) { - /* fallback to old ioctl */ - struct ifreq ifr; - unsigned long args[4] = { oldcode, value, 0, 0 }; -- -+ - strncpy(ifr.ifr_name, bridge, IFNAMSIZ); - ifr.ifr_data = (char *) &args; - ret = ioctl(br_socket_fd, SIOCDEVPRIVATE, &ifr); -@@ -348,14 +361,10 @@ static int port_set(const char *bridge, const char *ifname, - { - int ret; - char path[SYSFS_PATH_MAX]; -- FILE *f; - - snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/brport/%s", ifname, name); -- f = fopen(path, "w"); -- if (f) { -- ret = fprintf(f, "%ld\n", value); -- fclose(f); -- } else { -+ -+ if ((ret = set_sysfs(path, value)) < 0) { - int index = get_portno(bridge, ifname); - - if (index < 0) diff --git a/package/bridge-utils/Config.in b/package/bridge-utils/Config.in index 537eb1f59f..fb9c7df427 100644 --- a/package/bridge-utils/Config.in +++ b/package/bridge-utils/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_BRIDGE_UTILS Manage ethernet bridging; a way to connect networks together to form a larger network. - http://linux-net.osdl.org/index.php/Bridge + https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/ diff --git a/package/bridge-utils/bridge-utils.hash b/package/bridge-utils/bridge-utils.hash index c85fd04154..e699b24a63 100644 --- a/package/bridge-utils/bridge-utils.hash +++ b/package/bridge-utils/bridge-utils.hash @@ -1,3 +1,2 @@ -# From http://sourceforge.net/projects/bridge/files/bridge/ -md5 ec7b381160b340648dede58c31bb2238 bridge-utils-1.5.tar.gz -sha1 19d2a58cd3a70f971aa931b40256174a847e60d6 bridge-utils-1.5.tar.gz +# From https://www.kernel.org/pub/linux/utils/net/bridge-utils/sha256sums.asc +sha256 cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8 bridge-utils-1.6.tar.xz diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk index ae4c4197c7..efe57cd979 100644 --- a/package/bridge-utils/bridge-utils.mk +++ b/package/bridge-utils/bridge-utils.mk @@ -4,8 +4,9 @@ # ################################################################################ -BRIDGE_UTILS_VERSION = 1.5 -BRIDGE_UTILS_SITE = http://downloads.sourceforge.net/project/bridge/bridge +BRIDGE_UTILS_VERSION = 1.6 +BRIDGE_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/bridge-utils +BRIDGE_UTILS_SOURCE = bridge-utils-1.6.tar.xz BRIDGE_UTILS_AUTORECONF = YES BRIDGE_UTILS_CONF_OPTS = --with-linux-headers=$(LINUX_HEADERS_DIR) BRIDGE_UTILS_LICENSE = GPLv2+ From d2da85c396ba6aad88a698ade4b0ccd8c6c9e8e2 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 27 Oct 2016 16:33:42 +0100 Subject: [PATCH 1110/3392] toolchain-external.mk: fix ARCH_SUBDIR calculation ARCH_SUBDIR is computed based on the value of ARCH_SYSROOT_DIR and SYSROOT_DIR. For nested toolchains ARCH_SYSROOT_DIR is a subdir of SYSROOT_DIR, so a sed command like this one... sed -r -e "s:^${SYSROOT_DIR}(.*)/$:\1:" ...basically removes the leading SYSROOT_DIR part from ARCH_SYSROOT_DIR. But, for side-by-side sysroot toolchains ARCH_SYSROOT_DIR and SYSROOT_DIR are at the same level, so the above sed command doesn't make any effect. This patch therefore improves the calculation of ARCH_SUBDIR to clearly handle the three possible cases: - There is a single sysroot, or the selected architecture sysroot is the main one (i.e SYSROOT_DIR == ARCH_SYSROOT_DIR). In this case, ARCH_SUBDIR is empty. - There are side-by-side sysroots, such as SYSROOT_DIR=.../sysroot/mips-r2-hard/ and ARCH_SYSROOT_DIR=.../sysroot/mipsel-r2-hard/. - The arch-sysroot is nested, such as SYSROOT_DIR=.../sysroot and ARCH_SYSROOT_DIR=.../sysroot/armv4t/ Signed-off-by: Vicente Olivert Riera [Thomas: improve the logic to handle the SYSROOT_DIR==ARCH_SYSROOT_DIR case.] Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/toolchain-external.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index f7c6a1969d..b7a36bea12 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -665,7 +665,14 @@ define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \ fi ; \ fi ; \ - ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \ + if [ "$${SYSROOT_DIR}" == "$${ARCH_SYSROOT_DIR}" ] ; then \ + ARCH_SUBDIR="" ; \ + elif [ "`dirname $${ARCH_SYSROOT_DIR}`" = "`dirname $${SYSROOT_DIR}`" ] ; then \ + SYSROOT_DIR_DIRNAME=`dirname $${SYSROOT_DIR}`/ ; \ + ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR_DIRNAME}(.*)/$$:\1:"` ; \ + else \ + ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \ + fi ; \ $(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \ $(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) endef From 52b8a5d4f8be1b297f02c15d6e74a6e6ce383677 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 27 Oct 2016 23:22:14 +0200 Subject: [PATCH 1111/3392] mmc-utils: bump version to 2cb6695 Change log since last version bump: 2cb6695 Add missing -c for write_reliability e094e28 Fix return value check from set_partitioning_setting_completed() f90eac4 Add help texts for -c option 752072d Add -c option for partitioning commands 55380d9 Register being set is other than mentioned in printed message. 3c02759 Fix reported offset for enhanced user area start address a3d3331 mmc-utils: Add Command Queue fields to Extended CSD 0ca049f mmc-utils: Add ability to configure write protect on an eMMC device bb779ac mmc-utils: Add disable partition boot to 'mmc bootpart enable' 89cd01e mmc_utils: add ffu support 4af1749 mmc-utils: Merge the lsmmc tool into mmc-utils 44f94b9 mmc_utils: doc: add man-page 928ff07 mmc_utils: gp create: only allow partition [1-4] to be selected Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/mmc-utils/mmc-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk index 82468bcc28..7473a1b388 100644 --- a/package/mmc-utils/mmc-utils.mk +++ b/package/mmc-utils/mmc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -MMC_UTILS_VERSION = d0b46442b50794217e53b2455c1344c548d9d088 +MMC_UTILS_VERSION = 2cb6695e8dec00d887bdd5309d1b57d836fcd214 MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git MMC_UTILS_LICENSE = GPLv2 From 982e26796a6259aa525de83169ec05cc7c1f48ac Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 28 Oct 2016 13:24:04 +1030 Subject: [PATCH 1112/3392] linux-firmware: Bump version Signed-off-by: Joel Stanley Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 8d8b7b2da1..38bced643f 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = c4c07a8d1128d50a5c2885ceea1abbebaa82f820 +LINUX_FIRMWARE_VERSION = a179db97914da5e650c21ba8f9b0bae04a0f8a41 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git LINUX_FIRMWARE_SITE_METHOD = git From e37a9115f51c15115dfde7bc896c408ca0840561 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 28 Oct 2016 13:24:05 +1030 Subject: [PATCH 1113/3392] linux-firmware: Include all bnx2x firmwares Currently buildroot will create a broken system for any kernel version not between 3.18 and 4.1, as the bnx2x firmware it includes is only valid for that version of the upstream driver. This change modifies the build so that all versions are included as there was a strong preference for not adding options for each version, nor only supporting the latest kernel: On Fri, Feb 26, 2016 at 7:09 PM, Thomas Petazzoni wrote: > I think adding new config to chose between different versions of a > given firmware is going a bit too far. If we were to do that for all > firmwares in linux-firmware, it would really increase the number of > Config.in options too much. > > Shall I suggest to install both versions of the firmware? The firmware > files are not that large, and if filesystem size is really a strong > issue, it is always possible to clean up the non-required firmware > files in a post-build script. On Wed, Mar 2, 2016 at 7:47 AM, Arnout Vandecappelle wrote: > No, this is certainly not good, it fixes 4.2+ and simultaneously breaks 4.1-. > > What is wrong with Thomas's proposal to remove the unneeded versions in a > post-build script? If your size is so important that 640K matters, you would > probably anyway want to keep only one of the six binaries instead of three > different chip revisions. It is up to the user to ensure they remove the versions they don't want. Note that this increases the size of the root file system by about 8MB. Signed-off-by: Joel Stanley Signed-off-by: Thomas Petazzoni --- package/linux-firmware/linux-firmware.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 38bced643f..535b69a690 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -295,10 +295,7 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y) -LINUX_FIRMWARE_FILES += \ - bnx2x/bnx2x-e1-7.10.51.0.fw \ - bnx2x/bnx2x-e1h-7.10.51.0.fw \ - bnx2x/bnx2x-e2-7.10.51.0.fw +LINUX_FIRMWARE_FILES += bnx2x/* # No license file; the license is in the file WHENCE # which is installed unconditionally endif From fe41acfd6721e6250a6a1defc67f78fd0d603fb0 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 28 Oct 2016 07:51:48 +0300 Subject: [PATCH 1114/3392] ipset: bump to version 6.30 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- 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 844bebba8c..da860e8d05 100644 --- a/package/ipset/ipset.hash +++ b/package/ipset/ipset.hash @@ -1,4 +1,4 @@ -# From ftp://ftp.netfilter.org/pub/ipset/ipset-6.27.tar.bz2.md5sum.txt -md5 c39f8958908b1396e2c69f082b75d924 ipset-6.27.tar.bz2 +# From ftp://ftp.netfilter.org/pub/ipset/ipset-6.30.tar.bz2.md5sum.txt +md5 41c32e3b884ec714f0aac95e7675f9d1 ipset-6.30.tar.bz2 # Calculated based on the hash above -sha256 724897a80395534466142c3542184e5a480a5046140ca2a7d9097690b931b235 ipset-6.27.tar.bz2 +sha256 65bfa43fec3d51a6b4012f3d7e4b93a748df9b71b6cd6c53adbec8083e804a31 ipset-6.30.tar.bz2 diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index fff67e2746..db4952b1d5 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 6.27 +IPSET_VERSION = 6.30 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf From 32f5f465905499875c8ea9e536c842bd2f657c78 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Fri, 28 Oct 2016 12:14:03 +0200 Subject: [PATCH 1115/3392] package/postgresql: indentation cleanup Signed-off-by: Jerzy Grzegorek Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 1b184e71e1..8290370ffa 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -11,9 +11,10 @@ POSTGRESQL_LICENSE = PostgreSQL POSTGRESQL_LICENSE_FILES = COPYRIGHT POSTGRESQL_INSTALL_STAGING = YES POSTGRESQL_CONFIG_SCRIPTS = pg_config -POSTGRESQL_CONF_ENV = ac_cv_type_struct_sockaddr_in6=yes \ - pgac_cv_snprintf_long_long_int_modifier="%lld" \ - pgac_cv_snprintf_size_t_support=yes +POSTGRESQL_CONF_ENV = \ + ac_cv_type_struct_sockaddr_in6=yes \ + pgac_cv_snprintf_long_long_int_modifier="%lld" \ + pgac_cv_snprintf_size_t_support=yes POSTGRESQL_CONF_OPTS = --disable-rpath ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) From 718b7ebb43c82a0879ef098d44bbdb856a3a5fdb Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Fri, 28 Oct 2016 12:14:04 +0200 Subject: [PATCH 1116/3392] package/gpm: indentation cleanup Signed-off-by: Jerzy Grzegorek Signed-off-by: Thomas Petazzoni --- package/gpm/gpm.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/gpm/gpm.mk b/package/gpm/gpm.mk index 6d3b5d2dc2..ed4c1fd305 100644 --- a/package/gpm/gpm.mk +++ b/package/gpm/gpm.mk @@ -15,8 +15,9 @@ GPM_DEPENDENCIES = host-bison # if not already installed in staging dir, gpm Makefile may fail to find some # of the headers needed to generate build dependencies, the first time it is # built. CPPFLAGS is used to pass the right include path to dependency rules. -GPM_CONF_ENV = CPPFLAGS="$(TARGET_CPPFLAGS) -I$(@D)/src/headers/" \ - ac_cv_path_emacs=no +GPM_CONF_ENV = \ + CPPFLAGS="$(TARGET_CPPFLAGS) -I$(@D)/src/headers/" \ + ac_cv_path_emacs=no # For some reason, Microblaze gcc does not define __ELF__, which gpm # configure script uses to determine whether the architecture uses ELF From d70ade160efe88530b2511eb081730f2dcbfb3ae Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Oct 2016 21:26:16 +0200 Subject: [PATCH 1117/3392] microblaze: fix musl support For musl we need patches for bintils 2.25.1 and 2.26.1. Binutils 2.27 and gcc 6.2.x does not work for microblaze, even not for uClibc-ng or glibc. For gcc 5.4.x the existing patch need reworking so that musl and uClibc-ng is supported. Signed-off-by: Waldemar Brodkorb [Thomas: - Add proper description for the binutils patches - Use BR2_microblaze instead of BR2_microblazeel and BR2_microblazebz] Signed-off-by: Thomas Petazzoni --- .../binutils/2.25.1/800-microblaze-musl.patch | 22 ++++++++++++ .../2.26.1/0800-microblaze-musl.patch | 23 ++++++++++++ package/binutils/Config.in.host | 2 ++ package/gcc/5.4.0/892-microblaze-uclibc.patch | 24 ------------- .../910-microblaze-musl-and-uclibc.patch | 36 +++++++++++++++++++ package/gcc/Config.in.host | 3 ++ 6 files changed, 86 insertions(+), 24 deletions(-) create mode 100644 package/binutils/2.25.1/800-microblaze-musl.patch create mode 100644 package/binutils/2.26.1/0800-microblaze-musl.patch delete mode 100644 package/gcc/5.4.0/892-microblaze-uclibc.patch create mode 100644 package/gcc/5.4.0/910-microblaze-musl-and-uclibc.patch diff --git a/package/binutils/2.25.1/800-microblaze-musl.patch b/package/binutils/2.25.1/800-microblaze-musl.patch new file mode 100644 index 0000000000..34e69fd548 --- /dev/null +++ b/package/binutils/2.25.1/800-microblaze-musl.patch @@ -0,0 +1,22 @@ +Fix the genetation of GOT entries for the Microblaze target. + +PR target/19516 +* elf32-microblaze.c (microblaze_elf_finish_dynamic_symbol): +Always produce a RELATIVE reloc for a local symbol. + +[Taken from https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=47993b4af18c6ef1cad300f6393bf896d3cb5e5c.] +Signed-off-by: Waldemar Brodkorb + +diff -Nur binutils-2.25.1.orig/bfd/elf32-microblaze.c binutils-2.25.1/bfd/elf32-microblaze.c +--- binutils-2.25.1.orig/bfd/elf32-microblaze.c 2015-07-21 10:20:58.000000000 +0200 ++++ binutils-2.25.1/bfd/elf32-microblaze.c 2016-02-14 11:38:45.822387506 +0100 +@@ -3293,8 +3293,7 @@ + The entry in the global offset table will already have been + initialized in the relocate_section function. */ + if (info->shared +- && (info->symbolic || h->dynindx == -1) +- && h->def_regular) ++ && ((info->symbolic && h->def_regular) || h->dynindx == -1)) + { + asection *sec = h->root.u.def.section; + microblaze_elf_output_dynamic_relocation (output_bfd, diff --git a/package/binutils/2.26.1/0800-microblaze-musl.patch b/package/binutils/2.26.1/0800-microblaze-musl.patch new file mode 100644 index 0000000000..5e45058f6c --- /dev/null +++ b/package/binutils/2.26.1/0800-microblaze-musl.patch @@ -0,0 +1,23 @@ +Fix the genetation of GOT entries for the Microblaze target. + +PR target/19516 +* elf32-microblaze.c (microblaze_elf_finish_dynamic_symbol): +Always produce a RELATIVE reloc for a local symbol. + +[Taken from https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=47993b4af18c6ef1cad300f6393bf896d3cb5e5c.] +Signed-off-by: Waldemar Brodkorb + +diff -Nur binutils-2.26.1.orig/bfd/elf32-microblaze.c binutils-2.26.1/bfd/elf32-microblaze.c +--- binutils-2.26.1.orig/bfd/elf32-microblaze.c 2015-11-13 09:27:40.000000000 +0100 ++++ binutils-2.26.1/bfd/elf32-microblaze.c 2016-10-20 19:06:58.655565765 +0200 +@@ -3296,8 +3296,8 @@ + The entry in the global offset table will already have been + initialized in the relocate_section function. */ + if (bfd_link_pic (info) +- && (info->symbolic || h->dynindx == -1) +- && h->def_regular) ++ && ((info->symbolic && h->def_regular) ++ || h->dynindx == -1)) + { + asection *sec = h->root.u.def.section; + microblaze_elf_output_dynamic_relocation (output_bfd, diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 3e0c357d99..a7610b447c 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -17,6 +17,8 @@ choice config BR2_BINUTILS_VERSION_2_27_X bool "binutils 2.27" + # supported but broken on Microblaze + depends on !BR2_microblaze endchoice diff --git a/package/gcc/5.4.0/892-microblaze-uclibc.patch b/package/gcc/5.4.0/892-microblaze-uclibc.patch deleted file mode 100644 index a8eb5a6989..0000000000 --- a/package/gcc/5.4.0/892-microblaze-uclibc.patch +++ /dev/null @@ -1,24 +0,0 @@ -Add dynamic linker support for uClibc - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/gcc/config/microblaze/linux.h gcc-5.3.0/gcc/config/microblaze/linux.h ---- gcc-5.3.0.orig/gcc/config/microblaze/linux.h 2015-05-28 16:08:19.000000000 +0200 -+++ gcc-5.3.0/gcc/config/microblaze/linux.h 2016-05-13 09:21:01.579262885 +0200 -@@ -28,7 +28,15 @@ - #undef TLS_NEEDS_GOT - #define TLS_NEEDS_GOT 1 - --#define DYNAMIC_LINKER "/lib/ld.so.1" -+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+ -+#if DEFAULT_LIBC == LIBC_UCLIBC -+#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER -+#else -+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER -+#endif -+ - #undef SUBTARGET_EXTRA_SPECS - #define SUBTARGET_EXTRA_SPECS \ - { "dynamic_linker", DYNAMIC_LINKER } diff --git a/package/gcc/5.4.0/910-microblaze-musl-and-uclibc.patch b/package/gcc/5.4.0/910-microblaze-musl-and-uclibc.patch new file mode 100644 index 0000000000..6fe4993406 --- /dev/null +++ b/package/gcc/5.4.0/910-microblaze-musl-and-uclibc.patch @@ -0,0 +1,36 @@ +Add dynamic linker support for uClibc-ng/musl + +Signed-off-by: Waldemar Brodkorb + + +diff -Nur gcc-5.4.0.orig/gcc/config/microblaze/linux.h gcc-5.4.0/gcc/config/microblaze/linux.h +--- gcc-5.4.0.orig/gcc/config/microblaze/linux.h 2015-05-28 16:08:19.000000000 +0200 ++++ gcc-5.4.0/gcc/config/microblaze/linux.h 2016-10-23 17:09:46.962010871 +0200 +@@ -28,7 +28,26 @@ + #undef TLS_NEEDS_GOT + #define TLS_NEEDS_GOT 1 + +-#define DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++ ++#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++ ++#undef MUSL_DYNAMIC_LINKER ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" ++ ++#if DEFAULT_LIBC == LIBC_UCLIBC ++#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER ++#else ++#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER ++#endif ++ + #undef SUBTARGET_EXTRA_SPECS + #define SUBTARGET_EXTRA_SPECS \ + { "dynamic_linker", DYNAMIC_LINKER } diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index d204bf7deb..446df4dc78 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -48,6 +48,8 @@ choice depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 + # musl microblaze unsupported + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe)) # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # musl mips64 unsupported @@ -73,6 +75,7 @@ choice bool "gcc 6.x" # Broken or unsupported architectures depends on !BR2_arc + depends on !BR2_microblaze # Unsupported MIPS cores depends on !BR2_mips_m6201 && !BR2_mips_p6600 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 From 1eedbe2d601ee5de8dc6aa3894b416f5235adcb0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:13:23 -0300 Subject: [PATCH 1118/3392] adwaita-icon-theme: install to staging This is required for the upcoming evince package which checks for adwaita presence via pkgconfig file, which normally resides in staging. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/adwaita-icon-theme/adwaita-icon-theme.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/adwaita-icon-theme/adwaita-icon-theme.mk b/package/adwaita-icon-theme/adwaita-icon-theme.mk index b9ec0c0ace..fdf66c8e94 100644 --- a/package/adwaita-icon-theme/adwaita-icon-theme.mk +++ b/package/adwaita-icon-theme/adwaita-icon-theme.mk @@ -8,6 +8,7 @@ ADWAITA_ICON_THEME_VERSION_MAJOR = 3.22 ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0 ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR) ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz +ADWAITA_ICON_THEME_INSTALL_STAGING = YES ADWAITA_ICON_THEME_LICENSE = LGPLv3 or CC-BY-SA-3.0 ADWAITA_ICON_THEME_LICENSE_FILES = COPYING COPYING_LGPL COPYING_CCBYSA3 ADWAITA_ICON_THEME_DEPENDENCIES = host-intltool host-libgtk3 From 566858f6a1d65dda466942e4c84e40e3ce95e06f Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Fri, 28 Oct 2016 15:13:59 +0200 Subject: [PATCH 1119/3392] package/libglob: fix license typo Signed-off-by: Jerzy Grzegorek Signed-off-by: Thomas Petazzoni --- package/libglob/libglob.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libglob/libglob.mk b/package/libglob/libglob.mk index 534f936cc6..cd6922e0e7 100644 --- a/package/libglob/libglob.mk +++ b/package/libglob/libglob.mk @@ -7,7 +7,7 @@ LIBGLOB_VERSION = 1.0 LIBGLOB_SITE = $(call github,voidlinux,libglob,$(LIBGLOB_VERSION)) LIBGLOB_LICENSE = BSD-3c -LIBGLOB_LICENSE_FILE = LICENSE +LIBGLOB_LICENSE_FILES = LICENSE LIBGLOB_INSTALL_STAGING = YES ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) From ba781d347ca56f723786275f5c2b5172f7cf6ccb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Oct 2016 14:31:58 +0200 Subject: [PATCH 1120/3392] bellagio: add patch to fix installation path of documentation Fixes: http://autobuild.buildroot.net/results/c026551c6b3483d98dd2507c7529a0be8ff79007/ Signed-off-by: Thomas Petazzoni --- .../0005-fix-doc-installation-path.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 package/bellagio/0005-fix-doc-installation-path.patch diff --git a/package/bellagio/0005-fix-doc-installation-path.patch b/package/bellagio/0005-fix-doc-installation-path.patch new file mode 100644 index 0000000000..06b0743e26 --- /dev/null +++ b/package/bellagio/0005-fix-doc-installation-path.patch @@ -0,0 +1,24 @@ +Makefile.am: fix bogus docdir definition + +The definition of the docdir variable uses $(DESTDIR). However, +automake already prefixes all *dir variables automatically with +DESTDIR, which causes the documentation to be installed in +$(DESTDIR)/$(DESTDIR)/usr/share/doc/... + +Fix this by removing the $(DESTDIR) part of the docdir definition. + +Signed-off-by: Thomas Petazzoni + +Index: b/Makefile.am +=================================================================== +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,7 @@ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libomxil-bellagio.pc + +-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@ ++docdir = $(prefix)/share/doc/@PACKAGE@ + doc_DATA = README \ + ChangeLog \ + TODO From 1ba7b6a4f12977aec994c4f38d5be38cfdb27846 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Oct 2016 14:09:34 +0200 Subject: [PATCH 1121/3392] package/x265: bump version to 2.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x265/x265.hash | 2 +- package/x265/x265.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x265/x265.hash b/package/x265/x265.hash index 92b5beaa9d..d6dec122da 100644 --- a/package/x265/x265.hash +++ b/package/x265/x265.hash @@ -1,2 +1,2 @@ # Locally generated -sha256 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8 x265_1.9.tar.gz +sha256 88fcb9af4ba52c0757ac9c0d8cd5ec79951a22905ae886897e06954353d6a643 x265_2.1.tar.gz diff --git a/package/x265/x265.mk b/package/x265/x265.mk index e737c31375..ba284dacf9 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -4,7 +4,7 @@ # ################################################################################ -X265_VERSION = 1.9 +X265_VERSION = 2.1 X265_SOURCE = x265_$(X265_VERSION).tar.gz X265_SITE = https://bitbucket.org/multicoreware/x265/downloads X265_LICENSE = GPLv2+ From fe70f20daece4a845fbcc4ea2e7758c0e006d2fd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Oct 2016 15:03:58 +0200 Subject: [PATCH 1122/3392] network-manager: remove bogus --mandir option The network-manager.mk passes --mandir=$(STAGING_DIR)/usr/man/, which causes man pages to be installed in $(STAGING_DIR)/$(STAGING_DIR)/usr/man and $(TARGET_DIR)/$(STAGING_DIR)/usr/man. This is definitely bogus and causes some build failures thanks to the new check added by Yann E. Morin. This option was in network-manager.mk since the addition of the package. Maybe it was fixing a bug in the package logic back at the time, but nowadays, it causes an installation at the wrong location. Without this commit, the man pages are properly installed at the right location. Fixes: http://autobuild.buildroot.net/results/92683749b0b8e726bc83781ca6d8e103428362ba/ Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 663348abe7..3d7a1bf018 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -24,7 +24,6 @@ NETWORK_MANAGER_CONF_ENV = \ NETWORK_MANAGER_CONF_OPTS = \ - --mandir=$(STAGING_DIR)/usr/man/ \ --disable-tests \ --disable-qt \ --disable-more-warnings \ From af59e77d04ca69f02f6de09aa3933c4839bd8e7b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Oct 2016 14:10:09 +0200 Subject: [PATCH 1123/3392] package/x11r7/xlib_libXi: bump version to 1.7.8 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXi/xlib_libXi.hash | 4 ++-- package/x11r7/xlib_libXi/xlib_libXi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXi/xlib_libXi.hash b/package/x11r7/xlib_libXi/xlib_libXi.hash index a11b299721..e7a4032fb5 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.hash +++ b/package/x11r7/xlib_libXi/xlib_libXi.hash @@ -1,2 +1,2 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002723.html -sha256 996f834fa57b9b33ba36690f6f5c6a29320bc8213022943912462d8015b1e030 libXi-1.7.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002733.html +sha256 d8f2fa8d53141c41ff521627df9b2fa9c05f6f142fd9881152bab36549ac27bb libXi-1.7.8.tar.bz2 diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk index 8dfea0fecd..de680ea05f 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXI_VERSION = 1.7.7 +XLIB_LIBXI_VERSION = 1.7.8 XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXI_LICENSE = MIT From 23f8cbb95db981533950837054a11214a5accc64 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Oct 2016 14:10:10 +0200 Subject: [PATCH 1124/3392] package/x11r7/xdriver_xf86-input-libinput: bump version to 0.22.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../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 103e5154e0..6edc391146 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 https://lists.x.org/archives/xorg-announce/2016-September/002717.html -sha256 c54e8155d0ba0e5abba9de7bb227c4e4930959a01a904de96b6c0e52bb2a39b0 xf86-input-libinput-0.20.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-October/002732.html +sha256 c762b4072ed448e2ae9f35cebd7fec8df7fd42b3ae61462cc3b2f720a873eae2 xf86-input-libinput-0.22.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 eacacea162..517e5d27ef 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.20.0 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.22.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 b1c8794d8ac0eb3895d13ae91d8e912ec469a105 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Oct 2016 14:11:06 +0200 Subject: [PATCH 1125/3392] package/dtv-scan-tables: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dtv-scan-tables/dtv-scan-tables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dtv-scan-tables/dtv-scan-tables.mk b/package/dtv-scan-tables/dtv-scan-tables.mk index 0081369add..8ef42b90a2 100644 --- a/package/dtv-scan-tables/dtv-scan-tables.mk +++ b/package/dtv-scan-tables/dtv-scan-tables.mk @@ -4,7 +4,7 @@ # ################################################################################ -DTV_SCAN_TABLES_VERSION = 0c92e5e5d3590da60acb4bcc92c19f041dc7e481 +DTV_SCAN_TABLES_VERSION = ceb11833b35f05813b1f0397a60e0f3b99430aab DTV_SCAN_TABLES_SITE = http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git DTV_SCAN_TABLES_SITE_METHOD = git From 44c908f31b01a66b8e9701abbae4ab6e25e94568 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Oct 2016 14:11:07 +0200 Subject: [PATCH 1126/3392] package/tvheadend: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 0479971981..ca10dc38bf 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b6035c0eedfdcbec965116248471c23bed7f8b7f899e403d670495325002ba78 tvheadend-8e637f9f903f6d820f701a1461b144e67665c6fa.tar.gz +sha256 71dd3d8efa32d592342ff6955cc2cd317f07e74d2d546977eb9bc45136dd5de6 tvheadend-50a370707aedf5c127e92bb517c378aa8ac04657.tar.gz diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index af90a822d9..a3afec8c03 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 8e637f9f903f6d820f701a1461b144e67665c6fa +TVHEADEND_VERSION = 50a370707aedf5c127e92bb517c378aa8ac04657 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPLv3+ TVHEADEND_LICENSE_FILES = LICENSE.md From dbb5f4a1961f704142b3d9fece1db7caa9b46aff Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Oct 2016 14:08:59 +0200 Subject: [PATCH 1127/3392] package/x264: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x264/x264.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x264/x264.mk b/package/x264/x264.mk index 6055a8a6ec..19111f0b5e 100644 --- a/package/x264/x264.mk +++ b/package/x264/x264.mk @@ -4,7 +4,7 @@ # ################################################################################ -X264_VERSION = 3b70645597bea052d2398005bc723212aeea6875 +X264_VERSION = 72d53ab2ac7af24597a824e868f2ef363a22f5d4 X264_SITE = git://git.videolan.org/x264.git X264_LICENSE = GPLv2+ X264_DEPENDENCIES = host-pkgconf From 584ee80ac38cb7c1379697595fb4c01212e813ed Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Oct 2016 14:08:02 +0200 Subject: [PATCH 1128/3392] package/ffmpeg: bump version to 3.2 Support for libfaac was removed upstream: https://github.com/xbmc/FFmpeg/commit/dc0f711459e0c682bf9f94ba38d26736e90cff45 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index 7b1e1400eb..541f421de6 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a ffmpeg-3.1.5.tar.xz +sha256 88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da ffmpeg-3.2.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 52d2f38cfd..de6d8416c3 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.1.5 +FFMPEG_VERSION = 3.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -50,7 +50,6 @@ FFMPEG_CONF_OPTS = \ --disable-libopencore-amrwb \ --disable-libcdio \ --disable-libdc1394 \ - --disable-libfaac \ --disable-libgsm \ --disable-libilbc \ --disable-libnut \ From a8271f0c8e7e0f91395e7ca2b229ea09705ee13d Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 29 Oct 2016 10:35:50 +0200 Subject: [PATCH 1129/3392] moarvm: bump to version 2016.10 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/moarvm/moarvm.hash | 2 +- package/moarvm/moarvm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index f045f4fac7..514a1bfe80 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 6fe9000daada59535747f2557cc73573241ba8a6044271caf1647aa37be33c6d MoarVM-2016.04.tar.gz +sha256 d8cb9fe74267dd933c3e405b098dea99cb9c0561aedb06e8efd8ddaef43396d0 MoarVM-2016.10.tar.gz diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index fd054682b5..d2421fd78a 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2016.04 +MOARVM_VERSION = 2016.10 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 From 31e821405741b9f27a5705b3ef92f3638cde6b5b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 19:15:56 -0300 Subject: [PATCH 1130/3392] linux-headers: bump 4.{4, 8}.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 37936f645c..e770a446a5 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -232,9 +232,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.35" if BR2_KERNEL_HEADERS_4_1 - default "4.4.27" if BR2_KERNEL_HEADERS_4_4 + default "4.4.28" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.10" if BR2_KERNEL_HEADERS_4_7 - default "4.8.4" if BR2_KERNEL_HEADERS_4_8 + default "4.8.5" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 75a552fbfb93d899e42311a82d448b081ebe9c77 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 19:15:57 -0300 Subject: [PATCH 1131/3392] linux: bump default to version 4.8.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index df8baf5f95..268516f8e1 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.4)" + bool "Latest version (4.8.5)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.4" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.5" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 6dbd9ad3cc23eca260ce87f032ba1cecc7eb4329 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 13:12:11 -0300 Subject: [PATCH 1132/3392] redis: bump to version 3.2.5 Adjust default config patch to match new major version. localhost binding is now default so drop it, 300s keepalive is now default as well (instead of 60s from the previous patch and 0 by default) - which sounds reasonable so keep it. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...is.conf-adjust-defauts-for-buildroot.patch | 29 +++++++++++++++ .../redis/0003-redis.conf-sane-defaults.patch | 37 ------------------- package/redis/redis.hash | 4 +- package/redis/redis.mk | 2 +- 4 files changed, 32 insertions(+), 40 deletions(-) create mode 100644 package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch delete mode 100644 package/redis/0003-redis.conf-sane-defaults.patch diff --git a/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch b/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch new file mode 100644 index 0000000000..6ad81a493d --- /dev/null +++ b/package/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch @@ -0,0 +1,29 @@ +From f79d1d1bf9e6f54b67e5482602084fbff7fd9cc9 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Fri, 28 Oct 2016 12:50:34 -0300 +Subject: [PATCH] redis.conf: adjust defauts for buildroot + +Based on Martin Bark's patch hence archlinux package. +We just need to specify a proper db directory. + +Signed-off-by: Gustavo Zacarias +--- + redis.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/redis.conf b/redis.conf +index 22e00bc..3bb0430 100644 +--- a/redis.conf ++++ b/redis.conf +@@ -244,7 +244,7 @@ dbfilename dump.rdb + # The Append Only File will also be created inside this directory. + # + # Note that you must specify a directory here, not a file name. +-dir ./ ++dir /var/lib/redis/ + + ################################# REPLICATION ################################# + +-- +2.7.3 + diff --git a/package/redis/0003-redis.conf-sane-defaults.patch b/package/redis/0003-redis.conf-sane-defaults.patch deleted file mode 100644 index 6ee3f210ca..0000000000 --- a/package/redis/0003-redis.conf-sane-defaults.patch +++ /dev/null @@ -1,37 +0,0 @@ -Taken from archlinux redis package -See https://projects.archlinux.org/svntogit/community.git/tree/trunk/redis.conf-sane-defaults.patch?h=packages/redis&id=5b2491ea61b746f289acebd12bc66e337d7e5b88 - -Signed-off-by: Martin Bark - -========================================================================= -diff --git a/redis.conf b/redis.conf -index 6efb6ac..344e021 100644 ---- a/redis.conf -+++ b/redis.conf -@@ -61,7 +61,7 @@ tcp-backlog 511 - # Examples: - # - # bind 192.168.1.100 10.0.0.1 --# bind 127.0.0.1 -+bind 127.0.0.1 - - # Specify the path for the Unix socket that will be used to listen for - # incoming connections. There is no default, so Redis will not listen -@@ -87,7 +87,7 @@ timeout 0 - # On other kernels the period depends on the kernel configuration. - # - # A reasonable value for this option is 60 seconds. --tcp-keepalive 0 -+tcp-keepalive 60 - - # Specify the server verbosity level. - # This can be one of: -@@ -184,7 +184,7 @@ dbfilename dump.rdb - # The Append Only File will also be created inside this directory. - # - # Note that you must specify a directory here, not a file name. --dir ./ -+dir /var/lib/redis/ - - ################################# REPLICATION ################################# - diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 07783f545f..7e09db5dab 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,4 +1,4 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha1 e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c redis-3.0.7.tar.gz +sha1 6f6333db6111badaa74519d743589ac4635eba7a redis-3.2.5.tar.gz # Calculated based on the hash above -sha256 b2a791c4ea3bb7268795c45c6321ea5abcc24457178373e6a6e3be6372737f23 redis-3.0.7.tar.gz +sha256 8509ceb1efd849d6b2346a72a8e926b5a4f6ed3cc7c3cd8d9f36b2e9ba085315 redis-3.2.5.tar.gz diff --git a/package/redis/redis.mk b/package/redis/redis.mk index a9df6e712f..3b70991b48 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 3.0.7 +REDIS_VERSION = 3.2.5 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From 0a185aab18c2450390b57e334717c187a8c31e3f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 14:55:39 -0300 Subject: [PATCH 1133/3392] ezxml: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/ezxml/ezxml.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk index 769346605d..a806e566ed 100644 --- a/package/ezxml/ezxml.mk +++ b/package/ezxml/ezxml.mk @@ -11,8 +11,8 @@ EZXML_LICENSE = MIT EZXML_LICENSE_FILES = license.txt define EZXML_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" AR=$(TARGET_AR) \ - -f GNUmakefile -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f GNUmakefile \ + CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" AR=$(TARGET_AR) endef define EZXML_INSTALL_STAGING_CMDS From 690735ab155ee9447137bd061d7c9b4189b01ce2 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Fri, 28 Oct 2016 16:32:44 +0200 Subject: [PATCH 1134/3392] mfgtools: add gcc version dependency MfgTools requires gcc >= 4.8 since it needs C++11 support. Fixes the following autobuild issues: http://autobuild.buildroot.net/results/c8cbc4e5296af91be5fa8b17871bedf08b6a2697 http://autobuild.buildroot.net/results/fadabb38d8dde6f2be85fbc286b060e2f3e82f65 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/mfgtools/Config.in.host | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mfgtools/Config.in.host b/package/mfgtools/Config.in.host index 8bba9e2444..1cb5a7f095 100644 --- a/package/mfgtools/Config.in.host +++ b/package/mfgtools/Config.in.host @@ -1,6 +1,10 @@ +comment "mfgtools needs host gcc >= 4.8" + depends on !BR2_HOST_GCC_AT_LEAST_4_8 + config BR2_PACKAGE_HOST_MFGTOOLS bool "host mfgtools" depends on BR2_arm + depends on BR2_HOST_GCC_AT_LEAST_4_8 # needs C++11 help This package contains the Freescale manufacturing tool. It is designed to program firmware to i.MX boards during From b876d9d9c520b7afb399601a6063bc0d993c2729 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 12:09:07 -0300 Subject: [PATCH 1135/3392] json-glib: bump to version 1.2.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/json-glib/json-glib.hash | 4 ++-- package/json-glib/json-glib.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash index 18e1aa014d..2a5693934b 100644 --- a/package/json-glib/json-glib.hash +++ b/package/json-glib/json-glib.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.2/json-glib-1.2.0.sha256sum -sha256 99d6dfbe49c08fd7529f1fe8dcb1893b810a1bb222f1e7b65f41507658b8a7d3 json-glib-1.2.0.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.2/json-glib-1.2.2.sha256sum +sha256 ea128ab52a824fcd06e5448fbb2bd8d9a13740d51c66d445828edba71321a621 json-glib-1.2.2.tar.xz diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index f7c52c018a..305c9acc79 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -5,7 +5,7 @@ ################################################################################ JSON_GLIB_VERSION_MAJOR = 1.2 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).0 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).2 JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPLv2.1+ From 8855921dd4780162c6993b9087c1b73d1da38b53 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 12:09:23 -0300 Subject: [PATCH 1136/3392] mobile-broadband-provider-info: bump to version 20151214 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- .../mobile-broadband-provider-info.hash | 4 ++-- .../mobile-broadband-provider-info.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash index 54c7a99d27..5ab2e318fe 100644 --- a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash +++ b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/20120614/mobile-broadband-provider-info-20120614.sha256sum -sha256 72507a732e0cd16cf27424bb094b1c7a03e2206c119ad124722a283e587755f1 mobile-broadband-provider-info-20120614.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/20151214/mobile-broadband-provider-info-20151214.sha256sum +sha256 8ae45d6f10fed9750e259935804c4f40a4372bb119f0504187e4221896b205a4 mobile-broadband-provider-info-20151214.tar.xz diff --git a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk index f2a113635b..1a68708d45 100644 --- a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk +++ b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20120614 +MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20151214 MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION) MOBILE_BROADBAND_PROVIDER_INFO_SOURCE = mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION).tar.xz MOBILE_BROADBAND_PROVIDER_INFO_LICENSE = Public domain From e4b2a33d3580b08f8ef59ec436a04f3a6fda44e9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 12:09:39 -0300 Subject: [PATCH 1137/3392] gupnp: bump to version 1.0.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gupnp/gupnp.hash | 4 ++-- package/gupnp/gupnp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index 6bdc0c03a9..48aeb499f8 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,2 +1,2 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/0.99/gupnp-0.99.0.sha256sum: -sha256 695c745ae7ecef9482bd91821d84bb98764cbcca0d0f71acb6d46ac1be23a1be gupnp-0.99.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.1.sha256sum: +sha256 934584cc1b361bf251a5ac271ffb1995a3c6426ce44cb64f9c6d779f2af9a6d9 gupnp-1.0.1.tar.xz diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index fe80838eeb..764f527d28 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -4,8 +4,8 @@ # ################################################################################ -GUPNP_VERSION_MAJOR = 0.99 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).0 +GUPNP_VERSION_MAJOR = 1.0 +GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).1 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPLv2+ From 9b37b5f5d39896fc76e9e3231247c4f2e5d560cd Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 12:09:40 -0300 Subject: [PATCH 1138/3392] gssdp: bump to version 1.0.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gssdp/gssdp.hash | 4 ++-- package/gssdp/gssdp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gssdp/gssdp.hash b/package/gssdp/gssdp.hash index 373898868d..b646d185ba 100644 --- a/package/gssdp/gssdp.hash +++ b/package/gssdp/gssdp.hash @@ -1,2 +1,2 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/0.99/gssdp-0.99.0.sha256sum: -sha256 29330adea7314fde44b769e01b2ffa1d2d34e8955b0f82f20bfb425d8421bc60 gssdp-0.99.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.1.sha256sum: +sha256 601d67f40bc28c067742b7c46f3018da96b364fd3e83f30ddac6e190e323d2e1 gssdp-1.0.1.tar.xz diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk index 6a61789337..fa44a2ca9c 100644 --- a/package/gssdp/gssdp.mk +++ b/package/gssdp/gssdp.mk @@ -4,8 +4,8 @@ # ################################################################################ -GSSDP_VERSION_MAJOR = 0.99 -GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).0 +GSSDP_VERSION_MAJOR = 1.0 +GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).1 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPLv2+ From b7736796b6e753eeb488e79ca1a6fe326bd1c0e6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 12:09:41 -0300 Subject: [PATCH 1139/3392] gupnp-av: bump to version 0.12.10 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gupnp-av/gupnp-av.hash | 4 ++-- package/gupnp-av/gupnp-av.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index b97317195f..8fe7782249 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,2 +1,2 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.12/gupnp-av-0.12.8.sha256sum: -sha256 759bc7d46aff894c282d17f508d9b5be82de96aa74b10cb6b0fc6c5e07cc273c gupnp-av-0.12.8.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.12/gupnp-av-0.12.10.sha256sum: +sha256 8038ef84dddbe7ad91c205bf91dddf684f072df8623f39b6555a6bb72837b85a gupnp-av-0.12.10.tar.xz diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index 5835155155..40e6c8c836 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_AV_VERSION_MAJOR = 0.12 -GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).8 +GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).10 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) GUPNP_AV_LICENSE = LGPLv2+ From bb50481b36425ae428991595bac391a1f571ded3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:18:19 -0300 Subject: [PATCH 1140/3392] cryptopp: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/cryptopp/cryptopp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 86a2da1e8e..456876c4ee 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -20,11 +20,11 @@ HOST_CRYPTOPP_MAKE_OPTS = \ CXXFLAGS="$(HOST_CXXFLAGS) -fPIC" define HOST_CRYPTOPP_BUILD_CMDS - $(MAKE) -C $(@D) $(HOST_CRYPTOPP_MAKE_OPTS) shared + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CRYPTOPP_MAKE_OPTS) shared endef define HOST_CRYPTOPP_INSTALL_CMDS - $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install endef $(eval $(host-generic-package)) From 678a54e11c2194d1a036cb1c55f25e2b2faa4a94 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:18:20 -0300 Subject: [PATCH 1141/3392] lzip: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/lzip/lzip.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index c6f054319b..ecf70a37df 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -15,7 +15,7 @@ define LZIP_CONFIGURE_CMDS endef define HOST_LZIP_CONFIGURE_CMDS - (cd $(@D); ./configure --prefix=/usr \ + (cd $(@D); $(HOST_MAKE_ENV) ./configure --prefix=/usr \ $(HOST_CONFIGURE_OPTS) ) endef @@ -24,7 +24,7 @@ define LZIP_BUILD_CMDS endef define HOST_LZIP_BUILD_CMDS - $(MAKE) -C $(@D) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) endef define LZIP_INSTALL_TARGET_CMDS @@ -32,7 +32,7 @@ define LZIP_INSTALL_TARGET_CMDS endef define HOST_LZIP_INSTALL_CMDS - $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) install endef # It's not autotools-based From f3f9a860c09728edbc7a6cb5f03841092535ff59 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:18:21 -0300 Subject: [PATCH 1142/3392] lzip: use $(TARGET_MAKE_ENV) for configure as well Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/lzip/lzip.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index ecf70a37df..8180fd0a46 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -10,7 +10,7 @@ LZIP_LICENSE = GPLv3+ LZIP_LICENSE_FILES = COPYING define LZIP_CONFIGURE_CMDS - (cd $(@D); ./configure --prefix=/usr \ + (cd $(@D); $(TARGET_MAKE_ENV) ./configure --prefix=/usr \ $(TARGET_CONFIGURE_OPTS) ) endef From dba1ebe551c32b101cdc31402b2a580101765b8b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:18:22 -0300 Subject: [PATCH 1143/3392] libselinux: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libselinux/libselinux.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 6f9417321a..29ed0efacf 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -23,15 +23,18 @@ LIBSELINUX_MAKE_OPTS = \ define LIBSELINUX_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. - $(MAKE) -C $(@D) $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all endef define LIBSELINUX_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endef define LIBSELINUX_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install # Create the selinuxfs mount point if [ ! -d "$(TARGET_DIR)/selinux" ]; then mkdir $(TARGET_DIR)/selinux; fi if ! grep -q "selinuxfs" $(TARGET_DIR)/etc/fstab; then \ From 0ccc376bc4f1f41e3d8f623fb8d2ddaa4538771c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:18:23 -0300 Subject: [PATCH 1144/3392] libselinux: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libselinux/libselinux.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 29ed0efacf..165ac4c30d 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -67,18 +67,22 @@ HOST_LIBSELINUX_MAKE_OPTS = \ define HOST_LIBSELINUX_BUILD_CMDS # DESTDIR is needed during the compile to compute library and # header paths. - $(MAKE1) -C $(@D) $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ + $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ + $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/usr/lib all # Generate python interface wrapper - $(MAKE1) -C $(@D) $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap + $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ + $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap endef define HOST_LIBSELINUX_INSTALL_CMDS - $(MAKE) -C $(@D) $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ + $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/usr/lib SBINDIR=$(HOST_DIR)/usr/sbin install (cd $(HOST_DIR)/usr/lib; $(HOSTLN) -sf libselinux.so.1 libselinux.so) # Install python interface wrapper - $(MAKE) -C $(@D) $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ + $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap endef $(eval $(generic-package)) From 2072c96eece0dc521d3a0cf945276b7fa5c70780 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:18:24 -0300 Subject: [PATCH 1145/3392] perl: use $(TARGET_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/perl/perl.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/perl/perl.mk b/package/perl/perl.mk index a8768b216c..56fc5790ef 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -81,20 +81,21 @@ PERL_CONF_OPTS += --only-mod=$(subst $(space),$(comma),$(PERL_MODULES)) endif define PERL_CONFIGURE_CMDS - (cd $(@D); HOSTCC='$(HOSTCC_NOCCACHE)' ./configure $(PERL_CONF_OPTS)) + (cd $(@D); $(TARGET_MAKE_ENV) HOSTCC='$(HOSTCC_NOCCACHE)' \ + ./configure $(PERL_CONF_OPTS)) $(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h endef define PERL_BUILD_CMDS - $(MAKE1) -C $(@D) all + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) all endef define PERL_INSTALL_STAGING_CMDS - $(MAKE1) -C $(@D) DESTDIR="$(STAGING_DIR)" install.perl + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR="$(STAGING_DIR)" install.perl endef define PERL_INSTALL_TARGET_CMDS - $(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" install.perl + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" install.perl endef HOST_PERL_CONF_OPTS = \ From 57711efbe8a766b1534beeed37a3812777e3ba36 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:18:25 -0300 Subject: [PATCH 1146/3392] perl: use $(HOST_MAKE_ENV) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/perl/perl.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/perl/perl.mk b/package/perl/perl.mk index 56fc5790ef..84af75d07c 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -104,15 +104,16 @@ HOST_PERL_CONF_OPTS = \ -Dcc="$(HOSTCC)" define HOST_PERL_CONFIGURE_CMDS - (cd $(@D); HOSTCC='$(HOSTCC_NOCCACHE)' ./Configure $(HOST_PERL_CONF_OPTS)) + (cd $(@D); $(HOST_MAKE_ENV) HOSTCC='$(HOSTCC_NOCCACHE)' \ + ./Configure $(HOST_PERL_CONF_OPTS)) endef define HOST_PERL_BUILD_CMDS - $(MAKE) -C $(@D) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) endef define HOST_PERL_INSTALL_CMDS - $(MAKE) -C $(@D) INSTALL_DEPENDENCE='' install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_DEPENDENCE='' install endef $(eval $(generic-package)) From 868a9b8e5fa82aefc58e35722c2f50775f7d9bf9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:18:26 -0300 Subject: [PATCH 1147/3392] dtc: use $(TARGET_CONFIGURE_OPTS) when calling $(MAKE) Signed-off-by: Gustavo Zacarias Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/dtc/dtc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk index 0a486441a3..f6800f36b3 100644 --- a/package/dtc/dtc.mk +++ b/package/dtc/dtc.mk @@ -37,12 +37,12 @@ endef # For staging, only the library is needed define DTC_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr install-lib \ + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr install-lib \ install-includes endef define DTC_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr $(DTC_INSTALL_GOAL) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr $(DTC_INSTALL_GOAL) endef # host build From da87f590ddf1b804779facad7c1e626301f5e488 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:18:28 -0300 Subject: [PATCH 1148/3392] fmlib: use $(TARGET_MAKE_ENV) when calling $(MAKE) And drop FMLIB_MAKE_ENV which is non-existant as pointed by Arnout. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/fmlib/fmlib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 42cdc27773..16e817699e 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -31,7 +31,7 @@ endef define FMLIB_INSTALL_STAGING_CMDS $(RM) $(STAGING_DIR)/usr/lib/libfm.a - $(FMLIB_MAKE_ENV) $(MAKE) $(FMLIB_MAKE_OPTS) -C $(@D) install-libfm-$(FMLIB_ARCHTYPE) + $(TARGET_MAKE_ENV) $(MAKE) $(FMLIB_MAKE_OPTS) -C $(@D) install-libfm-$(FMLIB_ARCHTYPE) endef $(eval $(generic-package)) From 9e8cc4d5c8f91c1ed9a19a8c0cf4571052bc8238 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 28 Oct 2016 10:18:29 -0300 Subject: [PATCH 1149/3392] qt: use $(TARGET_MAKE_ENV) when calling $(MAKE) We drop the usage of the QT_CONFIGURE_ENV variable, because it isn't defined anywhere, so it's always empty. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/qt/qt.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 8c0ff7b034..29dcc46b7b 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -505,7 +505,7 @@ endef endif define QT_CONFIGURE_CMDS - -[ -f $(@D)/Makefile ] && $(MAKE) -C $(@D) confclean + -[ -f $(@D)/Makefile ] && $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) confclean $(QT_CONFIGURE_IPV6) $(QT_CONFIGURE_CONFIG_FILE) # Fix compiler path @@ -527,7 +527,7 @@ define QT_CONFIGURE_CMDS PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ - $(QT_CONFIGURE_ENV) \ + $(TARGET_MAKE_ENV) \ MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \ $(if $(VERBOSE),-verbose,-silent) \ -force-pkg-config \ @@ -632,7 +632,7 @@ endef # remove the sysroot path from them, since pkg-config already adds it # automatically. define QT_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install mkdir -p $(HOST_DIR)/usr/bin mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs From b83107e53ceace4f6d95520a193545bec729cae6 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 25 Oct 2016 21:37:20 +0200 Subject: [PATCH 1150/3392] motion: fix static linking of mysql with enabled libz library Fixes ([1]): checking for mysql_init in -lmysqlclient... no configure: error: MySQL support can't build without MySQL libraries [1] http://autobuild.buildroot.net/results/6cf/6cf38698a2a9a041ff375c01ae8898eace17cfb2 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...-given-CFLAGS-LIBS-for-mysqlclient-l.patch | 31 +++++++++++++++++++ package/motion/motion.mk | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch diff --git a/package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch b/package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch new file mode 100644 index 0000000000..4211fe67bd --- /dev/null +++ b/package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch @@ -0,0 +1,31 @@ +From 5a1081d36bf2861ffc882354c583a0eb6b0ee3d5 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 25 Oct 2016 21:27:41 +0200 +Subject: [PATCH] configure.ac: use given CFLAGS/LIBS for mysqlclient library + check + +Needed for static linking of mysql with enabled libz. + +Signed-off-by: Peter Seiderer +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5782fd6..aa5d9dd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -618,8 +618,8 @@ else + #LDFLAGS="-L$MYSQL_LIBDIR" + saved_CFLAGS=$CFLAGS + saved_LIBS=$LIBS +- CFLAGS="-I$MYSQL_INCDIR" +- LIBS="-L$MYSQL_LIBDIR" ++ CFLAGS="-I$MYSQL_INCDIR $CFLAGS" ++ LIBS="-L$MYSQL_LIBDIR $LIBS" + AC_CHECK_LIB(mysqlclient,mysql_init,[ + TEMP_LIBS="$TEMP_LIBS -L$MYSQL_LIBDIR -lmysqlclient -lz" + TEMP_CFLAGS="$TEMP_CFLAGS -I$MYSQL_INCDIR" +-- +2.8.1 + diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 49c0c6a047..d27def2fd8 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -9,7 +9,7 @@ MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION)) MOTION_LICENSE = GPLv2 MOTION_LICENSE_FILES = COPYING MOTION_DEPENDENCIES = host-pkgconf jpeg -# From git +# From git and patched configure.ac MOTION_AUTORECONF = YES # motion does not use any specific function of jpeg-turbo, so just relies on @@ -29,6 +29,10 @@ MOTION_CONF_OPTS += \ --with-mysql \ --with-mysql-include=$(STAGING_DIR)/usr/include/mysql \ --with-mysql-lib=$(STAGING_DIR)/usr/lib +# static link of mysql needs -lz +ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_ZLIB),yy) +MOTION_CONF_ENV += LIBS="-lz" +endif else MOTION_CONF_OPTS += --without-mysql endif From 6ac9823f99a3fbfdeb544396e65d466d4db2b5eb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Oct 2016 19:11:45 +0200 Subject: [PATCH 1151/3392] package/leafnode2: fix SITE url Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/leafnode2/leafnode2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index 5b9b85482b..0c20fd03cf 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -6,7 +6,7 @@ LEAFNODE2_VERSION = 2.0.0.alpha20140727b LEAFNODE2_SOURCE = leafnode-$(LEAFNODE2_VERSION).tar.bz2 -LEAFNODE2_SITE = http://www.dt.e-technik.tu-dortmund.de/~ma/leafnode/beta +LEAFNODE2_SITE = http://krusty.dt.e-technik.tu-dortmund.de/~ma/leafnode/beta LEAFNODE2_LICENSE = LGPLv2.1 LEAFNODE2_LICENSE_FILES = COPYING COPYING.LGPL LEAFNODE2_DEPENDENCIES = host-pcre pcre From c0a93f5975f71cade8fb854c7f3ff550a4d5268e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 29 Oct 2016 22:06:36 +0200 Subject: [PATCH 1152/3392] domoticz: bump to version 3.5834 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index b56bb95b7e..6ac223ce9e 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 f5eaa8db192c314374deb8d58471f3a338da1397be635ebaa4b1a5f664450b05 domoticz-87286ee76ad15420c52689f1e4eeeab56fb04d40.tar.gz +sha256 75148651fc17ff2730c172e25b6bac14e16e099733dda2f5ef2f0bc65fc46750 domoticz-3.5834.tar.gz diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index aceae2d3d2..0ffa5106ff 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 87286ee76ad15420c52689f1e4eeeab56fb04d40 +DOMOTICZ_VERSION = 3.5834 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPLv3 DOMOTICZ_LICENSE_FILES = License.txt From 5f1e0e688bba9b94287302258afdfacd6e6344e2 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Sun, 30 Oct 2016 13:51:45 +0100 Subject: [PATCH 1153/3392] trinity: fix Config.in depends on logic The comment from trinity Config.in currently does not show up in menuconfig for glibc or uClibc toolchains with older headers. This commit fixes the logic so that it shows up when either one of the dependencies from trinity are not met. Signed-off-by: Erico Nunes Signed-off-by: Thomas Petazzoni --- package/trinity/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/trinity/Config.in b/package/trinity/Config.in index 35b54d8306..0ce1f9aa27 100644 --- a/package/trinity/Config.in +++ b/package/trinity/Config.in @@ -18,5 +18,5 @@ config BR2_PACKAGE_TRINITY comment "trinity needs a uClibc or glibc toolchain w/ headers >= 3.4" depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_MUSL - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on BR2_TOOLCHAIN_USES_MUSL || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 From 9f4e7311ea1be940e37dbec6ef644af7eaecd864 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 30 Oct 2016 09:21:01 +0100 Subject: [PATCH 1154/3392] package/mysql: fix SITE url, add sha256 hash Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mysql/mysql.hash | 2 ++ package/mysql/mysql.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/mysql/mysql.hash b/package/mysql/mysql.hash index 84f3361502..bc309ec9a8 100644 --- a/package/mysql/mysql.hash +++ b/package/mysql/mysql.hash @@ -1,2 +1,4 @@ # From https://downloads.mariadb.com/archives/mysql-5.1/mysql-5.1.73.tar.gz.md5 md5 887f869bcc757957067b9198f707f32f mysql-5.1.73.tar.gz +# Locally computed +sha256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 mysql-5.1.73.tar.gz diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk index 92bf45a590..ea330f2515 100644 --- a/package/mysql/mysql.mk +++ b/package/mysql/mysql.mk @@ -7,7 +7,7 @@ MYSQL_VERSION_MAJOR = 5.1 MYSQL_VERSION = $(MYSQL_VERSION_MAJOR).73 MYSQL_SOURCE = mysql-$(MYSQL_VERSION).tar.gz -MYSQL_SITE = http://downloads.skysql.com/archives/mysql-$(MYSQL_VERSION_MAJOR) +MYSQL_SITE = http://dev.mysql.com/get/Downloads/MySQL-$(MYSQL_VERSION_MAJOR) MYSQL_INSTALL_STAGING = YES MYSQL_DEPENDENCIES = readline ncurses MYSQL_AUTORECONF = YES From b3450a888d0764a4f4d31dcad483c7b6092225cd Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 1 Nov 2016 10:59:47 +0000 Subject: [PATCH 1155/3392] lighttpd: bump version to 1.4.43 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/lighttpd/lighttpd.hash | 2 +- package/lighttpd/lighttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index edec58f0ea..c00236b671 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,2 +1,2 @@ # From http://www.lighttpd.net/ -sha256 b2c9069ed0bade9362c27b469a9b884641786aea1c3d686f9fd9f01d15e2a15f lighttpd-1.4.42.tar.xz +sha256 fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a lighttpd-1.4.43.tar.xz diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 537604aa08..9f7599a1e4 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).42 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).43 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3c From 2e29db7d979b58a72d0d7fc5eefb652abba971da Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 1 Nov 2016 10:18:08 +0100 Subject: [PATCH 1156/3392] package/uboot: define help commands when using Kconfig Expose the Kconfig-related help commands when U-Boot uses the Kconfig configuration. Like others (like Linux, barebox, busybox), only expose menuconfig, not all the configurators. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- boot/uboot/uboot.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index ae7539d512..3e347c1084 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -181,6 +181,12 @@ endif # BR2_TARGET_UBOOT_USE_DEFCONFIG UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) +define UBOOT_HELP_CMDS + @echo ' uboot-menuconfig - Run U-Boot menuconfig' + @echo ' uboot-savedefconfig - Run U-Boot savedefconfig' + @echo ' uboot-update-defconfig - Save the U-Boot configuration to the path specified' + @echo ' by BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE' +endef endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY define UBOOT_BUILD_CMDS From bce4d0af424f46ec4cdfa6e54de0c4a34cdaabed Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 1 Nov 2016 09:37:32 +0100 Subject: [PATCH 1157/3392] package/xen: fix build failure on x86 after bump to 4.7 Since the bump to 4.7, Xen fails to build because of a double definition of __OBJECT_FILE__. This is due to (who would have guessed) the weirdness of their buildsystem. Fix that with a dirty hack: undefine the macro before defining it. Signed-off-by: "Yann E. MORIN" Cc: Alistair Francis [Alistair: Tested on ARMv7 (little endian) boot.] Tested-by: Alistair Francis Reviewed-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- ...x-build-with-CFLAGS-from-environment.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/xen/0002-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch diff --git a/package/xen/0002-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch b/package/xen/0002-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch new file mode 100644 index 0000000000..0d4e581af6 --- /dev/null +++ b/package/xen/0002-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch @@ -0,0 +1,36 @@ +From 2a310549aaeaba05f640ade43488bb893101ce4a Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 29 Oct 2016 16:35:26 +0200 +Subject: [PATCH] xen/Rules.mk: fix build with CFLAGS from environment + +When CFLAGS are passed from the environment, the first-level make +invocation will append -D__OBJECT_FILE__ to it, then call a second +make invocation, that will have those new CFLAGS in its environment, +but will also append -D__OBJECT_FILE__ to those. + +Then, the compiler fails because __OBEJECT_FILE__ is defined twice. + +Just undefine it before defining it again, as a *workaround* to this +issue. + +Signed-off-by: "Yann E. MORIN" +--- + xen/Rules.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xen/Rules.mk b/xen/Rules.mk +index a9fda71..09ccbfa 100644 +--- a/xen/Rules.mk ++++ b/xen/Rules.mk +@@ -49,7 +49,7 @@ ALL_OBJS-$(CONFIG_CRYPTO) += $(BASEDIR)/crypto/built_in.o + CFLAGS += -nostdinc -fno-builtin -fno-common + CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith + CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h +-CFLAGS += '-D__OBJECT_FILE__="$@"' ++CFLAGS += -U__OBJECT_FILE__ '-D__OBJECT_FILE__="$@"' + + ifneq ($(clang),y) + # Clang doesn't understand this command line argument, and doesn't appear to +-- +2.7.4 + From a1e30d9365f3ecdf6e4aa97ad4b29c26dba2f8a5 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Tue, 1 Nov 2016 09:56:53 +0100 Subject: [PATCH 1158/3392] package/opencv: update sysctl patch Fixes: http://autobuild.buildroot.net/results/845/845f5e906fda3e87a2fc439a62baede44842283b/ Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/opencv/0002-avoid-sysctl_h.patch | 48 +++++++++++++++++++----- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/package/opencv/0002-avoid-sysctl_h.patch b/package/opencv/0002-avoid-sysctl_h.patch index 603220549e..b63ba55ac1 100644 --- a/package/opencv/0002-avoid-sysctl_h.patch +++ b/package/opencv/0002-avoid-sysctl_h.patch @@ -1,13 +1,24 @@ -From upstream master branch: -https://github.com/Itseez/opencv/blob/master/modules/core/src/ +From e5e71c31d54562f9c67a8226f0bfc08ad24b81cf Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Tue, 1 Nov 2016 09:30:23 +0100 +Subject: [PATCH 2/4] From upstream master branch: + https://github.com/Itseez/opencv/blob/master/modules/core/src/ Do not include sysctl.h targeting Linux systems. Signed-off-by: Waldemar Brodkorb +[Samuel Martin: convert patch to git diff, add cap_ffmpeg_impl.hpp fix] +Signed-off-by: Samuel Martin +--- + modules/core/src/parallel.cpp | 2 +- + modules/core/src/system.cpp | 2 +- + modules/highgui/src/cap_ffmpeg_impl.hpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) -diff -Nur opencv-2.4.12.3.orig/modules/core/src/parallel.cpp opencv-2.4.12.3/modules/core/src/parallel.cpp ---- opencv-2.4.12.3.orig/modules/core/src/parallel.cpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/core/src/parallel.cpp 2016-04-05 12:59:37.750143762 +0200 +diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp +index 4459a24..0374876 100644 +--- a/modules/core/src/parallel.cpp ++++ b/modules/core/src/parallel.cpp @@ -56,7 +56,7 @@ #include #if defined ANDROID @@ -17,10 +28,11 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/src/parallel.cpp opencv-2.4.12.3/mod #include #endif #endif -diff -Nur opencv-2.4.12.3.orig/modules/core/src/system.cpp opencv-2.4.12.3/modules/core/src/system.cpp ---- opencv-2.4.12.3.orig/modules/core/src/system.cpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/core/src/system.cpp 2016-04-05 13:05:22.468323717 +0200 -@@ -163,7 +163,7 @@ +diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp +index 9a7b262..731f090 100644 +--- a/modules/core/src/system.cpp ++++ b/modules/core/src/system.cpp +@@ -163,7 +163,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix) #include #if defined ANDROID #include @@ -29,3 +41,21 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/src/system.cpp opencv-2.4.12.3/modul #include #endif #endif +diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp +index dc3e10d..23674ff 100644 +--- a/modules/highgui/src/cap_ffmpeg_impl.hpp ++++ b/modules/highgui/src/cap_ffmpeg_impl.hpp +@@ -126,9 +126,9 @@ extern "C" { + #include + #include + #include +- #include + #include + #if defined __APPLE__ ++ #include + #include + #include + #endif +-- +2.10.2 + From 8bc94bf25a6f67014ffecdcd498deab7770823b1 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Tue, 1 Nov 2016 09:56:54 +0100 Subject: [PATCH 1159/3392] package/opencv: convert diff patch to git patch Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/opencv/0001-atomic.patch | 134 +++++++++++++++++++------------ 1 file changed, 82 insertions(+), 52 deletions(-) diff --git a/package/opencv/0001-atomic.patch b/package/opencv/0001-atomic.patch index bbe8d433cf..8c9724d25e 100644 --- a/package/opencv/0001-atomic.patch +++ b/package/opencv/0001-atomic.patch @@ -1,5 +1,8 @@ -Bug#714923: opencv FTBFS on sparc64 -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714923 +From f71c288c6d853e623461f97cd72e6a9e6541f61a Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Tue, 1 Nov 2016 09:25:30 +0100 +Subject: [PATCH 1/4] Bug#714923: opencv FTBFS on sparc64 + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714923 opencv uses functions from , but it wrongly assumes this functions apply to an int type. While it is true for some @@ -7,11 +10,26 @@ architectures, some architectures are using a long type there. The correct type to use is _Atomic_word. Signed-off-by: Waldemar Brodkorb +[Samuel Martin: convert to git diff] +Signed-off-by: Samuel Martin +--- + modules/core/include/opencv2/core/core.hpp | 10 +++++----- + modules/core/include/opencv2/core/gpumat.hpp | 2 +- + modules/core/include/opencv2/core/operations.hpp | 4 ++-- + modules/core/src/gpumat.cpp | 2 +- + modules/core/src/matrix.cpp | 4 ++-- + modules/core/src/system.cpp | 8 ++++---- + modules/gpu/include/opencv2/gpu/gpu.hpp | 2 +- + modules/ocl/include/opencv2/ocl/ocl.hpp | 2 +- + modules/ocl/src/matrix_operations.cpp | 2 +- + modules/python/src2/cv2.cpp | 8 ++++---- + 10 files changed, 22 insertions(+), 22 deletions(-) -diff -Nur opencv-2.4.12.3.orig/modules/core/include/opencv2/core/core.hpp opencv-2.4.12.3/modules/core/include/opencv2/core/core.hpp ---- opencv-2.4.12.3.orig/modules/core/include/opencv2/core/core.hpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/core/include/opencv2/core/core.hpp 2016-04-03 00:10:50.455774144 +0200 -@@ -1290,7 +1290,7 @@ +diff --git a/modules/core/include/opencv2/core/core.hpp b/modules/core/include/opencv2/core/core.hpp +index 591d50a..5b4261e 100644 +--- a/modules/core/include/opencv2/core/core.hpp ++++ b/modules/core/include/opencv2/core/core.hpp +@@ -1290,7 +1290,7 @@ public: operator const _Tp*() const; _Tp* obj; //< the object pointer. @@ -20,7 +38,7 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/include/opencv2/core/core.hpp opencv }; template -@@ -1490,9 +1490,9 @@ +@@ -1490,9 +1490,9 @@ class CV_EXPORTS MatAllocator public: MatAllocator() {} virtual ~MatAllocator() {} @@ -32,7 +50,7 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/include/opencv2/core/core.hpp opencv }; /*! -@@ -1985,7 +1985,7 @@ +@@ -1985,7 +1985,7 @@ public: //! pointer to the reference counter; // when matrix points to user-allocated data, the pointer is NULL @@ -41,7 +59,7 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/include/opencv2/core/core.hpp opencv //! helper fields used in locateROI and adjustROI uchar* datastart; -@@ -3408,7 +3408,7 @@ +@@ -3449,7 +3449,7 @@ public: { Hdr(int _dims, const int* _sizes, int _type); void clear(); @@ -50,10 +68,11 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/include/opencv2/core/core.hpp opencv int dims; int valueOffset; size_t nodeSize; -diff -Nur opencv-2.4.12.3.orig/modules/core/include/opencv2/core/gpumat.hpp opencv-2.4.12.3/modules/core/include/opencv2/core/gpumat.hpp ---- opencv-2.4.12.3.orig/modules/core/include/opencv2/core/gpumat.hpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/core/include/opencv2/core/gpumat.hpp 2016-04-02 23:08:58.116874218 +0200 -@@ -301,7 +301,7 @@ +diff --git a/modules/core/include/opencv2/core/gpumat.hpp b/modules/core/include/opencv2/core/gpumat.hpp +index 68647d9..d488c27 100644 +--- a/modules/core/include/opencv2/core/gpumat.hpp ++++ b/modules/core/include/opencv2/core/gpumat.hpp +@@ -301,7 +301,7 @@ namespace cv { namespace gpu //! pointer to the reference counter; // when GpuMatrix points to user-allocated data, the pointer is NULL @@ -62,10 +81,11 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/include/opencv2/core/gpumat.hpp open //! helper fields used in locateROI and adjustROI uchar* datastart; -diff -Nur opencv-2.4.12.3.orig/modules/core/include/opencv2/core/operations.hpp opencv-2.4.12.3/modules/core/include/opencv2/core/operations.hpp ---- opencv-2.4.12.3.orig/modules/core/include/opencv2/core/operations.hpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/core/include/opencv2/core/operations.hpp 2016-04-02 23:12:59.148385306 +0200 -@@ -2589,7 +2589,7 @@ +diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp +index 0ae51c6..a455502 100644 +--- a/modules/core/include/opencv2/core/operations.hpp ++++ b/modules/core/include/opencv2/core/operations.hpp +@@ -2589,7 +2589,7 @@ template inline Ptr<_Tp>::Ptr(_Tp* _obj) : obj(_obj) { if(obj) { @@ -74,7 +94,7 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/include/opencv2/core/operations.hpp *refcount = 1; } else -@@ -2628,7 +2628,7 @@ +@@ -2628,7 +2628,7 @@ template inline Ptr<_Tp>& Ptr<_Tp>::operator = (const Ptr<_Tp>& _p { if (this != &_ptr) { @@ -83,10 +103,11 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/include/opencv2/core/operations.hpp if( _refcount ) CV_XADD(_refcount, 1); release(); -diff -Nur opencv-2.4.12.3.orig/modules/core/src/gpumat.cpp opencv-2.4.12.3/modules/core/src/gpumat.cpp ---- opencv-2.4.12.3.orig/modules/core/src/gpumat.cpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/core/src/gpumat.cpp 2016-04-02 23:14:38.894804300 +0200 -@@ -716,7 +716,7 @@ +diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp +index 9669191..0bd2568 100644 +--- a/modules/core/src/gpumat.cpp ++++ b/modules/core/src/gpumat.cpp +@@ -716,7 +716,7 @@ void cv::gpu::GpuMat::create(int _rows, int _cols, int _type) datastart = data = static_cast(devPtr); dataend = data + nettosize; @@ -95,10 +116,11 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/src/gpumat.cpp opencv-2.4.12.3/modul *refcount = 1; } } -diff -Nur opencv-2.4.12.3.orig/modules/core/src/matrix.cpp opencv-2.4.12.3/modules/core/src/matrix.cpp ---- opencv-2.4.12.3.orig/modules/core/src/matrix.cpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/core/src/matrix.cpp 2016-04-02 23:59:53.405491031 +0200 -@@ -213,7 +213,7 @@ +diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp +index 57abffc..7b840a0 100644 +--- a/modules/core/src/matrix.cpp ++++ b/modules/core/src/matrix.cpp +@@ -213,7 +213,7 @@ void Mat::create(int d, const int* _sizes, int _type) { size_t totalsize = alignSize(step.p[0]*size.p[0], (int)sizeof(*refcount)); data = datastart = (uchar*)fastMalloc(totalsize + (int)sizeof(*refcount)); @@ -107,7 +129,7 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/src/matrix.cpp opencv-2.4.12.3/modul *refcount = 1; } else -@@ -228,7 +228,7 @@ +@@ -228,7 +228,7 @@ void Mat::create(int d, const int* _sizes, int _type) allocator = 0; size_t totalSize = alignSize(step.p[0]*size.p[0], (int)sizeof(*refcount)); data = datastart = (uchar*)fastMalloc(totalSize + (int)sizeof(*refcount)); @@ -116,10 +138,11 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/src/matrix.cpp opencv-2.4.12.3/modul *refcount = 1; } #else -diff -Nur opencv-2.4.12.3.orig/modules/core/src/system.cpp opencv-2.4.12.3/modules/core/src/system.cpp ---- opencv-2.4.12.3.orig/modules/core/src/system.cpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/core/src/system.cpp 2016-04-02 23:33:19.298905578 +0200 -@@ -892,7 +892,7 @@ +diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp +index f5a1af2..9a7b262 100644 +--- a/modules/core/src/system.cpp ++++ b/modules/core/src/system.cpp +@@ -892,7 +892,7 @@ struct Mutex::Impl void unlock() { LeaveCriticalSection(&cs); } CRITICAL_SECTION cs; @@ -128,7 +151,7 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/src/system.cpp opencv-2.4.12.3/modul }; #ifndef __GNUC__ -@@ -920,7 +920,7 @@ +@@ -920,7 +920,7 @@ struct Mutex::Impl void unlock() { OSSpinLockUnlock(&sl); } OSSpinLock sl; @@ -137,7 +160,7 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/src/system.cpp opencv-2.4.12.3/modul }; #elif defined __linux__ && !defined ANDROID && !defined __LINUXTHREADS_OLD__ -@@ -935,7 +935,7 @@ +@@ -935,7 +935,7 @@ struct Mutex::Impl void unlock() { pthread_spin_unlock(&sl); } pthread_spinlock_t sl; @@ -146,7 +169,7 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/src/system.cpp opencv-2.4.12.3/modul }; #else -@@ -950,7 +950,7 @@ +@@ -950,7 +950,7 @@ struct Mutex::Impl void unlock() { pthread_mutex_unlock(&sl); } pthread_mutex_t sl; @@ -155,10 +178,11 @@ diff -Nur opencv-2.4.12.3.orig/modules/core/src/system.cpp opencv-2.4.12.3/modul }; #endif -diff -Nur opencv-2.4.12.3.orig/modules/gpu/include/opencv2/gpu/gpu.hpp opencv-2.4.12.3/modules/gpu/include/opencv2/gpu/gpu.hpp ---- opencv-2.4.12.3.orig/modules/gpu/include/opencv2/gpu/gpu.hpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/gpu/include/opencv2/gpu/gpu.hpp 2016-04-02 23:16:19.737293785 +0200 -@@ -125,7 +125,7 @@ +diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp +index de16982..266fa2f 100644 +--- a/modules/gpu/include/opencv2/gpu/gpu.hpp ++++ b/modules/gpu/include/opencv2/gpu/gpu.hpp +@@ -125,7 +125,7 @@ public: size_t step; uchar* data; @@ -167,10 +191,11 @@ diff -Nur opencv-2.4.12.3.orig/modules/gpu/include/opencv2/gpu/gpu.hpp opencv-2. uchar* datastart; uchar* dataend; -diff -Nur opencv-2.4.12.3.orig/modules/ocl/include/opencv2/ocl/ocl.hpp opencv-2.4.12.3/modules/ocl/include/opencv2/ocl/ocl.hpp ---- opencv-2.4.12.3.orig/modules/ocl/include/opencv2/ocl/ocl.hpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/ocl/include/opencv2/ocl/ocl.hpp 2016-04-02 23:18:55.715331443 +0200 -@@ -404,7 +404,7 @@ +diff --git a/modules/ocl/include/opencv2/ocl/ocl.hpp b/modules/ocl/include/opencv2/ocl/ocl.hpp +index e8eb3e8..5ea05fc 100644 +--- a/modules/ocl/include/opencv2/ocl/ocl.hpp ++++ b/modules/ocl/include/opencv2/ocl/ocl.hpp +@@ -404,7 +404,7 @@ namespace cv //! pointer to the reference counter; // when oclMatrix points to user-allocated data, the pointer is NULL @@ -179,10 +204,11 @@ diff -Nur opencv-2.4.12.3.orig/modules/ocl/include/opencv2/ocl/ocl.hpp opencv-2. //! helper fields used in locateROI and adjustROI //datastart and dataend are not used in current version -diff -Nur opencv-2.4.12.3.orig/modules/ocl/src/matrix_operations.cpp opencv-2.4.12.3/modules/ocl/src/matrix_operations.cpp ---- opencv-2.4.12.3.orig/modules/ocl/src/matrix_operations.cpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/ocl/src/matrix_operations.cpp 2016-04-02 23:19:23.633128033 +0200 -@@ -591,7 +591,7 @@ +diff --git a/modules/ocl/src/matrix_operations.cpp b/modules/ocl/src/matrix_operations.cpp +index 331e432..c61dca4 100644 +--- a/modules/ocl/src/matrix_operations.cpp ++++ b/modules/ocl/src/matrix_operations.cpp +@@ -591,7 +591,7 @@ void cv::ocl::oclMat::createEx(int _rows, int _cols, int _type, DevMemRW rw_type datastart = data = (uchar *)dev_ptr; dataend = data + nettosize; @@ -191,10 +217,11 @@ diff -Nur opencv-2.4.12.3.orig/modules/ocl/src/matrix_operations.cpp opencv-2.4. *refcount = 1; } } -diff -Nur opencv-2.4.12.3.orig/modules/python/src2/cv2.cpp opencv-2.4.12.3/modules/python/src2/cv2.cpp ---- opencv-2.4.12.3.orig/modules/python/src2/cv2.cpp 2015-10-26 08:56:34.000000000 +0100 -+++ opencv-2.4.12.3/modules/python/src2/cv2.cpp 2016-04-02 23:18:34.897991791 +0200 -@@ -157,12 +157,12 @@ +diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp +index 04cea39..40e5d43 100644 +--- a/modules/python/src2/cv2.cpp ++++ b/modules/python/src2/cv2.cpp +@@ -157,12 +157,12 @@ static PyObject* failmsgp(const char *fmt, ...) static size_t REFCOUNT_OFFSET = (size_t)&(((PyObject*)0)->ob_refcnt) + (0x12345678 != *(const size_t*)"\x78\x56\x34\x12\0\0\0\0\0")*sizeof(int); @@ -209,7 +236,7 @@ diff -Nur opencv-2.4.12.3.orig/modules/python/src2/cv2.cpp opencv-2.4.12.3/modul { return (int*)((size_t)obj + REFCOUNT_OFFSET); } -@@ -173,7 +173,7 @@ +@@ -173,7 +173,7 @@ public: NumpyAllocator() {} ~NumpyAllocator() {} @@ -218,7 +245,7 @@ diff -Nur opencv-2.4.12.3.orig/modules/python/src2/cv2.cpp opencv-2.4.12.3/modul uchar*& datastart, uchar*& data, size_t* step) { PyEnsureGIL gil; -@@ -206,7 +206,7 @@ +@@ -206,7 +206,7 @@ public: datastart = data = (uchar*)PyArray_DATA((PyArrayObject*) o); } @@ -227,3 +254,6 @@ diff -Nur opencv-2.4.12.3.orig/modules/python/src2/cv2.cpp opencv-2.4.12.3/modul { PyEnsureGIL gil; if( !refcount ) +-- +2.10.2 + From eaf9b5044a75ceca83f092c001dec2dc59d221b3 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 31 Oct 2016 16:19:18 +0000 Subject: [PATCH 1160/3392] linux-headers: bump 4.{4, 8}.x series Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e770a446a5..71d3f60c03 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -232,9 +232,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.35" if BR2_KERNEL_HEADERS_4_1 - default "4.4.28" if BR2_KERNEL_HEADERS_4_4 + default "4.4.29" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.10" if BR2_KERNEL_HEADERS_4_7 - default "4.8.5" if BR2_KERNEL_HEADERS_4_8 + default "4.8.6" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 9e45f6f3e8aed14dbf2551ec4e5e423330a79f73 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 31 Oct 2016 16:19:19 +0000 Subject: [PATCH 1161/3392] linux: bump default to version 4.8.6 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 268516f8e1..3f4097d93b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.5)" + bool "Latest version (4.8.6)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.5" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.6" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From dcf7a64b463cb418b963665f7a8bfdbdeda10f5f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 31 Oct 2016 16:31:23 +0000 Subject: [PATCH 1162/3392] git: bump version to 2.10.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 73bb9cb7df..0815641c10 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 a9c32df9061cfc2c194ecaa0357ba273c1f24a0dbf0d856b03dcedafcd0a4dc6 git-2.10.1.tar.xz +sha256 94802903dd707d85ca3b9a2be35e936a54ce86375f52c6a789efe7ce7e238671 git-2.10.2.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 8bc2907561..a7768ac53b 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.10.1 +GIT_VERSION = 2.10.2 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2 LGPLv2.1+ From 91081e2a6b8e0cc68de7ad1e41cb1fd06de7c0f0 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 31 Oct 2016 16:31:24 +0000 Subject: [PATCH 1163/3392] nano: bump version to 2.7.1 Signed-off-by: Vicente Olivert Riera 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 fc628eb734..cb411b7e6a 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 f86af39514ae74e20bef3c29cd01d1090a9aca772a70e9c9f9e70c3d14b39521 nano-2.7.0.tar.xz +sha256 df5cbe69831d7394c0a32fb27373ab313335ea4dc586d6f4be4081eb1de857cd nano-2.7.1.tar.xz diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 984a5fc662..88e3cdb952 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 2.7 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION = $(NANO_VERSION_MAJOR).1 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPLv3+ From fcb554d39dd3476557406023d18543063ce8442c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 31 Oct 2016 16:31:25 +0000 Subject: [PATCH 1164/3392] postgresql: bump version to 9.6.1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 5e73badec6..900a55a7ad 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,2 +1,2 @@ -# From https://ftp.postgresql.org/pub/source/v9.6.0/postgresql-9.6.0.tar.bz2.sha256 -sha256 3b5fe9634b80a4511aac1832a087586a7caa8c3413619562bdda009a015863ce postgresql-9.6.0.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v9.6.1/postgresql-9.6.1.tar.bz2.sha256 +sha256 e5101e0a49141fc12a7018c6dad594694d3a3325f5ab71e93e0e51bd94e51fcd postgresql-9.6.1.tar.bz2 diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 8290370ffa..d46e8c0ec8 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 9.6.0 +POSTGRESQL_VERSION = 9.6.1 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 898538efef6b67791a1bad7eacc47e67bdb48e31 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 31 Oct 2016 12:11:58 -0200 Subject: [PATCH 1165/3392] configs/imx28evk: Generate the standard sdcard.img Generate the standard sdcard.img format that can be directly copied to the SD card. Remove the custom create-boot-sd.sh script and update the readme.txt file accordingly. Signed-off-by: Fabio Estevam [Thomas: further tweaks to readme.txt.] Signed-off-by: Thomas Petazzoni --- board/freescale/imx28evk/create-boot-sd.sh | 97 ---------------------- board/freescale/imx28evk/genimage.cfg | 29 +++++++ board/freescale/imx28evk/post-image.sh | 14 ++++ board/freescale/imx28evk/readme.txt | 7 +- configs/freescale_imx28evk_defconfig | 10 +++ 5 files changed, 56 insertions(+), 101 deletions(-) delete mode 100755 board/freescale/imx28evk/create-boot-sd.sh create mode 100644 board/freescale/imx28evk/genimage.cfg create mode 100755 board/freescale/imx28evk/post-image.sh diff --git a/board/freescale/imx28evk/create-boot-sd.sh b/board/freescale/imx28evk/create-boot-sd.sh deleted file mode 100755 index bce221237c..0000000000 --- a/board/freescale/imx28evk/create-boot-sd.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -set -u -set -e - -PROGNAME=$(basename $0) - -usage() -{ - echo "Create an SD card that boots on an i.MX28 EVK board." - echo - echo "Note: all data on the the card will be completely deleted!" - echo "Use with care!" - echo "Superuser permissions may be required to write to the device." - echo - echo "Usage: ${PROGNAME} " - echo "Arguments:" - echo " The device to be written to" - echo - echo "Example: ${PROGNAME} /dev/mmcblk0" - echo -} - -if [ $# -ne 1 ]; then - usage - exit 1 -fi - -if [ $(id -u) -ne 0 ]; then - echo "${PROGNAME} must be run as root" - exit 1 -fi - -DEV=${1} - -# The partition name prefix depends on the device name: -# - /dev/sde -> /dev/sde1 -# - /dev/mmcblk0 -> /dev/mmcblk0p1 -if echo ${DEV}|grep -q mmcblk ; then - PART="p" -else - PART="" -fi - -PART1=${DEV}${PART}1 -PART2=${DEV}${PART}2 -PART3=${DEV}${PART}3 - -# Unmount the partitions if mounted -umount ${PART1} || true -umount ${PART2} || true -umount ${PART3} || true - -# First, clear the card -dd if=/dev/zero of=${DEV} bs=1M count=20 - -sync - -# Partition the card. -# SD layout for i.MX28 boot: -# - Special partition type 53 at sector 2048, containing an SD-SB-encapsulated u-boot -# - FAT partition containing zImage -# - ext2/3 partition formatted as ext2 or ext3, containing the root filesystem. -sfdisk --force -u S ${DEV} < + sudo dd if=output/images/sdcard.img of=/dev/ Boot the i.MX28 EVK board ========================= diff --git a/configs/freescale_imx28evk_defconfig b/configs/freescale_imx28evk_defconfig index a6384626d7..790c338251 100644 --- a/configs/freescale_imx28evk_defconfig +++ b/configs/freescale_imx28evk_defconfig @@ -22,3 +22,13 @@ BR2_TARGET_UBOOT_BOARDNAME="mx28evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_FORMAT_SD=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT4=y + +# To generate SD Image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/imx28evk/post-image.sh" From 006c7ab5c45e3fc42729dbe242a0418fb8133c82 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 31 Oct 2016 03:46:16 -0400 Subject: [PATCH 1166/3392] lttng-libust: bump to version 2.8.1 The two current patches are removed because they were merged upstream. The new patch is needed to build with uClibc. It was also submitted upstream, but not merged as is yet. Defining NT_GNU_BUILD_ID to 3 when it's not defined seems like it's something done in other projects. This definition's value should never change (number of the build ID note section in ELF objects). LTTng-UST now has its man pages written in AsciiDoc and they get converted to troff at build time. This is not needed in a Buildroot image anyway. Signed-off-by: Philippe Proulx Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...define-NT_GNU_BUILD_ID-if-not-define.patch | 34 +++++++++++++++++++ package/lttng-libust/lttng-libust.hash | 10 +++--- package/lttng-libust/lttng-libust.mk | 8 ++--- 3 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch diff --git a/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch b/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch new file mode 100644 index 0000000000..2e0c8b1da0 --- /dev/null +++ b/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch @@ -0,0 +1,34 @@ +From d400314757a8d5d52bd5722d263bfd5886bb6595 Mon Sep 17 00:00:00 2001 +From: Philippe Proulx +Date: Sat, 29 Oct 2016 13:32:57 -0400 +Subject: [PATCH] lttng-ust-elf.c: define NT_GNU_BUILD_ID if not defined + +On uClibc, NT_GNU_BUILD_ID is not defined, so we define it +manually in this case. + +Signed-off-by: Philippe Proulx +[Philippe: grabbed from this pull request: + https://github.com/lttng/lttng-ust/pull/39 +] +--- + liblttng-ust/lttng-ust-elf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c +index 5f27920..beaa7f3 100644 +--- a/liblttng-ust/lttng-ust-elf.c ++++ b/liblttng-ust/lttng-ust-elf.c +@@ -29,6 +29,10 @@ + + #define BUF_LEN 4096 + ++#ifndef NT_GNU_BUILD_ID ++# define NT_GNU_BUILD_ID 3 ++#endif ++ + /* + * Retrieve the nth (where n is the `index` argument) phdr (program + * header) from the given elf instance. +-- +2.9.3 + diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash index 1494acf64c..a4a2907477 100644 --- a/package/lttng-libust/lttng-libust.hash +++ b/package/lttng-libust/lttng-libust.hash @@ -1,6 +1,6 @@ -# http://www.lttng.org/files/lttng-ust/lttng-ust-2.7.1.tar.bz2.sha1 -sha1 597ebecb885debb58c263de57f30b1096d4eefc6 lttng-ust-2.7.1.tar.bz2 +# From http://lttng.org/files/lttng-ust/lttng-ust-2.8.1.tar.bz2.{md5,sha1} +md5 be505077245dc05f93370a565eec15f4 lttng-ust-2.8.1.tar.bz2 +sha1 8bebdcbcb453d2643fb226dbe92de61764f1ee3b lttng-ust-2.8.1.tar.bz2 -# Locally computed -sha1 2e79c98e458b2e052930fb81441e6ca8377a2ed7 787364e8bac9a146f9d65c763633c2b75eb76463.patch -sha1 cf77ec415111f77573be7917d9b62d8e49dc6304 30307a67b48641875b122d8f832bbfb454e95d92.patch +# Locally generated +sha256 6e41349107e83e7b43c69ed358e48788ca2fd095bad61737b850e3f3d2c0508a lttng-ust-2.8.1.tar.bz2 diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index 61ffed4287..feeeb4325d 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -5,17 +5,13 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.7.1 +LTTNG_LIBUST_VERSION = 2.8.1 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING - -LTTNG_LIBUST_PATCH = \ - https://github.com/lttng/lttng-ust/commit/787364e8bac9a146f9d65c763633c2b75eb76463.patch \ - https://github.com/lttng/lttng-ust/commit/30307a67b48641875b122d8f832bbfb454e95d92.patch - LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux +LTTNG_LIBUST_CONF_OPTS += --disable-man-pages ifeq ($(BR2_PACKAGE_PYTHON),y) LTTNG_LIBUST_DEPENDENCIES += python From 15ce62bbf33f1527b5553695d4641fba134dcd6c Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 31 Oct 2016 03:46:17 -0400 Subject: [PATCH 1167/3392] lttng-libust: enable Python agent when Python is available Add the --enable-python-agent configure option to build the LTTng-UST Python agent when Python 2 or Python 3 is also part of the BR image. The LTTng-UST Python agent is a Python package which adds LTTng tracing to Python's standard logging when imported. Disable the Python agent otherwise. Signed-off-by: Philippe Proulx Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/lttng-libust/lttng-libust.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index feeeb4325d..7a83f46421 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -15,10 +15,13 @@ LTTNG_LIBUST_CONF_OPTS += --disable-man-pages ifeq ($(BR2_PACKAGE_PYTHON),y) LTTNG_LIBUST_DEPENDENCIES += python +LTTNG_LIBUST_CONF_OPTS += --enable-python-agent else ifeq ($(BR2_PACKAGE_PYTHON3),y) LTTNG_LIBUST_DEPENDENCIES += python3 +LTTNG_LIBUST_CONF_OPTS += --enable-python-agent else LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none" +LTTNG_LIBUST_CONF_OPTS += --disable-python-agent endif $(eval $(autotools-package)) From effb200ceacb42675cedb857435651ff5e5d477d Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 31 Oct 2016 03:46:19 -0400 Subject: [PATCH 1168/3392] lttng-tools: remove dependency on host-lttng-babeltrace We don't need to build Babeltrace for the host here. Any host running a major Linux distribution can get a recent version of Babeltrace. See . Signed-off-by: Philippe Proulx Reviewed-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/lttng-tools/lttng-tools.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index e5b12079a8..3fb169166c 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -13,11 +13,7 @@ LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr # Patching configure.ac LTTNG_TOOLS_AUTORECONF = YES -# The host-lttng-babeltrace technically isn't a required build -# dependency. However, having the babeltrace utilities built for the -# host is very useful, since those tools allow to convert the binary -# trace format into an human readable format. -LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt host-lttng-babeltrace util-linux +LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) LTTNG_TOOLS_CONF_OPTS += --enable-lttng-ust From 83676c3117130ae6e738105937aed12a4a7715a3 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 31 Oct 2016 03:46:20 -0400 Subject: [PATCH 1169/3392] lttng-modules: bump to version 2.8.3 LTTng-modules, starting from v2.8, has a mechanism to be built directly into a Linux kernel image, that is, not as loadable kernel modules. For this the `CONFIG_LTTNG_CLOCK_PLUGIN_TEST` and `CONFIG_LTTNG` Make variables were introduced. They need to be explicitly set to `m` here to build the project as loadable kernel modules. Signed-off-by: Philippe Proulx Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/lttng-modules/lttng-modules.hash | 5 +++-- package/lttng-modules/lttng-modules.mk | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index 2d50287897..ce725ec51a 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,2 +1,3 @@ -# from http://lttng.org/files/lttng-tools/lttng-modules-2.7.1.tar.bz2.sha1 -sha1 38c42ec89b4966c7a4cc04aea75f5841634d8d66 lttng-modules-2.7.1.tar.bz2 +# From http://lttng.org/files/lttng-modules/lttng-modules-2.8.3.tar.bz2.{md5,sha1} +md5 424354c4834d20235dacd9a1fd7653b6 lttng-modules-2.8.3.tar.bz2 +sha1 862705784a54962f70226004f1fd0bf77f73f10f lttng-modules-2.8.3.tar.bz2 diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index 5d0c422b13..9ecf572d3a 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,11 +4,12 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.7.1 +LTTNG_MODULES_VERSION = 2.8.3 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 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE +LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $(eval $(kernel-module)) $(eval $(generic-package)) From 77be1aa5187f80fc02a55cb2173f3f1251043ca7 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Tue, 1 Nov 2016 07:55:34 -0700 Subject: [PATCH 1170/3392] qt5webchannel: use QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES Signed-off-by: Matt Kraai Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webchannel/qt5webchannel.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 9e94914b90..3865ced340 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -62,6 +62,7 @@ define QT5WEBCHANNEL_INSTALL_TARGET_CMDS $(QT5WEBCHANNEL_INSTALL_TARGET_LIBS) $(QT5WEBCHANNEL_INSTALL_TARGET_QMLS) $(QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT) + $(QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES) endef $(eval $(generic-package)) From 437d90f03796c56d7b2709c0af4e7d1f986d0202 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Tue, 1 Nov 2016 07:55:35 -0700 Subject: [PATCH 1171/3392] qt5websockets: use QT5WEBSOCKETS_INSTALL_TARGET_EXAMPLES Signed-off-by: Matt Kraai Signed-off-by: Thomas Petazzoni --- package/qt5/qt5websockets/qt5websockets.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index f1200c283a..609b68e4e7 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -56,6 +56,7 @@ endif define QT5WEBSOCKETS_INSTALL_TARGET_CMDS $(QT5WEBSOCKETS_INSTALL_TARGET_LIBS) $(QT5WEBSOCKETS_INSTALL_TARGET_QMLS) + $(QT5WEBSOCKETS_INSTALL_TARGET_EXAMPLES) endef $(eval $(generic-package)) From fa921541902751b3cc3355ac4ea8f66ada18e91f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Oct 2016 14:25:11 +0100 Subject: [PATCH 1172/3392] binutils: add comment with bug report reference Add requested bug report Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index a7610b447c..dce699621d 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -18,6 +18,7 @@ choice config BR2_BINUTILS_VERSION_2_27_X bool "binutils 2.27" # supported but broken on Microblaze + # see https://sourceware.org/bugzilla/show_bug.cgi?id=20748 depends on !BR2_microblaze endchoice From bcb98949a6850e14431780ba53197f70f5f30401 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 30 Oct 2016 18:29:18 +0100 Subject: [PATCH 1173/3392] package/libfribidi: remove optional dependency to libglib Fixes vdr compile error: http://autobuild.buildroot.net/results/725/7252decffe29e19051eed0554786651aee216573/ Instead of fixing fribidi.pc or adding optional CFLAGS to the vdr package we remove the optional libglib dependency because it does not contain "any thing substantial" as pointed out in an pull request sent upstream: https://github.com/behdad/fribidi/pull/14 Signed-off-by: Bernd Kuhls Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/libfribidi/libfribidi.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index 4e82a5e4df..86e722a211 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -14,11 +14,9 @@ LIBFRIBIDI_INSTALL_STAGING = YES # Run autoreconf to regenerate ltmain.sh. LIBFRIBIDI_AUTORECONF = YES LIBFRIBIDI_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -LIBFRIBIDI_DEPENDENCIES += libglib2 -else -LIBFRIBIDI_CONF_OPTS += --with-glib=no -endif +# libglib2 dependency causes a build failure, and this optional +# dependency is going to be removed usptream, see +# https://github.com/behdad/fribidi/pull/14 +LIBFRIBIDI_CONF_OPTS = --with-glib=no $(eval $(autotools-package)) From 5349756f70fd82f05a753de1fa40e4fcf757cb9b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 30 Oct 2016 21:10:00 +0100 Subject: [PATCH 1174/3392] motion: fix static link with gnutls base64_encode is already defined in gnutls so rename it as motion_base64_encode to prevent a definition clash when linking statically with gnutls Fixes: - http://autobuild.buildroot.org/results/592672b8826f4c731c50d29725da964d876573c4 Signed-off-by: Fabrice Fontaine Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- .../motion/0002-Rename-base64_encode.patch | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 package/motion/0002-Rename-base64_encode.patch diff --git a/package/motion/0002-Rename-base64_encode.patch b/package/motion/0002-Rename-base64_encode.patch new file mode 100644 index 0000000000..8b06309252 --- /dev/null +++ b/package/motion/0002-Rename-base64_encode.patch @@ -0,0 +1,116 @@ +From 0da5428bdfe67eb17ee03f22f68e66b044abdf70 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 30 Oct 2016 19:30:46 +0100 +Subject: [PATCH] Rename base64_encode + +base64_encode is already defined in gnutls so rename it as +motion_base64_encode to prevent a definition clash when linking +statically with gnutls + +Fixes: + - http://autobuild.buildroot.org/results/592672b8826f4c731c50d29725da964d876573c4 + +Applied upstream: + - https://github.com/Motion-Project/motion/commit/cc3c25527d4bada0fe98a734fa2df29f8d6cf1ad + +Signed-off-by: Fabrice Fontaine +--- + netcam.c | 4 ++-- + netcam_wget.c | 4 ++-- + netcam_wget.h | 2 +- + stream.c | 4 ++-- + webhttpd.c | 4 ++-- + 5 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/netcam.c b/netcam.c +index a9df33a..38d4ca3 100644 +--- a/netcam.c ++++ b/netcam.c +@@ -2019,7 +2019,7 @@ static int netcam_http_build_url(netcam_context_ptr netcam, struct url_t *url) + else + ptr = url->userpass; + +- /* base64_encode needs up to 3 additional chars. */ ++ /* motion_base64_encode needs up to 3 additional chars. */ + if (ptr) { + userpass = mymalloc(strlen(ptr) + 3); + strcpy(userpass, ptr); +@@ -2045,7 +2045,7 @@ static int netcam_http_build_url(netcam_context_ptr netcam, struct url_t *url) + /* Allocate space for the base64-encoded string. */ + encuserpass = mymalloc(BASE64_LENGTH(strlen(userpass)) + 1); + /* Fill in the value. */ +- base64_encode(userpass, encuserpass, strlen(userpass)); ++ motion_base64_encode(userpass, encuserpass, strlen(userpass)); + /* Now create the last part (authorization) of the request. */ + request_pass = mymalloc(strlen(connect_auth_req) + + strlen(encuserpass) + 1); +diff --git a/netcam_wget.c b/netcam_wget.c +index 4491760..f5c1dc2 100644 +--- a/netcam_wget.c ++++ b/netcam_wget.c +@@ -210,13 +210,13 @@ int skip_lws(const char *string) + + + /** +- * base64_encode ++ * motion_base64_encode + * + * Encode the string S of length LENGTH to base64 format and place it + * to STORE. STORE will be 0-terminated, and must point to a writable + * buffer of at least 1+BASE64_LENGTH(length) bytes. + */ +-void base64_encode(const char *s, char *store, int length) ++void motion_base64_encode(const char *s, char *store, int length) + { + /* Conversion table. */ + static const char tbl[64] = { +diff --git a/netcam_wget.h b/netcam_wget.h +index 9a091bf..e9b02b5 100644 +--- a/netcam_wget.h ++++ b/netcam_wget.h +@@ -72,7 +72,7 @@ int rbuf_read_bufferful(netcam_context_ptr); + /* How many bytes it will take to store LEN bytes in base64. */ + #define BASE64_LENGTH(len) (4 * (((len) + 2) / 3)) + +-void base64_encode(const char *, char *, int); ++void motion_base64_encode(const char *, char *, int); + char *strdupdelim(const char *, const char *); + int http_process_type(const char *, void *); + +diff --git a/stream.c b/stream.c +index 04e67ee..ca201ac 100644 +--- a/stream.c ++++ b/stream.c +@@ -211,10 +211,10 @@ static void* handle_basic_auth(void* param) + + authentication = mymalloc(BASE64_LENGTH(auth_size) + 1); + userpass = mymalloc(auth_size + 4); +- /* base64_encode can read 3 bytes after the end of the string, initialize it. */ ++ /* motion_base64_encode can read 3 bytes after the end of the string, initialize it. */ + memset(userpass, 0, auth_size + 4); + strcpy(userpass, p->conf->stream_authentication); +- base64_encode(userpass, authentication, auth_size); ++ motion_base64_encode(userpass, authentication, auth_size); + free(userpass); + + if (strcmp(auth, authentication)) { +diff --git a/webhttpd.c b/webhttpd.c +index 6df2d11..36e8beb 100644 +--- a/webhttpd.c ++++ b/webhttpd.c +@@ -2616,10 +2616,10 @@ void httpd_run(struct context **cnt) + + authentication = mymalloc(BASE64_LENGTH(auth_size) + 1); + userpass = mymalloc(auth_size + 4); +- /* base64_encode can read 3 bytes after the end of the string, initialize it */ ++ /* motion_base64_encode can read 3 bytes after the end of the string, initialize it */ + memset(userpass, 0, auth_size + 4); + strcpy(userpass, cnt[0]->conf.webcontrol_authentication); +- base64_encode(userpass, authentication, auth_size); ++ motion_base64_encode(userpass, authentication, auth_size); + free(userpass); + } + +-- +2.5.0 + From db7b1040dcd0c2a24b65cbe94518d16d00f16ba7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 30 Oct 2016 22:47:33 +0100 Subject: [PATCH 1175/3392] gupnp-tools: fix when using latest gupnp-av Include gupnp.h ourselves, gupnp-av.h doesn't drag it in anymore Backported from: e9ec9634207e4c2eea6d268ee29b57e687c1f178 The patch retrieved from the official gnome URL (https://git.gnome.org/browse/gupnp-tools/patch/?id=e9ec9634207e4c2eea6d268ee29b57e687c1f178) can not be applied through GUPNP_TOOLS_PATCH as it does not end with the '.patch*' pattern Fixes: - http://autobuild.buildroot.org/results/329851daa060f23c55f996c1b0f323d41f85ccb2 Signed-off-by: Fabrice Fontaine Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...compiling-when-using-recent-GUPnP-AV.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/gupnp-tools/0001-Fix-compiling-when-using-recent-GUPnP-AV.patch diff --git a/package/gupnp-tools/0001-Fix-compiling-when-using-recent-GUPnP-AV.patch b/package/gupnp-tools/0001-Fix-compiling-when-using-recent-GUPnP-AV.patch new file mode 100644 index 0000000000..6d3769fbe4 --- /dev/null +++ b/package/gupnp-tools/0001-Fix-compiling-when-using-recent-GUPnP-AV.patch @@ -0,0 +1,27 @@ +From e9ec9634207e4c2eea6d268ee29b57e687c1f178 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sun, 16 Oct 2016 21:51:39 +0200 +Subject: av-cp: Fix compiling when using recent GUPnP-AV + +Include gupnp.h ourselves, gupnp-av.h doesn't drag it in anymore + +Signed-off-by: Jens Georg +--- + src/av-cp/playlist-treeview.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/av-cp/playlist-treeview.h b/src/av-cp/playlist-treeview.h +index 8637ae8..16b131e 100644 +--- a/src/av-cp/playlist-treeview.h ++++ b/src/av-cp/playlist-treeview.h +@@ -23,6 +23,8 @@ + + #include + #include ++ ++#include + #include + + typedef void (* MetadataFunc) (const char *metadata, +-- +cgit v0.12 From 92fa50ae5107a5b3999a91dc2e3775582aaf6878 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Oct 2016 21:14:22 +0200 Subject: [PATCH 1176/3392] package/transmission: fix SITE url Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/transmission/transmission.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index e0cfc2d33a..923ba409d3 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -5,7 +5,7 @@ ################################################################################ TRANSMISSION_VERSION = 2.92 -TRANSMISSION_SITE = http://download.transmissionbt.com/files +TRANSMISSION_SITE = https://github.com/transmission/transmission-releases/raw/master TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz TRANSMISSION_DEPENDENCIES = \ host-pkgconf \ From b474c3bdf7f923eb19acfdd2e28c26808b3f15d3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 1 Nov 2016 16:38:49 +0100 Subject: [PATCH 1177/3392] lftp: add patch to fix gcc 6.x build issue Fixes: http://autobuild.buildroot.net/results/e1e597300ed5b9bf12ceffe028d5f2687a6f07cd/ Signed-off-by: Thomas Petazzoni --- .../0002-fix-gcc-6-conflicts-signbit.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/lftp/0002-fix-gcc-6-conflicts-signbit.patch diff --git a/package/lftp/0002-fix-gcc-6-conflicts-signbit.patch b/package/lftp/0002-fix-gcc-6-conflicts-signbit.patch new file mode 100644 index 0000000000..e906c7ac80 --- /dev/null +++ b/package/lftp/0002-fix-gcc-6-conflicts-signbit.patch @@ -0,0 +1,57 @@ +Use instead of to fix gcc 6.x build + +This patch fixes the following build issue: + +../lib/math.h:2577:1: error: ‘int signbit(float)’ conflicts with a previous declaration + +that occurs with gcc 6.x. + +Patch taken from +https://raw.githubusercontent.com/openembedded/meta-openembedded/master/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch + +Signed-off-by: Thomas Petazzoni + +--- lftp-4.6.3a/src/NetAccess.cc.orig 2016-06-18 10:25:51.063358981 -0400 ++++ lftp-4.6.3a/src/NetAccess.cc 2016-06-18 10:26:04.143359209 -0400 +@@ -21,7 +21,7 @@ + + #include + #include +-#include ++#include + #include + + #include "NetAccess.h" +--- lftp-4.6.3a/src/Speedometer.cc.orig 2016-06-18 10:24:58.895358073 -0400 ++++ lftp-4.6.3a/src/Speedometer.cc 2016-06-18 10:25:10.879358281 -0400 +@@ -18,7 +18,7 @@ + */ + + #include +-#include ++#include + #include + #include "Speedometer.h" + #include "misc.h" +--- lftp-4.6.3a/src/FileCopy.cc.orig 2016-06-18 10:24:15.939357325 -0400 ++++ lftp-4.6.3a/src/FileCopy.cc 2016-06-18 10:24:24.583357475 -0400 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "FileCopy.h" + #include "url.h" +--- lftp-4.6.3a/src/ResMgr.cc.orig 2016-06-18 10:23:31.387356549 -0400 ++++ lftp-4.6.3a/src/ResMgr.cc 2016-06-18 10:23:41.771356729 -0400 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include From af413afff382e49d3e2dba6e6495213d07f6145d Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 1 Nov 2016 17:09:58 +0100 Subject: [PATCH 1178/3392] configs: freescale_imx*: bump to version 4.1.15_2.0.0_ga This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-freescale/commit/f4e7a140 https://github.com/Freescale/meta-freescale/commit/d4c994cb https://github.com/Freescale/meta-freescale/commit/7ad6dcc3 Signed-off-by: Gary Bisson Cc: Fabio Estevam Reviewed-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/freescale_imx6dlsabreauto_defconfig | 6 +++--- configs/freescale_imx6dlsabresd_defconfig | 6 +++--- configs/freescale_imx6qsabreauto_defconfig | 6 +++--- configs/freescale_imx6qsabresd_defconfig | 6 +++--- configs/freescale_imx6sololiteevk_defconfig | 6 +++--- configs/freescale_imx6sxsabresd_defconfig | 6 +++--- configs/freescale_imx6ulevk_defconfig | 6 +++--- configs/freescale_imx7dsabresd_defconfig | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 8eb3632784..ed5f67cab2 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -14,8 +14,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" @@ -36,4 +36,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 7e42faa698..0cbe974477 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -14,8 +14,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" @@ -35,4 +35,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 4536dc4ea0..9ae2f813e7 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -14,8 +14,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" @@ -36,4 +36,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index 4191e99a24..913a724212 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -14,8 +14,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" @@ -36,4 +36,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig index fa83f0ca82..79ebcb83c2 100644 --- a/configs/freescale_imx6sololiteevk_defconfig +++ b/configs/freescale_imx6sololiteevk_defconfig @@ -11,8 +11,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk" @@ -32,4 +32,4 @@ BR2_TARGET_UBOOT_BOARDNAME="mx6slevk" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 9f8df63d22..fed1a3e08a 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -14,8 +14,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" @@ -34,5 +34,5 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_TARGET_UBOOT_FORMAT_IMX=y diff --git a/configs/freescale_imx6ulevk_defconfig b/configs/freescale_imx6ulevk_defconfig index fb860b5607..d033b9950c 100644 --- a/configs/freescale_imx6ulevk_defconfig +++ b/configs/freescale_imx6ulevk_defconfig @@ -11,8 +11,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.1_patch" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-14x14-evk" @@ -22,7 +22,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ul_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.1.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_TARGET_UBOOT_FORMAT_IMX=y # required tools to create the microSD image diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 311f8acaae..4bedef10be 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -11,8 +11,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.0.0_ga" +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" @@ -26,7 +26,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_1.0.0_ga" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_TARGET_UBOOT_FORMAT_IMX=y # required tools to create the microSD image From e95190db7c9a7093ab0978f3ce327f4d6d5afd03 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 1 Nov 2016 17:09:59 +0100 Subject: [PATCH 1179/3392] imx-vpu: bump to version 5.4.35 Changelog: Coverity fixes for resources leaks, null dereference, string overflows and checking return. This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-freescale/commit/b138b5b0 Implicitly tested through gstreamer as the plugins rely on it: # gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm # gst-launch-1.0 filesrc location=/root/tears_of_steel_1080p.webm ! \ matroskademux ! imxvpudec ! imxipuvideosink Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-vpu/imx-vpu.hash | 2 +- package/freescale-imx/imx-vpu/imx-vpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-vpu/imx-vpu.hash b/package/freescale-imx/imx-vpu/imx-vpu.hash index 67ebaf2314..b3d617ded9 100644 --- a/package/freescale-imx/imx-vpu/imx-vpu.hash +++ b/package/freescale-imx/imx-vpu/imx-vpu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 2e670ef2337a5dbe6c32fa07128ad9aad32afdbf472c23d44133245ec6a66d46 imx-vpu-5.4.33.bin +sha256 e1d6550426dfc59e4fd0352f1d312ea7eff5dcf18974f923ed7a85007cb40e27 imx-vpu-5.4.35.bin diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk index 09ff5a80a6..0b464d854d 100644 --- a/package/freescale-imx/imx-vpu/imx-vpu.mk +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_VERSION = 5.4.33 +IMX_VPU_VERSION = 5.4.35 IMX_VPU_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin From 8700d722942bcc68947dc100b908281cc5ee7f7b Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 1 Nov 2016 17:10:00 +0100 Subject: [PATCH 1180/3392] imx-gpu-viv: bump to version 5.0.11.p8.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug Fixes for P8.6 Graphics includes: 3D: MGS-2239 Destroy EGL window surface and makecurrent new surface cause segmentation fault 3D: MGS-2237 [6Q-SDB] FB met GPU STATE DUMP when testing ES30 Conformance 100% 3D: MGS-2101 EGLImage created with an OpenVG parent image always returns EGL_BAD_ACCESS 3D: MGS-2086 Met GPU dump when do driver test under dvfs stress test 3D: MGS-2150 optimized vertex copy for attribute upload 3D: MGS-2100 CubeMap sub-texture copy disappears when small size and small x/y offset 3D: MA-8321 testTextureViewStress200Hz fail on kk4.4.3_2.0.1 with GPU 5.0.11p8 3D: MA-8302 testOpenGlEsVersion fail on kk4.4.3_2.0.1 with GPU 5.0.11p8 3D: MA-8300 Fix antutu3.0.3 2D/3D performance downgrade 3D: MA-8104 fix Antutu6.x benchmark 3D not supported issue 3D: MA-8110 Change NOTIFY_OK to NOTIFY_DONE in task_notify_func. 3D: MGS-1851 fix the integer id resource leak 3D: MGS-1845 refine es11 extension 3D: MGS-1717 display no output when use gplay to do loopback test Compiler: MGS-1948 Fix UBO in shader can not support by new bsp release. 2D-VG: MGS-2154 VG kernel driver Allocate and Free wrong memory type 2D-VG: MGS-2089 fix gc355 vg freeze with interrupt signal 2D-VG: MGS-2084 fix vg pbuffer memory leak 2D-VG: MGS-1756 Portability issue: OpenVG includes "malloc.h" instead of "stdlib.h" for malloc() function 2D: MA-8378 Refine g2d and gpu helper functions. 2D: MGS-1847 fix G2D build broken with g2dBUILD_FOR_VIVANTE=1 General: MGS-2243 Fix high impact Coverity issue in GPU kernel driver General: MGS-2233 fix gpu axi bus error with process kill operations General: MGS-2188 Fix misleading indents causing errors in gcc6 General: MGS-1624 QNX - port gmem_info tool General: MGS-1630-1 5.0.11.p8 driver can't pass build with kernel 4.1 on Android M6.0 This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-freescale/commit/de26bc15 This package has been tested with both X11 and Framebuffer backends: # cd /usr/share/examples/viv_samples/vdk/ # apitrace trace --api egl ./tutorial7 # gmem_info ... display memory use per PID ... # apitrace replay tutorial7.trace # eglretrace tutorial7.trace Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash | 2 +- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index f94d31485a..6c526c5876 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1 +1 @@ -sha256 8f79ce562d8ac1efb0a2af403b405541f98c55ae1631a18a3d7fad3224dfb44b imx-gpu-viv-5.0.11.p8.4-hfp.bin +sha256 caaabd59a259e29aa5b7f9d1d7f3fe71cff9336ba44904485d258baef276351f imx-gpu-viv-5.0.11.p8.6-hfp.bin diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index c7b1d9c809..961f574c8b 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_GPU_VIV_VERSION = 5.0.11.p8.4-hfp +IMX_GPU_VIV_VERSION = 5.0.11.p8.6-hfp IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin From 8182b741b021616beea06c927e4b199e18869675 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 1 Nov 2016 17:10:01 +0100 Subject: [PATCH 1181/3392] xdriver_xf86-video-imx-viv: bump version to 5.0.11.p8.6 This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-freescale/commit/0c40332c The following xorg.conf was used in order to force the use of the vivante module: https://github.com/Freescale/meta-fsl-arm/blob/master/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf Note that the X server must be started with the "noreset" option to avoid crashes when closing X apps. Tested with: # X -noreset & # cd /usr/share/examples/viv_samples/vdk/ # DISPLAY=:0 ./tutorial7 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash | 2 +- .../xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash index 2cdf2d0b3b..7d7da84e6b 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash @@ -1 +1 @@ -sha256 ddb6de9e00ce0b22f6c905eaf6694424413eade53ef6cd3b36e20ac99dcc0e0f xserver-xorg-video-imx-viv-5.0.11.p8.4.tar.gz +sha256 3eed38193e31bb5ba8d2c817bd9b4f6e2fe7540d2cab36de9098cb4f11946a9f xserver-xorg-video-imx-viv-5.0.11.p8.6.tar.gz diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk index 9ce08ef55f..2a3e99745a 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = 5.0.11.p8.4 +XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = 5.0.11.p8.6 XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(FREESCALE_IMX_SITE) XDRIVER_XF86_VIDEO_IMX_VIV_SOURCE = xserver-xorg-video-imx-viv-$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION).tar.gz XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv xserver_xorg-server \ From 47b16341e10c512164156f2d0e9f342238d0254f Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 1 Nov 2016 17:10:02 +0100 Subject: [PATCH 1182/3392] kernel-module-imx-gpu-viv: bump version to 5.0.11.p8.6 This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-freescale/commit/51148d70 This package has been tested with the following commands: # modprobe galcore # cd /usr/share/examples/viv_samples/vdk/ # ./tutorial7 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash | 2 +- .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash index 6d810eaf54..9c43ea39e7 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash @@ -1,2 +1,2 @@ # locally computed -sha256 6618b36baefd591e94a41167fa50d325c3df473918bceef027ca5a067aa1cffd kernel-module-imx-gpu-viv-aa83874b916cf5655cb90498b1ea5691537fdbc8.tar.gz +sha256 51dd137bd67ae991fa58fff4151c6bd7dd46bafd613f43e83d8403ec37217a90 kernel-module-imx-gpu-viv-bfa78b095a892705a09afe9514fc5d236b3124d2.tar.gz diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk index 11c67684de..bcbd8d2532 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KERNEL_MODULE_IMX_GPU_VIV_VERSION = aa83874b916cf5655cb90498b1ea5691537fdbc8 +KERNEL_MODULE_IMX_GPU_VIV_VERSION = bfa78b095a892705a09afe9514fc5d236b3124d2 KERNEL_MODULE_IMX_GPU_VIV_SITE = \ $(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION)) KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPLv2 From 5852fd53de9384e369e558b1d4723e1e28052166 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 1 Nov 2016 17:10:03 +0100 Subject: [PATCH 1183/3392] imx-codec: bump to version 4.1.4 Changelog - Upgrade license chksum to v14 EULA - Check for lib_src_ppp_arm11_elinux.so library before removing - Fixes for error hadling and robustness This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-freescale/commit/78856879 Implicitly tested through gstreamer as the 0.10 plugin relies on it: # gst-launch-1.0 playbin uri=file:///root/tears_of_steel_1080p.webm Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-codec/imx-codec.hash | 2 +- package/freescale-imx/imx-codec/imx-codec.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-codec/imx-codec.hash b/package/freescale-imx/imx-codec/imx-codec.hash index 39bddc169e..2bb7a242e9 100644 --- a/package/freescale-imx/imx-codec/imx-codec.hash +++ b/package/freescale-imx/imx-codec/imx-codec.hash @@ -1,2 +1,2 @@ # locally computed -sha256 62bda182143cde9743cba0eb2a1c315a53cb434294605742f9fc364219958888 imx-codec-4.0.9.bin +sha256 98fe71cb44f7e858c64c5eda81741ed02f40afaadc3d4ed1e693c7d1e684b81d imx-codec-4.1.4.bin diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk index 48408728a4..911ad8b1b0 100644 --- a/package/freescale-imx/imx-codec/imx-codec.mk +++ b/package/freescale-imx/imx-codec/imx-codec.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_CODEC_VERSION = 4.0.9 +IMX_CODEC_VERSION = 4.1.4 IMX_CODEC_SITE = $(FREESCALE_IMX_SITE) IMX_CODEC_SOURCE = imx-codec-$(IMX_CODEC_VERSION).bin IMX_CODEC_INSTALL_STAGING = YES From 3761678a6eb84a97bb90931bea838e503ec63a0f Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 1 Nov 2016 17:10:04 +0100 Subject: [PATCH 1184/3392] imx-parser: bump to version 4.1.4 Changelog: - Update license checksum to align to EULA - Updates for coverity, memory leaks, corrupted content This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-freescale/commit/4bbd9dc4 Implicitly tested through gstreamer as the 0.10 plugin relies on it: # gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-parser/imx-parser.hash | 2 +- package/freescale-imx/imx-parser/imx-parser.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-parser/imx-parser.hash b/package/freescale-imx/imx-parser/imx-parser.hash index 2193c66f4d..f6e82338aa 100644 --- a/package/freescale-imx/imx-parser/imx-parser.hash +++ b/package/freescale-imx/imx-parser/imx-parser.hash @@ -1,2 +1,2 @@ # locally computed -sha256 1bec0101843db2e95d61e3dbe9e35172d874e54be19cc5d8bf72a735d5e3236f imx-parser-4.0.9.bin +sha256 d3a03e60780bbbd0c92932f60bd34d2fe14ffecf6aa6b810723c3edf798cad1f imx-parser-4.1.4.bin diff --git a/package/freescale-imx/imx-parser/imx-parser.mk b/package/freescale-imx/imx-parser/imx-parser.mk index e5797899b9..a57647c03b 100644 --- a/package/freescale-imx/imx-parser/imx-parser.mk +++ b/package/freescale-imx/imx-parser/imx-parser.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_PARSER_VERSION = 4.0.9 +IMX_PARSER_VERSION = 4.1.4 IMX_PARSER_SITE = $(FREESCALE_IMX_SITE) IMX_PARSER_SOURCE = imx-parser-$(IMX_PARSER_VERSION).bin IMX_PARSER_INSTALL_STAGING = YES From 4888778b69a9149f9b18bb5cec09d68f5c247e7e Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 1 Nov 2016 17:10:05 +0100 Subject: [PATCH 1185/3392] imx-vpuwrap: bump to version 1.0.68 Changelog: - Coverity fixes for checkign return values, unused values, null checking - H.263 encoder invalid frame rate This patch is based on the Yocto equivalent: https://github.com/Freescale/meta-freescale/commit/fd160ae9 Implicitly tested through gstreamer as the 0.10 plugin relies on it: # gst-launch-0.10 playbin uri=file:///root/tears_of_steel_1080p.webm Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash | 2 +- package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash index 42b97a10c4..2999984d2c 100644 --- a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash +++ b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash @@ -1,2 +1,2 @@ # locally computed -sha256 ddeacb7d9cb26c8864374df6d3f090aad47cd2ae409c2b9c817b773447252d61 imx-vpuwrap-1.0.65.bin +sha256 282e7f8766ce385d8752bd29f04ddeff709ece0846be97547cf982183bbe241e imx-vpuwrap-1.0.68.bin diff --git a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk index da0e32c46c..7cbf7784c9 100644 --- a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk +++ b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPUWRAP_VERSION = 1.0.65 +IMX_VPUWRAP_VERSION = 1.0.68 IMX_VPUWRAP_SITE = $(FREESCALE_IMX_SITE) IMX_VPUWRAP_SOURCE = imx-vpuwrap-$(IMX_VPUWRAP_VERSION).bin IMX_VPUWRAP_DEPENDENCIES = imx-vpu From adec13992ce2ee333353bac71faef18ea22f7974 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 1 Nov 2016 21:19:44 +0100 Subject: [PATCH 1186/3392] DEVELOPERS: add Sam Bobroff as PowerPC-interested person This will allow Sam to receive PowerPC64(le) related build failures. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d0a51da3fb..5b3a986bf4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1285,6 +1285,7 @@ F: package/qdecoder/ F: package/qlibc/ N: Sam Bobroff +F: arch/Config.in.powerpc F: package/librtas/ N: Samuel Martin From 57d5012c656710f0b11bd31d0259386aad2ece5f Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 2 Nov 2016 09:59:11 +0100 Subject: [PATCH 1187/3392] DEVELOPERS: add entry for xdriver_xf86-video-imx-viv Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5b3a986bf4..d89bc03f9d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -536,6 +536,7 @@ F: package/gstreamer1/gst1-imx/ F: package/libimxvpuapi/ F: package/mfgtools/ F: package/sshpass/ +F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Geoff Levand F: package/flannel/ From 964c620ae9ae758ffb357eac648dc22aa20ea552 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 2 Nov 2016 10:01:36 +0100 Subject: [PATCH 1188/3392] sshpass: bump version to 1.06 Changelog: - Add -P for overriding the password prompt we search for - Add -v for verbose logging of the prompt detection prompt. - Allow packagers and compilers to change the default password prompt. - When giving -V, also print the default password prompt. Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/sshpass/sshpass.hash | 2 +- package/sshpass/sshpass.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sshpass/sshpass.hash b/package/sshpass/sshpass.hash index 12871e1ca8..f6e0611c2f 100644 --- a/package/sshpass/sshpass.hash +++ b/package/sshpass/sshpass.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 c3f78752a68a0c3f62efb3332cceea0c8a1f04f7cf6b46e00ec0c3000bc8483e sshpass-1.05.tar.gz +sha256 c6324fcee608b99a58f9870157dfa754837f8c48be3df0f5e2f3accf145dee60 sshpass-1.06.tar.gz diff --git a/package/sshpass/sshpass.mk b/package/sshpass/sshpass.mk index 7344ca6921..de46604812 100644 --- a/package/sshpass/sshpass.mk +++ b/package/sshpass/sshpass.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSHPASS_VERSION = 1.05 +SSHPASS_VERSION = 1.06 SSHPASS_SITE = http://downloads.sourceforge.net/project/sshpass/sshpass/$(SSHPASS_VERSION) SSHPASS_LICENSE = GPLv2+ SSHPASS_LICENSE_FILES = COPYING From dac9e45b5fa1faa1bbdab9a89c48c9f24d45aa45 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Wed, 2 Nov 2016 10:17:43 +0100 Subject: [PATCH 1189/3392] board/boundarydevices: remove u-boot from genimage.cfg Adding a comment to explain how to update the bootloader since it is located in NOR flash memory. Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- board/boundarydevices/common/genimage.cfg | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/board/boundarydevices/common/genimage.cfg b/board/boundarydevices/common/genimage.cfg index 7a5e71e58a..a383fb750c 100644 --- a/board/boundarydevices/common/genimage.cfg +++ b/board/boundarydevices/common/genimage.cfg @@ -1,13 +1,15 @@ +# Minimal SD card image for Boundary Devices platforms +# +# It does not need a boot section for a bootloader since it is booted +# from its NOR flash memory. +# +# To update the bootloader, execute the following from U-Boot prompt: +# => run upgradeu + image sdcard.img { hdimage { } - partition u-boot { - in-partition-table = "no" - image = "u-boot.imx" - offset = 1024 - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" From afdb102bd5a9bc35dde2fe0309da88f0d89210d3 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 2 Nov 2016 11:52:31 +0000 Subject: [PATCH 1190/3392] libcurl: bump version to 7.51.0 (security) List of fixed CVEs: CVE-2016-8615: cookie injection for other servers CVE-2016-8616: case insensitive password comparison CVE-2016-8617: OOB write via unchecked multiplication CVE-2016-8618: double-free in curl_maprintf CVE-2016-8619: double-free in krb5 code CVE-2016-8620: glob parser write/read out of bounds CVE-2016-8621: curl_getdate read out of bounds CVE-2016-8622: URL unescape heap overflow via integer truncation CVE-2016-8623: Use-after-free via shared cookies CVE-2016-8624: invalid URL parsing with '#' CVE-2016-8625: IDNA 2003 makes curl use wrong host Full ChangeLog: https://curl.haxx.se/changes.html#7_51_0 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libcurl/libcurl.hash | 2 +- package/libcurl/libcurl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index e2f2ecd109..e1283350cc 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 7b7347d976661d02c84a1f4d6daf40dee377efdc45b9e2c77dedb8acf140d8ec curl-7.50.3.tar.bz2 +sha256 7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde curl-7.51.0.tar.bz2 diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 32a3022ca5..d60000aaed 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.50.3 +LIBCURL_VERSION = 7.51.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = http://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 4a9f2cb2ee597583107a3add8b17f2217b3e0915 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 1 Nov 2016 19:59:14 -0300 Subject: [PATCH 1191/3392] bind: security bump to version 9.11.0-P1 Fixes: CVE-2016-8864 - denial-of-service vector which can potentially be exploited against BIND 9 servers. Signed-off-by: Gustavo Zacarias [Thomas: fix hash URL in .hash file, noticed by Vicente.] Signed-off-by: Thomas Petazzoni --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index bc46604ffe..3522149e9c 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,2 +1,2 @@ -# Verified from ftp://ftp.isc.org/isc/bind9/9.11.0/bind-9.11.0.tar.gz.sha256.asc -sha256 6f0b403036e0281b272a0fbdd0dc3417f3050b625cb059c5409432611418058b bind-9.11.0.tar.gz +# Verified from http://ftp.isc.org/isc/bind9/9.11.0-P1/bind-9.11.0-P1.tar.gz.sha256.asc +sha256 094cd3134ba1b44f0910de1334f05a7dca68d583da038de40a8ad7a0cb1592c6 bind-9.11.0-P1.tar.gz diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 9b5d8c56de..ee50acf3cf 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.0 +BIND_VERSION = 9.11.0-P1 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) From c2a7769d84c6d671d00d15a029811e94d6868b1f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 1 Nov 2016 19:59:30 -0300 Subject: [PATCH 1192/3392] memcached: security bump to version 1.4.33 Fixes: CVE-2016-8704 - server append/prepend remote code execution vulnerability. CVE-2016-8705 - server update remote code execution vulnerability. CVE-2016-8706 - server SASL authentication remote code execution vulnerability. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/memcached/memcached.hash | 6 +++--- package/memcached/memcached.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index dbc0c0ddac..256442afde 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,4 +1,4 @@ -# From http://www.memcached.org/files/memcached-1.4.32.tar.gz.sha1 -sha1 cbec6b533fe037b5ad5c54d111e0d30bc9db4424 memcached-1.4.32.tar.gz +# From http://www.memcached.org/files/memcached-1.4.33.tar.gz.sha1 +sha1 e343530c55946ccbdd78c488355b02eaf90b3b46 memcached-1.4.33.tar.gz # Calculated based on the hash above -sha256 54bb9acd5fbbb73cd1fbfa67cbc6b301009a2835a26c8a4c3dba634a0c3d875d memcached-1.4.32.tar.gz +sha256 83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d memcached-1.4.33.tar.gz diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 2d84574471..74cf6b8669 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.4.32 +MEMCACHED_VERSION = 1.4.33 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From 2c8da7d3c669e7df62b08490588484b253095529 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 1 Nov 2016 20:24:51 +0100 Subject: [PATCH 1193/3392] package/{mesa3d, mesa3d-headers}: bump version to 13.0.0 Udev support was removed upstream: https://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?h=13.0&id=f9f7e44c94f7eee4778768adf7afffba6c0581e7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 4 ++-- package/mesa3d/mesa3d.mk | 9 +-------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 3080afe4e6..b3b80ebc8e 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 = 12.0.3 +MESA3D_HEADERS_VERSION = 13.0.0 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 09923fdffe..7dbe1ac8fa 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2016-September/000236.html -sha256 1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1 mesa-12.0.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2016-November/000264.html +sha256 94edb4ebff82066a68be79d9c2627f15995e1fe10f67ab3fc63deb842027d727 mesa-13.0.0.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 1aa82d860b..e17db5c6f1 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 = 12.0.3 +MESA3D_VERSION = 13.0.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos @@ -41,13 +41,6 @@ MESA3D_DEPENDENCIES += libsha1 MESA3D_CONF_OPTS += --with-sha1=libsha1 endif -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -MESA3D_DEPENDENCIES += udev -MESA3D_CONF_OPTS += --disable-sysfs -else -MESA3D_CONF_OPTS += --enable-sysfs -endif - ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_DEPENDENCIES += \ xproto_xf86driproto \ From 671e1ee907f7930c44e3396abb741d1f385f1664 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 1 Nov 2016 22:15:53 -0500 Subject: [PATCH 1194/3392] configs/lego_ev3: add U-Boot support This adds U-Boot configuration for LEGO MINDSTORMS EV3. U-Boot has had support for LEGO MINDSTORMS EV3 since v2016.05. Signed-off-by: David Lechner Signed-off-by: Thomas Petazzoni --- configs/lego_ev3_defconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/lego_ev3_defconfig b/configs/lego_ev3_defconfig index 1ddc4f97b6..1521fa7cc4 100644 --- a/configs/lego_ev3_defconfig +++ b/configs/lego_ev3_defconfig @@ -24,3 +24,10 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_3=y # BR2_TARGET_ROOTFS_TAR is not set + +# U-Boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="legoev3" From c846d2e21133441e92b1ee3b98f2fc013a01db16 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 1 Nov 2016 22:15:54 -0500 Subject: [PATCH 1195/3392] board/lego/ev3: Create images using genimage This adds a script to create SD card and flash images for LEGO MINDSTORMS EV3 using the genimage tool. The default kernel config had to be modified to add support for squashfs and to add a ram disk. Signed-off-by: David Lechner Signed-off-by: Thomas Petazzoni --- board/lego/ev3/genimage.cfg | 57 +++++++++++++++++++++++++ board/lego/ev3/linux.fragment | 7 +++ board/lego/ev3/post-image.sh | 14 ++++++ board/lego/ev3/readme.txt | 80 ++++++++--------------------------- configs/lego_ev3_defconfig | 10 ++++- 5 files changed, 105 insertions(+), 63 deletions(-) create mode 100644 board/lego/ev3/genimage.cfg create mode 100644 board/lego/ev3/linux.fragment create mode 100755 board/lego/ev3/post-image.sh diff --git a/board/lego/ev3/genimage.cfg b/board/lego/ev3/genimage.cfg new file mode 100644 index 0000000000..6b8546cc7c --- /dev/null +++ b/board/lego/ev3/genimage.cfg @@ -0,0 +1,57 @@ +# LEGO MINDSTORMS EV3 can boot from a 16MB flash or from a microSD card. +# The U-Boot bootloader from the flash is always used, even when booting +# from a microSD card. + +# The Flash image + +flash nor-16M-256 { + pebsize = 4096 + numpebs = 4096 + minimum-io-unit-size = 256 +} + +image flash.bin { + flash { + } + flashtype = "nor-16M-256" + partition uboot { + image = "u-boot.bin" + size = 320K + } + partition uimage { + image = "uImage" + size = 3M + offset = 0x50000 + } + partition rootfs { + image = "rootfs.squashfs" + size = 9600K + offset = 0x350000 + } +} + +# The SD card image + +image boot.vfat { + vfat { + files = { + "uImage" + } + } + size = 16M +} + +image sdcard.img { + hdimage { + } + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 4M + } + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/lego/ev3/linux.fragment b/board/lego/ev3/linux.fragment new file mode 100644 index 0000000000..5593636798 --- /dev/null +++ b/board/lego/ev3/linux.fragment @@ -0,0 +1,7 @@ +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=1 +CONFIG_BLK_DEV_RAM_SIZE=32768 +CONFIG_SQUASHFS=y +CONFIG_SQUASHFS_LZ4=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y diff --git a/board/lego/ev3/post-image.sh b/board/lego/ev3/post-image.sh new file mode 100755 index 0000000000..81626dc371 --- /dev/null +++ b/board/lego/ev3/post-image.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/lego/ev3/readme.txt b/board/lego/ev3/readme.txt index 7d9ec4fbf0..c075af5eb6 100644 --- a/board/lego/ev3/readme.txt +++ b/board/lego/ev3/readme.txt @@ -25,9 +25,13 @@ How it works Boot process : -------------- -The u-boot on-board the EV3 brick has provision to boot a Linux kernel from the -external µSD card. It will try to load a uImage from the first µSD card -partition, which must be formatted with a FAT filesystem. +The EV3 boots from an EEPROM. This loads whatever is on the built-in 16MB flash +(usually U-Boot) and runs it. The U-Boot from the official LEGO firmware and +mainline U-Boot will attempt to boot a Linux kernel from the external µSD card. +It will try to load a uImage (and optional boot.scr) from the first µSD card +partition, which must be formatted with a FAT filesystem. If no µSD is found or +it does not contain a uImage file, then the EV3 will boot the uImage from the +built-in 16MB flash. How to build it =============== @@ -54,74 +58,26 @@ Result of the build After building, you should obtain this tree: output/images/ + ├── boot.vfat + ├── flash.bin ├── rootfs.ext2 ├── rootfs.ext3 -> rootfs.ext2 + ├── rootfs.squashfs + ├── sdcard.img + ├── u-boot.bin └── uImage -Prepare your SDcard -=================== - -The following µSD card layout is recommended: - -- First partition formatted with a FAT filesystem, containing the uImage. -- Second partition formatted as ext2 or ext3, containing the root filesystem. - -Create the SDcard partition table ----------------------------------- - -Determine the device associated to the SD card : - - $ cat /proc/partitions - -Let's assume it is /dev/mmcblk0 : - - $ sudo fdisk /dev/mmcblk0 - -Delete all previous partitions by creating a new disklabel with 'o', then -create the new partition table, using these options, pressing enter after each -one: - - * n p 1 2048 +10M t c - * n p 2 22528 +256M - -Using the 'p' option, the SD card's partition must look like this : - -Device Boot Start End Blocks Id System -/dev/mmcblk0p1 2048 22527 10240 c W95 FAT32 (LBA) -/dev/mmcblk0p2 22528 546815 262144 83 Linux - -Then write the partition table using 'w' and exit. - -Make partition one a DOS partition : - - $ sudo mkfs.vfat /dev/mmcblk0p1 - -Install the binaries to the SDcard ----------------------------------- - -Remember your binaries are located in output/images/, go inside that directory : - - $ cd output/images - -Copy the Linux kernel: - - $ sudo mkdir /mnt/sdcard - $ sudo mount /dev/mmcblk0p1 /mnt/sdcard - $ sudo cp uImage /mnt/sdcard - $ sudo umount /mnt/sdcard - -Copy the rootfs : - - $ sudo dd if=rootfs.ext3 of=/dev/mmcblk0p2 bs=1M - $ sync +Installation +============ -It's Done! +You can use either flash.bin or the sdcard.img. To load flash.bin, use the +official Lego Mindstorms EV3 programming software firmware update tool to load +the image. To use sdcard.img, use a disk writing tool such as Etcher or dd to +write the image to the µSD card. Finish ====== -Eject your µSD card, insert it in your Lego EV3, and power it up. - To have a serial console, you will need a proper USB to Lego serial port adapter plugged into the EV3 sensors port 1. See: diff --git a/configs/lego_ev3_defconfig b/configs/lego_ev3_defconfig index 1521fa7cc4..ea76d595a6 100644 --- a/configs/lego_ev3_defconfig +++ b/configs/lego_ev3_defconfig @@ -8,7 +8,7 @@ BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches" # system BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" - +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lego/ev3/post-image.sh" # Linux headers same as kernel, a 4.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y @@ -18,11 +18,14 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ev3dev/ev3dev-kernel.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.4.19-15-ev3dev-ev3_1" BR2_LINUX_KERNEL_DEFCONFIG="ev3dev" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lego/ev3/linux.fragment" BR2_LINUX_KERNEL_UIMAGE=y # filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_3=y +BR2_TARGET_ROOTFS_SQUASHFS=y +BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y # BR2_TARGET_ROOTFS_TAR is not set # U-Boot @@ -31,3 +34,8 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="legoev3" + +# host +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 7d4a2f2ca43eb6b925cdf5b6b15d48ac49ee96af Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 1 Nov 2016 22:15:55 -0500 Subject: [PATCH 1196/3392] linux: add ev3dev extension This adds an ev3dev Linux drivers extension that provides Linux kernel drivers for LEGO MINDSTORMS EV3 from the ev3dev project. Signed-off-by: David Lechner Signed-off-by: Thomas Petazzoni --- linux/Config.ext.in | 10 ++++++++++ linux/linux-ext-ev3dev-linux-drivers.mk | 12 ++++++++++++ package/Config.in | 1 + package/ev3dev-linux-drivers/Config.in | 12 ++++++++++++ package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk | 11 +++++++++++ package/ev3dev-linux-drivers/lego-linux-drivers.hash | 2 ++ support/scripts/pkg-stats | 1 + 7 files changed, 49 insertions(+) create mode 100644 linux/linux-ext-ev3dev-linux-drivers.mk create mode 100644 package/ev3dev-linux-drivers/Config.in create mode 100644 package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk create mode 100644 package/ev3dev-linux-drivers/lego-linux-drivers.hash diff --git a/linux/Config.ext.in b/linux/Config.ext.in index 5d5e7efbca..011dffb0b1 100644 --- a/linux/Config.ext.in +++ b/linux/Config.ext.in @@ -45,6 +45,16 @@ config BR2_LINUX_KERNEL_EXT_RTAI help RTAI Kernel part. +#------------------------------------------------------------------------------- +# ev3dev Linux drivers +config BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS + bool "ev3dev Linux drivers" + select BR2_PACKAGE_EV3DEV_LINUX_DRIVERS + help + Linux drivers for LEGO MINDSTORMS EV3 from the ev3dev project. + + https://github.com/ev3dev/lego-linux-drivers + #------------------------------------------------------------------------------- # fbtft config BR2_LINUX_KERNEL_EXT_FBTFT diff --git a/linux/linux-ext-ev3dev-linux-drivers.mk b/linux/linux-ext-ev3dev-linux-drivers.mk new file mode 100644 index 0000000000..c8afeeb1d5 --- /dev/null +++ b/linux/linux-ext-ev3dev-linux-drivers.mk @@ -0,0 +1,12 @@ +################################################################################ +# Linux ev3dev extensions +# +# Patch the linux kernel with ev3dev extension +################################################################################ + +LINUX_EXTENSIONS += ev3dev-linux-drivers + +define EV3DEV_LINUX_DRIVERS_PREPARE_KERNEL + mkdir -p $(LINUX_DIR)/drivers/lego + cp -dpfr $(EV3DEV_LINUX_DRIVERS_DIR)/* $(LINUX_DIR)/drivers/lego/ +endef diff --git a/package/Config.in b/package/Config.in index 0f6260b2d2..9ed296f2d9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -369,6 +369,7 @@ endmenu source "package/edid-decode/Config.in" source "package/eeprog/Config.in" source "package/eudev/Config.in" + source "package/ev3dev-linux-drivers/Config.in" source "package/evemu/Config.in" source "package/evtest/Config.in" source "package/fan-ctrl/Config.in" diff --git a/package/ev3dev-linux-drivers/Config.in b/package/ev3dev-linux-drivers/Config.in new file mode 100644 index 0000000000..9be2f282e9 --- /dev/null +++ b/package/ev3dev-linux-drivers/Config.in @@ -0,0 +1,12 @@ +# Prompt-less option, because this package is not doing anything except +# downloading the ev3dev driver sources. The real work is done by a Linux +# extension. +config BR2_PACKAGE_EV3DEV_LINUX_DRIVERS + bool + depends on BR2_LINUX_KERNEL + help + Linux drivers for LEGO MINDSTORMS EV3 + + This is only the download helper for the kernel patch. + + https://github.com/ev3dev/lego-linux-drivers diff --git a/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk b/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk new file mode 100644 index 0000000000..55e26f0411 --- /dev/null +++ b/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# ev3dev Linux drivers +# +################################################################################ + +EV3DEV_LINUX_DRIVERS_VERSION = 0e551eb25ae8600c1f178814781bfb42dc835496 +EV3DEV_LINUX_DRIVERS_SITE = $(call github,ev3dev,lego-linux-drivers,$(EV3DEV_LINUX_DRIVERS_VERSION)) +EV3DEV_LINUX_DRIVERS_LICENSE = GPLv2 + +$(eval $(generic-package)) diff --git a/package/ev3dev-linux-drivers/lego-linux-drivers.hash b/package/ev3dev-linux-drivers/lego-linux-drivers.hash new file mode 100644 index 0000000000..cc48f65395 --- /dev/null +++ b/package/ev3dev-linux-drivers/lego-linux-drivers.hash @@ -0,0 +1,2 @@ +# locally computed +sha256 9d2740b348c8d43e7e15fedc4cec99bf351a3a2ba8691f2a07c439a9c034bc04 lego-linux-drivers-0e551eb25ae8600c1f178814781bfb42dc835496.tar.gz diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index cc3bef452c..421fa5cf5d 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -94,6 +94,7 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do if test \ $i = "boot/common.mk" -o \ + $i = "linux/linux-ext-ev3dev-linux-drivers.mk" -o \ $i = "linux/linux-ext-fbtft.mk" -o \ $i = "linux/linux-ext-xenomai.mk" -o \ $i = "linux/linux-ext-rtai.mk" -o \ From 36bd9a3cb45ef4ce59581eb9f9c557cf6ceef09b Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 1 Nov 2016 22:15:56 -0500 Subject: [PATCH 1197/3392] board/lego/ev3: Use ev3dev linux ext for ev3dev drivers This uses the ev3dev linux extension to compile the ev3dev drivers for LEGO MINDSTORMS EV3. Signed-off-by: David Lechner Signed-off-by: Thomas Petazzoni --- ...01-Create-empty-drivers-lego-Kconfig.patch | 24 ------------------- board/lego/ev3/readme.txt | 4 ++-- configs/lego_ev3_defconfig | 4 +--- 3 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 board/lego/ev3/patches/linux/0001-Create-empty-drivers-lego-Kconfig.patch diff --git a/board/lego/ev3/patches/linux/0001-Create-empty-drivers-lego-Kconfig.patch b/board/lego/ev3/patches/linux/0001-Create-empty-drivers-lego-Kconfig.patch deleted file mode 100644 index 614d53dd39..0000000000 --- a/board/lego/ev3/patches/linux/0001-Create-empty-drivers-lego-Kconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 72c5727488f10160abfadcc77dd9763c4408b5e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= -Date: Sat, 15 Oct 2016 16:23:31 +0200 -Subject: [PATCH] Create empty drivers/lego/Kconfig -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Vincent Stehlé ---- - drivers/lego/Kconfig | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 drivers/lego/Kconfig - -diff --git a/drivers/lego/Kconfig b/drivers/lego/Kconfig -new file mode 100644 -index 0000000..d7cbf4f ---- /dev/null -+++ b/drivers/lego/Kconfig -@@ -0,0 +1 @@ -+# Empty Kconfig just to make source from drivers/Kconfig succeed. --- -2.9.3 - diff --git a/board/lego/ev3/readme.txt b/board/lego/ev3/readme.txt index c075af5eb6..c40907c69d 100644 --- a/board/lego/ev3/readme.txt +++ b/board/lego/ev3/readme.txt @@ -4,8 +4,7 @@ Intro ===== This is the buildroot basic board support for the Lego Mindstorms EV3 -programmable brick. No support for sensors and drivers is provided for the -moment. +programmable brick. The Lego Mindstorms EV3 brick comprises a Texas Instruments AM1808 SoC, with an ARM 926EJ-S main processor running at 300 MHz. @@ -17,6 +16,7 @@ See: The buildroot configuration uses the Linux kernel of the ev3dev project. See: - https://github.com/ev3dev/ev3-kernel/ +- https://github.com/ev3dev/lego-linux-drivers/ - http://www.ev3dev.org/ How it works diff --git a/configs/lego_ev3_defconfig b/configs/lego_ev3_defconfig index ea76d595a6..543a227493 100644 --- a/configs/lego_ev3_defconfig +++ b/configs/lego_ev3_defconfig @@ -2,9 +2,6 @@ BR2_arm=y BR2_arm926t=y -# patches -BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches" - # system BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" @@ -20,6 +17,7 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.4.19-15-ev3dev-ev3_1" BR2_LINUX_KERNEL_DEFCONFIG="ev3dev" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lego/ev3/linux.fragment" BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS=y # filesystem BR2_TARGET_ROOTFS_EXT2=y From d6d3c7ad39b3eb6e51a3feec333a8fc84f7258f7 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 2 Nov 2016 02:55:05 -0400 Subject: [PATCH 1198/3392] lttng-tools: bump to version 2.8.2 The current patches are dropped because they were merged upstream. The new patches exist to fix the build with musl. They were submitted on the lttng-dev mailing list, but not merged yet, or not merged in 2.8.2. LTTng-tools now has its man pages written in AsciiDoc and they get converted to troff at build time. This is not needed in a Buildroot image anyway. The --enable-lttng-ust/--disable-lttng-ust configure options are renamed to --with-lttng-ust/--without-lttng-ust in v2.8. Signed-off-by: Philippe Proulx Signed-off-by: Thomas Petazzoni --- ...ilure-when-__GLIBC_PREREQ-is-missing.patch | 55 --- ...napshot-del-output-with-name-on-musl.patch | 32 ++ ...2-Fix-add-missing-sys-types.h-header.patch | 29 -- ...trerror_r-behavior-is-glibc-specific.patch | 30 ++ ...read-stack-size-to-ulimit-soft-value.patch | 431 ++++++++++++++++++ package/lttng-tools/lttng-tools.hash | 6 +- package/lttng-tools/lttng-tools.mk | 10 +- 7 files changed, 502 insertions(+), 91 deletions(-) delete mode 100644 package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch create mode 100644 package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch delete mode 100644 package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch create mode 100644 package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch create mode 100644 package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch diff --git a/package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch b/package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch deleted file mode 100644 index 2c01dea6ae..0000000000 --- a/package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Baruch Siach -Date: Tue, 8 Mar 2016 14:25:34 +0200 -Subject: [PATCH] Fix: build failure when __GLIBC_PREREQ is missing - -The musl C library does not provide the __GLIBC_PREREQ macro. Instead of -relying on glibc version test, check directly for the availability of -epoll_create1(). - -Signed-off-by: Baruch Siach ---- -Patch status: sent upstream rebased on master branch -(http://lists.lttng.org/pipermail/lttng-dev/2016-March/025593.html) - - configure.ac | 2 +- - src/common/compat/poll.h | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 66d83b60b017..4fc1160c9a08 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -70,7 +70,7 @@ AC_CHECK_FUNCS([ \ - gethostbyname gethostname getpagesize localtime_r memchr memset \ - mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \ - strncasecmp strndup strpbrk strrchr strstr strtol strtoul \ -- strtoull \ -+ strtoull epoll_create1 \ - ]) - - # Babeltrace viewer check -diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h -index 699901848dc1..84f25d5c85aa 100644 ---- a/src/common/compat/poll.h -+++ b/src/common/compat/poll.h -@@ -73,7 +73,7 @@ enum { - LPOLLNVAL = EPOLLHUP, - LPOLLRDHUP = EPOLLRDHUP, - /* Close on exec feature of epoll */ --#if __GLIBC_PREREQ(2, 9) -+#if defined(HAVE_EPOLL_CREATE1) && defined(EPOLL_CLOEXEC) - LTTNG_CLOEXEC = EPOLL_CLOEXEC, - #else - /* -@@ -127,7 +127,7 @@ extern int compat_epoll_create(struct lttng_poll_event *events, - #define lttng_poll_create(events, size, flags) \ - compat_epoll_create(events, size, flags) - --#if __GLIBC_PREREQ(2, 9) -+#if defined(HAVE_EPOLL_CREATE1) && defined(EPOLL_CLOEXEC) - static inline int compat_glibc_epoll_create(int size __attribute__((unused)), - int flags) - { --- -2.7.0 - diff --git a/package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch b/package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch new file mode 100644 index 0000000000..102a02bef5 --- /dev/null +++ b/package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch @@ -0,0 +1,32 @@ +From: mjeanson@efficios.com Michael Jeanson +Date: Wed, 15 Jun 2016 17:18:02 -0400 +Subject: [lttng-dev] [PATCH] Fix: snapshot del-output with name on musl + +Some implementations of strtol() like the one in musl will +return EINVAL in perror when no valid number was found in +the string. + +Signed-off-by: Michael Jeanson +[Philippe: grabbed from the mailing list: + https://lists.lttng.org/pipermail/lttng-dev/2016-June/026192.html + and adapted to 2.8.2.] +Signed-off-by: Philippe Proulx +--- + src/bin/lttng/commands/snapshot.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c +index d948226..00aa5b7 100644 +--- a/src/bin/lttng/commands/snapshot.c ++++ b/src/bin/lttng/commands/snapshot.c +@@ -447,7 +447,7 @@ static int cmd_del_output(int argc, const char **argv) + + errno = 0; + id = strtol(argv[1], &name, 10); +- if (id == 0 && errno == 0) { ++ if (id == 0 && (errno == 0 || errno == EINVAL)) { + if (lttng_opt_mi) { + ret = mi_del_output(UINT32_MAX, name); + } else { +-- +2.7.4 diff --git a/package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch b/package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch deleted file mode 100644 index 5ce2da52dc..0000000000 --- a/package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Baruch Siach -Date: Tue, 8 Mar 2016 14:40:49 +0200 -Subject: [PATCH] Fix: add missing sys/types.h header - -The musl C library requires inclusion of sys/types.h for mode_t. - -Signed-off-by: Baruch Siach ---- -Patch status: sent upstream -(http://lists.lttng.org/pipermail/lttng-dev/2016-March/025594.html) - - src/common/runas.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/common/runas.h b/src/common/runas.h -index 2c5565af3646..ac1143eecf84 100644 ---- a/src/common/runas.h -+++ b/src/common/runas.h -@@ -19,6 +19,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include - #include - #include - --- -2.7.0 - diff --git a/package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch b/package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch new file mode 100644 index 0000000000..e9ba74fac4 --- /dev/null +++ b/package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch @@ -0,0 +1,30 @@ +From fc743b22fc26eab9f9dbf48e4505ed2394924bba Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 13 Jun 2016 18:44:17 -0400 +Subject: [PATCH lttng-tools] Fix: strerror_r behavior is glibc specific + +Signed-off-by: Michael Jeanson +[Philippe: grabbed from the mailing list: + https://lists.lttng.org/pipermail/lttng-dev/2016-June/026194.html +] +Signed-off-by: Philippe Proulx +--- + src/common/error.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/common/error.h b/src/common/error.h +index 0fbd3a2..e8c811e 100644 +--- a/src/common/error.h ++++ b/src/common/error.h +@@ -198,7 +198,7 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type) + + #define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ## args) + +-#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) ++#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) + + /* + * Version using XSI strerror_r. +-- +2.7.4 + diff --git a/package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch b/package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch new file mode 100644 index 0000000000..c0dd06737a --- /dev/null +++ b/package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch @@ -0,0 +1,431 @@ +From 451f4d875537c073a966d6ccfb2fe08a497fbd7b Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Wed, 15 Jun 2016 11:01:08 -0500 +Subject: [PATCH] Set thread stack size to ulimit soft value + +Signed-off-by: Michael Jeanson +[Philippe: grabbed from the mailing list: + https://lists.lttng.org/pipermail/lttng-dev/2016-June/026196.html +] +Signed-off-by: Philippe Proulx +--- + src/bin/lttng-consumerd/lttng-consumerd.c | 17 ++++++---- + src/bin/lttng-relayd/live.c | 10 +++--- + src/bin/lttng-relayd/live.h | 2 +- + src/bin/lttng-relayd/main.c | 14 +++++--- + src/bin/lttng-sessiond/main.c | 27 +++++++++------ + src/common/utils.c | 56 +++++++++++++++++++++++++++++++ + src/common/utils.h | 1 + + 7 files changed, 99 insertions(+), 28 deletions(-) + +diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c +index 00660fc..2f1d01c 100644 +--- a/src/bin/lttng-consumerd/lttng-consumerd.c ++++ b/src/bin/lttng-consumerd/lttng-consumerd.c +@@ -57,6 +57,8 @@ + static pthread_t channel_thread, data_thread, metadata_thread, + sessiond_thread, metadata_timer_thread, health_thread; + ++static pthread_attr_t *tattr; ++ + /* to count the number of times the user pressed ctrl+c */ + static int sigintcount = 0; + +@@ -351,6 +353,9 @@ int main(int argc, char **argv) + } + } + ++ /* Get stacksize limit */ ++ tattr = get_pthread_attr_stacksize(); ++ + /* + * Starting from here, we can create threads. This needs to be after + * lttng_daemonize due to RCU. +@@ -498,7 +503,7 @@ int main(int argc, char **argv) + } + + /* Create thread to manage the client socket */ +- ret = pthread_create(&health_thread, NULL, ++ ret = pthread_create(&health_thread, tattr, + thread_manage_health, (void *) NULL); + if (ret) { + errno = ret; +@@ -517,7 +522,7 @@ int main(int argc, char **argv) + cmm_smp_mb(); /* Read ready before following operations */ + + /* Create thread to manage channels */ +- ret = pthread_create(&channel_thread, NULL, ++ ret = pthread_create(&channel_thread, tattr, + consumer_thread_channel_poll, + (void *) ctx); + if (ret) { +@@ -528,7 +533,7 @@ int main(int argc, char **argv) + } + + /* Create thread to manage the polling/writing of trace metadata */ +- ret = pthread_create(&metadata_thread, NULL, ++ ret = pthread_create(&metadata_thread, tattr, + consumer_thread_metadata_poll, + (void *) ctx); + if (ret) { +@@ -539,7 +544,7 @@ int main(int argc, char **argv) + } + + /* Create thread to manage the polling/writing of trace data */ +- ret = pthread_create(&data_thread, NULL, consumer_thread_data_poll, ++ ret = pthread_create(&data_thread, tattr, consumer_thread_data_poll, + (void *) ctx); + if (ret) { + errno = ret; +@@ -549,7 +554,7 @@ int main(int argc, char **argv) + } + + /* Create the thread to manage the receive of fd */ +- ret = pthread_create(&sessiond_thread, NULL, ++ ret = pthread_create(&sessiond_thread, tattr, + consumer_thread_sessiond_poll, + (void *) ctx); + if (ret) { +@@ -563,7 +568,7 @@ int main(int argc, char **argv) + * Create the thread to manage the UST metadata periodic timer and + * live timer. + */ +- ret = pthread_create(&metadata_timer_thread, NULL, ++ ret = pthread_create(&metadata_timer_thread, tattr, + consumer_timer_thread, (void *) ctx); + if (ret) { + errno = ret; +diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c +index e2096ec..32efab1 100644 +--- a/src/bin/lttng-relayd/live.c ++++ b/src/bin/lttng-relayd/live.c +@@ -2147,13 +2147,13 @@ int relayd_live_join(void) + /* + * main + */ +-int relayd_live_create(struct lttng_uri *uri) ++int relayd_live_create(struct lttng_uri *uri, const pthread_attr_t *tattr) + { + int ret = 0, retval = 0; + void *status; + int is_root; + +- if (!uri) { ++ if (!uri || !tattr) { + retval = -1; + goto exit_init_data; + } +@@ -2186,7 +2186,7 @@ int relayd_live_create(struct lttng_uri *uri) + } + + /* Setup the dispatcher thread */ +- ret = pthread_create(&live_dispatcher_thread, NULL, ++ ret = pthread_create(&live_dispatcher_thread, tattr, + thread_dispatcher, (void *) NULL); + if (ret) { + errno = ret; +@@ -2196,7 +2196,7 @@ int relayd_live_create(struct lttng_uri *uri) + } + + /* Setup the worker thread */ +- ret = pthread_create(&live_worker_thread, NULL, ++ ret = pthread_create(&live_worker_thread, tattr, + thread_worker, NULL); + if (ret) { + errno = ret; +@@ -2206,7 +2206,7 @@ int relayd_live_create(struct lttng_uri *uri) + } + + /* Setup the listener thread */ +- ret = pthread_create(&live_listener_thread, NULL, ++ ret = pthread_create(&live_listener_thread, tattr, + thread_listener, (void *) NULL); + if (ret) { + errno = ret; +diff --git a/src/bin/lttng-relayd/live.h b/src/bin/lttng-relayd/live.h +index 2b8a3a0..6cd85e9 100644 +--- a/src/bin/lttng-relayd/live.h ++++ b/src/bin/lttng-relayd/live.h +@@ -24,7 +24,7 @@ + + #include "lttng-relayd.h" + +-int relayd_live_create(struct lttng_uri *live_uri); ++int relayd_live_create(struct lttng_uri *live_uri, const pthread_attr_t *tattr); + int relayd_live_stop(void); + int relayd_live_join(void); + +diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c +index 6ad6566..505e884 100644 +--- a/src/bin/lttng-relayd/main.c ++++ b/src/bin/lttng-relayd/main.c +@@ -119,6 +119,8 @@ static pthread_t dispatcher_thread; + static pthread_t worker_thread; + static pthread_t health_thread; + ++static pthread_attr_t *tattr; ++ + /* + * last_relay_stream_id_lock protects last_relay_stream_id increment + * atomicity on 32-bit architectures. +@@ -2778,6 +2780,8 @@ int main(int argc, char **argv) + } + } + ++ /* Get stack size limit */ ++ tattr = get_pthread_attr_stacksize(); + + /* Initialize thread health monitoring */ + health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES); +@@ -2840,7 +2844,7 @@ int main(int argc, char **argv) + } + + /* Create thread to manage the client socket */ +- ret = pthread_create(&health_thread, NULL, ++ ret = pthread_create(&health_thread, tattr, + thread_manage_health, (void *) NULL); + if (ret) { + errno = ret; +@@ -2850,7 +2854,7 @@ int main(int argc, char **argv) + } + + /* Setup the dispatcher thread */ +- ret = pthread_create(&dispatcher_thread, NULL, ++ ret = pthread_create(&dispatcher_thread, tattr, + relay_thread_dispatcher, (void *) NULL); + if (ret) { + errno = ret; +@@ -2860,7 +2864,7 @@ int main(int argc, char **argv) + } + + /* Setup the worker thread */ +- ret = pthread_create(&worker_thread, NULL, ++ ret = pthread_create(&worker_thread, tattr, + relay_thread_worker, NULL); + if (ret) { + errno = ret; +@@ -2870,7 +2874,7 @@ int main(int argc, char **argv) + } + + /* Setup the listener thread */ +- ret = pthread_create(&listener_thread, NULL, ++ ret = pthread_create(&listener_thread, tattr, + relay_thread_listener, (void *) NULL); + if (ret) { + errno = ret; +@@ -2879,7 +2883,7 @@ int main(int argc, char **argv) + goto exit_listener_thread; + } + +- ret = relayd_live_create(live_uri); ++ ret = relayd_live_create(live_uri, tattr); + if (ret) { + ERR("Starting live viewer threads"); + retval = -1; +diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c +index c8e4e53..b8f1bde 100644 +--- a/src/bin/lttng-sessiond/main.c ++++ b/src/bin/lttng-sessiond/main.c +@@ -212,6 +212,8 @@ static pthread_t ht_cleanup_thread; + static pthread_t agent_reg_thread; + static pthread_t load_session_thread; + ++static pthread_attr_t *tattr; ++ + /* + * UST registration command queue. This queue is tied with a futex and uses a N + * wakers / 1 waiter implemented and detailed in futex.c/.h +@@ -2402,7 +2404,7 @@ static int spawn_consumer_thread(struct consumer_data *consumer_data) + goto error; + } + +- ret = pthread_create(&consumer_data->thread, NULL, thread_manage_consumer, ++ ret = pthread_create(&consumer_data->thread, tattr, thread_manage_consumer, + consumer_data); + if (ret) { + errno = ret; +@@ -5638,6 +5640,9 @@ int main(int argc, char **argv) + goto exit_create_run_as_worker_cleanup; + } + ++ /* Get stack size limit */ ++ tattr = get_pthread_attr_stacksize(); ++ + /* + * Starting from here, we can create threads. This needs to be after + * lttng_daemonize due to RCU. +@@ -5672,7 +5677,7 @@ int main(int argc, char **argv) + } + + /* Create thread to clean up RCU hash tables */ +- ret = pthread_create(&ht_cleanup_thread, NULL, ++ ret = pthread_create(&ht_cleanup_thread, tattr, + thread_ht_cleanup, (void *) NULL); + if (ret) { + errno = ret; +@@ -6044,7 +6049,7 @@ int main(int argc, char **argv) + load_info->path = opt_load_session_path; + + /* Create health-check thread */ +- ret = pthread_create(&health_thread, NULL, ++ ret = pthread_create(&health_thread, tattr, + thread_manage_health, (void *) NULL); + if (ret) { + errno = ret; +@@ -6054,7 +6059,7 @@ int main(int argc, char **argv) + } + + /* Create thread to manage the client socket */ +- ret = pthread_create(&client_thread, NULL, ++ ret = pthread_create(&client_thread, tattr, + thread_manage_clients, (void *) NULL); + if (ret) { + errno = ret; +@@ -6064,7 +6069,7 @@ int main(int argc, char **argv) + } + + /* Create thread to dispatch registration */ +- ret = pthread_create(&dispatch_thread, NULL, ++ ret = pthread_create(&dispatch_thread, tattr, + thread_dispatch_ust_registration, (void *) NULL); + if (ret) { + errno = ret; +@@ -6074,7 +6079,7 @@ int main(int argc, char **argv) + } + + /* Create thread to manage application registration. */ +- ret = pthread_create(®_apps_thread, NULL, ++ ret = pthread_create(®_apps_thread, tattr, + thread_registration_apps, (void *) NULL); + if (ret) { + errno = ret; +@@ -6084,7 +6089,7 @@ int main(int argc, char **argv) + } + + /* Create thread to manage application socket */ +- ret = pthread_create(&apps_thread, NULL, ++ ret = pthread_create(&apps_thread, tattr, + thread_manage_apps, (void *) NULL); + if (ret) { + errno = ret; +@@ -6094,7 +6099,7 @@ int main(int argc, char **argv) + } + + /* Create thread to manage application notify socket */ +- ret = pthread_create(&apps_notify_thread, NULL, ++ ret = pthread_create(&apps_notify_thread, tattr, + ust_thread_manage_notify, (void *) NULL); + if (ret) { + errno = ret; +@@ -6104,7 +6109,7 @@ int main(int argc, char **argv) + } + + /* Create agent registration thread. */ +- ret = pthread_create(&agent_reg_thread, NULL, ++ ret = pthread_create(&agent_reg_thread, tattr, + agent_thread_manage_registration, (void *) NULL); + if (ret) { + errno = ret; +@@ -6116,7 +6121,7 @@ int main(int argc, char **argv) + /* Don't start this thread if kernel tracing is not requested nor root */ + if (is_root && !opt_no_kernel) { + /* Create kernel thread to manage kernel event */ +- ret = pthread_create(&kernel_thread, NULL, ++ ret = pthread_create(&kernel_thread, tattr, + thread_manage_kernel, (void *) NULL); + if (ret) { + errno = ret; +@@ -6127,7 +6132,7 @@ int main(int argc, char **argv) + } + + /* Create session loading thread. */ +- ret = pthread_create(&load_session_thread, NULL, thread_load_session, ++ ret = pthread_create(&load_session_thread, tattr, thread_load_session, + load_info); + if (ret) { + errno = ret; +diff --git a/src/common/utils.c b/src/common/utils.c +index 1e52ae0..593d6cc 100644 +--- a/src/common/utils.c ++++ b/src/common/utils.c +@@ -31,6 +31,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include +@@ -1383,3 +1385,57 @@ int utils_show_man_page(int section, const char *page_name) + section_string, page_name, NULL); + return ret; + } ++ ++static bool pthread_ss_done = false; ++static pthread_attr_t *tattr = NULL; ++static pthread_attr_t tattr_value; ++ ++LTTNG_HIDDEN ++pthread_attr_t *get_pthread_attr_stacksize() { ++ int ret = 0; ++ size_t ptstacksize; ++ struct rlimit rlim; ++ ++ /* Return cached value */ ++ if (pthread_ss_done) { ++ goto end; ++ } ++ ++ /* Get stack size limits */ ++ ret = getrlimit(RLIMIT_STACK, &rlim); ++ if (ret < 0) { ++ PERROR("getrlimit"); ++ goto end; ++ } ++ DBG("Stack size limits: soft %lld, hard %lld bytes", ++ (long long) rlim.rlim_cur, ++ (long long) rlim.rlim_max); ++ ++ /* Get default thread stack size */ ++ ret = pthread_attr_getstacksize(&tattr_value, &ptstacksize); ++ if (ret < 0) { ++ PERROR("pthread_attr_getstacksize"); ++ goto end; ++ } ++ DBG("Default pthread stack size is %zu bytes", ptstacksize); ++ ++ /* Check if default thread stack size respects ulimits */ ++ if (ptstacksize < rlim.rlim_cur) { ++ DBG("Your libc doesn't honor stack size limits, setting thread stack size to soft limit (%lld bytes)", (long long) rlim.rlim_cur); ++ ++ /* Create pthread_attr_t struct with ulimit stack size */ ++ ret = pthread_attr_setstacksize(&tattr_value, rlim.rlim_cur); ++ if (ret < 0) { ++ PERROR("pthread_attr_setstacksize"); ++ goto end; ++ } ++ ++ /* Set pointer */ ++ tattr = &tattr_value; ++ } ++ ++ /* Enable cached value */ ++ pthread_ss_done = true; ++end: ++ return tattr; ++} +diff --git a/src/common/utils.h b/src/common/utils.h +index 7285f5c..568c123 100644 +--- a/src/common/utils.h ++++ b/src/common/utils.h +@@ -60,5 +60,6 @@ int utils_create_lock_file(const char *filepath); + int utils_recursive_rmdir(const char *path); + int utils_truncate_stream_file(int fd, off_t length); + int utils_show_man_page(int section, const char *page_name); ++pthread_attr_t *get_pthread_attr_stacksize(); + + #endif /* _COMMON_UTILS_H */ +-- +2.7.4 + diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash index f05b0e3826..267da806d5 100644 --- a/package/lttng-tools/lttng-tools.hash +++ b/package/lttng-tools/lttng-tools.hash @@ -1,2 +1,6 @@ +# From http://lttng.org/files/lttng-tools/lttng-tools-2.8.2.tar.bz2.{md5,sha1} +md5 cac8d64111711ae1b632d0dc12fe92c1 lttng-tools-2.8.2.tar.bz2 +sha1 870874ba9644691de8e564a1fa1459aa5fef42ba lttng-tools-2.8.2.tar.bz2 + # Locally generated -sha256 0c799fb21dfa42475feaa1507ded934608b2e531039b46c40e944a5b81c7b21c lttng-tools-2.7.1.tar.bz2 +sha256 a07e00e9519dad2577d9330bcaf040ab3dc1b289fbcb8c702c39d520422e7565 lttng-tools-2.8.2.tar.bz2 diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index 3fb169166c..0591633b25 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -4,22 +4,20 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.7.1 +LTTNG_TOOLS_VERSION = 2.8.2 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+ (include/lttng/*, src/lib/lttng-ctl/*) LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE -LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr -# Patching configure.ac -LTTNG_TOOLS_AUTORECONF = YES +LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr --disable-man-pages LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) -LTTNG_TOOLS_CONF_OPTS += --enable-lttng-ust +LTTNG_TOOLS_CONF_OPTS += --with-lttng-ust LTTNG_TOOLS_DEPENDENCIES += lttng-libust else -LTTNG_TOOLS_CONF_OPTS += --disable-lttng-ust +LTTNG_TOOLS_CONF_OPTS += --without-lttng-ust endif $(eval $(autotools-package)) From be641e4e3847883552730b4f0511b7ab80e3f8aa Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 2 Nov 2016 02:55:06 -0400 Subject: [PATCH 1199/3392] lttng-babeltrace: bump to version 1.4.0 Current patches are dropped because they were merged upstream. Official upstream site of Babeltrace for the distribution of tarballs changed from lttng.org to efficios.com (see ). Official Babeltrace's website changed from to . I explicitly disable the support for debug informations in this patch to add it in a separate patch. Signed-off-by: Philippe Proulx Signed-off-by: Thomas Petazzoni --- .../0001-no-posix-fallocate-in-uclibc.patch | 37 ----------- ...efile.am-remove-unneeded-static-flag.patch | 36 +++++++++++ ...id-support-detection-on-static-build.patch | 63 ------------------- package/lttng-babeltrace/Config.in | 10 ++- .../lttng-babeltrace/lttng-babeltrace.hash | 11 ++-- package/lttng-babeltrace/lttng-babeltrace.mk | 9 +-- 6 files changed, 48 insertions(+), 118 deletions(-) delete mode 100644 package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch create mode 100644 package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch delete mode 100644 package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch diff --git a/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch b/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch deleted file mode 100644 index d77825fab6..0000000000 --- a/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch +++ /dev/null @@ -1,37 +0,0 @@ -Do not call posix_fallocate() on uClibc - -uClibc does not implement posix_fallocate(), and posix_fallocate() is -mostly only an hint to the kernel that we will need such or such -amount of space inside a file. So we just don't call posix_fallocate() -when building against uClibc. - -Signed-off-by: Thomas Petazzoni -[Peter: add #include ---- - formats/ctf/ctf.c | 3 +++ - 1 file changed, 3 insertions(+) - -Index: lttng-babeltrace-0.8/formats/ctf/ctf.c -=================================================================== ---- lttng-babeltrace-0.8.orig/formats/ctf/ctf.c -+++ lttng-babeltrace-0.8/formats/ctf/ctf.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -384,9 +385,11 @@ - } - pos->content_size = -1U; /* Unknown at this point */ - pos->packet_size = WRITE_PACKET_LEN; -+#ifndef __UCLIBC__ - off = posix_fallocate(pos->fd, pos->mmap_offset, - pos->packet_size / CHAR_BIT); - assert(off >= 0); -+#endif - pos->offset = 0; - } else { - read_next_packet: diff --git a/package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch b/package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch new file mode 100644 index 0000000000..b903d87223 --- /dev/null +++ b/package/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch @@ -0,0 +1,36 @@ +From 27e37d2621317d25e08ba0683bf8540b05b9347d Mon Sep 17 00:00:00 2001 +From: Philippe Proulx +Date: Fri, 28 Oct 2016 02:09:20 -0400 +Subject: [PATCH] tests/lib/Makefile.am: remove unneeded -static flag + +Having those -static flags breaks the build in shared-only builds. + +Signed-off-by: Philippe Proulx +[Philippe: grabbed from this pull request: + https://github.com/efficios/babeltrace/pull/49 +] +--- + tests/lib/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am +index 33ada16..c685e77 100644 +--- a/tests/lib/Makefile.am ++++ b/tests/lib/Makefile.am +@@ -31,13 +31,11 @@ check_SCRIPTS = test_seek_big_trace \ + test_ctf_writer_complete + + if ENABLE_DEBUG_INFO +-test_dwarf_LDFLAGS = -static + test_dwarf_LDADD = $(LIBTAP) \ + $(top_builddir)/lib/libbabeltrace.la \ + $(top_builddir)/lib/libdebug-info.la + test_dwarf_SOURCES = test_dwarf.c + +-test_bin_info_LDFLAGS = -static + test_bin_info_LDADD = $(LIBTAP) \ + $(top_builddir)/lib/libbabeltrace.la \ + $(top_builddir)/lib/libdebug-info.la +-- +2.9.3 + diff --git a/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch b/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch deleted file mode 100644 index 849c0a3d26..0000000000 --- a/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 670d0961a823df0db28f39a354430f3dc2519418 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sat, 28 May 2016 12:53:33 +0200 -Subject: [PATCH] configure: fix uuid support detection on static build - -This change adds uuid support detection using pkg-config, before falling -back on default AC_CHECK_LIB calls. - -Using flags from pkg-config is useful for static build, because they -also include dependency flags; whereas - -AC_CHECK_LIB function achieves its test by trying to link against the -requested library, without taking care of its dependency -requirements/flags. Therefore, in case of static build, it can fail on -the uuid detection like [1], because the uuid's dependency flags -(regarding gettext) are missing. -Instead, using pkg-config to do the check will take care of getting and -setting all required flags. - -This change adds uuid detection using pkg-config helper before falling -back on the standard AC_CHECK_LIB detection for platforms missing -pkg-config. - -This issue [1] has been triggered on Buildroot farms. - -[1] http://autobuild.buildroot.net/results/43b/43b98ddf9eb44152ed9ac4a98d887af14831d8da/build-end.log - -Signed-off-by: Samuel Martin ---- - configure.ac | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 632fe39..b344fa8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,6 +65,15 @@ esac - AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"]) - - # Check for libuuid -+PKG_CHECK_MODULES([UUID], [uuid], -+[ -+ LIBS="${UUID_LIBS} ${LIBS}" -+ CFLAGS="${CFLAGS} ${UUID_CFLAGS}" -+ AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) -+ have_libuuid=yes -+], -+[ -+# try detecting libuuid without pkg-config - AC_CHECK_LIB([uuid], [uuid_generate], - [ - AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) -@@ -83,6 +92,7 @@ AC_CHECK_LIB([uuid], [uuid_generate], - AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) - fi - ]) -+]) - ] - ) - AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"]) --- -2.8.3 - diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in index d362779eac..2e8d778f40 100644 --- a/package/lttng-babeltrace/Config.in +++ b/package/lttng-babeltrace/Config.in @@ -14,18 +14,16 @@ config BR2_PACKAGE_LTTNG_BABELTRACE to/from another trace format. Babeltrace is the reference implementation of the Common - Trace Format (see ). Babeltrace + Trace Format (see ). Babeltrace can decode and display LTTng traces, since the latter are written using the CTF format. Having this tool on the target is not mandatory. You can transfer the binary trace output from the target to your - development workstation, and use babeltrace here. Buildroot - automatically builds a host babeltrace in - $(O)/host/usr/bin/babeltrace as a dependency of the - lttng-tools package. + development workstation, and use babeltrace here. Babeltrace + is packaged for all major Linux distributions. - http://www.efficios.com/babeltrace + http://diamon.org/babeltrace comment "lttng-babeltrace needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU diff --git a/package/lttng-babeltrace/lttng-babeltrace.hash b/package/lttng-babeltrace/lttng-babeltrace.hash index a9f45b212e..bca0bdb902 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.hash +++ b/package/lttng-babeltrace/lttng-babeltrace.hash @@ -1,7 +1,6 @@ -# From http://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2.md5 -md5 20a806fa7570e69a91707855a98f3ca6 babeltrace-1.2.4.tar.bz2 -# From http://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2.sha1 -sha1 c72a80e8fd905cb1ae3b0cf88885517faafe0fa1 babeltrace-1.2.4.tar.bz2 -# Locally generated -sha256 666e3a1ad2dc7d5703059963056e7800f0eab59c8eeb6be2efe4f3acc5209eb1 babeltrace-1.2.4.tar.bz2 +# From http://www.efficios.com/files/babeltrace/babeltrace-1.4.0.tar.bz2.{md5,sha1} +md5 fa99064048af5c9c6ff00e489ac809c2 babeltrace-1.4.0.tar.bz2 +sha1 3b162480ee883625e8581bf163817f78a4b6487b babeltrace-1.4.0.tar.bz2 +# Locally generated +sha256 9469eeb22617cd12668683b04c27003e5337e9ac66ade914988df3642fc0d0e4 babeltrace-1.4.0.tar.bz2 diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk index b2e03a9952..291a56195b 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.mk +++ b/package/lttng-babeltrace/lttng-babeltrace.mk @@ -4,18 +4,15 @@ # ################################################################################ -LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace -LTTNG_BABELTRACE_VERSION = 1.2.4 +LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace +LTTNG_BABELTRACE_VERSION = 1.4.0 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code) LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE - LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf +LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ host-popt host-util-linux host-libglib2 host-pkgconf -# for 0002-configure-fix-uuid-support-detection-on-static-build.patch -LTTNG_BABELTRACE_AUTORECONF = YES - $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 106c7d30064cb17ae74708a9bc085e349cc735e2 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 2 Nov 2016 02:55:07 -0400 Subject: [PATCH 1200/3392] lttng-babeltrace: add host Babeltrace as host utility Although Babeltrace is available for all major Linux distributions, some of them have a quite old version of this project. Signed-off-by: Philippe Proulx Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/lttng-babeltrace/Config.in | 6 ++++-- package/lttng-babeltrace/Config.in.host | 14 ++++++++++++++ package/lttng-babeltrace/lttng-babeltrace.mk | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 package/lttng-babeltrace/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index e33cbb57e9..3b115c5f69 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -22,6 +22,7 @@ menu "Host utilities" source "package/jq/Config.in.host" source "package/jsmin/Config.in.host" source "package/lpc3250loader/Config.in.host" + source "package/lttng-babeltrace/Config.in.host" source "package/mfgtools/Config.in.host" source "package/mke2img/Config.in.host" source "package/mkpasswd/Config.in.host" diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in index 2e8d778f40..95b635dfdd 100644 --- a/package/lttng-babeltrace/Config.in +++ b/package/lttng-babeltrace/Config.in @@ -20,8 +20,10 @@ config BR2_PACKAGE_LTTNG_BABELTRACE Having this tool on the target is not mandatory. You can transfer the binary trace output from the target to your - development workstation, and use babeltrace here. Babeltrace - is packaged for all major Linux distributions. + development workstation, and use babeltrace here. + + See the lttng-babeltrace host utility to install Babeltrace + on the host. http://diamon.org/babeltrace diff --git a/package/lttng-babeltrace/Config.in.host b/package/lttng-babeltrace/Config.in.host new file mode 100644 index 0000000000..71b9c7d9ff --- /dev/null +++ b/package/lttng-babeltrace/Config.in.host @@ -0,0 +1,14 @@ +config BR2_PACKAGE_HOST_LTTNG_BABELTRACE + bool "host lttng-babeltrace" + help + The Babeltrace project provides trace read and write + libraries, as well as a trace converter application. Plugins + can be created for any trace format to allow its conversion + to/from another trace format. + + Babeltrace is the reference implementation of the Common + Trace Format (see ). Babeltrace + can decode and display LTTng traces, since the latter are + written using the CTF format. + + http://diamon.org/babeltrace diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk index 291a56195b..deb2d071e1 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.mk +++ b/package/lttng-babeltrace/lttng-babeltrace.mk @@ -13,6 +13,7 @@ LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ host-popt host-util-linux host-libglib2 host-pkgconf +HOST_LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 625af098cd358e5dc3528b5bf39def755c6b65a6 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 2 Nov 2016 02:55:08 -0400 Subject: [PATCH 1201/3392] lttng-babeltrace: add debug info support Since Babeltrace 1.4, there is support for printing debug information along with compatible traces and event records. Babeltrace needs elfutils in this case. Signed-off-by: Philippe Proulx [Thomas: - add better description for 0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch - use automatic dependency on elfutils rather than a very complicated Config.in symbol] Signed-off-by: Thomas Petazzoni --- ...x_lib_elfutils.m4-add-cache-variable.patch | 77 +++++++++++++++++++ package/lttng-babeltrace/Config.in | 3 + package/lttng-babeltrace/lttng-babeltrace.mk | 12 ++- 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 package/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch diff --git a/package/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch b/package/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch new file mode 100644 index 0000000000..b16781419a --- /dev/null +++ b/package/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch @@ -0,0 +1,77 @@ +From 697ab0905c59561562dc52cd3b925781e07814f3 Mon Sep 17 00:00:00 2001 +From: Philippe Proulx +Date: Wed, 2 Nov 2016 01:40:12 -0400 +Subject: [PATCH] m4/ax_lib_elfutils.m4: add cache variable + +This patch adds an autoconf cache variable to override the +AC_RUN_IFELSE() test result when cross-compiling. + +Signed-off-by: Philippe Proulx +[Philippe: grabbed from this pull request: + https://github.com/efficios/babeltrace/pull/52 +] +--- + m4/ax_lib_elfutils.m4 | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +diff --git a/m4/ax_lib_elfutils.m4 b/m4/ax_lib_elfutils.m4 +index fcfe06b..f4fcb0d 100644 +--- a/m4/ax_lib_elfutils.m4 ++++ b/m4/ax_lib_elfutils.m4 +@@ -21,7 +21,9 @@ + # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + # + # Check the currently installed version of elfutils by using the +-# _ELFUTILS_PREREQ macro defined in elfutils/version.h. ++# `_ELFUTILS_PREREQ` macro defined in . ++# ++# The cache variable for this test is `bt_cv_lib_elfutils`. + # + # AX_LIB_ELFUTILS(MAJOR_VERSION, MINOR_VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) + # --------------------------------------------------------------------------- +@@ -29,7 +31,6 @@ AC_DEFUN([AX_LIB_ELFUTILS], [ + m4_pushdef([major_version], [$1]) + m4_pushdef([minor_version], [$2]) + +- AC_MSG_CHECKING([for elfutils version >= major_version.minor_version]) + m4_if([$#], 3, [ + m4_pushdef([true_action], [$3]) + ], [ +@@ -43,20 +44,21 @@ AC_DEFUN([AX_LIB_ELFUTILS], [ + AC_MSG_ERROR(elfutils >= major_version.minor_version is required)]) + ]) + +- AC_RUN_IFELSE([ +- AC_LANG_SOURCE([ +- #include +- #include ++ AC_CACHE_CHECK( ++ [for elfutils version >= major_version.minor_version], ++ [bt_cv_lib_elfutils], [ ++ AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ #include ++ #include ++ ++ int main(void) { ++ return _ELFUTILS_PREREQ(major_version, minor_version) ? EXIT_SUCCESS : EXIT_FAILURE; ++ } ++ ])], [bt_cv_lib_elfutils=yes], [bt_cv_lib_elfutils=no]) ++ ] ++ ) + +- int main(void) { +- return _ELFUTILS_PREREQ(major_version, minor_version) ? EXIT_SUCCESS : EXIT_FAILURE; +- } +- ]) +- ], +- echo yes +- true_action, +- echo no +- false_action) ++ AS_IF([test "x$bt_cv_lib_elfutils" = "xyes"], [true_action], [false_action]) + + m4_popdef([false_action]) + m4_popdef([true_action]) +-- +2.9.3 + diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in index 95b635dfdd..9634a4d3a6 100644 --- a/package/lttng-babeltrace/Config.in +++ b/package/lttng-babeltrace/Config.in @@ -18,6 +18,9 @@ config BR2_PACKAGE_LTTNG_BABELTRACE can decode and display LTTng traces, since the latter are written using the CTF format. + To get support for debugging information, enable the + elfutils package. + Having this tool on the target is not mandatory. You can transfer the binary trace output from the target to your development workstation, and use babeltrace here. diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk index deb2d071e1..59327dbf5d 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.mk +++ b/package/lttng-babeltrace/lttng-babeltrace.mk @@ -10,10 +10,20 @@ LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code) LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf -LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ host-popt host-util-linux host-libglib2 host-pkgconf HOST_LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info +# For 0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch +LTTNG_BABELTRACE_AUTORECONF = YES + +ifeq ($(BR2_PACKAGE_ELFUTILS),y) +LTTNG_BABELTRACE_DEPENDENCIES += elfutils +LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info +LTTNG_BABELTRACE_CONF_ENV += bt_cv_lib_elfutils=yes +else +LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From ab70598952323a01dcec8d1a337f6c748399d00b Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Wed, 2 Nov 2016 18:46:24 +0100 Subject: [PATCH 1202/3392] tinyalsa: bump version to 1.0.2 tinyalsa has started doing release, so we will use it. With this release, both our patches were applied mainline: - 0001-tinypcminfo-make-function-pcm_get_format_name-static.patch [1] - 0002-asound.h-include-time.h-to-get-struct-timespec-proto.patch [2] The Makefile has changed a lot, so we take advantage of that to simplify our package. 1. https://github.com/tinyalsa/tinyalsa/commit/7d204edfe87f4e22105bcaeb750d69ac769afdd6 2. https://github.com/tinyalsa/tinyalsa/commit/c8333f8c7a4e4b9549abeef7530b2cd20a18e537 Signed-off-by: Maxime Hadjinlian [Thomas: add patch to remove doxygen usage.] Signed-off-by: Thomas Petazzoni --- .../tinyalsa/0001-disable-doxygen-usage.patch | 32 +++++++++++++ ...-function-pcm_get_format_name-static.patch | 45 ------------------- ...-time.h-to-get-struct-timespec-proto.patch | 33 -------------- package/tinyalsa/tinyalsa.hash | 2 +- package/tinyalsa/tinyalsa.mk | 20 ++++----- 5 files changed, 42 insertions(+), 90 deletions(-) create mode 100644 package/tinyalsa/0001-disable-doxygen-usage.patch delete mode 100644 package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch delete mode 100644 package/tinyalsa/0002-asound.h-include-time.h-to-get-struct-timespec-proto.patch diff --git a/package/tinyalsa/0001-disable-doxygen-usage.patch b/package/tinyalsa/0001-disable-doxygen-usage.patch new file mode 100644 index 0000000000..9c867a8fec --- /dev/null +++ b/package/tinyalsa/0001-disable-doxygen-usage.patch @@ -0,0 +1,32 @@ +Disable doxygen usage + +In order to avoid a dependency on doxygen on the build machine, this +patch adjusts the main Makefile to not build and install the +documentation. + +Signed-off-by: Thomas Petazzoni + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -13,13 +13,11 @@ + all: + $(MAKE) -C src + $(MAKE) -C utils +- $(MAKE) -C doxygen + + .PHONY: clean + clean: + $(MAKE) -C src clean + $(MAKE) -C utils clean +- $(MAKE) -C doxygen clean + + .PHONY: install + install: +@@ -27,5 +25,3 @@ + cp -Ru include/tinyalsa $(DESTDIR)$(INCDIR)/ + $(MAKE) -C src install + $(MAKE) -C utils install +- $(MAKE) -C doxygen install +- diff --git a/package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch b/package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch deleted file mode 100644 index 4c8d48fd9e..0000000000 --- a/package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 10d82df8d920ceec4be9028a4939f96d6f407e81 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 26 Aug 2015 09:20:13 +0200 -Subject: [PATCH] tinypcminfo: make function pcm_get_format_name() static - -When building tinyalsa with gcc 5.x, the following warnings appear: - -tinypcminfo.c:97:52: warning: 'format_lookup' is static but used in inline function 'pcm_get_format_name' which is not static - return bit_index < ARRAY_SIZE(format_lookup) ? format_lookup[bit_index] : NULL; - ^ -tinypcminfo.c:97:35: warning: 'format_lookup' is static but used in inline function 'pcm_get_format_name' which is not static - return bit_index < ARRAY_SIZE(format_lookup) ? format_lookup[bit_index] : NULL; - -And the build fails with: - -tinypcminfo.o: In function `main': -tinypcminfo.c:(.text+0x2f0): undefined reference to `pcm_get_format_name' -collect2: error: ld returned 1 exit status - -To fix this, this patch marks the pcm_get_format_name() as static, -since it's anyway only used in tinypcminfo.c. - -Submitted upstream: https://github.com/tinyalsa/tinyalsa/pull/61 - -Signed-off-by: Thomas Petazzoni ---- - tinypcminfo.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tinypcminfo.c b/tinypcminfo.c -index b2d11bc..99eec34 100644 ---- a/tinypcminfo.c -+++ b/tinypcminfo.c -@@ -92,7 +92,7 @@ static const char *format_lookup[] = { - /* Returns a human readable name for the format associated with bit_index, - * NULL if bit_index is not known. - */ --inline const char *pcm_get_format_name(unsigned bit_index) -+static inline const char *pcm_get_format_name(unsigned bit_index) - { - return bit_index < ARRAY_SIZE(format_lookup) ? format_lookup[bit_index] : NULL; - } --- -2.5.0 - diff --git a/package/tinyalsa/0002-asound.h-include-time.h-to-get-struct-timespec-proto.patch b/package/tinyalsa/0002-asound.h-include-time.h-to-get-struct-timespec-proto.patch deleted file mode 100644 index 1b5d43cec5..0000000000 --- a/package/tinyalsa/0002-asound.h-include-time.h-to-get-struct-timespec-proto.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c8333f8c7a4e4b9549abeef7530b2cd20a18e537 Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Mon, 12 Oct 2015 12:57:09 +0100 -Subject: [PATCH] asound.h: include to get struct timespec prototype - -without including it, we get -In file included from mixer.c:44:0: -include/sound/asound.h:337:18: error: field 'trigger_tstamp' has incomplete type -include/sound/asound.h:338:18: error: field 'tstamp' has incomplete type -etc. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit c8333f8c7a4e - - include/sound/asound.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/sound/asound.h b/include/sound/asound.h -index a041628ec28e..7c6de81673f5 100644 ---- a/include/sound/asound.h -+++ b/include/sound/asound.h -@@ -12,6 +12,7 @@ - #ifndef __SOUND_ASOUND_H - #define __SOUND_ASOUND_H - -+#include - #include - - #define SNDRV_PROTOCOL_VERSION(major, minor, subminor) (((major)<<16)|((minor)<<8)|(subminor)) --- -2.8.1 - diff --git a/package/tinyalsa/tinyalsa.hash b/package/tinyalsa/tinyalsa.hash index 5182b007d7..e07b4195eb 100644 --- a/package/tinyalsa/tinyalsa.hash +++ b/package/tinyalsa/tinyalsa.hash @@ -1,2 +1,2 @@ # locally computed -sha256 a15abd57e74a2c41dbc57cac6fae39a28d2643e9aa48263399de37481b9647d3 tinyalsa-f2a7b6d3d81bd337a540d56704b4aaa7bdb046fe.tar.gz +sha256 b3f22f762cca8edc692d239a9793a66b11aa5447dcee009e53987f5850f405e3 tinyalsa-v1.0.2.tar.gz diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index 816f6839f2..4cd01d5d44 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYALSA_VERSION = f2a7b6d3d81bd337a540d56704b4aaa7bdb046fe +TINYALSA_VERSION = v1.0.2 TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3c TINYALSA_INSTALL_STAGING = YES @@ -14,19 +14,17 @@ define TINYALSA_BUILD_CMDS endef define TINYALSA_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0755 $(@D)/libtinyalsa.so \ - $(STAGING_DIR)/usr/lib/libtinyalsa.so - $(INSTALL) -D -m 0644 $(@D)/include/tinyalsa/asoundlib.h \ - $(STAGING_DIR)/usr/include/tinyalsa/asoundlib.h + $(TARGET_MAKE_ENV) $(MAKE) \ + -C $(@D) \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + DESTDIR="$(STAGING_DIR)" install endef define TINYALSA_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/libtinyalsa.so \ - $(TARGET_DIR)/usr/lib/libtinyalsa.so - $(INSTALL) -D -m 0755 $(@D)/tinyplay $(TARGET_DIR)/usr/bin/tinyplay - $(INSTALL) -D -m 0755 $(@D)/tinycap $(TARGET_DIR)/usr/bin/tinycap - $(INSTALL) -D -m 0755 $(@D)/tinymix $(TARGET_DIR)/usr/bin/tinymix - $(INSTALL) -D -m 0755 $(@D)/tinypcminfo $(TARGET_DIR)/usr/bin/tinypcminfo + $(TARGET_MAKE_ENV) $(MAKE) \ + -C $(@D) \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package)) From aed8107168f6c3bd8e4646e156a9507a7e800009 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Wed, 2 Nov 2016 16:01:12 -0500 Subject: [PATCH 1203/3392] DEVELOPERS: add David Lechner Signed-off-by: David Lechner Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d89bc03f9d..1c3d6d7d04 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -387,6 +387,12 @@ F: package/openldap/ N: David du Colombier <0intro@gmail.com> F: package/x264/ +N: David Lechner +F: board/lego/ev3/ +F: configs/lego_ev3_defconfig +F: linux/linux-ext-ev3dev-linux-drivers.mk +F: package/ev3dev-linux-drivers/ + N: Davide Viti F: package/flann/ F: package/python-paho-mqtt/ From 052554bfbe179fcf83b079648a7c5e2fbd6466d1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 3 Nov 2016 21:31:14 +0100 Subject: [PATCH 1204/3392] CHANGES: prepare for 2016.11-rc1 Signed-off-by: Thomas Petazzoni --- CHANGES | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index fd5abcb8ef..c041ec8c3d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,10 +1,93 @@ -2016.11-rc1, +2016.11-rc1, Released November 3rd, 2016 - CMake support: + Fixes all over the tree and new features. + + Architecture: support for sh64 removed, improved support for + MIPS core selection, + + Toolchain: support for musl powerpc64le, mips64 and mipsr6 + toolchains, ARC toolchain components updates, gcc 6.x series + bumped to 6.2.0, default binutils version switched to 2.26, + default gcc version switched to gcc 5.x, Linaro toolchains + updated, uclibc-ng bumped to 1.0.19. + + Core infrastructure: support for multiple BR2_EXTERNAL + directories. + + Package infrastructure: new variable $(PKG)_DL_OPTS, addition + of -show-rdepends to list reverse dependencies, and + -graph-rdepends to graph reverse dependencies. + + CMake support: the toolchainfile.cmake file now provides a + definition of the CMAKE_BUILD_TYPE variable. The + toolchainfile.cmake also no longer passes the compiler/linker + flags defined by Buildroot. + + New defconfigs: warp7, Solidrun's MX6 Cubox/Hummingboard, + TS-4900, Grinn's liteBoard, Udoo MX6Q/DL, Qemu ARM noMMU, + BeagleBone Qt5 demo, Digilent Zybo. + + New packages: arm-trusted-firmware, amd-catalyst, atop, aufs, + aufs-util, fwts, gst1-rtsp-server, libglob, libite, mfgtools, + mksh, motion, paho-mqtt-c, php-amqp, python-couchdb, + python-crcmod, python-cssutils, python-docutils, + python-futures, python-mwclient, python-mwscrape, + python-mwscrape2slob, python-pyelftools, python-pyicu, + python-pylru, python-pyqt5, python-requests-toolbelt, + python-simpleaudio, python-slob, rabbitmq-server, shapelib, + vdr, vdr-plugin-vnsiserver, vexpress-firmware, xvisor, iio and + gpio linux tools. + + Removed packages: binutils 2.24, gcc 4.7, ipkg, + kodi-addon-xvdr, libgail, sstrip, torsmo, webkit, webkitgtk24, + wvdial, wvstreams, + + Documentation: the list of packages that was present in the + Buildroot manual has been removed. + + Other: addition of a DEVELOPERS file listing developers taking + care of packages or architectures. + + Issues resolved (http://bugs.buildroot.org): - The toolchainfile.cmake file now provides a definition of the - CMAKE_BUILD_TYPE variable. The toolchainfile.cmake also no - longer passes the compiler/linker flags defined by Buildroot. + #7802: host-python build hangs compiling getbuildinfo.o + #8206: mplayer uses host xorg development files + #8536: Building sudo with PAM results in unusable sudo + #8646: check-host-rpath script returns false positives when rpath + contains symlink + #8696: xdriver_xf86-input-mouse install header files in target + directory + #8811: rp-pppoe - generated scripts commands use HOST pathnames, + not necessarily TARGET + #8846: Orphaned/missing toolchain borks eclipse plugin + #8856: python tornado runtime wasn't met on buildroot 2016.02 + #8901: gcc failes to build if fortran is enabled + #8916: LDFLAGS pass to openssh + #8941: "ls" of an NFSv4 share only works when pumped through strace + #8946: Valgrind fails to build with stack protection turned on + #9021: Kodi - Broken: Illegal instruction (core dumped) + #9096: rootfs.ubi not created + #9176: minnowboard : USB not mounted + #9196: raspberry pi 3 default build seem broken + #9201: Permission denied make: *** [core-dependencies] Error 126 in + Buildroot-2015.08.1 + #9216: log4cpp package build fails to build within install + #9221: Kodi needs "Python .py and .pyc support" otherwise it crashes when + pressing buttons. + #9229: Firefly boot fails with: "failed to find part:boot" + #9256: [Config file] New device: Odroid-U2/U3 + #9296: Buildroot Fails on applying patches + #9301: U-boot fails to build with default zynq_zed_defconfig configuration + #9316: U-boot fails to build if libssl-dev is not installed + #9321: Vanilla libcrypt++ v5.6.3 doesn't allow to work Nvidia Tegra's + flash utility (tegrarcm) + #9326: Odroid-C2 build results in non-bootable image + #9336: Improve iconv support for external toolchain based builds + #9356: gdb package + #9366: no link rootfs.ext4 -> rootfs.ext2 + #9371: openssl: download failes with "Only allow downloads from primary + download site" + local server + #9381: check-host-rpath issues 2016.08, Released September 1st, 2016 From d62522722921342af7ea24214e8f6eda76a4fca1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 29 Oct 2016 10:26:41 +0200 Subject: [PATCH 1205/3392] package/pseudo: new package Pseudo is a program that can either be used directly or as an LD_PRELOAD, which allows these operations to succeed as if the user did have system administrator privileges even though they are an ordinary user. Pseudo has a lot of similarities to fakeroot but is a new implementation that improves on the problems seen using fakeroot. Signed-off-by: "Yann E. MORIN" Cc: Andrey Yurovsky Cc: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/pseudo/pseudo.hash | 2 ++ package/pseudo/pseudo.mk | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 package/pseudo/pseudo.hash create mode 100644 package/pseudo/pseudo.mk diff --git a/package/pseudo/pseudo.hash b/package/pseudo/pseudo.hash new file mode 100644 index 0000000000..5822d0e6f3 --- /dev/null +++ b/package/pseudo/pseudo.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 d7767c9a73b0df4f1f26952cf5eca4c6ff6fc4bc5ef15a904ea3839c70161936 pseudo-7abc9396731149df5eaf43c84fed4f3053b64de6.tar.gz diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk new file mode 100644 index 0000000000..314fa820c5 --- /dev/null +++ b/package/pseudo/pseudo.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# pseudo +# +################################################################################ + +PSEUDO_VERSION = 7abc9396731149df5eaf43c84fed4f3053b64de6 +PSEUDO_SITE = https://git.yoctoproject.org/git/pseudo +PSEUDO_SITE_METHOD = git + +# No "or later" clause. +PSEUDO_LICENSE = LGPLv2.1 +PSEUDO_LICENSE_FILES = COPYING + +$(eval $(host-autotools-package)) From 8035ceb56cc3ba2541aba0d0ead3f29900d9e310 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 29 Oct 2016 10:26:42 +0200 Subject: [PATCH 1206/3392] fs: use pseudo instead of fakeroot fakeroot misbhaves when there are SElinux contexts, as reported in #9386, and further detailed in https://bugzilla.redhat.com/show_bug.cgi?id=1238802 A proposal in the FC bug is to use pseudo instead of fakeroot. Pseudo is a from-scratch re-implementation of fakeroot; it is used in Poky/OE instead of fakeroot. Fixes #9386. Reported-by: Andrey Yurovsky Signed-off-by: "Yann E. MORIN" Cc: Andrey Yurovsky Cc: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- fs/common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 2b31e12934..2dbef4d7b0 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -43,7 +43,7 @@ ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) define ROOTFS_TARGET_INTERNAL # extra deps -ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \ +ROOTFS_$(2)_DEPENDENCIES += host-pseudo host-makedevs \ $$(if $$(PACKAGES_USERS)$$(ROOTFS_USERS_TABLES),host-mkpasswd) ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) @@ -97,7 +97,7 @@ endif echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) - PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT) + PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/pseudo -- $$(FAKEROOT_SCRIPT) $$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE) -@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE) ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),) From 1bcdddf7ebb38afe72f0ae2a98ff24a5a80e3974 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 3 Nov 2016 21:17:58 +0100 Subject: [PATCH 1207/3392] boards: add FriendlyARM Nanopi NEO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The FriendlyARM Nanopi NEO is a 4x4cm² board with an Allwiner H3 SoC: - quad-core Cortex-A7 @1.2GHz - 256 or 512MiB of DDR - uSDCard as only storage option - 3x USB 2.0 host (one socket, two on expansion pin-holes) - 1x USB 2.0 OTG (also used as power source) - 10/100 etehrnet MAC - GPIOs, SPI, I2c... Support for the Nanopi NEO in U-Boot and Linux is very recent, so much so that we have to use an -rc tag for U-Boot and a special Linux tree. As for Linux, I pushed a git tree on Github with a single tag that matches what is currently queued in the sunxi-next queued for 4.10, based on 4.9-rc3. All those commits are from Maxime's tree, the maintainer for most sunxi stuff. This also means that we can't use the Linux headers from the kernel being built (which is what we usually do) because those report 4.9, while Buildroot currently knows only of 4.8 at best. So this is what we use. Unfortunately, support for the ethernet MAC and the USB OTG are not yet upstream, but are being actively worked on. The Nanopi NEO is very similar to the Orangepi PC, so I was able to scanvenge most of its configuration. ;-) Thanks Maxime for your help on IRC! :-) Signed-off-by: "Yann E. MORIN" Cc: Maxime Ripard Signed-off-by: Thomas Petazzoni --- board/nanopi-neo/boot.cmd | 8 +++++++ board/nanopi-neo/genimage.cfg | 34 +++++++++++++++++++++++++++ board/nanopi-neo/post-build.sh | 12 ++++++++++ board/nanopi-neo/post-image.sh | 15 ++++++++++++ board/nanopi-neo/readme.txt | 43 ++++++++++++++++++++++++++++++++++ configs/nanopi_neo_defconfig | 42 +++++++++++++++++++++++++++++++++ 6 files changed, 154 insertions(+) create mode 100644 board/nanopi-neo/boot.cmd create mode 100644 board/nanopi-neo/genimage.cfg create mode 100755 board/nanopi-neo/post-build.sh create mode 100755 board/nanopi-neo/post-image.sh create mode 100644 board/nanopi-neo/readme.txt create mode 100644 configs/nanopi_neo_defconfig diff --git a/board/nanopi-neo/boot.cmd b/board/nanopi-neo/boot.cmd new file mode 100644 index 0000000000..7874057859 --- /dev/null +++ b/board/nanopi-neo/boot.cmd @@ -0,0 +1,8 @@ +setenv fdt_high ffffffff + +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + +fatload mmc 0 $kernel_addr_r zImage +fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-neo.dtb + +bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/nanopi-neo/genimage.cfg b/board/nanopi-neo/genimage.cfg new file mode 100644 index 0000000000..ad43d31049 --- /dev/null +++ b/board/nanopi-neo/genimage.cfg @@ -0,0 +1,34 @@ +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-h3-nanopi-neo.dtb", + "boot.scr" + } + } + size = 10M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 1040384 # 1MB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 32M + } +} diff --git a/board/nanopi-neo/post-build.sh b/board/nanopi-neo/post-build.sh new file mode 100755 index 0000000000..e6791e71ab --- /dev/null +++ b/board/nanopi-neo/post-build.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# post-build.sh for Nanopi NEO, based on the Orange Pi PC +# 2013, Carlo Caione +# 2016, "Yann E. MORIN" + +BOARD_DIR="$( dirname "${0}" )" +MKIMAGE="${HOST_DIR}/usr/bin/mkimage" +BOOT_CMD="${BOARD_DIR}/boot.cmd" +BOOT_CMD_H="${BINARIES_DIR}/boot.scr" + +# U-Boot script +"${MKIMAGE}" -C none -A arm -T script -d "${BOOT_CMD}" "${BOOT_CMD_H}" diff --git a/board/nanopi-neo/post-image.sh b/board/nanopi-neo/post-image.sh new file mode 100755 index 0000000000..740386ef82 --- /dev/null +++ b/board/nanopi-neo/post-image.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# post-image.sh for Nanopi NEO, based on the Orange Pi PC + +BOARD_DIR="$( dirname "${0}" )" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/nanopi-neo/readme.txt b/board/nanopi-neo/readme.txt new file mode 100644 index 0000000000..95fc62897a --- /dev/null +++ b/board/nanopi-neo/readme.txt @@ -0,0 +1,43 @@ +Intro +===== + +The instructions herein are valid for the FriendlyARM NanoPi NEO, +both the 256MiB and 512MiB versions. They should also work the the +NanoPi NEO Air, but this is untested so far. + +The FriendlyARM Nanopi NEO is a 4x4cm² board with an Allwiner H3 SoC: + - quad-core Cortex-A7 @1.2GHz + - 256 or 512MiB of DDR + - uSDCard as only storage option + - 3x USB 2.0 host (one socket, two on expansion pin-holes) + - 1x USB 2.0 OTG (also used as power source) + - 10/100 ethernet MAC + - GPIOs, SPI, I2c... + +Support for the Nanopi NEO in U-Boot and Linux is very recent, so +much so that we have to use an -rc tag for U-Boot and a special +Linux tree. + +Unfortunately, support for the ethernet MAC and the USB OTG are not +yet upstream, but are being actively worked on. + + +How to build +============ + + $ make nanopi_neo_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +You will then obtain an image ready to be written to your micro SDcard: + + $ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +Notes: + - replace 'sdX' with the actual device with your micro SDcard, + - you may need to be root to do that (use 'sudo'). + +Insert the micro SDcard in your NanoPi NEO and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/nanopi_neo_defconfig b/configs/nanopi_neo_defconfig new file mode 100644 index 0000000000..2f4ea37574 --- /dev/null +++ b/configs/nanopi_neo_defconfig @@ -0,0 +1,42 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y + +# Cannot use same headers as the kernel, because kernel is 4.9 +# and we only know 4.8 at best so far +BR2_KERNEL_HEADERS_4_8=y + +BR2_TARGET_GENERIC_HOSTNAME="nanopi-neo" +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/nanopi-neo/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nanopi-neo/post-image.sh" + +# Use a special kernel tree until all support finally lands upstream +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/yann-morin-1998/linux" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4.9-rc3-sunxi-next-2016-11-02" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-neo" + +# Use an -rc tag because the defconfig is very recent +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11-rc3" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" + +# Build an sdcard image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_BLOCKS=32768 +BR2_TARGET_ROOTFS_EXT2_INODES=8192 +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From 2bc3d067ef2f30bf54b11d970f9e4b8908278ead Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 3 Nov 2016 21:46:51 +0100 Subject: [PATCH 1208/3392] CHANGES: additional updates for 2016.11-rc1 Signed-off-by: Thomas Petazzoni --- CHANGES | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index c041ec8c3d..db27bc7d10 100644 --- a/CHANGES +++ b/CHANGES @@ -23,13 +23,13 @@ toolchainfile.cmake also no longer passes the compiler/linker flags defined by Buildroot. - New defconfigs: warp7, Solidrun's MX6 Cubox/Hummingboard, + New defconfigs: WaRP7, Solidrun's MX6 Cubox/Hummingboard, TS-4900, Grinn's liteBoard, Udoo MX6Q/DL, Qemu ARM noMMU, - BeagleBone Qt5 demo, Digilent Zybo. + BeagleBone Qt5 demo, Digilent Zybo, FriendlyARM Nanopi NEO. New packages: arm-trusted-firmware, amd-catalyst, atop, aufs, aufs-util, fwts, gst1-rtsp-server, libglob, libite, mfgtools, - mksh, motion, paho-mqtt-c, php-amqp, python-couchdb, + mksh, motion, paho-mqtt-c, php-amqp, pseudo, python-couchdb, python-crcmod, python-cssutils, python-docutils, python-futures, python-mwclient, python-mwscrape, python-mwscrape2slob, python-pyelftools, python-pyicu, @@ -67,6 +67,7 @@ #8946: Valgrind fails to build with stack protection turned on #9021: Kodi - Broken: Illegal instruction (core dumped) #9096: rootfs.ubi not created + #9111: glibc 2.23: libmvec.so not copied #9176: minnowboard : USB not mounted #9196: raspberry pi 3 default build seem broken #9201: Permission denied make: *** [core-dependencies] Error 126 in @@ -88,6 +89,7 @@ #9371: openssl: download failes with "Only allow downloads from primary download site" + local server #9381: check-host-rpath issues + #9386: ubinize fails with or without custom config 2016.08, Released September 1st, 2016 From 5e4ceb105fc40e45e1c120c9b90b0986c5decd0b Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 3 Nov 2016 09:59:27 +0200 Subject: [PATCH 1209/3392] DEVELOPERS: remove invalid email address Merge the two entries of Richard Braun under the correct address. Cc: Richard Braun Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1c3d6d7d04..10b431b9eb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1232,10 +1232,8 @@ F: package/atop/ N: Rhys Williams F: package/lirc-tools/ -N: Richard Braun -F: package/curlftpfs/ - N: Richard Braun +F: package/curlftpfs/ F: package/tzdata/ N: Rico Bachmann From 5e3f89666bbe0bf493ade79ffa4ad3c863bf71b4 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Thu, 3 Nov 2016 02:55:16 +0100 Subject: [PATCH 1210/3392] core: don't reset MAKEOVERRIDES when re-entering make We reset MAKEOVERRIDES to avoid passing down variables that are overridden on the command line to the package build systems. Indeed, the variables overridden on the command line will be Buildroot variables and not relevant to the package build system. In particular the O option is used by some packages and the value passed in on the command line is plain wrong for the individual package. However, in commit 916e614b, MAKEOVERRIDES was moved earlier and it was reset _before_ re-entering make in the cases when something has to be fixed up (incorrect umask, non-absolute paths in O or CURDIR). Therefore, if make is re-entered, any command line overrides are lost. This particularly bites the autobuilders, because they use O= to specify the output directory, and they add BR2_JLEVEL=... to avoid starting too many jobs in parallel. The BR2_JLEVEL override is lost. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Samuel Martin Cc: Yann E. MORIN Reviewed-by: Samuel Martin Tested-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c00e2008d1..4b494a3307 100644 --- a/Makefile +++ b/Makefile @@ -35,11 +35,6 @@ SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ ifneq ("$(origin O)", "command line") O := $(CURDIR)/output else -# Other packages might also support Linux-style out of tree builds -# with the O= syntax (E.G. BusyBox does). As make automatically -# forwards command line variable definitions those packages get very -# confused. Fix this by telling make to not do so. -MAKEOVERRIDES := # Strangely enough O is still passed to submakes with MAKEOVERRIDES # (with make 3.81 atleast), the only thing that changes is the output # of the origin function (command line -> environment). @@ -155,6 +150,13 @@ else ifneq ($(filter-out $(nobuild_targets),$(MAKECMDGOALS)),) BR_BUILDING = y endif +# We call make recursively to build packages. The command-line overrides that +# are passed to Buildroot don't apply to those package build systems. In +# particular, we don't want to pass down the O= option for out-of-tree +# builds, because the value specified on the command line will not be correct +# for packages. +MAKEOVERRIDES := + # Include some helper macros and variables include support/misc/utils.mk From 2048e22fa1fe2d5ff654e0fb6a17042254efc2a3 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Thu, 3 Nov 2016 02:55:17 +0100 Subject: [PATCH 1211/3392] core: remove redundant "override O := $(O)" The top-level Makefile contains an "override O := $(O)" statement that is purportedly required to make sure the O flag doesn't leak into the environment of sub-makes. However, since commit 173135d, there is already an "override O := ..." a few lines down. Therefore, the first override is redundant. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Makefile b/Makefile index 4b494a3307..cb030d46cf 100644 --- a/Makefile +++ b/Makefile @@ -34,13 +34,6 @@ SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ # build by preventing it from being forwarded to sub-make calls. ifneq ("$(origin O)", "command line") O := $(CURDIR)/output -else -# Strangely enough O is still passed to submakes with MAKEOVERRIDES -# (with make 3.81 atleast), the only thing that changes is the output -# of the origin function (command line -> environment). -# Unfortunately some packages don't look at origin (E.G. uClibc 0.9.31+) -# To really make O go away, we have to override it. -override O := $(O) endif # Check if the current Buildroot execution meets all the pre-requisites. From 77315259df98c4ba9cb0c6bf609bd04ab7557902 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 3 Nov 2016 16:40:16 -0200 Subject: [PATCH 1212/3392] configs: Remove udoo_quad_defconfig configs/mx6udoo_defconfig supports the quad and dual-lite variants, so there is no need to keep udoo_quad_defconfig anymore. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/udoo_quad_defconfig | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 configs/udoo_quad_defconfig diff --git a/configs/udoo_quad_defconfig b/configs/udoo_quad_defconfig deleted file mode 100644 index 534444686d..0000000000 --- a/configs/udoo_quad_defconfig +++ /dev/null @@ -1,29 +0,0 @@ -# Architceture -BR2_arm=y -BR2_cortex_a9=y -BR2_ARM_ENABLE_VFP=y - -# Linux headers same as kernel, a 3.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/UDOOboard/Kernel_Unico" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8a6eb060a0d968048f88d5a94510fc6db2c37939" -BR2_LINUX_KERNEL_PATCH="https://github.com/torvalds/linux/commit/455bd4c430b0c0a361f38e8658a0d6cb469942b5.patch https://github.com/torvalds/linux/commit/418df63adac56841ef6b0f1fcf435bc64d4ed177.patch" -BR2_LINUX_KERNEL_DEFCONFIG="UDOO" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="udoo_quad" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/UDOOboard/U-Boot_Unico-2013" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1b90fd4bafb1efe05f88eaded731d99a1428f497" -BR2_TARGET_UBOOT_FORMAT_IMX=y From 7ead164ba38656607fdd29529752210045ce2f4f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 3 Nov 2016 16:40:17 -0200 Subject: [PATCH 1213/3392] DEVELOPERS: Add an entry for mx6udoo_defconfig Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 10b431b9eb..c4b31174e6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -462,6 +462,7 @@ F: board/warp7/ F: configs/freescale_imx* F: configs/imx6ulpico_defconfig F: configs/mx6cubox_defconfig +F: configs/mx6udoo_defconfig F: configs/warp7_defconfig N: Fabio Porcedda From ad5cb7474fdaaa60e0a21743d1555f4f69b5b752 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Thu, 3 Nov 2016 21:36:04 +0100 Subject: [PATCH 1214/3392] owfs: install python bindings in the correct location The owfs build system has a pretty complicated way of configuring the Python bindings. It ends up with setting PYSITEDIR to the host-python site-packages path, and it still prepends DESTDIR to that. As a simple fix, override PYSITEDIR with the correct value on the make command line. Fixes: http://autobuild.buildroot.net/results/200/200846650641494290aa67d28ea6fb2c9351d4dc http://autobuild.buildroot.net/results/99c/99c00248dd8b00071bcdbc73336cc276c68a4c16 and many more Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/owfs/owfs.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index 83614afc70..e0679d21b7 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -66,6 +66,13 @@ OWFS_MAKE_ENV += \ _python_prefix=/usr \ _python_exec_prefix=/usr OWFS_DEPENDENCIES += python host-swig +# The configure scripts finds PYSITEDIR as the python_lib directory of +# host-python, and then prepends DESTDIR in front of it. So we end up +# installing things in $(TARGET_DIR)/$(HOST_DIR)/usr/lib/python which is +# clearly wrong. +# Patching owfs to do the right thing is not trivial, it's much easier to +# override the PYSITEDIR variable in make. +OWFS_EXTRA_MAKE_OPTS += PYSITEDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages else OWFS_CONF_OPTS += --disable-owpython --without-python endif @@ -75,6 +82,8 @@ ifeq ($(BR2_STATIC_LIBS),y) OWFS_CONF_OPTS += --disable-zero endif +OWFS_MAKE = $(MAKE) $(OWFS_EXTRA_MAKE_OPTS) + define OWFS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S25owserver \ $(TARGET_DIR)/etc/init.d/S25owserver From 108b9c1e6b15d74d2e3a3241901fbdaca42df524 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 3 Nov 2016 13:25:46 +0000 Subject: [PATCH 1215/3392] net-tools: add a patch to avoid struct redefinition This fixes a struct redefinition problem like this one: ================================ In file included from /usr/include/linux/if_tunnel.h:6:0, from iptunnel.c:34: /usr/include/linux/ip.h:85:8: error: redefinition of 'struct iphdr' struct iphdr { ^ In file included from iptunnel.c:29:0: /usr/include/netinet/ip.h:45:8: note: originally defined here struct iphdr ^ ================================ iptunnel.c includes netinet/ip.h which contains a definition of the iphdr struct. iptunnel.c also includes linux/if_tunnel.h which includes linux/ip.h which contains a definition of the iphdr struct. So, both netinet/ip.h and linux/ip.h define the iphdr struct, and both of them have been included directly or indirectly by iptunnel.c. Because of that the compilation fails due to a struct redefinition. The problem can be solved by just not including netinet/ip.h. The patch has been sent upstream as a merge request: https://sourceforge.net/p/net-tools/code/merge-requests/3/ Fixes: http://autobuild.buildroot.net/results/dce/dce499da84b2a41bab946d5109a283ccb85c8b81/ Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- ...tunnel.c-do-not-include-netinet-ip.h.patch | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch diff --git a/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch b/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch new file mode 100644 index 0000000000..002c9da639 --- /dev/null +++ b/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch @@ -0,0 +1,54 @@ +From 7a9a369d9de784791a2ab384877aab5ff3801d4e Mon Sep 17 00:00:00 2001 +From: Vicente Olivert Riera +Date: Thu, 3 Nov 2016 12:59:39 +0000 +Subject: [PATCH] iptunnel.c: do not include netinet/ip.h + +This fixes a struct redefinition problem like this one: + +================================ +In file included from /usr/include/linux/if_tunnel.h:6:0, + from iptunnel.c:34: +/usr/include/linux/ip.h:85:8: error: redefinition of 'struct iphdr' + struct iphdr { + ^ +In file included from iptunnel.c:29:0: +/usr/include/netinet/ip.h:45:8: note: originally defined here + struct iphdr + ^ +================================ + +iptunnel.c includes netinet/ip.h which contains a definition of the +iphdr struct. + +iptunnel.c also includes linux/if_tunnel.h which includes linux/ip.h +which contains a definition of the iphdr struct. + +So, both netinet/ip.h and linux/ip.h define the iphdr struct, and both +of them have been included directly or indirectly by iptunnel.c. Because +of that the compilation fails due to a struct redefinition. + +The problem can be solved by just not including netinet/ip.h. + +Upstream status: merge request sent +https://sourceforge.net/p/net-tools/code/merge-requests/3/ + +Signed-off-by: Vicente Olivert Riera +--- + iptunnel.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/iptunnel.c b/iptunnel.c +index 3fe1b84..247ae10 100644 +--- a/iptunnel.c ++++ b/iptunnel.c +@@ -26,7 +26,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +2.10.1 + From f9138514d1678415605b75ecfabecbb2f72f9310 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 3 Nov 2016 09:53:13 +0200 Subject: [PATCH 1216/3392] libcurl: move site to https Saves a redirect. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libcurl/libcurl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index d60000aaed..197e0b579d 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -6,7 +6,7 @@ LIBCURL_VERSION = 7.51.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 -LIBCURL_SITE = http://curl.haxx.se/download +LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_ZLIB),zlib) \ $(if $(BR2_PACKAGE_LIBIDN),libidn) \ From 8c005353b6c517c7df84ef42fe55a42c9952f002 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 2 Nov 2016 19:23:35 -0400 Subject: [PATCH 1217/3392] DEVELOPERS: transfer lttng-* and liburcu projects to Philippe Proulx Signed-off-by: Philippe Proulx Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index c4b31174e6..3a9c00d73c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1198,7 +1198,12 @@ F: package/libassuan/ F: package/libgpgme/ N: Philippe Proulx +F: package/lttng-babeltrace/ +F: package/lttng-libust/ +F: package/lttng-modules/ +F: package/lttng-tools/ F: package/python-ipython/ +F: package/liburcu/ N: Pierre Floury F: package/trace-cmd/ @@ -1476,15 +1481,10 @@ F: package/libcap/ F: package/libffi/ F: package/libsha1/ F: package/libtirpc/ -F: package/liburcu/ F: package/libxkbcommon/ F: package/libxml-parser-perl/ F: package/localedef/ F: package/log4cxx/ -F: package/lttng-babeltrace/ -F: package/lttng-libust/ -F: package/lttng-modules/ -F: package/lttng-tools/ F: package/monit/ F: package/mpdecimal/ F: package/msmtp/ From 258cc58294c22e6e3c399929b14fa9192ab38fb5 Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Thu, 3 Nov 2016 14:25:34 +1100 Subject: [PATCH 1218/3392] alsa-lib: fix build on powerpc64 and powerpc64le Fixes linker error http://autobuild.buildroot.net/results/c6272ac900d1a53b976839ac4f50a210b3e6b354 On powerpc64 (and powerpc64le) the build fails due to linker problems because of an old (2003) workaround for powerpc64, presumably working around an old toolchain problem that is no longer present. Removing the workaround allows the build to succeed. A new patch is added for this. Additionally, there was a mistake in patch 3: the patch added a test for HAVE_LIBDL to include/alsa-symbols.h but it was positioned in the file before config.h was included, so HAVE_LIBDL is never seen as defined. The test was also using HAVE_LIBDL (which indicates the library) rather than HAVE_DLFCN (which indicates the header). Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- package/alsa-lib/0003-dlmisc.patch | 10 +-- .../0005-remove-powerpc64-workaround.patch | 67 +++++++++++++++++++ 2 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 package/alsa-lib/0005-remove-powerpc64-workaround.patch diff --git a/package/alsa-lib/0003-dlmisc.patch b/package/alsa-lib/0003-dlmisc.patch index 05dc70ee7e..24b7230cae 100644 --- a/package/alsa-lib/0003-dlmisc.patch +++ b/package/alsa-lib/0003-dlmisc.patch @@ -36,10 +36,11 @@ diff --git a/modules/mixer/simple/sbasedl.c b/modules/mixer/simple/sbasedl.c #include #include #include -+#ifdef HAVE_LIBDL ++#include "config.h" ++#ifdef HAVE_DLFCN #include +#endif - #include "config.h" +-#include "config.h" #include "asoundlib.h" #include "mixer_abst.h" diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c @@ -49,9 +50,10 @@ diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c #include #include #include -+#ifdef HAVE_LIBDL ++#include "config.h" ++#ifdef HAVE_DLFCN #include +#endif - #include "config.h" +-#include "config.h" #include "asoundlib.h" #include "mixer_simple.h" diff --git a/package/alsa-lib/0005-remove-powerpc64-workaround.patch b/package/alsa-lib/0005-remove-powerpc64-workaround.patch new file mode 100644 index 0000000000..57a369e0e3 --- /dev/null +++ b/package/alsa-lib/0005-remove-powerpc64-workaround.patch @@ -0,0 +1,67 @@ +Linking currently fails on powerpc64 and powerpc64le when configured +with --without-versioned, as follows: +../src/.libs/libasound.so: undefined reference to `.__snd_pcm_hw_params_set_format_first' +(And many similar messages.) + +This appears to be due to a very old (2003) workaround for powerpc64, +(introduced by commit 06221f86) in include/alsa-symbols.h which alters +symbol names. While it was probably necessary at the time, it does not +appear to be necessary now and removing it fixes the build. + +Signed-off-by: Sam Bobroff +--- + include/alsa-symbols.h | 25 ++++--------------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/include/alsa-symbols.h b/include/alsa-symbols.h +index 51cb982..0cb0b9f 100644 +--- a/include/alsa-symbols.h ++++ b/include/alsa-symbols.h +@@ -29,19 +29,10 @@ + #define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post + #define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name) + +-#ifdef __powerpc64__ +-# define symbol_version(real, name, version) \ +- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version); \ +- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@" #version) +-# define default_symbol_version(real, name, version) \ +- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version); \ +- __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@@" #version) +-#else +-# define symbol_version(real, name, version) \ +- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version) +-# define default_symbol_version(real, name, version) \ +- __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version) +-#endif ++#define symbol_version(real, name, version) \ ++__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version) ++#define default_symbol_version(real, name, version) \ ++__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version) + + #ifdef USE_VERSIONED_SYMBOLS + #define use_symbol_version(real, name, version) \ +@@ -50,13 +41,6 @@ + default_symbol_version(real, name, version) + #else + #define use_symbol_version(real, name, version) /* nothing */ +-#ifdef __powerpc64__ +-#define use_default_symbol_version(real, name, version) \ +- __asm__ (".weak " ASM_NAME(#name)); \ +- __asm__ (".weak ." ASM_NAME(#name)); \ +- __asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real)); \ +- __asm__ (".set ." ASM_NAME(#name) ",." ASM_NAME(#real)) +-#else + #if defined(__alpha__) || defined(__mips__) + #define use_default_symbol_version(real, name, version) \ + __asm__ (".weak " ASM_NAME(#name)); \ +@@ -67,6 +51,5 @@ + __asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real)) + #endif + #endif +-#endif + + #endif /* __ALSA_SYMBOLS_H */ +-- +2.10.0.297.gf6727b0 + From 3e45b0314b64dff4882a5e2d3cf77a164e7c4ef4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 3 Nov 2016 16:32:44 +0100 Subject: [PATCH 1219/3392] domoticz: bump to version 3.5837 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 6ac223ce9e..fef72f52b6 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 75148651fc17ff2730c172e25b6bac14e16e099733dda2f5ef2f0bc65fc46750 domoticz-3.5834.tar.gz +sha256 4b2d59c2bd70e61c486b372059164a688c53b8aa9f1aedb4beb3316ae2a130c5 domoticz-3.5837.tar.gz diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 0ffa5106ff..2272da87cc 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 3.5834 +DOMOTICZ_VERSION = 3.5837 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPLv3 DOMOTICZ_LICENSE_FILES = License.txt From b9ebe40a92756c8ba248e5ee505afb912ce91bd2 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 3 Nov 2016 15:08:40 +0100 Subject: [PATCH 1220/3392] configs: atmel: xplained boards: bump to linux4sam_5.5 Bump at91bootstrap to v3.8.7, U-Boot to linux4sam_5.5, Linux to linux4sam_5.5 (based on v4.4.x). Signed-off-by: Ludovic Desroches Signed-off-by: Thomas Petazzoni --- configs/atmel_sama5d2_xplained_mmc_defconfig | 8 ++++---- configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 8 ++++---- configs/atmel_sama5d3_xplained_defconfig | 8 ++++---- configs/atmel_sama5d3_xplained_dev_defconfig | 8 ++++---- configs/atmel_sama5d3_xplained_mmc_defconfig | 8 ++++---- configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 8 ++++---- configs/atmel_sama5d4_xplained_defconfig | 8 ++++---- configs/atmel_sama5d4_xplained_dev_defconfig | 8 ++++---- configs/atmel_sama5d4_xplained_mmc_defconfig | 8 ++++---- configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 8 ++++---- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/configs/atmel_sama5d2_xplained_mmc_defconfig b/configs/atmel_sama5d2_xplained_mmc_defconfig index 7eb969f2e5..13086af607 100644 --- a/configs/atmel_sama5d2_xplained_mmc_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_defconfig @@ -3,12 +3,12 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b" @@ -17,13 +17,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.5" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index d7f4717631..a2250910c2 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -6,7 +6,7 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b" @@ -89,13 +89,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.5" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc" # Host packages diff --git a/configs/atmel_sama5d3_xplained_defconfig b/configs/atmel_sama5d3_xplained_defconfig index 480f2fd9f9..307bbaaee6 100644 --- a/configs/atmel_sama5d3_xplained_defconfig +++ b/configs/atmel_sama5d3_xplained_defconfig @@ -2,11 +2,11 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" @@ -17,12 +17,12 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.5" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash" BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index d51a141a01..4905148b26 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -5,7 +5,7 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -21,7 +21,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" @@ -88,13 +88,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.5" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash" # Host packages diff --git a/configs/atmel_sama5d3_xplained_mmc_defconfig b/configs/atmel_sama5d3_xplained_mmc_defconfig index 14ca3f54dd..0a44dc71f7 100644 --- a/configs/atmel_sama5d3_xplained_mmc_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_defconfig @@ -2,12 +2,12 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" @@ -16,13 +16,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.5" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index c45c2ce6aa..1fc84529b5 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -5,7 +5,7 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b" @@ -88,13 +88,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.5" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc" # Host packages diff --git a/configs/atmel_sama5d4_xplained_defconfig b/configs/atmel_sama5d4_xplained_defconfig index 65313f3858..5646723d15 100644 --- a/configs/atmel_sama5d4_xplained_defconfig +++ b/configs/atmel_sama5d4_xplained_defconfig @@ -3,11 +3,11 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" @@ -21,12 +21,12 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.5" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash" BR2_PACKAGE_HOST_SAM_BA=y diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index 7dadeca024..b3dc8159db 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -6,7 +6,7 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -22,7 +22,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" @@ -92,13 +92,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.5" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash" # Host packages diff --git a/configs/atmel_sama5d4_xplained_mmc_defconfig b/configs/atmel_sama5d4_xplained_mmc_defconfig index 7f93a82640..03055cff13 100644 --- a/configs/atmel_sama5d4_xplained_mmc_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_defconfig @@ -3,12 +3,12 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" @@ -17,13 +17,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.5" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index 9e11efac94..1d4cfcbe50 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -6,7 +6,7 @@ BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # Needed for some packages BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # Needed for gdb @@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" @@ -89,13 +89,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.5" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc" # Host packages From 8f97c8b9c9ce4f74cb7f4e0002c6dd11a6a55ad7 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 3 Nov 2016 15:08:41 +0100 Subject: [PATCH 1221/3392] configs: atmel: at91sam9x5ek: bump to linux4sam_5.5 Bump at91bootstrap to v3.8.7, U-Boot to linux4sam_5.5, Linux to linux4sam_5.5 (based on v4.4.x). Signed-off-by: Ludovic Desroches Signed-off-by: Thomas Petazzoni --- configs/at91sam9x5ek_defconfig | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/configs/at91sam9x5ek_defconfig b/configs/at91sam9x5ek_defconfig index 79031b675f..69f9e75ea9 100644 --- a/configs/at91sam9x5ek_defconfig +++ b/configs/at91sam9x5ek_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 3.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y +# Linux headers same as kernel, a 4.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="03329ca4cf6b94acc5c65b59b2d1f90fdeee0887" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek" @@ -14,10 +14,14 @@ BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot" BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="at91sam9x5ek_nandflash" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="677f3c2340b72131beebace8e96cac17b9569887" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash" BR2_PACKAGE_HOST_SAM_BA=y From a167081c5d5a5aee95b642a14200d18d8a84dbcc Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 3 Nov 2016 07:53:50 +0200 Subject: [PATCH 1222/3392] bridge-utils: fix build with musl Apply a patch that removes direct include of kernel headers to avoid conflict of definitions. Fixes: http://autobuild.buildroot.net/results/4aa/4aaeca4f1fca1794b039d7255a1828ff724f2234/ http://autobuild.buildroot.net/results/b48/b48a70137a4a568b31337f899fd21d05552db5e2/ http://autobuild.buildroot.net/results/bff/bff5767fc7e821a7674ee022111db84e4a9449d0/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...-fix-headers-conflict-with-musl-libc.patch | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 package/bridge-utils/0002-libbridge-fix-headers-conflict-with-musl-libc.patch diff --git a/package/bridge-utils/0002-libbridge-fix-headers-conflict-with-musl-libc.patch b/package/bridge-utils/0002-libbridge-fix-headers-conflict-with-musl-libc.patch new file mode 100644 index 0000000000..fd7f45ed4e --- /dev/null +++ b/package/bridge-utils/0002-libbridge-fix-headers-conflict-with-musl-libc.patch @@ -0,0 +1,140 @@ +From 24e5409190820a14e4d097924b1acaab62bb3b99 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Sun, 30 Oct 2016 18:12:00 +0200 +Subject: [PATCH] libbridge: fix headers conflict with musl libc + +Don't including kernel headers directly to avoid headers conflict like: + +In file included from .../sysroot/usr/include/linux/if_bridge.h:18:0, + from libbridge.h:26, + from libbridge_if.c:26: +.../sysroot/usr/include/linux/in6.h:32:8: error: redefinition of ‘struct in6_addr’ + struct in6_addr { + ^ +In file included from libbridge.h:24:0, + from libbridge_if.c:26: +.../sysroot/usr/include/netinet/in.h:23:8: note: originally defined here + struct in6_addr { + ^ + +Instead copy the required linux/if_bridge.h definitions into +libbridge_private.h. + +Signed-off-by: Baruch Siach +--- +Patch status: Nacked +(https://lists.linuxfoundation.org/pipermail/bridge/2016-November/010107.html) +--- + libbridge/libbridge.h | 1 - + libbridge/libbridge_private.h | 83 ++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 82 insertions(+), 2 deletions(-) + +diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h +index ff047f933cd6..18b40cd90413 100644 +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + + /* defined in net/if.h but that conflicts with linux/if.h... */ + extern unsigned int if_nametoindex (const char *__ifname); +diff --git a/libbridge/libbridge_private.h b/libbridge/libbridge_private.h +index 99a511dae00a..565025b7bccb 100644 +--- a/libbridge/libbridge_private.h ++++ b/libbridge/libbridge_private.h +@@ -24,7 +24,88 @@ + #include + #include + #include +-#include ++ ++/* From linux/if_ether.h */ ++#ifndef ETH_ALEN ++#define ETH_ALEN 6 ++#endif ++ ++/* From linux/if_bridge.h */ ++#ifndef BRCTL_GET_VERSION ++#define BRCTL_GET_VERSION 0 ++#define BRCTL_GET_BRIDGES 1 ++#define BRCTL_ADD_BRIDGE 2 ++#define BRCTL_DEL_BRIDGE 3 ++#define BRCTL_ADD_IF 4 ++#define BRCTL_DEL_IF 5 ++#define BRCTL_GET_BRIDGE_INFO 6 ++#define BRCTL_GET_PORT_LIST 7 ++#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8 ++#define BRCTL_SET_BRIDGE_HELLO_TIME 9 ++#define BRCTL_SET_BRIDGE_MAX_AGE 10 ++#define BRCTL_SET_AGEING_TIME 11 ++#define BRCTL_SET_GC_INTERVAL 12 ++#define BRCTL_GET_PORT_INFO 13 ++#define BRCTL_SET_BRIDGE_STP_STATE 14 ++#define BRCTL_SET_BRIDGE_PRIORITY 15 ++#define BRCTL_SET_PORT_PRIORITY 16 ++#define BRCTL_SET_PATH_COST 17 ++#define BRCTL_GET_FDB_ENTRIES 18 ++ ++#define BR_STATE_DISABLED 0 ++#define BR_STATE_LISTENING 1 ++#define BR_STATE_LEARNING 2 ++#define BR_STATE_FORWARDING 3 ++#define BR_STATE_BLOCKING 4 ++ ++struct __bridge_info { ++ __u64 designated_root; ++ __u64 bridge_id; ++ __u32 root_path_cost; ++ __u32 max_age; ++ __u32 hello_time; ++ __u32 forward_delay; ++ __u32 bridge_max_age; ++ __u32 bridge_hello_time; ++ __u32 bridge_forward_delay; ++ __u8 topology_change; ++ __u8 topology_change_detected; ++ __u8 root_port; ++ __u8 stp_enabled; ++ __u32 ageing_time; ++ __u32 gc_interval; ++ __u32 hello_timer_value; ++ __u32 tcn_timer_value; ++ __u32 topology_change_timer_value; ++ __u32 gc_timer_value; ++}; ++ ++struct __port_info { ++ __u64 designated_root; ++ __u64 designated_bridge; ++ __u16 port_id; ++ __u16 designated_port; ++ __u32 path_cost; ++ __u32 designated_cost; ++ __u8 state; ++ __u8 top_change_ack; ++ __u8 config_pending; ++ __u8 unused0; ++ __u32 message_age_timer_value; ++ __u32 forward_delay_timer_value; ++ __u32 hold_timer_value; ++}; ++ ++struct __fdb_entry { ++ __u8 mac_addr[ETH_ALEN]; ++ __u8 port_no; ++ __u8 is_local; ++ __u32 ageing_timer_value; ++ __u8 port_hi; ++ __u8 pad0; ++ __u16 unused; ++}; ++#endif /* BRCTL_GET_VERSION */ + + #define MAX_BRIDGES 1024 + #define MAX_PORTS 1024 +-- +2.10.1 + From 01432196cd0ab3e618d51309283b8ca34ec3bf75 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 26 Oct 2016 23:53:56 +0200 Subject: [PATCH 1223/3392] configs: drop cubieboard_defconfig This defconfig is affected by bug #8516, reported more than a year ago, and nobody has updated the defconfig since then. In addition, it should be migrated to the genimage mechanism instead of having its own mkcubieboard.sh script. Therefore, let's get rid of this defconfig. Fixes bug #8516. Signed-off-by: Thomas Petazzoni Cc: Carlo Caione Signed-off-by: Thomas Petazzoni --- board/cubietech/cubieboard/boot.cmd | 4 - .../cubieboard/linux-cubieboard2.config | 749 ------------------ board/cubietech/cubieboard/mkcubiecard.sh | 124 --- board/cubietech/cubieboard/post-build.sh | 14 - board/cubietech/cubieboard/readme.txt | 62 -- configs/cubieboard_defconfig | 38 - 6 files changed, 991 deletions(-) delete mode 100644 board/cubietech/cubieboard/boot.cmd delete mode 100644 board/cubietech/cubieboard/linux-cubieboard2.config delete mode 100755 board/cubietech/cubieboard/mkcubiecard.sh delete mode 100755 board/cubietech/cubieboard/post-build.sh delete mode 100644 board/cubietech/cubieboard/readme.txt delete mode 100644 configs/cubieboard_defconfig diff --git a/board/cubietech/cubieboard/boot.cmd b/board/cubietech/cubieboard/boot.cmd deleted file mode 100644 index 849ed00712..0000000000 --- a/board/cubietech/cubieboard/boot.cmd +++ /dev/null @@ -1,4 +0,0 @@ -setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra} -fatload mmc 0 0x43000000 script.bin -fatload mmc 0 0x48000000 uImage -bootm 0x48000000 diff --git a/board/cubietech/cubieboard/linux-cubieboard2.config b/board/cubietech/cubieboard/linux-cubieboard2.config deleted file mode 100644 index 1ae1519f8f..0000000000 --- a/board/cubietech/cubieboard/linux-cubieboard2.config +++ /dev/null @@ -1,749 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_SYSVIPC=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_AUDIT=y -CONFIG_IRQ_DOMAIN_DEBUG=y -CONFIG_RCU_FAST_NO_HZ=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=19 -CONFIG_CGROUPS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CPUSETS=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y -CONFIG_CGROUP_MEM_RES_CTLR=y -CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y -CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y -CONFIG_CGROUP_PERF=y -CONFIG_CGROUP_SCHED=y -CONFIG_CFS_BANDWIDTH=y -CONFIG_RT_GROUP_SCHED=y -CONFIG_BLK_CGROUP=y -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_PERF_COUNTERS=y -# CONFIG_COMPAT_BRK is not set -CONFIG_JUMP_LABEL=y -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_MODULE_SRCVERSION_ALL=y -CONFIG_BLK_DEV_BSGLIB=y -CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y -CONFIG_MAC_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_SGI_PARTITION=y -CONFIG_SUN_PARTITION=y -CONFIG_KARMA_PARTITION=y -CONFIG_EFI_PARTITION=y -CONFIG_CFQ_GROUP_IOSCHED=y -CONFIG_ARCH_SUN7I=y -CONFIG_SUNXI_SCALING_MIN=408 -# CONFIG_CACHE_L2X0 is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_SMP=y -CONFIG_ARM_ARCH_TIMER=y -CONFIG_NR_CPUS=2 -CONFIG_PREEMPT=y -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_HIGHMEM=y -CONFIG_COMPACTION=y -CONFIG_KSM=y -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/mmc0p1 rw init=/init loglevel=8" -CONFIG_KEXEC=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_DEFAULT_GOV_FANTASY=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPU_FREQ_USR_EVNT_NOTIFY=y -CONFIG_CPU_FREQ_DVFS=y -CONFIG_CPU_IDLE=y -CONFIG_VFP=y -CONFIG_NEON=y -CONFIG_BINFMT_MISC=y -CONFIG_PM_RUNTIME=y -CONFIG_PM_DEBUG=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_FIB_TRIE_STATS=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -CONFIG_IP_MROUTE_MULTIPLE_TABLES=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=y -CONFIG_INET_ESP=y -CONFIG_INET_IPCOMP=y -CONFIG_INET_DIAG=m -CONFIG_INET_UDP_DIAG=m -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=y -CONFIG_TCP_CONG_WESTWOOD=y -CONFIG_TCP_CONG_HTCP=y -CONFIG_TCP_CONG_HSTCP=y -CONFIG_TCP_CONG_HYBLA=y -CONFIG_TCP_CONG_SCALABLE=y -CONFIG_TCP_CONG_LP=y -CONFIG_TCP_CONG_VENO=y -CONFIG_TCP_CONG_YEAH=y -CONFIG_TCP_CONG_ILLINOIS=y -CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=y -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y -CONFIG_IPV6_PIMSM_V2=y -# CONFIG_ANDROID_PARANOID_NETWORK is not set -CONFIG_NETWORK_SECMARK=y -CONFIG_NETWORK_PHY_TIMESTAMPING=y -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_ZONES=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_TIMEOUT=y -CONFIG_NF_CONNTRACK_TIMESTAMP=y -CONFIG_NF_CT_PROTO_DCCP=m -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NETFILTER_TPROXY=m -CONFIG_NETFILTER_XT_SET=m -CONFIG_NETFILTER_XT_TARGET_AUDIT=m -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_NETFILTER_XT_TARGET_TEE=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TRACE=m -CONFIG_NETFILTER_XT_TARGET_SECMARK=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_IPVS=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_NFACCT=m -CONFIG_NETFILTER_XT_MATCH_OSF=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_QUOTA2=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_SET=m -CONFIG_IP_SET_BITMAP_IP=m -CONFIG_IP_SET_BITMAP_IPMAC=m -CONFIG_IP_SET_BITMAP_PORT=m -CONFIG_IP_SET_HASH_IP=m -CONFIG_IP_SET_HASH_IPPORT=m -CONFIG_IP_SET_HASH_IPPORTIP=m -CONFIG_IP_SET_HASH_IPPORTNET=m -CONFIG_IP_SET_HASH_NET=m -CONFIG_IP_SET_HASH_NETPORT=m -CONFIG_IP_SET_HASH_NETIFACE=m -CONFIG_IP_SET_LIST_SET=m -CONFIG_IP_VS=m -CONFIG_IP_VS_IPV6=y -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y -CONFIG_IP_VS_PROTO_SCTP=y -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m -CONFIG_IP_VS_FTP=m -CONFIG_IP_VS_PE_SIP=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_REJECT_SKERR=y -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_REJECT_SKERR=y -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m -CONFIG_BRIDGE_EBT_NFLOG=m -CONFIG_L2TP=m -CONFIG_L2TP_V3=y -CONFIG_L2TP_IP=m -CONFIG_L2TP_ETH=m -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -CONFIG_VLAN_8021Q_GVRP=y -CONFIG_BATMAN_ADV=m -CONFIG_OPENVSWITCH=m -CONFIG_NETPRIO_CGROUP=m -CONFIG_NET_PKTGEN=m -CONFIG_IRDA=m -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y -CONFIG_IRTTY_SIR=m -CONFIG_KINGSUN_DONGLE=m -CONFIG_KSDAZZLE_DONGLE=m -CONFIG_KS959_DONGLE=m -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_MCS_FIR=m -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_HCIBTSDIO=m -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_MRVL=m -CONFIG_BT_MRVL_SDIO=m -CONFIG_BT_ATH3K=m -CONFIG_AF_RXRPC=m -CONFIG_RXKAD=m -CONFIG_CFG80211=y -CONFIG_CFG80211_DEVELOPER_WARNINGS=y -CONFIG_WIRELESS_EXT_SYSFS=y -CONFIG_LIB80211=m -CONFIG_CFG80211_ALLOW_RECONNECT=y -CONFIG_MAC80211=m -CONFIG_MAC80211_MESH=y -CONFIG_WIMAX=m -CONFIG_RFKILL=y -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_CONNECTOR=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_CRYPTOLOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=2 -CONFIG_SUNXI_DBGREG=m -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=y -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_ATA=y -CONFIG_SATA_AHCI_PLATFORM=y -CONFIG_SW_SATA_AHCI_PLATFORM=y -CONFIG_NETDEVICES=y -CONFIG_BONDING=m -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -# CONFIG_NET_VENDOR_FARADAY is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SMSC is not set -# CONFIG_NET_VENDOR_STMICRO is not set -CONFIG_SUNXI_EMAC=y -CONFIG_PHYLIB=y -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPPOE=m -CONFIG_PPPOLAC=m -CONFIG_PPPOPNS=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_USB_IPHETH=m -CONFIG_ATH_COMMON=m -CONFIG_ATH9K=m -CONFIG_RTL8192CU=m -CONFIG_RTL8192CU_SW=m -CONFIG_RTL8188EU=m -CONFIG_RTXX7X_SW=m -CONFIG_INPUT_POLLDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_JOYDEV=y -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_KEYRESET=y -CONFIG_KEYBOARD_HV2605_KEYBOARD=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_GT801=m -CONFIG_TOUCHSCREEN_GT811=m -CONFIG_TOUCHSCREEN_GT818=m -CONFIG_TOUCHSCREEN_FT5X_TS=m -CONFIG_TOUCHSCREEN_ZT8031=m -CONFIG_GSENSOR=y -CONFIG_SENSORS_BMA250=m -CONFIG_MEMSIC_ECOMPASS=m -CONFIG_SENSORS_MXC622X=m -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=8 -CONFIG_SERIAL_8250_RUNTIME_UARTS=8 -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_SPI=y -CONFIG_SPI_DEBUG=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_SUNXI=m -CONFIG_POWER_SUPPLY=y -CONFIG_AW_AXP=y -# CONFIG_HWMON is not set -CONFIG_REGULATOR=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -CONFIG_MEDIA_TUNER_CUSTOMISE=y -# CONFIG_MEDIA_TUNER_SIMPLE is not set -# CONFIG_MEDIA_TUNER_TDA8290 is not set -# CONFIG_MEDIA_TUNER_TDA827X is not set -# CONFIG_MEDIA_TUNER_TDA18271 is not set -# CONFIG_MEDIA_TUNER_TDA9887 is not set -# CONFIG_MEDIA_TUNER_TEA5767 is not set -# CONFIG_MEDIA_TUNER_MT20XX is not set -# CONFIG_MEDIA_TUNER_MT2060 is not set -# CONFIG_MEDIA_TUNER_MT2266 is not set -# CONFIG_MEDIA_TUNER_MT2131 is not set -# CONFIG_MEDIA_TUNER_QT1010 is not set -# CONFIG_MEDIA_TUNER_MXL5005S is not set -# CONFIG_MEDIA_TUNER_MXL5007T is not set -# CONFIG_MEDIA_TUNER_MC44S803 is not set -# CONFIG_MEDIA_TUNER_MAX2165 is not set -# CONFIG_MEDIA_TUNER_TDA18218 is not set -# CONFIG_MEDIA_TUNER_TDA18212 is not set -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m -CONFIG_USB_GSPCA_BENQ=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_CPIA1=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_JEILINJ=m -CONFIG_USB_GSPCA_JL2005BCD=m -CONFIG_USB_GSPCA_KINECT=m -CONFIG_USB_GSPCA_KONICA=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_NW80X=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_OV534_9=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7302=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SE401=m -CONFIG_USB_GSPCA_SN9C2028=m -CONFIG_USB_GSPCA_SN9C20X=m -CONFIG_USB_GSPCA_SONIXB=m -CONFIG_USB_GSPCA_SONIXJ=m -CONFIG_USB_GSPCA_SPCA500=m -CONFIG_USB_GSPCA_SPCA501=m -CONFIG_USB_GSPCA_SPCA505=m -CONFIG_USB_GSPCA_SPCA506=m -CONFIG_USB_GSPCA_SPCA508=m -CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_SQ930X=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_STV0680=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TOPRO=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_VICAM=m -CONFIG_USB_GSPCA_XIRLINK_CIT=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_USBVISION=m -CONFIG_USB_ET61X251=m -CONFIG_USB_SN9C102=m -CONFIG_USB_PWC=m -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_IMX074=m -CONFIG_SOC_CAMERA_MT9M001=m -CONFIG_SOC_CAMERA_MT9M111=m -CONFIG_SOC_CAMERA_MT9T031=m -CONFIG_SOC_CAMERA_MT9T112=m -CONFIG_SOC_CAMERA_MT9V022=m -CONFIG_SOC_CAMERA_RJ54N1=m -CONFIG_SOC_CAMERA_TW9910=m -CONFIG_SOC_CAMERA_PLATFORM=m -CONFIG_SOC_CAMERA_OV2640=m -CONFIG_SOC_CAMERA_OV5642=m -CONFIG_SOC_CAMERA_OV6650=m -CONFIG_SOC_CAMERA_OV772X=m -CONFIG_SOC_CAMERA_OV9640=m -CONFIG_SOC_CAMERA_OV9740=m -CONFIG_V4L_MEM2MEM_DRIVERS=y -# CONFIG_VIDEO_CSI_SUN4I is not set -CONFIG_RADIO_SI470X=y -CONFIG_USB_SI470X=m -CONFIG_I2C_SI470X=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_SI4713=m -CONFIG_USB_KEENE=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_WL1273=m -CONFIG_AUDIO_ENGINE=y -CONFIG_PA_CONTROL=y -CONFIG_DRM=m -CONFIG_DRM_MALI=m -CONFIG_DRM_UDL=m -CONFIG_MALI=m -CONFIG_MALI400_DEBUG=y -CONFIG_MALI400_GPU_UTILIZATION=y -CONFIG_FB=y -CONFIG_FB_SUNXI=y -CONFIG_FB_SUNXI_LCD=y -CONFIG_FB_SUNXI_HDMI=y -CONFIG_HDMI_CEC=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_HRTIMER=m -CONFIG_SND_VERBOSE_PRINTK=y -CONFIG_SND_ALOOP=m -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_SOC=y -CONFIG_SND_SUNXI_SOC_SPDIF=y -CONFIG_HIDRAW=y -CONFIG_UHID=y -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y -CONFIG_HID_KYE=y -CONFIG_HID_LOGITECH_DJ=y -CONFIG_LOGITECH_FF=y -# CONFIG_LOGIWHEELS_FF is not set -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_REALTEK=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_STORAGE_ENE_UB6250=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_CONSOLE=y -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_GADGET=y -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_FILE_STORAGE_TEST=y -CONFIG_MMC=y -# CONFIG_MMC_BLOCK_BOUNCE is not set -CONFIG_MMC_USHC=y -CONFIG_MMC_SUNXI_POWER_CONTROL=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_SUNXI=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_SUN4I=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_RAM_CONSOLE=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_REISERFS_FS=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -CONFIG_QFMT_V2=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=y -CONFIG_CUSE=y -CONFIG_FSCACHE=y -CONFIG_FSCACHE_STATS=y -CONFIG_CACHEFILES=y -CONFIG_ISO9660_FS=y -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -CONFIG_NTFS_FS=y -CONFIG_NTFS_RW=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_CONFIGFS_FS=y -CONFIG_HFS_FS=y -CONFIG_HFSPLUS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_NFS_V4_1=y -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="y" -CONFIG_ROOT_NFS=y -CONFIG_NFS_USE_LEGACY_DNS=y -CONFIG_NFSD=m -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -CONFIG_NFSD_FAULT_INJECTION=y -CONFIG_CIFS=y -CONFIG_CIFS_DFS_UPCALL=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_936=y -CONFIG_NLS_CODEPAGE_950=y -CONFIG_NLS_CODEPAGE_932=y -CONFIG_NLS_CODEPAGE_949=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_STRIP_ASM_SYMS=y -CONFIG_DEBUG_FS=y -CONFIG_DEBUG_SECTION_MISMATCH=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_SHIRQ=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_LIST=y -CONFIG_BOOT_PRINTK_DELAY=y -CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y -# CONFIG_FTRACE is not set -CONFIG_DYNAMIC_DEBUG=y -CONFIG_STRICT_DEVMEM=y -CONFIG_DEBUG_LL=y -CONFIG_SECURITYFS=y -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_SEQIV=y -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_ZLIB=y -CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_LIBCRC32C=y diff --git a/board/cubietech/cubieboard/mkcubiecard.sh b/board/cubietech/cubieboard/mkcubiecard.sh deleted file mode 100755 index f1d5a9fb45..0000000000 --- a/board/cubietech/cubieboard/mkcubiecard.sh +++ /dev/null @@ -1,124 +0,0 @@ -#! /bin/sh -# mkCubieCard.sh v0.1: -# 2013, Carlo Caione -# heavely based on : -# mkA10card.sh v0.1 -# 2012, Jason Plum -# loosely based on : -# mkcard.sh v0.5 -# (c) Copyright 2009 Graeme Gregory -# Licensed under terms of GPLv2 -# -# Parts of the procudure base on the work of Denys Dmytriyenko -# http://wiki.omap.com/index.php/MMC_Boot_Format - -IMAGES_DIR=$1 -SPL_IMG=$IMAGES_DIR/sunxi-spl.bin -SPL_UBOOT=$IMAGES_DIR/u-boot-sunxi-with-spl.bin -UBOOT_IMG=$IMAGES_DIR/u-boot.bin -UIMAGE=$IMAGES_DIR/uImage -BIN_BOARD_FILE=$IMAGES_DIR/script.bin -ROOTFS=$IMAGES_DIR/rootfs.tar -BOOT_CMD_H=$IMAGES_DIR/boot.scr - -export LC_ALL=C - -if [ $# -ne 2 ]; then - echo "Usage: $0 " - exit 1; -fi - -if [ `id -u` -ne 0 ]; then - echo "This script must be run as root" 1>&2 - exit 1 -fi - -if [ ! -f $SPL_IMG -a ! -f $SPL_UBOOT ] || - [ ! -f $UBOOT_IMG ] || - [ ! -f $UIMAGE ] || - [ ! -f $BIN_BOARD_FILE ] || - [ ! -f $ROOTFS ] || - [ ! -f $BOOT_CMD_H ]; then - echo "File(s) missing." - exit 1 -fi - -DRIVE=$2 -P1=`mktemp -d` -P2=`mktemp -d` - -dd if=/dev/zero of=$DRIVE bs=1M count=3 - -SIZE=`fdisk -l $DRIVE | grep Disk | grep bytes | awk '{print $5}'` - -echo DISK SIZE - $SIZE bytes - - -# ~2048, 16MB, FAT, bootable -# ~rest of drive, Ext4 -{ -echo 32,512,0x0C,* -echo 544,,,- -} | sfdisk -D $DRIVE - -sleep 1 - -if [ -b ${DRIVE}1 ]; then - D1=${DRIVE}1 - umount ${DRIVE}1 - mkfs.vfat -n "boot" ${DRIVE}1 -else - if [ -b ${DRIVE}p1 ]; then - D1=${DRIVE}p1 - umount ${DRIVE}p1 - mkfs.vfat -n "boot" ${DRIVE}p1 - else - echo "Cant find boot partition in /dev" - exit 1 - fi -fi - - -if [ -b ${DRIVE}2 ]; then - D2=${DRIVE}2 - umount ${DRIVE}2 - mkfs.ext4 -L "Cubie" ${DRIVE}2 -else - if [ -b ${DRIVE}p2 ]; then - D2=${DRIVE}p2 - umount ${DRIVE}p2 - mkfs.ext4 -L "Cubie" ${DRIVE}p2 - else - echo "Cant find rootfs partition in /dev" - exit 1 - fi -fi - -mount $D1 $P1 -mount $D2 $P2 - -# write uImage -cp $UIMAGE $P1 -# write board file -cp $BIN_BOARD_FILE $P1 -# write u-boot script -cp $BOOT_CMD_H $P1 -# write rootfs -tar -C $P2 -xvf $ROOTFS - -sync - -umount $D1 -umount $D2 - -rm -fr $P1 -rm -fr $P2 - -if [ -e $SPL_UBOOT ]; then - dd if=$SPL_UBOOT of=$DRIVE bs=1024 seek=8 -else - # write SPL - dd if=$SPL_IMG of=$DRIVE bs=1024 seek=8 - # write mele u-boot - dd if=$UBOOT_IMG of=$DRIVE bs=1024 seek=32 -fi diff --git a/board/cubietech/cubieboard/post-build.sh b/board/cubietech/cubieboard/post-build.sh deleted file mode 100755 index 1b0258c551..0000000000 --- a/board/cubietech/cubieboard/post-build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# post-build.sh for CubieBoard -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/usr/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -if [ -e $MKIMAGE -a -e $BOOT_CMD ]; -then - $MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H -fi diff --git a/board/cubietech/cubieboard/readme.txt b/board/cubietech/cubieboard/readme.txt deleted file mode 100644 index 81cc5e409b..0000000000 --- a/board/cubietech/cubieboard/readme.txt +++ /dev/null @@ -1,62 +0,0 @@ -cubieboard and cubieboard2 - ------ -Intro ------ - -To be able to use your cubieboard board with the images generated by -Buildroot you have to correctly setup the SD card. - -For more information, please see http://linux-sunxi.org/FirstSteps - ---------------- -How to build it ---------------- - -You need to use the cubieboard_defconfig or cubieboard2_defconfig, to do so: - * make cubieboard_defconfig -or - * make cubieboard2_defconfig - -And to compile: - * make - ------------------ -What is generated ------------------ - -After building, you should obtain this tree: - - output/images/ - +-- rootfs.tar - +-- boot.scr - +-- script.bin - +-- sunxi-spl.bin - +-- u-boot.bin - +-- u-boot-sunxi-with-spl.bin (optional) - `-- uImage - --------------------------- -How setting up the SD card --------------------------- - -Depending on the rootfs size, you might want to use a 2GB or larger SD-card. -The script mkcubiecard.sh will take care of partitioning and formatting -the SD-card. - -BEWARE! This process will erase your SD card. - -Use dmesg to find out where the SD card is attached in the /dev tree -() and then: - -# sudo ./mkcubiecard.sh - -where: - - is the directory containing the generated files (usually - output/images) - - is the device file of the SD card (usually /dev/sdX) - - - --- -Carlo Caione diff --git a/configs/cubieboard_defconfig b/configs/cubieboard_defconfig deleted file mode 100644 index 498999b6b4..0000000000 --- a/configs/cubieboard_defconfig +++ /dev/null @@ -1,38 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a8=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard" -BR2_TARGET_GENERIC_ISSUE="Welcome to use Cubieboard!" -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard/post-build.sh" - -# Additional tools -BR2_PACKAGE_HOST_SUNXI_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_BOARDS=y -BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a10/cubieboard.fex" - -# Linux headers same as kernel, a 3.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux-sunxi/linux-sunxi.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9a1cd034181af628d4145202289e1993c1687db6" -BR2_LINUX_KERNEL_DEFCONFIG="sun4i" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="cubieboard" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_VERSION="sunxi" -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux-sunxi/u-boot-sunxi.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1a8ac55429f7f8cc9f100c1cf2dc0195cf81e76f" -BR2_TARGET_UBOOT_FORMAT_BIN=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" From 7158a6d6c9a1495f703695a84eef5c338a01826b Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Thu, 3 Nov 2016 22:49:29 +0100 Subject: [PATCH 1224/3392] CHANGES: extend 2016.11-rc1 changelog - Longer explanation of multi-BR2_EXTERNAL - Mention nobody UID 99 -> 65534 change - Mention removal of BR2_DEPRECATED - Mention use of system cmake - Mention new dependency on ExtUtils::MakeMaker. The other perl dependencies are not mentioned since they only apply if mpv is built. - Mention the $(STAGING_DIR)/$(O) check. - Mention unsafe path detection in -isystem etc. - Mention linux-tools split. - Mention changes in legal-info. - Mention that pseudo is used instead of fakeroot. - Correct the info of toolchainfile.cmake: it still sets cflags but it doesn't force them anymore (doesn't append). Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- CHANGES | 57 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index db27bc7d10..a4ff04549c 100644 --- a/CHANGES +++ b/CHANGES @@ -2,25 +2,61 @@ Fixes all over the tree and new features. + It is now possible to specify multiple BR2_EXTERNAL + directories. The required files in a BR2_EXTERNAL directory + have changed to accomodate this feature. Refer to the + documentation for details of how to update them. External + trees now have a name and a description. Also, it is possible + to override a defconfig in the external tree. + + The default skeleton now uses UID 65534 for the "nobody" + user instead of UID 99, like most distros do. See + https://lwn.net/Articles/695478/ for a complete discussion. + Programs and configuration files that explicitly refer to UID + 99 will have to be updated. + + When the build environment already has a suitable cmake version + (3.1 or later), that one will be used instead of building + host-cmake. This can speed up the build significantly. + + The ExtUtils::MakeMaker perl module is now required in the + build environment. + + An additional check is done during the build that files are + not installed in the output directory within the output + directory. This happens e.g. when the target directory is + contained both in --prefix and in DESTDIR. The build will + terminate with an error message that specifies which package + and which file caused the failure. + + The concept of "deprecated packages" and the BR2_DEPRECATED + option have been removed. Instead, packages are removed + immediately. Packages are only removed when they don't work + for some reason. If you still need a removed package and + you have a solution for the problem(s) that caused the + removal, please contribute it. + Architecture: support for sh64 removed, improved support for - MIPS core selection, + MIPS core selection. Toolchain: support for musl powerpc64le, mips64 and mipsr6 toolchains, ARC toolchain components updates, gcc 6.x series bumped to 6.2.0, default binutils version switched to 2.26, default gcc version switched to gcc 5.x, Linaro toolchains - updated, uclibc-ng bumped to 1.0.19. - - Core infrastructure: support for multiple BR2_EXTERNAL - directories. + updated, uclibc-ng bumped to 1.0.19. GCC is now always built + with TLS support. Checking of unsafe compiler options (that + point to host directories) has been extended with -isystem, + -idirafter and -iquote. Package infrastructure: new variable $(PKG)_DL_OPTS, addition of -show-rdepends to list reverse dependencies, and - -graph-rdepends to graph reverse dependencies. + -graph-rdepends to graph reverse dependencies. Linux tools + are now in a separate linux-tools package instead of in the + kernel build. Fakeroot has been replaced by pseudo. CMake support: the toolchainfile.cmake file now provides a definition of the CMAKE_BUILD_TYPE variable. The - toolchainfile.cmake also no longer passes the compiler/linker + toolchainfile.cmake also no longer forces the compiler/linker flags defined by Buildroot. New defconfigs: WaRP7, Solidrun's MX6 Cubox/Hummingboard, @@ -40,11 +76,16 @@ Removed packages: binutils 2.24, gcc 4.7, ipkg, kodi-addon-xvdr, libgail, sstrip, torsmo, webkit, webkitgtk24, - wvdial, wvstreams, + wvdial, wvstreams. Documentation: the list of packages that was present in the Buildroot manual has been removed. + Legal info: the "licenses.txt" file that concatenates all + license texts is no longer generated - it was not considered + useful. The manifest.csv contains an empty cell instead of + "not saved" when no license file is available. + Other: addition of a DEVELOPERS file listing developers taking care of packages or architectures. From eb71c22b0b0faa338c1f82f3e17ef12abadea1e8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 3 Nov 2016 22:56:20 +0100 Subject: [PATCH 1225/3392] CHANGES: final update Signed-off-by: Thomas Petazzoni --- CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES b/CHANGES index a4ff04549c..3be9906d46 100644 --- a/CHANGES +++ b/CHANGES @@ -93,6 +93,7 @@ #7802: host-python build hangs compiling getbuildinfo.o #8206: mplayer uses host xorg development files + #8516: mkcubiecard.sh uses outdated sfdisk switch -D #8536: Building sudo with PAM results in unusable sudo #8646: check-host-rpath script returns false positives when rpath contains symlink From 2837209efd270ddccd98f03060a3558a20b6a74e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 3 Nov 2016 23:21:05 +0100 Subject: [PATCH 1226/3392] package/pseudo: needs sqlite pseudo uses sqlite to store its state. Signed-off-by: "Yann E. MORIN" [Thomas: add comment about --libdir.] Signed-off-by: Thomas Petazzoni --- package/pseudo/pseudo.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index 314fa820c5..2137a37806 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -12,4 +12,12 @@ PSEUDO_SITE_METHOD = git PSEUDO_LICENSE = LGPLv2.1 PSEUDO_LICENSE_FILES = COPYING +HOST_PSEUDO_DEPENDENCIES = host-sqlite + +# configure script is not generated by autoconf, so passing --libdir +# is necessary, even if the infrastructure passes --prefix already. +HOST_PSEUDO_CONF_OPTS = \ + --libdir=$(HOST_DIR)/usr/lib \ + --with-sqlite=$(HOST_DIR)/usr + $(eval $(host-autotools-package)) From d5ed7fcad1da81894a32ec2908f56b001feefb6c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 3 Nov 2016 23:28:01 +0100 Subject: [PATCH 1227/3392] fs/iso9660: drop reference to host-fakeroot Since commit 41f0688d9113dd33a5971c5654c7efd022727ed2 ("fs/iso9660: convert to the filesystem infrastructure"), the is9660 logic uses the common filesystem infrastructure, so the dependency on host-fakeroot is no longer needed, and has actually become bogus since we switched to host-pseudo. Signed-off-by: Thomas Petazzoni --- fs/iso9660/iso9660.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 32d79d77d8..d1d9cbf1a4 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -24,7 +24,7 @@ ROOTFS_ISO9660_BOOT_MENU = $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU)) -ROOTFS_ISO9660_DEPENDENCIES = host-cdrkit host-fakeroot linux +ROOTFS_ISO9660_DEPENDENCIES = host-cdrkit linux ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) ROOTFS_ISO9660_USE_INITRD = YES From 7158403805f650e8e34de6c0ac0dcd9b565c679b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 3 Nov 2016 23:21:07 +0100 Subject: [PATCH 1228/3392] package/pseudo: add a legacy symlink to emulate fakeroot In case some post-image script want to call fakeroot, add a symlink to use pseudo instead. Reported-by: Arnout Vandecappelle Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pseudo/pseudo.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index 2137a37806..e2c56fff06 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -20,4 +20,9 @@ HOST_PSEUDO_CONF_OPTS = \ --libdir=$(HOST_DIR)/usr/lib \ --with-sqlite=$(HOST_DIR)/usr +define HOST_PSEUDO_FAKEROOT_SYMLINK + ln -sf pseudo $(HOST_DIR)/usr/bin/fakeroot +endef +HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_FAKEROOT_SYMLINK + $(eval $(host-autotools-package)) From 325cff36f74b07545389b81cee0a2acef55b487c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 3 Nov 2016 23:21:08 +0100 Subject: [PATCH 1229/3392] package/fakeroot: remove We've now entirely switched to using pseudo istead of fakeroot, so it is time to remove the fakeroot package now. Reported-by: Arnout Vandecappelle Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/fakeroot/0001-hide-dlsym-error.patch | 34 -------------------- package/fakeroot/fakeroot.hash | 4 --- package/fakeroot/fakeroot.mk | 20 ------------ 3 files changed, 58 deletions(-) delete mode 100644 package/fakeroot/0001-hide-dlsym-error.patch delete mode 100644 package/fakeroot/fakeroot.hash delete mode 100644 package/fakeroot/fakeroot.mk diff --git a/package/fakeroot/0001-hide-dlsym-error.patch b/package/fakeroot/0001-hide-dlsym-error.patch deleted file mode 100644 index 2c61fab248..0000000000 --- a/package/fakeroot/0001-hide-dlsym-error.patch +++ /dev/null @@ -1,34 +0,0 @@ -Description: Hide error from dlsym() - dlsym(), starting in glibc 2.24 actually reports errors. In our case, - we try to get ACL functions which are not in the glibc. This causes - failures in test suites, so hide those messages for non-debugging - purposes for now. It also makes the build logs annoying to read. -Author: Julian Andres Klode -Origin: vendor -Bug-Debian: https://bugs.debian.org/830912 -Forwarded: no -Last-Update: 2016-08-12 - -Signed-off-by: Maxime Hadjinlian - ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -256,10 +256,16 @@ void load_library_symbols(void){ - /* clear dlerror() just in case dlsym() legitimately returns NULL */ - msg = dlerror(); - *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); -+ - if ( (msg = dlerror()) != NULL){ -- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); --/* abort ();*/ -+#ifdef LIBFAKEROOT_DEBUGGING -+ if (fakeroot_debug) { -+ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); -+/* abort ();*/ -+ } -+#endif - } -+ - } - } - diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash deleted file mode 100644 index f0d436e5c3..0000000000 --- a/package/fakeroot/fakeroot.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://snapshot.debian.org/package/fakeroot/1.20.2-1/ -sha1 367040df07043edb630942b21939e493f3fad888 fakeroot_1.20.2.orig.tar.bz2 -# Calculated based on the hash above -sha256 7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2 diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk deleted file mode 100644 index 168cd13a48..0000000000 --- a/package/fakeroot/fakeroot.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# fakeroot -# -################################################################################ - -FAKEROOT_VERSION = 1.20.2 -FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2 -FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot -# Force capabilities detection off -# For now these are process capabilities (faked) rather than file -# so they're of no real use -HOST_FAKEROOT_CONF_ENV = \ - ac_cv_header_sys_capability_h=no \ - ac_cv_func_capset=no - -FAKEROOT_LICENSE = GPLv3+ -FAKEROOT_LICENSE_FILES = COPYING - -$(eval $(host-autotools-package)) From a564da220a0abcb26138652e52304272c93617e8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 3 Nov 2016 23:31:53 +0100 Subject: [PATCH 1230/3392] CHANGES: mention fakeroot as a removed package Signed-off-by: Thomas Petazzoni --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3be9906d46..5b1b62f58e 100644 --- a/CHANGES +++ b/CHANGES @@ -74,7 +74,7 @@ vdr, vdr-plugin-vnsiserver, vexpress-firmware, xvisor, iio and gpio linux tools. - Removed packages: binutils 2.24, gcc 4.7, ipkg, + Removed packages: binutils 2.24, fakeroot, gcc 4.7, ipkg, kodi-addon-xvdr, libgail, sstrip, torsmo, webkit, webkitgtk24, wvdial, wvstreams. From a6ba768e9f540256edec3bded9c3a99e3e4c5284 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 3 Nov 2016 21:54:07 +0100 Subject: [PATCH 1231/3392] Update for 2016.11-rc1 Signed-off-by: Thomas Petazzoni --- Makefile | 2 +- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 24 ++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index cb030d46cf..4ea64b3698 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2016.11-git +export BR2_VERSION := 2016.11-rc1 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 9ce62c860a..8824c98a62 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -41,41 +41,41 @@

buildroot-2016.08.1.tar.bz2

PGP signature

- + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/. diff --git a/docs/website/news.html b/docs/website/news.html index 9f23d35789..687b080cd0 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,30 @@

News

    +
  • +
    +
    +
    +

    2016.11-rc1 released

    +

    3 November 2016

    +
    +
    +

    We have a new release candidate! Lots of + changes all over the tree, see + the CHANGES + file for details. +

    + +

    Head to the downloads page to pick up the + 2016.11-rc1 + release candidate, and report any + problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • +
  • From 857ac5502dcc60e6d1bc4a509bec1766bce70761 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 4 Nov 2016 10:09:34 +0100 Subject: [PATCH 1232/3392] docs/website: update news with 2016.11-rc1 release e-mail link Signed-off-by: Thomas Petazzoni --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index 687b080cd0..901999be56 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

    2016.11-rc1 released

    We have a new release candidate! Lots of changes all over the tree, see the CHANGES - file for details. + file for details, read the + announcement.

    Head to the downloads page to pick up the From fdc9f9d035ef2b90d9a0f5617d2016b01e10a84f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 4 Nov 2016 06:52:55 +0100 Subject: [PATCH 1233/3392] package/openvpn: bump to version 2.3.13 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openvpn/openvpn.hash | 4 ++-- package/openvpn/openvpn.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index ce005d3d51..0c5cb09e94 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,2 +1,2 @@ -# Locally calculated after checking pgp signature -sha256 13b963414e2430215981868c77b9795d93653ee535a2d73576f7bb2c28200abc openvpn-2.3.12.tar.xz +# Locally calculated +sha256 9cde0c8000fd32d5275adb55f8bb1d8ba429ff3de35f60a36e81f3859b7537e0 openvpn-2.3.13.tar.xz diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 0e59fdc98d..cd0a2d13e6 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.3.12 +OPENVPN_VERSION = 2.3.13 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl From 07c1ae90c8890e82e62c22beaa4a72f6e081e96c Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Fri, 4 Nov 2016 11:15:17 +0100 Subject: [PATCH 1234/3392] board: atmel: genimage: add 1M offset for FAT partition With older SoCs and some SD cards, a 1024-bytes offset is needed to allow ROM code to read the content of the FAT partition. As it is usual to get a 1M bytes offset for the first partition, use this value to avoid boot issues. Signed-off-by: Ludovic Desroches Signed-off-by: Thomas Petazzoni --- board/atmel/sama5d2_xplained_mmc/genimage.cfg | 1 + board/atmel/sama5d3_xplained_mmc/genimage.cfg | 1 + board/atmel/sama5d4_xplained_mmc/genimage.cfg | 1 + 3 files changed, 3 insertions(+) diff --git a/board/atmel/sama5d2_xplained_mmc/genimage.cfg b/board/atmel/sama5d2_xplained_mmc/genimage.cfg index b0ba22dbb2..d3b7af5b5c 100644 --- a/board/atmel/sama5d2_xplained_mmc/genimage.cfg +++ b/board/atmel/sama5d2_xplained_mmc/genimage.cfg @@ -23,6 +23,7 @@ image sdcard.img { partition-type = 0xC bootable = "true" image = "boot.vfat" + offset = 1M } partition rootfs { diff --git a/board/atmel/sama5d3_xplained_mmc/genimage.cfg b/board/atmel/sama5d3_xplained_mmc/genimage.cfg index 32df453b01..277ce5f9c9 100644 --- a/board/atmel/sama5d3_xplained_mmc/genimage.cfg +++ b/board/atmel/sama5d3_xplained_mmc/genimage.cfg @@ -23,6 +23,7 @@ image sdcard.img { partition-type = 0xC bootable = "true" image = "boot.vfat" + offset = 1M } partition rootfs { diff --git a/board/atmel/sama5d4_xplained_mmc/genimage.cfg b/board/atmel/sama5d4_xplained_mmc/genimage.cfg index b23ebe470a..70bb3e4ff0 100644 --- a/board/atmel/sama5d4_xplained_mmc/genimage.cfg +++ b/board/atmel/sama5d4_xplained_mmc/genimage.cfg @@ -24,6 +24,7 @@ image sdcard.img { partition-type = 0xC bootable = "true" image = "boot.vfat" + offset = 1M } partition rootfs { From c29f023fc60392384f69b7530d729723913b778d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Sat, 5 Nov 2016 00:10:00 -0400 Subject: [PATCH 1235/3392] get-developers: fix parentheses for print MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Python3 complains about missing parentheses. $ ./support/scripts/get-developers File "./support/scripts/get-developers", line 45 print f ^ SyntaxError: Missing parentheses in call to 'print' Signed-off-by: Gaël PORTAY Signed-off-by: Thomas Petazzoni --- support/scripts/get-developers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/get-developers b/support/scripts/get-developers index 83f1e5b9b2..40ed08ffe1 100755 --- a/support/scripts/get-developers +++ b/support/scripts/get-developers @@ -42,7 +42,7 @@ def __main__(): if args.check: files = getdeveloperlib.check_developers(devs) for f in files: - print f + print(f) # Handle the architecture action if args.architecture is not None: From 48019c68fa051d0fb02d884c13852ff8135f9385 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 4 Nov 2016 21:20:58 +0100 Subject: [PATCH 1236/3392] package/mesa3d: Fix endianess detection with musl-based toolchains Fixes http://autobuild.buildroot.net/results/e27/e27a9a95f72dba3076549beb2a2ccfdbea2fcfee/ http://autobuild.buildroot.net/results/462/4629ee4813aa36de884bba2576612f909c007264/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...detection-with-musl-based-toolchains.patch | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 package/mesa3d/0004-Fix-endianess-detection-with-musl-based-toolchains.patch diff --git a/package/mesa3d/0004-Fix-endianess-detection-with-musl-based-toolchains.patch b/package/mesa3d/0004-Fix-endianess-detection-with-musl-based-toolchains.patch new file mode 100644 index 0000000000..656705b434 --- /dev/null +++ b/package/mesa3d/0004-Fix-endianess-detection-with-musl-based-toolchains.patch @@ -0,0 +1,65 @@ +From 61b076689b6308b1c9d0d84ee8654a47e65e67ae Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 4 Nov 2016 19:44:37 +0100 +Subject: [PATCH 1/1] Fix endianess detection with musl-based toolchains + +Musl does not define __GLIBC__ and will not provide a __MUSL__ macro: +http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F + +This patch checks for the presence of endian.h and promotes the result +to src/amd/Makefile.addrlib.am which executes the broken build command. +Fixes compile errors detected by the autobuilder infrastructure of the +buildroot project: + +http://autobuild.buildroot.net/results/e27/e27a9a95f72dba3076549beb2a2ccfdbea2fcfee/ +http://autobuild.buildroot.net/results/e27/e27a9a95f72dba3076549beb2a2ccfdbea2fcfee/ + +Patch sent upstream: https://patchwork.freedesktop.org/patch/119961/ + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 1 + + src/amd/Makefile.addrlib.am | 1 + + src/util/u_endian.h | 2 +- + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4761c59..7991b52 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -786,6 +786,7 @@ fi + AC_HEADER_MAJOR + AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"]) + AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"]) ++AC_CHECK_HEADER([endian.h], [DEFINES="$DEFINES -DHAVE_ENDIAN_H"]) + AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) + AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"]) + +diff --git a/src/amd/Makefile.addrlib.am b/src/amd/Makefile.addrlib.am +index 64823fc..4e2fb1d 100644 +--- a/src/amd/Makefile.addrlib.am ++++ b/src/amd/Makefile.addrlib.am +@@ -28,6 +28,7 @@ addrlib_libamdgpu_addrlib_la_CPPFLAGS = \ + -I$(srcdir)/addrlib/core \ + -I$(srcdir)/addrlib/inc/chip/r800 \ + -I$(srcdir)/addrlib/r800/chip \ ++ $(DEFINES) \ + -DBRAHMA_BUILD=1 + + addrlib_libamdgpu_addrlib_la_CXXFLAGS = \ +diff --git a/src/util/u_endian.h b/src/util/u_endian.h +index b9d563d..266fb4a 100644 +--- a/src/util/u_endian.h ++++ b/src/util/u_endian.h +@@ -27,7 +27,7 @@ + #ifndef U_ENDIAN_H + #define U_ENDIAN_H + +-#if defined(__GLIBC__) || defined(ANDROID) ++#if defined(__GLIBC__) || defined(ANDROID) || defined(HAVE_ENDIAN_H) + #include + + #if __BYTE_ORDER == __LITTLE_ENDIAN +-- +2.10.1 + From 97e8db6868bbceb9f46a9fece69492238345b32e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 4 Nov 2016 18:19:40 +0100 Subject: [PATCH 1237/3392] configs/nanopi-neo: use a more conventional kernel It turns out that linux-4.9-rc3 has all that is needed for the NanoPi NEO, so use that rather than the franken-kernel I assembled. Reported-by: Maxime Ripard Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- configs/nanopi_neo_defconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/nanopi_neo_defconfig b/configs/nanopi_neo_defconfig index 2f4ea37574..ba4534a1da 100644 --- a/configs/nanopi_neo_defconfig +++ b/configs/nanopi_neo_defconfig @@ -11,11 +11,10 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO" BR2_ROOTFS_POST_BUILD_SCRIPT="board/nanopi-neo/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nanopi-neo/post-image.sh" -# Use a special kernel tree until all support finally lands upstream +# Use a -rc kernel to get the DTS BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/yann-morin-1998/linux" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4.9-rc3-sunxi-next-2016-11-02" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9-rc3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-neo" From ac607c85a7152c3d0eaa3fde6b5344b283220bed Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 4 Nov 2016 12:41:37 -0400 Subject: [PATCH 1238/3392] lttng-babeltrace: fix static build again I accidentally removed the static build patch when bumping to v1.4.0, thinking it was merged upstream as of this version, but it's not the case (it's merged in master), so let's keep the patch file. Signed-off-by: Philippe Proulx Signed-off-by: Thomas Petazzoni --- ...id-support-detection-on-static-build.patch | 86 +++++++++++++++++++ package/lttng-babeltrace/lttng-babeltrace.mk | 4 +- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 package/lttng-babeltrace/0003-fix-uuid-support-detection-on-static-build.patch diff --git a/package/lttng-babeltrace/0003-fix-uuid-support-detection-on-static-build.patch b/package/lttng-babeltrace/0003-fix-uuid-support-detection-on-static-build.patch new file mode 100644 index 0000000000..875aa88f6e --- /dev/null +++ b/package/lttng-babeltrace/0003-fix-uuid-support-detection-on-static-build.patch @@ -0,0 +1,86 @@ +From 2741f55be80ae8af169ae795ea28d2a39c18fa60 Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Wed, 1 Jun 2016 21:56:32 +0200 +Subject: [PATCH] configure: fix uuid support detection on static build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This change adds uuid detection using pkg-config helper before falling +back on the standard AC_CHECK_LIB detection for platforms missing +pkg-config. + +AC_CHECK_LIB function achieves its test by trying to link against the +requested library, without taking care of its dependency +requirements/flags that may differ between different targets. +Therefore, in case of static build, it can fail on the uuid detection +like [1], because the uuid's dependency flags (regarding gettext) are +missing. + +Instead, using pkg-config to do the check will take care of getting and +setting all required flags. + +This issue [1] has been triggered on Buildroot farms. + +[1] http://autobuild.buildroot.net/results/43b/43b98ddf9eb44152ed9ac4a98d887af14831d8da/build-end.log + +Signed-off-by: Samuel Martin +Signed-off-by: Jérémie Galarneau +[Philippe: grabbed from this upstream patch: + https://github.com/efficios/babeltrace/commit/2741f55be80ae8af169ae795ea28d2a39c18fa60.patch +] +Signed-off-by: Philippe Proulx +--- + configure.ac | 31 +++++++++++++++++++++---------- + 1 file changed, 21 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 84f9000..2f5e3f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -163,24 +163,35 @@ AC_CHECK_FUNCS([uuid_generate], + link_with_libuuid=no + ], + [ +- # Check for libuuid +- AC_CHECK_LIB([uuid], [uuid_generate], ++ # First, check the pkg-config module is available, otherwise explicitly check ++ # for libuuid, or uuid support in the C-library. ++ PKG_CHECK_MODULES([UUID], [uuid], + [ ++ LIBS="${UUID_LIBS} ${LIBS}" ++ CFLAGS="${CFLAGS} ${UUID_CFLAGS}" + AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) + link_with_libuuid=yes + ], + [ +- # libuuid not found, check for uuid_create in libc. +- AC_CHECK_LIB([c], [uuid_create], ++ # Check for libuuid ++ AC_CHECK_LIB([uuid], [uuid_generate], + [ +- AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) +- link_with_libc_uuid=yes ++ AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) ++ link_with_libuuid=yes + ], + [ +- # for MinGW32 we have our own internal implemenation of uuid using Windows functions. +- if test "x$MINGW32" = xno; then +- AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) +- fi ++ # libuuid not found, check for uuid_create in libc. ++ AC_CHECK_LIB([c], [uuid_create], ++ [ ++ AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) ++ link_with_libc_uuid=yes ++ ], ++ [ ++ # for MinGW32 we have our own internal implemenation of uuid using Windows functions. ++ if test "x$MINGW32" = xno; then ++ AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) ++ fi ++ ]) + ]) + ]) + ]) diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk index 59327dbf5d..67b740656f 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.mk +++ b/package/lttng-babeltrace/lttng-babeltrace.mk @@ -14,7 +14,9 @@ HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ host-popt host-util-linux host-libglib2 host-pkgconf HOST_LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info -# For 0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch +# For: +# 0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch +# 0003-fix-uuid-support-detection-on-static-build.patch LTTNG_BABELTRACE_AUTORECONF = YES ifeq ($(BR2_PACKAGE_ELFUTILS),y) From d2362fc9c4d6add63c0a5c077d2729c0a67f239f Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Fri, 4 Nov 2016 16:28:42 +0100 Subject: [PATCH 1239/3392] tinyalsa: avoid install in /usr/local/ Set the PREFIX to avoid installing files in [...]/usr/local/. Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/tinyalsa/tinyalsa.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index 4cd01d5d44..87753d6f4e 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -16,6 +16,7 @@ endef define TINYALSA_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) \ -C $(@D) \ + PREFIX="/usr" \ CROSS_COMPILE="$(TARGET_CROSS)" \ DESTDIR="$(STAGING_DIR)" install endef @@ -23,6 +24,7 @@ endef define TINYALSA_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) \ -C $(@D) \ + PREFIX="/usr" \ CROSS_COMPILE="$(TARGET_CROSS)" \ DESTDIR="$(TARGET_DIR)" install endef From 99ed85d74081a8611a6f6d1f3d745a5c40aef975 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 4 Nov 2016 10:08:37 +0000 Subject: [PATCH 1240/3392] cmake: bump version to 3.6.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- .../cmake/0001-rename_cmake_rootfile.patch | 28 +++++++++++-------- package/cmake/cmake.hash | 4 +-- package/cmake/cmake.mk | 4 +-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/package/cmake/0001-rename_cmake_rootfile.patch b/package/cmake/0001-rename_cmake_rootfile.patch index 915b7e32bb..8c168c15a8 100644 --- a/package/cmake/0001-rename_cmake_rootfile.patch +++ b/package/cmake/0001-rename_cmake_rootfile.patch @@ -5,19 +5,25 @@ files are removed at build time via the target-finalize rule. This buildroot-specific patch makes sure ctest looks also for "Modules/CMake.cmake.ctest" before complaining +[Vincent: tweak patch for 3.6.3] + Signed-off-by: Davide Viti +Signed-off-by: Vicente Olivert Riera ---- cmake-3.0.2/Source/cmake.cxx~ 2014-09-11 15:24:01.000000000 +0200 -+++ cmake-3.0.2/Source/cmake.cxx 2014-11-25 15:48:04.461033690 +0100 -@@ -957,7 +957,10 @@ - "Path to cpack program executable.", cmCacheManager::INTERNAL); +diff -rup a/Source/cmake.cxx b/Source/cmake.cxx +--- a/Source/cmake.cxx 2016-07-07 15:47:27.000000000 +0100 ++++ b/Source/cmake.cxx 2016-07-14 10:14:59.914265515 +0100 +@@ -771,7 +771,12 @@ int cmake::AddCMakePaths() + "Path to cpack program executable.", cmState::INTERNAL); #endif - if(!cmSystemTools::FileExists( -- (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake").c_str())) -+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake").c_str()) && -+ !cmSystemTools::FileExists( -+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str()) + if (!cmSystemTools::FileExists( +- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str())) { ++ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str()) && ++ !cmSystemTools::FileExists( ++ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str() ++ ) + ) - { ++ { // couldn't find modules - cmSystemTools::Error("Could not find CMAKE_ROOT !!!\n" + cmSystemTools::Error( + "Could not find CMAKE_ROOT !!!\n" diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index e40d4ea39a..f846dc9541 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,2 +1,2 @@ -# From http://www.cmake.org/files/v3.5/cmake-3.5.2-SHA-256.txt -sha256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a cmake-3.5.2.tar.gz +# From http://www.cmake.org/files/v3.6/cmake-3.6.3-SHA-256.txt +sha256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe cmake-3.6.3.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 7a80c1bfef..fadb09ebdd 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.5 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2 +CMAKE_VERSION_MAJOR = 3.6 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt From 5f9381fa55f9de08e4810417094679fb3662149a Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 4 Nov 2016 10:32:13 +0000 Subject: [PATCH 1241/3392] systemd: bump version to 232 - 0002 patch tweaked. There is a hunk that has been removed upstream by this commit: https://github.com/systemd/systemd/commit/082210c7a837063fd8b520b18c221b42059d7eff - Patches 0004, 0005 and 0006 were backported from upstream and now they are included in this release, so drop them. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- ...sys-revert-use-of-ln-relative-option.patch | 18 ++--- ...rt-raw-needs-missing.h-for-O_TMPFILE.patch | 31 --------- ...-missing-definitions-for-__O_TMPFILE.patch | 63 ------------------ ...-fileio-we-always-have-O_TMPFILE-now.patch | 65 ------------------- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 6 files changed, 9 insertions(+), 172 deletions(-) delete mode 100644 package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch delete mode 100644 package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch delete mode 100644 package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch diff --git a/package/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch b/package/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch index 18dc98790c..2c1d929ebc 100644 --- a/package/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch +++ b/package/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch @@ -11,25 +11,21 @@ for example). Signed-off-by: Eric Le Bihan [Maxime: refresh the patch] +[Vincent: + refresh the patch, move-to-rootlibdir removed by: + https://github.com/systemd/systemd/commit/082210c7a837063fd8b520b18c221b42059d7eff +] Signed-off-by: Maxime Hadjinlian +Signed-off-by: Vicente Olivert Riera --- - Makefile.am | 15 +++------------ + Makefile.am | 11 ++--------- configure.ac | 2 -- - 2 files changed, 3 insertions(+), 14 deletions(-) + 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0c27f81..4de1595 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -255,7 +255,7 @@ define move-to-rootlibdir - $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ - so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ - rm -f $(DESTDIR)$(libdir)/$$libname && \ -- $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ -+ $(LN_S) -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ - mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ - fi - endef @@ -312,9 +312,9 @@ install-aliases-hook: set -- $(SYSTEM_UNIT_ALIASES) && \ dir=$(systemunitdir) && $(install-aliases) diff --git a/package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch b/package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch deleted file mode 100644 index bded6bc5d4..0000000000 --- a/package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4a6d35237f96d07f3a783c874933f87bf14f93e0 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 28 Aug 2016 16:26:04 +0200 -Subject: [PATCH] importd/export-raw: needs missing.h for O_TMPFILE - -O_TMPFILE may be missing from the system headers, so use our fallback -definition. - -Signed-off-by: "Yann E. MORIN" ---- -Backported from upstream: - https://github.com/systemd/systemd/commit/4a6d35237f96d07f3a783c874933f87bf14f93e0 ---- - src/import/export-raw.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/import/export-raw.c b/src/import/export-raw.c -index db06e11..6136b67 100644 ---- a/src/import/export-raw.c -+++ b/src/import/export-raw.c -@@ -34,6 +34,7 @@ - #include "fd-util.h" - #include "fileio.h" - #include "import-common.h" -+#include "missing.h" - #include "ratelimit.h" - #include "string-util.h" - #include "util.h" --- -2.7.4 - diff --git a/package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch b/package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch deleted file mode 100644 index 1c5ca05c97..0000000000 --- a/package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch +++ /dev/null @@ -1,63 +0,0 @@ -From daad709a7c13c0fac73e407528f96cc876c09629 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 28 Aug 2016 17:26:42 +0200 -Subject: [PATCH] missing.h: add missing definitions for __O_TMPFILE - -Currently, a missing __O_TMPFILE was only defined for i386 and x86_64, -leaving any other architectures with an "old" toolchain fail miserably -at build time: - src/import/export-raw.c: In function 'reflink_snapshot': - src/import/export-raw.c:271:26: error: 'O_TMPFILE' undeclared (first use in this function) - new_fd = open(d, O_TMPFILE|O_CLOEXEC|O_NOCTTY|O_RDWR, 0600); - ^ - -__O_TMPFILE (and O_TMPFILE) are available since glibc 2.19. However, a -lot of existing toolchains are still using glibc-2.18, and some even -before that, and it is not really possible to update those toolchains. - -Instead of defining it only for i386 and x86_64, define __O_TMPFILE -with the specific values for those archs where it is different from the -generic value. Use the values as found in the Linux kernel (v4.8-rc3, -current as of time of commit). - -Signed-off-by: "Yann E. MORIN" ---- -Backported from upstream: - https://github.com/systemd/systemd/commit/daad709a7c13c0fac73e407528f96cc876c09629 ---- - src/basic/missing.h | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/src/basic/missing.h b/src/basic/missing.h -index f8e0966..13ff51c 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -537,12 +537,21 @@ struct btrfs_ioctl_quota_ctl_args { - # define DRM_IOCTL_DROP_MASTER _IO('d', 0x1f) - #endif - --#if defined(__i386__) || defined(__x86_64__) -- --/* The precise definition of __O_TMPFILE is arch specific, so let's -- * just define this on x86 where we know the value. */ -+/* The precise definition of __O_TMPFILE is arch specific; use the -+ * values defined by the kernel (note: some are hexa, some are octal, -+ * duplicated as-is from the kernel definitions): -+ * - alpha, parisc, sparc: each has a specific value; -+ * - others: they use the "generic" value. -+ */ - - #ifndef __O_TMPFILE -+#if defined(__alpha__) -+#define __O_TMPFILE 0100000000 -+#elif defined(__parisc__) || defined(__hppa__) -+#define __O_TMPFILE 0400000000 -+#elif defined(__sparc__) || defined(__sparc64__) -+#define __O_TMPFILE 0x2000000 -+#else - #define __O_TMPFILE 020000000 - #endif - --- -2.7.4 - diff --git a/package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch b/package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch deleted file mode 100644 index e0e7209e60..0000000000 --- a/package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 1d9ed171788821c21ca900a921833a8e41bf22f3 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 29 Aug 2016 12:34:50 +0200 -Subject: [PATCH] basic/fileio: we always have O_TMPFILE now - -fileio makes use of O_TMPFILE when it is available. - -We now always have O_TMPFILE, defined in missing.h if missing -from the toolchain headers. - -Have fileio include missing.h and drop the guards around the -use of O_TMPFILE. - -Signed-off-by: "Yann E. MORIN" ---- -Backported from upstream: - https://github.com/systemd/systemd/commit/1d9ed171788821c21ca900a921833a8e41bf22f3 ---- - src/basic/fileio.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/basic/fileio.c b/src/basic/fileio.c -index d642f3d..a5920e7 100644 ---- a/src/basic/fileio.c -+++ b/src/basic/fileio.c -@@ -37,6 +37,7 @@ - #include "hexdecoct.h" - #include "log.h" - #include "macro.h" -+#include "missing.h" - #include "parse-util.h" - #include "path-util.h" - #include "random-util.h" -@@ -1280,12 +1281,10 @@ int open_tmpfile_unlinkable(const char *directory, int flags) { - - /* Returns an unlinked temporary file that cannot be linked into the file system anymore */ - --#ifdef O_TMPFILE - /* Try O_TMPFILE first, if it is supported */ - fd = open(directory, flags|O_TMPFILE|O_EXCL, S_IRUSR|S_IWUSR); - if (fd >= 0) - return fd; --#endif - - /* Fall back to unguessable name + unlinking */ - p = strjoina(directory, "/systemd-tmp-XXXXXX"); -@@ -1313,7 +1312,6 @@ int open_tmpfile_linkable(const char *target, int flags, char **ret_path) { - * which case "ret_path" will be returned as NULL. If not possible a the tempoary path name used is returned in - * "ret_path". Use link_tmpfile() below to rename the result after writing the file in full. */ - --#ifdef O_TMPFILE - { - _cleanup_free_ char *dn = NULL; - -@@ -1329,7 +1327,6 @@ int open_tmpfile_linkable(const char *target, int flags, char **ret_path) { - - log_debug_errno(errno, "Failed to use O_TMPFILE on %s: %m", dn); - } --#endif - - r = tempfn_random(target, NULL, &tmp); - if (r < 0) --- -2.7.4 - diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 30e9ef6527..0acaa3cdcd 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 systemd-231.tar.gz +sha256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 systemd-232.tar.gz diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index fb07819594..fa07bd0572 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 231 +SYSTEMD_VERSION = 232 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 944805f012f4f1f8e77aba0bbc5edc7e786999a2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 4 Nov 2016 07:08:21 +0100 Subject: [PATCH 1242/3392] tinycbor: bump to version v0.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/tinycbor/tinycbor.hash | 4 +--- package/tinycbor/tinycbor.mk | 13 +------------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/package/tinycbor/tinycbor.hash b/package/tinycbor/tinycbor.hash index f07fc17d9a..88300e8e34 100644 --- a/package/tinycbor/tinycbor.hash +++ b/package/tinycbor/tinycbor.hash @@ -1,4 +1,2 @@ # Locally computed: -sha256 f70de1e6b7e3750abb4ceacf0059e47b47c769f113434de10293b33867ce54c2 tinycbor-v0.3.2.tar.gz -sha256 7d3aa839ae246e9e14fc73e67869d88c684802c1578fb75503f3fdde1482dcf6 ede7f1431ae06c9086f2a83a57bd7832d99280e3.patch -sha256 42054074478d074d0320e0c64e8d44f60081b6f0d8dc0e3607e0fb7f4dad96a4 ad09b6af11fc8b6391041973783785cfe1559d63.patch +sha256 302ac9de66f1048725040ccc9a99e03c20529ac2b150ccf35cfd1e2dafa81c4b tinycbor-v0.4.tar.gz diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index 8ce9a76824..2691e5b8d3 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -4,22 +4,11 @@ # ################################################################################ -TINYCBOR_VERSION = v0.3.2 +TINYCBOR_VERSION = v0.4 TINYCBOR_SITE = $(call github,01org,tinycbor,$(TINYCBOR_VERSION)) TINYCBOR_LICENSE = MIT TINYCBOR_LICENSE_FILES = LICENSE -# This patch fixes the issue on unnamed union which are not supported by some -# targets like blackfin -# This patch is currently in dev branch and will be a part of v0.4 -TINYCBOR_PATCH = \ - https://github.com/01org/tinycbor/commit/ede7f1431ae06c9086f2a83a57bd7832d99280e3.patch - -# This patch fixes the issue on cjson detection -# This patch is currently in dev branch and will be a part of v0.4 -TINYCBOR_PATCH += \ - https://github.com/01org/tinycbor/commit/ad09b6af11fc8b6391041973783785cfe1559d63.patch - TINYCBOR_DEPENDENCIES = host-pkgconf TINYCBOR_INSTALL_STAGING = YES From 998d44e0881e8bcf7ecea7a606c389986f175c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 4 Nov 2016 23:55:49 -0400 Subject: [PATCH 1243/3392] pseudo: fix build for python3 based distros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pseudo is not python3 friendly. It causes build failure on distros using python3 as default python interpretor. ./maketables enums/*.in File "./makewrappers", line 327 return """/* This function is not called if pseudo is configured --enable-force-async */ ^ TabError: inconsistent use of tabs and spaces in indentation File "./maketables", line 76 print "Flags: set for %s" % self.name ^ SyntaxError: Missing parentheses in call to 'print' make[2]: *** [Makefile:150: wrappers] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: *** [Makefile:147: tables] Error 1 Those patches make pseudo works with python2 and python3. Signed-off-by: Gaël PORTAY Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...0001-Fix-mixed-tab-space-indentation.patch | 105 +++++++++ ...002-Fix-missing-parentheses-at-print.patch | 190 ++++++++++++++++ ...0003-Make-it-compatible-with-python3.patch | 215 ++++++++++++++++++ 3 files changed, 510 insertions(+) create mode 100644 package/pseudo/0001-Fix-mixed-tab-space-indentation.patch create mode 100644 package/pseudo/0002-Fix-missing-parentheses-at-print.patch create mode 100644 package/pseudo/0003-Make-it-compatible-with-python3.patch diff --git a/package/pseudo/0001-Fix-mixed-tab-space-indentation.patch b/package/pseudo/0001-Fix-mixed-tab-space-indentation.patch new file mode 100644 index 0000000000..6b62c1af94 --- /dev/null +++ b/package/pseudo/0001-Fix-mixed-tab-space-indentation.patch @@ -0,0 +1,105 @@ +From bf4e5310547603bf36e67dc4cba027963f16508e Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= +Date: Fri, 4 Nov 2016 11:53:48 -0400 +Subject: [PATCH 1/3] Fix mixed tab/space indentation +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +CC="cc -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -DPSEUDO_PREFIX='"/usr/local"' -DPSEUDO_SUFFIX='""' -DPSEUDO_BINDIR='"bin"' -DPSEUDO_LIBDIR='"lib64"' -DPSEUDO_LOCALSTATEDIR='"var/pseudo"' -DPSEUDO_VERSION='"1.8.1"' -DUSE_MEMORY_DB -DPSEUDO_PASSWD_FALLBACK='""' -DPSEUDO_XATTR_SUPPORT -O2 -g " ./makewrappers "xattr=true" + File "./makewrappers", line 327 + return """/* This function is not called if pseudo is configured --enable-force-async */ + ^ +TabError: inconsistent use of tabs and spaces in indentation + +Signed-off-by: Gaël PORTAY +--- + makewrappers | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/makewrappers b/makewrappers +index e9191ed..303e2cc 100755 +--- a/makewrappers ++++ b/makewrappers +@@ -324,7 +324,7 @@ class Function: + + def maybe_async_skip(self): + if self.async_skip: +- return """/* This function is not called if pseudo is configured --enable-force-async */ ++ return """/* This function is not called if pseudo is configured --enable-force-async */ + #ifdef PSEUDO_FORCE_ASYNC + if (!pseudo_allow_fsync) { + PROFILE_DONE; +@@ -333,7 +333,7 @@ class Function: + #endif + """ % self.async_skip + else: +- return "" ++ return "" + + def comment(self): + """declare self (in a comment)""" +@@ -393,11 +393,11 @@ class Function: + + def rc_format(self): + """the format string to use for the return value""" +- return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['format'] ++ return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['format'] + + def rc_value(self): + """the value to pass for the format string for the return value""" +- return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['value'] ++ return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['value'] + + def rc_decl(self): + """declare rc (if needed)""" +@@ -456,7 +456,7 @@ additional ports to include. + self.name = port + self.subports = [] + self.preports = [] +- print port ++ print port + + if os.path.exists(self.portfile("pseudo_wrappers.c")): + self.wrappers = self.portfile("pseudo_wrappers.c") +@@ -522,11 +522,11 @@ additional ports to include. + return '#define PSEUDO_PORT_%s 1' % string.upper(self.name).replace('/', '_') + + def portdeps(self): +- deps = [] +- if self.wrappers: +- deps.append(self.wrappers) +- if self.portdef_file: +- deps.append(self.portdef_file) ++ deps = [] ++ if self.wrappers: ++ deps.append(self.wrappers) ++ if self.portdef_file: ++ deps.append(self.portdef_file) + if deps: + return 'pseudo_wrappers.o: %s' % ' '.join(deps) + else: +@@ -590,7 +590,7 @@ def main(argv): + + for arg in argv: + name, value = arg.split('=') +- os.environ["port_" + name] = value ++ os.environ["port_" + name] = value + + # error checking helpfully provided by the exception handler + copyright_file = open('guts/COPYRIGHT') +@@ -599,9 +599,9 @@ def main(argv): + + for path in glob.glob('templates/*'): + try: +- print "Considering template: " + path ++ print "Considering template: " + path + source = TemplateFile(path) +- if source.name.endswith('.c') or source.name.endswith('.h'): ++ if source.name.endswith('.c') or source.name.endswith('.h'): + source.emit('copyright') + source.emit('header') + sources.append(source) +-- +2.10.1 + diff --git a/package/pseudo/0002-Fix-missing-parentheses-at-print.patch b/package/pseudo/0002-Fix-missing-parentheses-at-print.patch new file mode 100644 index 0000000000..b023fcf831 --- /dev/null +++ b/package/pseudo/0002-Fix-missing-parentheses-at-print.patch @@ -0,0 +1,190 @@ +From 6488a68ca715d8e18f899e536effceb548ed136e Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= +Date: Fri, 4 Nov 2016 12:23:25 -0400 +Subject: [PATCH 2/3] Fix missing parentheses at print +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +CC="cc -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -DPSEUDO_PREFIX='"/usr/local"' -DPSEUDO_SUFFIX='""' -DPSEUDO_BINDIR='"bin"' -DPSEUDO_LIBDIR='"lib64"' -DPSEUDO_LOCALSTATEDIR='"var/pseudo"' -DPSEUDO_VERSION='"1.8.1"' -DUSE_MEMORY_DB -DPSEUDO_PASSWD_FALLBACK='""' -DPSEUDO_XATTR_SUPPORT -O2 -g " ./makewrappers "xattr=true" + File "./makewrappers", line 459 + print port + ^ +SyntaxError: Missing parentheses in call to 'print' + +Signed-off-by: Gaël PORTAY +--- + maketables | 12 ++++++------ + makewrappers | 32 ++++++++++++++++---------------- + templatefile.py | 8 ++++---- + 3 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/maketables b/maketables +index b32312e..0726485 100755 +--- a/maketables ++++ b/maketables +@@ -73,7 +73,7 @@ class DataType: + for col in columns: + indexed = False + if col.startswith("FLAGS"): +- print "Flags: set for %s" % self.name ++ print("Flags: set for %s" % self.name) + self.flags = True + continue + if col.startswith("INDEXED "): +@@ -248,7 +248,7 @@ def main(): + template_file.emit('header') + templates.append(template_file) + except IOError: +- print "Invalid or malformed template %s. Aborting." % path ++ print("Invalid or malformed template %s. Aborting." % path) + exit(1) + + for filename in sys.argv[1:]: +@@ -256,15 +256,15 @@ def main(): + sys.stdout.write("%s: " % filename) + datatype = DataType(filename) + datatypes.append(datatype) +- print datatype.__repr__() +- print "" ++ print(datatype.__repr__()) ++ print("") + +- print "Writing datatypes...", ++ print("Writing datatypes...") + for datatype in datatypes: + # populate various tables and files with each datatype + for template_file in templates: + template_file.emit('body', datatype) +- print "done. Cleaning up." ++ print("done. Cleaning up.") + + for template_file in templates: + # clean up files +diff --git a/makewrappers b/makewrappers +index 303e2cc..bac856b 100755 +--- a/makewrappers ++++ b/makewrappers +@@ -456,7 +456,7 @@ additional ports to include. + self.name = port + self.subports = [] + self.preports = [] +- print port ++ print(port) + + if os.path.exists(self.portfile("pseudo_wrappers.c")): + self.wrappers = self.portfile("pseudo_wrappers.c") +@@ -504,17 +504,17 @@ additional ports to include. + prefuncs = pre.functions() + for name in prefuncs.keys(): + if name in mergedfuncs: +- print "Warning: %s from %s overriding %s" % (name, pre.name, mergedfuncs[name].port) ++ print("Warning: %s from %s overriding %s" % (name, pre.name, mergedfuncs[name].port)) + mergedfuncs[name] = prefuncs[name] + for name in self.funcs.keys(): + if name in mergedfuncs: +- print "Warning: %s from %s overriding %s" % (name, self.name, mergedfuncs[name].port) ++ print("Warning: %s from %s overriding %s" % (name, self.name, mergedfuncs[name].port)) + mergedfuncs[name] = self.funcs[name] + for sub in self.subports: + subfuncs = sub.functions() + for name in subfuncs.keys(): + if name in mergedfuncs: +- print "Warning: %s from %s overriding %s" % (name, sub.name, mergedfuncs[name].port) ++ print("Warning: %s from %s overriding %s" % (name, sub.name, mergedfuncs[name].port)) + mergedfuncs[name] = subfuncs[name] + return mergedfuncs + +@@ -576,11 +576,11 @@ def process_wrapfuncs(port): + func.directory = directory + funcs[func.name] = func + sys.stdout.write(".") +- except Exception, e: +- print "Parsing failed:", e ++ except Exception(e): ++ print("Parsing failed:", e) + exit(1) + funclist.close() +- print "" ++ print("") + return funcs + + def main(argv): +@@ -599,35 +599,35 @@ def main(argv): + + for path in glob.glob('templates/*'): + try: +- print "Considering template: " + path ++ print("Considering template: " + path) + source = TemplateFile(path) + if source.name.endswith('.c') or source.name.endswith('.h'): + source.emit('copyright') + source.emit('header') + sources.append(source) + except IOError: +- print "Invalid or malformed template %s. Aborting." % path ++ print("Invalid or malformed template %s. Aborting." % path) + exit(1) + + try: + port = Port('common', sources) + + except KeyError: +- print "Unknown uname -s result: '%s'." % uname_s +- print "Known system types are:" +- print "%-20s %-10s %s" % ("uname -s", "port name", "description") ++ print("Unknown uname -s result: '%s'." % uname_s) ++ print("Known system types are:") ++ print("%-20s %-10s %s" % ("uname -s", "port name", "description")) + for key in host_ports: +- print "%-20s %-10s %s" % (key, host_ports[key], +- host_descrs[host_ports[key]]) ++ print("%-20s %-10s %s" % (key, host_ports[key], ++ host_descrs[host_ports[key]])) + + # the per-function stuff +- print "Writing functions...", ++ print("Writing functions...") + all_funcs = port.functions() + for name in sorted(all_funcs.keys()): + # populate various tables and files with each function + for source in sources: + source.emit('body', all_funcs[name]) +- print "done. Cleaning up." ++ print("done. Cleaning up.") + + for source in sources: + # clean up files +diff --git a/templatefile.py b/templatefile.py +index 2789b22..abf9a2c 100644 +--- a/templatefile.py ++++ b/templatefile.py +@@ -79,13 +79,13 @@ class TemplateFile: + return + path = Template(self.path).safe_substitute(item) + if os.path.exists(path): +- # print "We don't overwrite existing files." ++ # print("We don't overwrite existing files.") + return + self.file = open(path, 'w') + if not self.file: +- print "Couldn't open '%s' (expanded from %s), " \ ++ print("Couldn't open '%s' (expanded from %s), " \ + "not emitting '%s'." % \ +- (path, self.path, template) ++ (path, self.path, template)) + return + + def emit(self, template, item=None): +@@ -103,7 +103,7 @@ class TemplateFile: + self.file.write(templ.safe_substitute(item)) + self.file.write("\n") + else: +- print "Warning: Unknown template '%s'." % template ++ print("Warning: Unknown template '%s'." % template) + + if self.file_per_item: + if self.file: +-- +2.10.1 + diff --git a/package/pseudo/0003-Make-it-compatible-with-python3.patch b/package/pseudo/0003-Make-it-compatible-with-python3.patch new file mode 100644 index 0000000000..3bb74deacf --- /dev/null +++ b/package/pseudo/0003-Make-it-compatible-with-python3.patch @@ -0,0 +1,215 @@ +From fcc10b1f4a9968af5cda1adb9e449df92939d5f2 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= +Date: Fri, 4 Nov 2016 15:58:46 -0400 +Subject: [PATCH 3/3] Make it compatible with python3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Python scripts are now compatible with both version of python, 2 and 3. + +Helped-by: Damien Riegel +Helped-by: Alexandre Leblanc +Signed-off-by: Gaël PORTAY +--- + maketables | 135 ++++++++++++++++++++++++++++++----------------------------- + makewrappers | 8 ++-- + 2 files changed, 73 insertions(+), 70 deletions(-) + +diff --git a/maketables b/maketables +index 0726485..f74f2b1 100755 +--- a/maketables ++++ b/maketables +@@ -51,6 +51,7 @@ value. (This is for consistency with C array bounds.) + import glob + import sys + import string ++import os + from templatefile import TemplateFile + + class DataType: +@@ -58,74 +59,74 @@ class DataType: + + def __init__(self, path): + """read the first line of path, then make tuples of the rest""" +- source = file(path) +- definition = source.readline().rstrip() +- self.name, qualifiers = string.split(definition, ': ', 2) +- if '; ' in qualifiers: +- self.prefix, columns = string.split(qualifiers, '; ') +- else: +- self.prefix = qualifiers +- columns = [] +- self.flags = False +- if len(columns): +- self.columns = [] +- columns = string.split(columns, ', ') +- for col in columns: +- indexed = False +- if col.startswith("FLAGS"): +- print("Flags: set for %s" % self.name) +- self.flags = True ++ with open(path,'r') as source: ++ definition = source.readline().rstrip() ++ self.name, qualifiers = definition.split(': ', 2) ++ if '; ' in qualifiers: ++ self.prefix, columns = qualifiers.split('; ') ++ else: ++ self.prefix = qualifiers ++ columns = [] ++ self.flags = False ++ if len(columns): ++ self.columns = [] ++ columns = columns.split(', ') ++ for col in columns: ++ indexed = False ++ if col.startswith("FLAGS"): ++ print("Flags: set for %s" % self.name) ++ self.flags = True ++ continue ++ if col.startswith("INDEXED "): ++ col = col[8:] ++ indexed = True ++ if "=" in col: ++ name, default = col.split(' = ') ++ else: ++ name, default = col, "" ++ if " " in name: ++ words = name.split(' ') ++ name = words[-1] ++ del words[-1] ++ type = ' '.join(words) ++ else: ++ type = "char *" ++ self.columns.append({"indexed":indexed, "type":type, "name":name, "value":default}) ++ else: ++ self.columns = [] ++ self.data = [] ++ self.comments = [] ++ index = 1 ++ for line in source.readlines(): ++ item = {} ++ if line.startswith('#'): ++ self.comments.append(line.rstrip().replace('#', '')) + continue +- if col.startswith("INDEXED "): +- col = col[8:] +- indexed = True +- if "=" in col: +- name, default = string.split(col, ' = ') +- else: +- name, default = col, "" +- if " " in name: +- words = string.split(name, ' ') +- name = words[-1] +- del words[-1] +- type = ' '.join(words) +- else: +- type = "char *" +- self.columns.append({"indexed":indexed, "type":type, "name":name, "value":default}) +- else: +- self.columns = [] +- self.data = [] +- self.comments = [] +- index = 1 +- for line in source.readlines(): +- item = {} +- if line.startswith('#'): +- self.comments.append(line.rstrip().replace('#', '')) +- continue +- # first entry on the line is the "real" name/id, following hunks +- # are additional columns +- cols = string.split(line.rstrip(), ', ') +- item["name"] = cols.pop(0) +- item["upper"] = item["name"].replace('-', '_').upper() +- column_list = [] +- for col in self.columns: +- if len(cols) > 0: +- value = cols.pop(0) +- if col["indexed"]: +- if not "max" in col: +- col["max"] = value +- if value > col["max"]: +- col["max"] = value +- if not "min" in col: +- col["min"] = value +- if value < col["min"]: +- col["min"] = value +- column_list.append({"name":col["name"], "value":value}) +- else: +- column_list.append({"name":col["name"], "value":col["value"]}) +- item["cols"] = column_list +- item["index"] = index +- index = index + 1 +- self.data.append(item) ++ # first entry on the line is the "real" name/id, following hunks ++ # are additional columns ++ cols = line.rstrip().split(', ') ++ item["name"] = cols.pop(0) ++ item["upper"] = item["name"].replace('-', '_').upper() ++ column_list = [] ++ for col in self.columns: ++ if len(cols) > 0: ++ value = cols.pop(0) ++ if col["indexed"]: ++ if not "max" in col: ++ col["max"] = value ++ if value > col["max"]: ++ col["max"] = value ++ if not "min" in col: ++ col["min"] = value ++ if value < col["min"]: ++ col["min"] = value ++ column_list.append({"name":col["name"], "value":value}) ++ else: ++ column_list.append({"name":col["name"], "value":col["value"]}) ++ item["cols"] = column_list ++ item["index"] = index ++ index = index + 1 ++ self.data.append(item) + + def __getitem__(self, key): + """Make this object look like a dict for Templates to use""" +diff --git a/makewrappers b/makewrappers +index bac856b..ff08ba0 100755 +--- a/makewrappers ++++ b/makewrappers +@@ -453,6 +453,8 @@ additional ports to include. + """ + + def __init__(self, port, sources): ++ if type(port) is not str: ++ port = str(port, encoding="ascii") + self.name = port + self.subports = [] + self.preports = [] +@@ -483,7 +485,7 @@ additional ports to include. + if retcode: + raise Exception("preports script failed for port %s" % self.name) + +- for preport in string.split(portlist): ++ for preport in portlist.split(): + next = Port(preport, sources) + self.preports.append(next) + +@@ -494,7 +496,7 @@ additional ports to include. + if retcode: + raise Exception("subports script failed for port %s" % self.name) + +- for subport in string.split(portlist): ++ for subport in portlist.split(): + next = Port(subport, sources) + self.subports.append(next) + +@@ -519,7 +521,7 @@ additional ports to include. + return mergedfuncs + + def define(self): +- return '#define PSEUDO_PORT_%s 1' % string.upper(self.name).replace('/', '_') ++ return '#define PSEUDO_PORT_%s 1' % self.name.upper().replace('/', '_') + + def portdeps(self): + deps = [] +-- +2.10.1 + From a25210b8a06ba7bc57481afbacc8f8b9bb007d40 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 5 Nov 2016 13:26:46 +0100 Subject: [PATCH 1244/3392] packages/pseudo: needs attr This fixes the build on machines that do not have attr development files installed. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pseudo/pseudo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index e2c56fff06..ed348f1cd9 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -12,7 +12,7 @@ PSEUDO_SITE_METHOD = git PSEUDO_LICENSE = LGPLv2.1 PSEUDO_LICENSE_FILES = COPYING -HOST_PSEUDO_DEPENDENCIES = host-sqlite +HOST_PSEUDO_DEPENDENCIES = host-attr host-sqlite # configure script is not generated by autoconf, so passing --libdir # is necessary, even if the infrastructure passes --prefix already. From bdb8f8231b0418c91bb800b59afa89f182a36081 Mon Sep 17 00:00:00 2001 From: Rahul Jain Date: Mon, 17 Oct 2016 16:32:23 +0530 Subject: [PATCH 1245/3392] ustream-ssl: new package ustream-ssl has support for polarssl and cyassl but since polarssl is made obsolete by mbedtls and cyassl is not present in buildroot, we have not added support for it. Signed-off-by: Rahul Bedarkar Signed-off-by: Rahul Jain Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/ustream-ssl/Config.in | 12 ++++++++++++ package/ustream-ssl/ustream-ssl.mk | 21 +++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 package/ustream-ssl/Config.in create mode 100644 package/ustream-ssl/ustream-ssl.mk diff --git a/package/Config.in b/package/Config.in index 9ed296f2d9..a24110e8ac 100644 --- a/package/Config.in +++ b/package/Config.in @@ -912,6 +912,7 @@ menu "Crypto" source "package/polarssl/Config.in" source "package/tinydtls/Config.in" source "package/trousers/Config.in" + source "package/ustream-ssl/Config.in" endmenu menu "Database" diff --git a/package/ustream-ssl/Config.in b/package/ustream-ssl/Config.in new file mode 100644 index 0000000000..540e43689f --- /dev/null +++ b/package/ustream-ssl/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_USTREAM_SSL + bool "ustream-ssl" + depends on !BR2_STATIC_LIBS #libubox + select BR2_PACKAGE_LIBUBOX + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS + help + ustream SSL wrapper + + https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary + +comment "ustream-ssl needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/ustream-ssl/ustream-ssl.mk b/package/ustream-ssl/ustream-ssl.mk new file mode 100644 index 0000000000..b83d129a23 --- /dev/null +++ b/package/ustream-ssl/ustream-ssl.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# ustream-ssl +# +################################################################################ + +USTREAM_SSL_VERSION = ec80adaa1b47f28d426fa19c692011ce60b992d6 +USTREAM_SSL_SITE = git://git.openwrt.org/project/ustream-ssl.git +USTREAM_SSL_LICENSE = ISC +USTREAM_SSL_LICENSE_FILES = ustream-ssl.h +USTREAM_SSL_INSTALL_STAGING = YES +USTREAM_SSL_DEPENDENCIES = libubox + +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +USTREAM_SSL_DEPENDENCIES += mbedtls +USTREAM_SSL_CONF_OPTS += -DMBEDTLS=ON +else +USTREAM_SSL_DEPENDENCIES += openssl +endif + +$(eval $(cmake-package)) From dde8a7610092608fefc55e2024a71e8cb769fbc0 Mon Sep 17 00:00:00 2001 From: Rahul Jain Date: Mon, 17 Oct 2016 16:32:24 +0530 Subject: [PATCH 1246/3392] uhttpd: new package Signed-off-by: Rahul Bedarkar Signed-off-by: Neha Bairathi Signed-off-by: Abhishek Singh Signed-off-by: Rahul Jain [Thomas: remove luajit support, as it doesn't build.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/uhttpd/Config.in | 18 ++++++++++++++++++ package/uhttpd/uhttpd.hash | 2 ++ package/uhttpd/uhttpd.mk | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 package/uhttpd/Config.in create mode 100644 package/uhttpd/uhttpd.hash create mode 100644 package/uhttpd/uhttpd.mk diff --git a/package/Config.in b/package/Config.in index a24110e8ac..0d449dcfb7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1616,6 +1616,7 @@ endif source "package/tunctl/Config.in" source "package/tvheadend/Config.in" source "package/udpcast/Config.in" + source "package/uhttpd/Config.in" source "package/ulogd/Config.in" source "package/ushare/Config.in" source "package/ussp-push/Config.in" diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in new file mode 100644 index 0000000000..e463b9305c --- /dev/null +++ b/package/uhttpd/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_UHTTPD + bool "uhttpd" + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_LIBUBOX + select BR2_PACKAGE_JSON_C + help + uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua + support. It is intended as a drop-in replacement for the Busybox + HTTP daemon. + + https://wiki.openwrt.org/doc/howto/http.uhttpd + +comment "uhttpd needs a toolchain w/ dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/package/uhttpd/uhttpd.hash b/package/uhttpd/uhttpd.hash new file mode 100644 index 0000000000..59e54ad49a --- /dev/null +++ b/package/uhttpd/uhttpd.hash @@ -0,0 +1,2 @@ +# No hash for this git snapshot +none xxx uhttpd-59e0c739634f46a164d939e54416287b91ff8a9b.tar.gz diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk new file mode 100644 index 0000000000..be0d7d63c6 --- /dev/null +++ b/package/uhttpd/uhttpd.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# uhttpd +# +################################################################################ + +UHTTPD_VERSION = 59e0c739634f46a164d939e54416287b91ff8a9b +UHTTPD_SITE = http://git.openwrt.org/project/uhttpd.git +UHTTPD_SITE_METHOD = git +UHTTPD_LICENSE = ISC +UHTTPD_LICENSE_FILES = uhttpd.h +UHTTPD_DEPENDENCIES = libubox json-c + +ifeq ($(BR2_PACKAGE_LUA_5_1),y) +UHTTPD_DEPENDENCIES += lua +UHTTPD_CONF_OPTS += -DLUA_SUPPORT=ON +else +UHTTPD_CONF_OPTS += -DLUA_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_USTREAM_SSL),y) +UHTTPD_DEPENDENCIES += ustream-ssl +UHTTPD_CONF_OPTS += -DTLS_SUPPORT=ON +else +UHTTPD_CONF_OPTS += -DTLS_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_UBUS),y) +UHTTPD_DEPENDENCIES += ubus +UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=ON +else +UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=OFF +endif + +$(eval $(cmake-package)) From 8bda3c5222a17762e8a7265c88eafe1a060c7714 Mon Sep 17 00:00:00 2001 From: Rahul Jain Date: Mon, 17 Oct 2016 16:32:25 +0530 Subject: [PATCH 1247/3392] DEVELOPERS: add entry for uhttpd and ustream-ssl Signed-off-by: Rahul Jain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3a9c00d73c..77e71b0d47 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1229,6 +1229,10 @@ F: package/gssdp/ F: package/gupnp/ F: package/gupnp-av/ +N: Rahul Jain +F: package/uhttpd/ +F: package/ustream-ssl/ + N: Renaud Aubin F: package/libhttpparser/ From 69182cb65a8be21b2133ee76b1e9c42bf9627d5b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Nov 2016 15:35:54 +0100 Subject: [PATCH 1248/3392] czmq: fix build with glibc 2.24 czmq uses readdir_r(), which has been marked as deprecated in glibc 2.24, and czmq uses -Werror which causes the warning to be turned into an error that aborts the build. This commit fixes that by removing -Werror. Long-term, we might want to upgrade czmq to a newer version, since they've removed the use of readdir_r() in commit 2594d406d8ec6f54e54d7570d7febba10a6906b2. But getting rid of -Werror is anyway always a good idea in Buildroot. Fixes: http://autobuild.buildroot.net/results/f6e4b8ed8571fdcf30eecae121dd11dfdef50799 Signed-off-by: Thomas Petazzoni --- .../0001-configure.ac-remove-Werror.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/czmq/0001-configure.ac-remove-Werror.patch diff --git a/package/czmq/0001-configure.ac-remove-Werror.patch b/package/czmq/0001-configure.ac-remove-Werror.patch new file mode 100644 index 0000000000..7f2dae2c2b --- /dev/null +++ b/package/czmq/0001-configure.ac-remove-Werror.patch @@ -0,0 +1,30 @@ +From 9a195dc573f4eed130773e6ef67efd5f71693e97 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 5 Nov 2016 15:33:57 +0100 +Subject: [PATCH] configure.ac: remove -Werror + +-Werror shouldn't be used in releases, as it can break the build with +newer versions of the compiler or the C library, when new warnings +are introduced. + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e92970a..2fd551a 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -344,7 +344,7 @@ AC_C_BIGENDIAN + + # These options are GNU compiler specific. + if test "x$GCC" = "xyes"; then +- CPPFLAGS="-pedantic -Werror -Wall -Wc++-compat ${CPPFLAGS}" ++ CPPFLAGS="-pedantic -Wall -Wc++-compat ${CPPFLAGS}" + fi + + AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes") +-- +2.7.4 + From f55a63f95359da1edbfba1fbed26cf9d7c1bb897 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 5 Nov 2016 21:24:06 +0200 Subject: [PATCH 1249/3392] libxml2: add upstream security fixes Fixes: CVE-2016-5131, CVE-2016-4658. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...ointer-paths-beginning-with-range-to.patch | 178 ++++++++++++ ...w-namespace-nodes-in-XPointer-ranges.patch | 253 ++++++++++++++++++ 2 files changed, 431 insertions(+) create mode 100644 package/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch create mode 100644 package/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch diff --git a/package/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch b/package/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch new file mode 100644 index 0000000000..42570c6350 --- /dev/null +++ b/package/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch @@ -0,0 +1,178 @@ +From 9ab01a277d71f54d3143c2cf333c5c2e9aaedd9e Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Tue, 28 Jun 2016 14:22:23 +0200 +Subject: [PATCH] Fix XPointer paths beginning with range-to + +The old code would invoke the broken xmlXPtrRangeToFunction. range-to +isn't really a function but a special kind of location step. Remove +this function and always handle range-to in the XPath code. + +The old xmlXPtrRangeToFunction could also be abused to trigger a +use-after-free error with the potential for remote code execution. + +Found with afl-fuzz. + +Fixes CVE-2016-5131. + +Signed-off-by: Baruch Siach +--- +Patch status: upstream commit 9ab01a277d7 + + result/XPath/xptr/vidbase | 13 ++++++++ + test/XPath/xptr/vidbase | 1 + + xpath.c | 7 ++++- + xpointer.c | 76 ++++------------------------------------------- + 4 files changed, 26 insertions(+), 71 deletions(-) + +diff --git a/result/XPath/xptr/vidbase b/result/XPath/xptr/vidbase +index 8b9e92d66d97..f19193e70edb 100644 +--- a/result/XPath/xptr/vidbase ++++ b/result/XPath/xptr/vidbase +@@ -17,3 +17,16 @@ Object is a Location Set: + To node + ELEMENT p + ++ ++======================== ++Expression: xpointer(range-to(id('chapter2'))) ++Object is a Location Set: ++1 : Object is a range : ++ From node ++ / ++ To node ++ ELEMENT chapter ++ ATTRIBUTE id ++ TEXT ++ content=chapter2 ++ +diff --git a/test/XPath/xptr/vidbase b/test/XPath/xptr/vidbase +index b1463830570a..884b1065d7fd 100644 +--- a/test/XPath/xptr/vidbase ++++ b/test/XPath/xptr/vidbase +@@ -1,2 +1,3 @@ + xpointer(id('chapter1')/p) + xpointer(id('chapter1')/p[1]/range-to(following-sibling::p[2])) ++xpointer(range-to(id('chapter2'))) +diff --git a/xpath.c b/xpath.c +index d992841ef0c2..5a01b1b399a2 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -10691,13 +10691,18 @@ xmlXPathCompPathExpr(xmlXPathParserContextPtr ctxt) { + lc = 1; + break; + } else if ((NXT(len) == '(')) { +- /* Note Type or Function */ ++ /* Node Type or Function */ + if (xmlXPathIsNodeType(name)) { + #ifdef DEBUG_STEP + xmlGenericError(xmlGenericErrorContext, + "PathExpr: Type search\n"); + #endif + lc = 1; ++#ifdef LIBXML_XPTR_ENABLED ++ } else if (ctxt->xptr && ++ xmlStrEqual(name, BAD_CAST "range-to")) { ++ lc = 1; ++#endif + } else { + #ifdef DEBUG_STEP + xmlGenericError(xmlGenericErrorContext, +diff --git a/xpointer.c b/xpointer.c +index 676c5105837a..d74174a318f1 100644 +--- a/xpointer.c ++++ b/xpointer.c +@@ -1332,8 +1332,6 @@ xmlXPtrNewContext(xmlDocPtr doc, xmlNodePtr here, xmlNodePtr origin) { + ret->here = here; + ret->origin = origin; + +- xmlXPathRegisterFunc(ret, (xmlChar *)"range-to", +- xmlXPtrRangeToFunction); + xmlXPathRegisterFunc(ret, (xmlChar *)"range", + xmlXPtrRangeFunction); + xmlXPathRegisterFunc(ret, (xmlChar *)"range-inside", +@@ -2243,76 +2241,14 @@ xmlXPtrRangeInsideFunction(xmlXPathParserContextPtr ctxt, int nargs) { + * @nargs: the number of args + * + * Implement the range-to() XPointer function ++ * ++ * Obsolete. range-to is not a real function but a special type of location ++ * step which is handled in xpath.c. + */ + void +-xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, int nargs) { +- xmlXPathObjectPtr range; +- const xmlChar *cur; +- xmlXPathObjectPtr res, obj; +- xmlXPathObjectPtr tmp; +- xmlLocationSetPtr newset = NULL; +- xmlNodeSetPtr oldset; +- int i; +- +- if (ctxt == NULL) return; +- CHECK_ARITY(1); +- /* +- * Save the expression pointer since we will have to evaluate +- * it multiple times. Initialize the new set. +- */ +- CHECK_TYPE(XPATH_NODESET); +- obj = valuePop(ctxt); +- oldset = obj->nodesetval; +- ctxt->context->node = NULL; +- +- cur = ctxt->cur; +- newset = xmlXPtrLocationSetCreate(NULL); +- +- for (i = 0; i < oldset->nodeNr; i++) { +- ctxt->cur = cur; +- +- /* +- * Run the evaluation with a node list made of a single item +- * in the nodeset. +- */ +- ctxt->context->node = oldset->nodeTab[i]; +- tmp = xmlXPathNewNodeSet(ctxt->context->node); +- valuePush(ctxt, tmp); +- +- xmlXPathEvalExpr(ctxt); +- CHECK_ERROR; +- +- /* +- * The result of the evaluation need to be tested to +- * decided whether the filter succeeded or not +- */ +- res = valuePop(ctxt); +- range = xmlXPtrNewRangeNodeObject(oldset->nodeTab[i], res); +- if (range != NULL) { +- xmlXPtrLocationSetAdd(newset, range); +- } +- +- /* +- * Cleanup +- */ +- if (res != NULL) +- xmlXPathFreeObject(res); +- if (ctxt->value == tmp) { +- res = valuePop(ctxt); +- xmlXPathFreeObject(res); +- } +- +- ctxt->context->node = NULL; +- } +- +- /* +- * The result is used as the new evaluation set. +- */ +- xmlXPathFreeObject(obj); +- ctxt->context->node = NULL; +- ctxt->context->contextSize = -1; +- ctxt->context->proximityPosition = -1; +- valuePush(ctxt, xmlXPtrWrapLocationSet(newset)); ++xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, ++ int nargs ATTRIBUTE_UNUSED) { ++ XP_ERROR(XPATH_EXPR_ERROR); + } + + /** +-- +2.10.2 + diff --git a/package/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch b/package/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch new file mode 100644 index 0000000000..45c1a07ca4 --- /dev/null +++ b/package/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch @@ -0,0 +1,253 @@ +From c1d1f7121194036608bf555f08d3062a36fd344b Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Tue, 28 Jun 2016 18:34:52 +0200 +Subject: [PATCH] Disallow namespace nodes in XPointer ranges + +Namespace nodes must be copied to avoid use-after-free errors. +But they don't necessarily have a physical representation in a +document, so simply disallow them in XPointer ranges. + +Found with afl-fuzz. + +Fixes CVE-2016-4658. + +Signed-off-by: Baruch Siach +--- +Patch status: upstream commit c1d1f712119403 + + xpointer.c | 149 +++++++++++++++++++++++-------------------------------------- + 1 file changed, 56 insertions(+), 93 deletions(-) + +diff --git a/xpointer.c b/xpointer.c +index a7b03fbdae16..694d120e2e0b 100644 +--- a/xpointer.c ++++ b/xpointer.c +@@ -320,6 +320,45 @@ xmlXPtrRangesEqual(xmlXPathObjectPtr range1, xmlXPathObjectPtr range2) { + } + + /** ++ * xmlXPtrNewRangeInternal: ++ * @start: the starting node ++ * @startindex: the start index ++ * @end: the ending point ++ * @endindex: the ending index ++ * ++ * Internal function to create a new xmlXPathObjectPtr of type range ++ * ++ * Returns the newly created object. ++ */ ++static xmlXPathObjectPtr ++xmlXPtrNewRangeInternal(xmlNodePtr start, int startindex, ++ xmlNodePtr end, int endindex) { ++ xmlXPathObjectPtr ret; ++ ++ /* ++ * Namespace nodes must be copied (see xmlXPathNodeSetDupNs). ++ * Disallow them for now. ++ */ ++ if ((start != NULL) && (start->type == XML_NAMESPACE_DECL)) ++ return(NULL); ++ if ((end != NULL) && (end->type == XML_NAMESPACE_DECL)) ++ return(NULL); ++ ++ ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); ++ if (ret == NULL) { ++ xmlXPtrErrMemory("allocating range"); ++ return(NULL); ++ } ++ memset(ret, 0, sizeof(xmlXPathObject)); ++ ret->type = XPATH_RANGE; ++ ret->user = start; ++ ret->index = startindex; ++ ret->user2 = end; ++ ret->index2 = endindex; ++ return(ret); ++} ++ ++/** + * xmlXPtrNewRange: + * @start: the starting node + * @startindex: the start index +@@ -344,17 +383,7 @@ xmlXPtrNewRange(xmlNodePtr start, int startindex, + if (endindex < 0) + return(NULL); + +- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); +- if (ret == NULL) { +- xmlXPtrErrMemory("allocating range"); +- return(NULL); +- } +- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); +- ret->type = XPATH_RANGE; +- ret->user = start; +- ret->index = startindex; +- ret->user2 = end; +- ret->index2 = endindex; ++ ret = xmlXPtrNewRangeInternal(start, startindex, end, endindex); + xmlXPtrRangeCheckOrder(ret); + return(ret); + } +@@ -381,17 +410,8 @@ xmlXPtrNewRangePoints(xmlXPathObjectPtr start, xmlXPathObjectPtr end) { + if (end->type != XPATH_POINT) + return(NULL); + +- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); +- if (ret == NULL) { +- xmlXPtrErrMemory("allocating range"); +- return(NULL); +- } +- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); +- ret->type = XPATH_RANGE; +- ret->user = start->user; +- ret->index = start->index; +- ret->user2 = end->user; +- ret->index2 = end->index; ++ ret = xmlXPtrNewRangeInternal(start->user, start->index, end->user, ++ end->index); + xmlXPtrRangeCheckOrder(ret); + return(ret); + } +@@ -416,17 +436,7 @@ xmlXPtrNewRangePointNode(xmlXPathObjectPtr start, xmlNodePtr end) { + if (start->type != XPATH_POINT) + return(NULL); + +- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); +- if (ret == NULL) { +- xmlXPtrErrMemory("allocating range"); +- return(NULL); +- } +- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); +- ret->type = XPATH_RANGE; +- ret->user = start->user; +- ret->index = start->index; +- ret->user2 = end; +- ret->index2 = -1; ++ ret = xmlXPtrNewRangeInternal(start->user, start->index, end, -1); + xmlXPtrRangeCheckOrder(ret); + return(ret); + } +@@ -453,17 +463,7 @@ xmlXPtrNewRangeNodePoint(xmlNodePtr start, xmlXPathObjectPtr end) { + if (end->type != XPATH_POINT) + return(NULL); + +- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); +- if (ret == NULL) { +- xmlXPtrErrMemory("allocating range"); +- return(NULL); +- } +- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); +- ret->type = XPATH_RANGE; +- ret->user = start; +- ret->index = -1; +- ret->user2 = end->user; +- ret->index2 = end->index; ++ ret = xmlXPtrNewRangeInternal(start, -1, end->user, end->index); + xmlXPtrRangeCheckOrder(ret); + return(ret); + } +@@ -486,17 +486,7 @@ xmlXPtrNewRangeNodes(xmlNodePtr start, xmlNodePtr end) { + if (end == NULL) + return(NULL); + +- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); +- if (ret == NULL) { +- xmlXPtrErrMemory("allocating range"); +- return(NULL); +- } +- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); +- ret->type = XPATH_RANGE; +- ret->user = start; +- ret->index = -1; +- ret->user2 = end; +- ret->index2 = -1; ++ ret = xmlXPtrNewRangeInternal(start, -1, end, -1); + xmlXPtrRangeCheckOrder(ret); + return(ret); + } +@@ -516,17 +506,7 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) { + if (start == NULL) + return(NULL); + +- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); +- if (ret == NULL) { +- xmlXPtrErrMemory("allocating range"); +- return(NULL); +- } +- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); +- ret->type = XPATH_RANGE; +- ret->user = start; +- ret->index = -1; +- ret->user2 = NULL; +- ret->index2 = -1; ++ ret = xmlXPtrNewRangeInternal(start, -1, NULL, -1); + return(ret); + } + +@@ -541,6 +521,8 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) { + */ + xmlXPathObjectPtr + xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { ++ xmlNodePtr endNode; ++ int endIndex; + xmlXPathObjectPtr ret; + + if (start == NULL) +@@ -549,7 +531,12 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { + return(NULL); + switch (end->type) { + case XPATH_POINT: ++ endNode = end->user; ++ endIndex = end->index; ++ break; + case XPATH_RANGE: ++ endNode = end->user2; ++ endIndex = end->index2; + break; + case XPATH_NODESET: + /* +@@ -557,39 +544,15 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { + */ + if (end->nodesetval->nodeNr <= 0) + return(NULL); ++ endNode = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; ++ endIndex = -1; + break; + default: + /* TODO */ + return(NULL); + } + +- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); +- if (ret == NULL) { +- xmlXPtrErrMemory("allocating range"); +- return(NULL); +- } +- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); +- ret->type = XPATH_RANGE; +- ret->user = start; +- ret->index = -1; +- switch (end->type) { +- case XPATH_POINT: +- ret->user2 = end->user; +- ret->index2 = end->index; +- break; +- case XPATH_RANGE: +- ret->user2 = end->user2; +- ret->index2 = end->index2; +- break; +- case XPATH_NODESET: { +- ret->user2 = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; +- ret->index2 = -1; +- break; +- } +- default: +- STRANGE +- return(NULL); +- } ++ ret = xmlXPtrNewRangeInternal(start, -1, endNode, endIndex); + xmlXPtrRangeCheckOrder(ret); + return(ret); + } +-- +2.10.2 + From 0bd23d2dc23add4db2c4321c3da096cc916fb999 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Nov 2016 16:57:52 +0100 Subject: [PATCH 1250/3392] package/sudo: add optional support for zlib Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/sudo/sudo.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index f28312ace1..89859dda03 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -30,6 +30,13 @@ else SUDO_CONF_OPTS += --without-pam endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +SUDO_CONF_OPTS += --enable-zlib +SUDO_DEPENDENCIES += zlib +else +SUDO_CONF_OPTS += --disable-zlib +endif + # mksigname/mksiglist needs to run on build host to generate source files define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST $(MAKE) $(HOST_CONFIGURE_OPTS) \ From dbc5f228b219d9b05a048303ddbd624da3411dd2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 5 Nov 2016 16:57:53 +0100 Subject: [PATCH 1251/3392] package/sudo: bump version to 1.8.18p1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/sudo/sudo.hash | 2 +- package/sudo/sudo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index 4c2431f13d..c6f5be3ab4 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,2 +1,2 @@ # From: http://www.sudo.ws/download.html -sha256 4316381708324da8b6cb151f655c1a11855207c7c02244d8ffdea5104d7cc308 sudo-1.8.15.tar.gz +sha256 e5a0471c721281a693025bbde33ebd9d3db43245d83ab8516bbfc23980379434 sudo-1.8.18p1.tar.gz diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 89859dda03..3643d55dbc 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUDO_VERSION = 1.8.15 +SUDO_VERSION = 1.8.18p1 SUDO_SITE = http://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC BSD-3c SUDO_LICENSE_FILES = doc/LICENSE From ab1b6f7df4355244dfc54b877889ff7a3cde02a0 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 5 Nov 2016 14:38:11 +0100 Subject: [PATCH 1252/3392] makedevs: resync device creation with upstream busybox In upstream busbyox, the code to create devices has been simplified: the code for a single and for multiple devices is no longer duplicated. Since we are going to change the device creation code next, it's convenient to have only one copy to modify. There are two behavioural changes with this, but they were introduced silently together with other commits in upstream busybox. - When mknod() fails, the chmod was still done. This is pointless so it is no longer done now. - There was a check for mode != -1; however, a mode of -1 would not have worked anyway because all bits would be set for mknod(), which would fail. So this check is redundant. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Fabio Estevam Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/makedevs/makedevs.c | 47 ++++++++++++------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c index cacb144e21..7092b1475e 100644 --- a/package/makedevs/makedevs.c +++ b/package/makedevs/makedevs.c @@ -599,6 +599,8 @@ int main(int argc, char **argv) } else { dev_t rdev; + unsigned i; + char *full_name_inc; if (type == 'p') { mode |= S_IFIFO; @@ -614,43 +616,24 @@ int main(int argc, char **argv) goto loop; } - if (count > 0) { - int i; - char *full_name_inc; - - full_name_inc = xmalloc(strlen(full_name) + 8); - for (i = 0; i < count; i++) { - sprintf(full_name_inc, "%s%d", full_name, start + i); - rdev = makedev(major, minor + i * increment); - if (mknod(full_name_inc, mode, rdev) == -1) { - bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name_inc); - ret = EXIT_FAILURE; - } - else if (chown(full_name_inc, uid, gid) == -1) { - bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc); - ret = EXIT_FAILURE; - } - if ((mode != -1) && (chmod(full_name_inc, mode) < 0)){ - bb_perror_msg("line %d: chmod failed for %s", linenum, full_name_inc); - ret = EXIT_FAILURE; - } - } - free(full_name_inc); - } else { - rdev = makedev(major, minor); - if (mknod(full_name, mode, rdev) == -1) { - bb_perror_msg("line %d: Couldnt create node %s", linenum, full_name); + full_name_inc = xmalloc(strlen(full_name) + sizeof(int)*3 + 2); + if (count) + count--; + for (i = start; i <= start + count; i++) { + sprintf(full_name_inc, count ? "%s%u" : "%s", full_name, i); + rdev = makedev(major, minor + (i - start) * increment); + if (mknod(full_name_inc, mode, rdev) < 0) { + bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc); ret = EXIT_FAILURE; - } - else if (chown(full_name, uid, gid) == -1) { - bb_perror_msg("line %d: chown failed for %s", linenum, full_name); + } else if (chown(full_name_inc, uid, gid) < 0) { + bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc); ret = EXIT_FAILURE; - } - if ((mode != -1) && (chmod(full_name, mode) < 0)){ - bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); + } else if (chmod(full_name_inc, mode) < 0) { + bb_perror_msg("line %d: can't chmod %s", linenum, full_name_inc); ret = EXIT_FAILURE; } } + free(full_name_inc); } loop: free(line); From c85cd189dc1ded92b78c5968860ff447ec9815ad Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 5 Nov 2016 14:38:12 +0100 Subject: [PATCH 1253/3392] makedevs: make device node creation idempotent We use makedevs to create device nodes in the target rootfs. However, this can be called several times, e.g. when building several filesystem images or when rebuilding. When makedevs is called the second time, the device node already exists so mknod() errors out. This wasn't noticed before because fakeroot's mknod() wrapper (incorrectly) does _not_ error out when the file exists already. Now we switched from fakeroot to pseudo, the problem becomes apparent. Before creating the device node, check if it already exists and if so, if it has the correct device type and number. Change of mode and ownership is still done. This approach was preferred over removing the target files before creating them, which would be simpler. However, when e.g. a file exists as a normal file and makedevs specifies it as a device node, that really is an error so we should detect it. The other types don't have to be changed. The 'd' (directory) type is already OK because it already only creates directories if they don't exist yet. The 'f' (file mode) and 'r' (recursive) types only operate on files and directories that exist already. Patch also sent upstream to busybox. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reported-by: Fabio Estevam Tested-by: Fabio Estevam Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/makedevs/makedevs.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c index 7092b1475e..bcf0e0f000 100644 --- a/package/makedevs/makedevs.c +++ b/package/makedevs/makedevs.c @@ -601,6 +601,7 @@ int main(int argc, char **argv) dev_t rdev; unsigned i; char *full_name_inc; + struct stat st; if (type == 'p') { mode |= S_IFIFO; @@ -622,10 +623,23 @@ int main(int argc, char **argv) for (i = start; i <= start + count; i++) { sprintf(full_name_inc, count ? "%s%u" : "%s", full_name, i); rdev = makedev(major, minor + (i - start) * increment); - if (mknod(full_name_inc, mode, rdev) < 0) { + if (stat(full_name_inc, &st) == 0) { + if ((mode & S_IFMT) != (st.st_mode & S_IFMT)) { + bb_error_msg("line %d: node %s exists but is of wrong file type", linenum, full_name_inc); + ret = EXIT_FAILURE; + continue; + } + if (st.st_rdev != rdev) { + bb_error_msg("line %d: node %s exists but is wrong device number", linenum, full_name_inc); + ret = EXIT_FAILURE; + continue; + } + } else if (mknod(full_name_inc, mode, rdev) < 0) { bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc); ret = EXIT_FAILURE; - } else if (chown(full_name_inc, uid, gid) < 0) { + continue; + } + if (chown(full_name_inc, uid, gid) < 0) { bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc); ret = EXIT_FAILURE; } else if (chmod(full_name_inc, mode) < 0) { From 8dc4d065123acb7e1a0763ae851b060b97a39db7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Nov 2016 14:45:54 +0100 Subject: [PATCH 1254/3392] configs/kb9202_defconfig: remove defconfig This configuration for the KwikByte KB9202 was added back in July 2008 (commit e27fef51834042a1b108e04927a2a91742a54327), and was never updated since then. It still uses a 2.6.38 kernel, with the out of tree patches from the former AT91 kernel maintainer. The board has been discontinued according to its page at http://www.kwikbyte.com/KB9202.html. This defconfig no longer builds since the switch to gcc 5.x as the default. Therefore, it's time to get rid of this defconfig. Signed-off-by: Thomas Petazzoni Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- configs/kb9202_defconfig | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 configs/kb9202_defconfig diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig deleted file mode 100644 index 0aea0eba27..0000000000 --- a/configs/kb9202_defconfig +++ /dev/null @@ -1,17 +0,0 @@ -# Architecture -BR2_arm=y -BR2_arm920t=y - -# Filesystem -BR2_TARGET_ROOTFS_TAR=y - -# Linux headers same as kernel, a 2.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_REALLY_OLD=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8" -BR2_LINUX_KERNEL_PATCH="http://maxim.org.za/AT91RM9200/2.6/2.6.38-at91.patch.gz" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="kb9202" From bafd08a1625d5ee3be0f5918919185f477dee008 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 5 Nov 2016 17:34:54 +0100 Subject: [PATCH 1255/3392] package/pseudo: update version Brings in a fix about externded attributes (xattrs). Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pseudo/pseudo.hash | 2 +- package/pseudo/pseudo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pseudo/pseudo.hash b/package/pseudo/pseudo.hash index 5822d0e6f3..1553a293fd 100644 --- a/package/pseudo/pseudo.hash +++ b/package/pseudo/pseudo.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 d7767c9a73b0df4f1f26952cf5eca4c6ff6fc4bc5ef15a904ea3839c70161936 pseudo-7abc9396731149df5eaf43c84fed4f3053b64de6.tar.gz +sha256 7d4b767302f118fa1c3f89b551cf3f3f2aa92721dab86ff62f0600a394b8a81a pseudo-45eca34c754d416a38bee90fb2d3c110a0b6cc5f.tar.gz diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index ed348f1cd9..67538a6d33 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -4,7 +4,7 @@ # ################################################################################ -PSEUDO_VERSION = 7abc9396731149df5eaf43c84fed4f3053b64de6 +PSEUDO_VERSION = 45eca34c754d416a38bee90fb2d3c110a0b6cc5f PSEUDO_SITE = https://git.yoctoproject.org/git/pseudo PSEUDO_SITE_METHOD = git From 6bb7430a20871ad4e3ccbc8c1992d60117214be2 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 5 Nov 2016 22:05:08 +0100 Subject: [PATCH 1256/3392] Makefile: delete default rules We don't use the default implicit rules that are added by make, so they just slow down the Makefile processing. The default implicit rules can be removed by defining an empty .SUFFIXES: target. This speeds up the start of the build on my machine from 5.6s to 4.9s. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 4ea64b3698..6cf5f1ce1e 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,9 @@ # You shouldn't need to mess with anything beyond this point... #-------------------------------------------------------------- +# Delete default rules. We don't use them. This saves a bit of time. +.SUFFIXES: + # we want bash as shell SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ From 27a20609c288e5d13a91b064c54c1d3f93ad7c48 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Nov 2016 16:42:19 +0100 Subject: [PATCH 1257/3392] binutils: add upstream patch to fix open microblaze issue This reenables the use of 2.27 for microblaze. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...dynamic-tag-VMA-and-size-from-dynami.patch | 36 +++++++++++++++++++ package/binutils/Config.in.host | 3 -- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 package/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch diff --git a/package/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch b/package/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch new file mode 100644 index 0000000000..f1ec259988 --- /dev/null +++ b/package/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch @@ -0,0 +1,36 @@ +From c646b02fdcae5f37bd88f33a0c4683ef13ad5c82 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Mon, 31 Oct 2016 12:46:38 +1030 +Subject: [PATCH] Revert part "Set dynamic tag VMA and size from dynamic + section when possible" + + PR 20748 + * elf32-microblaze.c (microblaze_elf_finish_dynamic_sections): Revert + 2016-05-13 change. + +Signed-off-by: Alan Modra +Signed-off-by: Waldemar Brodkorb + +diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c +index 477e7b3..5c66808 100644 +--- a/bfd/elf32-microblaze.c ++++ b/bfd/elf32-microblaze.c +@@ -3396,13 +3396,13 @@ microblaze_elf_finish_dynamic_sections (bfd *output_bfd, + { + asection *s; + +- s = bfd_get_linker_section (dynobj, name); ++ s = bfd_get_section_by_name (output_bfd, name); + if (s == NULL) + dyn.d_un.d_val = 0; + else + { + if (! size) +- dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; ++ dyn.d_un.d_ptr = s->vma; + else + dyn.d_un.d_val = s->size; + } +-- +2.1.4 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index dce699621d..3e0c357d99 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -17,9 +17,6 @@ choice config BR2_BINUTILS_VERSION_2_27_X bool "binutils 2.27" - # supported but broken on Microblaze - # see https://sourceware.org/bugzilla/show_bug.cgi?id=20748 - depends on !BR2_microblaze endchoice From 9f9903eaa6bde38fe449efeda3f546388a031fa6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Nov 2016 13:39:26 +0100 Subject: [PATCH 1258/3392] kvm-unit-tests: really use KVM_UNIT_TESTS_ARCH and fix value on x86-64 The kvm-unit-tests package defines a KVM_UNIT_TESTS_ARCH variable, but never used it. Due to this, on PowerPC64, we were passing an incorrect value, causing a build failure. In addition, once the KVM_UNIT_TESTS_ARCH is used, it appeared that its value for x86_64 was incorrect, due a typo: it was x86_84 instead of x86_64. Fixes: http://autobuild.buildroot.net/results/16836c02f4d1ab5df6b2e21a4fcdbbf4a7542f22/ Signed-off-by: Thomas Petazzoni --- package/kvm-unit-tests/kvm-unit-tests.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 1b5ce787ef..6e1c2dfcfb 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -17,7 +17,7 @@ KVM_UNIT_TESTS_ARCH = i386 else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) KVM_UNIT_TESTS_ARCH = ppc64 else ifeq ($(BR2_x86_64),y) -KVM_UNIT_TESTS_ARCH = x86_84 +KVM_UNIT_TESTS_ARCH = x86_64 endif ifeq ($(BR2_ENDIAN),"LITTLE") @@ -27,7 +27,7 @@ KVM_UNIT_TESTS_ENDIAN = big endif KVM_UNIT_TESTS_CONF_OPTS =\ - --arch="$(KERNEL_ARCH)" \ + --arch="$(KVM_UNIT_TESTS_ARCH)" \ --endian="$(KVM_UNIT_TESTS_ENDIAN)" # For all architectures but x86-64, we use the target From 0bb0443ee97c61dad1b9e595b0e421de3eed58b9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Nov 2016 13:57:51 +0100 Subject: [PATCH 1259/3392] kvm-unit-tests: add patch to remove -Werror Fixes: http://autobuild.buildroot.net/results/52c02c68be6c0b3e907f7ed645bd2d18476ec4f3/ Signed-off-by: Thomas Petazzoni --- package/kvm-unit-tests/0001-remove-werror.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 package/kvm-unit-tests/0001-remove-werror.patch diff --git a/package/kvm-unit-tests/0001-remove-werror.patch b/package/kvm-unit-tests/0001-remove-werror.patch new file mode 100644 index 0000000000..058a640d76 --- /dev/null +++ b/package/kvm-unit-tests/0001-remove-werror.patch @@ -0,0 +1,17 @@ +Remove -Werror to avoid build failures + +Signed-off-by: Thomas Petazzoni + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -45,7 +45,7 @@ + > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) + + CFLAGS += -g +-CFLAGS += $(autodepend-flags) -Wall -Werror -Wno-frame-address ++CFLAGS += $(autodepend-flags) -Wall -Wno-frame-address + frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer + fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") + fnostack_protector := $(call cc-option, -fno-stack-protector, "") From 7027bf022b9c9d488d53e3168af1cf16c6e41a0c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Nov 2016 14:12:25 +0100 Subject: [PATCH 1260/3392] binutils: add patch to 2.27 to fix arm issue with file having no data This commit adds a patch to binutils 2.27, which fixes the build of kvmtool on ARM. The fix is taken from the upstream mailing list at https://lists.gnu.org/archive/html/bug-binutils/2016-08/msg00165.html. Fixes: http://autobuild.buildroot.net/results/bae83d495b46efeec45c8008949c811b6241adaa Signed-off-by: Thomas Petazzoni --- .../2.27/0100-elf32-arm-no-data-fix.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 package/binutils/2.27/0100-elf32-arm-no-data-fix.patch diff --git a/package/binutils/2.27/0100-elf32-arm-no-data-fix.patch b/package/binutils/2.27/0100-elf32-arm-no-data-fix.patch new file mode 100644 index 0000000000..c6b0e7efe8 --- /dev/null +++ b/package/binutils/2.27/0100-elf32-arm-no-data-fix.patch @@ -0,0 +1,22 @@ +bfd/ChangeLog +2016-08-23 Nick Clifton + + * elf32-arm.c (elf32_arm_count_additional_relocs): Return zero if + there is no arm data associated with the section. + +[Thomas: taken from https://lists.gnu.org/archive/html/bug-binutils/2016-08/msg00165.html.] +Signed-off-by: Thomas Petazzoni + +diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c +index 1eba21b..4478238 100644 +--- a/bfd/elf32-arm.c ++++ b/bfd/elf32-arm.c +@@ -18688,7 +18688,7 @@ elf32_arm_count_additional_relocs (asection *sec) + { + struct _arm_elf_section_data *arm_data; + arm_data = get_arm_elf_section_data (sec); +- return arm_data->additional_reloc_count; ++ return arm_data == NULL ? 0 : arm_data->additional_reloc_count; + } + + /* Called to set the sh_flags, sh_link and sh_info fields of OSECTION which From 7c670327d3f2a21b219509e2102c980d1856d20c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Nov 2016 14:41:11 +0100 Subject: [PATCH 1261/3392] libnss: add upstream patch to fix uninitialized variable warning Fixes: http://autobuild.buildroot.net/results/47e611036be12844ebca093ddd8fe95c326c6056/ Signed-off-by: Thomas Petazzoni --- .../libnss/0003-it-uninitialized-fix.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 package/libnss/0003-it-uninitialized-fix.patch diff --git a/package/libnss/0003-it-uninitialized-fix.patch b/package/libnss/0003-it-uninitialized-fix.patch new file mode 100644 index 0000000000..7736c6a939 --- /dev/null +++ b/package/libnss/0003-it-uninitialized-fix.patch @@ -0,0 +1,24 @@ +# HG changeset patch +# User catdesk +# Date 1477710600 -7200 +# Sat Oct 29 05:10:00 2016 +0200 +# Node ID b9ef971b94ab110302d49255339077bc1b4aed7f +# Parent eb8c96563cd70aa69d48b01516085f7d2fb46178 +Bug 1313846 - Declare 'it = NULL' earlier. r=franziskus + +[Thomas: patch taken from upstream mercurial repository, revision +12791.] +Signed-off-by: Thomas Petazzoni + +diff -r eb8c96563cd7 -r b9ef971b94ab lib/jar/jarfile.c +--- a/nss/lib/jar/jarfile.c Mon Oct 31 17:31:20 2016 +0100 ++++ b/nss/lib/jar/jarfile.c Sat Oct 29 05:10:00 2016 +0200 +@@ -657,7 +657,7 @@ + jar_listzip(JAR *jar, JAR_FILE fp) + { + ZZLink *ent; +- JAR_Item *it; ++ JAR_Item *it = NULL; + JAR_Physical *phy = NULL; + struct ZipLocal *Local = PORT_ZNew(struct ZipLocal); + struct ZipCentral *Central = PORT_ZNew(struct ZipCentral); From 271756da6749a2d88ca9744cb56f25a8c822123e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Nov 2016 15:00:43 +0100 Subject: [PATCH 1262/3392] privoxy: needs thread support Even though privoxy has some conditional code to handle configurations without threads, it is not properly handled everywhere, leading to a build failure. Since this package is unlikely to be used in non-threaded environment, just disable it for non-threaded configurations. Fixes: http://autobuild.buildroot.net/results/fae7a41d110ed6c4d62c77873229d069d8b65986 Signed-off-by: Thomas Petazzoni --- package/privoxy/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/privoxy/Config.in b/package/privoxy/Config.in index 8d8d01a73f..accb48dfc2 100644 --- a/package/privoxy/Config.in +++ b/package/privoxy/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PRIVOXY bool "privoxy" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_PCRE select BR2_PACKAGE_ZLIB help @@ -10,3 +11,7 @@ config BR2_PACKAGE_PRIVOXY obnoxious Internet junk. http://www.privoxy.org/ + +comment "privoxy needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS From d02655cd2157636d6150daf3a1344b25141780c1 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 6 Nov 2016 14:15:23 +0100 Subject: [PATCH 1263/3392] package/ser2net: disable threads for toolchains without threads support ser2net configure script provide an option to disable threads support, use it. Fixes: http://autobuild.buildroot.net/results/6bc/6bc0f99917c2069a1614f4cfcaa98af1b21762e4 Signed-off-by: Romain Naour [Thomas: use --{with,without}-pthreads instead of --with-pthreads={yes,no}.] Signed-off-by: Thomas Petazzoni --- package/ser2net/ser2net.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk index 01aee95d6d..c4dcaf31fa 100644 --- a/package/ser2net/ser2net.mk +++ b/package/ser2net/ser2net.mk @@ -9,6 +9,12 @@ SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPLv2+ SER2NET_LICENSE_FILES = COPYING +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +SER2NET_CONF_OPTS += --with-pthreads +else +SER2NET_CONF_OPTS += --without-pthreads +endif + define SER2NET_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/ser2net/S50ser2net \ $(TARGET_DIR)/etc/init.d/S50ser2net From a1ca3dcb590852880770fe879ea59b6d8222b010 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Nov 2016 22:19:38 +0100 Subject: [PATCH 1264/3392] jamvm: fix build with uClibc on i386/x86_64 Commit 0b6b67f34d6d4aeb340bbca579dbf85363c3f4ea ("jamvm: add patch to fix musl build") introduced a patch to fix the jamvm build with the musl C library. While the commit log pretends that the build was still working with uClibc, it is not correct: it no longer builds fine with uClibc on i386/x86_64, because the Buildroot default configuration for uClibc doesn't enable support. Therefore this commit adapts the patch to use if available (which is the case with musl), and otherwise fall back to , which is available in uClibc. Thanks to Waldemar for the investigation. Fixes: http://autobuild.buildroot.net/results/325a50d15e1836b31df4e84ba83b296abfb73041/ Signed-off-by: Thomas Petazzoni --- ...-available-instead-of-fpu_control.h.patch} | 86 ++++++++++++------- package/jamvm/jamvm.mk | 9 ++ 2 files changed, 63 insertions(+), 32 deletions(-) rename package/jamvm/{0001-Use-fenv.h-instead-of-fpu_control.h.patch => 0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch} (50%) diff --git a/package/jamvm/0001-Use-fenv.h-instead-of-fpu_control.h.patch b/package/jamvm/0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch similarity index 50% rename from package/jamvm/0001-Use-fenv.h-instead-of-fpu_control.h.patch rename to package/jamvm/0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch index 50f95cde57..78ee9b7e18 100644 --- a/package/jamvm/0001-Use-fenv.h-instead-of-fpu_control.h.patch +++ b/package/jamvm/0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch @@ -1,86 +1,108 @@ -From 7152ded5219453c9ff1cd062cecbeaf4d77e4cab Mon Sep 17 00:00:00 2001 +From ecd4eceae98cfb1c83133bdeaa9095546ca8b7c6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 26 May 2016 15:05:48 +0200 -Subject: [PATCH] Use instead of +Subject: [PATCH] Use when available instead of musl libc (http://musl-libc.org lack the non-standard header, which is used in src/os/linux/{i386,x86_64}/init.c files to setup the floating point precision. This patch makes it use the -standard C header instead. +standard C header instead when available. Original patch at Felix Janda at -https://sourceforge.net/p/jamvm/patches/6/. +https://sourceforge.net/p/jamvm/patches/6/, adapted to still use + if is not provided. Signed-off-by: Thomas Petazzoni --- - src/os/linux/i386/init.c | 12 ++++++------ - src/os/linux/x86_64/init.c | 16 ++++++---------- - 2 files changed, 12 insertions(+), 16 deletions(-) + configure.ac | 2 +- + src/os/linux/i386/init.c | 15 +++++++++++++++ + src/os/linux/x86_64/init.c | 15 +++++++++++++-- + 3 files changed, 29 insertions(+), 3 deletions(-) +diff --git a/configure.ac b/configure.ac +index 19f77e6..ce59a3e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -279,7 +279,7 @@ fi + + dnl Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS(sys/time.h unistd.h endian.h sys/param.h locale.h alloca.h) ++AC_CHECK_HEADERS(sys/time.h unistd.h endian.h sys/param.h locale.h alloca.h fenv.h) + + if test "$enable_zip" != no; then + AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR(zlib.h is missing)) diff --git a/src/os/linux/i386/init.c b/src/os/linux/i386/init.c -index d9c6648..94a733e 100644 +index d9c6648..8fefe7d 100644 --- a/src/os/linux/i386/init.c +++ b/src/os/linux/i386/init.c -@@ -19,18 +19,18 @@ +@@ -19,18 +19,33 @@ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ --#include ++#include "config.h" ++ ++#if defined(HAVE_FENV_H) +#include ++#else + #include ++#endif /* Change floating point precision to double (64-bit) from * the extended (80-bit) Linux default. */ void setDoublePrecision() { -- fpu_control_t cw; ++#if defined(HAVE_FENV_H) + fenv_t fenv; - -- _FPU_GETCW(cw); -- cw &= ~_FPU_EXTENDED; -- cw |= _FPU_DOUBLE; -- _FPU_SETCW(cw); ++ + fegetenv(&fenv); + fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ + fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ + fesetenv(&fenv); ++#else + fpu_control_t cw; + + _FPU_GETCW(cw); + cw &= ~_FPU_EXTENDED; + cw |= _FPU_DOUBLE; + _FPU_SETCW(cw); ++#endif } void initialisePlatform() { diff --git a/src/os/linux/x86_64/init.c b/src/os/linux/x86_64/init.c -index 9d55229..a76a923 100644 +index 9d55229..b42b14e 100644 --- a/src/os/linux/x86_64/init.c +++ b/src/os/linux/x86_64/init.c -@@ -19,9 +19,7 @@ +@@ -19,7 +19,11 @@ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef __linux__ --#include --#endif ++#include "config.h" ++ ++#if defined(HAVE_FENV_H) +#include ++#else + #include + #endif - /* Change the x87 FPU precision to double (64-bit) from the extended - (80-bit) Linux default. Note, unlike on i386, my testcases pass -@@ -30,14 +28,12 @@ +@@ -30,7 +34,14 @@ */ void setDoublePrecision() { -#ifdef __linux__ -- fpu_control_t cw; ++#if defined(HAVE_FENV_H) + fenv_t fenv; - -- _FPU_GETCW(cw); -- cw &= ~_FPU_EXTENDED; -- cw |= _FPU_DOUBLE; -- _FPU_SETCW(cw); --#endif ++ + fegetenv(&fenv); + fenv.__control_word &= ~0x300; /*_FPU_EXTENDED */ + fenv.__control_word |= 0x200; /*_FPU_DOUBLE */ + fesetenv(&fenv); - } ++#else + fpu_control_t cw; - void initialisePlatform() { + _FPU_GETCW(cw); -- 2.7.4 diff --git a/package/jamvm/jamvm.mk b/package/jamvm/jamvm.mk index b1520ada49..ee80c80b2f 100644 --- a/package/jamvm/jamvm.mk +++ b/package/jamvm/jamvm.mk @@ -9,6 +9,8 @@ JAMVM_SITE = http://downloads.sourceforge.net/project/jamvm/jamvm/JamVM%20$(JAMV JAMVM_LICENSE = GPLv2+ JAMVM_LICENSE_FILES = COPYING JAMVM_DEPENDENCIES = zlib classpath +# For 0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch +JAMVM_AUTORECONF = YES # int inlining seems to crash jamvm, don't build shared version of internal lib JAMVM_CONF_OPTS = \ --with-classpath-install-dir=/usr \ @@ -22,4 +24,11 @@ ifeq ($(BR2_arm),y) JAMVM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -marm" endif +# Needed for autoreconf +define JAMVM_CREATE_M4_DIR + mkdir -p $(@D)/m4 +endef + +JAMVM_POST_PATCH_HOOKS += JAMVM_CREATE_M4_DIR + $(eval $(autotools-package)) From 0fb2263d29317ddb3f48113e340d3d7f6425423a Mon Sep 17 00:00:00 2001 From: Stefan Nickl Date: Sun, 6 Nov 2016 21:05:13 +0100 Subject: [PATCH 1265/3392] pkg-cmake: Change -DNEBUG to -DNDEBUG Signed-off-by: Stefan Nickl Acked-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- support/misc/toolchainfile.cmake.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index e095356b79..d4252dd9e7 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -25,8 +25,8 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) # screwed up and there is nothing Buildroot can do about that :( set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") -set(CMAKE_C_FLAGS_RELEASE " -DNEBUG" CACHE STRING "Release CFLAGS") -set(CMAKE_CXX_FLAGS_RELEASE " -DNEBUG" CACHE STRING "Release CXXFLAGS") +set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") +set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") # Build type from the Buildroot configuration set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") @@ -36,7 +36,7 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur # want to customize the compiler/linker flags, then: # * set them all on the cmake command line, e.g.: # cmake -DCMAKE_C_FLAGS="@@TARGET_CFLAGS@@ -Dsome_custom_flag" ... -# * and make sure the project's CMake code extendsthem like this if needed: +# * and make sure the project's CMake code extends them like this if needed: # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") @@ -58,7 +58,7 @@ set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") if(@@TOOLCHAIN_HAS_FORTRAN@@) set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") - set(CMAKE_Fortran_FLAGS_RELEASE " -DNEBUG" CACHE STRING "Release Fortran FLAGS") + set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") endif() From 83be94a56a14b921a0a680cfe8f5bbab737b313c Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Sun, 6 Nov 2016 22:30:09 +0100 Subject: [PATCH 1266/3392] libpjsip: bump to 2.5.5 Remove patches now upstream. Disable new optional features: webrtc and opus. Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- ...compatible-with-musl-fixes-musl-buil.patch | 53 ------------ ...priority-with-sched_priority-fixes-m.patch | 82 ------------------- package/libpjsip/libpjsip.hash | 6 +- package/libpjsip/libpjsip.mk | 4 +- 4 files changed, 6 insertions(+), 139 deletions(-) delete mode 100644 package/libpjsip/0001-Use-mutex-types-compatible-with-musl-fixes-musl-buil.patch delete mode 100644 package/libpjsip/0002-Replace-__sched_priority-with-sched_priority-fixes-m.patch diff --git a/package/libpjsip/0001-Use-mutex-types-compatible-with-musl-fixes-musl-buil.patch b/package/libpjsip/0001-Use-mutex-types-compatible-with-musl-fixes-musl-buil.patch deleted file mode 100644 index ab3444b710..0000000000 --- a/package/libpjsip/0001-Use-mutex-types-compatible-with-musl-fixes-musl-buil.patch +++ /dev/null @@ -1,53 +0,0 @@ -From ba1057d74aac6c2dde5477bd6a2deea79f14962c Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Sat, 12 Mar 2016 15:19:34 +0100 -Subject: [PATCH 1/2] Use mutex types compatible with musl (fixes musl build) - -PTHREAD_MUTEX_FAST_NP and PTHREAD_MUTEX_RECURSIVE_NP are not defined -in the musl C library. Use values that map to the same mutex type in -GNU libc and uClibc-ng. - -Fixes the following build errors when building with musl: - - ../src/pj/os_core_unix.c: In function 'init_mutex': - ../src/pj/os_core_unix.c:1128:40: error: 'PTHREAD_MUTEX_FAST_NP' undeclared (first use in this function) - rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_FAST_NP); - ^ - ../src/pj/os_core_unix.c:1128:40: note: each undeclared identifier is reported only once for each function it appears in - ../src/pj/os_core_unix.c:1138:40: error: 'PTHREAD_MUTEX_RECURSIVE_NP' undeclared (first use in this function) - rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); - ^ - -Original patch: -http://git.alpinelinux.org/cgit/aports/plain/main/pjproject/musl-fixes.patch - -Signed-off-by: Luca Ceresoli ---- - pjlib/src/pj/os_core_unix.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pjlib/src/pj/os_core_unix.c b/pjlib/src/pj/os_core_unix.c -index 1c87b2f..f08ba27 100644 ---- a/pjlib/src/pj/os_core_unix.c -+++ b/pjlib/src/pj/os_core_unix.c -@@ -1125,7 +1125,7 @@ static pj_status_t init_mutex(pj_mutex_t *mutex, const char *name, int type) - if (type == PJ_MUTEX_SIMPLE) { - #if (defined(PJ_LINUX) && PJ_LINUX!=0) || \ - defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE) -- rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_FAST_NP); -+ rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); - #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \ - defined(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE) - /* Nothing to do, default is simple */ -@@ -1135,7 +1135,7 @@ static pj_status_t init_mutex(pj_mutex_t *mutex, const char *name, int type) - } else { - #if (defined(PJ_LINUX) && PJ_LINUX!=0) || \ - defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE) -- rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); -+ rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \ - defined(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE) - // Phil Torre : --- -1.9.1 - diff --git a/package/libpjsip/0002-Replace-__sched_priority-with-sched_priority-fixes-m.patch b/package/libpjsip/0002-Replace-__sched_priority-with-sched_priority-fixes-m.patch deleted file mode 100644 index e1cb00229a..0000000000 --- a/package/libpjsip/0002-Replace-__sched_priority-with-sched_priority-fixes-m.patch +++ /dev/null @@ -1,82 +0,0 @@ -From cca93ce25f993c97ef3d96fa32461d5717c30518 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Sat, 12 Mar 2016 15:31:47 +0100 -Subject: [PATCH 2/2] Replace __sched_priority with sched_priority(fixes musl - build) - -The musl C library defines sched_priority, not __sched_priority as GNU -libc and uClibc-ng do. Use sched_priority instead. - -This does not break compatibility with GNU libc and uClibc-ng because -both define in sched.h: - - #define sched_priority __sched_priority - -Fixes the following build errors when building with musl: - - ../src/samples/siprtp.c: In function 'boost_priority': - ../src/samples/siprtp.c:1137:7: error: 'struct sched_param' has no member named '__sched_priority' - tp.__sched_priority = max_prio; - ^ - In file included from /home/murray/devel/buildroot/test-musl-eabi/build/libpjsip-2.4.5/pjlib/include/pj/except.h:30:0, - from /home/murray/devel/buildroot/test-musl-eabi/build/libpjsip-2.4.5/pjlib/include/pjlib.h:35, - from ../src/samples/siprtp.c:76: - ../src/samples/siprtp.c:1146:18: error: 'struct sched_param' has no member named '__sched_priority' - policy, tp.__sched_priority)); - ^ - -Original patch: -http://git.alpinelinux.org/cgit/aports/plain/main/pjproject/musl-fixes.patch - -Signed-off-by: Luca Ceresoli ---- - pjsip-apps/src/samples/siprtp.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c -index 796464f..6e32a8f 100644 ---- a/pjsip-apps/src/samples/siprtp.c -+++ b/pjsip-apps/src/samples/siprtp.c -@@ -1134,7 +1134,7 @@ static void boost_priority(void) - PJ_RETURN_OS_ERROR(rc)); - return; - } -- tp.__sched_priority = max_prio; -+ tp.sched_priority = max_prio; - - rc = sched_setscheduler(0, POLICY, &tp); - if (rc != 0) { -@@ -1143,7 +1143,7 @@ static void boost_priority(void) - } - - PJ_LOG(4, (THIS_FILE, "New process policy=%d, priority=%d", -- policy, tp.__sched_priority)); -+ policy, tp.sched_priority)); - - /* - * Adjust thread scheduling algorithm and priority -@@ -1156,10 +1156,10 @@ static void boost_priority(void) - } - - PJ_LOG(4, (THIS_FILE, "Old thread policy=%d, priority=%d", -- policy, tp.__sched_priority)); -+ policy, tp.sched_priority)); - - policy = POLICY; -- tp.__sched_priority = max_prio; -+ tp.sched_priority = max_prio; - - rc = pthread_setschedparam(pthread_self(), policy, &tp); - if (rc != 0) { -@@ -1169,7 +1169,7 @@ static void boost_priority(void) - } - - PJ_LOG(4, (THIS_FILE, "New thread policy=%d, priority=%d", -- policy, tp.__sched_priority)); -+ policy, tp.sched_priority)); - } - - #else --- -1.9.1 - diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index e0d3d14323..99760652cb 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,5 +1,5 @@ -# From http://www.pjsip.org/release/2.4.5/MD5SUM.TXT -md5 f58b3485977b3a700256203a554b3869 pjproject-2.4.5.tar.bz2 +# From http://www.pjsip.org/release/2.5.5/MD5SUM.TXT +md5 183f7144b9aa238884243c0fc52ece36 pjproject-2.5.5.tar.bz2 # Locally computed -sha256 086f5e70dcaee312b66ddc24dac6ef85e6f1fec4eed00ff2915cebe0ee3cdd8d pjproject-2.4.5.tar.bz2 +sha256 ab39207b761d3485199cd881410afeb2d171dff7c2bf75e8caae91c6dca508f3 pjproject-2.5.5.tar.bz2 diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 2b5e18f223..cb0d866e25 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.4.5 +LIBPJSIP_VERSION = 2.5.5 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.bz2 LIBPJSIP_SITE = http://www.pjsip.org/release/$(LIBPJSIP_VERSION) LIBPJSIP_DEPENDENCIES = libsrtp @@ -34,6 +34,8 @@ LIBPJSIP_CONF_OPTS = \ --disable-opencore-amr \ --disable-g7221-codec \ --disable-ilbc-codec \ + --disable-webrtc \ + --disable-opus \ --with-external-srtp=$(STAGING_DIR)/usr ifeq ($(BR2_PACKAGE_OPENSSL),y) From 61331ac08e688ba5cf2913a09cbb3c54892cd54a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 6 Nov 2016 17:12:14 -0200 Subject: [PATCH 1267/3392] freescale: Add a standard genimage script for MX23/MX28 Add a standard genimage script for the MXS processors (MX23 and MX28). Based on the common scripts for the other imx devices: board/freescale/common/genimage.cfg.template board/freescale/common/post-image.sh This makes it easier to add new MX23/MX28 boards configurations into Buildroot. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- .../common/mxs/genimage.cfg.template | 39 ++++++++++++++ board/freescale/common/mxs/post-image.sh | 54 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 board/freescale/common/mxs/genimage.cfg.template create mode 100755 board/freescale/common/mxs/post-image.sh diff --git a/board/freescale/common/mxs/genimage.cfg.template b/board/freescale/common/mxs/genimage.cfg.template new file mode 100644 index 0000000000..e094fb7f2c --- /dev/null +++ b/board/freescale/common/mxs/genimage.cfg.template @@ -0,0 +1,39 @@ +# Minimal SD card image for the Freescale MX23/MX28 Template +# +# We mimic the .sdcard Freescale's MX23/MX28 image format: +# * u-boot.sb is placed at offset 1M, +# * a FAT partition at offset 16 MB is containing zImage/uImage and DTB files +# * a single root filesystem partition is required (ext2, ext3 or ext4) +# + +image boot.vfat { + vfat { + files = { + %FILES% + } + } + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0x53 + image = "u-boot.sd" + offset = 1M + size = 16M + } + + partition kernel { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/freescale/common/mxs/post-image.sh b/board/freescale/common/mxs/post-image.sh new file mode 100755 index 0000000000..0bfb835c6e --- /dev/null +++ b/board/freescale/common/mxs/post-image.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env bash + +# +# dtb_list extracts the list of DTB files from BR2_LINUX_KERNEL_INTREE_DTS_NAME +# in ${BR_CONFIG}, then prints the corresponding list of file names for the +# genimage configuration file +# +dtb_list() +{ + local DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" + + for dt in $DTB_LIST; do + echo -n "\"$dt.dtb\", " + done +} + +# +# linux_image extracts the Linux image format from BR2_LINUX_KERNEL_UIMAGE in +# ${BR_CONFIG}, then prints the corresponding file name for the genimage +# configuration file +# +linux_image() +{ + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + echo "\"uImage\"" + else + echo "\"zImage\"" + fi +} + +main() +{ + local FILES="$(dtb_list) $(linux_image)" + local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" + local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + + sed -e "s/%FILES%/${FILES}/" \ + board/freescale/common/mxs/genimage.cfg.template > ${GENIMAGE_CFG} + + rm -rf "${GENIMAGE_TMP}" + + genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + + rm -f ${GENIMAGE_CFG} + + exit $? +} + +main $@ From dfd3b84813e8b12b0b9f6044b0ada20e0ccddaee Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 6 Nov 2016 17:12:15 -0200 Subject: [PATCH 1268/3392] configs/imx28evk: Use the common mxs genimage script Use the common mxs genimage script instead of a custom one. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/freescale/imx28evk/genimage.cfg | 29 -------------------------- board/freescale/imx28evk/post-image.sh | 14 ------------- configs/freescale_imx28evk_defconfig | 2 +- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 board/freescale/imx28evk/genimage.cfg delete mode 100755 board/freescale/imx28evk/post-image.sh diff --git a/board/freescale/imx28evk/genimage.cfg b/board/freescale/imx28evk/genimage.cfg deleted file mode 100644 index 4df432f994..0000000000 --- a/board/freescale/imx28evk/genimage.cfg +++ /dev/null @@ -1,29 +0,0 @@ -image kernel.vfat { - vfat { - files = { - "zImage", "imx28-evk.dtb" - } - } - size = 16M -} - -image sdcard.img { - hdimage { - } - partition boot { - partition-type = 0x53 - image = "u-boot.sd" - offset = 1M - size = 16M - } - - partition kernel { - partition-type = 0xC - image = "kernel.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext2" - } -} diff --git a/board/freescale/imx28evk/post-image.sh b/board/freescale/imx28evk/post-image.sh deleted file mode 100755 index b4ac4608ff..0000000000 --- a/board/freescale/imx28evk/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/configs/freescale_imx28evk_defconfig b/configs/freescale_imx28evk_defconfig index 790c338251..08d5bd9cc7 100644 --- a/configs/freescale_imx28evk_defconfig +++ b/configs/freescale_imx28evk_defconfig @@ -31,4 +31,4 @@ BR2_TARGET_ROOTFS_EXT4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/imx28evk/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" From 09ed94bd6d51ff1e47df26b4ba8cdb682dc78bf3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 6 Nov 2016 19:11:00 +0100 Subject: [PATCH 1269/3392] package/mesa3d: Remove opengl headers files if opengl support is disabled Mesa3d used to install GL/gl.h & co. only if libGL.so was installed. After this commit https://cgit.freedesktop.org/mesa/mesa/commit/?h=13.0&id=a89faa2022fd995af2019c886b152b49a01f9392 this is no longer the case leading to misdetection of opengl support by vlc if mesa3d was built before: http://git.videolan.org/?p=vlc.git;a=blob;f=configure.ac;h=c8900d216540816224e872bef46fbcc93d83ca41;hb=HEAD#l3010 This patch partly re-introduces a mechanism to clean unwanted files installed by mesa3d which was removed when bumping to 12.0.0: https://git.buildroot.net/buildroot/commit/package/mesa3d?id=ff3e522e748925f6be5732a6e5df6553468ca0a1 Fixes http://autobuild.buildroot.net/results/13e/13e7c0f5fc6ae8ba5e62b2597d188496c64090fd/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d/mesa3d.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index e17db5c6f1..96ebb95b30 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -137,6 +137,12 @@ MESA3D_CONF_OPTS += --disable-va # libGL is only provided for a full xorg stack ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_PROVIDES += libgl +else +define MESA3D_REMOVE_OPENGL_HEADERS + rm -rf $(STAGING_DIR)/usr/include/GL/ +endef + +MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_HEADERS endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) From a92fdd337a4cfe8e5bdf297bfe5c7d7ee008a50e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 6 Nov 2016 17:19:24 +0100 Subject: [PATCH 1270/3392] Revert "package/x265: bump version to 2.1" This reverts commit 1ba7b6a4f12977aec994c4f38d5be38cfdb27846. Adding -DCROSS_COMPILE_ARM=ON to _CONF_OPTS will not fix the build: /home/buildroot/br2/output/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include/gnu/stubs.h:7:29: fatal error: gnu/stubs-soft.h: No such file or directory because cross-compiling x265 is only supported for soft-float abi: https://bitbucket.org/multicoreware/x265/src/583fc74fc0a29f330187dbd78151c30a3e03d5a7/source/CMakeLists.txt?at=default#CMakeLists.txt-211 Fixes http://autobuild.buildroot.net/results/6ec/6ec75cc176e05bfc6287dc54fa1a53e0ffc0521d/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x265/x265.hash | 2 +- package/x265/x265.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x265/x265.hash b/package/x265/x265.hash index d6dec122da..92b5beaa9d 100644 --- a/package/x265/x265.hash +++ b/package/x265/x265.hash @@ -1,2 +1,2 @@ # Locally generated -sha256 88fcb9af4ba52c0757ac9c0d8cd5ec79951a22905ae886897e06954353d6a643 x265_2.1.tar.gz +sha256 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8 x265_1.9.tar.gz diff --git a/package/x265/x265.mk b/package/x265/x265.mk index ba284dacf9..e737c31375 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -4,7 +4,7 @@ # ################################################################################ -X265_VERSION = 2.1 +X265_VERSION = 1.9 X265_SOURCE = x265_$(X265_VERSION).tar.gz X265_SITE = https://bitbucket.org/multicoreware/x265/downloads X265_LICENSE = GPLv2+ From c80a95c50585ef9701d696c847ced6ebb91a3bad Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Nov 2016 15:24:59 +0100 Subject: [PATCH 1271/3392] configs/mini2440_defconfig: remove defconfig This defconfig has not been updated in any significant way since 2011, when Peter moved it to use a mainline kernel. It's now using an ancient 3.0 kernel, and a vendor-specific U-Boot version that fails to build with various "undefined reference" errors: undefined reference to `show_boot_progress' undefined reference to `image_print_contents' undefined reference to `wait_ms' So it's time to get rid of the defconfig for this platform. Signed-off-by: Thomas Petazzoni Acked-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/mini2440_defconfig | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 configs/mini2440_defconfig diff --git a/configs/mini2440_defconfig b/configs/mini2440_defconfig deleted file mode 100644 index 2891d10df4..0000000000 --- a/configs/mini2440_defconfig +++ /dev/null @@ -1,34 +0,0 @@ -# Architecture -BR2_arm=y -BR2_arm920t=y - -# Serial port -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttySAC0" - -# Filesystem -BR2_TARGET_ROOTFS_JFFS2=y -BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y -BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x800 -BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000 -BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y -BR2_TARGET_ROOTFS_JFFS2_LE=y -BR2_TARGET_ROOTFS_TAR=y - -# Linux headers same as kernel, a 3.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="mini2440" -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="http://repo.or.cz/w/u-boot-openmoko/mini2440.git/snapshot/dev-mini2440-stable.tar.gz" - -# -# Kernel -# -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.0.4" -BR2_LINUX_KERNEL_DEFCONFIG="mini2440" -BR2_LINUX_KERNEL_UIMAGE=y From cbf9208549d179c0765e729ab463debebfd60bd6 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 6 Nov 2016 15:38:51 +0100 Subject: [PATCH 1272/3392] olimex_a20_olinuxino_lime_mali: bump u-boot to 2016.09.01 U-Boot KConfig allows to take care of CONFIG_OLD_SUNXI_KERNEL_COMPAT in order to properly start the kernel (Error: unrecognized/unsupported machine ID) Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime_defconfig | 3 ++- configs/olimex_a20_olinuxino_lime_mali_defconfig | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 49987fef11..5941550112 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -32,9 +32,10 @@ BR2_TARGET_ROOTFS_EXT2_4=y # Bootloaders BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="A20-OLinuXino-Lime" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/olimex_a20_olinuxino_lime_mali_defconfig b/configs/olimex_a20_olinuxino_lime_mali_defconfig index 42c8a7c39d..b2d7dd564a 100644 --- a/configs/olimex_a20_olinuxino_lime_mali_defconfig +++ b/configs/olimex_a20_olinuxino_lime_mali_defconfig @@ -37,9 +37,11 @@ BR2_TARGET_ROOTFS_EXT2_4=y # Bootloaders BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="A20-OLinuXino-Lime" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" +BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" From fc1d28891f52c3ccce1a01ad5ad1a9db23300495 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 6 Nov 2016 17:04:48 +0100 Subject: [PATCH 1273/3392] package/qemu: disable Qemu user-land emulation for musl toolchains Like for cyclictest (rt-test)[1], linux-user/syscall.c use the definition of the "struct sigevent" from Glibc/uClibc which doesn't build with musl libc. So, disable Qemu user-land emulation for musl toolchains. Fixes: http://autobuild.buildroot.net/results/b27/b277e668d9e22b624416bf46f6ccba802acd257e [1] 43bffa59e7359610c8f00038ddd97795c0ca35e1 Signed-off-by: Romain Naour Cc: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index ea6b94605c..8bae5f40ec 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -69,11 +69,16 @@ comment "systems emulation needs a toolchain w/ dynamic library" config BR2_PACKAGE_QEMU_LINUX_USER bool "Enable all Linux user-land emulation" + # Incompatible "struct sigevent" definition on musl + depends on !BR2_TOOLCHAIN_USES_MUSL help Say 'y' to build all Linux user-land emulators that QEMU supports. # Note: bsd-user can not be build on Linux +comment "Linux user-land emulation needs a glibc or uClibc toolchain" + depends on BR2_TOOLCHAIN_USES_MUSL + endif # BR2_PACKAGE_QEMU_CUSTOM_TARGETS == "" config BR2_PACKAGE_QEMU_HAS_EMULS From 7561c512a3bc39b0a2ed9df5c8b81cb5459d7e69 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:27 -0300 Subject: [PATCH 1274/3392] gstreamer1: bump to version 1.10.0 Remove gstconfig.h compatibility kludge since it has been fixed/reinstated upstream. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 12 +----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index c85518e270..8bd7782a5d 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.8.3.tar.xz.sha256sum -sha256 66b37762d4fdcd63bce5a2bec57e055f92420e95037361609900278c0db7c53f gstreamer-1.8.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.0.tar.xz.sha256sum +sha256 1e7778fabe480185bfc4ce552f0860de1443f6618a68a86ccdd65854fed37207 gstreamer-1.10.0.tar.xz diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index d69c3e87cd..f0afdd976c 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.8.3 +GSTREAMER1_VERSION = 1.10.0 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES @@ -36,14 +36,4 @@ GSTREAMER1_CONF_OPTS = \ GSTREAMER1_DEPENDENCIES = libglib2 host-pkgconf host-bison host-flex -# gstreamer-1.6 changed the location of its gstconfig.h file, -# and unfortunately, not all (by far!) consumers have been -# updated to look in the correct location. -# Add a symlink to the legacy location -define GSTREAMER1_LEGACY_CGSTCONFIG_H - cd $(STAGING_DIR)/usr/include/gstreamer-1.0/gst && \ - ln -sf ../../../lib/gstreamer-1.0/include/gst/gstconfig.h . -endef -GSTREAMER1_POST_INSTALL_STAGING_HOOKS += GSTREAMER1_LEGACY_CGSTCONFIG_H - $(eval $(autotools-package)) From bef9a1fbeb45c3c30d9e00de7ea1742012e538b3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:28 -0300 Subject: [PATCH 1275/3392] gstreamer1: add explicit libunwind support It's a new feature for 1.10.0+, however it doesn't have an enable/disable configure switch so just handle the dependency. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gstreamer1/gstreamer1.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index f0afdd976c..cb111f2f4c 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -34,6 +34,11 @@ GSTREAMER1_CONF_OPTS = \ $(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),,--disable-registry) \ $(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),,--disable-tools) -GSTREAMER1_DEPENDENCIES = libglib2 host-pkgconf host-bison host-flex +GSTREAMER1_DEPENDENCIES = \ + host-bison \ + host-flex \ + host-pkgconf \ + libglib2 \ + $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) $(eval $(autotools-package)) From 2b08e5ec871b031147595ab1189cdb3bb5aa0df5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:29 -0300 Subject: [PATCH 1276/3392] gst1-plugins-base: bump to version 1.10.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 83f0e83461..f4a43ca284 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.8.3.tar.xz.sha256sum -sha256 114871d4d63606b4af424a8433cd923e4ff66896b244bb7ac97b9da47f71e79e gst-plugins-base-1.8.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.0.tar.xz.sha256sum +sha256 bfcdef97dfc69a0bbdb4403c47aae4e53def176bf0b781c5d818550536cfe94a gst-plugins-base-1.10.0.tar.xz diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 5a35897292..c5686b3eff 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.8.3 +GST1_PLUGINS_BASE_VERSION = 1.10.0 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From e6a58ad7d326d3dcc564e36e2dc157d5a3532d7c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:30 -0300 Subject: [PATCH 1277/3392] gst1-plugins-good: bump to version 1.10.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 2e3db3d81b..a00db6cc43 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.8.3.tar.xz.sha256sum -sha256 a1d6579ba203a7734927c24b90bf6590d846c5a5fcec01a48201018c8ad2827a gst-plugins-good-1.8.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.0.tar.xz.sha256sum +sha256 7a03559763f5634ab1b4b2edd3e9f7442bdd4657187e20ea5e1887ae46371de2 gst-plugins-good-1.10.0.tar.xz diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index b4bc2e474c..ca3bfaa15e 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.8.3 +GST1_PLUGINS_GOOD_VERSION = 1.10.0 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From 48adcc3503c12516c834a6343765f52ac292e640 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:31 -0300 Subject: [PATCH 1278/3392] gst1-plugins-bad: bump to version 1.10.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index a0d6cdccc9..34f3dc2af9 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.8.3.tar.xz.sha256sum -sha256 7899fcb18e6a1af2888b19c90213af018a57d741c6e72ec56b133bc73ec8509b gst-plugins-bad-1.8.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.0.tar.xz.sha256sum +sha256 3d5f9d16e1a3ee7c5c024494cc3a3420007bfdce6f94511317ae004972811c4f gst-plugins-bad-1.10.0.tar.xz diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index eb935bc290..ac99fcd600 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.8.3 +GST1_PLUGINS_BAD_VERSION = 1.10.0 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From b60aca590b6ea9b1ef4400b986631548195e6d19 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Nov 2016 23:04:47 +0100 Subject: [PATCH 1279/3392] fdk-aac: refactor architecture dependency as a blind option In preparation to the addition of a fdk-aac GStreamer plugin that will have to select the fdk-aac package (and therefore inherits its dependencies), this commits adds a BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS blind option to avoid duplicating the architecture dependencies of this package. Signed-off-by: Thomas Petazzoni --- package/fdk-aac/Config.in | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/package/fdk-aac/Config.in b/package/fdk-aac/Config.in index 9e18d22039..f51c5ab19c 100644 --- a/package/fdk-aac/Config.in +++ b/package/fdk-aac/Config.in @@ -1,11 +1,14 @@ +# These are the architectures supported by FDK AAC +config BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS + bool + default y if BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ + BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ + BR2_powerpc || BR2_sh + config BR2_PACKAGE_FDK_AAC bool "fdk-aac" + depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP - # These are the architectures supported by FDK AAC - depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_sh - help The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software that implements the MPEG Advanced Audio Coding ("AAC") @@ -14,7 +17,5 @@ config BR2_PACKAGE_FDK_AAC http://sourceforge.net/projects/opencore-amr/files/fdk-aac/ comment "fdk-aac needs a toolchain w/ C++" + depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_sh From 0d45e57a1292a803fe3d118c580243d2e8bd41c4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:32 -0300 Subject: [PATCH 1280/3392] gst1-plugins-bad: enable fdkaac plugin It's new for 1.10.0, add an explicit option for the fdkaac plugin. Signed-off-by: Gustavo Zacarias [Thomas: add missing dependencies for the fdk-aac select, as noticed by Baruch Siach.] Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/Config.in | 12 ++++++++++++ .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 2f288cabc6..8af35cc2be 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -520,6 +520,18 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV help Linux framebuffer video sink +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC + bool "fdk-aac" + select BR2_PACKAGE_FDK_AAC + depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP + help + MPEG AAC encoder/decoder + +comment "fdk-aac needs a toolchain w/ C++" + depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL bool "gl" default y diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac99fcd600..cd9da7cbe1 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -642,6 +642,14 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-fbdev endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC),y) +GST1_PLUGINS_BAD_CONF_OPTS += --enable-fdk_aac +GST1_PLUGINS_BAD_DEPENDENCIES += fdk-aac +GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y +else +GST1_PLUGINS_BAD_CONF_OPTS += --disable-fdk_aac +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-gl else From 8ea3a3b9c32f88871a1c3090a2a0dd5097061928 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Nov 2016 23:18:58 +0100 Subject: [PATCH 1281/3392] webrtc-audio-processing: refactor architecture dependency as a blind option In preparation to the addition of a webrtc GStreamer plugin that will have to select the webrtc-audio-processing package (and therefore inherits its dependencies), this commits adds a BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS blind option to avoid duplicating the architecture dependencies of this package. Signed-off-by: Thomas Petazzoni --- package/webrtc-audio-processing/Config.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/webrtc-audio-processing/Config.in b/package/webrtc-audio-processing/Config.in index 79a06d8b3f..02715b080a 100644 --- a/package/webrtc-audio-processing/Config.in +++ b/package/webrtc-audio-processing/Config.in @@ -1,6 +1,10 @@ +config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS + bool + default y if BR2_arm || BR2_i386 || BR2_x86_64 + config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING bool "webrtc-audio-processing" - depends on BR2_arm || BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # pthread_condattr_setclock @@ -12,6 +16,6 @@ config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/ comment "webrtc-audio-processing needs a toolchain w/ C++, NPTL, gcc >= 4.8" - depends on BR2_arm || BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 From ee267886bc090335dd94c97dca1c294addccc090 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:33 -0300 Subject: [PATCH 1282/3392] gst1-plugins-bad: enable webrtc plugin It's new for 1.10.0, add an explicit option for the webrtc plugin. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/Config.in | 17 +++++++++++++++++ .../gst1-plugins-bad/gst1-plugins-bad.mk | 7 +++++++ 2 files changed, 24 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 8af35cc2be..1e251afec6 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -682,6 +682,23 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP help Webp image format plugin +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC + bool "webrtc" + # All depends from webrtc-audio-processing + depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING + select BR2_PACKAGE_WEBRTC + help + WebRTC echo-cancellation, gain control and noise suppression + +comment "webrtc needs a toolchain w/ C++, NPTL, gcc >= 4.8" + depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 bool "x265" depends on BR2_INSTALL_LIBSTDCPP diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index cd9da7cbe1..ba9f8ffd08 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -794,6 +794,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-webp endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC),y) +GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtc +GST1_PLUGINS_BAD_DEPENDENCIES += webrtc-audio-processing +else +GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtc +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-x265 GST1_PLUGINS_BAD_DEPENDENCIES += x265 From 2485193b5d41e0456c22574b9add2f6b2261a2f1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:34 -0300 Subject: [PATCH 1283/3392] gst1-plugins-bad: add new timecode plugin Add a new explicit option for the dependency-less timecode plugin. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/Config.in | 3 +++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 1e251afec6..40bb2834e4 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -419,6 +419,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO bool "stereo" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE + bool "timecode" + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA bool "tta" diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ba9f8ffd08..012b948b2c 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -517,6 +517,12 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-stereo endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE),y) +GST1_PLUGINS_BAD_CONF_OPTS += --enable-timecode +else +GST1_PLUGINS_BAD_CONF_OPTS += --disable-timecode +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-tta else From 593446f3f436f3a27fd22251c38b97710edd8b7c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:35 -0300 Subject: [PATCH 1284/3392] gst1-plugins-ugly: bump to version 1.10.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 1c6aa7d80a..57845256bc 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.8.3.tar.xz.sha256sum -sha256 6fa2599fdd072d31fbaf50c34af406e2be944a010b1f4eab67a5fe32a0310693 gst-plugins-ugly-1.8.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.0.tar.xz.sha256sum +sha256 97de8d1903abb54305732e6b8781c8c42f5cc5a2a548a8f31b38c189e81a55e0 gst-plugins-ugly-1.10.0.tar.xz diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 4a67a73bce..40234a1afe 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.8.3 +GST1_PLUGINS_UGLY_VERSION = 1.10.0 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From 5ffd5bf1cd84a8d78827976f9cd277da2a02ed0f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:36 -0300 Subject: [PATCH 1285/3392] gst1-libav: bump to version 1.10.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 46d48a956e..329d1d6aa1 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.8.3.tar.xz.sha256sum -sha256 9006a05990089f7155ee0e848042f6bb24e52ab1d0a59ff8d1b5d7e33001a495 gst-libav-1.8.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.0.tar.xz.sha256sum +sha256 af98204411c78abb98233c1858f2886be6401304d24be218752bbbcede9bd85b gst-libav-1.10.0.tar.xz diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 5706c64623..718ebdb318 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.8.3 +GST1_LIBAV_VERSION = 1.10.0 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_CONF_OPTS = --with-system-libav From 4ea04475a6d6fc472b5da3584702ee848596dc7b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:37 -0300 Subject: [PATCH 1286/3392] gst1-rtsp-server: bump to version 1.10.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index a30afbc1d3..597f0b20d6 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,2 +1,2 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.8.3.tar.xz.sha256sum -sha256 010f06800c1c957851d1352e5ec7a8ba3ce6a857fec1b8afc7d1a9e5f53288bf gst-rtsp-server-1.8.3.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.0.tar.xz.sha256sum +sha256 aa72a94cccdd2387ad25dc65c5c0b1f76269c3997cbde348232eec2a1565b3cd gst-rtsp-server-1.10.0.tar.xz diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 458e3aff37..4ff44c9e2a 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.8.3 +GST1_RTSP_SERVER_VERSION = 1.10.0 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPLv2+ From 32e0d57a0fed932fcfc4745afda4d65aeb71c39f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:38 -0300 Subject: [PATCH 1287/3392] gst1-validate: bump to version 1.10.0 It now requires json-glib as dependency so adjust. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-validate/Config.in | 1 + package/gstreamer1/gst1-validate/gst1-validate.hash | 4 ++-- package/gstreamer1/gst1-validate/gst1-validate.mk | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-validate/Config.in b/package/gstreamer1/gst1-validate/Config.in index a9bb2aa388..2022d38d99 100644 --- a/package/gstreamer1/gst1-validate/Config.in +++ b/package/gstreamer1/gst1-validate/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GST1_VALIDATE bool "gst1-validate" depends on BR2_PACKAGE_PYTHON select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_JSON_GLIB select BR2_PACKAGE_PYTHON_PYEXPAT # cairo is autodetected but needs PNG support select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO diff --git a/package/gstreamer1/gst1-validate/gst1-validate.hash b/package/gstreamer1/gst1-validate/gst1-validate.hash index 09061f402a..f08e1b71a6 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.hash +++ b/package/gstreamer1/gst1-validate/gst1-validate.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.8.3.tar.xz.sha256sum -sha256 4525a4fb5b85b8a49674e00d652bee9ac62c56241c148abbff23efa50a224e34 gst-validate-1.8.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.0.tar.xz.sha256sum +sha256 a99a5cd1dfa5d021dd0197b32b04a20348479c097ebeb1f4c36161d70048a176 gst-validate-1.10.0.tar.xz diff --git a/package/gstreamer1/gst1-validate/gst1-validate.mk b/package/gstreamer1/gst1-validate/gst1-validate.mk index 372e5d6633..94595a6ce4 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.mk +++ b/package/gstreamer1/gst1-validate/gst1-validate.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VALIDATE_VERSION = 1.8.3 +GST1_VALIDATE_VERSION = 1.10.0 GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate GST1_VALIDATE_LICENSE = LGPLv2.1+ @@ -15,6 +15,7 @@ GST1_VALIDATE_CONF_OPTS = --disable-sphinx-doc GST1_VALIDATE_DEPENDENCIES = \ gstreamer1 \ gst1-plugins-base \ + json-glib \ host-python \ python \ $(if $(BR2_PACKAGE_CAIRO),cairo) From de45145d99ee3b4ffafd6632623262faafcb6fb9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:39 -0300 Subject: [PATCH 1288/3392] gst-omx: bump to version 1.10.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 40d5197117..653c93c589 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,2 +1,2 @@ -# locally computed -sha256 0b4874961e6488ad9e5808114bd486ea981c540907262caab1419355fd82d745 gst-omx-1.2.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/ +sha256 89f7da36abcf278200f561fa9d8d7042ad1459aa211cdc81c4c1a3d2162e9e7f gst-omx-1.10.0.tar.xz diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 4ca441656b..f0b39c9f9d 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.2.0 +GST_OMX_VERSION = 1.10.0 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From 3295a5ef4d41f91fbe9d8d2e690768c8056f3fd4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 3 Nov 2016 06:58:40 -0300 Subject: [PATCH 1289/3392] gst1-plugins-bad: add srtp support It's not new for 1.10.0 but hasn't been enabled when libsrtp was added to buildroot. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/Config.in | 4 ++++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 40bb2834e4..16c0b7e3f2 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -665,6 +665,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE bool "sndfile" select BR2_PACKAGE_LIBSNDFILE +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP + bool "srtp" + select BR2_PACKAGE_LIBSRTP + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD bool "vcd" diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 012b948b2c..098cf2b5da 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -44,7 +44,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ --disable-ladspa \ --disable-lv2 \ --disable-libde265 \ - --disable-srtp \ --disable-linsys \ --disable-modplug \ --disable-mimic \ @@ -780,6 +779,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-sndfile endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP),y) +GST1_PLUGINS_BAD_CONF_OPTS += --enable-srtp +GST1_PLUGINS_BAD_DEPENDENCIES += libsrtp +else +GST1_PLUGINS_BAD_CONF_OPTS += --disable-srtp +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-vcd else From dfc2c48c1e174d4882ec2cda54ecb95690229b2a Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Mon, 7 Nov 2016 16:14:42 +0100 Subject: [PATCH 1290/3392] board/armadeus: bump apf51 kernel to 4.4.30 (latest LTS) This will fix: http://free-electrons.com/~thomas/pub/buildroot-defconfigs/armadeus_apf51_defconfig.log.FAIL Signed-off-by: Julien BOIBESSOT Signed-off-by: Thomas Petazzoni --- .../{linux-3.12.config => linux-4.4.config} | 26 ++++++++++++++----- configs/armadeus_apf51_defconfig | 6 ++--- 2 files changed, 22 insertions(+), 10 deletions(-) rename board/armadeus/apf51/{linux-3.12.config => linux-4.4.config} (93%) diff --git a/board/armadeus/apf51/linux-3.12.config b/board/armadeus/apf51/linux-4.4.config similarity index 93% rename from board/armadeus/apf51/linux-3.12.config rename to board/armadeus/apf51/linux-4.4.config index 6c461b6f0d..6957b635a1 100644 --- a/board/armadeus/apf51/linux-3.12.config +++ b/board/armadeus/apf51/linux-4.4.config @@ -20,7 +20,7 @@ CONFIG_BSD_DISKLABEL=y # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_MXC=y CONFIG_MXC_IRQ_PRIOR=y -CONFIG_MACH_IMX51_DT=y +CONFIG_SOC_IMX51=y CONFIG_ARM_THUMBEE=y CONFIG_PREEMPT=y CONFIG_AEABI=y @@ -111,7 +111,9 @@ CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_IMX=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_WM831X=y +CONFIG_TOUCHSCREEN_MC13XXX=m CONFIG_INPUT_MISC=y +CONFIG_INPUT_MC13783_PWRBUTTON=m CONFIG_INPUT_UINPUT=m CONFIG_INPUT_WM831X_ON=y # CONFIG_LEGACY_PTYS is not set @@ -127,19 +129,24 @@ CONFIG_SPI_IMX=y CONFIG_SPI_SPIDEV=m CONFIG_GPIO_SYSFS=y CONFIG_GPIO_WM831X=m -CONFIG_POWER_SUPPLY=m +CONFIG_POWER_SUPPLY=y CONFIG_WM831X_BACKUP=m CONFIG_WM831X_POWER=m CONFIG_HWMON=m CONFIG_SENSORS_AS1531=m +CONFIG_SENSORS_MC13783_ADC=m CONFIG_SENSORS_WM831X=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_WM831X_WATCHDOG=m CONFIG_IMX2_WDT=y +CONFIG_MFD_MC13XXX_I2C=y CONFIG_MFD_WM831X_I2C=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_MC13892=m +CONFIG_IMX_IPUV3_CORE=y +CONFIG_DRM=y CONFIG_MFD_IMX_IPU_V3=y CONFIG_MEDIA_SUPPORT=m CONFIG_VIDEO_DEV=m @@ -203,12 +210,13 @@ CONFIG_USB_PRINTER=y CONFIG_USB_WDM=y CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_PHY=y CONFIG_NOP_USB_XCEIV=y CONFIG_USB_GPIO_VBUS=y CONFIG_USB_ULPI=y -CONFIG_USB_GADGET=m +CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG_FILES=y CONFIG_USB_GADGET_DEBUG_FS=y CONFIG_USB_ETH=m @@ -227,12 +235,19 @@ CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_WM831X_STATUS=m +CONFIG_LEDS_MC13783=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_RTC_CLASS=y CONFIG_RTC_MXC=y CONFIG_RTC_DRV_WM831X=y +CONFIG_RTC_DRV_MC13XXX=m CONFIG_STAGING=y +CONFIG_DRM_IMX=y +CONFIG_DRM_IMX_FB_HELPER=y +CONFIG_DRM_IMX_PARALLEL_DISPLAY=y +CONFIG_DRM_IMX_TVE=y +CONFIG_DRM_IMX_IPUV3=y CONFIG_IIO=m CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y @@ -242,6 +257,7 @@ CONFIG_EXT2_FS_XIP=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS=y CONFIG_AUTOFS4_FS=y CONFIG_ISO9660_FS=y CONFIG_JOLIET=y @@ -249,10 +265,6 @@ CONFIG_ZISOFS=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_CMODE_NONE=y CONFIG_UBIFS_FS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y diff --git a/configs/armadeus_apf51_defconfig b/configs/armadeus_apf51_defconfig index f70593b05d..e834626713 100644 --- a/configs/armadeus_apf51_defconfig +++ b/configs/armadeus_apf51_defconfig @@ -3,7 +3,7 @@ BR2_arm=y BR2_cortex_a8=y # Linux headers same as kernel, a 3.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y # System BR2_TARGET_GENERIC_HOSTNAME="apf51" @@ -13,9 +13,9 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf51/linux-3.12.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf51/linux-4.4.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000" BR2_LINUX_KERNEL_DTS_SUPPORT=y From ae32d09c91bc3144a6e543fba13ce714ee6b1ceb Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Mon, 7 Nov 2016 16:58:04 +0100 Subject: [PATCH 1291/3392] board/armadeus: bump apf28 kernel version to 4.4.30 (latest LTS) Signed-off-by: Julien BOIBESSOT Signed-off-by: Thomas Petazzoni --- configs/armadeus_apf28_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/armadeus_apf28_defconfig b/configs/armadeus_apf28_defconfig index 708f20bea3..31fb52897b 100644 --- a/configs/armadeus_apf28_defconfig +++ b/configs/armadeus_apf28_defconfig @@ -13,7 +13,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf28/linux-4.4.config" BR2_LINUX_KERNEL_UIMAGE=y From 4d65a7f0ee1219b190fdf82eb4951845a42ae63b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 22:01:05 +0100 Subject: [PATCH 1292/3392] configs/freescale_p2020ds: remove defconfig This defconfig no longer builds with gcc 5.x, and the original submitter, Gustavo, no longer has the hardware to test this configuration. Signed-off-by: Thomas Petazzoni --- board/freescale/p2020ds/linux-3.12.config | 374 ------------------ .../p2020ds/linux-fix-c6187597-breakage.patch | 51 --- board/freescale/p2020ds/readme.txt | 40 -- configs/freescale_p2020ds_defconfig | 24 -- 4 files changed, 489 deletions(-) delete mode 100644 board/freescale/p2020ds/linux-3.12.config delete mode 100644 board/freescale/p2020ds/linux-fix-c6187597-breakage.patch delete mode 100644 board/freescale/p2020ds/readme.txt delete mode 100644 configs/freescale_p2020ds_defconfig diff --git a/board/freescale/p2020ds/linux-3.12.config b/board/freescale/p2020ds/linux-3.12.config deleted file mode 100644 index 7181a6dcb1..0000000000 --- a/board/freescale/p2020ds/linux-3.12.config +++ /dev/null @@ -1,374 +0,0 @@ -CONFIG_PPC_85xx=y -CONFIG_PHYS_64BIT=y -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_IRQ_DOMAIN_DEBUG=y -CONFIG_NO_HZ_IDLE=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_CGROUPS=y -CONFIG_NAMESPACES=y -CONFIG_EXPERT=y -CONFIG_KALLSYMS_ALL=y -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_BLK_DEV_BSG is not set -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_POWERNV_MSI is not set -CONFIG_MPC85xx_DS=y -CONFIG_HIGHMEM=y -CONFIG_HOTPLUG_CPU=y -CONFIG_IRQ_ALL_CPUS=y -CONFIG_FORCE_MAX_ZONEORDER=12 -# CONFIG_SUSPEND is not set -CONFIG_PCI=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCI_MSI=y -CONFIG_RAPIDIO=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=m -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_INET_ESP=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -CONFIG_NETWORK_SECMARK=y -CONFIG_NETFILTER=y -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_ZONES=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_TIMEOUT=y -CONFIG_NF_CONNTRACK_TIMESTAMP=y -CONFIG_NF_CT_PROTO_DCCP=m -CONFIG_NF_CT_PROTO_UDPLITE=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_CT_NETLINK_HELPER=m -CONFIG_NETFILTER_NETLINK_QUEUE_CT=y -CONFIG_NETFILTER_XT_TARGET_AUDIT=m -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HMARK=m -CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_NETFILTER_XT_TARGET_TEE=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TRACE=m -CONFIG_NETFILTER_XT_TARGET_SECMARK=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_CPU=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_NFACCT=m -CONFIG_NETFILTER_XT_MATCH_OSF=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT_IPV4=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_SYNPROXY=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_NF_NAT_IPV6=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=m -CONFIG_IP_SCTP=m -CONFIG_BRIDGE=m -CONFIG_CFG80211=m -CONFIG_MAC80211=m -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_FW_LOADER_USER_HELPER is not set -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_FTL=y -CONFIG_MTD_CFI=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_FSL_ELBC=y -CONFIG_MTD_NAND_FSL_IFC=y -CONFIG_MTD_UBI=y -CONFIG_PROC_DEVICETREE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_NBD=y -CONFIG_EEPROM_LEGACY=y -CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_LOGGING=y -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_FSL=y -CONFIG_SATA_SIL24=y -CONFIG_PATA_ALI=y -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -CONFIG_MD_LINEAR=y -CONFIG_MD_RAID0=y -CONFIG_MD_RAID1=y -CONFIG_MD_RAID10=y -CONFIG_MD_RAID456=y -CONFIG_MD_MULTIPATH=y -CONFIG_BCACHE=y -CONFIG_BLK_DEV_DM=m -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_THIN_PROVISIONING=m -CONFIG_DM_CACHE=m -CONFIG_DM_MIRROR=m -CONFIG_DM_RAID=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_NETDEVICES=y -CONFIG_DUMMY=y -CONFIG_TUN=y -CONFIG_NET_TULIP=y -CONFIG_GIANFAR=y -CONFIG_E1000E=y -CONFIG_AT803X_PHY=y -CONFIG_ATHEROS_PHY=y -CONFIG_MARVELL_PHY=y -CONFIG_DAVICOM_PHY=y -CONFIG_CICADA_PHY=y -CONFIG_VITESSE_PHY=y -CONFIG_DP8384x_PHY=y -CONFIG_FIXED_PHY=y -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPPOE=m -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_ATH_CARDS=m -CONFIG_ATH9K=m -CONFIG_ATH9K_HTC=m -CONFIG_RT2X00=m -CONFIG_RT2800PCI=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT3573=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -# CONFIG_RTL_CARDS is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y -CONFIG_NVRAM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MPC=y -CONFIG_SPI=y -CONFIG_SPI_FSL_SPI=y -CONFIG_SPI_FSL_ESPI=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_MPC8XXX=y -# CONFIG_HWMON is not set -# CONFIG_VGA_ARB is not set -# CONFIG_VGA_CONSOLE is not set -CONFIG_SOUND=m -CONFIG_SND=m -CONFIG_SND_HRTIMER=m -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_DRIVERS is not set -CONFIG_SND_INTEL8X0=m -# CONFIG_SND_PPC is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set -# CONFIG_HID_GENERIC is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_FSL=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PPC_OF_BE=y -CONFIG_USB_OHCI_HCD_PPC_OF_LE=y -CONFIG_USB_STORAGE=y -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_OF_ESDHC=y -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_CMOS=y -CONFIG_DMADEVICES=y -CONFIG_FSL_DMA=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_FANOTIFY=y -CONFIG_FUSE_FS=m -CONFIG_VFAT_FS=y -CONFIG_PROC_KCORE=y -CONFIG_TMPFS=y -CONFIG_HUGETLBFS=y -CONFIG_JFFS2_FS=y -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_FS_XATTR=y -CONFIG_UBIFS_FS=y -CONFIG_SQUASHFS=y -CONFIG_SQUASHFS_XATTR=y -CONFIG_SQUASHFS_LZO=y -CONFIG_SQUASHFS_XZ=y -CONFIG_NFS_FS=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NFSD=m -CONFIG_CIFS=m -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_DEBUG is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=m -CONFIG_CRC_T10DIF=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DETECT_HUNG_TASK=y -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_DES=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_TALITOS=y diff --git a/board/freescale/p2020ds/linux-fix-c6187597-breakage.patch b/board/freescale/p2020ds/linux-fix-c6187597-breakage.patch deleted file mode 100644 index 598f92d3ce..0000000000 --- a/board/freescale/p2020ds/linux-fix-c6187597-breakage.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Nikita Yushchenko -Subject: [PATCH] usb: pci-quirks: do not access OHCI_FMINTERVAL register on ULI hw - -This access causes hang on Freescale P2020DS board (that has OHCI -provided by ULI 1533 chip). - -Since preserving OHCI_FMINTERVAL was originally done only for NVIDIA -hardware and only later (in c6187597) was turned unconditional, and -c6187597 commit message again mentions only NVIDIA, I think it should be -safe to disable preserving OHCI_FMINTERVAL if device vendor is ULI. - -Signed-off-by: Nikita Yushchenko ---- - drivers/usb/host/pci-quirks.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c -index 00661d3..5acbd5b 100644 ---- a/drivers/usb/host/pci-quirks.c -+++ b/drivers/usb/host/pci-quirks.c -@@ -571,7 +571,7 @@ static void quirk_usb_handoff_ohci(struct pci_dev *pdev) - { - void __iomem *base; - u32 control; -- u32 fminterval; -+ u32 uninitialized_var(fminterval); - int cnt; - - if (!mmio_resource_enabled(pdev, 0)) -@@ -619,7 +619,8 @@ static void quirk_usb_handoff_ohci(struct pci_dev *pdev) - } - - /* software reset of the controller, preserving HcFmInterval */ -- fminterval = readl(base + OHCI_FMINTERVAL); -+ if (pdev->vendor != PCI_VENDOR_ID_AL) -+ fminterval = readl(base + OHCI_FMINTERVAL); - writel(OHCI_HCR, base + OHCI_CMDSTATUS); - - /* reset requires max 10 us delay */ -@@ -628,7 +629,8 @@ static void quirk_usb_handoff_ohci(struct pci_dev *pdev) - break; - udelay(1); - } -- writel(fminterval, base + OHCI_FMINTERVAL); -+ if (pdev->vendor != PCI_VENDOR_ID_AL) -+ writel(fminterval, base + OHCI_FMINTERVAL); - - /* Now the controller is safely in SUSPEND and nothing can wake it up */ - iounmap(base); --- -1.7.10.4 diff --git a/board/freescale/p2020ds/readme.txt b/board/freescale/p2020ds/readme.txt deleted file mode 100644 index a9735b07c5..0000000000 --- a/board/freescale/p2020ds/readme.txt +++ /dev/null @@ -1,40 +0,0 @@ -You'll need to program the files created by buildroot into the flash. -The fast way is to tftp transfer the files via one of the network interfaces. - -Alternatively you can transfer the files via serial console with an Ymodem -file transfer from your terminal program by using a "loady" command -from the u-boot prompt instead of the "tftp ..." commands stated below. -Beware that serial console file transfers are quite slow! - -1. Program the DTB to NOR flash - - => tftp ${loadaddr} p2020ds.dtb - => erase 0xeff00000 0xeff7ffff - => cp.b ${loadaddr} 0xeff00000 ${filesize} - -2. Program the kernel to NOR flash - - => tftp ${loadaddr} uImage - => erase 0xec000000 0xec3fffff - => cp.b ${loadaddr} 0xec000000 ${filesize} - -3. Program the root filesystem to NOR flash - - => tftp ${loadaddr} rootfs.jffs2 - => erase 0xec400000 0xeeffffff - => cp.b ${loadaddr} 0xec400000 ${filesize} - -4. Booting your new system - - => setenv jffs2boot 'setenv bootargs root=/dev/mtdblock4 rootfstype=jffs2 rw console=ttyS0,115200;bootm ec000000 - eff00000' - - If you want to set this boot option as default: - - => setenv bootcmd 'run jffs2boot' - => saveenv - - ...or for a single boot: - - => run jffs2boot - - You can login with user "root". diff --git a/configs/freescale_p2020ds_defconfig b/configs/freescale_p2020ds_defconfig deleted file mode 100644 index 6661acbc48..0000000000 --- a/configs/freescale_p2020ds_defconfig +++ /dev/null @@ -1,24 +0,0 @@ -# Architecture -BR2_powerpc=y -BR2_powerpc_8548=y - -# Filesystem -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_JFFS2=y - -# Linux headers same as kernel, a 3.12 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://git.freescale.com/git/cgit.cgi/ppc/sdk/linux.git/snapshot/fsl-sdk-v1.6.tar.bz2" -BR2_LINUX_KERNEL_PATCH="board/freescale/p2020ds/linux-fix-c6187597-breakage.patch" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p2020ds/linux-3.12.config" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="p2020ds" - -# Serial port config -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" From be8779da6b8ce7079d2b3ff33d48ba41ddfca27c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 22:01:51 +0100 Subject: [PATCH 1293/3392] configs/qmx6: remove defconfig The original submitter and follow-up contributors to the qmx6 defconfig no longer have the hardware available or the time/interest to update this defconfig, which currently fails to build with gcc 5.x. Due to this, this commit removes this defconfig. Signed-off-by: Thomas Petazzoni --- board/congatec/qmx6/readme.txt | 36 ---------------------------------- configs/qmx6_defconfig | 33 ------------------------------- 2 files changed, 69 deletions(-) delete mode 100644 board/congatec/qmx6/readme.txt delete mode 100644 configs/qmx6_defconfig diff --git a/board/congatec/qmx6/readme.txt b/board/congatec/qmx6/readme.txt deleted file mode 100644 index d2e0dcacbd..0000000000 --- a/board/congatec/qmx6/readme.txt +++ /dev/null @@ -1,36 +0,0 @@ -This is the minimal buildroot support for the Congatec QMX6 Qseven CoM - -conga-QMX6 is based on the freescale iMX6 SoC. For more information please -have a look at http://www.congatec.com/products/qseven/conga-qmx6.html - -The configuration is based on the currently latest kernel release from -Congatec's git repository which is based on 3.0.35. The bootloader u-boot -is preconfigured on the CPU module and does not need to be replaced. - -To build the default configuration you only have to: - - make qmx6_defconfig && make - -You will need a microSD card of sufficient size and the first or only -partition configured as Linux type. - -To transfer the system to the card do: - - $ sudo dd if=output/images/rootfs.ext2 of=/dev/sdX1 - -You can optionally extend the filesystem size to the whole partition: - - $ sudo resize2fs /dev/sdX1 - -You can also update the card image without completely rewriting it: - - $ sudo mount /dev/sdX1 /mnt - $ sudo tar xf output/images/rootfs.tar -C /mnt - $ sudo umount /mnt - -Connect a terminal program to the rs232 connector marked "CONSOLE" -with baudrate set to 115200, insert the microSD card into the socket -on the CPU module and power the board to watch the system boot. - -Booting from the SD card slot on the base board is currently not -supported. diff --git a/configs/qmx6_defconfig b/configs/qmx6_defconfig deleted file mode 100644 index cb80cad46d..0000000000 --- a/configs/qmx6_defconfig +++ /dev/null @@ -1,33 +0,0 @@ -BR2_arm=y -BR2_cortex_a9=y -# Linux headers same as kernel, a 3.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" - -# Notice you need a recent version of u-boot (with DT support) to be able -# to boot this kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.congatec.com/arm/imx6_kernel_3.14.git" -# Last version of branch cgt_qmx6_3.14.28_1.0.0 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="105820d6bd251deb49c3dd3f71fa0d76adce97c7" -BR2_LINUX_KERNEL_DEFCONFIG="qmx6" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-qmx6" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# Change boardname depending of your product number -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="cgt_qmx6_pn016103" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://git.congatec.com/arm/qmx6_uboot.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="4d3b64e93064ed3d97ef7d91ff0f61a693a460fc" -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.pn016103.imx" - -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_3=y - -BR2_PACKAGE_HOST_UBOOT_TOOLS=y From 561859a533c1c692383530f71a011babe3b12128 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 7 Nov 2016 07:51:32 +0100 Subject: [PATCH 1294/3392] ser2net: bump to version 3.1 Version 3.1 adds librt to the list of required libraries. Fixes: http://autobuild.buildroot.net/results/7f1/7f152e2255f8d2cf9378812998fe9a239319c116 Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/ser2net/ser2net.hash | 2 +- package/ser2net/ser2net.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ser2net/ser2net.hash b/package/ser2net/ser2net.hash index 3e62f1c3f2..f3b5692bfc 100644 --- a/package/ser2net/ser2net.hash +++ b/package/ser2net/ser2net.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 e8aaf6c629c78bbc424e8a6810758061f9c68a4ffea0faf7c5031de26ce1c3e1 ser2net-3.0.tar.gz +sha256 ad0db28e2a4b79a6d4e4b38ec1e50a22cc80fbbb4d7cad0a42f651457b00475e ser2net-3.1.tar.gz diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk index c4dcaf31fa..9a4a8d561a 100644 --- a/package/ser2net/ser2net.mk +++ b/package/ser2net/ser2net.mk @@ -4,7 +4,7 @@ # ################################################################################ -SER2NET_VERSION = 3.0 +SER2NET_VERSION = 3.1 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPLv2+ SER2NET_LICENSE_FILES = COPYING From 1832f13b6304152b7fe47547cd2870c695a59d74 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 7 Nov 2016 07:51:33 +0100 Subject: [PATCH 1295/3392] DEVELOPERS: add Yegor Yefremov for the ser2net package Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3a9c00d73c..bade9f4eb5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1647,6 +1647,7 @@ F: package/modem-manager/ F: package/nuttcp/ F: package/parted/ F: package/python* +F: package/ser2net/ F: package/socketcand/ F: package/qt5/qt5serialbus/ F: package/sdparm/ From 701f0e15ea8d10113fa6ddfd7bcfc0cfe9fd8520 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 7 Nov 2016 12:51:02 +0000 Subject: [PATCH 1296/3392] sqlite: bump version to 3150100 (3.15.1) Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/sqlite/sqlite.hash | 4 ++-- package/sqlite/sqlite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index b0418af0f7..bb24f94efc 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,4 +1,4 @@ # From http://www.sqlite.org/download.html -sha1 b34cb4ee9710368598c62df0222f5c24dfc9c860 sqlite-autoconf-3150000.tar.gz +sha1 47404fe5c43936160ad0e90bddedc99367da7a9b sqlite-autoconf-3150100.tar.gz # Calculated based on the hash above -sha256 77162da9b4a0336d7e77d5252b690662850f62b47c12d9125f74ab9de78ded27 sqlite-autoconf-3150000.tar.gz +sha256 5dfa89b7697ee3c2ac7b44e8e157e7f204bf999c866afcaa8bb1c7ff656ae2c5 sqlite-autoconf-3150100.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 0a5c1bb8f9..3f44f82b17 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3150000 +SQLITE_VERSION = 3150100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2016 SQLITE_LICENSE = Public domain From 24fa2acca61ec9d82eebcb2e538cc98b05ebe260 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 7 Nov 2016 10:22:45 +0000 Subject: [PATCH 1297/3392] lvm2: bump version to 2.02.167 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 a269eb6d38..edc9360301 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 8bebe9b474f791b5edf5366b0bd24861fbbaf8a83afa2a9e2a8e3917e05e4ecbf6877f018be03ffb4e9b4c8832208264165b85182bf79a07661adf35128b4a21 LVM2.2.02.166.tgz +sha512 492b2f5ca462dbbb8e182befdb6ca60c7a31b16a39f59a38cabdcd0996d9e2c49ae56a2289def80b89da738176ac55cf13cbefd401feb7a1e3a6ef9a4c267f2b LVM2.2.02.167.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index d76cdd2caf..dd574218f7 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.166 +LVM2_VERSION = 2.02.167 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES From adf31efcd433712f546f2a3bcdb18abe650db27b Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Mon, 7 Nov 2016 17:54:00 +0100 Subject: [PATCH 1298/3392] board/boundarydevices: fix boot partition number in bootscript It was previously hardcoded to use the 1st partition although the bootpart variable was used to download kernel/dtb from any partition. Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- board/boundarydevices/common/6x_bootscript.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/board/boundarydevices/common/6x_bootscript.txt b/board/boundarydevices/common/6x_bootscript.txt index e8a08aa8ae..2fc687aff4 100644 --- a/board/boundarydevices/common/6x_bootscript.txt +++ b/board/boundarydevices/common/6x_bootscript.txt @@ -92,14 +92,12 @@ fi setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc" -bpart=1 - if test "sata" = "${dtype}" ; then - setenv bootargs "${bootargs} root=/dev/sda${bpart}" ; + setenv bootargs "${bootargs} root=/dev/sda${bootpart}" ; elif test "usb" = "${dtype}" ; then - setenv bootargs "${bootargs} root=/dev/sda${bpart}" ; + setenv bootargs "${bootargs} root=/dev/sda${bootpart}" ; else - setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bpart}" + setenv bootargs "${bootargs} root=/dev/mmcblk${disk}p${bootpart}" fi if itest.s "x" != "x${disable_giga}" ; then From 22dc3b6b64ead9b5ddc0daa99e01f045e0623836 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 7 Nov 2016 15:18:14 +0000 Subject: [PATCH 1299/3392] net-tools: fix field with incomplete type error Update 0002 patch to match the one sent as a pull request. The previous one introduced a new problem that has been addressed in the new version. Some Linux headers included in certain toolchains may not have an updated linux/if_tunnel.h which includes linux/ip.h, so we need to include it unconditionally otherwise linux/if_tunnel.h will use the struct iphdr before being defined and the compilation will fail in this way: In file included from iptunnel.c:33:0: /usr/include/linux/if_tunnel.h:37:16: error: field 'iph' has incomplete type struct iphdr iph; ^ Pull request URL: https://sourceforge.net/p/net-tools/code/merge-requests/4/ Fixes: http://autobuild.buildroot.net/results/34f/34f9b10ef6a613057e8f6457d8a0a2fa142ad123/ Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- ...tunnel.c-do-not-include-netinet-ip.h.patch | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch b/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch index 002c9da639..a8658c4fec 100644 --- a/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch +++ b/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch @@ -1,4 +1,4 @@ -From 7a9a369d9de784791a2ab384877aab5ff3801d4e Mon Sep 17 00:00:00 2001 +From eec38a200357b195efbb23bb645ab721c040f246 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 3 Nov 2016 12:59:39 +0000 Subject: [PATCH] iptunnel.c: do not include netinet/ip.h @@ -29,19 +29,32 @@ of that the compilation fails due to a struct redefinition. The problem can be solved by just not including netinet/ip.h. +However, some Linux headers included in certain toolchains may not have +an updated linux/if_tunnel.h which includes linux/ip.h, so we need to +include it unconditionally otherwise linux/if_tunnel.h will use the +struct iphdr before being defined and the compilation will also fail in +this way: + +================================ +In file included from iptunnel.c:33:0: +/usr/include/linux/if_tunnel.h:37:16: error: field 'iph' has incomplete type + struct iphdr iph; + ^ +================================ + Upstream status: merge request sent -https://sourceforge.net/p/net-tools/code/merge-requests/3/ +https://sourceforge.net/p/net-tools/code/merge-requests/4/ Signed-off-by: Vicente Olivert Riera --- - iptunnel.c | 1 - - 1 file changed, 1 deletion(-) + iptunnel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptunnel.c b/iptunnel.c -index 3fe1b84..247ae10 100644 +index 3fe1b84..e2ec2d8 100644 --- a/iptunnel.c +++ b/iptunnel.c -@@ -26,7 +26,6 @@ +@@ -26,11 +26,11 @@ #include #include #include @@ -49,6 +62,11 @@ index 3fe1b84..247ae10 100644 #include #include #include + #include ++#include + #include + + #include "config.h" -- 2.10.1 From 100ed2c05a47b239b383a2f83f1ffc8bb70b86f9 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 7 Nov 2016 12:17:24 +0100 Subject: [PATCH 1300/3392] wpa_supplicant: add mesh support (IEEE 80211s) Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/wpa_supplicant/Config.in | 7 +++++++ package/wpa_supplicant/wpa_supplicant.mk | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 454541fdce..9250a3b200 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -45,6 +45,13 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY help Enable support for Wi-Fi Display +config BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING + bool "Enable mesh networking" + depends on BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT + help + Enable support for open and secured mesh networking + (IEEE 802.11s) + config BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN bool "Enable autoscan" help diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 3c3317b122..9c8414b568 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -73,6 +73,11 @@ ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_WIFI_DISPLAY endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING),y) +WPA_SUPPLICANT_CONFIG_SET += CONFIG_MESH +WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_IEEE80211W +endif + ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN),y) WPA_SUPPLICANT_CONFIG_ENABLE += \ CONFIG_AUTOSCAN_EXPONENTIAL \ From a4cbf58f836c8e46f8cdbc9e1eabe1d0b606ce6a Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Mon, 7 Nov 2016 17:05:12 +0100 Subject: [PATCH 1301/3392] busybox: allow the user to set the telnetd options Source /etc/default/telnet to make it possible to override the telnetd arguments. For example a user may want to set an alternative port. Signed-off-by: Michael Walle Signed-off-by: Thomas Petazzoni --- package/busybox/S50telnet | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/busybox/S50telnet b/package/busybox/S50telnet index 47e2b63e19..82952b8cb8 100755 --- a/package/busybox/S50telnet +++ b/package/busybox/S50telnet @@ -3,10 +3,13 @@ # Start telnet.... # +TELNETD_ARGS=-F +[ -r /etc/default/telnet ] && . /etc/default/telnet + start() { printf "Starting telnetd: " start-stop-daemon -S -q -m -b -p /var/run/telnetd.pid \ - -x /usr/sbin/telnetd -- -F + -x /usr/sbin/telnetd -- $TELNETD_ARGS [ $? = 0 ] && echo "OK" || echo "FAIL" } From 177bbf65669cff25eaff5e0dfbf87ae161ab8803 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 7 Nov 2016 12:55:27 -0200 Subject: [PATCH 1302/3392] configs/imx23evk: Add support for imx23evk Add support for imx23evk board. For more information about this board, please check: http://www.nxp.com/products/software-and-tools/software-development-tools/i.mx-software-and-tools/i.mx23-evaluation-kit:IMX23EVK Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/freescale/imx23evk/readme.txt | 48 +++++++++++++++++++++++++++++ configs/imx23evk_defconfig | 34 ++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 board/freescale/imx23evk/readme.txt create mode 100644 configs/imx23evk_defconfig diff --git a/board/freescale/imx23evk/readme.txt b/board/freescale/imx23evk/readme.txt new file mode 100644 index 0000000000..6574577dcc --- /dev/null +++ b/board/freescale/imx23evk/readme.txt @@ -0,0 +1,48 @@ +************************** +Freescale i.MX23 EVK board +************************** + +This file documents the Buildroot support for the Freescale i.MX23 EVK board. + +Build +===== + +First, configure Buildroot for your i.MX23 EVK board: + + make imx23evk_defconfig + +Build all components: + + make + +You will find in output/images/ directory the following files: + - imx23-evk.dtb + - rootfs.tar + - u-boot.sd + - zImage + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Then, run the following command: + +*** WARNING! The command will destroy all the card content. Use with care! *** + + sudo dd if=output/images/sdcard.img of=/dev/ + +Boot the i.MX23 EVK board +========================= + +- Put the Boot Mode Select jumper as 1 0 0 1 so that it can boot + from the SD card +- Insert the SD card in the SD Card slot of the board; +- Connect an RS232 UART cable to the Debug UART Port and connect using a + terminal emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! diff --git a/configs/imx23evk_defconfig b/configs/imx23evk_defconfig new file mode 100644 index 0000000000..fe0744036d --- /dev/null +++ b/configs/imx23evk_defconfig @@ -0,0 +1,34 @@ +# architecture +BR2_arm=y +BR2_arm926t=y + +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y + +# system +BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + +# kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" +BR2_LINUX_KERNEL_DEFCONFIG="mxs" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-evk" + +# bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx23evk" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_FORMAT_SD=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT4=y + +# To generate SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" From e3f6475801067c8d0ef0c90a56a357105c5faa34 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 6 Nov 2016 20:43:27 -0200 Subject: [PATCH 1303/3392] freescale: Create the board/freescale/common/imx/ directory In order to have a better hierarchy for the genimage scripts used by NXP mx25, mx51, mx53, mx6, mx7 SoCs, let's place them inside the board/freescale/common/imx/ directory. This helps in creating a more natural separation between the mxs scripts that are placed inside the board/freescale/common/mxs/ directory. Suggested-by: Thomas Petazzoni Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/freescale/common/{ => imx}/genimage.cfg.template | 0 board/freescale/common/{ => imx}/post-image.sh | 2 +- board/freescale/imx25pdk/readme.txt | 2 +- board/freescale/imx51evk/readme.txt | 2 +- board/freescale/imx6sabre/readme.txt | 2 +- board/freescale/imx6ulevk/readme.txt | 2 +- board/freescale/imx7dsdb/readme.txt | 2 +- board/technexion/imx6ulpico/readme.txt | 2 +- configs/freescale_imx6dlsabreauto_defconfig | 2 +- configs/freescale_imx6dlsabresd_defconfig | 2 +- configs/freescale_imx6qsabreauto_defconfig | 2 +- configs/freescale_imx6qsabresd_defconfig | 2 +- configs/freescale_imx6sololiteevk_defconfig | 2 +- configs/freescale_imx6sxsabresd_defconfig | 2 +- configs/freescale_imx6ulevk_defconfig | 2 +- configs/freescale_imx7dsabresd_defconfig | 2 +- configs/imx6ulpico_defconfig | 2 +- configs/mx25pdk_defconfig | 2 +- configs/mx51evk_defconfig | 2 +- configs/mx53loco_defconfig | 2 +- configs/warp7_defconfig | 2 +- configs/warpboard_defconfig | 2 +- 22 files changed, 21 insertions(+), 21 deletions(-) rename board/freescale/common/{ => imx}/genimage.cfg.template (100%) rename board/freescale/common/{ => imx}/post-image.sh (94%) diff --git a/board/freescale/common/genimage.cfg.template b/board/freescale/common/imx/genimage.cfg.template similarity index 100% rename from board/freescale/common/genimage.cfg.template rename to board/freescale/common/imx/genimage.cfg.template diff --git a/board/freescale/common/post-image.sh b/board/freescale/common/imx/post-image.sh similarity index 94% rename from board/freescale/common/post-image.sh rename to board/freescale/common/imx/post-image.sh index 7d48550a5a..9e4da82dc7 100755 --- a/board/freescale/common/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -35,7 +35,7 @@ main() local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" sed -e "s/%FILES%/${FILES}/" \ - board/freescale/common/genimage.cfg.template > ${GENIMAGE_CFG} + board/freescale/common/imx/genimage.cfg.template > ${GENIMAGE_CFG} rm -rf "${GENIMAGE_TMP}" diff --git a/board/freescale/imx25pdk/readme.txt b/board/freescale/imx25pdk/readme.txt index df7c617264..1aece6c9b3 100644 --- a/board/freescale/imx25pdk/readme.txt +++ b/board/freescale/imx25pdk/readme.txt @@ -40,7 +40,7 @@ command as root: *** WARNING! This will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/freescale/common/genimage.cfg.template. +board/freescale/common/imx/genimage.cfg.template. Boot the i.MX25 PDK board ========================= diff --git a/board/freescale/imx51evk/readme.txt b/board/freescale/imx51evk/readme.txt index bf739fd659..d67a3fd724 100644 --- a/board/freescale/imx51evk/readme.txt +++ b/board/freescale/imx51evk/readme.txt @@ -40,7 +40,7 @@ command as root: *** WARNING! This will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/freescale/common/genimage.cfg.template. +board/freescale/common/imx/genimage.cfg.template. Boot the i.MX51 EVK board ========================= diff --git a/board/freescale/imx6sabre/readme.txt b/board/freescale/imx6sabre/readme.txt index e409d8f190..a1bd82fdc7 100644 --- a/board/freescale/imx6sabre/readme.txt +++ b/board/freescale/imx6sabre/readme.txt @@ -71,7 +71,7 @@ command as root: *** WARNING! The script will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/freescale/common/genimage.cfg.template. +board/freescale/common/imx/genimage.cfg.template. Boot the SABRE board ==================== diff --git a/board/freescale/imx6ulevk/readme.txt b/board/freescale/imx6ulevk/readme.txt index 98de2775db..25b95fec52 100644 --- a/board/freescale/imx6ulevk/readme.txt +++ b/board/freescale/imx6ulevk/readme.txt @@ -43,7 +43,7 @@ command as root: *** WARNING! This will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/freescale/common/genimage.cfg.template. +board/freescale/common/imx/genimage.cfg.template. Boot the i.MX6UL EVK board ========================= diff --git a/board/freescale/imx7dsdb/readme.txt b/board/freescale/imx7dsdb/readme.txt index 9aeeb166d8..c6030f6965 100644 --- a/board/freescale/imx7dsdb/readme.txt +++ b/board/freescale/imx7dsdb/readme.txt @@ -40,7 +40,7 @@ command as root: *** WARNING! This will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/freescale/common/genimage.cfg.template. +board/freescale/common/imx/genimage.cfg.template. Boot the i.MX7D SDB board ========================= diff --git a/board/technexion/imx6ulpico/readme.txt b/board/technexion/imx6ulpico/readme.txt index a7c3a445d0..7eab3f6b86 100644 --- a/board/technexion/imx6ulpico/readme.txt +++ b/board/technexion/imx6ulpico/readme.txt @@ -46,7 +46,7 @@ command as root: *** WARNING! This will destroy all the card content. Use with care! *** For details about the medium image layout, see the definition in -board/freescale/common/genimage.cfg.template. +board/freescale/common/imx/genimage.cfg.template. Boot the i.MX6UL Pico board ========================= diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index ed5f67cab2..1cf5fee0fd 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" # filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 0cbe974477..904f0a2442 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" # filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y # required tools to create the microSD image diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 9ae2f813e7..64efd42195 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" # filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index 913a724212..962c274d60 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" # filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig index 79ebcb83c2..bf0b9e5f2d 100644 --- a/configs/freescale_imx6sololiteevk_defconfig +++ b/configs/freescale_imx6sololiteevk_defconfig @@ -18,7 +18,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk" # filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y # required tools to create the microSD image diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index fed1a3e08a..9b5cdb85e4 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" # filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y # required tools to create the microSD image diff --git a/configs/freescale_imx6ulevk_defconfig b/configs/freescale_imx6ulevk_defconfig index d033b9950c..3c5a9099a0 100644 --- a/configs/freescale_imx6ulevk_defconfig +++ b/configs/freescale_imx6ulevk_defconfig @@ -31,6 +31,6 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # filesystem / image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 4bedef10be..97d3cde16e 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -33,4 +33,4 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" diff --git a/configs/imx6ulpico_defconfig b/configs/imx6ulpico_defconfig index 71277d9b82..88604a6627 100644 --- a/configs/imx6ulpico_defconfig +++ b/configs/imx6ulpico_defconfig @@ -45,6 +45,6 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # filesystem / image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/mx25pdk_defconfig b/configs/mx25pdk_defconfig index 645fe8a13a..65a6d12f56 100644 --- a/configs/mx25pdk_defconfig +++ b/configs/mx25pdk_defconfig @@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index 1fca282536..db82a36eaa 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index 94ac818d1b..7597ae9ca7 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -14,7 +14,7 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y # Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 31251f4645..a55a5049cf 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -38,7 +38,7 @@ BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y # Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y diff --git a/configs/warpboard_defconfig b/configs/warpboard_defconfig index 5e9c0514b7..531a8783b1 100644 --- a/configs/warpboard_defconfig +++ b/configs/warpboard_defconfig @@ -42,7 +42,7 @@ BR2_PACKAGE_HOST_DFU_UTIL=y BR2_PACKAGE_HOST_IMX_USB_LOADER=y # Filesystem -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y From 4c8e573fcb98f39b7fb3165d45dcb99f244eec4d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Nov 2016 16:23:53 +0100 Subject: [PATCH 1304/3392] ffmpeg: disable on Microblaze Building ffmpeg on Microblaze triggers the gcc PR71124, which causes an infinite loop in the compiler. This causes numerous timeouts in the autobuilders, such as, just over the last two days: http://autobuild.buildroot.net/results/b47fb2ae810ada475fef215c1efb54a9891fef6f http://autobuild.buildroot.net/results/a8a1dfb7d4a7a6babe665214030e2245d572d1d3 http://autobuild.buildroot.net/results/248c58cd20686497c4dabc1a19b2c8c7c76b33ab http://autobuild.buildroot.net/results/3641092f62551bd41c24eafdce46804f9551b761 http://autobuild.buildroot.net/results/f2f65106c3e9dcfd546d5dad7cd0f7cd7145420c http://autobuild.buildroot.net/results/c45f085ca421b12195fe6a9298b3b3a9cb761360 http://autobuild.buildroot.net/results/349de9b8251b9b72ace595920303e45497833c29 Signed-off-by: Thomas Petazzoni --- package/ffmpeg/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index a3ca1054d9..e8135953b2 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS bool # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 # No support for ARMv7-M in the ARM assembly logic - default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M + # Microblaze build affected by gcc PR71124 (infinite loop) + default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M && !BR2_microblaze menuconfig BR2_PACKAGE_FFMPEG bool "ffmpeg" From c30dd540c4a82ea527fe9f5dd94443d9dc0c4919 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Nov 2016 17:32:13 +0100 Subject: [PATCH 1305/3392] assimp: disable package with the ADI Blackfin toolchain assimp fails to build with an internal compiler error with the ADI Blackfin toolchain, while it builds fine with the mainline gcc for Blackfin. So let's disable this package (which has no reverse dependencies that select it) for the ADI Blackfin toolchain. Fixes: http://autobuild.buildroot.net/results/394e3545a7bbe5d6fbaf4c97f0a3eb51c7d57076 Signed-off-by: Thomas Petazzoni --- package/assimp/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/assimp/Config.in b/package/assimp/Config.in index 93020f7238..8fa6429da0 100644 --- a/package/assimp/Config.in +++ b/package/assimp/Config.in @@ -4,6 +4,11 @@ config BR2_PACKAGE_ASSIMP # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that # cause an infinite loop in gcc when building this package. depends on !BR2_microblaze + # The ADI Blackfin toolchain does not build assimp properly, + # fails with "internal compiler error: in simplify_subreg, at + # simplify-rtx.c:5001". It builds fine with a mainline gcc for + # Blackfin. + depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_ZLIB help From 187e5bc92b63eb652e326364eaf1fd874fc1d170 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Nov 2016 19:18:50 +0100 Subject: [PATCH 1306/3392] libmpeg2: add patch to fix build on ARMv7-M This commit adds a patch to libmpeg2 that improves the ARM detection to not use the optimized ARM code on ARMv7-M architectures. Fixes: http://autobuild.buildroot.net/results/9c44de035ce81c6cc8a92ea8bad4def25cd99cd0 Signed-off-by: Thomas Petazzoni --- package/libmpeg2/0003-fix-arm-detection.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/libmpeg2/0003-fix-arm-detection.patch diff --git a/package/libmpeg2/0003-fix-arm-detection.patch b/package/libmpeg2/0003-fix-arm-detection.patch new file mode 100644 index 0000000000..69ec4547de --- /dev/null +++ b/package/libmpeg2/0003-fix-arm-detection.patch @@ -0,0 +1,39 @@ +Improve the ARM detection to work on Thumb-only architecture + +The ARM-specific assembly code doesn't build on Thumb-only +architectures such as ARMv7-M, but the configure script assumes that +if the host tuple is arm*, then it can build and use the ARM optimized +code. + +This patch improves the configure.ac detection logic, by building one +of the instruction of the optimized assembly code, and using this to +decide whether or not the optimizations should be enabled. + +Signed-off-by: Thomas Petazzoni + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -101,8 +101,10 @@ + alpha*) + AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);; + arm*) +- arm_conditional=: +- AC_DEFINE([ARCH_ARM],,[ARM architecture]);; ++ AC_TRY_LINK([], [asm(".syntax divided\nstmfd sp!,{r4-r11,lr}")], ++ [AC_DEFINE([ARCH_ARM],,[ARM architecture]) ++ use_arm_optimization=yes], ++ [use_arm_optimization=no]) + esac + elif test x"$CC" = x"tendracc"; then + dnl TenDRA portability checking compiler +@@ -122,7 +124,7 @@ + esac + fi + +-AM_CONDITIONAL(ARCH_ARM, ${arm_conditional}) ++AM_CONDITIONAL(ARCH_ARM, test "${use_arm_optimization}" = "yes") + + dnl Checks for libtool - this must be done after we set cflags + AC_LIBTOOL_WIN32_DLL From 2befc2c736ae175ed6bad34aae42806b1de0df49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 8 Nov 2016 00:02:32 +0100 Subject: [PATCH 1307/3392] package/ccache: bump to version 3.3.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note, that version 3.3.3 of ccache fixes a bug [1] where the Linux kernel image is the same even after changing the source code and rebuilding it. [1] https://github.com/ccache/ccache/issues/136 Signed-off-by: Jörg Krause Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/ccache/ccache.hash | 4 ++-- package/ccache/ccache.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index fdd0ddfb4f..bde53f794d 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,2 +1,2 @@ -# Verified key https://samba.org/ftp/ccache/ccache-3.3.2.tar.xz.asc - sha256 computed locally -sha256 907685cb23d8f82074b8d1a9b4ebabb36914d151ac7b96a840c68c08d1a14530 ccache-3.3.2.tar.xz +# Verified key https://samba.org/ftp/ccache/ccache-3.3.3.tar.xz.asc - sha256 computed locally +sha256 3b02a745da1cfa9eb438af7147e0fd3545e2f6163de9e5b07da86f58859f04ec ccache-3.3.3.tar.xz diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 63907c25f5..f174a5d01c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 3.3.2 +CCACHE_VERSION = 3.3.3 CCACHE_SITE = https://samba.org/ftp/ccache CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPLv3+, others From 64904f0f6d691cfea5ae1c8f58e2d61aac0684c2 Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Tue, 8 Nov 2016 14:09:37 +1100 Subject: [PATCH 1308/3392] mpv: fix build on powerpc64 w/ altivec Fixes http://autobuild.buildroot.net/results/77f/77f00633b0b25f001cd4ca54ed3a12aee301c287 Add a patch to work around a name collision between bool and altivec's bool apparent when using sdl2. Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- .../0002-Fix-build-on-powerpc64-altivec.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/mpv/0002-Fix-build-on-powerpc64-altivec.patch diff --git a/package/mpv/0002-Fix-build-on-powerpc64-altivec.patch b/package/mpv/0002-Fix-build-on-powerpc64-altivec.patch new file mode 100644 index 0000000000..6db911d7cb --- /dev/null +++ b/package/mpv/0002-Fix-build-on-powerpc64-altivec.patch @@ -0,0 +1,28 @@ +Subject: [PATCH] Work around bool type redefinition by altivec + +On powerpc64le, the SDL header from SDL2 may include altivec.h and this +(combined with -std=c99) will cause a compile failure due to bool being +redefined as a vector type. + +Re-include stdbool.h after SDL.h to restore the normal bool type. + +Signed-off-by: Sam Bobroff +--- + audio/out/ao_sdl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c +index d9d0062..0cb80d6 100644 +--- a/audio/out/ao_sdl.c ++++ b/audio/out/ao_sdl.c +@@ -29,6 +29,7 @@ + #include "osdep/timer.h" + + #include ++#include + + struct priv + { +-- +2.10.0.297.gf6727b0 + From d9a6d70283442f78a965b6c6d9713c4377d90de8 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 9 Nov 2016 18:40:44 +0200 Subject: [PATCH 1309/3392] libxslt: correct homepage link Link to the actual webpage of libxslt, not to the xslt spec page. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libxslt/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libxslt/Config.in b/package/libxslt/Config.in index ee2f66c36e..dfe5b99f04 100644 --- a/package/libxslt/Config.in +++ b/package/libxslt/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBXSLT to describe how the document is transformed into another XML document that uses the formatting vocabulary. - http://www.w3.org/TR/xslt + http://xmlsoft.org/xslt/ From 3ded6e5e3909f1a519abbf58f386f31eba7fc806 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 9 Nov 2016 21:01:56 +0200 Subject: [PATCH 1310/3392] libxslt: add upstream security fix Fixes CVE-2016-4738 - heap overread. https://www.debian.org/security/2016/dsa-3709 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...erread-in-xsltFormatNumberConversion.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch diff --git a/package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch b/package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch new file mode 100644 index 0000000000..1ad494a6c0 --- /dev/null +++ b/package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch @@ -0,0 +1,35 @@ +From eb1030de31165b68487f288308f9d1810fed6880 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Fri, 10 Jun 2016 14:23:58 +0200 +Subject: [PATCH] Fix heap overread in xsltFormatNumberConversion + +An empty decimal-separator could cause a heap overread. This can be +exploited to leak a couple of bytes after the buffer that holds the +pattern string. + +Found with afl-fuzz and ASan. + +Signed-off-by: Baruch Siach +--- +Patch status: upstream commit eb1030de311 + + libxslt/numbers.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libxslt/numbers.c b/libxslt/numbers.c +index d1549b46ca26..e78c46b6357b 100644 +--- a/libxslt/numbers.c ++++ b/libxslt/numbers.c +@@ -1090,7 +1090,8 @@ xsltFormatNumberConversion(xsltDecimalFormatPtr self, + } + + /* We have finished the integer part, now work on fraction */ +- if (xsltUTF8Charcmp(the_format, self->decimalPoint) == 0) { ++ if ( (*the_format != 0) && ++ (xsltUTF8Charcmp(the_format, self->decimalPoint) == 0) ) { + format_info.add_decimal = TRUE; + the_format += xsltUTF8Size(the_format); /* Skip over the decimal */ + } +-- +2.10.2 + From d13b1ce707fb609e53164e1ae4281e1e3e7c84ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Wed, 9 Nov 2016 17:38:23 +0100 Subject: [PATCH 1311/3392] configs: freescale_imx31_3stack: bump kernel version to 4.1.15_2.0.0_ga MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch to the kernel of release 4.1.15_2.0.0_ga, as it builds properly with gcc 5.x, which is now the default. We add a linux config fragment to disable the framebuffer, to repair the build for imx_v6_v7_defconfig. Suggested-by: Thomas Petazzoni Signed-off-by: Vincent Stehlé Signed-off-by: Julien Olivain Tested-by: Julien Olivain Cc: Fabio Estevam [Thomas: adjust syntax in fragment.] Signed-off-by: Thomas Petazzoni --- board/freescale/imx31_3stack/linux.fragment | 1 + configs/freescale_imx31_3stack_defconfig | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 board/freescale/imx31_3stack/linux.fragment diff --git a/board/freescale/imx31_3stack/linux.fragment b/board/freescale/imx31_3stack/linux.fragment new file mode 100644 index 0000000000..beb6b46f2e --- /dev/null +++ b/board/freescale/imx31_3stack/linux.fragment @@ -0,0 +1 @@ +# CONFIG_FB_MXS is not set diff --git a/configs/freescale_imx31_3stack_defconfig b/configs/freescale_imx31_3stack_defconfig index bf1afad13c..0476fc1b59 100644 --- a/configs/freescale_imx31_3stack_defconfig +++ b/configs/freescale_imx31_3stack_defconfig @@ -3,18 +3,18 @@ BR2_arm=y BR2_arm1136jf_s=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 3.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15=y +# Linux headers same as kernel, a 4.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -# Note: sadly the Linux kernel will not boot on the i.MX31 PDK, starting with -# v3.16 and at least up to v4.0-rc4; this is why we use v3.15.y here. -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.10" +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx31_3stack/linux.fragment" BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_INITRAMFS=y From 240564a6933d9300473b5ced02d2f6f2a2fa4cd9 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 9 Nov 2016 16:16:57 +0000 Subject: [PATCH 1312/3392] arch/Config.in.mips: add support for XBurst cores The Ingenic XBurst is a MIPS32R2 microprocessor. It has a bug in the FPU that can generate incorrect results in certain cases. The problem shows up when you have several fused madd instructions in sequence with dependant operands. Using the -mno-fused-madd option prevents gcc from emitting these instructions. This patch adds changes to the toolchain wrapper to use that option. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- arch/Config.in.mips | 14 ++++++++++++++ toolchain/toolchain-wrapper.c | 3 +++ toolchain/toolchain-wrapper.mk | 5 +++++ 3 files changed, 22 insertions(+) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 3662fedca8..1021a579b9 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -63,6 +63,19 @@ config BR2_mips_p5600 bool "P5600" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R5 +config BR2_mips_xburst + bool "XBurst" + depends on !BR2_ARCH_IS_64 + select BR2_MIPS_CPU_MIPS32R2 + help + The Ingenic XBurst is a MIPS32R2 microprocessor. It has a + bug in the FPU that can generate incorrect results in + certain cases. The problem shows up when you have several + fused madd instructions in sequence with dependant + operands. This requires the -mno-fused-madd compiler option + to be used in order to prevent emitting these instructions. + + See http://www.ingenic.com/en/?xburst.html config BR2_mips_64 bool "Generic MIPS64" depends on BR2_ARCH_IS_64 @@ -137,6 +150,7 @@ config BR2_GCC_TARGET_ARCH default "m5101" if BR2_mips_m5101 default "m6201" if BR2_mips_m6201 default "p5600" if BR2_mips_p5600 + default "mips32r2" if BR2_mips_xburst default "mips64" if BR2_mips_64 default "mips64r2" if BR2_mips_64r2 default "mips64r5" if BR2_mips_64r5 diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 925d01394c..d59629b048 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -66,6 +66,9 @@ static char *predef_args[] = { #ifdef BR_OMIT_LOCK_PREFIX "-Wa,-momit-lock-prefix=yes", #endif +#ifdef BR_NO_FUSED_MADD + "-mno-fused-madd", +#endif #ifdef BR_BINFMT_FLAT "-Wl,-elf2flt", #endif diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index e7aa5fb829..c7b50195d3 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -26,6 +26,11 @@ ifeq ($(BR2_x86_x1000),y) TOOLCHAIN_WRAPPER_ARGS += -DBR_OMIT_LOCK_PREFIX endif +# Avoid FPU bug on XBurst CPUs +ifeq ($(BR2_mips_xburst),y) +TOOLCHAIN_WRAPPER_ARGS += -DBR_NO_FUSED_MADD +endif + ifeq ($(BR2_CCACHE_USE_BASEDIR),y) TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"' endif From 2ab26ce601f46abdc72cfceb3c752d92b67146b7 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 9 Nov 2016 16:16:58 +0000 Subject: [PATCH 1313/3392] ci20_defconfig: use XBurst CPU Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- configs/ci20_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index bd30cbd423..ecf3007a37 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -1,6 +1,6 @@ # architecture BR2_mipsel=y -BR2_mips_32r2=y +BR2_mips_xburst=y # BR2_MIPS_SOFT_FLOAT is not set # Linux headers same as kernel, a 3.18 series From 0aff35482ca469288d038437e4760741043e5ccc Mon Sep 17 00:00:00 2001 From: Jan Viktorin Date: Wed, 9 Nov 2016 14:27:39 +0100 Subject: [PATCH 1314/3392] olimex_a20_olinuxino_lime2: bump U-Boot to 2016.05 The patch fixes build by GCC 5 (unsupported by the older U-Boot). Signed-off-by: Jan Viktorin Reported-by: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 57dda72f29..87fc674b90 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -25,7 +25,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05" BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y From 2a6001f17aba3f405f1aa95b3d95a553761d9b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 9 Nov 2016 10:25:07 +0100 Subject: [PATCH 1315/3392] python: fix double format detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Python is not able to detect if compiler double representation is compliant with IEE754: checking whether C doubles are little-endian IEEE 754 binary64... no checking whether C doubles are big-endian IEEE 754 binary64... no checking whether C doubles are ARM mixed-endian IEEE 754 binary64... no Accordingly 'legacy' mode isused. It is possible to check this at runtime by check if 'sys.float_repr_style' contains 'short' or 'legacy'. Calculus correctness is not garanteed with 'legacy'. Problem is better described here: http://stackoverflow.com/questions/29920294/what-causes-pythons-float-repr-style-to-use-legacy https://bugs.python.org/issue7117 However, all gcc architecture use a representation compliant with IEE754. So, we can enable it unconditionnaly. Signed-off-by: Jérôme Pouiller [Thomas: adjust condition to avoid usage of qstrip, suggested by Baruch.] Signed-off-by: Thomas Petazzoni --- package/python/python.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python/python.mk b/package/python/python.mk index cc65376837..cfd5a0af12 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -140,6 +140,13 @@ PYTHON_CONF_ENV += \ ac_cv_prog_HAS_HG=/bin/false \ ac_cv_prog_SVNVERSION=/bin/false +# GCC is always compliant with IEEE754 +ifeq ($(BR2_ENDIAN),"LITTLE") +PYTHON_CONF_ENV += ac_cv_little_endian_double=yes +else +PYTHON_CONF_ENV += ac_cv_big_endian_double=yes +endif + PYTHON_CONF_OPTS += \ --without-cxx-main \ --without-doc-strings \ From 7be691623a27087cc89c169e21466a0e66a75eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 9 Nov 2016 10:25:08 +0100 Subject: [PATCH 1316/3392] python3: fix double format detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Python is not able to detect if compiler double representation is compliant with IEE754: checking whether C doubles are little-endian IEEE 754 binary64... no checking whether C doubles are big-endian IEEE 754 binary64... no checking whether C doubles are ARM mixed-endian IEEE 754 binary64... no Accordingly 'legacy' mode isused. It is possible to check this at runtime by check if 'sys.float_repr_style' contains 'short' or 'legacy'. Calculus correctness is not garanteed with 'legacy'. Problem is better described here: http://stackoverflow.com/questions/29920294/what-causes-pythons-float-repr-style-to-use-legacy https://bugs.python.org/issue7117 However, all gcc architecture use a representation compliant with IEE754. So, we can enable it unconditionnaly. Signed-off-by: Jérôme Pouiller [Thomas: rework condition to not use strip, as suggested by Baruch.] Signed-off-by: Thomas Petazzoni --- package/python3/python3.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index b3f31c0aa0..f355ae9e6c 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -126,6 +126,13 @@ PYTHON3_CONF_ENV += \ ac_cv_working_tzset=yes \ ac_cv_prog_HAS_HG=/bin/false +# GCC is always compliant with IEEE754 +ifeq ($(BR2_ENDIAN),"LITTLE") +PYTHON3_CONF_ENV += ac_cv_little_endian_double=yes +else +PYTHON3_CONF_ENV += ac_cv_big_endian_double=yes +endif + # uClibc is known to have a broken wcsftime() implementation, so tell # Python 3 to fall back to strftime() instead. ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) From 6668a0ed5ce5174d2307997e7a6d7c9f94ccb282 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 9 Nov 2016 08:05:31 +0100 Subject: [PATCH 1317/3392] php: fix bfin compile issue Fixes: http://autobuild.buildroot.net/results/8326f24511d3b109d22a76660adc017bbcaca197 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/php/0007-avoid-bfin-gcc-segfault.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 package/php/0007-avoid-bfin-gcc-segfault.patch diff --git a/package/php/0007-avoid-bfin-gcc-segfault.patch b/package/php/0007-avoid-bfin-gcc-segfault.patch new file mode 100644 index 0000000000..4dccb25f1f --- /dev/null +++ b/package/php/0007-avoid-bfin-gcc-segfault.patch @@ -0,0 +1,16 @@ +Avoid gcc segmentation fault + +Signed-off-by: Waldemar Brodkorb + +diff -Nur php-7.0.12.orig/Zend/zend_portability.h php-7.0.12/Zend/zend_portability.h +--- php-7.0.12.orig/Zend/zend_portability.h 2016-10-13 16:04:17.000000000 +0200 ++++ php-7.0.12/Zend/zend_portability.h 2016-11-08 02:49:39.118388999 +0100 +@@ -97,7 +97,7 @@ + + #if defined(ZEND_WIN32) && !defined(__clang__) + # define ZEND_ASSUME(c) __assume(c) +-#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT ++#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT && !defined(__bfin__) + # define ZEND_ASSUME(c) do { \ + if (__builtin_expect(!(c), 0)) __builtin_unreachable(); \ + } while (0) From afc9274715d0bf4c92bd930cdeb91bdc60904c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 9 Nov 2016 10:51:24 +0100 Subject: [PATCH 1318/3392] valgrind: do not use host mpicc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Valgrind may use 'mpicc' (from openmi project) to compile libmpiwrap-*.so. Without any option, it will detect and use 'mpicc' from host and generate libmpiwrap-*.so for host: $ file target/usr/lib/valgrind/libmpiwrap-arm-linux.so target/usr/lib/valgrind/libmpiwrap-arm-linux.so: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, not stripped We simply disable openmi support for valgrind. Signed-off-by: Jérôme Pouiller [Thomas: refactor with other unconditional CONF_OPTS.] Signed-off-by: Thomas Petazzoni --- package/valgrind/valgrind.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 09f711662b..087a3813af 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -9,7 +9,9 @@ VALGRIND_SITE = http://valgrind.org/downloads VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPLv2 GFDLv1.2 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS -VALGRIND_CONF_OPTS = --disable-ubsan +VALGRIND_CONF_OPTS = \ + --disable-ubsan \ + --without-mpicc VALGRIND_INSTALL_STAGING = YES # patch 0004-Fixes-for-musl-libc.patch touching configure.ac From 56d4c0b8ae6d18577e8e9eb50dae88936a19f0ac Mon Sep 17 00:00:00 2001 From: Cyril Bur Date: Wed, 9 Nov 2016 10:09:44 +1100 Subject: [PATCH 1319/3392] DEVELOPERS: add Cyril Bur to PowerPC Signed-off-by: Cyril Bur Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index bade9f4eb5..9035d22d26 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -338,6 +338,7 @@ N: Cédric Chépied F: package/znc/ N: Cyril Bur +F: arch/Config.in.powerpc F: package/kvm-unit-tests N: Dagg Stompler From cdcb7c25cdce46ec0bf6f1b993dc0502035c0cb0 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Tue, 8 Nov 2016 14:49:42 -0500 Subject: [PATCH 1320/3392] php-fpm: remove config comments to fix startup The comments in the Buildroot-provided php-fpm.conf would produce the following error when starting php-fpm: ERROR: [/etc/php-fpm.conf:2] value is NULL for a ZEND_INI_PARSER_ENTRY Removing the comments fixes the problem. Signed-off-by: Frank Hunleth Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/php/php-fpm.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/php/php-fpm.conf b/package/php/php-fpm.conf index b75a58fefc..88014b8c80 100644 --- a/package/php/php-fpm.conf +++ b/package/php/php-fpm.conf @@ -1,9 +1,6 @@ [www] -# Only start children when there are requests to be processed pm = ondemand -# Terminate them again after there haven't been any for 2 minutes pm.process_idle_timeout = 120s -# Maximum number of children processing PHP requests concurrently pm.max_children = 5 listen = /var/run/php-fpm.sock From f9fb1d59f571f3c465a25169f0d710a8ca0589af Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 8 Nov 2016 23:18:31 +0100 Subject: [PATCH 1321/3392] package/pseudo: enforce the host bitness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pseudo can detect the host bitness, but is not sure about it: it checks what type of file /bin/sh is, using file(1). However, in some conditions, /bin/sh can be of a different bitness than the rest of the system (weird, but not impossible), which causes build issues. Just enforce the bitness, so that pseudo needs not (wrongly) guess it. Signed-off-by: "Yann E. MORIN" Cc: Gaël PORTAY Cc: Patrick Keroulas Cc: Erico Nunes Cc: Julien BOIBESSOT Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pseudo/pseudo.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index 67538a6d33..92de2c6f1b 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -17,6 +17,7 @@ HOST_PSEUDO_DEPENDENCIES = host-attr host-sqlite # configure script is not generated by autoconf, so passing --libdir # is necessary, even if the infrastructure passes --prefix already. HOST_PSEUDO_CONF_OPTS = \ + --bits=$(if $(filter %64,$(HOSTARCH)),64,32) \ --libdir=$(HOST_DIR)/usr/lib \ --with-sqlite=$(HOST_DIR)/usr From a2ec1d26f850a2d2b800c79adeb421a40ffd4973 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 8 Nov 2016 00:09:35 +0100 Subject: [PATCH 1322/3392] olimex_imx233_olinuxino: bump version Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- .../genimage-imx233_olinuxino.cfg | 1 + .../olimex/imx233_olinuxino/linux-3.18.config | 152 ------------------ board/olimex/imx233_olinuxino/post-image.sh | 3 - configs/olimex_imx233_olinuxino_defconfig | 16 +- 4 files changed, 10 insertions(+), 162 deletions(-) delete mode 100644 board/olimex/imx233_olinuxino/linux-3.18.config diff --git a/board/olimex/imx233_olinuxino/genimage-imx233_olinuxino.cfg b/board/olimex/imx233_olinuxino/genimage-imx233_olinuxino.cfg index 78979dcc9c..751fe862d9 100644 --- a/board/olimex/imx233_olinuxino/genimage-imx233_olinuxino.cfg +++ b/board/olimex/imx233_olinuxino/genimage-imx233_olinuxino.cfg @@ -1,6 +1,7 @@ image kernel.vfat { vfat { files = { + "imx23-olinuxino.dtb", "uImage" } } diff --git a/board/olimex/imx233_olinuxino/linux-3.18.config b/board/olimex/imx233_olinuxino/linux-3.18.config deleted file mode 100644 index d46d4d5cba..0000000000 --- a/board/olimex/imx233_olinuxino/linux-3.18.config +++ /dev/null @@ -1,152 +0,0 @@ -CONFIG_SYSVIPC=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_PERF_EVENTS=y -# CONFIG_COMPAT_BRK is not set -CONFIG_MODULES=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_BLK_DEV_INTEGRITY=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_ARCH_MXS=y -# CONFIG_ARM_THUMB is not set -CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_AEABI=y -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_CMDLINE="console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait" -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_SYN_COOKIES=y -CONFIG_CFG80211=y -CONFIG_CFG80211_WEXT=y -CONFIG_MAC80211=y -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_SST25L=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_GPMI_NAND=y -CONFIG_MTD_UBI=y -# CONFIG_BLK_DEV is not set -CONFIG_EEPROM_AT24=y -CONFIG_EEPROM_93CX6=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_NETDEVICES=y -# CONFIG_ETHERNET is not set -CONFIG_USB_USBNET=y -CONFIG_USB_NET_SMSC95XX=y -CONFIG_RTL8187=m -CONFIG_ATH_CARDS=m -CONFIG_ATH9K_HTC=m -CONFIG_RT2X00=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RTL_CARDS=m -CONFIG_RTL8192CU=m -# CONFIG_RTLWIFI_DEBUG is not set -CONFIG_ZD1211RW=m -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -# CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_MXS_AUART=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MXS=y -CONFIG_SPI=y -CONFIG_SPI_GPIO=m -CONFIG_SPI_MXS=y -CONFIG_PTP_1588_CLOCK=y -CONFIG_GPIO_SYSFS=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_STMP3XXX_RTC_WATCHDOG=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_FB=y -CONFIG_FB_MXS=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_PWM=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_HRTIMER=y -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_CHIPIDEA=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_MXS_PHY=y -CONFIG_MMC=y -CONFIG_MMC_MXS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_ONESHOT=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_BACKLIGHT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_STMP=y -CONFIG_DMADEVICES=y -CONFIG_MXS_DMA=y -CONFIG_STAGING=y -CONFIG_MXS_LRADC=y -CONFIG_IIO=y -CONFIG_IIO_SYSFS_TRIGGER=y -CONFIG_PWM=y -CONFIG_PWM_MXS=y -CONFIG_EXT4_FS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -# CONFIG_MISC_FILESYSTEMS is not set -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_PRINTK_TIME=y -CONFIG_FRAME_WARN=2048 -CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_FS=y -CONFIG_STRICT_DEVMEM=y -CONFIG_DEBUG_USER=y -CONFIG_KEYS=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DEV_MXS_DCP=y -CONFIG_CRC_CCITT=y -CONFIG_CRC_ITU_T=y -CONFIG_CRC7=m -CONFIG_FONTS=y diff --git a/board/olimex/imx233_olinuxino/post-image.sh b/board/olimex/imx233_olinuxino/post-image.sh index 703cbe7ee2..948d770bb2 100755 --- a/board/olimex/imx233_olinuxino/post-image.sh +++ b/board/olimex/imx233_olinuxino/post-image.sh @@ -5,9 +5,6 @@ BOARD_NAME="$(basename ${BOARD_DIR})" GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" -# Create symlink to "rename" kernel image -ln -sf uImage.imx23-olinuxino ${BINARIES_DIR}/uImage - rm -rf "${GENIMAGE_TMP}" genimage \ diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig index f74f42222a..e0a7b08d4f 100644 --- a/configs/olimex_imx233_olinuxino_defconfig +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -2,6 +2,9 @@ BR2_arm=y BR2_arm926t=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y + # System BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -9,15 +12,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.2" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olimex/imx233_olinuxino/linux-3.18.config" -BR2_LINUX_KERNEL_APPENDED_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x42000000" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" +BR2_LINUX_KERNEL_DEFCONFIG="mxs" +BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-olinuxino" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x42000000" # Firmware for WiFi BR2_PACKAGE_LINUX_FIRMWARE=y @@ -36,7 +38,7 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx23_olinuxino" BR2_TARGET_UBOOT_FORMAT_SD=y From 58cf64bf66c7024626f6636206d4a363bfc2e255 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 8 Nov 2016 00:09:36 +0100 Subject: [PATCH 1323/3392] olimex_imx233_olinuxino: use the common mxs genimage script Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- .../genimage-imx233_olinuxino.cfg | 29 ------------------- board/olimex/imx233_olinuxino/post-image.sh | 17 ----------- configs/olimex_imx233_olinuxino_defconfig | 2 +- 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 board/olimex/imx233_olinuxino/genimage-imx233_olinuxino.cfg delete mode 100755 board/olimex/imx233_olinuxino/post-image.sh diff --git a/board/olimex/imx233_olinuxino/genimage-imx233_olinuxino.cfg b/board/olimex/imx233_olinuxino/genimage-imx233_olinuxino.cfg deleted file mode 100644 index 751fe862d9..0000000000 --- a/board/olimex/imx233_olinuxino/genimage-imx233_olinuxino.cfg +++ /dev/null @@ -1,29 +0,0 @@ -image kernel.vfat { - vfat { - files = { - "imx23-olinuxino.dtb", - "uImage" - } - } - size = 5M -} - -image sdcard.img { - hdimage { - } - partition boot { - partition-type = 0x53 - image = "u-boot.sd" - size = 16M - } - - partition kernel { - partition-type = 0xC - image = "kernel.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext2" - } -} diff --git a/board/olimex/imx233_olinuxino/post-image.sh b/board/olimex/imx233_olinuxino/post-image.sh deleted file mode 100755 index 948d770bb2..0000000000 --- a/board/olimex/imx233_olinuxino/post-image.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -BOARD_NAME="$(basename ${BOARD_DIR})" -GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig index e0a7b08d4f..1040e5e740 100644 --- a/configs/olimex_imx233_olinuxino_defconfig +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -46,5 +46,5 @@ BR2_TARGET_UBOOT_FORMAT_SD=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/olimex/imx233_olinuxino/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/mxs/post-image.sh" From b2163fb8d4cc6ca925464b60b517e8953038559d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 9 Nov 2016 10:43:46 +0100 Subject: [PATCH 1324/3392] patchelf: bump version to 0.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- package/patchelf/patchelf.hash | 2 +- package/patchelf/patchelf.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/patchelf/patchelf.hash b/package/patchelf/patchelf.hash index 0da413e6ca..14154a31fc 100644 --- a/package/patchelf/patchelf.hash +++ b/package/patchelf/patchelf.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 14af06a2da688d577d64ff8dac065bb8903bbffbe01d30c62df7af9bf4ce72fe patchelf-0.8.tar.gz +sha256 f2aa40a6148cb3b0ca807a1bf836b081793e55ec9e5540a5356d800132be7e0a patchelf-0.9.tar.gz diff --git a/package/patchelf/patchelf.mk b/package/patchelf/patchelf.mk index 043224dab2..5222e57950 100644 --- a/package/patchelf/patchelf.mk +++ b/package/patchelf/patchelf.mk @@ -4,8 +4,8 @@ # ################################################################################ -PATCHELF_VERSION = 0.8 -PATCHELF_SITE = http://releases.nixos.org/patchelf/patchelf-0.8 +PATCHELF_VERSION = 0.9 +PATCHELF_SITE = http://releases.nixos.org/patchelf/patchelf-0.9 PATCHELF_LICENSE = GPLv3+ PATCHELF_LICENSE_FILES = COPYING From dbfc24a3c04d9311d6f959dece7c42b059e256f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 9 Nov 2016 10:36:29 +0100 Subject: [PATCH 1325/3392] screen: enable support for 256 colors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Support for 256 colors is enabled in xterm and ncurses, but it was forgotten for screen. Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- package/screen/screen.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 84c3d75d1a..16a97cc759 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -11,6 +11,7 @@ SCREEN_LICENSE_FILES = COPYING SCREEN_DEPENDENCIES = ncurses SCREEN_AUTORECONF = YES SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" +SCREEN_CONF_OPTS = --enable-colors256 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin define SCREEN_INSTALL_SCREENRC From 58aefb2a5d034a5b16800dc935f376c83a815efd Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 8 Nov 2016 11:37:48 +0000 Subject: [PATCH 1326/3392] libgtk3: bump version to 3.22.3 Overview of Changes in GTK+ 3.22.3: http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.3.news Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index b60671753c..1c58efc2fc 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.2.sha256sum -sha256 2343dcaed2fc237ef718136ff4110fef7eb1ebfe178a9b064aa21cd74ecb6946 gtk+-3.22.2.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.3.sha256sum +sha256 e190ab1a9a893861b8e8be341aa57bce8b7146d6445ebfe5a8ab64236fe82ed3 gtk+-3.22.3.tar.xz diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index b7cea7dd37..0b9a9992ef 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.22 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).2 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).3 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPLv2+ From 8f4c905adf76d49c33ba29f090a149a6128b64cb Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 8 Nov 2016 15:34:46 +0100 Subject: [PATCH 1327/3392] swupdate: bump to version 2016.10 A short list of new features: - progress interface as general way to signalize the update status outside of the process. - support encrypted artifacts (encryption via simmetric keys) - host verification for swu images (-c option) - configuration file to configure the update process - HAwkbit backend: API extended, support for configData messages - Hawkbit backend: supports SSL certificates - remote handler : general interface to connect external installers. Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 918ca2fe89..1ba10f6457 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c21d2fd52eb7ed9c304a7a996d230a8f1b47b9879a8c9fa50c80b41e117d1e60 swupdate-2016.07.tar.gz +sha256 840d6287a41f7a42e08a74045ee40b7c2f82c1ecfedf8c915e3935d4f0084376 swupdate-2016.10.tar.gz diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index d442810b21..c905c1d746 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2016.07 +SWUPDATE_VERSION = 2016.10 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPLv2+, MIT, Public Domain SWUPDATE_LICENSE_FILES = COPYING From 84bd58d5bb06bfedb88e8abca53ec5b88ae9b29f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 8 Nov 2016 10:32:56 +0000 Subject: [PATCH 1328/3392] MIPS: remove M5100 core This is a microcontroller class (MCU) core which is not suitable for running Linux. Signed-off-by: Vicente Olivert Riera Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- arch/Config.in.mips | 5 ----- package/gcc/Config.in.host | 5 ++--- toolchain/toolchain-external/Config.in | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 1021a579b9..21f0a8d102 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -47,10 +47,6 @@ config BR2_mips_interaptiv bool "interAptiv" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R2 -config BR2_mips_m5100 - bool "M5100" - depends on !BR2_ARCH_IS_64 - select BR2_MIPS_CPU_MIPS32R5 config BR2_mips_m5101 bool "M5101" depends on !BR2_ARCH_IS_64 @@ -146,7 +142,6 @@ config BR2_GCC_TARGET_ARCH default "mips32r5" if BR2_mips_32r5 default "mips32r6" if BR2_mips_32r6 default "interaptiv" if BR2_mips_interaptiv - default "m5100" if BR2_mips_m5100 default "m5101" if BR2_mips_m5101 default "m6201" if BR2_mips_m6201 default "p5600" if BR2_mips_p5600 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 446df4dc78..f46656c593 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -64,9 +64,8 @@ choice # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && \ - !BR2_mips_m5101 && !BR2_mips_m6201 && !BR2_mips_i6400 && \ - !BR2_mips_p6600 + depends on !BR2_mips_interaptiv && !BR2_mips_m5101 && \ + !BR2_mips_m6201 && !BR2_mips_i6400 && !BR2_mips_p6600 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 5324599bf7..22f760be0d 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -530,7 +530,7 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS BR2_x86_64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && !BR2_mips_m5101 + depends on !BR2_mips_interaptiv && !BR2_mips_m5101 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 select BR2_TOOLCHAIN_EXTERNAL_MUSL From b2bae3b523aedd3ccf798c492f525660c4943770 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 8 Nov 2016 10:32:57 +0000 Subject: [PATCH 1329/3392] MIPS: rename M5101 core to M5150 m5101 is the -march option for GCC, but the real core name is M5150. Signed-off-by: Vicente Olivert Riera Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- arch/Config.in.mips | 6 +++--- package/gcc/Config.in.host | 2 +- toolchain/toolchain-external/Config.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 21f0a8d102..29a967df50 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -47,8 +47,8 @@ config BR2_mips_interaptiv bool "interAptiv" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R2 -config BR2_mips_m5101 - bool "M5101" +config BR2_mips_m5150 + bool "M5150" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R5 config BR2_mips_m6201 @@ -142,7 +142,7 @@ config BR2_GCC_TARGET_ARCH default "mips32r5" if BR2_mips_32r5 default "mips32r6" if BR2_mips_32r6 default "interaptiv" if BR2_mips_interaptiv - default "m5101" if BR2_mips_m5101 + default "m5101" if BR2_mips_m5150 default "m6201" if BR2_mips_m6201 default "p5600" if BR2_mips_p5600 default "mips32r2" if BR2_mips_xburst diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index f46656c593..eb1479af57 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -64,7 +64,7 @@ choice # musl ppc64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5101 && \ + depends on !BR2_mips_interaptiv && !BR2_mips_m5150 && \ !BR2_mips_m6201 && !BR2_mips_i6400 && !BR2_mips_p6600 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 22f760be0d..476b37b58e 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -530,7 +530,7 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS BR2_x86_64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5101 + depends on !BR2_mips_interaptiv && !BR2_mips_m5150 # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 select BR2_TOOLCHAIN_EXTERNAL_MUSL From e5b3fa3ae4f1cbeac6ab19ee763c7118ab3b1d80 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 8 Nov 2016 10:32:58 +0000 Subject: [PATCH 1330/3392] MIPS: rename M6201 core to M6250 m6201 is the -march option for GCC, but the real core name is M6250. Signed-off-by: Vicente Olivert Riera Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- arch/Config.in.mips | 6 +++--- package/gcc/Config.in.host | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/Config.in.mips b/arch/Config.in.mips index 29a967df50..ce41e9e725 100644 --- a/arch/Config.in.mips +++ b/arch/Config.in.mips @@ -51,8 +51,8 @@ config BR2_mips_m5150 bool "M5150" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R5 -config BR2_mips_m6201 - bool "M6201" +config BR2_mips_m6250 + bool "M6250" depends on !BR2_ARCH_IS_64 select BR2_MIPS_CPU_MIPS32R6 config BR2_mips_p5600 @@ -143,7 +143,7 @@ config BR2_GCC_TARGET_ARCH default "mips32r6" if BR2_mips_32r6 default "interaptiv" if BR2_mips_interaptiv default "m5101" if BR2_mips_m5150 - default "m6201" if BR2_mips_m6201 + default "m6201" if BR2_mips_m6250 default "p5600" if BR2_mips_p5600 default "mips32r2" if BR2_mips_xburst default "mips64" if BR2_mips_64 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index eb1479af57..0a63e6a101 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -65,7 +65,7 @@ choice depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) # Unsupported MIPS cores depends on !BR2_mips_interaptiv && !BR2_mips_m5150 && \ - !BR2_mips_m6201 && !BR2_mips_i6400 && !BR2_mips_p6600 + !BR2_mips_m6250 && !BR2_mips_i6400 && !BR2_mips_p6600 # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_TOOLCHAIN_GCC_AT_LEAST_5 @@ -76,7 +76,7 @@ choice depends on !BR2_arc depends on !BR2_microblaze # Unsupported MIPS cores - depends on !BR2_mips_m6201 && !BR2_mips_p6600 + depends on !BR2_mips_m6250 && !BR2_mips_p6600 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 endchoice From 401c47e44b26e97db1c12cce0a42c62cfb72a9b9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 6 Nov 2016 23:53:32 +0100 Subject: [PATCH 1331/3392] package/guile: dont't use -Os for CS 2014.05 ARM toolchain With this toolchain, guile tigger an assembler error with -Os which is probably caused by the binutils version being used: arm-none-linux-gnueabi-ld --version GNU ld (Sourcery CodeBench Lite 2014.05-29) 2.24.51.20140217 arm-none-linux-gnueabi-gcc --version arm-none-linux-gnueabi-gcc (Sourcery CodeBench Lite 2014.05-29) 4.8.3 20140320 (prerelease) Nowaday, even with a Buildroot internal toolchain using the oldest Binutils GCC version (2.25.1 and 4.8.6), guile build fine with -Os. So, force -O2 when this toolchain is used and BR2_OPTIMIZE_S is set. Fixes: http://autobuild.buildroot.net/results/976/976b3477407e64c8c2fc2309ed952d0083903a19 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/guile/guile.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/guile/guile.mk b/package/guile/guile.mk index ca54a4d77f..88c74143bf 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -32,6 +32,11 @@ ifeq ($(BR2_STATIC_LIBS),y) GUILE_CFLAGS += -DGC_NO_DLOPEN endif +# Triggers assembler error with -Os +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM)$(BR2_OPTIMIZE_S),yy) +GUILE_CFLAGS += -O2 +endif + # It can use readline, but on the condition that it was build against # ncurses. If both aren't present disable readline support since the # host readline/ncurses support can poison the build. From 00e7d119ec16cd64f89cb21a2ea715e2bfc3dc73 Mon Sep 17 00:00:00 2001 From: Dagg Stompler Date: Wed, 9 Nov 2016 21:07:33 +0200 Subject: [PATCH 1332/3392] kodi: allow enablement of libamcodec as codec if selected allow usage of amcodec if kodi is built and libamcodec is selected Signed-off-by: Dagg Stompler [Thomas: fix KODI_INCLUDES definition in RPi case, fix indentation.] Signed-off-by: Thomas Petazzoni --- .../kodi/0012-Fix_includes_in_amcodec.patch | 38 +++++++++++++++++++ package/kodi/kodi.mk | 17 +++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 package/kodi/0012-Fix_includes_in_amcodec.patch diff --git a/package/kodi/0012-Fix_includes_in_amcodec.patch b/package/kodi/0012-Fix_includes_in_amcodec.patch new file mode 100644 index 0000000000..4a6d44f686 --- /dev/null +++ b/package/kodi/0012-Fix_includes_in_amcodec.patch @@ -0,0 +1,38 @@ +commit 4bbb21aa5cee6b2f40759aa8b1bd65246a237f79 +Author: Alex Deryskyba +Date: Wed May 4 01:38:27 2016 +0200 + + [aml] Fix includes in amcodec/codec.h to make them relative + +[Taken from upstream commit +https://github.com/xbmc/xbmc/commit/4bbb21aa5cee6b2f40759aa8b1bd65246a237f79.] +Signed-off-by: Dagg Stompler + +diff --git a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h +index 187d4d5..632c24e 100644 +--- a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h ++++ b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h +@@ -12,8 +12,8 @@ + #ifndef CODEC_CTRL_H_ + #define CODEC_CTRL_H_ + +-#include +-#include ++#include "codec_type.h" ++#include "codec_error.h" + + + int codec_init(codec_para_t *); +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in +index a1a3447..1bf5a89 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in +@@ -24,8 +24,6 @@ endif + ifeq (@USE_LIBAMCODEC@,1) + SRCS += AMLCodec.cpp + SRCS += DVDVideoCodecAmlogic.cpp +-INCLUDES += -I$(prefix)/include/amcodec +-INCLUDES += -I$(prefix)/include/amplayer + endif + + ifeq (@USE_ANDROID@,1) diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index e0361dae78..de4d308f6b 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -96,9 +96,10 @@ endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) KODI_DEPENDENCIES += rpi-userland KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer -KODI_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \ - LIBS="-lvcos -lvchostif" +KODI_INCLUDES += \ + -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ + -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux +KODI_LIBS = -lvcos -lvchostif endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) @@ -113,6 +114,16 @@ KODI_DEPENDENCIES += imx-vpuwrap KODI_CONF_OPTS += --enable-codec=imxvpu endif +ifeq ($(BR2_PACKAGE_LIBAMCODEC),y) +KODI_DEPENDENCIES += libamcodec +KODI_CONF_OPTS += --enable-codec=amcodec +KODI_INCLUDES += -I$(STAGING_DIR)/usr/include/amcodec +endif + +KODI_CONF_ENV += \ + INCLUDES="$(KODI_INCLUDES)" \ + LIBS="$(KODI_LIBS)" + ifeq ($(BR2_PACKAGE_LIBCAP),y) KODI_CONF_OPTS += --enable-libcap KODI_DEPENDENCIES += libcap From e4e2cc4d4b0cc4ad1fafa208e1c6887452727a4e Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 7 Nov 2016 02:19:56 +0100 Subject: [PATCH 1333/3392] Use already qstripped BR2_TOOLCHAIN_EXTERNAL_PREFIX everywhere The BR2_TOOLCHAIN_EXTERNAL_PREFIX variable is already qstripped and stored in the TOOLCHAIN_EXTERNAL_PREFIX variable in toolchain-external.mk, so use this variable everywhere. This will be useful for a later patch that makes the derivation of TOOLCHAIN_EXTERNAL_PREFIX a little more complex. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour [Arnout: split off into separate patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 2 +- package/wine/wine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index 5d591e9a43..bd73219bbf 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -184,7 +184,7 @@ endif ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) TARGET_CROSS = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)- else -TARGET_CROSS = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))- +TARGET_CROSS = $(HOST_DIR)/usr/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- endif # Define TARGET_xx variables for all common binutils/gcc diff --git a/package/wine/wine.mk b/package/wine/wine.mk index d9a0ecf851..47ba90a214 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -34,7 +34,7 @@ WINE_CONF_OPTS = \ # wrapper believes what the real gcc is named, and force the tuple of # the external toolchain, not the one we compute in GNU_TARGET_NAME. ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) -WINE_CONF_OPTS += TARGETFLAGS="-b $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))" +WINE_CONF_OPTS += TARGETFLAGS="-b $(TOOLCHAIN_EXTERNAL_PREFIX)" endif ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_SEQ)$(BR2_PACKAGE_ALSA_LIB_RAWMIDI),yyy) From 0e3b374208fe1c74cb977553f492c5c6280e82f2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Nov 2016 14:32:36 +0100 Subject: [PATCH 1334/3392] configs: remove calao*_defconfig The calao defconfigs no longer build with gcc 5.x, due to Linux kernel versions used being too old. However, it is unlikely that anyone will ever update them, since Calao Systems has gone bankrupt in April 2016. Therefore, let's remove them. If anyone is interested again at some point, it will be easy to revive them from the Git history. Signed-off-by: Thomas Petazzoni --- board/calao/qil-a9260/linux-3.4.7.config | 111 --- .../at91bootstrap/0001-qil-a9260.patch | 603 ------------- .../patches/barebox/0001-qil-a9260.patch | 36 - .../patches/linux/0001-qil-a9260.patch | 27 - .../at91bootstrap-1.16-tny-a9g20-lpw.patch | 551 ------------ board/calao/tny-a9g20-lpw/linux-3.9.config | 187 ---- .../at91bootstrap-1.16-usb-a9260.patch | 603 ------------- board/calao/usb-a9260/linux-3.7.4.config | 97 -- .../at91bootstrap-1.16-usb-a9263.patch | 851 ------------------ board/calao/usb-a9263/linux-3.4.4.config | 102 --- board/calao/usb-a9g20-lpw/linux-3.4.4.config | 105 --- .../at91bootstrap/0001-usb-a9g20-lpw.patch | 610 ------------- .../patches/barebox/0001-usb-a9g20-lpw.patch | 12 - configs/calao_qil_a9260_defconfig | 20 - configs/calao_tny_a9g20_lpw_defconfig | 29 - configs/calao_usb_a9260_defconfig | 18 - configs/calao_usb_a9263_defconfig | 17 - configs/calao_usb_a9g20_lpw_defconfig | 17 - 18 files changed, 3996 deletions(-) delete mode 100644 board/calao/qil-a9260/linux-3.4.7.config delete mode 100644 board/calao/qil-a9260/patches/at91bootstrap/0001-qil-a9260.patch delete mode 100644 board/calao/qil-a9260/patches/barebox/0001-qil-a9260.patch delete mode 100644 board/calao/qil-a9260/patches/linux/0001-qil-a9260.patch delete mode 100644 board/calao/tny-a9g20-lpw/at91bootstrap-1.16-tny-a9g20-lpw.patch delete mode 100644 board/calao/tny-a9g20-lpw/linux-3.9.config delete mode 100644 board/calao/usb-a9260/at91bootstrap-1.16-usb-a9260.patch delete mode 100644 board/calao/usb-a9260/linux-3.7.4.config delete mode 100644 board/calao/usb-a9263/at91bootstrap-1.16-usb-a9263.patch delete mode 100644 board/calao/usb-a9263/linux-3.4.4.config delete mode 100644 board/calao/usb-a9g20-lpw/linux-3.4.4.config delete mode 100644 board/calao/usb-a9g20-lpw/patches/at91bootstrap/0001-usb-a9g20-lpw.patch delete mode 100644 board/calao/usb-a9g20-lpw/patches/barebox/0001-usb-a9g20-lpw.patch delete mode 100644 configs/calao_qil_a9260_defconfig delete mode 100644 configs/calao_tny_a9g20_lpw_defconfig delete mode 100644 configs/calao_usb_a9260_defconfig delete mode 100644 configs/calao_usb_a9263_defconfig delete mode 100644 configs/calao_usb_a9g20_lpw_defconfig diff --git a/board/calao/qil-a9260/linux-3.4.7.config b/board/calao/qil-a9260/linux-3.4.7.config deleted file mode 100644 index 105d76006a..0000000000 --- a/board/calao/qil-a9260/linux-3.4.7.config +++ /dev/null @@ -1,111 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9260=y -CONFIG_MACH_QIL_A9260=y -CONFIG_AT91_SLOW_CLOCK=y -CONFIG_AT91_EARLY_USART0=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS1,115200" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y -CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_MMC=y -CONFIG_MMC_AT91=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_M41T94=y -CONFIG_EXT2_FS=y -CONFIG_FUSE_FS=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_XATTR=y -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/board/calao/qil-a9260/patches/at91bootstrap/0001-qil-a9260.patch b/board/calao/qil-a9260/patches/at91bootstrap/0001-qil-a9260.patch deleted file mode 100644 index eb9de2a15e..0000000000 --- a/board/calao/qil-a9260/patches/at91bootstrap/0001-qil-a9260.patch +++ /dev/null @@ -1,603 +0,0 @@ -From a3e08beea8bf5e96e1237eef4a82f4a2fdd5286b Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Thu, 19 Jul 2012 14:19:59 +0200 -Subject: [PATCH] Add support for the Calao-systems QIL-A9260 - - -Signed-off-by: Gregory Hermant ---- - board/qil_a9260/nandflash/Makefile | 122 ++++++++++++++ - board/qil_a9260/nandflash/qil-a9260.h | 109 ++++++++++++ - board/qil_a9260/qil_a9260.c | 298 +++++++++++++++++++++++++++++++++ - crt0_gnu.S | 7 + - include/part.h | 6 +- - 5 files changed, 541 insertions(+), 1 deletions(-) - create mode 100644 board/qil_a9260/nandflash/Makefile - create mode 100644 board/qil_a9260/nandflash/qil-a9260.h - create mode 100644 board/qil_a9260/qil_a9260.c - -diff --git a/board/qil_a9260/nandflash/Makefile b/board/qil_a9260/nandflash/Makefile -new file mode 100644 -index 0000000..209a25f ---- /dev/null -+++ b/board/qil_a9260/nandflash/Makefile -@@ -0,0 +1,122 @@ -+# TODO: set this appropriately for your local toolchain -+ifndef ERASE_FCT -+ERASE_FCT=rm -f -+endif -+ifndef CROSS_COMPILE -+CROSS_COMPILE=arm-elf- -+endif -+ -+TOOLCHAIN=gcc -+ -+BOOTSTRAP_PATH=../../.. -+ -+# NandFlashBoot Configuration for QIL-A9260 -+ -+# Target name (case sensitive!!!) -+TARGET=AT91SAM9260 -+# Board name (case sensitive!!!) -+BOARD=qil_a9260 -+# Link Address and Top_of_Memory -+LINK_ADDR=0x200000 -+TOP_OF_MEMORY=0x301000 -+# Name of current directory -+PROJECT=nandflash -+ -+ifndef BOOT_NAME -+BOOT_NAME=$(PROJECT)_$(BOARD) -+endif -+ -+INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT) -+ -+ifeq ($(TOOLCHAIN), gcc) -+ -+AS=$(CROSS_COMPILE)gcc -+CC=$(CROSS_COMPILE)gcc -+LD=$(CROSS_COMPILE)gcc -+NM= $(CROSS_COMPILE)nm -+SIZE=$(CROSS_COMPILE)size -+OBJCOPY=$(CROSS_COMPILE)objcopy -+OBJDUMP=$(CROSS_COMPILE)objdump -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) -+ -+# Linker flags. -+# -Wl,...: tell GCC to pass this to linker. -+# -Map: create map file -+# --cref: add cross reference to map file -+LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref -+LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR) -+OBJS=crt0_gnu.o -+ -+endif -+ -+OBJS+=\ -+ $(BOARD).o \ -+ main.o \ -+ gpio.o \ -+ pmc.o \ -+ debug.o \ -+ sdramc.o \ -+ nandflash.o \ -+ _udivsi3.o \ -+ _umodsi3.o \ -+ div0.o \ -+ udiv.o \ -+ string.o -+ -+ -+rebuild: clean all -+ -+all: $(BOOT_NAME) -+ -+ifeq ($(TOOLCHAIN), gcc) -+$(BOOT_NAME): $(OBJS) -+ $(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS) -+ $(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin -+endif -+ -+ -+$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o -+ -+main.o: $(BOOTSTRAP_PATH)/main.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o -+ -+gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o -+ -+pmc.o: $(BOOTSTRAP_PATH)/driver/pmc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o -+ -+debug.o: $(BOOTSTRAP_PATH)/driver/debug.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o -+ -+sdramc.o: $(BOOTSTRAP_PATH)/driver/sdramc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o -+ -+dataflash.o: $(BOOTSTRAP_PATH)/driver/dataflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o -+ -+nandflash.o: $(BOOTSTRAP_PATH)/driver/nandflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o -+ -+crt0_gnu.o: $(BOOTSTRAP_PATH)/crt0_gnu.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o -+ -+div0.o: $(BOOTSTRAP_PATH)/lib/div0.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o -+ -+string.o: $(BOOTSTRAP_PATH)/lib/string.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o -+ -+udiv.o: $(BOOTSTRAP_PATH)/lib/udiv.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o -+ -+_udivsi3.o: $(BOOTSTRAP_PATH)/lib/_udivsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o -+ -+_umodsi3.o: $(BOOTSTRAP_PATH)/lib/_umodsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o -+ -+clean: -+ $(ERASE_FCT) *.o *.bin *.elf *.map -diff --git a/board/qil_a9260/nandflash/qil-a9260.h b/board/qil_a9260/nandflash/qil-a9260.h -new file mode 100644 -index 0000000..c87002e ---- /dev/null -+++ b/board/qil_a9260/nandflash/qil-a9260.h -@@ -0,0 +1,109 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2006, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : qil-a9260.h -+ * Object : -+ * Creation : GH July 19th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#ifndef _QIL_A9260_H -+#define _QIL_A9260_H -+ -+/* ******************************************************************* */ -+/* PMC Settings */ -+/* */ -+/* The main oscillator is enabled as soon as possible in the c_startup */ -+/* and MCK is switched on the main oscillator. */ -+/* PLL initialization is done later in the hw_init() function */ -+/* ******************************************************************* */ -+#define MASTER_CLOCK (180000000/2) -+#define PLL_LOCK_TIMEOUT 1000000 -+ -+#define PLLA_SETTINGS 0x20593F06 -+#define PLLB_SETTINGS 0x10483F0E -+ -+/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */ -+#define MCKR_SETTINGS (AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2) -+#define MCKR_CSS_SETTINGS (AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS) -+ -+/* ******************************************************************* */ -+/* NandFlash Settings */ -+/* */ -+/* ******************************************************************* */ -+#define AT91C_SMARTMEDIA_BASE 0x40000000 -+ -+#define AT91_SMART_MEDIA_ALE (1 << 21) /* our ALE is AD21 */ -+#define AT91_SMART_MEDIA_CLE (1 << 22) /* our CLE is AD22 */ -+ -+#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0) -+#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0) -+ -+#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13)) -+ -+ -+/* ******************************************************************** */ -+/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 90000000.*/ -+/* Please refer to SMC section in AT91SAM datasheet to learn how */ -+/* to generate these values. */ -+/* ******************************************************************** */ -+#define AT91C_SM_NWE_SETUP (1 << 0) -+#define AT91C_SM_NCS_WR_SETUP (0 << 8) -+#define AT91C_SM_NRD_SETUP (1 << 16) -+#define AT91C_SM_NCS_RD_SETUP (0 << 24) -+ -+#define AT91C_SM_NWE_PULSE (3 << 0) -+#define AT91C_SM_NCS_WR_PULSE (3 << 8) -+#define AT91C_SM_NRD_PULSE (3 << 16) -+#define AT91C_SM_NCS_RD_PULSE (3 << 24) -+ -+#define AT91C_SM_NWE_CYCLE (5 << 0) -+#define AT91C_SM_NRD_CYCLE (5 << 16) -+#define AT91C_SM_TDF (2 << 16) -+ -+/* ******************************************************************* */ -+/* BootStrap Settings */ -+/* */ -+/* ******************************************************************* */ -+#define IMG_ADDRESS 0x20000 /* Image Address in NandFlash */ -+#define IMG_SIZE 0x40000 /* Image Size in NandFlash */ -+ -+#define MACH_TYPE 0x6AF /* QIL-A9260 */ -+#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+ -+/* ******************************************************************* */ -+/* Application Settings */ -+/* ******************************************************************* */ -+#undef CFG_DEBUG -+#undef CFG_DATAFLASH -+ -+#define CFG_NANDFLASH -+#undef NANDFLASH_SMALL_BLOCKS /* NANDFLASH_LARGE_BLOCKS used instead */ -+ -+#define CFG_HW_INIT -+#define CFG_SDRAM -+ -+#endif /* _QIL_A9260_H */ -diff --git a/board/qil_a9260/qil_a9260.c b/board/qil_a9260/qil_a9260.c -new file mode 100644 -index 0000000..ae122e7 ---- /dev/null -+++ b/board/qil_a9260/qil_a9260.c -@@ -0,0 +1,298 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2006, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaiimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : qil_a9260.c -+ * Object : -+ * Creation : GH July 19th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#include "../../include/part.h" -+#include "../../include/gpio.h" -+#include "../../include/pmc.h" -+#include "../../include/debug.h" -+#include "../../include/sdramc.h" -+#include "../../include/main.h" -+#ifdef CFG_NANDFLASH -+#include "../../include/nandflash.h" -+#endif -+#ifdef CFG_DATAFLASH -+#include "../../include/dataflash.h" -+#endif -+ -+static inline unsigned int get_cp15(void) -+{ -+ unsigned int value; -+ __asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value)); -+ return value; -+} -+ -+static inline void set_cp15(unsigned int value) -+{ -+ __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); -+} -+ -+#ifdef CFG_HW_INIT -+/*----------------------------------------------------------------------------*/ -+/* \fn hw_init */ -+/* \brief This function performs very low level HW initialization */ -+/* This function is invoked as soon as possible during the c_startup */ -+/* The bss segment must be initialized */ -+/*----------------------------------------------------------------------------*/ -+void hw_init(void) -+{ -+ unsigned int cp15; -+ -+ /* Configure PIOs */ -+ const struct pio_desc hw_pio[] = { -+#ifdef CFG_DEBUG -+ {"RXD", AT91C_PIN_PB(14), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"TXD", AT91C_PIN_PB(15), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#endif -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Disable watchdog */ -+ writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR); -+ -+ /* At this stage the main oscillator is supposed to be enabled -+ * PCK = MCK = MOSC */ -+ -+ /* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */ -+ pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* PCK = PLLA = 2 * MCK */ -+ pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT); -+ /* Switch MCK on PLLA output */ -+ pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* Configure PLLB */ -+ pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* Configure CP15 */ -+ cp15 = get_cp15(); -+ cp15 |= I_CACHE; -+ set_cp15(cp15); -+ -+ /* Configure the PIO controller */ -+ pio_setup(hw_pio); -+ -+ /* Configure the EBI Slave Slot Cycle to 64 */ -+ writel( (readl((AT91C_BASE_MATRIX + MATRIX_SCFG3)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG3)); -+ -+#ifdef CFG_DEBUG -+ /* Enable Debug messages on the DBGU */ -+ dbg_init(BAUDRATE(MASTER_CLOCK, 115200)); -+ -+ dbg_print("Start AT91Bootstrap...\n\r"); -+#endif /* CFG_DEBUG */ -+ -+#ifdef CFG_SDRAM -+ /* Initialize the matrix */ -+ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS1A_SDRAMC, AT91C_BASE_CCFG + CCFG_EBICSA); -+ -+ /* Configure SDRAM Controller */ -+ sdram_init( AT91C_SDRAMC_NC_9 | -+ AT91C_SDRAMC_NR_13 | -+ AT91C_SDRAMC_CAS_2 | -+ AT91C_SDRAMC_NB_4_BANKS | -+ AT91C_SDRAMC_DBW_32_BITS | -+ AT91C_SDRAMC_TWR_2 | -+ AT91C_SDRAMC_TRC_7 | -+ AT91C_SDRAMC_TRP_2 | -+ AT91C_SDRAMC_TRCD_2 | -+ AT91C_SDRAMC_TRAS_5 | -+ AT91C_SDRAMC_TXSR_8, /* Control Register */ -+ (MASTER_CLOCK * 7)/1000000, /* Refresh Timer Register */ -+ AT91C_SDRAMC_MD_SDRAM); /* SDRAM (no low power) */ -+ -+ -+#endif /* CFG_SDRAM */ -+} -+#endif /* CFG_HW_INIT */ -+ -+#ifdef CFG_SDRAM -+/*------------------------------------------------------------------------------*/ -+/* \fn sdramc_hw_init */ -+/* \brief This function performs SDRAMC HW initialization */ -+/*------------------------------------------------------------------------------*/ -+void sdramc_hw_init(void) -+{ -+ /* Configure PIOs */ -+/* const struct pio_desc sdramc_pio[] = { -+ {"D16", AT91C_PIN_PC(16), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D17", AT91C_PIN_PC(17), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D18", AT91C_PIN_PC(18), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D19", AT91C_PIN_PC(19), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D20", AT91C_PIN_PC(20), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D21", AT91C_PIN_PC(21), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D22", AT91C_PIN_PC(22), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D23", AT91C_PIN_PC(23), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D24", AT91C_PIN_PC(24), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D25", AT91C_PIN_PC(25), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D26", AT91C_PIN_PC(26), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D27", AT91C_PIN_PC(27), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D28", AT91C_PIN_PC(28), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D29", AT91C_PIN_PC(29), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D30", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D31", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+*/ -+ /* Configure the SDRAMC PIO controller to output PCK0 */ -+/* pio_setup(sdramc_pio); */ -+ -+ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0)); -+ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0)); -+ -+} -+#endif /* CFG_SDRAM */ -+ -+#ifdef CFG_DATAFLASH -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn df_recovery */ -+/* \brief This function erases DataFlash Page 0 if USR PB is pressed */ -+/* during boot sequence */ -+/*------------------------------------------------------------------------------*/ -+void df_recovery(AT91PS_DF pDf) -+{ -+#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH) -+ /* Configure PIOs */ -+ const struct pio_desc usrpb_pio[] = { -+ {"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(usrpb_pio); -+ -+ /* If USR PB is pressed during Boot sequence */ -+ /* Erase DataFlash Page 0*/ -+ if ( !pio_get_value(AT91C_PIN_PB(10)) ) -+ df_page_erase(pDf, 0); -+#endif -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn df_hw_init */ -+/* \brief This function performs DataFlash HW initialization */ -+/*------------------------------------------------------------------------------*/ -+void df_hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc df_pio[] = { -+ {"MISO", AT91C_PIN_PA(0), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"MOSI", AT91C_PIN_PA(1), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"SPCK", AT91C_PIN_PA(2), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH) -+ {"NPCS0", AT91C_PIN_PA(3), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#endif -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ pio_setup(df_pio); -+} -+#endif /* CFG_DATAFLASH */ -+ -+ -+ -+#ifdef CFG_NANDFLASH -+/*------------------------------------------------------------------------------*/ -+/* \fn nand_recovery */ -+/* \brief This function erases NandFlash Block 0 if USR PB is pressed */ -+/* during boot sequence */ -+/*------------------------------------------------------------------------------*/ -+static void nand_recovery(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc usrpb_pio[] = { -+ {"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(usrpb_pio); -+ -+ /* If USR PB is pressed during Boot sequence */ -+ /* Erase NandFlash block 0*/ -+ if (!pio_get_value(AT91C_PIN_PB(10)) ) -+ AT91F_NandEraseBlock0(); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_hw_init */ -+/* \brief NandFlash HW init */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc nand_pio[] = { -+ {"RDY_BSY", AT91C_PIN_PC(13), 0, PIO_PULLUP, PIO_INPUT}, -+ {"NANDCS", AT91C_PIN_PC(14), 0, PIO_PULLUP, PIO_OUTPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */ -+ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA); -+ -+ /* Configure SMC CS3 */ -+ writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3); -+ writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3); -+ writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE) , AT91C_BASE_SMC + SMC_CYCLE3); -+ writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | -+ AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF) , AT91C_BASE_SMC + SMC_CTRL3); -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOC), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(nand_pio); -+ -+ nand_recovery(); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_cfg_16bits_dbw_init */ -+/* \brief Configure SMC in 16 bits mode */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_cfg_16bits_dbw_init(void) -+{ -+ writel(readl(AT91C_BASE_SMC + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC + SMC_CTRL3); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_cfg_8bits_dbw_init */ -+/* \brief Configure SMC in 8 bits mode */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_cfg_8bits_dbw_init(void) -+{ -+ writel((readl(AT91C_BASE_SMC + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC + SMC_CTRL3); -+} -+ -+ -+#endif /* #ifdef CFG_NANDFLASH */ -diff --git a/crt0_gnu.S b/crt0_gnu.S -index 042b617..002feef 100644 ---- a/crt0_gnu.S -+++ b/crt0_gnu.S -@@ -106,6 +106,13 @@ _relocate_to_sram: - #endif /* CFG_NORFLASH */ - - _setup_clocks: -+/* Test if main osc is bypassed */ -+ ldr r0,=AT91C_PMC_MOR -+ ldr r1, [r0] -+ ldr r2,=AT91C_CKGR_OSCBYPASS -+ ands r1, r1, r2 -+ bne _init_data /* branch if OSCBYPASS=1 */ -+ - /* Test if main oscillator is enabled */ - ldr r0,=AT91C_PMC_SR - ldr r1, [r0] -diff --git a/include/part.h b/include/part.h -index ba5985a..bbd33fe 100644 ---- a/include/part.h -+++ b/include/part.h -@@ -35,7 +35,11 @@ - - #ifdef AT91SAM9260 - #include "AT91SAM9260_inc.h" --#include "at91sam9260ek.h" -+ #ifdef at91sam9260ek -+ #include "at91sam9260ek.h" -+ #elif qil_a9260 -+ #include "qil-a9260.h" -+ #endif - #endif - - #ifdef AT91SAM9XE --- -1.5.6.3 - diff --git a/board/calao/qil-a9260/patches/barebox/0001-qil-a9260.patch b/board/calao/qil-a9260/patches/barebox/0001-qil-a9260.patch deleted file mode 100644 index a74e657066..0000000000 --- a/board/calao/qil-a9260/patches/barebox/0001-qil-a9260.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d076aa6182dc6df6bb311e60bbddb03573b9483b Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Fri, 3 Aug 2012 11:25:49 +0200 -Subject: [PATCH] Enable pull-up on Rx serial ports for the CALAO MB-QIL-A9260 - - -Signed-off-by: Gregory Hermant ---- - arch/arm/boards/qil-a9260/init.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/arch/arm/boards/qil-a9260/init.c b/arch/arm/boards/qil-a9260/init.c -index 305d733..b43cace 100644 ---- a/arch/arm/boards/qil-a9260/init.c -+++ b/arch/arm/boards/qil-a9260/init.c -@@ -196,11 +196,17 @@ device_initcall(qil_a9260_devices_init); - static int qil_a9260_console_init(void) - { - at91_register_uart(0, 0); -+ at91_set_A_periph(AT91_PIN_PB14, 1); /* Enable pull-up on DRXD */ -+ - at91_register_uart(1, ATMEL_UART_CTS | ATMEL_UART_RTS - | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD - | ATMEL_UART_RI); -+ - at91_register_uart(2, ATMEL_UART_CTS | ATMEL_UART_RTS); -+ at91_set_A_periph(AT91_PIN_PB7, 1); /* Enable pull-up on RXD1 */ -+ - at91_register_uart(3, ATMEL_UART_CTS | ATMEL_UART_RTS); -+ at91_set_A_periph(AT91_PIN_PB9, 1); /* Enable pull-up on RXD2 */ - - return 0; - } --- -1.5.6.3 - diff --git a/board/calao/qil-a9260/patches/linux/0001-qil-a9260.patch b/board/calao/qil-a9260/patches/linux/0001-qil-a9260.patch deleted file mode 100644 index 5d355d23cc..0000000000 --- a/board/calao/qil-a9260/patches/linux/0001-qil-a9260.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fe6432a9728b62bce3db73c5a4efe026018fd495 Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Fri, 3 Aug 2012 16:45:37 +0200 -Subject: [PATCH] QIL-A9260: rtc modalias m41t48 renamed to rtc-m41t48 - - -Signed-off-by: Gregory Hermant ---- - arch/arm/mach-at91/board-qil-a9260.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c -index bf351e2..c0df05c 100644 ---- a/arch/arm/mach-at91/board-qil-a9260.c -+++ b/arch/arm/mach-at91/board-qil-a9260.c -@@ -78,7 +78,7 @@ static struct at91_udc_data __initdata ek_udc_data = { - static struct spi_board_info ek_spi_devices[] = { - #if defined(CONFIG_RTC_DRV_M41T94) - { /* M41T94 RTC */ -- .modalias = "m41t94", -+ .modalias = "rtc-m41t94", - .chip_select = 0, - .max_speed_hz = 1 * 1000 * 1000, - .bus_num = 0, --- -1.5.6.3 - diff --git a/board/calao/tny-a9g20-lpw/at91bootstrap-1.16-tny-a9g20-lpw.patch b/board/calao/tny-a9g20-lpw/at91bootstrap-1.16-tny-a9g20-lpw.patch deleted file mode 100644 index 71746ce5ae..0000000000 --- a/board/calao/tny-a9g20-lpw/at91bootstrap-1.16-tny-a9g20-lpw.patch +++ /dev/null @@ -1,551 +0,0 @@ -From 53bd82b122f4530a98cba45795832820bb1d0b45 Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Mon, 13 Aug 2012 11:26:10 +0200 -Subject: [PATCH] Add support for the Calao-systems TNY-A9G20-LPW - - -Signed-off-by: Gregory Hermant ---- - board/tny_a9g20_lpw/nandflash/Makefile | 121 ++++++++++++ - board/tny_a9g20_lpw/nandflash/tny-a9g20-lpw.h | 114 ++++++++++++ - board/tny_a9g20_lpw/tny_a9g20_lpw.c | 243 +++++++++++++++++++++++++ - crt0_gnu.S | 6 + - include/part.h | 6 +- - 5 files changed, 489 insertions(+), 1 deletion(-) - create mode 100644 board/tny_a9g20_lpw/nandflash/Makefile - create mode 100644 board/tny_a9g20_lpw/nandflash/tny-a9g20-lpw.h - create mode 100644 board/tny_a9g20_lpw/tny_a9g20_lpw.c - -diff --git a/board/tny_a9g20_lpw/nandflash/Makefile b/board/tny_a9g20_lpw/nandflash/Makefile -new file mode 100644 -index 0000000..7efbea7 ---- /dev/null -+++ b/board/tny_a9g20_lpw/nandflash/Makefile -@@ -0,0 +1,121 @@ -+# TODO: set this appropriately for your local toolchain -+ifndef ERASE_FCT -+ERASE_FCT=rm -f -+endif -+ifndef CROSS_COMPILE -+CROSS_COMPILE=arm-elf- -+endif -+ -+TOOLCHAIN=gcc -+ -+BOOTSTRAP_PATH=../../.. -+ -+# NandFlashBoot Configuration for AT91SAM9260EK -+ -+# Target name (case sensitive!!!) -+TARGET=AT91SAM9G20 -+# Board name (case sensitive!!!) -+BOARD=tny_a9g20_lpw -+# Link Address and Top_of_Memory -+LINK_ADDR=0x200000 -+TOP_OF_MEMORY=0x301000 -+# Name of current directory -+PROJECT=nandflash -+ -+ifndef BOOT_NAME -+BOOT_NAME=$(PROJECT)_$(BOARD) -+endif -+ -+INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT) -+ -+ifeq ($(TOOLCHAIN), gcc) -+ -+AS=$(CROSS_COMPILE)gcc -+CC=$(CROSS_COMPILE)gcc -+LD=$(CROSS_COMPILE)gcc -+NM= $(CROSS_COMPILE)nm -+SIZE=$(CROSS_COMPILE)size -+OBJCOPY=$(CROSS_COMPILE)objcopy -+OBJDUMP=$(CROSS_COMPILE)objdump -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) -+ -+# Linker flags. -+# -Wl,...: tell GCC to pass this to linker. -+# -Map: create map file -+# --cref: add cross reference to map file -+LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref -+LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR) -+OBJS=crt0_gnu.o -+ -+endif -+ -+OBJS+=\ -+ $(BOARD).o \ -+ main.o \ -+ gpio.o \ -+ pmc.o \ -+ debug.o \ -+ sdramc.o \ -+ nandflash.o \ -+ _udivsi3.o \ -+ _umodsi3.o \ -+ div0.o \ -+ udiv.o \ -+ string.o -+ -+rebuild: clean all -+ -+all: $(BOOT_NAME) -+ -+ifeq ($(TOOLCHAIN), gcc) -+$(BOOT_NAME): $(OBJS) -+ $(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS) -+ $(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin -+endif -+ -+ -+$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o -+ -+main.o: $(BOOTSTRAP_PATH)/main.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o -+ -+gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o -+ -+pmc.o: $(BOOTSTRAP_PATH)/driver/pmc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o -+ -+debug.o: $(BOOTSTRAP_PATH)/driver/debug.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o -+ -+sdramc.o: $(BOOTSTRAP_PATH)/driver/sdramc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o -+ -+dataflash.o: $(BOOTSTRAP_PATH)/driver/dataflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o -+ -+nandflash.o: $(BOOTSTRAP_PATH)/driver/nandflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o -+ -+crt0_gnu.o: $(BOOTSTRAP_PATH)/crt0_gnu.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o -+ -+div0.o: $(BOOTSTRAP_PATH)/lib/div0.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o -+ -+string.o: $(BOOTSTRAP_PATH)/lib/string.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o -+ -+udiv.o: $(BOOTSTRAP_PATH)/lib/udiv.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o -+ -+_udivsi3.o: $(BOOTSTRAP_PATH)/lib/_udivsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o -+ -+_umodsi3.o: $(BOOTSTRAP_PATH)/lib/_umodsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o -+ -+clean: -+ $(ERASE_FCT) *.o *.bin *.elf *.map -diff --git a/board/tny_a9g20_lpw/nandflash/tny-a9g20-lpw.h b/board/tny_a9g20_lpw/nandflash/tny-a9g20-lpw.h -new file mode 100644 -index 0000000..b1f8a1d ---- /dev/null -+++ b/board/tny_a9g20_lpw/nandflash/tny-a9g20-lpw.h -@@ -0,0 +1,114 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2008, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : tny-a9g20-lpw.h -+ * Object : -+ * Creation : GH August 13th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#ifndef _TNY_A9G20_LPW_H -+#define _TNY_A9G20_LPW_H -+ -+/* ******************************************************************* */ -+/* PMC Settings */ -+/* */ -+/* The main oscillator is enabled as soon as possible in the c_startup */ -+/* and MCK is switched on the main oscillator. */ -+/* PLL initialization is done later in the hw_init() function */ -+/* ******************************************************************* */ -+#define MASTER_CLOCK (100000000) -+#define PLL_LOCK_TIMEOUT 1000000 -+ -+/* set PLLA to 800Mhz from MAINCK= 12Mhz MULA=199 (0xC7+1= 200), DIVA=0x03 (Fplla=12Mhz x [(199+1)/3]=800Mhz) */ -+#define PLLA_SETTINGS 0x20C73F03 -+#define PLLB_SETTINGS 0x100F3F02 -+ -+/* Switch MCK on PLLA output PCK = PLLA/2 = 3 * MCK */ -+/* LP-SDRAM (fmax=100Mhz) PDIV=0 => PRESCALER CLK=PCLK; */ -+/* MDIV = 2 => PRESCALER CLK / 4 = MCLK=100Mhz */ -+/* PRESCALER CLK = PLLA (800Mhz) / 2 (PRES=1) = 400Mhz */ -+#define MCKR_SETTINGS 0x0204 -+#define MCKR_CSS_SETTINGS (AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS) -+ -+/* ******************************************************************* */ -+/* NandFlash Settings */ -+/* */ -+/* ******************************************************************* */ -+#define AT91C_SMARTMEDIA_BASE 0x40000000 -+ -+#define AT91_SMART_MEDIA_ALE (1 << 21) /* our ALE is AD21 */ -+#define AT91_SMART_MEDIA_CLE (1 << 22) /* our CLE is AD22 */ -+ -+#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0) -+#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0) -+ -+#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13)) -+ -+ -+/* ******************************************************************** */ -+/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 100000000.*/ -+/* Please refer to SMC section in AT91SAM9 datasheet to learn how */ -+/* to generate these values. */ -+/* ******************************************************************** */ -+#define AT91C_SM_NWE_SETUP (1 << 0) -+#define AT91C_SM_NCS_WR_SETUP (0 << 8) -+#define AT91C_SM_NRD_SETUP (1 << 16) -+#define AT91C_SM_NCS_RD_SETUP (0 << 24) -+ -+#define AT91C_SM_NWE_PULSE (3 << 0) -+#define AT91C_SM_NCS_WR_PULSE (3 << 8) -+#define AT91C_SM_NRD_PULSE (3 << 16) -+#define AT91C_SM_NCS_RD_PULSE (3 << 24) -+ -+#define AT91C_SM_NWE_CYCLE (5 << 0) -+#define AT91C_SM_NRD_CYCLE (5 << 16) -+ -+#define AT91C_SM_TDF (2 << 16) -+ -+/* ******************************************************************* */ -+/* BootStrap Settings */ -+/* */ -+/* ******************************************************************* */ -+#define IMG_ADDRESS 0x20000 /* Image Address in NandFlash */ -+#define IMG_SIZE 0x40000 /* Image Size in NandFlash */ -+ -+#define MACH_TYPE 0x80B /* TNY-A9G20 */ -+#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+ -+/* ******************************************************************* */ -+/* Application Settings */ -+/* ******************************************************************* */ -+#undef CFG_DEBUG -+#undef CFG_DATAFLASH -+ -+#define CFG_NANDFLASH -+#undef NANDFLASH_SMALL_BLOCKS /* NANDFLASH_LARGE_BLOCKS used instead */ -+ -+#define CFG_SDRAM -+#define CFG_HW_INIT -+ -+#endif /* _TNY_A9G20_LPW_H */ -diff --git a/board/tny_a9g20_lpw/tny_a9g20_lpw.c b/board/tny_a9g20_lpw/tny_a9g20_lpw.c -new file mode 100644 -index 0000000..cef9055 ---- /dev/null -+++ b/board/tny_a9g20_lpw/tny_a9g20_lpw.c -@@ -0,0 +1,243 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2008, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : tny_a9g20_lpw.c -+ * Object : -+ * Creation : GH August 13th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#include "../../include/part.h" -+#include "../../include/gpio.h" -+#include "../../include/pmc.h" -+#include "../../include/debug.h" -+#include "../../include/sdramc.h" -+#include "../../include/main.h" -+#ifdef CFG_NANDFLASH -+#include "../../include/nandflash.h" -+#endif -+ -+static inline unsigned int get_cp15(void) -+{ -+ unsigned int value; -+ __asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value)); -+ return value; -+} -+ -+static inline void set_cp15(unsigned int value) -+{ -+ __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); -+} -+ -+#ifdef CFG_HW_INIT -+/*----------------------------------------------------------------------------*/ -+/* \fn hw_init */ -+/* \brief This function performs very low level HW initialization */ -+/* This function is invoked as soon as possible during the c_startup */ -+/* The bss segment must be initialized */ -+/*----------------------------------------------------------------------------*/ -+void hw_init(void) -+{ -+ unsigned int cp15; -+ -+ /* Configure PIOs */ -+ const struct pio_desc hw_pio[] = { -+#ifdef CFG_DEBUG -+ {"RXD", AT91C_PIN_PB(14), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"TXD", AT91C_PIN_PB(15), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#endif -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Disable watchdog */ -+ writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR); -+ -+ /* At this stage the main oscillator is supposed to be enabled -+ * PCK = MCK = MOSC */ -+ writel(0x00, AT91C_BASE_PMC + PMC_PLLICPR); -+ -+ /* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */ -+ pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* PCK = PLLA/2 = 3 * MCK */ -+ pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT); -+ /* Switch MCK on PLLA output */ -+ pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* Configure PLLB */ -+ pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* Configure CP15 */ -+ cp15 = get_cp15(); -+ cp15 |= I_CACHE; -+ set_cp15(cp15); -+ -+ /* Configure the PIO controller */ -+ pio_setup(hw_pio); -+ -+ /* Configure the EBI Slave Slot Cycle to 64 */ -+ writel((readl((AT91C_BASE_MATRIX + MATRIX_SCFG3)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG3)); -+ -+#ifdef CFG_DEBUG -+ /* Enable Debug messages on the DBGU */ -+ dbg_init(BAUDRATE(MASTER_CLOCK, 115200)); -+ -+ dbg_print("Start AT91Bootstrap...\n\r"); -+#endif /* CFG_DEBUG */ -+ -+#ifdef CFG_SDRAM -+ /* Initialize the matrix (slow slew rate enabled and LPSDRAM memory voltage = 1.8V) */ -+ writel(((readl(AT91C_BASE_CCFG + CCFG_EBICSA)) | AT91C_EBI_CS1A_SDRAMC | (1<<17)) & ~0x00010000, AT91C_BASE_CCFG + CCFG_EBICSA); -+ -+ /* Configure SDRAM Controller */ -+ sdram_init( AT91C_SDRAMC_NC_9 | -+ AT91C_SDRAMC_NR_13 | -+ AT91C_SDRAMC_CAS_3 | -+ AT91C_SDRAMC_NB_4_BANKS | -+ AT91C_SDRAMC_DBW_32_BITS | -+ AT91C_SDRAMC_TWR_2 | -+ AT91C_SDRAMC_TRC_7 | -+ AT91C_SDRAMC_TRP_2 | -+ AT91C_SDRAMC_TRCD_2 | -+ AT91C_SDRAMC_TRAS_5 | -+ AT91C_SDRAMC_TXSR_8, /* Control Register */ -+ (MASTER_CLOCK * 7)/1000000, /* Refresh Timer Register */ -+ AT91C_SDRAMC_MD_LOW_POWER_SDRAM); /* SDRAM (low power) */ -+ -+#endif /* CFG_SDRAM */ -+} -+#endif /* CFG_HW_INIT */ -+ -+#ifdef CFG_SDRAM -+/*------------------------------------------------------------------------------*/ -+/* \fn sdramc_hw_init */ -+/* \brief This function performs SDRAMC HW initialization */ -+/*------------------------------------------------------------------------------*/ -+void sdramc_hw_init(void) -+{ -+ /* Configure PIOs */ -+/* const struct pio_desc sdramc_pio[] = { -+ {"D16", AT91C_PIN_PC(16), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D17", AT91C_PIN_PC(17), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D18", AT91C_PIN_PC(18), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D19", AT91C_PIN_PC(19), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D20", AT91C_PIN_PC(20), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D21", AT91C_PIN_PC(21), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D22", AT91C_PIN_PC(22), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D23", AT91C_PIN_PC(23), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D24", AT91C_PIN_PC(24), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D25", AT91C_PIN_PC(25), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D26", AT91C_PIN_PC(26), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D27", AT91C_PIN_PC(27), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D28", AT91C_PIN_PC(28), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D29", AT91C_PIN_PC(29), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D30", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D31", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+*/ -+ /* Configure the SDRAMC PIO controller to output PCK0 */ -+/* pio_setup(sdramc_pio); */ -+ -+ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0)); -+ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0)); -+ -+} -+#endif /* CFG_SDRAM */ -+ -+#ifdef CFG_NANDFLASH -+/*------------------------------------------------------------------------------*/ -+/* \fn nand_recovery */ -+/* \brief This function erases NandFlash Block 0 if BP4 is pressed */ -+/* during boot sequence */ -+/*------------------------------------------------------------------------------*/ -+static void nand_recovery(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc bp4_pio[] = { -+ {"BP4", AT91C_PIN_PA(31), 0, PIO_PULLUP, PIO_INPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOA), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(bp4_pio); -+ -+ /* If BP4 is pressed during Boot sequence */ -+ /* Erase NandFlash block 0*/ -+ if (!pio_get_value(AT91C_PIN_PA(31)) ) -+ AT91F_NandEraseBlock0(); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_hw_init */ -+/* \brief NandFlash HW init */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc nand_pio[] = { -+ {"RDY_BSY", AT91C_PIN_PC(13), 0, PIO_PULLUP, PIO_INPUT}, -+ {"NANDCS", AT91C_PIN_PC(14), 0, PIO_PULLUP, PIO_OUTPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */ -+ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA); -+ -+ /* Configure SMC CS3 */ -+ writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3); -+ writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3); -+ writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE) , AT91C_BASE_SMC + SMC_CYCLE3); -+ writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | -+ AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF) , AT91C_BASE_SMC + SMC_CTRL3); -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOC), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(nand_pio); -+ -+ nand_recovery(); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_cfg_16bits_dbw_init */ -+/* \brief Configure SMC in 16 bits mode */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_cfg_16bits_dbw_init(void) -+{ -+ writel(readl(AT91C_BASE_SMC + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC + SMC_CTRL3); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_cfg_8bits_dbw_init */ -+/* \brief Configure SMC in 8 bits mode */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_cfg_8bits_dbw_init(void) -+{ -+ writel((readl(AT91C_BASE_SMC + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC + SMC_CTRL3); -+} -+ -+#endif /* #ifdef CFG_NANDFLASH */ -diff --git a/crt0_gnu.S b/crt0_gnu.S -index 042b617..c6cd49d 100644 ---- a/crt0_gnu.S -+++ b/crt0_gnu.S -@@ -106,6 +106,12 @@ _relocate_to_sram: - #endif /* CFG_NORFLASH */ - - _setup_clocks: -+/* Test if main osc is bypassed */ -+ ldr r0,=AT91C_PMC_MOR -+ ldr r1, [r0] -+ ldr r2,=AT91C_CKGR_OSCBYPASS -+ ands r1, r1, r2 -+ bne _init_data /* branch if OSCBYPASS=1 */ - /* Test if main oscillator is enabled */ - ldr r0,=AT91C_PMC_SR - ldr r1, [r0] -diff --git a/include/part.h b/include/part.h -index ba5985a..ab79af1 100644 ---- a/include/part.h -+++ b/include/part.h -@@ -46,7 +46,11 @@ - - #ifdef AT91SAM9G20 - #include "AT91SAM9260_inc.h" --#include "at91sam9g20ek.h" -+ #ifdef at91sam9g20ek -+ #include "at91sam9g20ek.h" -+ #elif tny_a9g20_lpw -+ #include "tny-a9g20-lpw.h" -+ #endif - #endif - - #ifdef AT91SAM9261 --- -1.7.9.5 - diff --git a/board/calao/tny-a9g20-lpw/linux-3.9.config b/board/calao/tny-a9g20-lpw/linux-3.9.config deleted file mode 100644 index 797c15a4dd..0000000000 --- a/board/calao/tny-a9g20-lpw/linux-3.9.config +++ /dev/null @@ -1,187 +0,0 @@ -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_KALLSYMS_ALL=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_LBDAF is not set -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_SOC_AT91SAM9260=y -CONFIG_SOC_AT91SAM9263=y -CONFIG_SOC_AT91SAM9G45=y -CONFIG_SOC_AT91SAM9X5=y -CONFIG_SOC_AT91SAM9N12=y -CONFIG_MACH_AT91SAM_DT=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -CONFIG_AT91_TIMER_HZ=128 -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" -CONFIG_KEXEC=y -CONFIG_AUTO_ZRELADDR=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_PNP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_DIAG is not set -CONFIG_IPV6=y -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -CONFIG_IPV6_SIT_6RD=y -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_STANDALONE is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_GLUEBI=y -CONFIG_PROC_DEVICETREE=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=4 -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_ATMEL_PWM=y -CONFIG_ATMEL_TCLIB=y -CONFIG_EEPROM_93CX6=m -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_LOWLEVEL is not set -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_FARADAY is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SMSC is not set -# CONFIG_NET_VENDOR_STMICRO is not set -CONFIG_DAVICOM_PHY=y -CONFIG_MICREL_PHY=y -# CONFIG_WLAN is not set -CONFIG_INPUT_POLLDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=480 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272 -CONFIG_INPUT_JOYDEV=y -CONFIG_INPUT_EVDEV=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_SERIO is not set -CONFIG_LEGACY_PTY_COUNT=4 -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_GPIO=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_AT91SAM9X_WATCHDOG=y -CONFIG_SSB=m -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_ATMEL=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_ATMEL_LCDC=y -# CONFIG_BACKLIGHT_GENERIC is not set -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_ACORN_8x8=y -CONFIG_FONT_MINI_4x6=y -CONFIG_LOGO=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_ACM=y -CONFIG_USB_STORAGE=y -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_FTDI_SIO=y -CONFIG_USB_SERIAL_PL2303=y -CONFIG_USB_GADGET=y -CONFIG_USB_AT91=m -CONFIG_USB_ETH=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_CDC_COMPOSITE=m -CONFIG_USB_G_ACM_MS=m -CONFIG_USB_G_MULTI=m -CONFIG_USB_G_MULTI_CDC=y -CONFIG_MMC=y -CONFIG_MMC_ATMELMCI=y -CONFIG_MMC_SPI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91RM9200=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_DMADEVICES=y -# CONFIG_IOMMU_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_FANOTIFY=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_STRIP_ASM_SYMS=y -CONFIG_DEBUG_FS=y -# CONFIG_SCHED_DEBUG is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ARC4=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m -# CONFIG_CRYPTO_HW is not set -CONFIG_CRC_CCITT=m -CONFIG_AVERAGE=y diff --git a/board/calao/usb-a9260/at91bootstrap-1.16-usb-a9260.patch b/board/calao/usb-a9260/at91bootstrap-1.16-usb-a9260.patch deleted file mode 100644 index 1393677dfc..0000000000 --- a/board/calao/usb-a9260/at91bootstrap-1.16-usb-a9260.patch +++ /dev/null @@ -1,603 +0,0 @@ -From 43e8c90f13806405bde8eaaf3a956d0ddc806f64 Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Tue, 2 Oct 2012 09:19:15 +0200 -Subject: [PATCH] Add support for the USB-A9260 - - -Signed-off-by: Gregory Hermant ---- - board/usb_a9260/nandflash/Makefile | 122 ++++++++++++++ - board/usb_a9260/nandflash/usb-a9260.h | 109 ++++++++++++ - board/usb_a9260/usb_a9260.c | 298 +++++++++++++++++++++++++++++++++ - crt0_gnu.S | 7 + - include/part.h | 6 +- - 5 files changed, 541 insertions(+), 1 deletion(-) - create mode 100644 board/usb_a9260/nandflash/Makefile - create mode 100644 board/usb_a9260/nandflash/usb-a9260.h - create mode 100644 board/usb_a9260/usb_a9260.c - -diff --git a/board/usb_a9260/nandflash/Makefile b/board/usb_a9260/nandflash/Makefile -new file mode 100644 -index 0000000..02f4b50 ---- /dev/null -+++ b/board/usb_a9260/nandflash/Makefile -@@ -0,0 +1,122 @@ -+# TODO: set this appropriately for your local toolchain -+ifndef ERASE_FCT -+ERASE_FCT=rm -f -+endif -+ifndef CROSS_COMPILE -+CROSS_COMPILE=arm-elf- -+endif -+ -+TOOLCHAIN=gcc -+ -+BOOTSTRAP_PATH=../../.. -+ -+# NandFlashBoot Configuration for USB-A9260 -+ -+# Target name (case sensitive!!!) -+TARGET=AT91SAM9260 -+# Board name (case sensitive!!!) -+BOARD=usb_a9260 -+# Link Address and Top_of_Memory -+LINK_ADDR=0x200000 -+TOP_OF_MEMORY=0x301000 -+# Name of current directory -+PROJECT=nandflash -+ -+ifndef BOOT_NAME -+BOOT_NAME=$(PROJECT)_$(BOARD) -+endif -+ -+INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT) -+ -+ifeq ($(TOOLCHAIN), gcc) -+ -+AS=$(CROSS_COMPILE)gcc -+CC=$(CROSS_COMPILE)gcc -+LD=$(CROSS_COMPILE)gcc -+NM= $(CROSS_COMPILE)nm -+SIZE=$(CROSS_COMPILE)size -+OBJCOPY=$(CROSS_COMPILE)objcopy -+OBJDUMP=$(CROSS_COMPILE)objdump -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) -+ -+# Linker flags. -+# -Wl,...: tell GCC to pass this to linker. -+# -Map: create map file -+# --cref: add cross reference to map file -+LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref -+LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR) -+OBJS=crt0_gnu.o -+ -+endif -+ -+OBJS+=\ -+ $(BOARD).o \ -+ main.o \ -+ gpio.o \ -+ pmc.o \ -+ debug.o \ -+ sdramc.o \ -+ nandflash.o \ -+ _udivsi3.o \ -+ _umodsi3.o \ -+ div0.o \ -+ udiv.o \ -+ string.o -+ -+ -+rebuild: clean all -+ -+all: $(BOOT_NAME) -+ -+ifeq ($(TOOLCHAIN), gcc) -+$(BOOT_NAME): $(OBJS) -+ $(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS) -+ $(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin -+endif -+ -+ -+$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o -+ -+main.o: $(BOOTSTRAP_PATH)/main.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o -+ -+gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o -+ -+pmc.o: $(BOOTSTRAP_PATH)/driver/pmc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o -+ -+debug.o: $(BOOTSTRAP_PATH)/driver/debug.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o -+ -+sdramc.o: $(BOOTSTRAP_PATH)/driver/sdramc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o -+ -+dataflash.o: $(BOOTSTRAP_PATH)/driver/dataflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o -+ -+nandflash.o: $(BOOTSTRAP_PATH)/driver/nandflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o -+ -+crt0_gnu.o: $(BOOTSTRAP_PATH)/crt0_gnu.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o -+ -+div0.o: $(BOOTSTRAP_PATH)/lib/div0.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o -+ -+string.o: $(BOOTSTRAP_PATH)/lib/string.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o -+ -+udiv.o: $(BOOTSTRAP_PATH)/lib/udiv.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o -+ -+_udivsi3.o: $(BOOTSTRAP_PATH)/lib/_udivsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o -+ -+_umodsi3.o: $(BOOTSTRAP_PATH)/lib/_umodsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o -+ -+clean: -+ $(ERASE_FCT) *.o *.bin *.elf *.map -diff --git a/board/usb_a9260/nandflash/usb-a9260.h b/board/usb_a9260/nandflash/usb-a9260.h -new file mode 100644 -index 0000000..2aaf759 ---- /dev/null -+++ b/board/usb_a9260/nandflash/usb-a9260.h -@@ -0,0 +1,109 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2006, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : usb-a9260.h -+ * Object : -+ * Creation : GH Oct 1th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#ifndef _USB_A9260_H -+#define _USB_A9260_H -+ -+/* ******************************************************************* */ -+/* PMC Settings */ -+/* */ -+/* The main oscillator is enabled as soon as possible in the c_startup */ -+/* and MCK is switched on the main oscillator. */ -+/* PLL initialization is done later in the hw_init() function */ -+/* ******************************************************************* */ -+#define MASTER_CLOCK (180000000/2) -+#define PLL_LOCK_TIMEOUT 1000000 -+ -+#define PLLA_SETTINGS 0x20593F06 -+#define PLLB_SETTINGS 0x10483F0E -+ -+/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */ -+#define MCKR_SETTINGS (AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2) -+#define MCKR_CSS_SETTINGS (AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS) -+ -+/* ******************************************************************* */ -+/* NandFlash Settings */ -+/* */ -+/* ******************************************************************* */ -+#define AT91C_SMARTMEDIA_BASE 0x40000000 -+ -+#define AT91_SMART_MEDIA_ALE (1 << 21) /* our ALE is AD21 */ -+#define AT91_SMART_MEDIA_CLE (1 << 22) /* our CLE is AD22 */ -+ -+#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0) -+#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0) -+ -+#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13)) -+ -+ -+/* ******************************************************************** */ -+/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 90000000.*/ -+/* Please refer to SMC section in AT91SAM datasheet to learn how */ -+/* to generate these values. */ -+/* ******************************************************************** */ -+#define AT91C_SM_NWE_SETUP (1 << 0) -+#define AT91C_SM_NCS_WR_SETUP (0 << 8) -+#define AT91C_SM_NRD_SETUP (1 << 16) -+#define AT91C_SM_NCS_RD_SETUP (0 << 24) -+ -+#define AT91C_SM_NWE_PULSE (3 << 0) -+#define AT91C_SM_NCS_WR_PULSE (3 << 8) -+#define AT91C_SM_NRD_PULSE (3 << 16) -+#define AT91C_SM_NCS_RD_PULSE (3 << 24) -+ -+#define AT91C_SM_NWE_CYCLE (5 << 0) -+#define AT91C_SM_NRD_CYCLE (5 << 16) -+#define AT91C_SM_TDF (2 << 16) -+ -+/* ******************************************************************* */ -+/* BootStrap Settings */ -+/* */ -+/* ******************************************************************* */ -+#define IMG_ADDRESS 0x20000 /* Image Address in NandFlash */ -+#define IMG_SIZE 0x40000 /* Image Size in NandFlash */ -+ -+#define MACH_TYPE 0x6AD /* USB-A9260 */ -+#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+ -+/* ******************************************************************* */ -+/* Application Settings */ -+/* ******************************************************************* */ -+#undef CFG_DEBUG -+#undef CFG_DATAFLASH -+ -+#define CFG_NANDFLASH -+#undef NANDFLASH_SMALL_BLOCKS /* NANDFLASH_LARGE_BLOCKS used instead */ -+ -+#define CFG_HW_INIT -+#define CFG_SDRAM -+ -+#endif /* _USB_A9260_H */ -diff --git a/board/usb_a9260/usb_a9260.c b/board/usb_a9260/usb_a9260.c -new file mode 100644 -index 0000000..de30f0b ---- /dev/null -+++ b/board/usb_a9260/usb_a9260.c -@@ -0,0 +1,298 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2006, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaiimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : usb_a9260.c -+ * Object : -+ * Creation : GH Oct 1th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#include "../../include/part.h" -+#include "../../include/gpio.h" -+#include "../../include/pmc.h" -+#include "../../include/debug.h" -+#include "../../include/sdramc.h" -+#include "../../include/main.h" -+#ifdef CFG_NANDFLASH -+#include "../../include/nandflash.h" -+#endif -+#ifdef CFG_DATAFLASH -+#include "../../include/dataflash.h" -+#endif -+ -+static inline unsigned int get_cp15(void) -+{ -+ unsigned int value; -+ __asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value)); -+ return value; -+} -+ -+static inline void set_cp15(unsigned int value) -+{ -+ __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); -+} -+ -+#ifdef CFG_HW_INIT -+/*----------------------------------------------------------------------------*/ -+/* \fn hw_init */ -+/* \brief This function performs very low level HW initialization */ -+/* This function is invoked as soon as possible during the c_startup */ -+/* The bss segment must be initialized */ -+/*----------------------------------------------------------------------------*/ -+void hw_init(void) -+{ -+ unsigned int cp15; -+ -+ /* Configure PIOs */ -+ const struct pio_desc hw_pio[] = { -+#ifdef CFG_DEBUG -+ {"RXD", AT91C_PIN_PB(14), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"TXD", AT91C_PIN_PB(15), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#endif -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Disable watchdog */ -+ writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR); -+ -+ /* At this stage the main oscillator is supposed to be enabled -+ * PCK = MCK = MOSC */ -+ -+ /* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */ -+ pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* PCK = PLLA = 2 * MCK */ -+ pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT); -+ /* Switch MCK on PLLA output */ -+ pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* Configure PLLB */ -+ pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* Configure CP15 */ -+ cp15 = get_cp15(); -+ cp15 |= I_CACHE; -+ set_cp15(cp15); -+ -+ /* Configure the PIO controller */ -+ pio_setup(hw_pio); -+ -+ /* Configure the EBI Slave Slot Cycle to 64 */ -+ writel( (readl((AT91C_BASE_MATRIX + MATRIX_SCFG3)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG3)); -+ -+#ifdef CFG_DEBUG -+ /* Enable Debug messages on the DBGU */ -+ dbg_init(BAUDRATE(MASTER_CLOCK, 115200)); -+ -+ dbg_print("Start AT91Bootstrap...\n\r"); -+#endif /* CFG_DEBUG */ -+ -+#ifdef CFG_SDRAM -+ /* Initialize the matrix */ -+ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS1A_SDRAMC, AT91C_BASE_CCFG + CCFG_EBICSA); -+ -+ /* Configure SDRAM Controller */ -+ sdram_init( AT91C_SDRAMC_NC_9 | -+ AT91C_SDRAMC_NR_13 | -+ AT91C_SDRAMC_CAS_2 | -+ AT91C_SDRAMC_NB_4_BANKS | -+ AT91C_SDRAMC_DBW_32_BITS | -+ AT91C_SDRAMC_TWR_2 | -+ AT91C_SDRAMC_TRC_7 | -+ AT91C_SDRAMC_TRP_2 | -+ AT91C_SDRAMC_TRCD_2 | -+ AT91C_SDRAMC_TRAS_5 | -+ AT91C_SDRAMC_TXSR_8, /* Control Register */ -+ (MASTER_CLOCK * 7)/1000000, /* Refresh Timer Register */ -+ AT91C_SDRAMC_MD_SDRAM); /* SDRAM (no low power) */ -+ -+ -+#endif /* CFG_SDRAM */ -+} -+#endif /* CFG_HW_INIT */ -+ -+#ifdef CFG_SDRAM -+/*------------------------------------------------------------------------------*/ -+/* \fn sdramc_hw_init */ -+/* \brief This function performs SDRAMC HW initialization */ -+/*------------------------------------------------------------------------------*/ -+void sdramc_hw_init(void) -+{ -+ /* Configure PIOs */ -+/* const struct pio_desc sdramc_pio[] = { -+ {"D16", AT91C_PIN_PC(16), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D17", AT91C_PIN_PC(17), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D18", AT91C_PIN_PC(18), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D19", AT91C_PIN_PC(19), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D20", AT91C_PIN_PC(20), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D21", AT91C_PIN_PC(21), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D22", AT91C_PIN_PC(22), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D23", AT91C_PIN_PC(23), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D24", AT91C_PIN_PC(24), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D25", AT91C_PIN_PC(25), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D26", AT91C_PIN_PC(26), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D27", AT91C_PIN_PC(27), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D28", AT91C_PIN_PC(28), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D29", AT91C_PIN_PC(29), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D30", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D31", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+*/ -+ /* Configure the SDRAMC PIO controller to output PCK0 */ -+/* pio_setup(sdramc_pio); */ -+ -+ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0)); -+ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0)); -+ -+} -+#endif /* CFG_SDRAM */ -+ -+#ifdef CFG_DATAFLASH -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn df_recovery */ -+/* \brief This function erases DataFlash Page 0 if USR PB is pressed */ -+/* during boot sequence */ -+/*------------------------------------------------------------------------------*/ -+void df_recovery(AT91PS_DF pDf) -+{ -+#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH) -+ /* Configure PIOs */ -+ const struct pio_desc usrpb_pio[] = { -+ {"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(usrpb_pio); -+ -+ /* If USR PB is pressed during Boot sequence */ -+ /* Erase DataFlash Page 0*/ -+ if ( !pio_get_value(AT91C_PIN_PB(10)) ) -+ df_page_erase(pDf, 0); -+#endif -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn df_hw_init */ -+/* \brief This function performs DataFlash HW initialization */ -+/*------------------------------------------------------------------------------*/ -+void df_hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc df_pio[] = { -+ {"MISO", AT91C_PIN_PA(0), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"MOSI", AT91C_PIN_PA(1), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"SPCK", AT91C_PIN_PA(2), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH) -+ {"NPCS0", AT91C_PIN_PA(3), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#endif -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ pio_setup(df_pio); -+} -+#endif /* CFG_DATAFLASH */ -+ -+ -+ -+#ifdef CFG_NANDFLASH -+/*------------------------------------------------------------------------------*/ -+/* \fn nand_recovery */ -+/* \brief This function erases NandFlash Block 0 if USR PB is pressed */ -+/* during boot sequence */ -+/*------------------------------------------------------------------------------*/ -+static void nand_recovery(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc usrpb_pio[] = { -+ {"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(usrpb_pio); -+ -+ /* If USR PB is pressed during Boot sequence */ -+ /* Erase NandFlash block 0*/ -+ if (!pio_get_value(AT91C_PIN_PB(10)) ) -+ AT91F_NandEraseBlock0(); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_hw_init */ -+/* \brief NandFlash HW init */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc nand_pio[] = { -+ {"RDY_BSY", AT91C_PIN_PC(13), 0, PIO_PULLUP, PIO_INPUT}, -+ {"NANDCS", AT91C_PIN_PC(14), 0, PIO_PULLUP, PIO_OUTPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */ -+ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA); -+ -+ /* Configure SMC CS3 */ -+ writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3); -+ writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3); -+ writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE) , AT91C_BASE_SMC + SMC_CYCLE3); -+ writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | -+ AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF) , AT91C_BASE_SMC + SMC_CTRL3); -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOC), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(nand_pio); -+ -+ nand_recovery(); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_cfg_16bits_dbw_init */ -+/* \brief Configure SMC in 16 bits mode */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_cfg_16bits_dbw_init(void) -+{ -+ writel(readl(AT91C_BASE_SMC + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC + SMC_CTRL3); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_cfg_8bits_dbw_init */ -+/* \brief Configure SMC in 8 bits mode */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_cfg_8bits_dbw_init(void) -+{ -+ writel((readl(AT91C_BASE_SMC + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC + SMC_CTRL3); -+} -+ -+ -+#endif /* #ifdef CFG_NANDFLASH */ -diff --git a/crt0_gnu.S b/crt0_gnu.S -index 042b617..002feef 100644 ---- a/crt0_gnu.S -+++ b/crt0_gnu.S -@@ -106,6 +106,13 @@ _relocate_to_sram: - #endif /* CFG_NORFLASH */ - - _setup_clocks: -+/* Test if main osc is bypassed */ -+ ldr r0,=AT91C_PMC_MOR -+ ldr r1, [r0] -+ ldr r2,=AT91C_CKGR_OSCBYPASS -+ ands r1, r1, r2 -+ bne _init_data /* branch if OSCBYPASS=1 */ -+ - /* Test if main oscillator is enabled */ - ldr r0,=AT91C_PMC_SR - ldr r1, [r0] -diff --git a/include/part.h b/include/part.h -index ba5985a..212789f 100644 ---- a/include/part.h -+++ b/include/part.h -@@ -35,7 +35,11 @@ - - #ifdef AT91SAM9260 - #include "AT91SAM9260_inc.h" --#include "at91sam9260ek.h" -+ #ifdef at91sam9260ek -+ #include "at91sam9260ek.h" -+ #elif usb_a9260 -+ #include "usb-a9260.h" -+ #endif - #endif - - #ifdef AT91SAM9XE --- -1.7.9.5 - diff --git a/board/calao/usb-a9260/linux-3.7.4.config b/board/calao/usb-a9260/linux-3.7.4.config deleted file mode 100644 index c466bdc88c..0000000000 --- a/board/calao/usb-a9260/linux-3.7.4.config +++ /dev/null @@ -1,97 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9260=y -CONFIG_MACH_USB_A9260=y -CONFIG_AT91_SLOW_CLOCK=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_EXT2_FS=y -CONFIG_FUSE_FS=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_UBIFS_FS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/board/calao/usb-a9263/at91bootstrap-1.16-usb-a9263.patch b/board/calao/usb-a9263/at91bootstrap-1.16-usb-a9263.patch deleted file mode 100644 index 579893050f..0000000000 --- a/board/calao/usb-a9263/at91bootstrap-1.16-usb-a9263.patch +++ /dev/null @@ -1,851 +0,0 @@ -From 74796655212d321f50ab89e8c5570245901f4cba Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Thu, 5 Jul 2012 18:44:07 +0200 -Subject: [PATCH] Add support for the Calao-systems USB-A9263 - - -Signed-off-by: Gregory Hermant ---- - board/usb_a9263/dataflash/Makefile | 115 +++++++++++++ - board/usb_a9263/dataflash/usb-a9263.h | 97 +++++++++++ - board/usb_a9263/nandflash/Makefile | 117 ++++++++++++++ - board/usb_a9263/nandflash/usb-a9263.h | 116 +++++++++++++ - board/usb_a9263/usb_a9263.c | 285 +++++++++++++++++++++++++++++++++ - crt0_gnu.S | 7 + - driver/dataflash.c | 6 +- - include/part.h | 6 +- - 8 files changed, 745 insertions(+), 4 deletions(-) - create mode 100644 board/usb_a9263/dataflash/Makefile - create mode 100644 board/usb_a9263/dataflash/usb-a9263.h - create mode 100644 board/usb_a9263/nandflash/Makefile - create mode 100644 board/usb_a9263/nandflash/usb-a9263.h - create mode 100644 board/usb_a9263/usb_a9263.c - -diff --git a/board/usb_a9263/dataflash/Makefile b/board/usb_a9263/dataflash/Makefile -new file mode 100644 -index 0000000..332685e ---- /dev/null -+++ b/board/usb_a9263/dataflash/Makefile -@@ -0,0 +1,115 @@ -+# TODO: set this appropriately for your local toolchain -+#SHELL=C:\CYGWIN_REP\dwn_071004\bin\BASH.exe -+CROSS_COMPILE=arm-elf- -+#CROSS_COMPILE = arm-softfloat-linux-gnu- -+ -+TOOLCHAIN=gcc -+ -+BOOTSTRAP_PATH=../../.. -+ -+# DataFlashBoot Configuration for USB-A9263 -+ -+# Target name (case sensitive!!!) -+TARGET=AT91SAM9263 -+# Board name (case sensitive!!!) -+BOARD=usb_a9263 -+# Link Address and Top_of_Memory -+LINK_ADDR=0x300000 -+TOP_OF_MEMORY=0x314000 -+# Name of current directory -+PROJECT=dataflash -+ -+ifndef BOOT_NAME -+BOOT_NAME=$(PROJECT)_$(BOARD) -+endif -+ -+INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT) -+ -+ifeq ($(TOOLCHAIN), gcc) -+ -+AS=$(CROSS_COMPILE)gcc -+CC=$(CROSS_COMPILE)gcc -+LD=$(CROSS_COMPILE)gcc -+NM= $(CROSS_COMPILE)nm -+SIZE=$(CROSS_COMPILE)size -+OBJCOPY=$(CROSS_COMPILE)objcopy -+OBJDUMP=$(CROSS_COMPILE)objdump -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) -+ -+# Linker flags. -+# -Wl,...: tell GCC to pass this to linker. -+# -Map: create map file -+# --cref: add cross reference to map file -+LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref -+LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR) -+OBJS=crt0_gnu.o -+ -+endif -+ -+OBJS+=\ -+ $(BOARD).o \ -+ main.o \ -+ gpio.o \ -+ pmc.o \ -+ debug.o \ -+ sdramc.o \ -+ dataflash.o \ -+ _udivsi3.o \ -+ _umodsi3.o \ -+ div0.o \ -+ udiv.o \ -+ string.o -+ -+rebuild: clean all -+ -+all: $(BOOT_NAME) -+ -+ifeq ($(TOOLCHAIN), gcc) -+$(BOOT_NAME): $(OBJS) -+ $(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS) -+ $(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin -+endif -+ -+ -+$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o -+ -+main.o: $(BOOTSTRAP_PATH)/main.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o -+ -+gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o -+ -+pmc.o: $(BOOTSTRAP_PATH)/driver/pmc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o -+ -+debug.o: $(BOOTSTRAP_PATH)/driver/debug.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o -+ -+sdramc.o: $(BOOTSTRAP_PATH)/driver/sdramc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o -+ -+dataflash.o: $(BOOTSTRAP_PATH)/driver/dataflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o -+ -+crt0_gnu.o: $(BOOTSTRAP_PATH)/crt0_gnu.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o -+ -+div0.o: $(BOOTSTRAP_PATH)/lib/div0.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o -+ -+string.o: $(BOOTSTRAP_PATH)/lib/string.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o -+ -+udiv.o: $(BOOTSTRAP_PATH)/lib/udiv.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o -+ -+_udivsi3.o: $(BOOTSTRAP_PATH)/lib/_udivsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o -+ -+_umodsi3.o: $(BOOTSTRAP_PATH)/lib/_umodsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o -+ -+clean: -+ rm -f *.o *.bin *.elf *.map -diff --git a/board/usb_a9263/dataflash/usb-a9263.h b/board/usb_a9263/dataflash/usb-a9263.h -new file mode 100644 -index 0000000..40a3af8 ---- /dev/null -+++ b/board/usb_a9263/dataflash/usb-a9263.h -@@ -0,0 +1,97 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2006, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : usb-a9263.h -+ * Object : -+ * Creation : GH Jun 28th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#ifndef _USB_A9263_H -+#define _USB_A9263_H -+ -+/* ******************************************************************* */ -+/* PMC Settings */ -+/* */ -+/* The main oscillator is enabled as soon as possible in the c_startup */ -+/* and MCK is switched on the main oscillator. */ -+/* PLL initialization is done later in the hw_init() function */ -+/* ******************************************************************* */ -+#define MASTER_CLOCK (180000000/2) -+#define PLL_LOCK_TIMEOUT 1000000 -+ -+#define PLLA_SETTINGS 0x20593F06 -+#define PLLB_SETTINGS 0x10483F0E -+ -+/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */ -+#define MCKR_SETTINGS (AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2) -+#define MCKR_CSS_SETTINGS (AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS) -+ -+/* ******************************************************************* */ -+/* DataFlash Settings */ -+/* */ -+/* ******************************************************************* */ -+#define AT91C_BASE_SPI AT91C_BASE_SPI0 -+#define AT91C_ID_SPI AT91C_ID_SPI0 -+ -+/* SPI CLOCK */ -+#define AT91C_SPI_CLK 8000000 -+/* AC characteristics */ -+/* DLYBS = tCSS= 250ns min and DLYBCT = tCSH = 250ns */ -+#define DATAFLASH_TCSS (0x1a << 16) /* 250ns min (tCSS) <=> 12/48000000 = 250ns */ -+#define DATAFLASH_TCHS (0x1 << 24) /* 250ns min (tCSH) <=> (64*1+SCBR)/(2*48000000) */ -+ -+#define DF_CS_SETTINGS (AT91C_SPI_NCPHA | (AT91C_SPI_DLYBS & DATAFLASH_TCSS) | (AT91C_SPI_DLYBCT & DATAFLASH_TCHS) | ((MASTER_CLOCK / AT91C_SPI_CLK) << 8)) -+ -+/* ******************************************************************* */ -+/* SDRAMC Settings */ -+/* */ -+/* ******************************************************************* */ -+#define AT91C_BASE_SDRAMC AT91C_BASE_SDRAMC0 -+#define AT91C_EBI_SDRAM AT91C_EBI0_SDRAM -+ -+/* ******************************************************************* */ -+/* BootStrap Settings */ -+/* */ -+/* ******************************************************************* */ -+#define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ -+ -+#define IMG_ADDRESS 0x4000 /* Image Address in DataFlash */ -+#define IMG_SIZE 0x40000 /* Image Size in DataFlash */ -+ -+#define MACH_TYPE 0x6AE /* USB-A9263 */ -+#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+ -+/* ******************************************************************* */ -+/* Application Settings */ -+/* ******************************************************************* */ -+#define CFG_HW_INIT -+#define CFG_SDRAM -+#undef CFG_DEBUG -+ -+#define CFG_DATAFLASH -+ -+#endif /* _USB_A9263_H */ -diff --git a/board/usb_a9263/nandflash/Makefile b/board/usb_a9263/nandflash/Makefile -new file mode 100644 -index 0000000..c453098 ---- /dev/null -+++ b/board/usb_a9263/nandflash/Makefile -@@ -0,0 +1,117 @@ -+# TODO: set this appropriately for your local toolchain -+#SHELL=C:\CYGWIN_REP\dwn_071004\bin\BASH.exe -+CROSS_COMPILE=arm-elf- -+ -+TOOLCHAIN=gcc -+ -+BOOTSTRAP_PATH=../../.. -+ -+# NandFlashBoot Configuration for USB-A9263 -+ -+# Target name (case sensitive!!!) -+TARGET=AT91SAM9263 -+# Board name (case sensitive!!!) -+BOARD=usb_a9263 -+# Link Address and Top_of_Memory -+LINK_ADDR=0x300000 -+TOP_OF_MEMORY=0x314000 -+# Name of current directory -+PROJECT=nandflash -+ -+ifndef BOOT_NAME -+BOOT_NAME=$(PROJECT)_$(BOARD) -+endif -+ -+INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT) -+ -+ifeq ($(TOOLCHAIN), gcc) -+ -+AS=$(CROSS_COMPILE)gcc -+CC=$(CROSS_COMPILE)gcc -+LD=$(CROSS_COMPILE)gcc -+NM= $(CROSS_COMPILE)nm -+SIZE=$(CROSS_COMPILE)size -+OBJCOPY=$(CROSS_COMPILE)objcopy -+OBJDUMP=$(CROSS_COMPILE)objdump -+CCFLAGS=-g -mcpu=arm9 -O0 -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) -+ -+# Linker flags. -+# -Wl,...: tell GCC to pass this to linker. -+# -Map: create map file -+# --cref: add cross reference to map file -+LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref -+LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR) -+OBJS=crt0_gnu.o -+ -+endif -+ -+OBJS+=\ -+ $(BOARD).o \ -+ main.o \ -+ gpio.o \ -+ pmc.o \ -+ debug.o \ -+ sdramc.o \ -+ nandflash.o \ -+ _udivsi3.o \ -+ _umodsi3.o \ -+ div0.o \ -+ udiv.o \ -+ string.o -+ -+rebuild: clean all -+ -+all: $(BOOT_NAME) -+ -+ifeq ($(TOOLCHAIN), gcc) -+$(BOOT_NAME): $(OBJS) -+ $(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS) -+ $(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin -+endif -+ -+ -+$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o -+ -+main.o: $(BOOTSTRAP_PATH)/main.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o -+ -+gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o -+ -+pmc.o: $(BOOTSTRAP_PATH)/driver/pmc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o -+ -+debug.o: $(BOOTSTRAP_PATH)/driver/debug.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o -+ -+sdramc.o: $(BOOTSTRAP_PATH)/driver/sdramc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o -+ -+dataflash.o: $(BOOTSTRAP_PATH)/driver/dataflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o -+ -+nandflash.o: $(BOOTSTRAP_PATH)/driver/nandflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o -+ -+crt0_gnu.o: $(BOOTSTRAP_PATH)/crt0_gnu.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o -+ -+div0.o: $(BOOTSTRAP_PATH)/lib/div0.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o -+ -+string.o: $(BOOTSTRAP_PATH)/lib/string.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o -+ -+udiv.o: $(BOOTSTRAP_PATH)/lib/udiv.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o -+ -+_udivsi3.o: $(BOOTSTRAP_PATH)/lib/_udivsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o -+ -+_umodsi3.o: $(BOOTSTRAP_PATH)/lib/_umodsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o -+ -+clean: -+ rm -f *.o *.bin *.elf *.map -diff --git a/board/usb_a9263/nandflash/usb-a9263.h b/board/usb_a9263/nandflash/usb-a9263.h -new file mode 100644 -index 0000000..24e2cf1 ---- /dev/null -+++ b/board/usb_a9263/nandflash/usb-a9263.h -@@ -0,0 +1,116 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2006, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : usb-a9263.h -+ * Object : -+ * Creation : GH Jun 28th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#ifndef _USB_A9263_H -+#define _USB_A9263_H -+ -+/* ******************************************************************* */ -+/* PMC Settings */ -+/* */ -+/* The main oscillator is enabled as soon as possible in the c_startup */ -+/* and MCK is switched on the main oscillator. */ -+/* PLL initialization is done later in the hw_init() function */ -+/* ******************************************************************* */ -+#define MASTER_CLOCK (180000000/2) -+#define PLL_LOCK_TIMEOUT 1000000 -+ -+#define PLLA_SETTINGS 0x20593F06 -+#define PLLB_SETTINGS 0x10483F0E -+ -+/* Switch MCK on PLLA output PCK = PLLA = 2 * MCK */ -+#define MCKR_SETTINGS (AT91C_PMC_PRES_CLK | AT91C_PMC_MDIV_2) -+#define MCKR_CSS_SETTINGS (AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS) -+ -+/* ******************************************************************* */ -+/* NandFlash Settings */ -+/* */ -+/* ******************************************************************* */ -+#define AT91C_SMARTMEDIA_BASE 0x40000000 -+ -+#define AT91_SMART_MEDIA_ALE (1 << 21) /* our ALE is AD21 */ -+#define AT91_SMART_MEDIA_CLE (1 << 22) /* our CLE is AD22 */ -+ -+#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOD_SODR = AT91C_PIO_PD15;} while(0) -+#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOD_CODR = AT91C_PIO_PD15;} while(0) -+#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOA_PDSR & AT91C_PIO_PA22)) -+ -+/* ******************************************************************* */ -+/* SDRAMC Settings */ -+/* */ -+/* ******************************************************************* */ -+#define AT91C_BASE_SDRAMC AT91C_BASE_SDRAMC0 -+#define AT91C_EBI_SDRAM AT91C_EBI0_SDRAM -+ -+/* ******************************************************************** */ -+/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 90000000. */ -+/* Please refer to SMC section in AT91SAM9x datasheet to learn how */ -+/* to generate these values. */ -+/* ******************************************************************** */ -+#define AT91C_SM_NWE_SETUP (1 << 0) -+#define AT91C_SM_NCS_WR_SETUP (0 << 8) -+#define AT91C_SM_NRD_SETUP (1 << 16) -+#define AT91C_SM_NCS_RD_SETUP (0 << 24) -+ -+#define AT91C_SM_NWE_PULSE (3 << 0) -+#define AT91C_SM_NCS_WR_PULSE (3 << 8) -+#define AT91C_SM_NRD_PULSE (3 << 16) -+#define AT91C_SM_NCS_RD_PULSE (3 << 24) -+ -+#define AT91C_SM_NWE_CYCLE (5 << 0) -+#define AT91C_SM_NRD_CYCLE (5 << 16) -+ -+#define AT91C_SM_TDF (2 << 16) -+ -+/* ******************************************************************* */ -+/* BootStrap Settings */ -+/* */ -+/* ******************************************************************* */ -+#define IMG_ADDRESS 0x20000 /* Image Address in NandFlash */ -+#define IMG_SIZE 0x40000 /* Image Size in NandFlash */ -+ -+#define MACH_TYPE 0x6AE /* USB-A9263 */ -+#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+ -+/* ******************************************************************* */ -+/* Application Settings */ -+/* ******************************************************************* */ -+#undef CFG_DEBUG -+#undef CFG_DATAFLASH -+ -+#define CFG_NANDFLASH -+#undef NANDFLASH_SMALL_BLOCKS /* NANDFLASH_LARGE_BLOCKS used instead */ -+ -+#define CFG_HW_INIT -+#define CFG_SDRAM -+ -+ -+#endif /* _USB_A9263_H */ -diff --git a/board/usb_a9263/usb_a9263.c b/board/usb_a9263/usb_a9263.c -new file mode 100644 -index 0000000..5630f99 ---- /dev/null -+++ b/board/usb_a9263/usb_a9263.c -@@ -0,0 +1,285 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2006, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaiimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : usb_a9263.c -+ * Object : -+ * Creation : GH Jun 28th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#include "../../include/part.h" -+#include "../../include/gpio.h" -+#include "../../include/pmc.h" -+#include "../../include/debug.h" -+#include "../../include/sdramc.h" -+#include "../../include/main.h" -+#ifdef CFG_NANDFLASH -+#include "../../include/nandflash.h" -+#endif -+#ifdef CFG_DATAFLASH -+#include "../../include/dataflash.h" -+#endif -+ -+static inline unsigned int get_cp15(void) -+{ -+ unsigned int value; -+ __asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value)); -+ return value; -+} -+ -+static inline void set_cp15(unsigned int value) -+{ -+ __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); -+} -+ -+ -+#ifdef CFG_HW_INIT -+/*---------------------------------------------------------------------------- */ -+/* \fn hw_init */ -+/* \brief This function performs very low level HW initialization */ -+/* This function is invoked as soon as possible during the c_startup */ -+/* The bss segment must be initialized */ -+/*---------------------------------------------------------------------------- */ -+void hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc hw_pio[] = { -+#ifdef CFG_DEBUG -+ {"RXD", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"TXD", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#endif -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Disable watchdog */ -+ writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR); -+ -+ /* At this stage the main oscillator is supposed to be enabled -+ * PCK = MCK = MOSC */ -+ -+ /* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */ -+ pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* PCK = PLLA = 2 * MCK */ -+ pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT); -+ /* Switch MCK on PLLA output */ -+ pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ -+ /* Configure PLLB */ -+ pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* Configure the PIO controller to output PCK0 */ -+ pio_setup(hw_pio); -+ -+ /* Configure the EBI0 Slave Slot Cycle to 64 */ -+ writel( (readl((AT91C_BASE_MATRIX + MATRIX_SCFG4)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG4)); -+ -+#ifdef CFG_DEBUG -+ /* Enable Debug messages on the DBGU */ -+ dbg_init(BAUDRATE(MASTER_CLOCK, 115200)); -+ dbg_print("Start AT91Bootstrap...\n\r"); -+#endif /* CFG_DEBUG */ -+ -+#ifdef CFG_SDRAM -+ /* Initialize the matrix */ -+ /* VDDIOMSEL = 1 -> Memories are 3.3V powered */ -+ writel(readl(AT91C_BASE_CCFG + CCFG_EBI0CSA) | (1 << 16) | AT91C_EBI_CS1A_SDRAMC, AT91C_BASE_CCFG + CCFG_EBI0CSA); -+ -+ /* Configure SDRAM Controller */ -+ sdram_init( AT91C_SDRAMC_NC_9 | -+ AT91C_SDRAMC_NR_13 | -+ AT91C_SDRAMC_CAS_2 | -+ AT91C_SDRAMC_NB_4_BANKS | -+ AT91C_SDRAMC_DBW_32_BITS | -+ AT91C_SDRAMC_TWR_2 | -+ AT91C_SDRAMC_TRC_7 | -+ AT91C_SDRAMC_TRP_2 | -+ AT91C_SDRAMC_TRCD_2 | -+ AT91C_SDRAMC_TRAS_5 | -+ AT91C_SDRAMC_TXSR_8, /* Control Register */ -+ (MASTER_CLOCK * 7)/1000000, /* Refresh Timer Register */ -+ AT91C_SDRAMC_MD_SDRAM); /* SDRAM (no low power) */ -+#endif /* CFG_SDRAM */ -+} -+#endif /* CFG_HW_INIT */ -+ -+ -+#ifdef CFG_SDRAM -+//*---------------------------------------------------------------------------- -+//* \fn sdramc_hw_init -+//* \brief This function performs SDRAMC HW initialization -+//*----------------------------------------------------------------------------*/ -+void sdramc_hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc sdramc_pio[] = { -+ {"D16", AT91C_PIN_PD(16), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D17", AT91C_PIN_PD(17), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D18", AT91C_PIN_PD(18), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D19", AT91C_PIN_PD(19), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D20", AT91C_PIN_PD(20), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D21", AT91C_PIN_PD(21), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D22", AT91C_PIN_PD(22), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D23", AT91C_PIN_PD(23), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D24", AT91C_PIN_PD(24), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D25", AT91C_PIN_PD(25), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D26", AT91C_PIN_PD(26), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D27", AT91C_PIN_PD(27), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D28", AT91C_PIN_PD(28), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D29", AT91C_PIN_PD(29), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D30", AT91C_PIN_PD(30), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D31", AT91C_PIN_PD(31), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the SDRAMC PIO controller */ -+ pio_setup(sdramc_pio); -+} -+#endif -+ -+#ifdef CFG_DATAFLASH -+/*------------------------------------------------------------------------------*/ -+/* \fn df_recovery */ -+/* \brief This function erases DataFlash Page 0 if USER PB is pressed */ -+/* during boot sequence */ -+/*------------------------------------------------------------------------------*/ -+void df_recovery(AT91PS_DF pDf) -+{ -+#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH) -+ /* Configure PIOs */ -+ const struct pio_desc usrpb_pio[] = { -+ {"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(usrpb_pio); -+ -+ /* If USER PB is pressed during Boot sequence */ -+ /* Erase NandFlash block 0*/ -+ if ( !pio_get_value(AT91C_PIN_PB(10)) ) -+ df_page_erase(pDf, 0); -+#endif -+} -+/*------------------------------------------------------------------------------*/ -+/* \fn df_hw_init */ -+/* \brief This function performs DataFlash HW initialization */ -+/*------------------------------------------------------------------------------*/ -+void df_hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc df_pio[] = { -+ {"MISO", AT91C_PIN_PA(0), 0, PIO_DEFAULT, PIO_PERIPH_B}, -+ {"MOSI", AT91C_PIN_PA(1), 0, PIO_DEFAULT, PIO_PERIPH_B}, -+ {"SPCK", AT91C_PIN_PA(2), 0, PIO_DEFAULT, PIO_PERIPH_B}, -+ {"NPCS0", AT91C_PIN_PA(5), 0, PIO_DEFAULT, PIO_PERIPH_B}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ pio_setup(df_pio); -+} -+#endif /* CFG_DATAFLASH */ -+ -+ -+#ifdef CFG_NANDFLASH -+/*------------------------------------------------------------------------------*/ -+/* \fn nand_recovery */ -+/* \brief This function erases NandFlash Block 0 if USER PB is pressed */ -+/* during boot sequence */ -+/*------------------------------------------------------------------------------*/ -+static void nand_recovery(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc usrpb_pio[] = { -+ {"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(usrpb_pio); -+ -+ /* If USER PB is pressed during Boot sequence */ -+ /* Erase NandFlash block 0*/ -+ if (!pio_get_value(AT91C_PIN_PB(10)) ) -+ AT91F_NandEraseBlock0(); -+} -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_hw_init */ -+/* \brief NandFlash HW init */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc nand_pio[] = { -+ {"RDY_BSY", AT91C_PIN_PA(22), 0, PIO_PULLUP, PIO_INPUT}, -+ {"NANDCS", AT91C_PIN_PD(15), 0, PIO_PULLUP, PIO_OUTPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */ -+ writel(readl(AT91C_BASE_CCFG + CCFG_EBI0CSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBI0CSA); -+ -+ /* Configure SMC CS3 */ -+ writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC0 + SMC_SETUP3); -+ writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC0 + SMC_PULSE3); -+ writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE) , AT91C_BASE_SMC0 + SMC_CYCLE3); -+ writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | -+ AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF) , AT91C_BASE_SMC0 + SMC_CTRL3); -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOA), PMC_PCER + AT91C_BASE_PMC); -+ writel((1 << AT91C_ID_PIOCDE), PMC_PCER + AT91C_BASE_PMC); -+ -+ pio_setup(nand_pio); -+ -+ nand_recovery(); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_cfg_16bits_dbw_init */ -+/* \brief Configure SMC in 16 bits mode */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_cfg_16bits_dbw_init(void) -+{ -+ writel(readl(AT91C_BASE_SMC0 + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC0 + SMC_CTRL3); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_cfg_8bits_dbw_init */ -+/* \brief Configure SMC in 8 bits mode */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_cfg_8bits_dbw_init(void) -+{ -+ writel((readl(AT91C_BASE_SMC0 + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC0 + SMC_CTRL3); -+} -+ -+#endif /* #ifdef CFG_NANDFLASH */ -+ -+ -diff --git a/crt0_gnu.S b/crt0_gnu.S -index 042b617..002feef 100644 ---- a/crt0_gnu.S -+++ b/crt0_gnu.S -@@ -106,6 +106,13 @@ _relocate_to_sram: - #endif /* CFG_NORFLASH */ - - _setup_clocks: -+/* Test if main osc is bypassed */ -+ ldr r0,=AT91C_PMC_MOR -+ ldr r1, [r0] -+ ldr r2,=AT91C_CKGR_OSCBYPASS -+ ands r1, r1, r2 -+ bne _init_data /* branch if OSCBYPASS=1 */ -+ - /* Test if main oscillator is enabled */ - ldr r0,=AT91C_PMC_SR - ldr r1, [r0] -diff --git a/driver/dataflash.c b/driver/dataflash.c -index e28e49e..4de295a 100644 ---- a/driver/dataflash.c -+++ b/driver/dataflash.c -@@ -293,14 +293,14 @@ static int df_init (AT91PS_DF pDf) - pDf->dfDescription.pages_size = 264; - pDf->dfDescription.page_offset = 9; - break; -- -+*/ - case AT45DB021B: - pDf->dfDescription.pages_number = 1024; - pDf->dfDescription.pages_size = 264; - pDf->dfDescription.page_offset = 9; - break; - -- case AT45DB041B: -+/* case AT45DB041B: - pDf->dfDescription.pages_number = 2048; - pDf->dfDescription.pages_size = 264; - pDf->dfDescription.page_offset = 9; -@@ -373,7 +373,7 @@ int load_df(unsigned int pcs, unsigned int img_addr, unsigned int img_size, unsi - if (!df_init(pDf)) - return -1; - --#if defined(AT91SAM9260) || defined(AT91SAM9XE) || defined(AT91SAM9G20) -+#if defined(AT91SAM9260) || defined(AT91SAM9263) || defined(AT91SAM9XE) || defined(AT91SAM9G20) - /* Test if a button has been pressed or not */ - /* Erase Page 0 to avoid infinite loop */ - df_recovery(pDf); -diff --git a/include/part.h b/include/part.h -index ba5985a..a1863d0 100644 ---- a/include/part.h -+++ b/include/part.h -@@ -61,7 +61,11 @@ - - #ifdef AT91SAM9263 - #include "AT91SAM9263_inc.h" --#include "at91sam9263ek.h" -+ #ifdef at91sam9263ek -+ #include "at91sam9263ek.h" -+ #elif usb_a9263 -+ #include "usb-a9263.h" -+ #endif - #endif - - #ifdef AT91CAP9 --- -1.5.6.3 - diff --git a/board/calao/usb-a9263/linux-3.4.4.config b/board/calao/usb-a9263/linux-3.4.4.config deleted file mode 100644 index 8c71231f38..0000000000 --- a/board/calao/usb-a9263/linux-3.4.4.config +++ /dev/null @@ -1,102 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9263=y -CONFIG_MACH_USB_A9263=y -CONFIG_AT91_SLOW_CLOCK=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y -CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_EXT2_FS=y -CONFIG_FUSE_FS=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_XATTR=y -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/board/calao/usb-a9g20-lpw/linux-3.4.4.config b/board/calao/usb-a9g20-lpw/linux-3.4.4.config deleted file mode 100644 index 56eb04bd73..0000000000 --- a/board/calao/usb-a9g20-lpw/linux-3.4.4.config +++ /dev/null @@ -1,105 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9G20=y -CONFIG_MACH_USB_A9G20=y -CONFIG_AT91_SLOW_CLOCK=y -# CONFIG_ARM_THUMB is not set -CONFIG_AEABI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=64M console=ttyS0,115200" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=y -# CONFIG_KEYBOARD_ATKBD is not set -CONFIG_KEYBOARD_GPIO=y -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_GPIO=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -# CONFIG_HWMON is not set -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_ETH=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_RV3029C2=y -CONFIG_EXT2_FS=y -CONFIG_FUSE_FS=m -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_JFFS2_FS=y -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_XATTR=y -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/board/calao/usb-a9g20-lpw/patches/at91bootstrap/0001-usb-a9g20-lpw.patch b/board/calao/usb-a9g20-lpw/patches/at91bootstrap/0001-usb-a9g20-lpw.patch deleted file mode 100644 index 06a89edd6b..0000000000 --- a/board/calao/usb-a9g20-lpw/patches/at91bootstrap/0001-usb-a9g20-lpw.patch +++ /dev/null @@ -1,610 +0,0 @@ -From 8d84757d5170969e8bdfebc7951f43c5aa2b05fd Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Fri, 6 Jul 2012 16:32:47 +0200 -Subject: [PATCH] Add support for the Calao-systems USB-A9G20-LPW - - -Signed-off-by: Gregory Hermant ---- - board/usb_a9g20_lpw/nandflash/Makefile | 121 ++++++++++ - board/usb_a9g20_lpw/nandflash/usb-a9g20-lpw.h | 112 +++++++++ - board/usb_a9g20_lpw/usb_a9g20_lpw.c | 303 +++++++++++++++++++++++++ - crt0_gnu.S | 7 + - include/part.h | 6 +- - 5 files changed, 548 insertions(+), 1 deletions(-) - create mode 100644 board/usb_a9g20_lpw/nandflash/Makefile - create mode 100644 board/usb_a9g20_lpw/nandflash/usb-a9g20-lpw.h - create mode 100644 board/usb_a9g20_lpw/usb_a9g20_lpw.c - -diff --git a/board/usb_a9g20_lpw/nandflash/Makefile b/board/usb_a9g20_lpw/nandflash/Makefile -new file mode 100644 -index 0000000..8c9d99a ---- /dev/null -+++ b/board/usb_a9g20_lpw/nandflash/Makefile -@@ -0,0 +1,121 @@ -+# TODO: set this appropriately for your local toolchain -+ifndef ERASE_FCT -+ERASE_FCT=rm -f -+endif -+ifndef CROSS_COMPILE -+CROSS_COMPILE=arm-elf- -+endif -+ -+TOOLCHAIN=gcc -+ -+BOOTSTRAP_PATH=../../.. -+ -+# NandFlashBoot Configuration for USB-A9G20-LPW -+ -+# Target name (case sensitive!!!) -+TARGET=AT91SAM9G20 -+# Board name (case sensitive!!!) -+BOARD=usb_a9g20_lpw -+# Link Address and Top_of_Memory -+LINK_ADDR=0x200000 -+TOP_OF_MEMORY=0x301000 -+# Name of current directory -+PROJECT=nandflash -+ -+ifndef BOOT_NAME -+BOOT_NAME=$(PROJECT)_$(BOARD) -+endif -+ -+INCL=./$(BOOTSTRAP_PATH)/board/$(BOARD)/$(PROJECT) -+ -+ifeq ($(TOOLCHAIN), gcc) -+ -+AS=$(CROSS_COMPILE)gcc -+CC=$(CROSS_COMPILE)gcc -+LD=$(CROSS_COMPILE)gcc -+NM= $(CROSS_COMPILE)nm -+SIZE=$(CROSS_COMPILE)size -+OBJCOPY=$(CROSS_COMPILE)objcopy -+OBJDUMP=$(CROSS_COMPILE)objdump -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) -+ -+# Linker flags. -+# -Wl,...: tell GCC to pass this to linker. -+# -Map: create map file -+# --cref: add cross reference to map file -+LDFLAGS+=-nostartfiles -nostdlib -Wl,-Map=$(BOOT_NAME).map,--cref -+LDFLAGS+=-T $(BOOTSTRAP_PATH)/elf32-littlearm.lds -Ttext $(LINK_ADDR) -+OBJS=crt0_gnu.o -+ -+endif -+ -+OBJS+=\ -+ $(BOARD).o \ -+ main.o \ -+ gpio.o \ -+ pmc.o \ -+ debug.o \ -+ sdramc.o \ -+ nandflash.o \ -+ _udivsi3.o \ -+ _umodsi3.o \ -+ div0.o \ -+ udiv.o \ -+ string.o -+ -+rebuild: clean all -+ -+all: $(BOOT_NAME) -+ -+ifeq ($(TOOLCHAIN), gcc) -+$(BOOT_NAME): $(OBJS) -+ $(LD) $(LDFLAGS) -n -o $(BOOT_NAME).elf $(OBJS) -+ $(OBJCOPY) --strip-debug --strip-unneeded $(BOOT_NAME).elf -O binary $(BOOT_NAME).bin -+endif -+ -+ -+$(BOARD).o: $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/board/$(BOARD)/$(BOARD).c -o $(BOARD).o -+ -+main.o: $(BOOTSTRAP_PATH)/main.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/main.c -o main.o -+ -+gpio.o: $(BOOTSTRAP_PATH)/driver/gpio.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/gpio.c -o gpio.o -+ -+pmc.o: $(BOOTSTRAP_PATH)/driver/pmc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/pmc.c -o pmc.o -+ -+debug.o: $(BOOTSTRAP_PATH)/driver/debug.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/debug.c -o debug.o -+ -+sdramc.o: $(BOOTSTRAP_PATH)/driver/sdramc.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/sdramc.c -o sdramc.o -+ -+dataflash.o: $(BOOTSTRAP_PATH)/driver/dataflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/dataflash.c -o dataflash.o -+ -+nandflash.o: $(BOOTSTRAP_PATH)/driver/nandflash.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/driver/nandflash.c -o nandflash.o -+ -+crt0_gnu.o: $(BOOTSTRAP_PATH)/crt0_gnu.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/crt0_gnu.S -o crt0_gnu.o -+ -+div0.o: $(BOOTSTRAP_PATH)/lib/div0.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/div0.c -o div0.o -+ -+string.o: $(BOOTSTRAP_PATH)/lib/string.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/string.c -o string.o -+ -+udiv.o: $(BOOTSTRAP_PATH)/lib/udiv.c -+ $(CC) -c $(CCFLAGS) $(BOOTSTRAP_PATH)/lib/udiv.c -o udiv.o -+ -+_udivsi3.o: $(BOOTSTRAP_PATH)/lib/_udivsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_udivsi3.S -o _udivsi3.o -+ -+_umodsi3.o: $(BOOTSTRAP_PATH)/lib/_umodsi3.S -+ $(AS) $(ASFLAGS) $(BOOTSTRAP_PATH)/lib/_umodsi3.S -o _umodsi3.o -+ -+clean: -+ $(ERASE_FCT) *.o *.bin *.elf *.map -diff --git a/board/usb_a9g20_lpw/nandflash/usb-a9g20-lpw.h b/board/usb_a9g20_lpw/nandflash/usb-a9g20-lpw.h -new file mode 100644 -index 0000000..c0bdc6e ---- /dev/null -+++ b/board/usb_a9g20_lpw/nandflash/usb-a9g20-lpw.h -@@ -0,0 +1,112 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2008, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : usb-a9g20-lpw.h -+ * Object : -+ * Creation : GH July 6th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#ifndef _USB_A9G20_LPW_H -+#define _USB_A9G20_LPW_H -+ -+/* ******************************************************************* */ -+/* PMC Settings */ -+/* */ -+/* The main oscillator is enabled as soon as possible in the c_startup */ -+/* and MCK is switched on the main oscillator. */ -+/* PLL initialization is done later in the hw_init() function */ -+/* ******************************************************************* */ -+#define MASTER_CLOCK (133000000) -+#define PLL_LOCK_TIMEOUT 1000000 -+ -+/* Set PLLA to 798Mhz */ -+#define PLLA_SETTINGS 0x20843F02 -+#define PLLB_SETTINGS 0x100F3F02 -+ -+/* Switch MCK on PLLA output PCK = PLLA/2 = 3 * MCK */ -+#define MCKR_SETTINGS 0x1300 -+#define MCKR_CSS_SETTINGS (AT91C_PMC_CSS_PLLA_CLK | MCKR_SETTINGS) -+ -+/* ******************************************************************* */ -+/* NandFlash Settings */ -+/* */ -+/* ******************************************************************* */ -+#define AT91C_SMARTMEDIA_BASE 0x40000000 -+ -+#define AT91_SMART_MEDIA_ALE (1 << 21) /* our ALE is AD21 */ -+#define AT91_SMART_MEDIA_CLE (1 << 22) /* our CLE is AD22 */ -+ -+#define NAND_DISABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_SODR = AT91C_PIO_PC14;} while(0) -+#define NAND_ENABLE_CE() do { *(volatile unsigned int *)AT91C_PIOC_CODR = AT91C_PIO_PC14;} while(0) -+ -+#define NAND_WAIT_READY() while (!(*(volatile unsigned int *)AT91C_PIOC_PDSR & AT91C_PIO_PC13)) -+ -+ -+/* ******************************************************************** */ -+/* SMC Chip Select 3 Timings for NandFlash for MASTER_CLOCK = 133000000.*/ -+/* Please refer to SMC section in AT91SAM9 datasheet to learn how */ -+/* to generate these values. */ -+/* ******************************************************************** */ -+#define AT91C_SM_NWE_SETUP (2 << 0) -+#define AT91C_SM_NCS_WR_SETUP (0 << 8) -+#define AT91C_SM_NRD_SETUP (2 << 16) -+#define AT91C_SM_NCS_RD_SETUP (0 << 24) -+ -+#define AT91C_SM_NWE_PULSE (4 << 0) -+#define AT91C_SM_NCS_WR_PULSE (4 << 8) -+#define AT91C_SM_NRD_PULSE (4 << 16) -+#define AT91C_SM_NCS_RD_PULSE (4 << 24) -+ -+#define AT91C_SM_NWE_CYCLE (7 << 0) -+#define AT91C_SM_NRD_CYCLE (7 << 16) -+ -+#define AT91C_SM_TDF (3 << 16) -+ -+/* ******************************************************************* */ -+/* BootStrap Settings */ -+/* */ -+/* ******************************************************************* */ -+#define IMG_ADDRESS 0x20000 /* Image Address in NandFlash */ -+#define IMG_SIZE 0x40000 /* Image Size in NandFlash */ -+ -+#define MACH_TYPE 0x731 /* USB-A9G20 */ -+#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+ -+/* ******************************************************************* */ -+/* Application Settings */ -+/* ******************************************************************* */ -+#undef CFG_DEBUG -+#undef CFG_DATAFLASH -+ -+#define CFG_NANDFLASH -+#undef NANDFLASH_SMALL_BLOCKS /* NANDFLASH_LARGE_BLOCKS used instead */ -+#undef CFG_NANDFLASH_RECOVERY -+ -+#define CFG_SDRAM -+#define CFG_HW_INIT -+ -+#endif /* _USB_A9G20_LPW_H */ -diff --git a/board/usb_a9g20_lpw/usb_a9g20_lpw.c b/board/usb_a9g20_lpw/usb_a9g20_lpw.c -new file mode 100644 -index 0000000..c372307 ---- /dev/null -+++ b/board/usb_a9g20_lpw/usb_a9g20_lpw.c -@@ -0,0 +1,303 @@ -+/* ---------------------------------------------------------------------------- -+ * ATMEL Microcontroller Software Support - ROUSSET - -+ * ---------------------------------------------------------------------------- -+ * Copyright (c) 2008, Atmel Corporation -+ -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the disclaimer below. -+ * -+ * Atmel's name may not be used to endorse or promote products derived from -+ * this software without specific prior written permission. -+ * -+ * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE -+ * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * ---------------------------------------------------------------------------- -+ * File Name : usb_a9g20_lpw.c -+ * Object : -+ * Creation : GH July 6th 2012 -+ *----------------------------------------------------------------------------- -+ */ -+#include "../../include/part.h" -+#include "../../include/gpio.h" -+#include "../../include/pmc.h" -+#include "../../include/debug.h" -+#include "../../include/sdramc.h" -+#include "../../include/main.h" -+#ifdef CFG_NANDFLASH -+#include "../../include/nandflash.h" -+#endif -+#ifdef CFG_DATAFLASH -+#include "../../include/dataflash.h" -+#endif -+ -+static inline unsigned int get_cp15(void) -+{ -+ unsigned int value; -+ __asm__("mrc p15, 0, %0, c1, c0, 0" : "=r" (value)); -+ return value; -+} -+ -+static inline void set_cp15(unsigned int value) -+{ -+ __asm__("mcr p15, 0, %0, c1, c0, 0" : : "r" (value)); -+} -+ -+#ifdef CFG_HW_INIT -+/*----------------------------------------------------------------------------*/ -+/* \fn hw_init */ -+/* \brief This function performs very low level HW initialization */ -+/* This function is invoked as soon as possible during the c_startup */ -+/* The bss segment must be initialized */ -+/*----------------------------------------------------------------------------*/ -+void hw_init(void) -+{ -+ unsigned int cp15; -+ -+ /* Configure PIOs */ -+ const struct pio_desc hw_pio[] = { -+#ifdef CFG_DEBUG -+ {"RXD", AT91C_PIN_PB(14), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"TXD", AT91C_PIN_PB(15), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#endif -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Disable watchdog */ -+ writel(AT91C_WDTC_WDDIS, AT91C_BASE_WDTC + WDTC_WDMR); -+ -+ /* At this stage the main oscillator is supposed to be enabled -+ * PCK = MCK = MOSC */ -+ writel(0x00, AT91C_BASE_PMC + PMC_PLLICPR); -+ -+ /* Configure PLLA = MOSC * (PLL_MULA + 1) / PLL_DIVA */ -+ pmc_cfg_plla(PLLA_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* PCK = PLLA/2 = 3 * MCK */ -+ pmc_cfg_mck(MCKR_SETTINGS, PLL_LOCK_TIMEOUT); -+ /* Switch MCK on PLLA output */ -+ pmc_cfg_mck(MCKR_CSS_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* Configure PLLB */ -+ pmc_cfg_pllb(PLLB_SETTINGS, PLL_LOCK_TIMEOUT); -+ -+ /* Configure CP15 */ -+ cp15 = get_cp15(); -+ cp15 |= I_CACHE; -+ set_cp15(cp15); -+ -+ /* Configure the PIO controller */ -+ pio_setup(hw_pio); -+ -+ /* Configure the EBI Slave Slot Cycle to 64 */ -+ writel((readl((AT91C_BASE_MATRIX + MATRIX_SCFG3)) & ~0xFF) | 0x40, (AT91C_BASE_MATRIX + MATRIX_SCFG3)); -+ -+#ifdef CFG_DEBUG -+ /* Enable Debug messages on the DBGU */ -+ dbg_init(BAUDRATE(MASTER_CLOCK, 115200)); -+ -+ dbg_print("Start AT91Bootstrap...\n\r"); -+#endif /* CFG_DEBUG */ -+ -+#ifdef CFG_SDRAM -+ /* Initialize the matrix (VDDIOSEL=0: memory voltage = 1.8V ) */ -+ writel((readl(AT91C_BASE_CCFG + CCFG_EBICSA) & ~0x00010000) | AT91C_EBI_CS1A_SDRAMC , AT91C_BASE_CCFG + CCFG_EBICSA); -+ -+ /* Configure SDRAM Controller */ -+ sdram_init( AT91C_SDRAMC_NC_9 | -+ AT91C_SDRAMC_NR_13 | -+ AT91C_SDRAMC_CAS_3 | -+ AT91C_SDRAMC_NB_4_BANKS | -+ AT91C_SDRAMC_DBW_32_BITS | -+ AT91C_SDRAMC_TWR_3 | -+ AT91C_SDRAMC_TRC_9 | -+ AT91C_SDRAMC_TRP_3 | -+ AT91C_SDRAMC_TRCD_3 | -+ AT91C_SDRAMC_TRAS_6 | -+ AT91C_SDRAMC_TXSR_10, /* Control Register */ -+ (MASTER_CLOCK * 7)/1000000, /* Refresh Timer Register */ -+ AT91C_SDRAMC_MD_SDRAM); /* SDRAM (no low power) */ -+ -+#endif /* CFG_SDRAM */ -+} -+#endif /* CFG_HW_INIT */ -+ -+#ifdef CFG_SDRAM -+/*------------------------------------------------------------------------------*/ -+/* \fn sdramc_hw_init */ -+/* \brief This function performs SDRAMC HW initialization */ -+/*------------------------------------------------------------------------------*/ -+void sdramc_hw_init(void) -+{ -+ /* Configure PIOs */ -+/* const struct pio_desc sdramc_pio[] = { -+ {"D16", AT91C_PIN_PC(16), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D17", AT91C_PIN_PC(17), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D18", AT91C_PIN_PC(18), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D19", AT91C_PIN_PC(19), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D20", AT91C_PIN_PC(20), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D21", AT91C_PIN_PC(21), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D22", AT91C_PIN_PC(22), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D23", AT91C_PIN_PC(23), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D24", AT91C_PIN_PC(24), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D25", AT91C_PIN_PC(25), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D26", AT91C_PIN_PC(26), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D27", AT91C_PIN_PC(27), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D28", AT91C_PIN_PC(28), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D29", AT91C_PIN_PC(29), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D30", AT91C_PIN_PC(30), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"D31", AT91C_PIN_PC(31), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+*/ -+ /* Configure the SDRAMC PIO controller to output PCK0 */ -+/* pio_setup(sdramc_pio); */ -+ -+ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_ASR(0)); -+ writel(0xFFFF0000, AT91C_BASE_PIOC + PIO_PDR(0)); -+ -+} -+#endif /* CFG_SDRAM */ -+ -+#ifdef CFG_DATAFLASH -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn df_recovery */ -+/* \brief This function erases DataFlash Page 0 if USR PB is pressed */ -+/* during boot sequence */ -+/*------------------------------------------------------------------------------*/ -+void df_recovery(AT91PS_DF pDf) -+{ -+#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS1_DATAFLASH) -+ /* Configure PIOs */ -+ const struct pio_desc usrpb[] = { -+ {"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(usrpb); -+ -+ /* If USR PB is pressed during Boot sequence */ -+ /* Erase NandFlash block 0*/ -+ if ( !pio_get_value(AT91C_PIN_PB(10)) ) -+ df_page_erase(pDf, 0); -+#endif -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn df_hw_init */ -+/* \brief This function performs DataFlash HW initialization */ -+/*------------------------------------------------------------------------------*/ -+void df_hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc df_pio[] = { -+ {"MISO", AT91C_PIN_PA(0), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"MOSI", AT91C_PIN_PA(1), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ {"SPCK", AT91C_PIN_PA(2), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS0_DATAFLASH) -+ {"NPCS0", AT91C_PIN_PA(3), 0, PIO_DEFAULT, PIO_PERIPH_A}, -+#endif -+#if (AT91C_SPI_PCS_DATAFLASH == AT91C_SPI_PCS1_DATAFLASH) -+ {"NPCS1", AT91C_PIN_PC(11), 0, PIO_DEFAULT, PIO_PERIPH_B}, -+#endif -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ pio_setup(df_pio); -+} -+#endif /* CFG_DATAFLASH */ -+ -+ -+ -+#ifdef CFG_NANDFLASH -+/*------------------------------------------------------------------------------*/ -+/* \fn nand_recovery */ -+/* \brief This function erases NandFlash Block 0 if USER PB is pressed */ -+/* during boot sequence */ -+/*------------------------------------------------------------------------------*/ -+#ifdef CFG_NANDFLASH_RECOVERY -+static void nand_recovery(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc usrpb[] = { -+ {"USRPB", AT91C_PIN_PB(10), 0, PIO_PULLUP, PIO_INPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOB), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(usrpb); -+ -+ /* If USER PB is pressed during Boot sequence */ -+ /* Erase NandFlash block 0*/ -+ if (!pio_get_value(AT91C_PIN_PB(10)) ) -+ AT91F_NandEraseBlock0(); -+} -+#else -+static void nand_recovery(void) {} -+#endif -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_hw_init */ -+/* \brief NandFlash HW init */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_hw_init(void) -+{ -+ /* Configure PIOs */ -+ const struct pio_desc nand_pio[] = { -+ {"RDY_BSY", AT91C_PIN_PC(13), 0, PIO_PULLUP, PIO_INPUT}, -+ {"NANDCS", AT91C_PIN_PC(14), 0, PIO_PULLUP, PIO_OUTPUT}, -+ {(char *) 0, 0, 0, PIO_DEFAULT, PIO_PERIPH_A}, -+ }; -+ -+ /* Setup Smart Media, first enable the address range of CS3 in HMATRIX user interface */ -+ writel(readl(AT91C_BASE_CCFG + CCFG_EBICSA) | AT91C_EBI_CS3A_SM, AT91C_BASE_CCFG + CCFG_EBICSA); -+ -+ /* Configure SMC CS3 */ -+ writel((AT91C_SM_NWE_SETUP | AT91C_SM_NCS_WR_SETUP | AT91C_SM_NRD_SETUP | AT91C_SM_NCS_RD_SETUP), AT91C_BASE_SMC + SMC_SETUP3); -+ writel((AT91C_SM_NWE_PULSE | AT91C_SM_NCS_WR_PULSE | AT91C_SM_NRD_PULSE | AT91C_SM_NCS_RD_PULSE), AT91C_BASE_SMC + SMC_PULSE3); -+ writel((AT91C_SM_NWE_CYCLE | AT91C_SM_NRD_CYCLE) , AT91C_BASE_SMC + SMC_CYCLE3); -+ writel((AT91C_SMC_READMODE | AT91C_SMC_WRITEMODE | AT91C_SMC_NWAITM_NWAIT_DISABLE | -+ AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS | AT91C_SM_TDF) , AT91C_BASE_SMC + SMC_CTRL3); -+ -+ /* Configure the PIO controller */ -+ writel((1 << AT91C_ID_PIOC), PMC_PCER + AT91C_BASE_PMC); -+ pio_setup(nand_pio); -+ -+ nand_recovery(); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_cfg_16bits_dbw_init */ -+/* \brief Configure SMC in 16 bits mode */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_cfg_16bits_dbw_init(void) -+{ -+ writel(readl(AT91C_BASE_SMC + SMC_CTRL3) | AT91C_SMC_DBW_WIDTH_SIXTEEN_BITS, AT91C_BASE_SMC + SMC_CTRL3); -+} -+ -+/*------------------------------------------------------------------------------*/ -+/* \fn nandflash_cfg_8bits_dbw_init */ -+/* \brief Configure SMC in 8 bits mode */ -+/*------------------------------------------------------------------------------*/ -+void nandflash_cfg_8bits_dbw_init(void) -+{ -+ writel((readl(AT91C_BASE_SMC + SMC_CTRL3) & ~(AT91C_SMC_DBW)) | AT91C_SMC_DBW_WIDTH_EIGTH_BITS, AT91C_BASE_SMC + SMC_CTRL3); -+} -+ -+#endif /* #ifdef CFG_NANDFLASH */ -diff --git a/crt0_gnu.S b/crt0_gnu.S -index 042b617..002feef 100644 ---- a/crt0_gnu.S -+++ b/crt0_gnu.S -@@ -106,6 +106,13 @@ _relocate_to_sram: - #endif /* CFG_NORFLASH */ - - _setup_clocks: -+/* Test if main osc is bypassed */ -+ ldr r0,=AT91C_PMC_MOR -+ ldr r1, [r0] -+ ldr r2,=AT91C_CKGR_OSCBYPASS -+ ands r1, r1, r2 -+ bne _init_data /* branch if OSCBYPASS=1 */ -+ - /* Test if main oscillator is enabled */ - ldr r0,=AT91C_PMC_SR - ldr r1, [r0] -diff --git a/include/part.h b/include/part.h -index ba5985a..1d7392a 100644 ---- a/include/part.h -+++ b/include/part.h -@@ -46,7 +46,11 @@ - - #ifdef AT91SAM9G20 - #include "AT91SAM9260_inc.h" --#include "at91sam9g20ek.h" -+ #ifdef at91sam9g20ek -+ #include "at91sam9g20ek.h" -+ #elif usb_a9g20_lpw -+ #include "usb-a9g20-lpw.h" -+ #endif - #endif - - #ifdef AT91SAM9261 --- -1.5.6.3 - diff --git a/board/calao/usb-a9g20-lpw/patches/barebox/0001-usb-a9g20-lpw.patch b/board/calao/usb-a9g20-lpw/patches/barebox/0001-usb-a9g20-lpw.patch deleted file mode 100644 index cea8bb8c0a..0000000000 --- a/board/calao/usb-a9g20-lpw/patches/barebox/0001-usb-a9g20-lpw.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/arm/configs/usb_a9g20_defconfig b/arch/arm/configs/usb_a9g20_defconfig -index 30bf380..7716e0e 100644 ---- a/arch/arm/configs/usb_a9g20_defconfig -+++ b/arch/arm/configs/usb_a9g20_defconfig -@@ -15,6 +15,7 @@ CONFIG_HUSH_FANCY_PROMPT=y - CONFIG_CMDLINE_EDITING=y - CONFIG_AUTO_COMPLETE=y - CONFIG_MENU=y -+# CONFIG_ERRNO_MESSAGES is not set - # CONFIG_CONSOLE_ACTIVATE_FIRST is not set - CONFIG_CONSOLE_ACTIVATE_ALL=y - CONFIG_PARTITION=y diff --git a/configs/calao_qil_a9260_defconfig b/configs/calao_qil_a9260_defconfig deleted file mode 100644 index 8b76a87b15..0000000000 --- a/configs/calao_qil_a9260_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -BR2_arm=y -BR2_arm926t=y -BR2_GLOBAL_PATCH_DIR="board/calao/qil-a9260/patches" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" -# Linux headers same as kernel, a 3.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y -BR2_PACKAGE_HOST_SAM_BA=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_AT91BOOTSTRAP=y -BR2_TARGET_AT91BOOTSTRAP_BOARD="qil_a9260" -BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y -BR2_TARGET_BAREBOX=y -BR2_TARGET_BAREBOX_CUSTOM_VERSION=y -BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2012.08.0" -BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="qil_a9260" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/qil-a9260/linux-3.4.7.config" diff --git a/configs/calao_tny_a9g20_lpw_defconfig b/configs/calao_tny_a9g20_lpw_defconfig deleted file mode 100644 index 5c66d06186..0000000000 --- a/configs/calao_tny_a9g20_lpw_defconfig +++ /dev/null @@ -1,29 +0,0 @@ -# architecture -BR2_arm=y -BR2_arm926t=y - -# system -BR2_PACKAGE_HOST_SAM_BA=y - -# filesystem -BR2_TARGET_ROOTFS_UBIFS=y - -# Linux headers same as kernel, a 3.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y - -# bootloaders -BR2_TARGET_AT91BOOTSTRAP=y -BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/tny-a9g20-lpw" -BR2_TARGET_AT91BOOTSTRAP_BOARD="tny_a9g20_lpw" -BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y -BR2_TARGET_BAREBOX=y -BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="tny_a9g20" - -# linux -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.4" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/tny-a9g20-lpw/linux-3.9.config" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="tny_a9g20" diff --git a/configs/calao_usb_a9260_defconfig b/configs/calao_usb_a9260_defconfig deleted file mode 100644 index d8bfd0dabe..0000000000 --- a/configs/calao_usb_a9260_defconfig +++ /dev/null @@ -1,18 +0,0 @@ -BR2_arm=y -BR2_arm926t=y -# Linux headers same as kernel, a 3.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y -BR2_PACKAGE_MTD=y -BR2_PACKAGE_HOST_SAM_BA=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_AT91BOOTSTRAP=y -BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/usb-a9260" -BR2_TARGET_AT91BOOTSTRAP_BOARD="usb_a9260" -BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y -BR2_TARGET_BAREBOX=y -BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9260" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.10" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9260/linux-3.7.4.config" diff --git a/configs/calao_usb_a9263_defconfig b/configs/calao_usb_a9263_defconfig deleted file mode 100644 index ed6d3cbd88..0000000000 --- a/configs/calao_usb_a9263_defconfig +++ /dev/null @@ -1,17 +0,0 @@ -BR2_arm=y -BR2_arm926t=y -# Linux headers same as kernel, a 3.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y -BR2_PACKAGE_HOST_SAM_BA=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_AT91BOOTSTRAP=y -BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/usb-a9263" -BR2_TARGET_AT91BOOTSTRAP_BOARD="usb_a9263" -BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y -BR2_TARGET_BAREBOX=y -BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9263" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.10" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9263/linux-3.4.4.config" diff --git a/configs/calao_usb_a9g20_lpw_defconfig b/configs/calao_usb_a9g20_lpw_defconfig deleted file mode 100644 index 8a56d060a0..0000000000 --- a/configs/calao_usb_a9g20_lpw_defconfig +++ /dev/null @@ -1,17 +0,0 @@ -BR2_arm=y -BR2_arm926t=y -# Linux headers same as kernel, a 3.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y -BR2_GLOBAL_PATCH_DIR="board/calao/usb-a9g20-lpw/patches" -BR2_PACKAGE_HOST_SAM_BA=y -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_AT91BOOTSTRAP=y -BR2_TARGET_AT91BOOTSTRAP_BOARD="usb_a9g20_lpw" -BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y -BR2_TARGET_BAREBOX=y -BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9g20" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.10" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/usb-a9g20-lpw/linux-3.4.4.config" From 2501039e3f6f105745be48cbc3b1cb48b00d519e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Nov 2016 14:32:37 +0100 Subject: [PATCH 1335/3392] DEVELOPERS: remove Gregory Hermant The Calao Systems company has gone bankrupt in April 2016, and the domain name no longer exists, so there is no chance to ever contact Gregory Hermant at a @calao-systems.com address, so let's remove his entry from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 8 -------- 1 file changed, 8 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 9035d22d26..9d0ede76a0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -569,14 +569,6 @@ F: package/libsrtp/ F: package/libwebsock/ F: package/sofia-sip/ -N: Gregory Hermant -F: package/bcusdk/ -F: package/dfu-util/ -F: package/libpthsem/ -F: package/linknx/ -F: package/snowball-hdmiservice/ -F: package/ux500-firmware/ - N: Guillaume Gardet F: package/c-icap/ F: package/c-icap-modules/ From ed364d1e54a7a31f6e2dc40af4b496c93148383e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Nov 2016 14:32:38 +0100 Subject: [PATCH 1336/3392] snowball-{hdmiservice, init}: remove packages The snowball_defconfig has been removed one year ago in commit b3fa8e24defb20e1734e7e75f432090fe83c0dd8 ("configs: remove calao_snowball_defconfig"), and it's no longer possible to buy Snowball boards. Therefore, there is no reason to keep the snowball-related packages in our tree. Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 17 +++++++++++++ package/Config.in | 2 -- package/snowball-hdmiservice/Config.in | 14 ----------- .../snowball-hdmiservice.hash | 2 -- .../snowball-hdmiservice.mk | 25 ------------------- package/snowball-init/Config.in | 17 ------------- package/snowball-init/snowball-init.hash | 2 -- package/snowball-init/snowball-init.mk | 16 ------------ 8 files changed, 17 insertions(+), 78 deletions(-) delete mode 100644 package/snowball-hdmiservice/Config.in delete mode 100644 package/snowball-hdmiservice/snowball-hdmiservice.hash delete mode 100644 package/snowball-hdmiservice/snowball-hdmiservice.mk delete mode 100644 package/snowball-init/Config.in delete mode 100644 package/snowball-init/snowball-init.hash delete mode 100644 package/snowball-init/snowball-init.mk diff --git a/Config.in.legacy b/Config.in.legacy index 8c41b05095..53fcf4e31f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -142,6 +142,23 @@ comment "build, or run, in unpredictable ways. " comment "----------------------------------------------------" endif +############################################################################### +comment "Legacy options removed in 2017.02" + +config BR2_PACKAGE_SNOWBALL_HDMISERVICE + bool "snowball-hdmiservice removed" + select BR2_LEGACY + help + We no longer have support for the Snowball platform in + Buildroot, so this package was no longer useful. + +config BR2_PACKAGE_SNOWBALL_INIT + bool "snowball-init removed" + select BR2_LEGACY + help + We no longer have support for the Snowball platform in + Buildroot, so this package was no longer useful. + ############################################################################### comment "Legacy options removed in 2016.11" diff --git a/package/Config.in b/package/Config.in index 0d449dcfb7..7c91215d69 100644 --- a/package/Config.in +++ b/package/Config.in @@ -453,7 +453,6 @@ endmenu source "package/sispmctl/Config.in" 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" @@ -1419,7 +1418,6 @@ menu "Miscellaneous" source "package/qemu/Config.in" source "package/qpdf/Config.in" source "package/shared-mime-info/Config.in" - source "package/snowball-init/Config.in" source "package/taskd/Config.in" source "package/wine/Config.in" source "package/xutil_util-macros/Config.in" diff --git a/package/snowball-hdmiservice/Config.in b/package/snowball-hdmiservice/Config.in deleted file mode 100644 index 21a4f3c3cb..0000000000 --- a/package/snowball-hdmiservice/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_SNOWBALL_HDMISERVICE - bool "snowball-hdmiservice" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - HDMI userspace control daemon - - This package contains the HDMI userspace control daemon for the - snowball board - - http://www.igloocommunity.org - -comment "snowball-hdmiservice needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/snowball-hdmiservice/snowball-hdmiservice.hash b/package/snowball-hdmiservice/snowball-hdmiservice.hash deleted file mode 100644 index e9fffd7573..0000000000 --- a/package/snowball-hdmiservice/snowball-hdmiservice.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 dd2d8362a66178be082affa7cc238aebf3d671be184356bc23d13789db638b9d snowball-hdmiservice-f75c99d1c52707240a78b4ba78e41d20d3aa3b08.tar.gz diff --git a/package/snowball-hdmiservice/snowball-hdmiservice.mk b/package/snowball-hdmiservice/snowball-hdmiservice.mk deleted file mode 100644 index 4aa1a2749b..0000000000 --- a/package/snowball-hdmiservice/snowball-hdmiservice.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# snowball-hdmiservice -# -################################################################################ - -SNOWBALL_HDMISERVICE_VERSION = f75c99d1c52707240a78b4ba78e41d20d3aa3b08 -SNOWBALL_HDMISERVICE_SITE = $(call github,igloocommunity,hdmiservice,$(SNOWBALL_HDMISERVICE_VERSION)) -SNOWBALL_HDMISERVICE_LICENSE = MIT -SNOWBALL_HDMISERVICE_LICENSE_FILES = debian/copyright -SNOWBALL_HDMISERVICE_INSTALL_STAGING = YES - -define SNOWBALL_HDMISERVICE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" -endef - -define SNOWBALL_HDMISERVICE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" DESTDIR=$(STAGING_DIR) install -endef - -define SNOWBALL_HDMISERVICE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package/snowball-init/Config.in b/package/snowball-init/Config.in deleted file mode 100644 index 6c94731203..0000000000 --- a/package/snowball-init/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_SNOWBALL_INIT - bool "snowball-init" - # Runtime dependency, needed by snowball startup script - select BR2_PACKAGE_BLUEZ_UTILS - depends on !BR2_STATIC_LIBS # bluez_utils - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 - depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_UX500_FIRMWARE - help - Snowball init scripts - - http://www.igloocommunity.org - -comment "snowball-init 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/snowball-init/snowball-init.hash b/package/snowball-init/snowball-init.hash deleted file mode 100644 index f048ab7320..0000000000 --- a/package/snowball-init/snowball-init.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7adafa3e91cae286e18c062acc1b1d0676ac7352e7dedef9dc6106f905433106 snowball-init-b064be21de25729039e5e54037bbdd2e25cfd5b7.tar.gz diff --git a/package/snowball-init/snowball-init.mk b/package/snowball-init/snowball-init.mk deleted file mode 100644 index f06b03277a..0000000000 --- a/package/snowball-init/snowball-init.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# snowball-init -# -################################################################################ - -SNOWBALL_INIT_VERSION = b064be21de25729039e5e54037bbdd2e25cfd5b7 -SNOWBALL_INIT_SITE = $(call github,igloocommunity,snowball-init,$(SNOWBALL_INIT_VERSION)) -SNOWBALL_INIT_LICENSE = BSD-4c -SNOWBALL_INIT_LICENSE_FILES = debian/copyright - -define SNOWBALL_INIT_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(@D)/snowball $(TARGET_DIR)/etc/init.d/S50snowball -endef - -$(eval $(generic-package)) From 179c5f1b87a46ac272d66a947fddbf7c0fdeb442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 9 Nov 2016 11:57:27 +0100 Subject: [PATCH 1337/3392] Makefile: fix stripping of ld.so and libpthread for merged /usr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If 'lib' is a symlink (as is the case when BR2_ROOTFS_MERGED_USR=y), 'find lib' does not return the correct result. So, until now, libpthread*.so* and ld-*.so* were not stripped when 'lib' was a symlink. We fix this by using 'find lib/' instead of 'find lib'. For consistency reason, we also do the same change for the 'find' that removes .a and .la files. Signed-off-by: Jérôme Pouiller [Thomas: slightly improved the commit log.] Signed-off-by: Thomas Petazzoni --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4ea64b3698..925e9c6327 100644 --- a/Makefile +++ b/Makefile @@ -641,7 +641,7 @@ target-finalize: $(PACKAGES) $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f - find $(TARGET_DIR)/lib $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/libexec \ + find $(TARGET_DIR)/lib/ $(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/libexec/ \ \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f ifneq ($(BR2_PACKAGE_GDB),y) rm -rf $(TARGET_DIR)/usr/share/gdb @@ -663,13 +663,13 @@ endif # besides the one in which crash occurred; or SIGTRAP kills my program when # I set a breakpoint" ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) - find $(TARGET_DIR)/lib -type f -name 'libpthread*.so*' | \ + find $(TARGET_DIR)/lib/ -type f -name 'libpthread*.so*' | \ xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) endif # Valgrind needs ld.so with enough information, so only strip # debugging symbols. - find $(TARGET_DIR)/lib -type f -name 'ld-*.so*' | \ + find $(TARGET_DIR)/lib/ -type f -name 'ld-*.so*' | \ xargs -r $(STRIPCMD) $(STRIP_STRIP_DEBUG) test -f $(TARGET_DIR)/etc/ld.so.conf && \ { echo "ERROR: we shouldn't have a /etc/ld.so.conf file"; exit 1; } || true From 527e63cb82bae97ac2ef48a32a8d0c559ed9701b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 8 Nov 2016 23:18:32 +0100 Subject: [PATCH 1338/3392] package/pseudo: force rpath and pass our host CFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pseudo whines when those are not set, and tries to find a suitable value; this is usually correct but risk an incorrect guess in corner cases. Rather than leaving those in guess-mode, just force them to values we know are correct. Signed-off-by: "Yann E. MORIN" Cc: Gaël PORTAY Cc: Patrick Keroulas Cc: Erico Nunes Cc: Julien BOIBESSOT Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle [Thomas: use double quotes instead of single quotes.] Signed-off-by: Thomas Petazzoni --- package/pseudo/pseudo.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index 92de2c6f1b..a924e10c45 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -16,7 +16,12 @@ HOST_PSEUDO_DEPENDENCIES = host-attr host-sqlite # configure script is not generated by autoconf, so passing --libdir # is necessary, even if the infrastructure passes --prefix already. +# It also does not use CFLAGS from the environment, they need to be +# specified with a custom --cflags option. Also force rpath to avoid +# a warning at configure time. HOST_PSEUDO_CONF_OPTS = \ + --cflags="$(HOSTCFLAGS)" \ + --with-rpath=$(HOST_DIR)/usr/lib \ --bits=$(if $(filter %64,$(HOSTARCH)),64,32) \ --libdir=$(HOST_DIR)/usr/lib \ --with-sqlite=$(HOST_DIR)/usr From a1d602a74d53f5610852c1763014632de145bf8b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 8 Nov 2016 23:18:33 +0100 Subject: [PATCH 1339/3392] package/pseudo: wrap the real pseudo with a wrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Running pseudo is more involved than running fakeroot. In the transition from using fakeroot, we just did not account for the extra requirements. First, we explicitly tell pseudo where it is, otherwise it tries to guess. Its guess is correct, but it prints a warning, which is not nice. Second, we tell it where to find the passwd and group files in case it has to emulate access to them. We currently do not use that feature, but better safe than sorry. Third, pseudo spawns a background daemon, and talks to it (when fakeroot would emulate the state all in the current process' state, pseudo uses the daemon to coordinate the state across multiple processes). We are not much interested in the daemon lingering around, so we just tell it to terminate as soon as the last clients quits (this can take up to one second). Fourth and last, pseudo always stores its internal database when exiting, and reloads it when spawned. The database is by default stored in a sub-directory of the prefix it was installed in, but this is impractical for us. We want the database to be specific to the one config dir we are building, so we store the database in a (hidden) sub-dir of the build dir, thus ensuring it is never shared with another build. That directory is hidden (starts with a dot) because we consider that to be our internal state that we do not want to expose to the user. The wrapper has to be relocatable, so we avoid using hard-coded paths in there: we derive those paths fom the runtime path of pseudo. However, the build directory $(BUILD_DIR) is not available in the environment (we do not export it because it conflicts with some buildsystems). Instead, we use $(BASE_DIR) which is exported. Finally, when relocated, the wrapper would not be used in the Buildroot environment, so may not have access to TARGET_DIR or BASE_DIR, unless the user sets them. If he does not, we still want the wrapper to be working (to avoid the warning about the prefix, and to exit the daemon asap); thus we leave the passwd and localstatedir variable alone if we don't have what it needs to set them, rather than set them to incorrect values. Signed-off-by: "Yann E. MORIN" Cc: Gaël PORTAY Cc: Patrick Keroulas Cc: Erico Nunes Cc: Julien BOIBESSOT Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pseudo/pseudo-wrapper | 12 ++++++++++++ package/pseudo/pseudo.mk | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 package/pseudo/pseudo-wrapper diff --git a/package/pseudo/pseudo-wrapper b/package/pseudo/pseudo-wrapper new file mode 100644 index 0000000000..feaa7fcecb --- /dev/null +++ b/package/pseudo/pseudo-wrapper @@ -0,0 +1,12 @@ +#!/bin/sh + +export PSEUDO_PREFIX="$(dirname "${0%/*}")" +export PSEUDO_OPTS="-t0" +if [ -n "${TARGET_DIR}" ]; then + export PSEUDO_PASSWD="${TARGET_DIR}" +fi +if [ -n "${BASE_DIR}" ]; then + export PSEUDO_LOCALSTATEDIR="${BASE_DIR}/build/.pseudodb" +fi + +exec "${0%-wrapper}" "${@}" diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index a924e10c45..7701825343 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -26,6 +26,12 @@ HOST_PSEUDO_CONF_OPTS = \ --libdir=$(HOST_DIR)/usr/lib \ --with-sqlite=$(HOST_DIR)/usr +define HOST_PSEUDO_INSTALL_WRAPPER + $(INSTALL) -D -m 0755 $(HOST_PSEUDO_PKGDIR)/pseudo-wrapper \ + $(HOST_DIR)/usr/bin/pseudo-wrapper +endef +HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_INSTALL_WRAPPER + define HOST_PSEUDO_FAKEROOT_SYMLINK ln -sf pseudo $(HOST_DIR)/usr/bin/fakeroot endef From 74a3e75bb8208a8f3bb8426549fce1ea09b3be8a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 8 Nov 2016 23:18:34 +0100 Subject: [PATCH 1340/3392] fs: call the pseudo wrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: "Yann E. MORIN" Cc: Gaël PORTAY Cc: Patrick Keroulas Cc: Erico Nunes Cc: Julien BOIBESSOT Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 2dbef4d7b0..22f3de5e2c 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -97,7 +97,7 @@ endif echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) - PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/pseudo -- $$(FAKEROOT_SCRIPT) + PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/pseudo-wrapper -- $$(FAKEROOT_SCRIPT) $$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE) -@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE) ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),) From 499f28fc7ce6184c8017ccd229ffc973a520adde Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 8 Nov 2016 23:18:35 +0100 Subject: [PATCH 1341/3392] package/pseudo: provide better legacy handling for fakeroot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now have a wrapper that makes pseudo behaves like the fakeroot of the good ol' days. So the symlink will just magically keep old scripts working as they did before the switch to pseudo. However, using fakeroot is deprecated, and we want people to stop using it altogether and switch to pseudo. So, make the wrapper recognise how it's called, and if called as fakeroot, print a warning message. Signed-off-by: "Yann E. MORIN" Cc: Gaël PORTAY Cc: Patrick Keroulas Cc: Erico Nunes Cc: Julien BOIBESSOT Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pseudo/pseudo-wrapper | 9 ++++++++- package/pseudo/pseudo.mk | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/pseudo/pseudo-wrapper b/package/pseudo/pseudo-wrapper index feaa7fcecb..9c8dbdbfab 100644 --- a/package/pseudo/pseudo-wrapper +++ b/package/pseudo/pseudo-wrapper @@ -1,5 +1,12 @@ #!/bin/sh +if [ "${0##*/}" = "fakeroot" ]; then + cat >&2 <<-_EOF_ + WARNING: fakeroot has been replaced with pseudo. + WARNING: Update your script(s) to use pseudo or pseudo-wrapper instead. + _EOF_ +fi + export PSEUDO_PREFIX="$(dirname "${0%/*}")" export PSEUDO_OPTS="-t0" if [ -n "${TARGET_DIR}" ]; then @@ -9,4 +16,4 @@ if [ -n "${BASE_DIR}" ]; then export PSEUDO_LOCALSTATEDIR="${BASE_DIR}/build/.pseudodb" fi -exec "${0%-wrapper}" "${@}" +exec "${0%/*}/pseudo" "${@}" diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index 7701825343..aa2a9c78a0 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -33,7 +33,7 @@ endef HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_INSTALL_WRAPPER define HOST_PSEUDO_FAKEROOT_SYMLINK - ln -sf pseudo $(HOST_DIR)/usr/bin/fakeroot + ln -sf pseudo-wrapper $(HOST_DIR)/usr/bin/fakeroot endef HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_FAKEROOT_SYMLINK From 8b7b8b993e2a3dd9c0be4a15d8f31aedf7d933b3 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 10 Nov 2016 06:53:58 +0200 Subject: [PATCH 1342/3392] patchelf: use .tar.bz2 archive Saves a little space and network bandwidth. While at it, use PATCHELF_VERSION for PATCHELF_SITE. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/patchelf/patchelf.hash | 2 +- package/patchelf/patchelf.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/patchelf/patchelf.hash b/package/patchelf/patchelf.hash index 14154a31fc..653eb466bf 100644 --- a/package/patchelf/patchelf.hash +++ b/package/patchelf/patchelf.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f2aa40a6148cb3b0ca807a1bf836b081793e55ec9e5540a5356d800132be7e0a patchelf-0.9.tar.gz +sha256 a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83 patchelf-0.9.tar.bz2 diff --git a/package/patchelf/patchelf.mk b/package/patchelf/patchelf.mk index 5222e57950..cf2e43a730 100644 --- a/package/patchelf/patchelf.mk +++ b/package/patchelf/patchelf.mk @@ -5,7 +5,8 @@ ################################################################################ PATCHELF_VERSION = 0.9 -PATCHELF_SITE = http://releases.nixos.org/patchelf/patchelf-0.9 +PATCHELF_SITE = http://releases.nixos.org/patchelf/patchelf-$(PATCHELF_VERSION) +PATCHELF_SOURCE = patchelf-$(PATCHELF_VERSION).tar.bz2 PATCHELF_LICENSE = GPLv3+ PATCHELF_LICENSE_FILES = COPYING From a50b9f0ebf73d98567ce1f98bf913ffc5c39e13e Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 10 Nov 2016 08:05:35 +0100 Subject: [PATCH 1343/3392] configs: atmel: at91sam9260eknf: update defconfig Bump to a recent version of AT91bootstrap and use mainline version of U-Boot and Linux. This is needed to fix the build with gcc 5.x. Signed-off-by: Ludovic Desroches [Thomas: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y.] Signed-off-by: Thomas Petazzoni --- board/atmel/at91sam9260ek/linux-3.9.config | 98 ---------------------- configs/at91sam9260eknf_defconfig | 36 ++++---- 2 files changed, 21 insertions(+), 113 deletions(-) delete mode 100644 board/atmel/at91sam9260ek/linux-3.9.config diff --git a/board/atmel/at91sam9260ek/linux-3.9.config b/board/atmel/at91sam9260ek/linux-3.9.config deleted file mode 100644 index 48dc656f4a..0000000000 --- a/board/atmel/at91sam9260ek/linux-3.9.config +++ /dev/null @@ -1,98 +0,0 @@ -CONFIG_EXPERIMENTAL=y -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_KERNEL_LZO=y -# CONFIG_SWAP is not set -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_SLAB=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_AT91=y -CONFIG_ARCH_AT91SAM9260=y -CONFIG_ARCH_AT91SAM9260_SAM9XE=y -CONFIG_MACH_AT91SAM9260EK=y -CONFIG_MACH_CAM60=y -CONFIG_MACH_SAM9_L9260=y -CONFIG_MACH_AFEB9260=y -CONFIG_MACH_USB_A9260=y -CONFIG_MACH_QIL_A9260=y -CONFIG_MACH_CPU9260=y -CONFIG_MACH_FLEXIBITY=y -CONFIG_MACH_SNAPPER_9260=y -CONFIG_MACH_AT91SAM_DT=y -CONFIG_AT91_PROGRAMMABLE_CLOCKS=y -# CONFIG_ARM_THUMB is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" -CONFIG_FPE_NWFPE=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_IPV6 is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_MACB=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_GPIO=y -# CONFIG_HWMON is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_AT91SAM9X_WATCHDOG=y -# CONFIG_USB_HID is not set -CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_DEBUG=y -CONFIG_USB_GADGET=y -CONFIG_USB_ZERO=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91SAM9=y -CONFIG_EXT2_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_UBIFS_FS=y -CONFIG_CRAMFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y diff --git a/configs/at91sam9260eknf_defconfig b/configs/at91sam9260eknf_defconfig index 92bb07116f..d91fcb0549 100644 --- a/configs/at91sam9260eknf_defconfig +++ b/configs/at91sam9260eknf_defconfig @@ -2,26 +2,32 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 3.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y -# Packages -BR2_PACKAGE_HOST_SAM_BA=y +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" +BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9260ek" # Filesystem BR2_TARGET_ROOTFS_UBIFS=y BR2_TARGET_ROOTFS_UBI=y # Bootloaders -BR2_TARGET_AT91BOOTSTRAP=y -BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9260ek" -BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y -BR2_TARGET_BAREBOX=y -BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="at91sam9260ek" +BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" +BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9260eknf_uboot" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9260ek_nandflash" -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/atmel/at91sam9260ek/linux-3.9.config" +# Host packages +BR2_PACKAGE_HOST_SAM_BA=y From 39c15c0e6e60599daa931019377300261062ad5a Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 10 Nov 2016 08:05:36 +0100 Subject: [PATCH 1344/3392] configs: atmel: at91sam9rlek: update defconfig Bump to a recent version of AT91bootstrap and use mainline version of U-Boot and Linux. This is needed to fix the build with gcc 5.x. Signed-off-by: Ludovic Desroches [Thomas: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y.] Signed-off-by: Thomas Petazzoni --- configs/at91sam9rlek_defconfig | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/configs/at91sam9rlek_defconfig b/configs/at91sam9rlek_defconfig index 66e4a8884e..bc1be16421 100644 --- a/configs/at91sam9rlek_defconfig +++ b/configs/at91sam9rlek_defconfig @@ -1,22 +1,34 @@ +# Architecture BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 3.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y + +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y + +# Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="03329ca4cf6b94acc5c65b59b2d1f90fdeee0887" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9rlek" + +# Filesystem BR2_TARGET_ROOTFS_UBIFS=y BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_ROOTFS_UBI=y + +# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9rleknf_uboot" BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="at91sam9rlek_nandflash" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="677f3c2340b72131beebace8e96cac17b9569887" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9rlek_nandflash" + +# Host packages BR2_PACKAGE_HOST_SAM_BA=y From e214d710f17490db98584dbaba70c69aa8b1b0e4 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 10 Nov 2016 08:05:37 +0100 Subject: [PATCH 1345/3392] configs: atmel: at91sam9g20dfc: update defconfig Bump to a recent version of AT91bootstrap and use mainline version of U-Boot and Linux. This is needed to fix the build with gcc 5.x. Signed-off-by: Ludovic Desroches [Thomas: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y.] Signed-off-by: Thomas Petazzoni --- configs/at91sam9g20dfc_defconfig | 39 +++++++++++++++++--------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index 4ed5a9b0b9..15a8d879b7 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -2,28 +2,31 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 3.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_1=y - -# Host utilities -# -BR2_PACKAGE_HOST_SAM_BA=y - -# First stage bootloader -BR2_TARGET_AT91BOOTSTRAP=y -BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9g20ek" -BR2_TARGET_AT91BOOTSTRAP_DATAFLASHCARD=y - -# Second stage bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="at91sam9g20ek_nandflash" +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1.6" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="at91sam9g20ek" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" +BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g20ek" # Filesystem BR2_TARGET_ROOTFS_TAR=y + +# Bootloaders +BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" +BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9g20eknf_uboot" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9g20ek_nandflash" + +# Host packages +BR2_PACKAGE_HOST_SAM_BA=y From 30dc5f4d40b25729daf6f2c6cda28f7ad77701f7 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 10 Nov 2016 08:05:38 +0100 Subject: [PATCH 1346/3392] configs: atmel: at91sam9g45m10ek: update defconfig Bump to a recent version of AT91bootstrap and use mainline version of U-Boot and Linux. This is needed to fix the build with gcc 5.x. Signed-off-by: Ludovic Desroches [Thomas: add missing BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y.] Signed-off-by: Thomas Petazzoni --- configs/at91sam9g45m10ek_defconfig | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/configs/at91sam9g45m10ek_defconfig b/configs/at91sam9g45m10ek_defconfig index 35618d5f4c..2bf7179980 100644 --- a/configs/at91sam9g45m10ek_defconfig +++ b/configs/at91sam9g45m10ek_defconfig @@ -1,22 +1,34 @@ +# Architecture BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 3.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y + +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y + +# Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="03329ca4cf6b94acc5c65b59b2d1f90fdeee0887" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9m10g45ek" + +# Filesystem BR2_TARGET_ROOTFS_UBIFS=y BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047 BR2_TARGET_ROOTFS_UBI=y + +# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9m10g45eknf_uboot" BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="at91sam9m10g45ek_nandflash" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="677f3c2340b72131beebace8e96cac17b9569887" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9m10g45ek_nandflash" + +# Host packages BR2_PACKAGE_HOST_SAM_BA=y From e09a4e3cfd3d0c766138ad978713409bae1598e0 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 10 Nov 2016 09:45:30 +0100 Subject: [PATCH 1347/3392] configs/atmel_sama5d3xek: bump to linux4sam_5.5 Bump to linux4sam_5.5 and remove dtb variants which are no longer supported. This is needed to fix the build with gcc 5.x. Signed-off-by: Ludovic Desroches Signed-off-by: Thomas Petazzoni --- configs/atmel_sama5d3xek_defconfig | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/configs/atmel_sama5d3xek_defconfig b/configs/atmel_sama5d3xek_defconfig index 086c18e0d4..c57076c9f9 100644 --- a/configs/atmel_sama5d3xek_defconfig +++ b/configs/atmel_sama5d3xek_defconfig @@ -1,26 +1,40 @@ +# Architecture BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -# Linux headers same as kernel, a 3.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y + +# Toolchain +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="03329ca4cf6b94acc5c65b59b2d1f90fdeee0887" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sama5d31ek sama5d31ek_pda4 sama5d31ek_pda7 sama5d31ek_revc sama5d31ek_revc_pda4 sama5d31ek_revc_pda7 sama5d33ek sama5d33ek_pda4 sama5d33ek_pda7 sama5d33ek_revc sama5d33ek_revc_pda4 sama5d33ek_revc_pda7 sama5d34ek sama5d34ek_pda4 sama5d34ek_pda7 sama5d34ek_revc sama5d34ek_revc_pda4 sama5d34ek_revc_pda7 sama5d35ek sama5d35ek_revc sama5d36ek sama5d36ek_pda4 sama5d36ek_pda7 sama5d36ek_revc sama5d36ek_revc_pda4 sama5d36ek_revc_pda7" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sama5d31ek sama5d33ek sama5d34ek sama5d35ek sama5d36ek" + +# Filesystem BR2_TARGET_ROOTFS_UBIFS=y BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 BR2_TARGET_ROOTFS_UBI=y BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 + +# Bootloaders BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3xeknf_uboot" BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="sama5d3xek_nandflash" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="677f3c2340b72131beebace8e96cac17b9569887" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3xek_nandflash" BR2_TARGET_UBOOT_SPL=y + +# Host packages BR2_PACKAGE_HOST_SAM_BA=y From dca2c33af71712128baf2d480d9103fdfa36e000 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 10 Nov 2016 09:49:27 +0100 Subject: [PATCH 1348/3392] configs/atmel_sama5d4ek: remove defconfig The Atmel sama5d4ek board is no longer sold. Since there is the Xplained board and we won't maintain anymore the EK board, the defconfig can be removed. In addition, the defconfig was failing to build with gcc 5.x. Signed-off-by: Ludovic Desroches Signed-off-by: Thomas Petazzoni --- configs/atmel_sama5d4ek_defconfig | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 configs/atmel_sama5d4ek_defconfig diff --git a/configs/atmel_sama5d4ek_defconfig b/configs/atmel_sama5d4ek_defconfig deleted file mode 100644 index 9d74eeed1d..0000000000 --- a/configs/atmel_sama5d4ek_defconfig +++ /dev/null @@ -1,30 +0,0 @@ -BR2_arm=y -BR2_cortex_a5=y -BR2_ARM_ENABLE_NEON=y -BR2_ARM_ENABLE_VFP=y -BR2_ARM_INSTRUCTIONS_THUMB2=y -# Linux headers same as kernel, a 3.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="03329ca4cf6b94acc5c65b59b2d1f90fdeee0887" -BR2_LINUX_KERNEL_DEFCONFIG="sama5" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4ek" -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 -BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 -BR2_TARGET_ROOTFS_UBI=y -BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 -BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 -BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4eknf_uboot_secure" -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="sama5d4ek_nandflash" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="677f3c2340b72131beebace8e96cac17b9569887" -BR2_TARGET_UBOOT_SPL=y -BR2_PACKAGE_HOST_SAM_BA=y From 78ac39cb89a6933c36508f6b10d30150ddb1ba05 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Thu, 10 Nov 2016 11:14:39 +0100 Subject: [PATCH 1349/3392] board/atmel/readme.txt: remove mention of sama5d4ek The sama5d4ek defconfig has been removed in commit 9cb0b37cbd267ec1c2beea3deeaa86846bc2d037, but the board/atmel/readme.txt file was not updated accordingly. This commit fixes that. Reported-by: Baruch Siach Signed-off-by: Ludovic Desroches Signed-off-by: Thomas Petazzoni --- board/atmel/readme.txt | 1 - configs/atmel_sama5d4_xplained_defconfig | 32 ------------------------ 2 files changed, 33 deletions(-) delete mode 100644 configs/atmel_sama5d4_xplained_defconfig diff --git a/board/atmel/readme.txt b/board/atmel/readme.txt index 3a79e57c33..0b6634687e 100644 --- a/board/atmel/readme.txt +++ b/board/atmel/readme.txt @@ -13,7 +13,6 @@ This guide covers the following configurations: - atmel_sama5d3_xplained_dev_defconfig - atmel_sama5d3_xplained_mmc_defconfig - atmel_sama5d3_xplained_mmc_dev_defconfig - - atmel_sama5d4ek_defconfig - atmel_sama5d4_xplained_defconfig - atmel_sama5d4_xplained_dev_defconfig - atmel_sama5d4_xplained_mmc_defconfig diff --git a/configs/atmel_sama5d4_xplained_defconfig b/configs/atmel_sama5d4_xplained_defconfig deleted file mode 100644 index 5646723d15..0000000000 --- a/configs/atmel_sama5d4_xplained_defconfig +++ /dev/null @@ -1,32 +0,0 @@ -BR2_arm=y -BR2_cortex_a5=y -BR2_ARM_ENABLE_NEON=y -BR2_ARM_ENABLE_VFP=y -BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" -BR2_LINUX_KERNEL_DEFCONFIG="sama5" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" -BR2_TARGET_ROOTFS_UBIFS=y -BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 -BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 -BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 -BR2_TARGET_ROOTFS_UBI=y -BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 -BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 -BR2_TARGET_AT91BOOTSTRAP3=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" -BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash" -BR2_PACKAGE_HOST_SAM_BA=y From 6be40345af9c08b795573a4c922ccba1049cb47d Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 10 Nov 2016 10:57:15 +0100 Subject: [PATCH 1350/3392] sunxi-tools: bump to version 1.4.1 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/sunxi-tools/sunxi-tools.hash | 2 +- package/sunxi-tools/sunxi-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sunxi-tools/sunxi-tools.hash b/package/sunxi-tools/sunxi-tools.hash index 90991a36be..efb2b54d9c 100644 --- a/package/sunxi-tools/sunxi-tools.hash +++ b/package/sunxi-tools/sunxi-tools.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8b5defeaabec99b6c759ed1d99d91e4d23188431868d17cf6ed144f37e42bee5 sunxi-tools-89dac0f7eaaedd0d8afa9d5a3c713c7c1ccb9cf6.tar.gz +sha256 da5d762608517b4b2e9bd392bd9a63afae3973d9c8264cbcfb757ddac8120d1b sunxi-tools-v1.4.1.tar.gz diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk index 23e313533b..c554a5fd15 100644 --- a/package/sunxi-tools/sunxi-tools.mk +++ b/package/sunxi-tools/sunxi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUNXI_TOOLS_VERSION = 89dac0f7eaaedd0d8afa9d5a3c713c7c1ccb9cf6 +SUNXI_TOOLS_VERSION = v1.4.1 SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,$(SUNXI_TOOLS_VERSION)) SUNXI_TOOLS_LICENSE = GPLv2+ SUNXI_TOOLS_LICENSE_FILES = COPYING From 1a23203bf40ce3ade154cdc3f1b91191ca23fdd3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 10 Nov 2016 13:54:48 +0100 Subject: [PATCH 1351/3392] configs/atmel_sama5d4_xplained: re-add defconfig This defconfig was mistakenly removed by commit 78ac39cb89a6933c36508f6b10d30150ddb1ba05 due to an improper conflict detection in "git am". This commit restores it. Signed-off-by: Thomas Petazzoni --- configs/atmel_sama5d4_xplained_defconfig | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 configs/atmel_sama5d4_xplained_defconfig diff --git a/configs/atmel_sama5d4_xplained_defconfig b/configs/atmel_sama5d4_xplained_defconfig new file mode 100644 index 0000000000..5646723d15 --- /dev/null +++ b/configs/atmel_sama5d4_xplained_defconfig @@ -0,0 +1,32 @@ +BR2_arm=y +BR2_cortex_a5=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5" +BR2_LINUX_KERNEL_DEFCONFIG="sama5" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b" +BR2_TARGET_ROOTFS_UBIFS=y +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3e000 +BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1000 +BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2082 +BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000 +BR2_TARGET_ROOTFS_UBI_SUBSIZE=0 +BR2_TARGET_AT91BOOTSTRAP3=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7" +BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash" +BR2_PACKAGE_HOST_SAM_BA=y From 80e59b9de2e8a4296322ee998e5e99d8a72f6ee4 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 10 Nov 2016 11:55:24 +0100 Subject: [PATCH 1352/3392] sunxi-tools: fix license file Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/sunxi-tools/sunxi-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk index c554a5fd15..1a58aff1be 100644 --- a/package/sunxi-tools/sunxi-tools.mk +++ b/package/sunxi-tools/sunxi-tools.mk @@ -7,7 +7,7 @@ SUNXI_TOOLS_VERSION = v1.4.1 SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,$(SUNXI_TOOLS_VERSION)) SUNXI_TOOLS_LICENSE = GPLv2+ -SUNXI_TOOLS_LICENSE_FILES = COPYING +SUNXI_TOOLS_LICENSE_FILES = LICENSE.md HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf FEX2BIN = $(HOST_DIR)/usr/bin/fex2bin From cd8171f4c7eb60fb349f549e124c3744f8a9af32 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 11 Nov 2016 12:45:11 +0100 Subject: [PATCH 1353/3392] package/domoticz: disable for Sourcery CodeBench SH 2012.09 Like for prboom, domoticz trigger an internal compiler error: [...]/hardware/MySensorsBase.cpp: In member function 'void MySensorsBase::Do_Send_Work()': [...]/hardware/MySensorsBase.cpp:2190:6: internal compiler error: Segmentation fault Fixes: http://autobuild.buildroot.net/results/0ea/0eadf342f86ed71c3a4008f13a4d3e175143460d Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/domoticz/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 3bd7824add..f128e6f88c 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_DOMOTICZ depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3 + # These result in internal compiler error + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_DATE_TIME select BR2_PACKAGE_BOOST_SYSTEM @@ -26,6 +28,7 @@ config BR2_PACKAGE_DOMOTICZ comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, threads, wchar, dynamic library" depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ !(BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3) From 4f04be1659f186765f506c68f5bfbf6845fc40dc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 11 Nov 2016 09:54:06 +0100 Subject: [PATCH 1354/3392] package/efl: remove wayland dependency Wayland support requires DRM support in efl libraries since 1.18 bump, but this support is not merged yet in Buildroot and waiting for review [1]. For 2016.11, keep wayland support disabled to avoid build issues. Fixes: http://autobuild.buildroot.net/results/162133cbddcca1ea8be660a19771f04296c20fd2 [1] http://patchwork.ozlabs.org/patch/671260/ http://patchwork.ozlabs.org/patch/671261/ Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/efl/Config.in | 1 - package/efl/efl.mk | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index f963ade8e5..69b0dcfb39 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -14,7 +14,6 @@ config BR2_PACKAGE_EFL select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_JPEG # Emile needs libjpeg select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency - select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND # https://phab.enlightenment.org/T2728 select BR2_PACKAGE_LUAJIT # Lua support broken select BR2_PACKAGE_UTIL_LINUX diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 777ef3c848..6af7aa0c5e 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -42,6 +42,7 @@ EFL_CONF_OPTS = \ --disable-sdl \ --disable-spectre \ --disable-xinput22 \ + --disable-wayland \ --with-doxygen=no # Disable untested configuration warning. @@ -145,13 +146,6 @@ else EFL_CONF_OPTS += --with-crypto=none endif # BR2_PACKAGE_OPENSSL -ifeq ($(BR2_PACKAGE_WAYLAND),y) -EFL_DEPENDENCIES += wayland libxkbcommon -EFL_CONF_OPTS += --enable-wayland -else -EFL_CONF_OPTS += --disable-wayland -endif - ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) EFL_CONF_OPTS += --enable-elput EFL_DEPENDENCIES += libinput libxkbcommon From 7a21e6e9e3095197267d11c0844e94d648d5f379 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 10 Nov 2016 19:54:39 +0200 Subject: [PATCH 1355/3392] jasper: security bump to version 1.900.22 Fixes: CVE-2016-8693: Double free vulnerability in mem_close CVE-2016-8692: Divide by zero in jpc_dec_process_siz CVE-2016-8691: Divide by zero in jpc_dec_process_siz CVE-2016-8690: Null pointer dereference in bmp_getdata triggered by crafted BMP image CVE-2016-2089: matrix rows_ NULL pointer dereference in jas_matrix_clip() CVE-2016-8886: memory allocation failure in jas_malloc CVE-2016-8887: Null pointer dereference in jp2_colr_destroy CVE-2016-8884, CVE-2016-8885: Null pointer dereference in bmp_getdata (incomplete fix for CVE-2016-8690) CVE-2016-8880: Heap buffer overflow in jpc_dec_cp_setfromcox() CVE-2016-8881: Heap buffer overflow in jpc_getuint16() CVE-2016-8882: Null pointer access in jpc_pi_destroy CVE-2016-8883: Assert in jpc_dec_tiledecode() Drop upstream patches. Change SITE to the official download location, since the current one does not have the updated version. Unfortunately, the official site only offers tar.gz. Fix license. It is "based on the MIT license", but not exactly the same (http://www.ece.uvic.ca/~frodo/jasper/; under "Legal Issues"). Drop autoreconf; the autotools version has been updated since commit 324ccec90d (jasper: autoreconf to fix rpath issue) that introduced it. Cc: Maxime Hadjinlian Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/jasper/0001-fix-CVE-2014-9029.patch | 36 -- package/jasper/0002-fix-CVE-2014-8138.patch | 18 - package/jasper/0003-fix-CVE-2014-8137-1.patch | 47 --- package/jasper/0004-fix-CVE-2014-8137-2.patch | 18 - package/jasper/0005-fix-CVE-2014-8157.patch | 17 - package/jasper/0006-fix-CVE-2014-8158.patch | 334 ------------------ package/jasper/0007-preserve-cflags.patch | 27 -- package/jasper/0008-fix-CVE-2016-2116.patch | 18 - package/jasper/0009-fix-CVE-2016-1577.patch | 18 - package/jasper/0010-fix-CVE-2016-1867.patch | 16 - package/jasper/0011-fix-CVE-2015-5221.patch | 23 -- package/jasper/0012-fix-CVE-2015-5203.patch | 187 ---------- package/jasper/jasper.hash | 2 +- package/jasper/jasper.mk | 9 +- 14 files changed, 4 insertions(+), 766 deletions(-) delete mode 100644 package/jasper/0001-fix-CVE-2014-9029.patch delete mode 100644 package/jasper/0002-fix-CVE-2014-8138.patch delete mode 100644 package/jasper/0003-fix-CVE-2014-8137-1.patch delete mode 100644 package/jasper/0004-fix-CVE-2014-8137-2.patch delete mode 100644 package/jasper/0005-fix-CVE-2014-8157.patch delete mode 100644 package/jasper/0006-fix-CVE-2014-8158.patch delete mode 100644 package/jasper/0007-preserve-cflags.patch delete mode 100644 package/jasper/0008-fix-CVE-2016-2116.patch delete mode 100644 package/jasper/0009-fix-CVE-2016-1577.patch delete mode 100644 package/jasper/0010-fix-CVE-2016-1867.patch delete mode 100644 package/jasper/0011-fix-CVE-2015-5221.patch delete mode 100644 package/jasper/0012-fix-CVE-2015-5203.patch diff --git a/package/jasper/0001-fix-CVE-2014-9029.patch b/package/jasper/0001-fix-CVE-2014-9029.patch deleted file mode 100644 index c2e95a8d14..0000000000 --- a/package/jasper/0001-fix-CVE-2014-9029.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix CVE-2014-9029 - -Patch taken from https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2014-9029 - -Signed-off-by: Baruch Siach ---- - ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:45:44.000000000 +0100 -+++ jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:44:58.000000000 +0100 -@@ -1281,7 +1281,7 @@ static int jpc_dec_process_coc(jpc_dec_t - jpc_coc_t *coc = &ms->parms.coc; - jpc_dec_tile_t *tile; - -- if (JAS_CAST(int, coc->compno) > dec->numcomps) { -+ if (JAS_CAST(int, coc->compno) >= dec->numcomps) { - jas_eprintf("invalid component number in COC marker segment\n"); - return -1; - } -@@ -1307,7 +1307,7 @@ static int jpc_dec_process_rgn(jpc_dec_t - jpc_rgn_t *rgn = &ms->parms.rgn; - jpc_dec_tile_t *tile; - -- if (JAS_CAST(int, rgn->compno) > dec->numcomps) { -+ if (JAS_CAST(int, rgn->compno) >= dec->numcomps) { - jas_eprintf("invalid component number in RGN marker segment\n"); - return -1; - } -@@ -1356,7 +1356,7 @@ static int jpc_dec_process_qcc(jpc_dec_t - jpc_qcc_t *qcc = &ms->parms.qcc; - jpc_dec_tile_t *tile; - -- if (JAS_CAST(int, qcc->compno) > dec->numcomps) { -+ if (JAS_CAST(int, qcc->compno) >= dec->numcomps) { - jas_eprintf("invalid component number in QCC marker segment\n"); - return -1; - } diff --git a/package/jasper/0002-fix-CVE-2014-8138.patch b/package/jasper/0002-fix-CVE-2014-8138.patch deleted file mode 100644 index e107123ce8..0000000000 --- a/package/jasper/0002-fix-CVE-2014-8138.patch +++ /dev/null @@ -1,18 +0,0 @@ -See https://bugzilla.redhat.com/show_bug.cgi?id=1173162 - -Signed-off-by: Gustavo Zacarias - ---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:44.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:26.000000000 +0100 -@@ -386,6 +386,11 @@ jas_image_t *jp2_decode(jas_stream_t *in - /* Determine the type of each component. */ - if (dec->cdef) { - for (i = 0; i < dec->numchans; ++i) { -+ /* Is the channel number reasonable? */ -+ if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) { -+ jas_eprintf("error: invalid channel number in CDEF box\n"); -+ goto error; -+ } - jas_image_setcmpttype(dec->image, - dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo], - jp2_getct(jas_image_clrspc(dec->image), diff --git a/package/jasper/0003-fix-CVE-2014-8137-1.patch b/package/jasper/0003-fix-CVE-2014-8137-1.patch deleted file mode 100644 index 0253c62839..0000000000 --- a/package/jasper/0003-fix-CVE-2014-8137-1.patch +++ /dev/null @@ -1,47 +0,0 @@ -See https://bugzilla.redhat.com/show_bug.cgi?id=1173157 - -Signed-off-by: Gustavo Zacarias - ---- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c 2014-12-11 14:06:44.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/base/jas_icc.c 2014-12-11 15:16:37.971272386 +0100 -@@ -1009,7 +1009,6 @@ static int jas_icccurv_input(jas_iccattr - return 0; - - error: -- jas_icccurv_destroy(attrval); - return -1; - } - -@@ -1127,7 +1126,6 @@ static int jas_icctxtdesc_input(jas_icca - #endif - return 0; - error: -- jas_icctxtdesc_destroy(attrval); - return -1; - } - -@@ -1206,8 +1204,6 @@ static int jas_icctxt_input(jas_iccattrv - goto error; - return 0; - error: -- if (txt->string) -- jas_free(txt->string); - return -1; - } - -@@ -1328,7 +1324,6 @@ static int jas_icclut8_input(jas_iccattr - goto error; - return 0; - error: -- jas_icclut8_destroy(attrval); - return -1; - } - -@@ -1497,7 +1492,6 @@ static int jas_icclut16_input(jas_iccatt - goto error; - return 0; - error: -- jas_icclut16_destroy(attrval); - return -1; - } - diff --git a/package/jasper/0004-fix-CVE-2014-8137-2.patch b/package/jasper/0004-fix-CVE-2014-8137-2.patch deleted file mode 100644 index e052709d55..0000000000 --- a/package/jasper/0004-fix-CVE-2014-8137-2.patch +++ /dev/null @@ -1,18 +0,0 @@ -See https://bugzilla.redhat.com/show_bug.cgi?id=1173157 - -Signed-off-by: Gustavo Zacarias - ---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:30:54.193209780 +0100 -+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:36:46.313217814 +0100 -@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in - case JP2_COLR_ICC: - iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp, - dec->colr->data.colr.iccplen); -- assert(iccprof); -+ if (!iccprof) { -+ jas_eprintf("error: failed to parse ICC profile\n"); -+ goto error; -+ } - jas_iccprof_gethdr(iccprof, &icchdr); - jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); - jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc)); diff --git a/package/jasper/0005-fix-CVE-2014-8157.patch b/package/jasper/0005-fix-CVE-2014-8157.patch deleted file mode 100644 index ab81674f93..0000000000 --- a/package/jasper/0005-fix-CVE-2014-8157.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix CVE-2014-8157 - dec->numtiles off-by-one check in jpc_dec_process_sot() -From https://bugzilla.redhat.com/show_bug.cgi?id=1179282 - -Signed-off-by: Gustavo Zacarias - -diff -up jasper-1.900.1/src/libjasper/jpc/jpc_dec.c.CVE-2014-8157 jasper-1.900.1/src/libjasper/jpc/jpc_dec.c ---- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c.CVE-2014-8157 2015-01-19 16:59:36.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2015-01-19 17:07:41.609863268 +0100 -@@ -489,7 +489,7 @@ static int jpc_dec_process_sot(jpc_dec_t - dec->curtileendoff = 0; - } - -- if (JAS_CAST(int, sot->tileno) > dec->numtiles) { -+ if (JAS_CAST(int, sot->tileno) >= dec->numtiles) { - jas_eprintf("invalid tile number in SOT marker segment\n"); - return -1; - } diff --git a/package/jasper/0006-fix-CVE-2014-8158.patch b/package/jasper/0006-fix-CVE-2014-8158.patch deleted file mode 100644 index 8413d2ef93..0000000000 --- a/package/jasper/0006-fix-CVE-2014-8158.patch +++ /dev/null @@ -1,334 +0,0 @@ -Fix CVE-2014-8158 - unrestricted stack memory use in jpc_qmfb.c -From https://bugzilla.redhat.com/show_bug.cgi?id=1179298 - -Signed-off-by: Gustavo Zacarias - -diff -up jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c.CVE-2014-8158 jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c ---- jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c.CVE-2014-8158 2015-01-19 17:25:28.730195502 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c 2015-01-19 17:27:20.214663127 +0100 -@@ -306,11 +306,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - { - - int bufsize = JPC_CEILDIVPOW2(numcols, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE]; --#else -- jpc_fix_t splitbuf[bufsize]; --#endif - jpc_fix_t *buf = splitbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; -@@ -318,7 +314,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - register int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -326,7 +321,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - abort(); - } - } --#endif - - if (numcols >= 2) { - hstartcol = (numcols + 1 - parity) >> 1; -@@ -360,12 +354,10 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -374,11 +366,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE]; --#else -- jpc_fix_t splitbuf[bufsize]; --#endif - jpc_fix_t *buf = splitbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; -@@ -386,7 +374,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - register int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -394,7 +381,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - abort(); - } - } --#endif - - if (numrows >= 2) { - hstartcol = (numrows + 1 - parity) >> 1; -@@ -428,12 +414,10 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -442,11 +426,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t splitbuf[bufsize * JPC_QMFB_COLGRPSIZE]; --#endif - jpc_fix_t *buf = splitbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -457,7 +437,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -465,7 +444,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - abort(); - } - } --#endif - - if (numrows >= 2) { - hstartcol = (numrows + 1 - parity) >> 1; -@@ -517,12 +495,10 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -531,11 +507,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t splitbuf[bufsize * numcols]; --#endif - jpc_fix_t *buf = splitbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -546,7 +518,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -554,7 +525,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - abort(); - } - } --#endif - - if (numrows >= 2) { - hstartcol = (numrows + 1 - parity) >> 1; -@@ -606,12 +576,10 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -619,18 +587,13 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int - { - - int bufsize = JPC_CEILDIVPOW2(numcols, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE]; --#else -- jpc_fix_t joinbuf[bufsize]; --#endif - jpc_fix_t *buf = joinbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; - register int n; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -638,7 +601,6 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int - abort(); - } - } --#endif - - hstartcol = (numcols + 1 - parity) >> 1; - -@@ -670,12 +632,10 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int - ++srcptr; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - -@@ -684,18 +644,13 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE]; --#else -- jpc_fix_t joinbuf[bufsize]; --#endif - jpc_fix_t *buf = joinbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; - register int n; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -703,7 +658,6 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - abort(); - } - } --#endif - - hstartcol = (numrows + 1 - parity) >> 1; - -@@ -735,12 +689,10 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - ++srcptr; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - -@@ -749,11 +701,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t joinbuf[bufsize * JPC_QMFB_COLGRPSIZE]; --#endif - jpc_fix_t *buf = joinbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -763,7 +711,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - register int i; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { -@@ -771,7 +718,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - abort(); - } - } --#endif - - hstartcol = (numrows + 1 - parity) >> 1; - -@@ -821,12 +767,10 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - srcptr += JPC_QMFB_COLGRPSIZE; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - -@@ -835,11 +779,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t joinbuf[bufsize * numcols]; --#endif - jpc_fix_t *buf = joinbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -849,7 +789,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - register int i; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) { -@@ -857,7 +796,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - abort(); - } - } --#endif - - hstartcol = (numrows + 1 - parity) >> 1; - -@@ -907,12 +845,10 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - srcptr += numcols; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - diff --git a/package/jasper/0007-preserve-cflags.patch b/package/jasper/0007-preserve-cflags.patch deleted file mode 100644 index 7e4c4a26f0..0000000000 --- a/package/jasper/0007-preserve-cflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Max Filippov -Subject: Don't overwrite CFLAGS when configured with --enable-debug - -This drops architecture-specific ABI flags, which may be important. - -Signded-off-by: Max Filippov - ---- jasper-1.900.1/configure.ac.orig 2015-05-18 22:27:53.057512760 +0300 -+++ jasper-1.900.1/configure.ac 2015-05-18 22:28:36.090415422 +0300 -@@ -327,7 +327,7 @@ - AC_DEFINE(DEBUG) - AC_DEFINE(DEBUG_OVERFLOW) - if test "$GCC" = yes; then -- CFLAGS="-g -O0" -+ CFLAGS="$CFLAGS -g -O0" - fi - ;; - no) -@@ -357,7 +357,7 @@ - case "${enableval}" in - yes) - if test "$GCC" = yes; then -- CFLAGS="-g -O0" -+ CFLAGS="$CFLAGS -g -O0" - fi - ;; - no) diff --git a/package/jasper/0008-fix-CVE-2016-2116.patch b/package/jasper/0008-fix-CVE-2016-2116.patch deleted file mode 100644 index 1ceb3952c7..0000000000 --- a/package/jasper/0008-fix-CVE-2016-2116.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Prevent jas_stream_t memory leak in jas_iccprof_createfrombuf() -Author: Tyler Hicks - -From: http://seclists.org/oss-sec/2016/q1/att-507/CVE-2016-2116.patch - -Signed-off-by: Gustavo Zacarias - ---- jasper-1.900.1-debian1.orig/src/libjasper/base/jas_icc.c -+++ jasper-1.900.1-debian1/src/libjasper/base/jas_icc.c -@@ -1693,6 +1693,8 @@ jas_iccprof_t *jas_iccprof_createfrombuf - jas_stream_close(in); - return prof; - error: -+ if (in) -+ jas_stream_close(in); - return 0; - } - diff --git a/package/jasper/0009-fix-CVE-2016-1577.patch b/package/jasper/0009-fix-CVE-2016-1577.patch deleted file mode 100644 index cfe8b45e30..0000000000 --- a/package/jasper/0009-fix-CVE-2016-1577.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: CVE-2016-1577: Prevent double-free in jas_iccattrval_destroy() -Author: Tyler Hicks -Bug-Ubuntu: https://launchpad.net/bugs/1547865 - -From: http://seclists.org/oss-sec/2016/q1/att-507/CVE-2016-1577.patch - -Signed-off-by: Gustavo Zacarias - ---- jasper-1.900.1-debian1.orig/src/libjasper/base/jas_icc.c -+++ jasper-1.900.1-debian1/src/libjasper/base/jas_icc.c -@@ -300,6 +300,7 @@ jas_iccprof_t *jas_iccprof_load(jas_stre - if (jas_iccprof_setattr(prof, tagtabent->tag, attrval)) - goto error; - jas_iccattrval_destroy(attrval); -+ attrval = 0; - } else { - #if 0 - jas_eprintf("warning: skipping unknown tag type\n"); diff --git a/package/jasper/0010-fix-CVE-2016-1867.patch b/package/jasper/0010-fix-CVE-2016-1867.patch deleted file mode 100644 index 33f34c356a..0000000000 --- a/package/jasper/0010-fix-CVE-2016-1867.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: http://pkgs.fedoraproject.org/cgit/rpms/jasper.git/plain/jasper-CVE-2016-1867.patch - -Signed-off-by: Gustavo Zacarias - -diff -urNp jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1.new/src/libjasper/jpc/jpc_t2cod.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c 2016-08-11 14:34:31.795661973 +0200 -+++ jasper-1.900.1.new/src/libjasper/jpc/jpc_t2cod.c 2016-08-12 07:02:40.044860209 +0200 -@@ -429,7 +429,7 @@ static int jpc_pi_nextcprl(register jpc_ - } - - for (pi->compno = pchg->compnostart, pi->picomp = -- &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno, -+ &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno < pi->numcomps; ++pi->compno, - ++pi->picomp) { - pirlvl = pi->picomp->pirlvls; - pi->xstep = pi->picomp->hsamp * (1 << (pirlvl->prcwidthexpn + diff --git a/package/jasper/0011-fix-CVE-2015-5221.patch b/package/jasper/0011-fix-CVE-2015-5221.patch deleted file mode 100644 index 7dcbdddd7b..0000000000 --- a/package/jasper/0011-fix-CVE-2015-5221.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: http://pkgs.fedoraproject.org/cgit/rpms/jasper.git/plain/jasper-CVE-2015-5221.patch - -Signed-off-by: Gustavo Zacarias - -diff -urNp jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1.new/src/libjasper/mif/mif_cod.c ---- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c 2016-08-11 13:46:26.166415464 +0200 -+++ jasper-1.900.1.new/src/libjasper/mif/mif_cod.c 2016-08-11 14:17:20.507144931 +0200 -@@ -569,13 +569,13 @@ static int mif_process_cmpt(mif_hdr_t *h - break; - } - } -- jas_tvparser_destroy(tvp); - if (!cmpt->sampperx || !cmpt->samppery) { - goto error; - } - if (mif_hdr_addcmpt(hdr, hdr->numcmpts, cmpt)) { - goto error; - } -+ jas_tvparser_destroy(tvp); - return 0; - - error: - diff --git a/package/jasper/0012-fix-CVE-2015-5203.patch b/package/jasper/0012-fix-CVE-2015-5203.patch deleted file mode 100644 index 50f0613cd8..0000000000 --- a/package/jasper/0012-fix-CVE-2015-5203.patch +++ /dev/null @@ -1,187 +0,0 @@ -From: http://pkgs.fedoraproject.org/cgit/rpms/jasper.git/plain/jasper-CVE-2015-5203.patch - -Signed-off-by: Gustavo Zacarias - -diff -urNp jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1.new/src/libjasper/base/jas_stream.c ---- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c 2016-08-11 13:35:09.160895769 +0200 -+++ jasper-1.900.1.new/src/libjasper/base/jas_stream.c 2016-08-11 13:39:33.800843489 +0200 -@@ -99,7 +99,7 @@ static int jas_strtoopenmode(const char - static void jas_stream_destroy(jas_stream_t *stream); - static jas_stream_t *jas_stream_create(void); - static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf, -- int bufsize); -+ size_t bufsize); - - static int mem_read(jas_stream_obj_t *obj, char *buf, int cnt); - static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt); -@@ -168,7 +168,7 @@ static jas_stream_t *jas_stream_create() - return stream; - } - --jas_stream_t *jas_stream_memopen(char *buf, int bufsize) -+jas_stream_t *jas_stream_memopen(char *buf, size_t bufsize) - { - jas_stream_t *stream; - jas_stream_memobj_t *obj; -@@ -570,7 +570,7 @@ int jas_stream_puts(jas_stream_t *stream - return 0; - } - --char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize) -+char *jas_stream_gets(jas_stream_t *stream, char *buf, size_t bufsize) - { - int c; - char *bufptr; -@@ -694,7 +694,7 @@ long jas_stream_tell(jas_stream_t *strea - \******************************************************************************/ - - static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf, -- int bufsize) -+ size_t bufsize) - { - /* If this function is being called, the buffer should not have been - initialized yet. */ -@@ -987,7 +987,7 @@ static int mem_read(jas_stream_obj_t *ob - return cnt; - } - --static int mem_resize(jas_stream_memobj_t *m, int bufsize) -+static int mem_resize(jas_stream_memobj_t *m, size_t bufsize) - { - unsigned char *buf; - -diff -urNp jasper-1.900.1.orig/src/libjasper/include/jasper/jas_stream.h jasper-1.900.1.new/src/libjasper/include/jasper/jas_stream.h ---- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_stream.h 2007-01-19 22:43:04.000000000 +0100 -+++ jasper-1.900.1.new/src/libjasper/include/jasper/jas_stream.h 2016-08-11 13:41:27.841153595 +0200 -@@ -215,7 +215,7 @@ typedef struct { - uchar *bufstart_; - - /* The buffer size. */ -- int bufsize_; -+ size_t bufsize_; - - /* The current position in the buffer. */ - uchar *ptr_; -@@ -267,7 +267,7 @@ typedef struct { - uchar *buf_; - - /* The allocated size of the buffer for holding file data. */ -- int bufsize_; -+ size_t bufsize_; - - /* The length of the file. */ - int_fast32_t len_; -@@ -291,7 +291,7 @@ typedef struct { - jas_stream_t *jas_stream_fopen(const char *filename, const char *mode); - - /* Open a memory buffer as a stream. */ --jas_stream_t *jas_stream_memopen(char *buf, int bufsize); -+jas_stream_t *jas_stream_memopen(char *buf, size_t bufsize); - - /* Open a file descriptor as a stream. */ - jas_stream_t *jas_stream_fdopen(int fd, const char *mode); -@@ -366,7 +366,7 @@ int jas_stream_printf(jas_stream_t *stre - int jas_stream_puts(jas_stream_t *stream, const char *s); - - /* Read a line of input from a stream. */ --char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize); -+char *jas_stream_gets(jas_stream_t *stream, char *buf, size_t bufsize); - - /* Look at the next character to be read from a stream without actually - removing it from the stream. */ -diff -urNp jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1.new/src/libjasper/jpc/jpc_qmfb.c ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c 2016-08-11 13:35:09.170895681 +0200 -+++ jasper-1.900.1.new/src/libjasper/jpc/jpc_qmfb.c 2016-08-11 13:45:20.847809678 +0200 -@@ -305,7 +305,7 @@ jpc_qmfb2d_t jpc_ns_qmfb2d = { - void jpc_qmfb_split_row(jpc_fix_t *a, int numcols, int parity) - { - -- int bufsize = JPC_CEILDIVPOW2(numcols, 1); -+ size_t bufsize = JPC_CEILDIVPOW2(numcols, 1); - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE]; - jpc_fix_t *buf = splitbuf; - register jpc_fix_t *srcptr; -@@ -365,7 +365,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - int parity) - { - -- int bufsize = JPC_CEILDIVPOW2(numrows, 1); -+ size_t bufsize = JPC_CEILDIVPOW2(numrows, 1); - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE]; - jpc_fix_t *buf = splitbuf; - register jpc_fix_t *srcptr; -@@ -425,7 +425,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - int parity) - { - -- int bufsize = JPC_CEILDIVPOW2(numrows, 1); -+ size_t bufsize = JPC_CEILDIVPOW2(numrows, 1); - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE]; - jpc_fix_t *buf = splitbuf; - jpc_fix_t *srcptr; -@@ -506,7 +506,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - int stride, int parity) - { - -- int bufsize = JPC_CEILDIVPOW2(numrows, 1); -+ size_t bufsize = JPC_CEILDIVPOW2(numrows, 1); - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE]; - jpc_fix_t *buf = splitbuf; - jpc_fix_t *srcptr; -@@ -586,7 +586,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - void jpc_qmfb_join_row(jpc_fix_t *a, int numcols, int parity) - { - -- int bufsize = JPC_CEILDIVPOW2(numcols, 1); -+ size_t bufsize = JPC_CEILDIVPOW2(numcols, 1); - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE]; - jpc_fix_t *buf = joinbuf; - register jpc_fix_t *srcptr; -@@ -643,7 +643,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - int parity) - { - -- int bufsize = JPC_CEILDIVPOW2(numrows, 1); -+ size_t bufsize = JPC_CEILDIVPOW2(numrows, 1); - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE]; - jpc_fix_t *buf = joinbuf; - register jpc_fix_t *srcptr; -@@ -700,7 +700,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - int parity) - { - -- int bufsize = JPC_CEILDIVPOW2(numrows, 1); -+ size_t bufsize = JPC_CEILDIVPOW2(numrows, 1); - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE]; - jpc_fix_t *buf = joinbuf; - jpc_fix_t *srcptr; -@@ -778,7 +778,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - int stride, int parity) - { - -- int bufsize = JPC_CEILDIVPOW2(numrows, 1); -+ size_t bufsize = JPC_CEILDIVPOW2(numrows, 1); - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE]; - jpc_fix_t *buf = joinbuf; - jpc_fix_t *srcptr; -diff -urNp jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1.new/src/libjasper/mif/mif_cod.c ---- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c 2016-08-11 13:35:09.179895601 +0200 -+++ jasper-1.900.1.new/src/libjasper/mif/mif_cod.c 2016-08-11 13:46:26.166415464 +0200 -@@ -107,7 +107,7 @@ static int mif_hdr_put(mif_hdr_t *hdr, j - static int mif_hdr_addcmpt(mif_hdr_t *hdr, int cmptno, mif_cmpt_t *cmpt); - static mif_cmpt_t *mif_cmpt_create(void); - static void mif_cmpt_destroy(mif_cmpt_t *cmpt); --static char *mif_getline(jas_stream_t *jas_stream, char *buf, int bufsize); -+static char *mif_getline(jas_stream_t *jas_stream, char *buf, size_t bufsize); - static int mif_getc(jas_stream_t *in); - static mif_hdr_t *mif_makehdrfromimage(jas_image_t *image); - -@@ -657,7 +657,7 @@ static void mif_cmpt_destroy(mif_cmpt_t - * MIF parsing code. - \******************************************************************************/ - --static char *mif_getline(jas_stream_t *stream, char *buf, int bufsize) -+static char *mif_getline(jas_stream_t *stream, char *buf, size_t bufsize) - { - int c; - char *bufptr; diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash index 4d9ed7432a..fdadbb283d 100644 --- a/package/jasper/jasper.hash +++ b/package/jasper/jasper.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6e9a959bf4f8cb02f77f42d1b9880b8e85d021ac51f43d8787b5438fd2b7a1c5 jasper-1.900.1.tar.bz2 +sha256 6c942ae79108cd6a359e5bc34ea03565bd33ac20f6814cb09c4f92298b6b1cb8 jasper-1.900.22.tar.gz diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index db86ae88e1..4616fed188 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -4,15 +4,12 @@ # ################################################################################ -JASPER_VERSION = 1.900.1 -JASPER_SITE = http://sources.openelec.tv/devel -JASPER_SOURCE = jasper-$(JASPER_VERSION).tar.bz2 +JASPER_VERSION = 1.900.22 +JASPER_SITE = http://www.ece.uvic.ca/~frodo/jasper/software JASPER_INSTALL_STAGING = YES JASPER_DEPENDENCIES = jpeg -JASPER_LICENSE = MIT +JASPER_LICENSE = JasPer License Version 2.0 JASPER_LICENSE_FILES = LICENSE -# needed to fix rpath issue (http://autobuild.buildroot.net/results/307/307cac65287420252a5bb64715d9a1edd90e72fa/) -JASPER_AUTORECONF = YES # Xtensa gcc is unable to generate correct code with -O0 enabled by # --enable-debug. Allow package build but disable debug. From e71f94a4d1056a6eb29da9b52a3cc25755d573a3 Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Thu, 10 Nov 2016 18:53:27 +0300 Subject: [PATCH 1356/3392] config: bump linux kernel to 4.8.6 in synopsys defconfigs With this commit we update ARC defconfigs with the following: - "snps_axs101_defconfig", "snps_axs103_defconfig" and "snps_hs38_smp_vdk_defconfig": - bump linux kernel version to 4.8.6 - set up host linux headers to 4.8 Signed-off-by: Vlad Zakharov Signed-off-by: Thomas Petazzoni --- configs/snps_axs101_defconfig | 6 +++--- configs/snps_axs103_defconfig | 6 +++--- configs/snps_hs38_smp_vdk_defconfig | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/snps_axs101_defconfig b/configs/snps_axs101_defconfig index f272853c13..eea7a50141 100644 --- a/configs/snps_axs101_defconfig +++ b/configs/snps_axs101_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="axs101" # Bootloader diff --git a/configs/snps_axs103_defconfig b/configs/snps_axs103_defconfig index 75596c90b6..08c55de7e7 100644 --- a/configs/snps_axs103_defconfig +++ b/configs/snps_axs103_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" # Bootloader diff --git a/configs/snps_hs38_smp_vdk_defconfig b/configs/snps_hs38_smp_vdk_defconfig index 32922f810e..d4dcd1ba93 100644 --- a/configs/snps_hs38_smp_vdk_defconfig +++ b/configs/snps_hs38_smp_vdk_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform" BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp" BR2_LINUX_KERNEL_VMLINUX=y From 12b7cf60606e4e82acf9f29454bab6ba40457777 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 10 Nov 2016 13:39:45 -0200 Subject: [PATCH 1357/3392] configs/olimex_imx233_olinuxino: Add EXT4 support Select BR2_TARGET_ROOTFS_EXT4 so that an EXT4 rootfs can be generated. Signed-off-by: Fabio Estevam Acked-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_imx233_olinuxino_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig index 1040e5e740..70e8b5df44 100644 --- a/configs/olimex_imx233_olinuxino_defconfig +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -32,6 +32,7 @@ BR2_PACKAGE_ZD1211_FIRMWARE=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT4=y # BR2_TARGET_ROOTFS_TAR is not set # U-Boot From a15d553820df58181250259324166fdb9b553f17 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 10 Nov 2016 13:39:46 -0200 Subject: [PATCH 1358/3392] configs/olimex_imx233_olinuxino: readme: Adjust the generated file names After the conversion to the common genimage scripts the generated file list is a bit different, so adjust it accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/olimex/imx233_olinuxino/readme.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/olimex/imx233_olinuxino/readme.txt b/board/olimex/imx233_olinuxino/readme.txt index 4b24ac2c16..d6a7377c13 100644 --- a/board/olimex/imx233_olinuxino/readme.txt +++ b/board/olimex/imx233_olinuxino/readme.txt @@ -8,12 +8,12 @@ It also pulls up the console on the serial port, not on TV output. === Output files after building ============================================== output/images -+-- kernel.vfat (VFAT kernel partition image generated by genimage) ++-- boot.vfat (VFAT kernel partition image generated by genimage) ++-- imx23-olinuxino.dtb (device tree blob) +-- rootfs.ext2 (Root file system) +-- sdcard.img (Complete SD card image generated by genimage) +-- u-boot.sd (U-Boot image) -+-- uImage -> uImage.imx23-olinuxino (To copy kernel as "uImage" to kernel.vfat) -+-- uImage.imx23-olinuxino (Kernel uImage) ++-- uImage (Kernel binary) === Use of generated SD card image =========================================== From d5ad41a723f1e7d61cce61ac8e8a19314baf1883 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 10 Nov 2016 13:39:47 -0200 Subject: [PATCH 1359/3392] configs/olimex_imx233_olinuxino: readme: Improve SD card flashing procedure Make the SD card flashing procedure text consistent with the other i.MX boards. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/olimex/imx233_olinuxino/readme.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/board/olimex/imx233_olinuxino/readme.txt b/board/olimex/imx233_olinuxino/readme.txt index d6a7377c13..2722c3acbd 100644 --- a/board/olimex/imx233_olinuxino/readme.txt +++ b/board/olimex/imx233_olinuxino/readme.txt @@ -17,13 +17,16 @@ output/images === Use of generated SD card image =========================================== -Just write sdcard.img directly to the SD card +To determine the device associated to the SD card have a look in the +/proc/partitions file: -***** WARNING: Double check that /dev/sdc is your MicroSD card ***** -***** It might be /dev/sdb or some other device name ***** -***** Failure to do so may result in you wiping your hard disk ***** + cat /proc/partitions + +Then, run the following command as root: + +*** WARNING! The command will destroy all the card content. Use with care! *** - # dd if=output/images/sdcard.img of=/dev/sdc bs=512 + sudo dd if=output/images/sdcard.img of=/dev/ === Manual creation of SD card image ========================================= From 7ce31b3e5592ee70ab4f1911caf8cef2e597946c Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 10 Nov 2016 13:39:48 -0200 Subject: [PATCH 1360/3392] configs/olimex_imx233_olinuxino: remove useless section from readme.txt After the conversion to the common genimage scripts, the uImage.imx23-olinuxino file no longer exists. Instead of updating the section, let's simply remove it as the more standard method of using sdcard.img is already explained. This also makes the readme more consistent with the other i.MX readme files. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/olimex/imx233_olinuxino/readme.txt | 70 ------------------------ 1 file changed, 70 deletions(-) diff --git a/board/olimex/imx233_olinuxino/readme.txt b/board/olimex/imx233_olinuxino/readme.txt index 2722c3acbd..1e676c45d1 100644 --- a/board/olimex/imx233_olinuxino/readme.txt +++ b/board/olimex/imx233_olinuxino/readme.txt @@ -27,73 +27,3 @@ Then, run the following command as root: *** WARNING! The command will destroy all the card content. Use with care! *** sudo dd if=output/images/sdcard.img of=/dev/ - -=== Manual creation of SD card image ========================================= - -You'll need a spare MicroSD card with Freescale's special partition layout. -This is basically three partitions: - -1) Type 53, the U-Boot partition, should be 16MB. -2) VFAT, place the kernel uImage there -3) Anything you like, for this example an ext2 partition, type 83 (linux). - -Assuming you see your MicroSD card as /dev/sdc you'd need to do, as root -and from the buildroot project top level directory: -(remember to replace /dev/sdc* with the appropiate device name!) - -***** WARNING: Double check that /dev/sdc is your MicroSD card ***** -***** It might be /dev/sdb or some other device name ***** -***** Failure to do so may result in you wiping your hard disk ***** - -1. Unmount the filesystem(s) if they're already mounted, usually... - - # for fs in `grep /dev/sdc /proc/mounts|cut -d ' ' -f 1`;do umount $fs;done - - ...should work - -2. Blank the partition table out - - # dd if=/dev/zero of=/dev/sdc bs=1024 count=1024 - -3. Set up the partitions - - # fdisk /dev/sdc - n - p - 1 - - +16MB - t - 53 - n - p - 2 - - +5M - t - 2 - 4 - n - p - 3 - - - w - -4. Fill up the first (U-Boot) partition - # dd if=output/images/u-boot.sd bs=512 of=/dev/sdc1 - -5. Create VFAT Filesystem - # mkfs.vfat /dev/sdc2 - -6. Mount and copy output/images/uImage.imx23-olinuxino to the VFAT partition, rename to uImage - # mount /dev/sdc2 /mnt - # cp output/images/uImages/uImage.imx23-olinuxino /mnt/uImage - # umount /mnt - -7. Fill up the third (filesystem) partition - # dd if=output/images/rootfs.ext2 of=/dev/sdc3 bs=512 - -8. Remove the MicroSD card from your linux PC and put it into your olinuxino. - -9. Boot! You're done! From 1f4c619c5820ca29c6975312e90efe267a909a2c Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 11 Nov 2016 11:19:40 +0100 Subject: [PATCH 1361/3392] configs/olimex_imx233_olinuxino: restore Wifi config Add a fragment with configs from retired linux-3.18.config. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- .../imx233_olinuxino/linux-wifi.fragment | 18 ++++++++++++++++++ configs/olimex_imx233_olinuxino_defconfig | 1 + 2 files changed, 19 insertions(+) create mode 100644 board/olimex/imx233_olinuxino/linux-wifi.fragment diff --git a/board/olimex/imx233_olinuxino/linux-wifi.fragment b/board/olimex/imx233_olinuxino/linux-wifi.fragment new file mode 100644 index 0000000000..b70dea2c67 --- /dev/null +++ b/board/olimex/imx233_olinuxino/linux-wifi.fragment @@ -0,0 +1,18 @@ +# Network testing +CONFIG_WIRELESS=y +CONFIG_CFG80211=y +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=y +# MII PHY device drivers +CONFIG_WLAN=y +CONFIG_RTL8187=m +CONFIG_ATH9K_HTC=m +CONFIG_RT2X00=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CU=m +CONFIG_ZD1211RW=m diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig index 70e8b5df44..37ec4d7834 100644 --- a/configs/olimex_imx233_olinuxino_defconfig +++ b/configs/olimex_imx233_olinuxino_defconfig @@ -16,6 +16,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="mxs" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-olinuxino" BR2_LINUX_KERNEL_UIMAGE=y From f7afd935422ffd511a0e31827d56c6cb60aee23c Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 11 Nov 2016 16:19:24 +0100 Subject: [PATCH 1362/3392] netsniff-ng: bump to version 0.6.2 We recently released netsniff-ng 0.6.2 [1], bumpd the version accordingly. [1] https://github.com/netsniff-ng/netsniff-ng/releases/tag/v0.6.2 Cc: Joris Lijssens Signed-off-by: Tobias Klauser Signed-off-by: Thomas Petazzoni --- package/netsniff-ng/netsniff-ng.hash | 2 +- package/netsniff-ng/netsniff-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/netsniff-ng/netsniff-ng.hash b/package/netsniff-ng/netsniff-ng.hash index 52124977ed..67b3331a92 100644 --- a/package/netsniff-ng/netsniff-ng.hash +++ b/package/netsniff-ng/netsniff-ng.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 902661bcdbc129c6a6c1f69a72f921fffc9e765d005568dc153f09ca0097c180 netsniff-ng-v0.6.1.tar.gz +sha256 62e8aa970a4f46cdaddf54daf8ea26e7ae9f9f358efaf0651799c8c4e937c286 netsniff-ng-v0.6.2.tar.gz diff --git a/package/netsniff-ng/netsniff-ng.mk b/package/netsniff-ng/netsniff-ng.mk index ad97a887e4..4ec7e743f5 100644 --- a/package/netsniff-ng/netsniff-ng.mk +++ b/package/netsniff-ng/netsniff-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETSNIFF_NG_VERSION = v0.6.1 +NETSNIFF_NG_VERSION = v0.6.2 NETSNIFF_NG_SITE = $(call github,netsniff-ng,netsniff-ng,$(NETSNIFF_NG_VERSION)) NETSNIFF_NG_LICENSE = GPLv2 NETSNIFF_NG_LICENSE_FILES = README COPYING From 1595020670aec5185dcc01df0d42c0905f930928 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 11 Nov 2016 18:01:59 +0100 Subject: [PATCH 1363/3392] package/kvmtool: fix a musl build issue on ARM We simply bump the version rather than backport the patch, as there has been only very few, minor commits in-between. The kvmtool build with musl still produce some warning but they are fixed with the current master 0093df80 (kvmtool: Makefile: disable PIE build for bios and pre_init). So the next version bump should fixes them. Fixes: http://autobuild.buildroot.net/results/8e8/8e81354e82a8c0495e2ca465eb79cb8cf4c9b153 Signed-off-by: Romain Naour Cc: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/kvmtool/kvmtool.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk index 7f682db625..12454e1bfd 100644 --- a/package/kvmtool/kvmtool.mk +++ b/package/kvmtool/kvmtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -KVMTOOL_VERSION = 372f583d359a5bdcbbe7268809c8d1dc179c64d2 +KVMTOOL_VERSION = bed2bd9e1fbef5819090feeada7b86eed97ca5e2 KVMTOOL_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/will/kvmtool.git KVMTOOL_SITE_METHOD = git KVMTOOL_DEPENDENCIES = \ From cd59cb6b388d00865d0084e6a25eb306c0b5fdd3 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 11 Nov 2016 17:15:09 +0000 Subject: [PATCH 1364/3392] php: bump version to 7.0.13 Release notes: http://php.net/ChangeLog-7.php#7.0.13 Signed-off-by: Vicente Olivert Riera 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 dde6a64dc3..f1cd34654e 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 f3d6c49e1c242e5995dec15e503fde996c327eb86cd7ec45c690e93c971b83ff php-7.0.12.tar.xz +sha256 357ba7f93975d7d836abed0852dc3ed96a988af539e87750613294cbee82f1bf php-7.0.13.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index f85cb371c2..c8abe660ad 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.0.12 +PHP_VERSION = 7.0.13 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 7d6bbbab39931f35081a12bc18985874cc129f03 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 11 Nov 2016 20:52:25 +0100 Subject: [PATCH 1365/3392] package/libva: bump version to 1.7.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva/libva.hash | 4 ++-- package/libva/libva.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index c2e5ea4644..e63f4dbd83 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/libva/2016-September/004379.html -sha1 a89680d34236fdc63adeec25cf431c005644b8c6 libva-1.7.2.tar.bz2 +# From https://lists.freedesktop.org/archives/libva/2016-November/004730.html +sha1 18e46f3d5a0e971eb0ec9fe14bc021e69eb13fb8 libva-1.7.3.tar.bz2 diff --git a/package/libva/libva.mk b/package/libva/libva.mk index df1758efcd..cf42b70e84 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 1.7.2 +LIBVA_VERSION = 1.7.3 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 LIBVA_SITE = http://www.freedesktop.org/software/vaapi/releases/libva LIBVA_LICENSE = MIT From 2ef6f37000dfcc1aedc501238d42cd0b22f24236 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 11 Nov 2016 20:52:26 +0100 Subject: [PATCH 1366/3392] package/libva-intel-driver: bump version to 1.7.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libva-intel-driver/libva-intel-driver.hash | 4 ++-- package/libva-intel-driver/libva-intel-driver.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libva-intel-driver/libva-intel-driver.hash b/package/libva-intel-driver/libva-intel-driver.hash index 24c2170451..10664d051b 100644 --- a/package/libva-intel-driver/libva-intel-driver.hash +++ b/package/libva-intel-driver/libva-intel-driver.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/libva/2016-September/004380.html -sha1 9373afadd6ec0d6d983cf5bb2001d91c22b39719 libva-intel-driver-1.7.2.tar.bz2 +# From https://lists.freedesktop.org/archives/libva/2016-November/004731.html +sha1 5100f187afc4e39fce5664b96fe11a38faa9afaa libva-intel-driver-1.7.3.tar.bz2 diff --git a/package/libva-intel-driver/libva-intel-driver.mk b/package/libva-intel-driver/libva-intel-driver.mk index c388de1589..86f6eaa60e 100644 --- a/package/libva-intel-driver/libva-intel-driver.mk +++ b/package/libva-intel-driver/libva-intel-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_INTEL_DRIVER_VERSION = 1.7.2 +LIBVA_INTEL_DRIVER_VERSION = 1.7.3 LIBVA_INTEL_DRIVER_SOURCE = libva-intel-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 LIBVA_INTEL_DRIVER_SITE = http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver LIBVA_INTEL_DRIVER_LICENSE = MIT From b1a2f09e6956f880c9f56d8be27e38adaca3179f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 11 Nov 2016 21:35:29 +0100 Subject: [PATCH 1367/3392] go: remove powerpc64 big-endian from supported architectures cgo currently doesn't properly support powerpc64 big-endian, as noted in https://github.com/golang/go/issues/13192, and indeed, we have a large number of build failures of Go packages on this architecture. This commit therefore disables Go on PowerPC64 big-endian (PowerPC64 little-endian is fine). Fixes: http://autobuild.buildroot.net/results/a6e9bac0a735f48d0ba0af081aeac4ed9fdfaca7/ (flannel) http://autobuild.buildroot.net/results/230f52bc35f437836c7a76d4b58ef454635ee0d3/ (docker-containerd) http://autobuild.buildroot.net/results/77c31d6e8f5efe3e024e27a160cf5d1d1952719e/ (runc) http://autobuild.buildroot.net/results/a87b07417ea8bd81ffe27e5661b4359ddc0149ab/ (docker-engine) Signed-off-by: Thomas Petazzoni --- package/go/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 8d4d346bf3..a210033efd 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,7 @@ config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS bool default y depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ - || BR2_i386 || BR2_x86_64 || BR2_powerpc64 || BR2_powerpc64le \ + || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el depends on !BR2_ARM_CPU_ARMV4 # MIPS R6 support in Go has not yet been developed. From 2f257ec7d7334472effe756c6c789ea7da9ff215 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Wed, 9 Nov 2016 00:06:41 +0530 Subject: [PATCH 1368/3392] wget: fix ssl detection in static libs configuration When building wget with openssl in static libs configuration, wget build system fails detect openssl because it doesn't specify LD flags for private libs used by openssl. This specifically happens when we pass --with-libssl-prefix to configure which tries to find ssl using custom flags. If we don't specify --with-libssl-prefix, it relies on pkg-config files to detect ssl and it's LD flags which helps with static linking. This commit removes --with-libssl-prefix conf opts. Since this case is similar to gnutls, we remove same conf opts for gnutls as well. wget can be built with either gnutls or openssl crypto libraries, so separate optional support for both is not required. This commit also does minor optimization by checking for either gnutls or openssl while at it. Fixes: http://autobuild.buildroot.net/results/c6a/c6abdff37b86471cf8b0ceffeff5472042923de0/ Signed-off-by: Rahul Bedarkar Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/wget/wget.mk | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 9cda76b6a2..c9efc03302 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -17,26 +17,17 @@ WGET_DEPENDENCIES += busybox endif ifeq ($(BR2_PACKAGE_GNUTLS),y) -WGET_CONF_OPTS += \ - --with-ssl=gnutls \ - --with-libgnutls-prefix=$(STAGING_DIR) +WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -WGET_CONF_OPTS += --with-ssl=openssl --with-libssl-prefix=$(STAGING_DIR) +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +WGET_CONF_OPTS += --with-ssl=openssl WGET_DEPENDENCIES += openssl +else +WGET_CONF_OPTS += --without-ssl endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) WGET_DEPENDENCIES += util-linux endif -# --with-ssl is default -ifneq ($(BR2_PACKAGE_GNUTLS),y) -ifneq ($(BR2_PACKAGE_OPENSSL),y) -WGET_CONF_OPTS += --without-ssl -endif -endif - $(eval $(autotools-package)) From 7afacefb9c21079645e2ef1bd855aa65e6e6bac9 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Wed, 9 Nov 2016 00:06:42 +0530 Subject: [PATCH 1369/3392] wget: fix static link with gnutls When statically linking with gnutls, we get definition clash error for base64_encode which is also defined by gnutls. This commit adds patch to rename base64_{encode,decode} defined in wget. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- ...1-utils-rename-base64_-encode-decode.patch | 134 ++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 package/wget/0001-utils-rename-base64_-encode-decode.patch diff --git a/package/wget/0001-utils-rename-base64_-encode-decode.patch b/package/wget/0001-utils-rename-base64_-encode-decode.patch new file mode 100644 index 0000000000..f219afa4e2 --- /dev/null +++ b/package/wget/0001-utils-rename-base64_-encode-decode.patch @@ -0,0 +1,134 @@ +From 9e68787576fec304da23af26dca963a4cdea7765 Mon Sep 17 00:00:00 2001 +From: Rahul Bedarkar +Date: Tue, 8 Nov 2016 23:42:53 +0530 +Subject: [PATCH] utils: rename base64_{encode,decode} + +When statically linking with gnutls, we get definition clash error for +base64_encode which is also defined by gnutls. + +/home/rahul.bedarkar/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgnutls.a(base64.o): In function `base64_encode': +base64.c:(.text+0x148): multiple definition of `base64_encode' +utils.o:utils.c:(.text+0x4378): first defined here +collect2: error: ld returned 1 exit status + +To prevent definition clash, rename base64_{encode,decode} + +Signed-off-by: Rahul Bedarkar +--- + src/http-ntlm.c | 6 +++--- + src/http.c | 4 ++-- + src/utils.c | 8 ++++---- + src/utils.h | 4 ++-- + 4 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/http-ntlm.c b/src/http-ntlm.c +index 56c40ae..87f5a37 100644 +--- a/src/http-ntlm.c ++++ b/src/http-ntlm.c +@@ -122,7 +122,7 @@ ntlm_input (struct ntlmdata *ntlm, const char *header) + + DEBUGP (("Received a type-2 NTLM message.\n")); + +- size = base64_decode (header, buffer); ++ size = wget_base64_decode (header, buffer); + if (size < 0) + return false; /* malformed base64 from server */ + +@@ -411,7 +411,7 @@ ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd, + size = 32 + hostlen + domlen; + + base64 = (char *) alloca (BASE64_LENGTH (size) + 1); +- base64_encode (ntlmbuf, size, base64); ++ wget_base64_encode (ntlmbuf, size, base64); + + output = concat_strings ("NTLM ", base64, (char *) 0); + break; +@@ -584,7 +584,7 @@ ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd, + + /* convert the binary blob into base64 */ + base64 = (char *) alloca (BASE64_LENGTH (size) + 1); +- base64_encode (ntlmbuf, size, base64); ++ wget_base64_encode (ntlmbuf, size, base64); + + output = concat_strings ("NTLM ", base64, (char *) 0); + +diff --git a/src/http.c b/src/http.c +index 7e60a07..368d30d 100644 +--- a/src/http.c ++++ b/src/http.c +@@ -2818,7 +2818,7 @@ metalink_from_http (const struct response *resp, const struct http_stat *hs, + char *bin_hash = alloca (dig_hash_str_len * 3 / 4 + 1); + size_t hash_bin_len; + +- hash_bin_len = base64_decode (dig_hash, bin_hash); ++ hash_bin_len = wget_base64_decode (dig_hash, bin_hash); + + /* One slot for me, one for zero-termination. */ + mfile->checksums = +@@ -4546,7 +4546,7 @@ basic_authentication_encode (const char *user, const char *passwd) + sprintf (t1, "%s:%s", user, passwd); + + t2 = (char *)alloca (BASE64_LENGTH (len1) + 1); +- base64_encode (t1, len1, t2); ++ wget_base64_encode (t1, len1, t2); + + return concat_strings ("Basic ", t2, (char *) 0); + } +diff --git a/src/utils.c b/src/utils.c +index b07da9f..355f0ce 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -2140,7 +2140,7 @@ xsleep (double seconds) + base64 data. */ + + size_t +-base64_encode (const void *data, size_t length, char *dest) ++wget_base64_encode (const void *data, size_t length, char *dest) + { + /* Conversion table. */ + static const char tbl[64] = { +@@ -2208,7 +2208,7 @@ base64_encode (const void *data, size_t length, char *dest) + This function originates from Free Recode. */ + + ssize_t +-base64_decode (const char *base64, void *dest) ++wget_base64_decode (const char *base64, void *dest) + { + /* Table of base64 values for first 128 characters. Note that this + assumes ASCII (but so does Wget in other places). */ +@@ -2588,7 +2588,7 @@ wg_pubkey_pem_to_der (const char *pem, unsigned char **der, size_t *der_len) + + base64data = xmalloc (BASE64_LENGTH(stripped_pem_count)); + +- size = base64_decode (stripped_pem, base64data); ++ size = wget_base64_decode (stripped_pem, base64data); + + if (size < 0) { + xfree (base64data); /* malformed base64 from server */ +@@ -2651,7 +2651,7 @@ wg_pin_peer_pubkey (const char *pinnedpubkey, const char *pubkey, size_t pubkeyl + end_pos[0] = '\0'; + + /* decode base64 pinnedpubkey, 8 is length of "sha256//" */ +- decoded_hash_length = base64_decode (begin_pos + 8, expectedsha256sumdigest); ++ decoded_hash_length = wget_base64_decode (begin_pos + 8, expectedsha256sumdigest); + /* if valid base64, compare sha256 digests directly */ + if (SHA256_DIGEST_SIZE == decoded_hash_length && + !memcmp (sha256sumdigest, expectedsha256sumdigest, SHA256_DIGEST_SIZE)) { +diff --git a/src/utils.h b/src/utils.h +index f224b73..aaac730 100644 +--- a/src/utils.h ++++ b/src/utils.h +@@ -140,8 +140,8 @@ void xsleep (double); + /* How many bytes it will take to store LEN bytes in base64. */ + #define BASE64_LENGTH(len) (4 * (((len) + 2) / 3)) + +-size_t base64_encode (const void *, size_t, char *); +-ssize_t base64_decode (const char *, void *); ++size_t wget_base64_encode (const void *, size_t, char *); ++ssize_t wget_base64_decode (const char *, void *); + + #ifdef HAVE_LIBPCRE + void *compile_pcre_regex (const char *); +-- +2.6.2 + From e6795d79317b47bbd5407a9c0a4e3bbe0fbb0501 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 11 Nov 2016 22:37:42 +0100 Subject: [PATCH 1370/3392] package/sane-backends: fix musl build issue We should include config.h from sanei_backend.h in order to use the correct if/else HAVE_FOO. For some reason with Glibc or uClibc there is no problem but with musl we have the following weird issue: In file included from epsonds.h:41:0, from epsonds-jpeg.c:18: ../include/sane/sanei_backend.h:99:33: error: expected ';', identifier or '(' before 'int' ../include/sane/sanei_backend.h:99:33: warning: useless type name in empty declaration That's because HAVE_SIGPROCMASK is not defined although it's correctly detected by the configure script. $ grep config.log config.log:#define HAVE_SIGPROCMASK 1 So, include config.h to avoid to redefine sigset_t. Fixes: http://autobuild.buildroot.net/results/9f1/9f1f1cb727b5c5407e69172280a3dee880e55cdf Signed-off-by: Romain Naour Cc: Frank Hunleth Reviewed-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- ...03-sane_backend-add-missing-config.h.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/sane-backends/0003-sane_backend-add-missing-config.h.patch diff --git a/package/sane-backends/0003-sane_backend-add-missing-config.h.patch b/package/sane-backends/0003-sane_backend-add-missing-config.h.patch new file mode 100644 index 0000000000..8e56b0284b --- /dev/null +++ b/package/sane-backends/0003-sane_backend-add-missing-config.h.patch @@ -0,0 +1,49 @@ +From 13aadf79659dd238b618c8be7c1de44960bd5d50 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 11 Nov 2016 22:20:03 +0100 +Subject: [PATCH] sane_backend: add missing config.h + +We should include config.h from sanei_backend.h in order to use the +correct if/else HAVE_FOO. + +For some reason with Glibc or uClibc there is no problem but with musl +we have the following weird issue: + +In file included from epsonds.h:41:0, + from epsonds-jpeg.c:18: +../include/sane/sanei_backend.h:99:33: error: expected ';', identifier or '(' before 'int' + # define sigset_t int + ^ +../include/sane/sanei_backend.h:99:33: warning: useless type name in empty declaration + +That's because HAVE_SIGPROCMASK is not defined although it's correctly +detected by the configure script. + +$ grep config.log +config.log:#define HAVE_SIGPROCMASK 1 + +So, include config.h to avoid to redefine sigset_t. + +Fixes: +http://autobuild.buildroot.net/results/9f1/9f1f1cb727b5c5407e69172280a3dee880e55cdf + +Signed-off-by: Romain Naour +--- + include/sane/sanei_backend.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/sane/sanei_backend.h b/include/sane/sanei_backend.h +index 1b5afe2..2a96532 100644 +--- a/include/sane/sanei_backend.h ++++ b/include/sane/sanei_backend.h +@@ -8,6 +8,7 @@ + * @sa sanei.h sanei_thread.h + */ + ++#include "../include/sane/config.h" + + /* + * Compiler related options +-- +2.5.5 + From 52f9243be5ce8e5dfd0b3a1ebe490ea5ac075dad Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 11 Nov 2016 19:30:40 -0300 Subject: [PATCH 1371/3392] linux-headers: bump 3.12.x and 4.{4, 8}.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 71d3f60c03..8bfad444f1 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -226,15 +226,15 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.83" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.104" if BR2_KERNEL_HEADERS_3_10 - default "3.12.66" if BR2_KERNEL_HEADERS_3_12 + default "3.12.67" if BR2_KERNEL_HEADERS_3_12 default "3.14.79" if BR2_KERNEL_HEADERS_3_14 default "3.18.44" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.35" if BR2_KERNEL_HEADERS_4_1 - default "4.4.29" if BR2_KERNEL_HEADERS_4_4 + default "4.4.31" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.10" if BR2_KERNEL_HEADERS_4_7 - default "4.8.6" if BR2_KERNEL_HEADERS_4_8 + default "4.8.7" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 683f33dae51a03684fdec7ba49413f0a27f162ff Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 11 Nov 2016 19:30:41 -0300 Subject: [PATCH 1372/3392] linux: bump defaul to version 4.8.7 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 3f4097d93b..7e141a21a5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.6)" + bool "Latest version (4.8.7)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.7" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 4605967780e9ecd14fba8100618963247ba72442 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 12 Nov 2016 21:29:56 +0200 Subject: [PATCH 1373/3392] jasper: disable -pedantic-errors The -pedantic-errors gcc option turns -pedantic warnings into errors. This mostly affects older gcc versions that default to the ISO90 C standard. Use the --disable-strict configure option to remove -pedantic-errors. Fixes: http://autobuild.buildroot.net/results/191/191f80779df1a9e6f832106e6c4bdf601e2a9893/ http://autobuild.buildroot.net/results/1fe/1febccc7215814490fa3c776b34bc367363afe39/ http://autobuild.buildroot.net/results/a6f/a6f9bfec3406fc21b130f1669e3534651b9c9596/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/jasper/jasper.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 4616fed188..bacb1a6cfe 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -10,6 +10,7 @@ JASPER_INSTALL_STAGING = YES JASPER_DEPENDENCIES = jpeg JASPER_LICENSE = JasPer License Version 2.0 JASPER_LICENSE_FILES = LICENSE +JASPER_CONF_OPTS = --disable-strict # Xtensa gcc is unable to generate correct code with -O0 enabled by # --enable-debug. Allow package build but disable debug. From 9bf4bd7ab08db7165439532a0ba3fc8ca1f40108 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 13 Nov 2016 11:47:35 +0100 Subject: [PATCH 1374/3392] package/weston: fix build without EGL Fixes: http://autobuild.buildroot.org/results/378/378ffddcebd0ab3dabfdb268614d1344a38e8dd1/ http://autobuild.buildroot.org/results/3c2/3c25333d3c5838bea27540d8ac752c8bdf4db843/ [...] Signed-off-by: "Yann E. MORIN" Cc: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...include-weston-egl-ext.h-only-if-ENA.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch diff --git a/package/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch b/package/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch new file mode 100644 index 0000000000..baa3a4fc84 --- /dev/null +++ b/package/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch @@ -0,0 +1,38 @@ +From e338ced1e04bf4b97322d5eed2b5bdf5b052095a Mon Sep 17 00:00:00 2001 +From: Krzysztof Konopko +Date: Thu, 15 Sep 2016 13:01:49 +0200 +Subject: [PATCH] shared/platform: include weston-egl-ext.h only if ENABLE_EGL + is defined + +Including `weston-egl-ext.h` causes compilation failure for configurations +with EGL disabled. + +Verified with `--disable-egl`, `--disable-x11-compositor` +and `--disable-drm-compositor`. + +Signed-off-by: Krzysztof Konopko +Reviewed-by: Pekka Paalanen +[yann.morin.1998@free.fr: backported from upstream] +Signed-off-by: "Yann E. MORIN" +--- + shared/platform.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shared/platform.h b/shared/platform.h +index 1eb96fd..30db1a6 100644 +--- a/shared/platform.h ++++ b/shared/platform.h +@@ -33,9 +33,9 @@ + #include + #include + #include +-#endif + + #include "weston-egl-ext.h" ++#endif + + #ifdef __cplusplus + extern "C" { +-- +2.7.4 + From 064004ae9df23c9671673a9ae1f7b2d1042c15ee Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 11 Nov 2016 22:09:04 +0100 Subject: [PATCH 1375/3392] tinymembench: add patch to fix build on Cortex-M This commit adds a patch to the tinymembench package that fixes the build on Thumb-only architectures such as ARM Cortex-M. The patch has been submitted upstream in https://github.com/ssvb/tinymembench/pull/13. Fixes: http://autobuild.buildroot.net/results/5f0148cef22b3b9aee691e1702722a0bbc68c8e8/ Signed-off-by: Thomas Petazzoni --- ...ix-build-on-Thumb-only-architectures.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch diff --git a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch b/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch new file mode 100644 index 0000000000..88559ec012 --- /dev/null +++ b/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch @@ -0,0 +1,47 @@ +From 034a3552e9700c6d424bd706db106f5bce1f5a5e Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 11 Nov 2016 21:49:39 +0100 +Subject: [PATCH] arm: fix build on Thumb-only architectures + +Building tinymembench for ARM Cortex-M currently fails, because the +arm-neon.S file contains ARM code that doesn't build on Thumb-only +architectures. To account for this and fix the build for Cortex-M, +this patch adjusts the compile time condition to also verify that the +architecture supports the ARM instruction set, by testing the +__ARM_ARCH_ISA_ARM compiler define. + +Signed-off-by: Thomas Petazzoni +--- + arm-neon.S | 2 +- + asm-opt.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arm-neon.S b/arm-neon.S +index 4db78ce..19c30ad 100644 +--- a/arm-neon.S ++++ b/arm-neon.S +@@ -21,7 +21,7 @@ + * DEALINGS IN THE SOFTWARE. + */ + +-#ifdef __arm__ ++#if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) + + .text + .fpu neon +diff --git a/asm-opt.c b/asm-opt.c +index 9da4596..eba1183 100644 +--- a/asm-opt.c ++++ b/asm-opt.c +@@ -202,7 +202,7 @@ bench_info *get_asm_framebuffer_benchmarks(void) + return empty; + } + +-#elif defined(__arm__) ++#elif defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) + + #include "arm-neon.h" + +-- +2.7.4 + From 7892a778b8bed72202db9641c2649825852148b0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 12 Nov 2016 16:30:12 +0100 Subject: [PATCH 1376/3392] package/strace: disable libmpers with musl toolchains strace bundle some kernel headers to build libmpers, this mixes userspace headers and kernel headers which break the build with musl. The stddef.h from gcc is used instead of the one from musl. Disable libmpers for musl toolchains. Fixes: http://autobuild.buildroot.net/results/6f6/6f63fa2537ff316ba259a20966faadcf5ab9deff Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/strace/strace.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 385c0029cc..59418af855 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -10,6 +10,14 @@ STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VE STRACE_LICENSE = BSD-3c STRACE_LICENSE_FILES = COPYING +# strace bundle some kernel headers to build libmpers, this mixes userspace +# headers and kernel headers which break the build with musl. +# The stddef.h from gcc is used instead of the one from musl. +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +STRACE_CONF_OPTS += st_cv_m32_mpers=no \ + st_cv_mx32_mpers=no +endif + define STRACE_REMOVE_STRACE_GRAPH rm -f $(TARGET_DIR)/usr/bin/strace-graph endef From de90e02c60d65f9bcef5a9b757a6b59473d37cc7 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 6 Nov 2016 17:35:59 +0100 Subject: [PATCH 1377/3392] package/openjpeg: fix static build This change adds a patch to openjpeg fixing the tiff indirect dependencies in case of static build. A similar patch for upstream master has been submitted [1]. Fixes: http://autobuild.buildroot.net/results/d0d/d0d22727311d6300e0e400728126170407bfd699/ and many others... [1] https://github.com/uclouvain/openjpeg/pull/866 Signed-off-by: Samuel Martin Cc: Olivier Schonken Signed-off-by: Thomas Petazzoni --- ...append-flags-found-by-pkg-config-if-.patch | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch diff --git a/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch b/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch new file mode 100644 index 0000000000..be509024de --- /dev/null +++ b/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch @@ -0,0 +1,72 @@ +From 38f50c7d9ad3ba06b64583045665203afb53cbd9 Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Sun, 6 Nov 2016 16:29:08 +0100 +Subject: [PATCH] thirdparty: tiff: append flags found by pkg-config if + available + +This change allows to get all required CFLAGS/LDFLAGS in case of static only +build. + +This build issue [1] was triggered by the Buildroot farms. + +[1] http://autobuild.buildroot.net/results/d0d/d0d22727311d6300e0e400728126170407bfd699/build-end.log + +Signed-off-by: Samuel Martin +--- + thirdparty/CMakeLists.txt | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index d1e68ca..225f51d 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -1,5 +1,9 @@ + # 3rd party libs + ++IF(NOT BUILD_THIRDPARTY) ++ include(FindPkgConfig) ++ENDIF(NOT BUILD_THIRDPARTY) ++ + #------------ + # Try to find lib Z + IF(BUILD_THIRDPARTY) +@@ -35,6 +39,9 @@ IF(BUILD_THIRDPARTY) + SET(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng PARENT_SCOPE) + ELSE (BUILD_THIRDPARTY) + IF (ZLIB_FOUND) ++ # Static only build: ++ # it is not necessary to invoke pkg_check_module on libpng, because libpng ++ # only depends on zlib, which is already checked. + FIND_PACKAGE(PNG) + IF(PNG_FOUND) + message(STATUS "Your system seems to have a PNG lib available, we will use it") +@@ -66,12 +73,24 @@ IF(BUILD_THIRDPARTY) + SET(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) + ELSE (BUILD_THIRDPARTY) + FIND_PACKAGE(TIFF) ++ # Static only build: ++ # it is necessary to invoke pkg_check_module on libtiff since it may have ++ # several other dependencies not declared by its cmake module, but they are ++ # in the its pkgconfig module. ++ IF(PKG_CONFIG_FOUND) ++ FOREACH(pc_tiff_module tiff tiff3 tiff4 tiff-3 tiff-4 libtiff libtiff3 libtiff4 libtiff-3 libtiff-4) ++ pkg_check_modules(PC_TIFF QUIET ${pc_tiff_module}) ++ IF(PC_TIFF_FOUND) ++ break() ++ ENDIF(PC_TIFF_FOUND) ++ ENDFOREACH() ++ ENDIF(PKG_CONFIG_FOUND) + IF(TIFF_FOUND) + message(STATUS "Your system seems to have a TIFF lib available, we will use it") + SET(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE) + SET(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) +- SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) +- SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) ++ SET(TIFF_LIBNAME ${TIFF_LIBRARIES} ${PC_TIFF_STATIC_LIBRARIES} PARENT_SCOPE) ++ SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} ${PC_TIFF_STATIC_INCLUDE_DIRS} PARENT_SCOPE) + ELSE (TIFF_FOUND) # not found + SET(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE) + SET(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE) +-- +2.10.2 + From 70030101e16d79683051ac04e206dc0cfba48f2a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 11 Nov 2016 23:54:10 +0100 Subject: [PATCH 1378/3392] lcms2: fix lcms2.pc.in thread library dependency (for static linking) Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...cms2.pc.in-thread-library-dependency.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/lcms2/0001-Fix-lcms2.pc.in-thread-library-dependency.patch diff --git a/package/lcms2/0001-Fix-lcms2.pc.in-thread-library-dependency.patch b/package/lcms2/0001-Fix-lcms2.pc.in-thread-library-dependency.patch new file mode 100644 index 0000000000..f8c0d00d30 --- /dev/null +++ b/package/lcms2/0001-Fix-lcms2.pc.in-thread-library-dependency.patch @@ -0,0 +1,26 @@ +From 0b55fd4e0935a0231ca258fde631a95215df2f72 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 11 Nov 2016 23:29:56 +0100 +Subject: [PATCH] Fix lcms2.pc.in thread library dependency. + +Needed (sometimes) for static linking. + +Signed-off-by: Peter Seiderer +--- + lcms2.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lcms2.pc.in b/lcms2.pc.in +index b715f59..5b4213c 100644 +--- a/lcms2.pc.in ++++ b/lcms2.pc.in +@@ -7,5 +7,5 @@ Name: @PACKAGE@ + Description: LCMS Color Management Library + Version: @VERSION@ + Libs: -L${libdir} -llcms2 +-Libs.private: @LIB_MATH@ ++Libs.private: @LIB_MATH@ @LIB_THREAD@ + Cflags: -I${includedir} +-- +2.8.1 + From 6378194f3abaf540e149c22e18e202dd724af835 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 11 Nov 2016 23:54:11 +0100 Subject: [PATCH 1379/3392] openjpeg: fix static linking of liblcms2 Fixes [1]: .../host/usr/bfin-buildroot-uclinux-uclibc/sysroot/usr/lib/liblcms2.a(cmsplugin.o): In function `_cmsDeleteContext': cmsplugin.c:(.text+0x1c2): undefined reference to `_pthread_mutex_lock' cmsplugin.c:(.text+0x1f6): undefined reference to `_pthread_mutex_unlock' http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...-append-flags-found-by-pkg-config-if.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch diff --git a/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch b/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch new file mode 100644 index 0000000000..4366c0af88 --- /dev/null +++ b/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch @@ -0,0 +1,47 @@ +From 226daa77ea5a35da306f9af2548f3e2c9e79f577 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 11 Nov 2016 23:35:13 +0100 +Subject: [PATCH] thirdparty: lcms2: append flags found by pkg-config if + available + +This change allows to get all required CFLAGS/LDFLAGS in case of static only +build. + +Fixes a buildroot build failure (see [1]). + +[1] http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57 + +Signed-off-by: Peter Seiderer +--- + thirdparty/CMakeLists.txt | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index 225f51d..42770ad 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -113,12 +113,19 @@ IF( BUILD_THIRDPARTY) + SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) + ELSE (BUILD_THIRDPARTY) + FIND_PACKAGE(LCMS2) ++ # Static only build: ++ # it is necessary to invoke pkg_check_module on lcms2 since it may have ++ # several other dependencies not declared by its cmake module, but they are ++ # in the its pkgconfig module. ++ IF(PKG_CONFIG_FOUND) ++ pkg_check_modules(PC_LCMS2 QUIET lcms2) ++ ENDIF(PKG_CONFIG_FOUND) + IF(LCMS2_FOUND) + message(STATUS "Your system seems to have a LCMS2 lib available, we will use it") + SET(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE) + SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) +- SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE) +- SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE) ++ SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE) ++ SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE) + ELSE (LCMS2_FOUND) # not found lcms2 + # try to find LCMS + FIND_PACKAGE(LCMS) +-- +2.8.1 + From 9317b9542bd3971bc340808ca8efadee36f5b263 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 13 Nov 2016 18:03:57 +0100 Subject: [PATCH 1380/3392] quota: fix build on musl This commit adds 3 patches to the quota package, that allows to build it with musl. One patch was borrowed from OpenEmbedded, the other two patches are really trivial. Fixes: http://autobuild.buildroot.net/results/6f0ff905251d12e198654b8ffe0ea5c15186371e/ Signed-off-by: Thomas Petazzoni --- .../quota/0003-remove-non-posix-types.patch | 200 ++++++++++++++++++ package/quota/0004-import-sys-cdefs.patch | 18 ++ package/quota/0005-include-fcntl.patch | 20 ++ 3 files changed, 238 insertions(+) create mode 100644 package/quota/0003-remove-non-posix-types.patch create mode 100644 package/quota/0004-import-sys-cdefs.patch create mode 100644 package/quota/0005-include-fcntl.patch diff --git a/package/quota/0003-remove-non-posix-types.patch b/package/quota/0003-remove-non-posix-types.patch new file mode 100644 index 0000000000..869c85f23e --- /dev/null +++ b/package/quota/0003-remove-non-posix-types.patch @@ -0,0 +1,200 @@ +Use proper C99 integer types + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +[Thomas: borrowed from OpenEmbedded.] +Signed-off-by: Thomas Petazzoni + +Index: quota-tools/bylabel.c +=================================================================== +--- quota-tools.orig/bylabel.c ++++ quota-tools/bylabel.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "bylabel.h" + #include "common.h" +@@ -37,32 +38,32 @@ static struct uuidCache_s { + + #define EXT2_SUPER_MAGIC 0xEF53 + struct ext2_super_block { +- u_char s_dummy1[56]; +- u_char s_magic[2]; +- u_char s_dummy2[46]; +- u_char s_uuid[16]; +- u_char s_volume_name[16]; ++ uint8_t s_dummy1[56]; ++ uint8_t s_magic[2]; ++ uint8_t s_dummy2[46]; ++ uint8_t s_uuid[16]; ++ uint8_t s_volume_name[16]; + }; + +-#define ext2magic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8)) ++#define ext2magic(s) ((uint32_t) s.s_magic[0] + (((uint32_t) s.s_magic[1]) << 8)) + + #define XFS_SUPER_MAGIC "XFSB" + #define XFS_SUPER_MAGIC2 "BSFX" + struct xfs_super_block { +- u_char s_magic[4]; +- u_char s_dummy[28]; +- u_char s_uuid[16]; +- u_char s_dummy2[60]; +- u_char s_fsname[12]; ++ uint8_t s_magic[4]; ++ uint8_t s_dummy[28]; ++ uint8_t s_uuid[16]; ++ uint8_t s_dummy2[60]; ++ uint8_t s_fsname[12]; + }; + + #define REISER_SUPER_MAGIC "ReIsEr2Fs" + struct reiserfs_super_block { +- u_char s_dummy1[52]; +- u_char s_magic[10]; +- u_char s_dummy2[22]; +- u_char s_uuid[16]; +- u_char s_volume_name[16]; ++ uint8_t s_dummy1[52]; ++ uint8_t s_magic[10]; ++ uint8_t s_dummy2[22]; ++ uint8_t s_uuid[16]; ++ uint8_t s_volume_name[16]; + }; + + static inline unsigned short swapped(unsigned short a) +@@ -222,7 +223,7 @@ static char *get_spec_by_x(int n, const + return NULL; + } + +-static u_char fromhex(char c) ++static uint8_t fromhex(char c) + { + if (isdigit(c)) + return (c - '0'); +@@ -234,7 +235,7 @@ static u_char fromhex(char c) + + static char *get_spec_by_uuid(const char *s) + { +- u_char uuid[16]; ++ uint8_t uuid[16]; + int i; + + if (strlen(s) != 36 || s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-') +Index: quota-tools/quot.c +=================================================================== +--- quota-tools.orig/quot.c ++++ quota-tools/quot.c +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + #include "pot.h" + #include "quot.h" +@@ -56,8 +57,8 @@ + #include "quotasys.h" + + #define TSIZE 500 +-static __uint64_t sizes[TSIZE]; +-static __uint64_t overflow; ++static uint64_t sizes[TSIZE]; ++static uint64_t overflow; + + static int aflag; + static int cflag; +@@ -72,7 +73,7 @@ static time_t now; + char *progname; + + static void mounttable(void); +-static char *idname(__uint32_t, int); ++static char *idname(uint32_t, int); + static void report(const char *, const char *, int); + static void creport(const char *, const char *); + +@@ -173,7 +174,7 @@ static int qcmp(du_t * p1, du_t * p2) + static void creport(const char *file, const char *fsdir) + { + int i; +- __uint64_t t = 0; ++ uint64_t t = 0; + + printf(_("%s (%s):\n"), file, fsdir); + for (i = 0; i < TSIZE - 1; i++) +@@ -219,7 +220,7 @@ static void report(const char *file, con + } + } + +-static idcache_t *getnextent(int type, __uint32_t id, int byid) ++static idcache_t *getnextent(int type, uint32_t id, int byid) + { + struct passwd *pw; + struct group *gr; +@@ -240,7 +241,7 @@ static idcache_t *getnextent(int type, _ + return &idc; + } + +-static char *idname(__uint32_t id, int type) ++static char *idname(uint32_t id, int type) + { + idcache_t *ncp, *idp; + static idcache_t nc[2][NID]; +@@ -286,8 +287,8 @@ static void acctXFS(xfs_bstat_t *p) + { + register du_t *dp; + du_t **hp; +- __uint64_t size; +- __uint32_t i, id; ++ uint64_t size; ++ uint32_t i, id; + + if ((p->bs_mode & S_IFMT) == 0) + return; +Index: quota-tools/quot.h +=================================================================== +--- quota-tools.orig/quot.h ++++ quota-tools/quot.h +@@ -35,18 +35,18 @@ + #define SEC24HR (60*60*24) /* seconds per day */ + + typedef struct { +- __uint32_t id; ++ uint32_t id; + char name[UT_NAMESIZE + 1]; + } idcache_t; + + typedef struct du { + struct du *next; +- __uint64_t blocks; +- __uint64_t blocks30; +- __uint64_t blocks60; +- __uint64_t blocks90; +- __uint64_t nfiles; +- __uint32_t id; ++ uint64_t blocks; ++ uint64_t blocks30; ++ uint64_t blocks60; ++ uint64_t blocks90; ++ uint64_t nfiles; ++ uint32_t id; + } du_t; + + #define NDU 60000 +Index: quota-tools/rquota_server.c +=================================================================== +--- quota-tools.orig/rquota_server.c ++++ quota-tools/rquota_server.c +@@ -60,7 +60,7 @@ extern char nfs_pseudoroot[PATH_MAX]; + */ + extern struct authunix_parms *unix_cred; + +-int in_group(gid_t * gids, u_int len, gid_t gid) ++int in_group(gid_t * gids, uint32_t len, gid_t gid) + { + gid_t *gidsp = gids + len; + diff --git a/package/quota/0004-import-sys-cdefs.patch b/package/quota/0004-import-sys-cdefs.patch new file mode 100644 index 0000000000..9acd1fe4f9 --- /dev/null +++ b/package/quota/0004-import-sys-cdefs.patch @@ -0,0 +1,18 @@ +Add missing include + +quota.h uses the __P definition, so it must include . + +Signed-off-by: Thomas Petazzoni + +Index: b/quota.h +=================================================================== +--- a/quota.h ++++ b/quota.h +@@ -2,6 +2,7 @@ + #define GUARD_QUOTA_H + + #include ++#include + + typedef u_int32_t qid_t; /* Type in which we store ids in memory */ + typedef int64_t qsize_t; /* Type in which we store size limitations */ diff --git a/package/quota/0005-include-fcntl.patch b/package/quota/0005-include-fcntl.patch new file mode 100644 index 0000000000..fe7ea98831 --- /dev/null +++ b/package/quota/0005-include-fcntl.patch @@ -0,0 +1,20 @@ +Include to get loff_t definition + +Fixes the following build issue with musl: + +dqblk_v2.h:32:2: error: unknown type name ‘loff_t’ + +Signed-off-by: Thomas Petazzoni + +Index: b/dqblk_v2.h +=================================================================== +--- a/dqblk_v2.h ++++ b/dqblk_v2.h +@@ -8,6 +8,7 @@ + #define GUARD_DQBLK_V2_H + + #include ++#include + #include "quota_tree.h" + + #define Q_V2_GETQUOTA 0x0D00 /* Get limits and usage */ From 90aed6685f24d2fe60500e958841dd30dc56263f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 13 Nov 2016 16:27:07 +0100 Subject: [PATCH 1381/3392] CHANGES: update for -rc2 Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- CHANGES | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/CHANGES b/CHANGES index 5b1b62f58e..94cea41a9b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,34 @@ +2016.11-rc2, Released November 13th, 2016 + + Fixes all over the tree. + + Architecture: add support for MIPS XBurst cores; remove MIPS + support for M5100 cores. + + Updated/fixed packages: mesa3d, lttng-babeltrace, tinyalsa, pseudo, + czmq, libxml2, makedevs, binutils, kvm-unit-tests, libnss, privoxy, + qemu, ser2net, net-tools, ffmpeg, assimp, libmpeg2, ccache, mpv, + libxslt, python, python3, php, valgrind, guile, domoticz, efl, + jasper, kvmtool, go, wget, sane-backends, weston, tinymembench, + strace, openjpeg, lcms2. + + Linux kernel: update default to 4.8.7. + + CMake support: fix cmake wrapper to properly pass NDEBUG flag. + + Filesystems: use a wrapper to pseudo, to better mimick the behaviour + of fakeroot; makedevs no longer breaks of the destination already + exists and is of the correct type/major/minor. + + Defconfigs: a few legacy and broken defconfigs have been removed + because they now fail to build: kb9202_defconfig, mini2440_defconfig, + freescale_p2020ds, qmx6, calao*, atmel_sama5d4ek. Other defconfigs + have been updated: nanopi-neo, olimex_a20_olinuxino_lime_mali, + armadeus_apf51, armadeus_apf28, freescale_imx31_3stack, ci20, + olimex_a20_olinuxino_lime2, atmel_at91sam9260eknf, + atmel_at91sam9rlek, atmel_at91sam9g20dfc, atmel_at91sam9g45m10ek, + atmel_sama5d3xek. + 2016.11-rc1, Released November 3rd, 2016 Fixes all over the tree and new features. From d4b99ff86c142a6d38bb8cda3f82a6e708740035 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 13 Nov 2016 18:23:10 +0100 Subject: [PATCH 1382/3392] CHANGES: mention quota package update Signed-off-by: Thomas Petazzoni --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 94cea41a9b..c4c063c2a2 100644 --- a/CHANGES +++ b/CHANGES @@ -10,7 +10,7 @@ qemu, ser2net, net-tools, ffmpeg, assimp, libmpeg2, ccache, mpv, libxslt, python, python3, php, valgrind, guile, domoticz, efl, jasper, kvmtool, go, wget, sane-backends, weston, tinymembench, - strace, openjpeg, lcms2. + strace, openjpeg, lcms2, quota. Linux kernel: update default to 4.8.7. From 789c73134397c42087c99d4a0ce6c518da191361 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 13 Nov 2016 20:57:03 +0100 Subject: [PATCH 1383/3392] Update for 2016.11-rc2 Signed-off-by: Thomas Petazzoni --- Makefile | 2 +- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 925e9c6327..37e4bd4dbd 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2016.11-rc1 +export BR2_VERSION := 2016.11-rc2 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 8824c98a62..41b12bfcad 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

    buildroot-2016.08.1.tar.bz2

    -

    Latest release candidate: 2016.11-rc1

    +

    Latest release candidate: 2016.11-rc2

    - +
    - +
    -

    buildroot-2016.11-rc1.tar.gz

    -

    PGP signature

    +

    buildroot-2016.11-rc2.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2016.11-rc1.tar.bz2

    -

    PGP signature

    +

    buildroot-2016.11-rc2.tar.bz2

    +

    PGP signature

    diff --git a/docs/website/news.html b/docs/website/news.html index 901999be56..2f4d4689bb 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,30 @@

    News

      +
    • +
      +
      +
      +

      2016.11-rc2 released

      +

      13 November 2016

      +
      +
      +

      We have a new release candidate! Lots of + changes all over the tree, see + the CHANGES + file for details. +

      + +

      Head to the downloads page to pick up the + 2016.11-rc2 + release candidate, and report any + problems found to the + mailing list or + bug tracker.

      +
      +
      +
      • +
    • From 104eaea440162a300c03b008d6991f64f7cc4502 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 13 Nov 2016 15:14:43 +0100 Subject: [PATCH 1384/3392] domoticz: bump to version 3.5877 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index fef72f52b6..7feab8fbca 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 4b2d59c2bd70e61c486b372059164a688c53b8aa9f1aedb4beb3316ae2a130c5 domoticz-3.5837.tar.gz +sha256 fb88edbe428851a7a337a85faa93f6da00713b3ad086ff6957031dc9b3b58bba domoticz-3.5877.tar.gz diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 2272da87cc..f43dbda49e 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 3.5837 +DOMOTICZ_VERSION = 3.5877 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPLv3 DOMOTICZ_LICENSE_FILES = License.txt From dab808e6ae634e08040a96bd06ea4910fed93633 Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Thu, 10 Nov 2016 18:53:27 +0300 Subject: [PATCH 1385/3392] config: bump linux kernel to 4.8.6 in synopsys defconfigs With this commit we update ARC defconfigs with the following: - "snps_axs101_defconfig", "snps_axs103_defconfig" and "snps_hs38_smp_vdk_defconfig": - bump linux kernel version to 4.8.6 - set up host linux headers to 4.8 Signed-off-by: Vlad Zakharov [Thomas: as reported by Alexey, this commit is in fact a bug fix: it makes the defconfig work properly. Indeed, since the ARC compiler has moved to gcc 6.x, the ABI has changed, and a Linux 4.8+ kernel is needed for userspace to work on ARC.] Signed-off-by: Thomas Petazzoni --- configs/snps_axs101_defconfig | 6 +++--- configs/snps_axs103_defconfig | 6 +++--- configs/snps_hs38_smp_vdk_defconfig | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/snps_axs101_defconfig b/configs/snps_axs101_defconfig index f272853c13..eea7a50141 100644 --- a/configs/snps_axs101_defconfig +++ b/configs/snps_axs101_defconfig @@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="axs101" # Bootloader diff --git a/configs/snps_axs103_defconfig b/configs/snps_axs103_defconfig index 75596c90b6..08c55de7e7 100644 --- a/configs/snps_axs103_defconfig +++ b/configs/snps_axs103_defconfig @@ -9,13 +9,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" # Bootloader diff --git a/configs/snps_hs38_smp_vdk_defconfig b/configs/snps_hs38_smp_vdk_defconfig index 32922f810e..d4dcd1ba93 100644 --- a/configs/snps_hs38_smp_vdk_defconfig +++ b/configs/snps_hs38_smp_vdk_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform" BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +# Linux headers same as kernel, a 4.8 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp" BR2_LINUX_KERNEL_VMLINUX=y From 4309b96f3a38a2ed40389612c28a47917595667b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 14 Nov 2016 21:16:52 +0100 Subject: [PATCH 1386/3392] lcms2: bump version to 2.8 For ChangeLog see [1]. [1] https://github.com/mm2/Little-CMS/blob/master/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/lcms2/lcms2.hash | 7 +++---- package/lcms2/lcms2.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index 908822f8c1..1cf1017c54 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,4 @@ -# From http://sourceforge.net/projects/lcms/files/lcms/2.7/ -sha1 625f0d74bad4a0f6f917120fd992437d26f754d2 lcms2-2.7.tar.gz -md5 06c1626f625424a811fb4b5eb070839d lcms2-2.7.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.8 +sha1 e9535ec4a572b8fc7a1c405c35e6f4dc97714197 lcms2-2.8.tar.gz # Locally computed: -sha256 4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53 lcms2-2.7.tar.gz +sha256 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22 lcms2-2.8.tar.gz diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 265af29098..8d0609ea1e 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LCMS2_VERSION = 2.7 -LCMS2_SITE = http://downloads.sourceforge.net/lcms/lcms +LCMS2_VERSION = 2.8 +LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING LCMS2_INSTALL_STAGING = YES From c418476aa85e8158c3e309bb08c7bdf77665c70c Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Mon, 14 Nov 2016 21:07:00 +0300 Subject: [PATCH 1387/3392] configs/snps_axs*: bump U-Boot to 2016.11 With this commit we upgrade U-Boot version to 2016.11 in "snps_axs101_defconfig" and "snps_axs103_defconfig". Important fixes: new version fixes U-Boot build for arc700. Since gcc-6.x "-marc700" option is no longer supported, "-mcpu=arc700" should be used instead. We haven't sent it before as we were waiting for U-Boot 2016.11 release. Signed-off-by: Vlad Zakharov Signed-off-by: Thomas Petazzoni --- configs/snps_axs101_defconfig | 2 +- configs/snps_axs103_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/snps_axs101_defconfig b/configs/snps_axs101_defconfig index eea7a50141..07564b41bf 100644 --- a/configs/snps_axs101_defconfig +++ b/configs/snps_axs101_defconfig @@ -21,6 +21,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="axs101" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs101" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/snps_axs103_defconfig b/configs/snps_axs103_defconfig index 08c55de7e7..d2a838e6b3 100644 --- a/configs/snps_axs103_defconfig +++ b/configs/snps_axs103_defconfig @@ -22,6 +22,6 @@ BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs103" BR2_TARGET_UBOOT_NEEDS_DTC=y From 6e0d4bac19f8144b9dc56851ae98a476ed9e5363 Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Mon, 14 Nov 2016 20:56:37 +0300 Subject: [PATCH 1388/3392] toolchain: Bump ARC tools to arc-2016.09-rc1 As described at: 4520524ba055706236db9f00dd79f1b2e2e87fde this commit continues a series of updates of ARC tools. This time we're updating tools to arc-2016.09-rc1. This update contains a lot of important fixes, e.g. it fixes: http://autobuild.buildroot.net/results/4c7/4c77f33c842b37bf28cb931edf1b290e1bf4d93c// http://autobuild.buildroot.net/results/902/902729a0b98675ad803939e3ecdcf230065a6012// and other failures. Other important change is that we also update gdb. Now we are using gdb 7.12. This version of gdb requires C++ toolchain support so we add corresponding dependency to gdb Config.in file. Signed-off-by: Vlad Zakharov [Thomas: - fix dependency on C++ of gdb, it must use BR2_INSTALL_LIBSTDCPP - add comment about the C++ dependency of gdb on ARC.] Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 2 +- .../0300-ld-makefile.patch | 0 .../0301-check-ldrunpath-length.patch | 0 .../0500-add-sysroot-fix-from-bug-3049.patch | 0 .../0600-poison-system-directories.patch | 0 package/binutils/binutils.hash | 2 +- package/binutils/binutils.mk | 2 +- package/gcc/Config.in.host | 2 +- .../301-missing-execinfo_h.patch | 0 .../860-cilk-wchar.patch | 0 .../940-uclinux-enable-threads.patch | 0 package/gcc/gcc.hash | 2 +- package/gdb/Config.in | 6 ++++++ package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 15 files changed, 13 insertions(+), 7 deletions(-) rename package/binutils/{arc-2016.09-eng015 => arc-2016.09-rc1}/0300-ld-makefile.patch (100%) rename package/binutils/{arc-2016.09-eng015 => arc-2016.09-rc1}/0301-check-ldrunpath-length.patch (100%) rename package/binutils/{arc-2016.09-eng015 => arc-2016.09-rc1}/0500-add-sysroot-fix-from-bug-3049.patch (100%) rename package/binutils/{arc-2016.09-eng015 => arc-2016.09-rc1}/0600-poison-system-directories.patch (100%) rename package/gcc/{arc-2016.09-eng015 => arc-2016.09-rc1}/301-missing-execinfo_h.patch (100%) rename package/gcc/{arc-2016.09-eng015 => arc-2016.09-rc1}/860-cilk-wchar.patch (100%) rename package/gcc/{arc-2016.09-eng015 => arc-2016.09-rc1}/940-uclinux-enable-threads.patch (100%) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 3e0c357d99..af9339e11b 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -22,7 +22,7 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2016.09-eng015" if BR2_arc + default "arc-2016.09-rc1" if BR2_arc default "2.25.1" if BR2_BINUTILS_VERSION_2_25_X default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X default "2.27" if BR2_BINUTILS_VERSION_2_27_X diff --git a/package/binutils/arc-2016.09-eng015/0300-ld-makefile.patch b/package/binutils/arc-2016.09-rc1/0300-ld-makefile.patch similarity index 100% rename from package/binutils/arc-2016.09-eng015/0300-ld-makefile.patch rename to package/binutils/arc-2016.09-rc1/0300-ld-makefile.patch diff --git a/package/binutils/arc-2016.09-eng015/0301-check-ldrunpath-length.patch b/package/binutils/arc-2016.09-rc1/0301-check-ldrunpath-length.patch similarity index 100% rename from package/binutils/arc-2016.09-eng015/0301-check-ldrunpath-length.patch rename to package/binutils/arc-2016.09-rc1/0301-check-ldrunpath-length.patch diff --git a/package/binutils/arc-2016.09-eng015/0500-add-sysroot-fix-from-bug-3049.patch b/package/binutils/arc-2016.09-rc1/0500-add-sysroot-fix-from-bug-3049.patch similarity index 100% rename from package/binutils/arc-2016.09-eng015/0500-add-sysroot-fix-from-bug-3049.patch rename to package/binutils/arc-2016.09-rc1/0500-add-sysroot-fix-from-bug-3049.patch diff --git a/package/binutils/arc-2016.09-eng015/0600-poison-system-directories.patch b/package/binutils/arc-2016.09-rc1/0600-poison-system-directories.patch similarity index 100% rename from package/binutils/arc-2016.09-eng015/0600-poison-system-directories.patch rename to package/binutils/arc-2016.09-rc1/0600-poison-system-directories.patch diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index f41b39b15a..80ac9ddf2f 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -5,4 +5,4 @@ sha512 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322 sha512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb binutils-2.27.tar.bz2 # Locally calculated (fetched from Github) -sha512 f8cc7529fbe3cb52b666b92e1353063a8a36ea07fa8c5aa8359252f4222feaed15253b6a137033c74dabc0ae784daf8a7978e69ebdb8bf8cd6b8bb61c84bf181 binutils-arc-2016.09-eng015.tar.gz +sha512 d0befdeb0a7b76efd1ad655fc062cde2aa67be7b26210c913ab2709e069d815c4ff2863ce7add1f6434da5a2f4faf1ce5a5bc3d0e64f3e04548a7479f24edcbc binutils-arc-2016.09-rc1.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index ca481d25b1..61486a2f8f 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,7 +9,7 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2016.09-eng015 +BINUTILS_VERSION = arc-2016.09-rc1 else BINUTILS_VERSION = 2.25.1 endif diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 0a63e6a101..d10798b10d 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -98,7 +98,7 @@ config BR2_GCC_VERSION default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.4.0" if BR2_GCC_VERSION_5_X default "6.2.0" if BR2_GCC_VERSION_6_X - default "arc-2016.09-eng015" if BR2_GCC_VERSION_ARC + default "arc-2016.09-rc1" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS string "Additional gcc options" diff --git a/package/gcc/arc-2016.09-eng015/301-missing-execinfo_h.patch b/package/gcc/arc-2016.09-rc1/301-missing-execinfo_h.patch similarity index 100% rename from package/gcc/arc-2016.09-eng015/301-missing-execinfo_h.patch rename to package/gcc/arc-2016.09-rc1/301-missing-execinfo_h.patch diff --git a/package/gcc/arc-2016.09-eng015/860-cilk-wchar.patch b/package/gcc/arc-2016.09-rc1/860-cilk-wchar.patch similarity index 100% rename from package/gcc/arc-2016.09-eng015/860-cilk-wchar.patch rename to package/gcc/arc-2016.09-rc1/860-cilk-wchar.patch diff --git a/package/gcc/arc-2016.09-eng015/940-uclinux-enable-threads.patch b/package/gcc/arc-2016.09-rc1/940-uclinux-enable-threads.patch similarity index 100% rename from package/gcc/arc-2016.09-eng015/940-uclinux-enable-threads.patch rename to package/gcc/arc-2016.09-rc1/940-uclinux-enable-threads.patch diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index ce738ef531..e5d96f44ad 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -12,4 +12,4 @@ sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d sha512 1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a83ce1cd4cdd2d1cb0b3e3c34e9b7ae1b2ab83dfc649ee817ab05247c76198 gcc-6.2.0.tar.bz2 # Locally calculated (fetched from Github) -sha512 9f365452f746ae91875d935c2ec5ed16cd11a2973f69bd23193fec9fc6b557e0dd66bb169e7efb7ec63fd78af36139005abcf5a5a1d89d6f49788b2ed7b334fb gcc-arc-2016.09-eng015.tar.gz +sha512 7029d7ae1316b9385880f32283aa6c4979b1257500bb21e3fb234475ecb20082f46b114d8b7022c75a8dcf0c0c7b6b02e9384b49dd3189adc3d454502b8b0c26 gcc-arc-2016.09-rc1.tar.gz diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 809e02d076..0c6966ab35 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -2,6 +2,10 @@ comment "gdb/gdbserver needs a toolchain w/ threads, threads debug" depends on !BR2_nios2 && !BR2_bfin depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG +comment "gdb/gdbserver needs a toolchain w/ C++" + depends on BR2_arc + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_GDB bool "gdb" # When the external toolchain gdbserver is copied to the @@ -11,6 +15,8 @@ config BR2_PACKAGE_GDB (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY) depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG depends on !BR2_nios2 && !BR2_bfin + # Since ARC gdb moved to 7.12 toolchain requires C++ support to build gdb. + depends on !BR2_arc || BR2_INSTALL_LIBSTDCPP help GDB, the GNU Project debugger, allows you to see what is going on `inside' another program while it executes -- or diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index a36dc0f0f0..b6eb41f4cc 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -56,7 +56,7 @@ endif config BR2_GDB_VERSION string depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB - default "arc-2016.03-gdb" if BR2_arc + default "arc-2016.09-rc1-gdb" if BR2_arc default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze default "7.9.1" if BR2_GDB_VERSION_7_9 default "7.10.1" if BR2_GDB_VERSION_7_10 || !BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 611a75ca27..8c0d51bc82 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -5,4 +5,4 @@ sha512 f80ec6c8a0f0b54c8b945666e875809174402b7e121efb378ebac931a91f9a1cc0048568 # Locally calculated (fetched from Github) sha512 0a467091d4b01fbecabb4b8da1cb743025c70e7f4874a0b5c8fa2ec623569a39bde6762b91806de0be6e63711aeb6909715cfbe43860de73d8aec6159a9f10a7 gdb-6be65fb56ea6694a9260733a536a023a1e2d4d57.tar.gz -sha512 1abef1357896c2b57cfa7f7414eedc49d0de26b54321c680c2d027b1a27ec453d421e7f89a5281336047542379fd4820685802059efbd32b87c5ccffbaf2bd16 gdb-arc-2016.03-gdb.tar.gz +sha512 e6019ac0d6b1354943d3c06c84f353ba49fef105b07c1a04ad90cc5b65f91e38fe6c671e0c34a9541ee282d0f42cf24579c011a0469d19faaa4d00d64a17afe2 gdb-arc-2016.09-rc1-gdb.tar.gz From eac8c9ee2439fb4a43c9cef5371ae268489cd185 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 14 Nov 2016 22:47:43 +0200 Subject: [PATCH 1389/3392] openjpeg: security bump to version 2.1.2 See CHANGELOG.md for the full list of fixes, including security issues. See CVE number lists at [1] and [2]. [1] http://advisories.mageia.org/MGASA-2016-0362.html [2] https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/thread/HPMDEUIMHTLKMHELDL4F4HZ7X4Y34JEB/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/openjpeg/openjpeg.hash | 2 +- package/openjpeg/openjpeg.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash index 35d4fbd535..c0abd0c54d 100644 --- a/package/openjpeg/openjpeg.hash +++ b/package/openjpeg/openjpeg.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 4afc996cd5e0d16360d71c58216950bcb4ce29a3272360eb29cadb1c8bce4efc openjpeg-2.1.tar.gz +sha256 4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7 openjpeg-2.1.2.tar.gz diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index bf125261a7..ca22068113 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENJPEG_VERSION = 2.1 -OPENJPEG_SITE = $(call github,uclouvain,openjpeg,version.$(OPENJPEG_VERSION)) +OPENJPEG_VERSION = 2.1.2 +OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2c OPENJPEG_LICENSE_FILES = LICENSE OPENJPEG_INSTALL_STAGING = YES From 7f4dfd11888d1a092f3b92e8550b3958d87412f3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 14 Nov 2016 22:20:36 +0100 Subject: [PATCH 1390/3392] dtv-scan-tables: rename file to have only ASCII characters Since the bump of dtv-scan-tables to version ceb11833b35f05813b1f0397a60e0f3b99430aab in commit b1c8794d8ac0eb3895d13ae91d8e912ec469a105, one file contains non-ASCII characters, which causes encoding issues tvheadend. Since no other file in the dtv-scan-tables code base contains files with non-ASCII characters (despite having files named after cities in various countries that definitely do have non-ASCII characters), we rename this file so that it is named with only ASCII characters. This fixes the build of tvheadend, which was failing when the host Python interpreter was python3, due to a file name encoding issue. Fixes: http://autobuild.buildroot.net/results/1ae8bee297edb089535a2fb6ec724ebf7976888d/ (tvheadend) Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/dtv-scan-tables/dtv-scan-tables.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/dtv-scan-tables/dtv-scan-tables.mk b/package/dtv-scan-tables/dtv-scan-tables.mk index 8ef42b90a2..8a782cb404 100644 --- a/package/dtv-scan-tables/dtv-scan-tables.mk +++ b/package/dtv-scan-tables/dtv-scan-tables.mk @@ -17,6 +17,15 @@ DTV_SCAN_TABLES_SITE_METHOD = git DTV_SCAN_TABLES_LICENSE = GPLv2, LGPLv2.1 DTV_SCAN_TABLES_LICENSE_FILES = COPYING COPYING.LGPL +# In order to avoid issues with file name encodings, we rename the +# only dtv-scan-tables file that has non-ASCII characters to have a +# name using only ASCII characters (pl-Krosno_Sucha_Gora) +define DTV_SCAN_TABLES_FIX_NONASCII_FILENAMES + mv $(@D)/dvb-t/pl-Krosno_Sucha* $(@D)/dvb-t/pl-Krosno_Sucha_Gora +endef + +DTV_SCAN_TABLES_POST_PATCH_HOOKS += DTV_SCAN_TABLES_FIX_NONASCII_FILENAMES + define DTV_SCAN_TABLES_INSTALL_TARGET_CMDS for f in atsc dvb-c dvb-s dvb-t; do \ $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/dvb/$$f; \ From ce7b0b8dfba9832169d80916b9adf83ef27dbb04 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 14 Nov 2016 15:26:23 -0200 Subject: [PATCH 1391/3392] boot/uboot: bump to version 2016.11 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index fabf27db73..3b4bfac070 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -38,7 +38,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2016.09.01" + bool "2016.11" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -86,7 +86,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2016.09.01" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2016.11" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index db60dabf99..5b2c3bf493 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 95728e89dd476d17428f94080752ab48884be477b6a678941582aeef618b70bb u-boot-2016.09.01.tar.bz2 +sha256 45813e6565dcc0436abe6752624324cdbf5f3ac106570d76d32b46ec529bcdc8 u-boot-2016.11.tar.bz2 From 99fd3bae35f9971544990c1869933b8ae22832ec Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 14 Nov 2016 15:26:24 -0200 Subject: [PATCH 1392/3392] uboot-tools: bump to version 2016.11 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index db60dabf99..5b2c3bf493 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 95728e89dd476d17428f94080752ab48884be477b6a678941582aeef618b70bb u-boot-2016.09.01.tar.bz2 +sha256 45813e6565dcc0436abe6752624324cdbf5f3ac106570d76d32b46ec529bcdc8 u-boot-2016.11.tar.bz2 diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index a3335a5e84..bb0cba8782 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2016.09.01 +UBOOT_TOOLS_VERSION = 2016.11 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPLv2+ From 87f1bdda38b43192908dab585dc6b4fc3e39ffe5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 14 Nov 2016 15:26:25 -0200 Subject: [PATCH 1393/3392] configs/warp7: Bump to U-Boot 2016.11 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/warp7_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index a55a5049cf..fca7a1d06f 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -25,7 +25,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="warp7_secure" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" BR2_TARGET_UBOOT_FORMAT_IMX=y # wifi firmware for brcm43430 From d3f0d52144f27097bba225bdb2a3b1620d44ab5a Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Mon, 14 Nov 2016 02:05:41 -0800 Subject: [PATCH 1394/3392] package/gcc: backport xtensa trap pattern for 5.x gcc 5.x uses trap pattern extensively to mark locations where program execution should never get. Default pattern implementation emits a call to 'abort' function. This function however is not always available, e.g. it's not available for the libc dynamic linker. Backport implementation of the trap pattern for xtensa that does not result in a call to 'abort'. Fixes: http://autobuild.buildroot.net/results/0fbcc4475545904bf88f25a3bdf3ee552bf4960e http://autobuild.buildroot.net/results/cb7f5bdfac615d774f3bcd1b802f8d74460bc557 http://autobuild.buildroot.net/results/cf3dc9ae4f74ff28b285f1a862b71d96384d7651 Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni --- .../875-xtensa-implement-trap-pattern.patch | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 package/gcc/5.4.0/875-xtensa-implement-trap-pattern.patch diff --git a/package/gcc/5.4.0/875-xtensa-implement-trap-pattern.patch b/package/gcc/5.4.0/875-xtensa-implement-trap-pattern.patch new file mode 100644 index 0000000000..870b079e38 --- /dev/null +++ b/package/gcc/5.4.0/875-xtensa-implement-trap-pattern.patch @@ -0,0 +1,67 @@ +From 2b4b5775554c91a63ccae4ee566db696b633652e Mon Sep 17 00:00:00 2001 +From: jcmvbkbc +Date: Wed, 10 Jun 2015 15:07:40 +0000 +Subject: [PATCH] xtensa: implement trap pattern + +2015-06-10 Max Filippov +gcc/ + * config/xtensa/xtensa.h (TARGET_DEBUG): New definition. + * config/xtensa/xtensa.md (define_attr "type"): New type "trap". + (define_insn "trap"): New definition. + +Signed-off-by: Max Filippov + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224330 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + gcc/config/xtensa/xtensa.h | 1 + + gcc/config/xtensa/xtensa.md | 15 ++++++++++++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h +index 615f741..fb8702c 100644 +--- a/gcc/config/xtensa/xtensa.h ++++ b/gcc/config/xtensa/xtensa.h +@@ -67,6 +67,7 @@ extern unsigned xtensa_current_frame_size; + #define TARGET_THREADPTR XCHAL_HAVE_THREADPTR + #define TARGET_LOOPS XCHAL_HAVE_LOOPS + #define TARGET_WINDOWED_ABI (XSHAL_ABI == XTHAL_ABI_WINDOWED) ++#define TARGET_DEBUG XCHAL_HAVE_DEBUG + + #define TARGET_DEFAULT \ + ((XCHAL_HAVE_L32R ? 0 : MASK_CONST16) | \ +diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md +index 6d84384..a577aa3 100644 +--- a/gcc/config/xtensa/xtensa.md ++++ b/gcc/config/xtensa/xtensa.md +@@ -86,7 +86,7 @@ + ;; Attributes. + + (define_attr "type" +- "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry" ++ "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry,trap" + (const_string "unknown")) + + (define_attr "mode" +@@ -1764,6 +1764,19 @@ + [(set_attr "length" "0") + (set_attr "type" "nop")]) + ++(define_insn "trap" ++ [(trap_if (const_int 1) (const_int 0))] ++ "" ++{ ++ if (TARGET_DEBUG) ++ return "break\t1, 15"; ++ else ++ return (TARGET_DENSITY ? "ill.n" : "ill"); ++} ++ [(set_attr "type" "trap") ++ (set_attr "mode" "none") ++ (set_attr "length" "3")]) ++ + ;; Setting up a frame pointer is tricky for Xtensa because GCC doesn't + ;; know if a frame pointer is required until the reload pass, and + ;; because there may be an incoming argument value in the hard frame +-- +2.1.4 + From 2775276135b3c8d06084c97e6195bc310bc432bf Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 14 Nov 2016 23:58:30 +0200 Subject: [PATCH 1395/3392] openjpeg: refresh patches The 2.1.2 version bump did not take into account the recently added fixes. Update the patches to apply based on upstream pull requests #866 and #867. Cc: Peter Seiderer Cc: Samuel Martin Signed-off-by: Baruch Siach Acked-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...append-flags-found-by-pkg-config-if-.patch | 60 +++++++++---------- ...-append-flags-found-by-pkg-config-if.patch | 38 ++++++------ 2 files changed, 50 insertions(+), 48 deletions(-) diff --git a/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch b/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch index be509024de..bce790a478 100644 --- a/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch +++ b/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch @@ -17,56 +17,56 @@ Signed-off-by: Samuel Martin 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index d1e68ca..225f51d 100644 +index cb24b43b58e2..cd6a5e1391b0 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -1,5 +1,9 @@ # 3rd party libs -+IF(NOT BUILD_THIRDPARTY) ++if(NOT BUILD_THIRDPARTY) + include(FindPkgConfig) -+ENDIF(NOT BUILD_THIRDPARTY) ++endif(NOT BUILD_THIRDPARTY) + #------------ # Try to find lib Z - IF(BUILD_THIRDPARTY) -@@ -35,6 +39,9 @@ IF(BUILD_THIRDPARTY) - SET(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng PARENT_SCOPE) - ELSE (BUILD_THIRDPARTY) - IF (ZLIB_FOUND) + if(BUILD_THIRDPARTY) +@@ -36,6 +40,9 @@ if(BUILD_THIRDPARTY) + else(BUILD_THIRDPARTY) + if(ZLIB_FOUND) + find_package(PNG) + # Static only build: + # it is not necessary to invoke pkg_check_module on libpng, because libpng + # only depends on zlib, which is already checked. - FIND_PACKAGE(PNG) - IF(PNG_FOUND) + if(PNG_FOUND) message(STATUS "Your system seems to have a PNG lib available, we will use it") -@@ -66,12 +73,24 @@ IF(BUILD_THIRDPARTY) - SET(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) - ELSE (BUILD_THIRDPARTY) - FIND_PACKAGE(TIFF) + set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE) +@@ -66,12 +73,24 @@ if(BUILD_THIRDPARTY) + set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) + else(BUILD_THIRDPARTY) + find_package(TIFF) + # Static only build: + # it is necessary to invoke pkg_check_module on libtiff since it may have + # several other dependencies not declared by its cmake module, but they are + # in the its pkgconfig module. -+ IF(PKG_CONFIG_FOUND) -+ FOREACH(pc_tiff_module tiff tiff3 tiff4 tiff-3 tiff-4 libtiff libtiff3 libtiff4 libtiff-3 libtiff-4) ++ if(PKG_CONFIG_FOUND) ++ foreach(pc_tiff_module tiff tiff3 tiff4 tiff-3 tiff-4 libtiff libtiff3 libtiff4 libtiff-3 libtiff-4) + pkg_check_modules(PC_TIFF QUIET ${pc_tiff_module}) -+ IF(PC_TIFF_FOUND) ++ if(PC_TIFF_FOUND) + break() -+ ENDIF(PC_TIFF_FOUND) -+ ENDFOREACH() -+ ENDIF(PKG_CONFIG_FOUND) - IF(TIFF_FOUND) ++ endif(PC_TIFF_FOUND) ++ endforeach() ++ endif(PKG_CONFIG_FOUND) + if(TIFF_FOUND) message(STATUS "Your system seems to have a TIFF lib available, we will use it") - SET(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE) - SET(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) -- SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) -- SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) -+ SET(TIFF_LIBNAME ${TIFF_LIBRARIES} ${PC_TIFF_STATIC_LIBRARIES} PARENT_SCOPE) -+ SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} ${PC_TIFF_STATIC_INCLUDE_DIRS} PARENT_SCOPE) - ELSE (TIFF_FOUND) # not found - SET(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE) - SET(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE) + set(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE) + set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) +- set(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) +- set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) ++ set(TIFF_LIBNAME ${TIFF_LIBRARIES} ${PC_TIFF_STATIC_LIBRARIES} PARENT_SCOPE) ++ set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} ${PC_TIFF_STATIC_INCLUDE_DIRS} PARENT_SCOPE) + else(TIFF_FOUND) # not found + set(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE) + set(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE) -- 2.10.2 diff --git a/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch b/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch index 4366c0af88..5697b82de2 100644 --- a/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch +++ b/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch @@ -7,9 +7,11 @@ Subject: [PATCH] thirdparty: lcms2: append flags found by pkg-config if This change allows to get all required CFLAGS/LDFLAGS in case of static only build. -Fixes a buildroot build failure (see [1]). +Fixes a buildroot build failure (see [1], [2] and [3]). [1] http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57 +[2] http://lists.busybox.net/pipermail/buildroot/2016-November/177187.html +[3] http://lists.busybox.net/pipermail/buildroot/2016-November/177188.html Signed-off-by: Peter Seiderer --- @@ -17,31 +19,31 @@ Signed-off-by: Peter Seiderer 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index 225f51d..42770ad 100644 +index cd6a5e1391b0..a3a8494d89b1 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt -@@ -113,12 +113,19 @@ IF( BUILD_THIRDPARTY) - SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) - ELSE (BUILD_THIRDPARTY) - FIND_PACKAGE(LCMS2) +@@ -113,12 +113,19 @@ if( BUILD_THIRDPARTY) + set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) + else(BUILD_THIRDPARTY) + find_package(LCMS2) + # Static only build: + # it is necessary to invoke pkg_check_module on lcms2 since it may have + # several other dependencies not declared by its cmake module, but they are + # in the its pkgconfig module. -+ IF(PKG_CONFIG_FOUND) ++ if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_LCMS2 QUIET lcms2) -+ ENDIF(PKG_CONFIG_FOUND) - IF(LCMS2_FOUND) ++ endif(PKG_CONFIG_FOUND) + if(LCMS2_FOUND) message(STATUS "Your system seems to have a LCMS2 lib available, we will use it") - SET(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE) - SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) -- SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE) -- SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE) -+ SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE) -+ SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE) - ELSE (LCMS2_FOUND) # not found lcms2 + set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE) + set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) +- set(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE) +- set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE) ++ set(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE) ++ set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE) + else(LCMS2_FOUND) # not found lcms2 # try to find LCMS - FIND_PACKAGE(LCMS) + find_package(LCMS) -- -2.8.1 +2.10.2 From 9c49afdad67f421f03b1acfc5ed48150c4b36a65 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 14 Nov 2016 23:05:34 +0100 Subject: [PATCH 1396/3392] package/gdb: disable simulator support for microblaze The gdb simulator seems missing with the Xilinx fork of gdb. Disable it for microblaze since only the Xilinx version of gdb is currently available. Fixes: http://autobuild.buildroot.net/results/907/9079dad3f138c313a6abb40825baf4d9683a2422 Signed-off-by: Romain Naour Cc: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/gdb/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index b6eb41f4cc..da6b30ecf4 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -27,7 +27,7 @@ config BR2_PACKAGE_HOST_GDB_PYTHON config BR2_PACKAGE_HOST_GDB_SIM bool "Simulator support" - depends on !BR2_arc + depends on !BR2_arc && !BR2_microblaze help This option enables the simulator support in the cross gdb. From 5f899d7f1cd807ff7a92b2facfd4718dad139724 Mon Sep 17 00:00:00 2001 From: Patrick Devlin Date: Mon, 14 Nov 2016 11:58:50 -0500 Subject: [PATCH 1397/3392] package/nodejs: bump version to 6.9.1 https://nodejs.org/en/blog/release/v6.9.1/ The patches from 6.7.0 have been copied to 6.9.1. Signed-off-by: Patrick Devlin Signed-off-by: Thomas Petazzoni --- .../0001-gyp-force-link-command-to-use-CXX.patch | 0 ...2-inspector-don-t-build-when-ssl-support-is-disabled.patch | 0 package/nodejs/Config.in | 2 +- package/nodejs/nodejs.hash | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename package/nodejs/{6.7.0 => 6.9.1}/0001-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{6.7.0 => 6.9.1}/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch (100%) diff --git a/package/nodejs/6.7.0/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.9.1/0001-gyp-force-link-command-to-use-CXX.patch similarity index 100% rename from package/nodejs/6.7.0/0001-gyp-force-link-command-to-use-CXX.patch rename to package/nodejs/6.9.1/0001-gyp-force-link-command-to-use-CXX.patch diff --git a/package/nodejs/6.7.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.9.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch similarity index 100% rename from package/nodejs/6.7.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch rename to package/nodejs/6.9.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 976be50e4d..a47ba37a4a 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_PACKAGE_NODEJS_VERSION_STRING string - default "6.7.0" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS + default "6.9.1" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS default "0.10.47" config BR2_PACKAGE_NODEJS_NPM diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index f334a47e98..5df79afee4 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ # From upstream URL: http://nodejs.org/dist/v0.10.47/SHASUMS256.txt sha256 335bdf4db702885a8acaf2c9f241c70cabd62497361da81aca65c8e8a8e7ff09 node-v0.10.47.tar.xz -# From upstream URL: http://nodejs.org/dist/v6.7.0/SHASUMS256.txt -sha256 ceb028324aab1ee8c7ea6a62026f036f3ea71f5ef5212593d0f833f999dd3be5 node-v6.7.0.tar.xz +# From upstream URL: http://nodejs.org/dist/v6.9.1/SHASUMS256.txt +sha256 0bdd8d1305777cc8cd206129ea494d6c6ce56001868dd80147aff531d6df0729 node-v6.9.1.tar.xz From 966e0e8e10d33407775c5e8b6beb98d0a8810072 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 14 Nov 2016 12:29:47 +0100 Subject: [PATCH 1398/3392] package/libnet: enable on musl configurations Thanks to a patch taken from upstream (https://github.com/sam-github/libnet/commit/ffd7fab744a9ad2893169a8fb6244074604d5d0d), we can enable the libnet package on musl toolchain. Adjusted the file paths manually so the patch applies to the packaged libnet sources. Signed-off-by: Tobias Klauser [Thomas: allow the package to be selected with the musl C library.] Signed-off-by: Thomas Petazzoni --- package/libnet/0001-support-musl-libc.patch | 50 +++++++++++++++++++++ package/libnet/Config.in | 5 --- 2 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 package/libnet/0001-support-musl-libc.patch diff --git a/package/libnet/0001-support-musl-libc.patch b/package/libnet/0001-support-musl-libc.patch new file mode 100644 index 0000000000..0704157bb5 --- /dev/null +++ b/package/libnet/0001-support-musl-libc.patch @@ -0,0 +1,50 @@ +From ffd7fab744a9ad2893169a8fb6244074604d5d0d Mon Sep 17 00:00:00 2001 +From: rofl0r +Date: Tue, 12 Aug 2014 21:51:39 +0200 +Subject: [PATCH] Support musl libc, remove support for glibc < 2.1 + +The workarounds for glibc < 2.1 (was released february 1999) break the +build with musl libc. + +It is very unlikely that 2.0 or earlier is still in use, and if so, +1) that's a big security hole +2) code wouldnt compile anyway since noone tested build in the last decade +3) user of it wouldn't expect anyway to get bleeding edge sw built on it, + so he would just use the latest version that works for him. + +Closes #52 +--- + libnet/src/libnet_link_linux.c | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/libnet/src/libnet_link_linux.c b/libnet/src/libnet_link_linux.c +index 054458d..3c6df3c 100644 +--- a/src/libnet_link_linux.c ++++ b/src/libnet_link_linux.c +@@ -30,26 +30,15 @@ + #include + + #include +-#if (__GLIBC__) + #include + #include +-#else +-#include +-#include +-#endif + + #if (HAVE_PACKET_SOCKET) + #ifndef SOL_PACKET + #define SOL_PACKET 263 + #endif /* SOL_PACKET */ +-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 + #include + #include /* the L2 protocols */ +-#else +-#include +-#include +-#include /* The L2 protocols */ +-#endif + #endif /* HAVE_PACKET_SOCKET */ + + #include "../include/libnet.h" diff --git a/package/libnet/Config.in b/package/libnet/Config.in index 0c5c230af4..7186972b7e 100644 --- a/package/libnet/Config.in +++ b/package/libnet/Config.in @@ -1,12 +1,7 @@ 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 glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL From f148d55980bbc2943706670df638b0f70d8de81e Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 14 Nov 2016 12:29:48 +0100 Subject: [PATCH 1399/3392] package/netsniff-ng: allow to build with musl netsniff-ng allows build with musl since version 0.5.8. With libnet now being able to build with musl, let's enable musl for netsniff-ng as well. Signed-off-by: Tobias Klauser [Thomas: update Config.in comment.] Signed-off-by: Thomas Petazzoni --- package/netsniff-ng/Config.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/netsniff-ng/Config.in b/package/netsniff-ng/Config.in index e52bb25f0a..00617e3719 100644 --- a/package/netsniff-ng/Config.in +++ b/package/netsniff-ng/Config.in @@ -7,8 +7,7 @@ config BR2_PACKAGE_NETSNIFF_NG 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_USES_UCLIBC depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS @@ -17,7 +16,7 @@ config BR2_PACKAGE_NETSNIFF_NG networking toolkit. If you will, the Swiss army knife for network packets. -comment "netsniff-ng needs a glibc toolchain w/ threads, headers >= 3.0" +comment "netsniff-ng needs a glibc or musl toolchain w/ threads, headers >= 3.0" depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC \ + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 From 2114cf021f493defdc3aa6f21259a317aaf62493 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 15 Nov 2016 00:16:40 +0100 Subject: [PATCH 1400/3392] qt5base: fix eglfs compile for odroid-mali Avoid duplicated struct fbdev_window definition (introduced by [1]) by renaming struct fbdev_window to shadow_fbdev_window. Fixes [2]: qeglfsmaliintegration.cpp:45:8: error: redefinition of 'struct fbdev_window' struct fbdev_window { ^ In file included from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:28:0, from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36, from ../../../eglfs/qeglfsglobal.h:45, from ../../../eglfs/qeglfsdeviceintegration.h:48, from qeglfsmaliintegration.h:37, from qeglfsmaliintegration.cpp:34: [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=58bed4cda98e8e25db8adc61c7db73b6853077dc [2] http://autobuild.buildroot.net/results/48c/48c458c035162169e8ca7c34ae65e9064822f25a Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...x-eglfs_mali-compile-for-odroid-mali.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch diff --git a/package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch b/package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch new file mode 100644 index 0000000000..cbafb397bb --- /dev/null +++ b/package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch @@ -0,0 +1,53 @@ +From b6c602e4264021f98ec2c72316e2a2000bf35e82 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 14 Nov 2016 23:42:25 +0100 +Subject: [PATCH] eglfs: fix eglfs_mali compile for odroid-mali + +Avoid duplicated struct fbdev_window definition (introduced by [1]) by +renaming struct fbdev_window to shadow_fbdev_window. + +Fixes the following buildroot compile failure ([2]): + +qeglfsmaliintegration.cpp:45:8: error: redefinition of 'struct fbdev_window' + struct fbdev_window { + ^ +In file included from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:28:0, + from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36, + from ../../../eglfs/qeglfsglobal.h:45, + from ../../../eglfs/qeglfsdeviceintegration.h:48, + from qeglfsmaliintegration.h:37, + from qeglfsmaliintegration.cpp:34: + +[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=58bed4cda98e8e25db8adc61c7db73b6853077dc +[2] http://autobuild.buildroot.net/results/48c/48c458c035162169e8ca7c34ae65e9064822f25a + +Signed-off-by: Peter Seiderer +--- + .../eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp +index 43decdf..aeba83f 100644 +--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp ++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp +@@ -42,7 +42,7 @@ + + QT_BEGIN_NAMESPACE + +-struct fbdev_window { ++struct shadow_fbdev_window { + unsigned short width; + unsigned short height; + }; +@@ -85,7 +85,7 @@ EGLNativeWindowType QEglFSMaliIntegration::createNativeWindow(QPlatformWindow *w + Q_UNUSED(window); + Q_UNUSED(format); + +- fbdev_window *fbwin = reinterpret_cast(malloc(sizeof(fbdev_window))); ++ shadow_fbdev_window *fbwin = reinterpret_cast(malloc(sizeof(shadow_fbdev_window))); + if (NULL == fbwin) + return 0; + +-- +2.8.1 + From aae80e71b6ce75bdf73cc9b84ec96c92ed13aa58 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 15 Nov 2016 08:34:18 +0200 Subject: [PATCH 1401/3392] openssh: add upstream security fix Fixes CVE-2016-8858: Memory exhaustion, up to 128MB, of unauthenticated peer. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/openssh/0003-fix-CVE-2016-8858.patch | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/openssh/0003-fix-CVE-2016-8858.patch diff --git a/package/openssh/0003-fix-CVE-2016-8858.patch b/package/openssh/0003-fix-CVE-2016-8858.patch new file mode 100644 index 0000000000..4ba1cfdc01 --- /dev/null +++ b/package/openssh/0003-fix-CVE-2016-8858.patch @@ -0,0 +1,31 @@ +From ec165c392ca54317dbe3064a8c200de6531e89ad Mon Sep 17 00:00:00 2001 +From: "markus@openbsd.org" +Date: Mon, 10 Oct 2016 19:28:48 +0000 +Subject: [PATCH] upstream commit + +Unregister the KEXINIT handler after message has been +received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause +allocation of up to 128MB -- until the connection is closed. Reported by +shilei-c at 360.cn + +Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05 + +Signed-off-by: Baruch Siach +--- +Patch status: upstream + + kex.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/kex.c b/kex.c +index 3f97f8c..6a94bc5 100644 +--- a/kex.c ++++ b/kex.c +@@ -481,6 +481,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt) + if (kex == NULL) + return SSH_ERR_INVALID_ARGUMENT; + ++ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL); + ptr = sshpkt_ptr(ssh, &dlen); + if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0) + return r; From a75a1d36d235b8552e3f6989681d0a4f17acef64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Mon, 14 Nov 2016 12:04:48 +0100 Subject: [PATCH 1402/3392] htop: enable unicode if possible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Pouiller [Thomas: - use positive logic - use += instead of = in conditions.] Signed-off-by: Thomas Petazzoni --- package/htop/htop.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 7409a78e28..adc5090146 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -7,10 +7,15 @@ HTOP_VERSION = 2.0.2 HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses -HTOP_CONF_OPTS = --disable-unicode # Prevent htop build system from searching the host paths HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/ncurses5-config HTOP_LICENSE = GPLv2 HTOP_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +HTOP_CONF_OPTS += --enable-unicode +else +HTOP_CONF_OPTS += --disable-unicode +endif + $(eval $(autotools-package)) From 6672a8a14194c75a886e2a9d3dcff3f8c2c74ccc Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sun, 13 Nov 2016 22:41:03 +0100 Subject: [PATCH 1403/3392] package/python-pillow: bump to pillow 3.4.2 This patch bumps python pillow to version 3.4.2 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-pillow/python-pillow.hash | 4 ++-- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index ed195f6188..1dd816cb9f 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/pillow/json, sha256 locally computed -md5 1ea45914e8cc375fb385da2555b37267 Pillow-3.4.0.tar.gz -sha256 51027d511f4ab991f628f6f7b9b0fbf18f584ee8a67160410afe3b19685b9d50 Pillow-3.4.0.tar.gz +md5 09ebb92ec5cbba13ff1acf139caf6b66 Pillow-3.4.2.tar.gz +sha256 0ee9975c05602e755ff5000232e0335ba30d507f6261922a658ee11b1cec36d1 Pillow-3.4.2.tar.gz diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index f06ce8d197..59cde75b75 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 3.4.0 +PYTHON_PILLOW_VERSION = 3.4.2 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz -PYTHON_PILLOW_SITE = https://pypi.python.org/packages/51/1d/6456623ea7e155249c0e82cf92715c42ba1902759d1eeff6ac5c3107e747 +PYTHON_PILLOW_SITE = https://pypi.python.org/packages/46/4f/94f6165052774839b4a4af0c72071aa528d5dc8cb8bc6bb43e24a55c10cc PYTHON_PILLOW_LICENSE = PIL Software License PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_SETUP_TYPE = setuptools From 472f0ae2dff7a912bebdb025f7dca0541ebc9769 Mon Sep 17 00:00:00 2001 From: Rahul Jain Date: Tue, 15 Nov 2016 16:33:20 +0530 Subject: [PATCH 1404/3392] Makefile: add missing targets to noconfig_targets and nobuild_targets currently some buildroot targets fails (list-defconfigs, graph-build, etc), if there is an issue with configuration. For example, enabling uboot package without providing custom version name results in failing of various targets. Signed-off-by: Rahul Jain Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: as suggested by Arnout, added printvars and savedefconfig to nobuild_targets.] Signed-off-by: Thomas Petazzoni --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6cf5f1ce1e..eff814b8c6 100644 --- a/Makefile +++ b/Makefile @@ -126,7 +126,8 @@ export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlo noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \ defconfig %_defconfig allyesconfig allnoconfig silentoldconfig release \ randpackageconfig allyespackageconfig allnopackageconfig \ - print-version olddefconfig distclean + print-version olddefconfig distclean manual manual-html manual-split-html \ + manual-pdf manual-text manual-epub # Some global targets do not trigger a build, but are used to collect # metadata, or do various checks. When such targets are triggered, @@ -137,9 +138,12 @@ noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconf # We're building in two situations: when MAKECMDGOALS is empty # (default target is to build), or when MAKECMDGOALS contains # something else than one of the nobuild_targets. -nobuild_targets := source source-check \ - legal-info external-deps _external-deps \ - clean distclean help +nobuild_targets := source %-source source-check \ + legal-info %-legal-info external-deps _external-deps \ + clean distclean help show-targets graph-depends \ + %-graph-depends %-show-depends %-show-version \ + graph-build graph-size list-defconfigs \ + savedefconfig printvars ifeq ($(MAKECMDGOALS),) BR_BUILDING = y else ifneq ($(filter-out $(nobuild_targets),$(MAKECMDGOALS)),) From cbe981184cc1b4909b3f18d653109075d21458cb Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 15 Nov 2016 15:25:48 +0000 Subject: [PATCH 1405/3392] ruby: bump version to 2.3.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 7e627441a1..d480f0743d 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,2 +1,2 @@ -# From https://www.ruby-lang.org/en/news/2016/04/26/ruby-2-3-1-released/ -sha256 6725b5534d5a3a21ec4f14d6d7b9921a0d00d08acb88fd04cd50b47b70496338 ruby-2.3.1.tar.xz +# From https://www.ruby-lang.org/en/news/2016/11/15/ruby-2-3-2-released/ +sha256 5c78f311045ce48160092160444dec2744941a5e37d7865032978bd5bf392f0c ruby-2.3.2.tar.xz diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index f3f80475b8..631f270e43 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 2.3 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).1 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 RUBY_VERSION_EXT = 2.3.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From ca99d0ea925e5a8e42bd270402b0171a39d1d955 Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Tue, 15 Nov 2016 18:21:31 +0300 Subject: [PATCH 1406/3392] gdb: arc: remove C++ dependency and disable build with C++ gdb arc-2016.09-rc1 is based on upstream 7.12 gdb version where we can still disable C++ build. For more information take a look at: https://sourceware.org/gdb/wiki/cxx-conversion We wanted to build gdb with C++ as it is used as default in 7.12 and is even a mandatory requirement since 2016/09. But unfortunately we missed one runtime failure that C++ build causes and so now we have to disable C++ build. When gdb arc-2016.09-rc1 is built as a C++ application it segfaults at runtime for ARC. We are going to fix the issue in 2017.03 ARC toolchain release. and before this we remove C++ dependency are adding temporary workaround to prevent runtime segfaults. The workaround is to disable building gdb as C++ application via passing --disable-build-with-cxx config option when building gdb for ARC. Signed-off-by: Vlad Zakharov Signed-off-by: Thomas Petazzoni --- package/gdb/Config.in | 6 ------ package/gdb/gdb.mk | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 0c6966ab35..809e02d076 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -2,10 +2,6 @@ comment "gdb/gdbserver needs a toolchain w/ threads, threads debug" depends on !BR2_nios2 && !BR2_bfin depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG -comment "gdb/gdbserver needs a toolchain w/ C++" - depends on BR2_arc - depends on !BR2_INSTALL_LIBSTDCPP - config BR2_PACKAGE_GDB bool "gdb" # When the external toolchain gdbserver is copied to the @@ -15,8 +11,6 @@ config BR2_PACKAGE_GDB (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY) depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG depends on !BR2_nios2 && !BR2_bfin - # Since ARC gdb moved to 7.12 toolchain requires C++ support to build gdb. - depends on !BR2_arc || BR2_INSTALL_LIBSTDCPP help GDB, the GNU Project debugger, allows you to see what is going on `inside' another program while it executes -- or diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index ccf9e4968d..ea27d0c6eb 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -100,6 +100,13 @@ GDB_CONF_OPTS = \ --disable-werror \ --enable-static +# When gdb is built as C++ application for ARC it segfaults at runtime +# So we pass --disable-build-with-cxx config option to force gdb not to +# be built as C++ app. +ifeq ($(BR2_arc),y) +GDB_CONF_OPTS += --disable-build-with-cxx +endif + ifeq ($(BR2_PACKAGE_GDB_TUI),y) GDB_CONF_OPTS += --enable-tui else From 0ee4deb9618f961e12e340d527ed0e4fb1ae4829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 15 Nov 2016 21:46:58 +0100 Subject: [PATCH 1407/3392] package/tremor: fix build with Thumb only ARM archs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some ARM architectures like ARMv7-M only supports Thumb instructions, but the tremor build configuration enables ARM assembly code unconditionally for all arm triplets by defining _ARM_ASSEM_. We are overriding this by undefining this macro for ARM architectures not supporting ARM instructions. Fixes: http://autobuild.buildroot.net/results/054/054f1c77b0e5d46b2dc53769469c0ed03e6b79ef/ http://autobuild.buildroot.net/results/ba1/ba1760b1428584f70e44dbffb8218ff3ee55e702/ http://autobuild.buildroot.net/results/2a6/2a687853cf0bc832fef29f88de0d85bd495fe87d/ http://autobuild.buildroot.net/results/cb6/cb6c560bf31834aadbe3d13a118b31ea8190159b/ Signed-off-by: Jörg Krause Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/tremor/tremor.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk index 97b0ce36e4..2a791b6729 100644 --- a/package/tremor/tremor.mk +++ b/package/tremor/tremor.mk @@ -16,9 +16,17 @@ TREMOR_DEPENDENCIES = libogg # tremor has ARM assembly code that cannot be compiled in Thumb2 mode, # so we must force the traditional ARM mode. +# However, some ARM architectures like ARNv7-M only supports Thumb +# instructions, but the tremor build configuration enables ARM assembly +# code unconditionally for all arm triplets by defining _ARM_ASSEM_. +# We are overriding this by undefining this macro for the ARM +# architectures not supporting ARM instructions. ifeq ($(BR2_arm),y) -TREMOR_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -marm" +ifeq ($(BR2_ARM_CPU_HAS_ARM),y) +TREMOR_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -marm" +else +TREMOR_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -U_ARM_ASSEM_" +endif endif $(eval $(autotools-package)) From 9d5ac9698bd5fd7dfb60447b8f9734f23bf78773 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Wed, 9 Nov 2016 16:59:54 +0300 Subject: [PATCH 1408/3392] qt5webkit: get source code from Qt5 unofficial builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of messing with git we can get tarballs of obsolete but still existing Qt5 submodules as we used to but from a bit different location. It turned out Qt people still create packages for obsolete submodules for so-called "unofficial builds", see [1]. [1] https://wiki.qt.io/Qt-5-unofficial-builds Signed-off-by: Alexey Brodkin Cc: Yegor Yefremov Cc: Thomas Petazzoni Cc: Peter Seiderer Cc: "Yann E. MORIN" Cc: Jerzy Grzegorek Cc: Peter Korsgaard Cc: Julien Corjon Cc: Gary Bisson Cc: Jérôme Pouiller Reviewed-by: Julien Corjon Signed-off-by: Thomas Petazzoni --- package/qt5/qt5.mk | 1 + package/qt5/qt5webkit/qt5webkit.hash | 4 ++-- package/qt5/qt5webkit/qt5webkit.mk | 14 +++----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index d25f663662..e937e234b5 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -1,6 +1,7 @@ QT5_VERSION_MAJOR = 5.6 QT5_VERSION = $(QT5_VERSION_MAJOR).2 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules include $(sort $(wildcard package/qt5/*/*.mk)) define QT5_LA_PRL_FILES_FIXUP diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index 96b8bdd690..309f776b3f 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -1,2 +1,2 @@ -# locally computed -sha256 bdd659573e7e75cd4ad57b7160a7353d98d21a6fef06e4fb9e114a5b1f1e9dab qt5webkit-b35917bcb44d7f200af0f4ac68a126fa0aa8d93d.tar.gz +# Hash from: http://download.qt.io/snapshots/qt/5.6/5.6.2/latest_src/submodules/qtwebkit-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 qtwebkit-opensource-src-5.6.2.tar.xz diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 378cdf7857..980d2aff01 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -4,10 +4,9 @@ # ################################################################################ -QT5WEBKIT_VERSION = b35917bcb44d7f200af0f4ac68a126fa0aa8d93d -# Using GitHub since it supports downloading tarballs from random commits. -# The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so. -QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION)) +QT5WEBKIT_VERSION = $(QT5_VERSION) +QT5WEBKIT_SITE = $(QT5_SNAPSHOTS_SITE) +QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ host-bison host-flex host-gperf host-python host-ruby \ qt5base sqlite @@ -43,14 +42,7 @@ define QT5WEBKIT_PYTHON2_SYMLINK endef QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK -# Since we get the source from git, generated header files are not included. -# qmake detects that header file generation (using the syncqt tool) must be -# done based on the existence of a .git directory (cfr. the git_build config -# option which is set in qt_build_paths.prf). -# So, to make sure that qmake detects that header files must be generated, -# create an empty .git directory. define QT5WEBKIT_CONFIGURE_CMDS - mkdir -p $(@D)/.git (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake) endef From 614e821a7f71906b8ff096331a9e9481b71dde00 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 7 Nov 2016 19:14:29 +0100 Subject: [PATCH 1409/3392] xmlstarlet: fix static linking problem Instead of patching configure.ac we can just add the missing libraries to LIBS. Tested with m68k/arm static builds. This makes the patch obsolete and the autoreconf can be avoided. Fixes: http://autobuild.buildroot.net/results/02f9fc5884d3a7d460b96937183362d6c3fc6fde Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...tatic-linking-problem-with-libgcrypt.patch | 46 ------------------- package/xmlstarlet/xmlstarlet.mk | 4 +- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 package/xmlstarlet/0001-Fix-static-linking-problem-with-libgcrypt.patch diff --git a/package/xmlstarlet/0001-Fix-static-linking-problem-with-libgcrypt.patch b/package/xmlstarlet/0001-Fix-static-linking-problem-with-libgcrypt.patch deleted file mode 100644 index ea54c983a2..0000000000 --- a/package/xmlstarlet/0001-Fix-static-linking-problem-with-libgcrypt.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8cee09b59a8c1ff2ebfc8c46097825d2eafdc4dd Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 16 May 2015 17:32:13 +0200 -Subject: [PATCH] Fix static linking problem with libgcrypt - -When libgcrypt is used, it is linked with libgpg-error, so we should -also test that libgpg-error is available, and include -lgpg-error in -the LIBS variable. - -This fixes build issues like: - - CCLD xml -/home/thomas/projets/buildroot/output/host/usr/bfin-buildroot-uclinux-uclibc/sysroot/usr/lib/libexslt.a(crypto.o): In function `_exsltCryptoGcryptInit': -crypto.c:(.text+0x112): undefined reference to `_gcry_check_version' -/home/thomas/projets/buildroot/output/host/usr/bfin-buildroot-uclinux-uclibc/sysroot/usr/lib/libexslt.a(crypto.o): In function `_exsltCryptoRc4DecryptFunction': -crypto.c:(.text+0x316): undefined reference to `_gcry_cipher_open' -crypto.c:(.text+0x32a): undefined reference to `_gcry_strerror' -crypto.c:(.text+0x34c): undefined reference to `_gcry_cipher_setkey' - -Which are caused by the AC_SEARCH_LIBS() test for libgcrypt to fail -due to -lgpg-error not been present in the LIBS variable. - -Note that using PKG_CHECK_MODULES() would be a much much better -replacement than this complicated handling of static libraries, but -it's a much more significant effort. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 4db0129..e378996 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -125,6 +125,7 @@ AS_IF([test "x$STATIC_LIBS" != xno], - [AC_SEARCH_LIBS([libiconv_open], [iconv], [], [], "$USER_LIBS")], "$USER_LIBS") - AC_SEARCH_LIBS([clock_gettime], [rt], [], [], "$USER_LIBS") - AC_SEARCH_LIBS([deflate], [z], [], [], "$USER_LIBS") -+ AC_SEARCH_LIBS([gpg_strerror], [gpg-error], [], [], "$USER_LIBS") - AC_SEARCH_LIBS([gcry_cipher_encrypt], [gcrypt], [], [], "$USER_LIBS") - - # Checks for inet libraries: --- -2.1.0 - diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk index 7039d7738f..2a0d3df378 100644 --- a/package/xmlstarlet/xmlstarlet.mk +++ b/package/xmlstarlet/xmlstarlet.mk @@ -8,8 +8,6 @@ XMLSTARLET_VERSION = 1.6.1 XMLSTARLET_SITE = http://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION) XMLSTARLET_LICENSE = MIT XMLSTARLET_LICENSE_FILES = COPYING -# We're patching configure.ac -XMLSTARLET_AUTORECONF = YES XMLSTARLET_DEPENDENCIES += libxml2 libxslt \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) @@ -21,7 +19,7 @@ XMLSTARLET_CONF_OPTS += \ ifeq ($(BR2_STATIC_LIBS),y) XMLSTARLET_CONF_OPTS += --enable-static-libs -XMLSTARLET_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libxml-2.0`" +XMLSTARLET_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libxml-2.0 libexslt` $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" else XMLSTARLET_CONF_OPTS += --disable-static-libs endif From e550e4783a988feb24c4707db28f0dbc3b72df6a Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 16 Nov 2016 09:52:45 +0900 Subject: [PATCH 1410/3392] boot-wrapper-aarch64: update upstream repository cmarinas/boot-wrapper-aarch64.git does not exist any more. Switch over to mark/boot-wrapper-aarch64.git. Signed-off-by: Masahiro Yamada Cc: Catalin Marinas Cc: Mark Rutland Signed-off-by: Thomas Petazzoni --- boot/boot-wrapper-aarch64/Config.in | 2 +- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/boot-wrapper-aarch64/Config.in b/boot/boot-wrapper-aarch64/Config.in index 73d790fede..efb70dcdf5 100644 --- a/boot/boot-wrapper-aarch64/Config.in +++ b/boot/boot-wrapper-aarch64/Config.in @@ -11,7 +11,7 @@ config BR2_TARGET_BOOT_WRAPPER_AARCH64 possible to start an Aarch64 kernel inside the available software simulators for the Aarch64 architecture. - git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git + git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git if BR2_TARGET_BOOT_WRAPPER_AARCH64 diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index a46937538d..601cfab314 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -5,7 +5,7 @@ ################################################################################ BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694 -BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git +BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_LICENSE = BSD3c BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux From 75022c5270d444a6cd5f0ffe3d1c29f597d43722 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 16 Nov 2016 00:22:18 +0100 Subject: [PATCH 1411/3392] package/xenomai: bfin remove inline keyword Xenomai user space tools fail to build for bfin target since it's provide it's own pthread_atfork(), shm_open() and shm_unlink() definition using the inline keyword and weak attribute. With gcc 5+ the weak attribute is discarded by the inline keyword, so each symbol are global and are redefined several time while linking. Fixes: http://autobuild.buildroot.net/results/0c2/0c2e5eb4edd4f9427f61d3c9b67a12a7a0e24140 Signed-off-by: Romain Naour [Thomas: add reference to upstream commit.] Signed-off-by: Thomas Petazzoni --- .../0001-bfin-remove-inline-keyword.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 package/xenomai/0001-bfin-remove-inline-keyword.patch diff --git a/package/xenomai/0001-bfin-remove-inline-keyword.patch b/package/xenomai/0001-bfin-remove-inline-keyword.patch new file mode 100644 index 0000000000..376bd21c37 --- /dev/null +++ b/package/xenomai/0001-bfin-remove-inline-keyword.patch @@ -0,0 +1,62 @@ +From 2a96c8bbe19a193d9ae6d0780fc274abc4df03e3 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 5 Nov 2016 19:09:00 +0100 +Subject: [PATCH] bfin: remove inline keyword + +Xenomai user space tools fail to build for bfin target since it's +provide it's own pthread_atfork(), shm_open() and shm_unlink() +definition using the inline keyword and weak attribute. + +With gcc 5+ the weak attribute is discarded by the inline keyword, +so each symbol are global and are redefined several time while +linking. + +Fixes: +http://autobuild.buildroot.net/results/0c2/0c2e5eb4edd4f9427f61d3c9b67a12a7a0e24140 + +Patch status: upstream, +https://git.xenomai.org/xenomai-2.6.git/commit/?id=917dcebb26ec492f276cdc3b55867aa90e01fa12 + +Signed-off-by: Romain Naour +--- + include/asm-blackfin/syscall.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/include/asm-blackfin/syscall.h b/include/asm-blackfin/syscall.h +index 9eda8b9..b5728b5 100644 +--- a/include/asm-blackfin/syscall.h ++++ b/include/asm-blackfin/syscall.h +@@ -132,9 +132,9 @@ static inline int __xn_interrupted_p(struct pt_regs *regs) + #define XENOMAI_SKINCALL5(id,op,a1,a2,a3,a4,a5) XENOMAI_DO_SYSCALL(5,id,op,a1,a2,a3,a4,a5) + + /* uClibc does not provide pthread_atfork() for this arch; provide it +- here. Note: let the compiler decides whether it wants to actually +- inline this routine, i.e. do not force always_inline. */ +-inline __attribute__((weak)) int pthread_atfork(void (*prepare)(void), ++ here. ++*/ ++__attribute__((weak)) int pthread_atfork(void (*prepare)(void), + void (*parent)(void), + void (*child)(void)) + { +@@ -143,7 +143,7 @@ inline __attribute__((weak)) int pthread_atfork(void (*prepare)(void), + + #include + +-inline __attribute__((weak)) int shm_open(const char *name, ++__attribute__((weak)) int shm_open(const char *name, + int oflag, + mode_t mode) + { +@@ -151,7 +151,7 @@ inline __attribute__((weak)) int shm_open(const char *name, + return -1; + } + +-inline __attribute__((weak)) int shm_unlink(const char *name) ++__attribute__((weak)) int shm_unlink(const char *name) + { + errno = ENOSYS; + return -1; +-- +2.5.5 + From 12c2c80aa379411f178023ba9194e48e249a7571 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 16 Nov 2016 11:29:00 +0000 Subject: [PATCH 1412/3392] imagemagick: bump version to 7.0.3-7 (security) oss-security reference: http://www.openwall.com/lists/oss-security/2016/11/13/1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- 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 8ad340dd19..4bdfe8f177 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 86a1f04077de2b1486a93088030b010780067b25ab0284560435e2f458e247ca ImageMagick-7.0.3-4.tar.xz +sha256 140b99f33a3326aed92132a7cd054ee962a6e2562064c68495640411aa4571d7 ImageMagick-7.0.3-7.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 2cae064bec..4f5c3be7e7 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.3-4 +IMAGEMAGICK_VERSION = 7.0.3-7 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From 6c248452d62c53cc224fc7ea4911b58d833372b4 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 16 Nov 2016 12:58:37 +0000 Subject: [PATCH 1413/3392] gnuchess: bump version to 6.2.4 (security) oss-security reference: http://www.openwall.com/lists/oss-security/2016/11/13/2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gnuchess/gnuchess.hash | 2 +- package/gnuchess/gnuchess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gnuchess/gnuchess.hash b/package/gnuchess/gnuchess.hash index 26342bccd3..064a845eda 100644 --- a/package/gnuchess/gnuchess.hash +++ b/package/gnuchess/gnuchess.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 17caab725539447bcb17a14b17905242cbf287087e53a6777524feb7bbaeed06 gnuchess-6.2.1.tar.gz +sha256 3c425c0264f253fc5cc2ba969abe667d77703c728770bd4b23c456cbe5e082ef gnuchess-6.2.4.tar.gz diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk index 0555cb17b4..e066b01fe5 100644 --- a/package/gnuchess/gnuchess.mk +++ b/package/gnuchess/gnuchess.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUCHESS_VERSION = 6.2.1 +GNUCHESS_VERSION = 6.2.4 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess GNUCHESS_LICENSE = GPLv2+ GNUCHESS_LICENSE_FILES = COPYING From 10189569cae26bdd2bb40c586590b0975940249f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 16 Nov 2016 12:47:17 +0000 Subject: [PATCH 1414/3392] cryptsetup: bump version to 1.7.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 5972bf8beb..b8c0d2b4e6 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/sha256sums.asc -sha256 dbb35dbf5f0c1749168c86c913fe98e872247bfc8425314b494c2423e7e43342 cryptsetup-1.7.2.tar.xz +sha256 af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02 cryptsetup-1.7.3.tar.xz diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index d7bd251228..50bf5f2aaf 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 1.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 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 36305380db1312442623128689fe5067d9058381 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 16 Nov 2016 22:11:49 +0100 Subject: [PATCH 1415/3392] xmlstarlet: use $() to reference make variables instead of ${} Signed-off-by: Thomas Petazzoni --- package/xmlstarlet/xmlstarlet.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk index 7039d7738f..98efd07730 100644 --- a/package/xmlstarlet/xmlstarlet.mk +++ b/package/xmlstarlet/xmlstarlet.mk @@ -15,9 +15,9 @@ XMLSTARLET_DEPENDENCIES += libxml2 libxslt \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) XMLSTARLET_CONF_OPTS += \ - --with-libxml-prefix=${STAGING_DIR}/usr \ - --with-libxslt-prefix=${STAGING_DIR}/usr \ - --with-libiconv-prefix=${STAGING_DIR}/usr + --with-libxml-prefix=$(STAGING_DIR)/usr \ + --with-libxslt-prefix=$(STAGING_DIR)/usr \ + --with-libiconv-prefix=$(STAGING_DIR)/usr ifeq ($(BR2_STATIC_LIBS),y) XMLSTARLET_CONF_OPTS += --enable-static-libs From 78c446a3405b97ea5bbff8b89199689c1fdf29e4 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 16 Nov 2016 18:29:21 +0200 Subject: [PATCH 1416/3392] linux-pam: drop useless comment The recursive reason for disabling linux-pam with musl doesn't help. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/linux-pam/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index 5d3fd61fa4..3d9835e8cc 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LINUX_PAM select BR2_PACKAGE_FLEX depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam + depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU # fork() help A Security Framework that Provides Authentication for Applications From 496b15eac07e7fc6de21360e27be1e8ed864268b Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 16 Nov 2016 17:40:10 +0000 Subject: [PATCH 1417/3392] lftp: bump version to 4.7.4 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/lftp/lftp.hash | 4 ++-- package/lftp/lftp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lftp/lftp.hash b/package/lftp/lftp.hash index 57a5205af0..0e0f927a56 100644 --- a/package/lftp/lftp.hash +++ b/package/lftp/lftp.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 3b22259cdc4c1a6ae349057d16bda4b4816929e04d223242ab8927bc31a48e7c lftp-4.7.3.tar.xz +# Locally calculated after checking gpg signature +sha256 bf67c4d128b6f769a4082947376a9679c5ee3463a24ab761a0757f75d70bd92c lftp-4.7.4.tar.xz diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk index 802bbc74be..a7e1f92619 100644 --- a/package/lftp/lftp.mk +++ b/package/lftp/lftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LFTP_VERSION = 4.7.3 +LFTP_VERSION = 4.7.4 LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz LFTP_SITE = http://lftp.yar.ru/ftp LFTP_LICENSE = GPLv3+ From f9349058f7fe1fd50f03751a9b544b7c6fe93142 Mon Sep 17 00:00:00 2001 From: "Alvaro G. M" Date: Tue, 15 Nov 2016 11:50:44 +0100 Subject: [PATCH 1418/3392] libxmlrpc: bump to 1.39.11 Previous version patches are still needed, but they have been upgraded to apply cleanly. This also reverts aa9fde1c459dbc20b268694eafd7a1d3341dbf76, as that patch is already on upstream. Signed-off-by: Alvaro Gamez [Thomas: fix the AR/RANLIB problem by adding another patch.] Signed-off-by: Thomas Petazzoni --- .../libxmlrpc/0001-fix-gennmtab-build.patch | 2 +- .../0004-use-correct-curl-config.patch | 36 +++---------------- .../0006-fix-ar-ranlib-handling.patch | 28 +++++++++++++++ package/libxmlrpc/0006-narrowing.patch | 20 ----------- package/libxmlrpc/libxmlrpc.hash | 2 +- package/libxmlrpc/libxmlrpc.mk | 2 +- 6 files changed, 36 insertions(+), 54 deletions(-) create mode 100644 package/libxmlrpc/0006-fix-ar-ranlib-handling.patch delete mode 100644 package/libxmlrpc/0006-narrowing.patch diff --git a/package/libxmlrpc/0001-fix-gennmtab-build.patch b/package/libxmlrpc/0001-fix-gennmtab-build.patch index 8cdd9329f5..e98e5cbf58 100644 --- a/package/libxmlrpc/0001-fix-gennmtab-build.patch +++ b/package/libxmlrpc/0001-fix-gennmtab-build.patch @@ -19,7 +19,7 @@ Index: b/lib/expat/gennmtab/Makefile + $(CC_FOR_BUILD) -c $< -o $@ $(CFLAGS_FOR_BUILD) $(INCLUDES) gennmtab:%:%.o -- $(BUILDTOOL_CCLD) -o $@ $(LDFLAGS) $^ +- $(BUILDTOOL_CCLD) -o $@ $(LDFLAGS_ALL) $^ + $(CC_FOR_BUILD) -o $@ $(LDFLAGS_FOR_BUILD) $^ include depend.mk diff --git a/package/libxmlrpc/0004-use-correct-curl-config.patch b/package/libxmlrpc/0004-use-correct-curl-config.patch index b5816432d8..f2f1c557ba 100644 --- a/package/libxmlrpc/0004-use-correct-curl-config.patch +++ b/package/libxmlrpc/0004-use-correct-curl-config.patch @@ -12,15 +12,15 @@ Index: b/src/Makefile =================================================================== --- a/src/Makefile +++ b/src/Makefile -@@ -56,7 +56,7 @@ - TRANSPORT_MODS += blddir/lib/curl_transport/curltransaction - TRANSPORT_MODS += blddir/lib/curl_transport/curlmulti - TRANSPORT_MODS += blddir/lib/curl_transport/lock_pthread +@@ -57,7 +57,7 @@ + TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport + TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curltransaction + TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curlmulti - TRANSPORT_LIBDEP += $(shell curl-config --libs) + TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs) + TRANSPORT_INCLUDES += -Isrcdir/lib/curl_transport endif ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) - TRANSPORT_MODS += blddir/lib/libwww_transport/xmlrpc_libwww_transport Index: b/config.mk.in =================================================================== --- a/config.mk.in @@ -68,29 +68,3 @@ Index: b/lib/curl_transport/Makefile # We expect that curl-config --cflags just gives us -I options, because # we need just the -I options for 'make dep'. Plus, it's scary to think # of what any other compiler flag would do to our compile. -Index: b/src/cpp/test/Makefile -=================================================================== ---- a/src/cpp/test/Makefile -+++ b/src/cpp/test/Makefile -@@ -20,7 +20,7 @@ - LIBS := $(shell $(XMLRPC_C_CONFIG) client --ldadd) - - ifeq ($(MUST_BUILD_CURL_CLIENT),yes) -- LIBS += $(shell curl-config --libs) -+ LIBS += $(shell $(CURL_CONFIG) --libs) - endif - ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) - LIBS += $(shell libwww-config --libs) -Index: b/tools/common.mk -=================================================================== ---- a/tools/common.mk -+++ b/tools/common.mk -@@ -15,7 +15,7 @@ - CLIENT_LDLIBS += $(shell libwww-config --libs) - endif - ifeq ($(MUST_BUILD_CURL_CLIENT),yes) -- CLIENT_LDLIBS += $(shell curl-config --libs) -+ CLIENT_LDLIBS += $(shell $(CURL_CONFIG) --libs) - endif - ifeq ($(MUST_BUILD_WININET_CLIENT),yes) - CLIENT_LDLIBS += $(shell wininet-config --libs) diff --git a/package/libxmlrpc/0006-fix-ar-ranlib-handling.patch b/package/libxmlrpc/0006-fix-ar-ranlib-handling.patch new file mode 100644 index 0000000000..1e58d24780 --- /dev/null +++ b/package/libxmlrpc/0006-fix-ar-ranlib-handling.patch @@ -0,0 +1,28 @@ +Fix detection of AR and RANLIB + +The configure.in script assumes that ranlib and ar are necessarily +prefixed by ${ac_tool_prefix}, which is the value of --host. However, +it's not necessarily the case. + +So instead, use AC_CHECK_TOOL to check for AR, and AC_PROG_RANLIB to +check for RANLIB. + +Signed-off-by: Thomas Petazzoni + +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -621,10 +621,8 @@ + BUILDDIR=$(pwd) + AC_SUBST(BUILDDIR) + +-AR=${ac_tool_prefix}ar +-AC_SUBST([AR]) +-RANLIB=${ac_tool_prefix}ranlib +-AC_SUBST([RANLIB]) ++AC_CHECK_TOOL([AR], [ar]) ++AC_PROG_RANLIB + + dnl ======================================================================= + dnl Output our results. diff --git a/package/libxmlrpc/0006-narrowing.patch b/package/libxmlrpc/0006-narrowing.patch deleted file mode 100644 index 43a5ca5f40..0000000000 --- a/package/libxmlrpc/0006-narrowing.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix build with gcc6 - -Downloaded from -https://build.opensuse.org/package/view_file/devel:libraries:c_c++/xmlrpc-c/narrowing.patch - -Signed-off-by: Bernd Kuhls - -Index: xmlrpc-c-1.33.18/src/cpp/base64.cpp -=================================================================== ---- xmlrpc-c-1.33.18.orig/src/cpp/base64.cpp -+++ xmlrpc-c-1.33.18/src/cpp/base64.cpp -@@ -14,7 +14,7 @@ using namespace xmlrpc_c; - - namespace { - --char const table_a2b_base64[] = { -+signed char const table_a2b_base64[] = { - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63, diff --git a/package/libxmlrpc/libxmlrpc.hash b/package/libxmlrpc/libxmlrpc.hash index d37fcfc95c..8ec1e14ea7 100644 --- a/package/libxmlrpc/libxmlrpc.hash +++ b/package/libxmlrpc/libxmlrpc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 8ae6ed4ec57d50ed132b1150fc5258346eef3e291501a564f14fa97586902f98 xmlrpc-c-1.25.30.tgz +sha256 2e56cdcdd5c5fa564bcdc7a56bca108a88f5b78b34ccc85558366efabdc8b8e8 xmlrpc-c-1.39.11.tgz diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk index 03a709597b..53a587780c 100644 --- a/package/libxmlrpc/libxmlrpc.mk +++ b/package/libxmlrpc/libxmlrpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXMLRPC_VERSION = 1.25.30 +LIBXMLRPC_VERSION = 1.39.11 LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(LIBXMLRPC_VERSION) LIBXMLRPC_LICENSE = BSD-3c (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c) From 196932cd91ef5d58bd3142bbea939fb55636a540 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 10 Nov 2016 15:27:11 +0200 Subject: [PATCH 1419/3392] toolchain: workaround musl/kernel headers conflict Rick Felker suggested[1] this hack as a workaround to musl libc conflict with kernel headers: The problem is linux/libc-compat.h, which should fix this, only works on glibc, by design. See: #ifndef _LIBC_COMPAT_H #define _LIBC_COMPAT_H /* We have included glibc headers... */ #if defined(__GLIBC__) /* Coordinate with glibc netinet/in.h header. */ #if defined(_NETINET_IN_H) If you patch it like this: -#if defined(__GLIBC__) +#if 1 then it should mostly work but it's still all a big hack. I think that's what distros are doing. The problem is that the same header is trying to do two different things: 1. Provide extra linux-kernel-API stuff that's not in the libc/userspace headers. 2. Provide definitions of the standard types and constants for uClibc and klibc, which don't have complete libc headers and rely on the kernel headers for definitions. These two uses really should be separated out into separate headers so that the latter only get included explicitly by uClibc and klibc and otherwise remain completely unused. But that would require coordinated changes/upgrades which are unlikely to happen. :( Upstream musl still evaluates[2][3] a permanent solution. With this in place we can revert (at least) commits a167081c5d (bridge-utils: fix build with musl) and e74d4fc4932 (norm: add patch to fix musl build). [1] http://www.openwall.com/lists/musl/2015/10/08/2 [2] http://git.musl-libc.org/cgit/musl/commit/?id=04983f2272382af92eb8f8838964ff944fbb8258 [3] http://www.openwall.com/lists/musl/2016/11/09/2 Signed-off-by: Baruch Siach Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- toolchain/toolchain/toolchain.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index c22713bfe3..d317e917d0 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -12,6 +12,20 @@ endif TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO +# Apply a hack that Rick Felker suggested[1] to avoid conflicts between libc +# headers and kernel headers. This is a temporary measure until musl finds a +# better solution. +# +# [1] http://www.openwall.com/lists/musl/2015/10/08/2 +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +define TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK + $(SED) 's/^#if defined(__GLIBC__)$$/#if 1/' \ + $(STAGING_DIR)/usr/include/linux/libc-compat.h +endef +TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK +TOOLCHAIN_INSTALL_STAGING = YES +endif + $(eval $(virtual-package)) toolchain: $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake From c0b756cac41219ad558105304d33d113e2ee4d75 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 10 Nov 2016 15:27:12 +0200 Subject: [PATCH 1420/3392] Revert "bridge-utils: fix build with musl" This reverts commit a167081c5d5a5aee95b642a14200d18d8a84dbcc. With the applied musl/kernel headers conflict workaround this upstream nacked patch is no longer necessary. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...-fix-headers-conflict-with-musl-libc.patch | 140 ------------------ 1 file changed, 140 deletions(-) delete mode 100644 package/bridge-utils/0002-libbridge-fix-headers-conflict-with-musl-libc.patch diff --git a/package/bridge-utils/0002-libbridge-fix-headers-conflict-with-musl-libc.patch b/package/bridge-utils/0002-libbridge-fix-headers-conflict-with-musl-libc.patch deleted file mode 100644 index fd7f45ed4e..0000000000 --- a/package/bridge-utils/0002-libbridge-fix-headers-conflict-with-musl-libc.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 24e5409190820a14e4d097924b1acaab62bb3b99 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sun, 30 Oct 2016 18:12:00 +0200 -Subject: [PATCH] libbridge: fix headers conflict with musl libc - -Don't including kernel headers directly to avoid headers conflict like: - -In file included from .../sysroot/usr/include/linux/if_bridge.h:18:0, - from libbridge.h:26, - from libbridge_if.c:26: -.../sysroot/usr/include/linux/in6.h:32:8: error: redefinition of ‘struct in6_addr’ - struct in6_addr { - ^ -In file included from libbridge.h:24:0, - from libbridge_if.c:26: -.../sysroot/usr/include/netinet/in.h:23:8: note: originally defined here - struct in6_addr { - ^ - -Instead copy the required linux/if_bridge.h definitions into -libbridge_private.h. - -Signed-off-by: Baruch Siach ---- -Patch status: Nacked -(https://lists.linuxfoundation.org/pipermail/bridge/2016-November/010107.html) ---- - libbridge/libbridge.h | 1 - - libbridge/libbridge_private.h | 83 ++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 82 insertions(+), 2 deletions(-) - -diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h -index ff047f933cd6..18b40cd90413 100644 ---- a/libbridge/libbridge.h -+++ b/libbridge/libbridge.h -@@ -23,7 +23,6 @@ - #include - #include - #include --#include - - /* defined in net/if.h but that conflicts with linux/if.h... */ - extern unsigned int if_nametoindex (const char *__ifname); -diff --git a/libbridge/libbridge_private.h b/libbridge/libbridge_private.h -index 99a511dae00a..565025b7bccb 100644 ---- a/libbridge/libbridge_private.h -+++ b/libbridge/libbridge_private.h -@@ -24,7 +24,88 @@ - #include - #include - #include --#include -+ -+/* From linux/if_ether.h */ -+#ifndef ETH_ALEN -+#define ETH_ALEN 6 -+#endif -+ -+/* From linux/if_bridge.h */ -+#ifndef BRCTL_GET_VERSION -+#define BRCTL_GET_VERSION 0 -+#define BRCTL_GET_BRIDGES 1 -+#define BRCTL_ADD_BRIDGE 2 -+#define BRCTL_DEL_BRIDGE 3 -+#define BRCTL_ADD_IF 4 -+#define BRCTL_DEL_IF 5 -+#define BRCTL_GET_BRIDGE_INFO 6 -+#define BRCTL_GET_PORT_LIST 7 -+#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8 -+#define BRCTL_SET_BRIDGE_HELLO_TIME 9 -+#define BRCTL_SET_BRIDGE_MAX_AGE 10 -+#define BRCTL_SET_AGEING_TIME 11 -+#define BRCTL_SET_GC_INTERVAL 12 -+#define BRCTL_GET_PORT_INFO 13 -+#define BRCTL_SET_BRIDGE_STP_STATE 14 -+#define BRCTL_SET_BRIDGE_PRIORITY 15 -+#define BRCTL_SET_PORT_PRIORITY 16 -+#define BRCTL_SET_PATH_COST 17 -+#define BRCTL_GET_FDB_ENTRIES 18 -+ -+#define BR_STATE_DISABLED 0 -+#define BR_STATE_LISTENING 1 -+#define BR_STATE_LEARNING 2 -+#define BR_STATE_FORWARDING 3 -+#define BR_STATE_BLOCKING 4 -+ -+struct __bridge_info { -+ __u64 designated_root; -+ __u64 bridge_id; -+ __u32 root_path_cost; -+ __u32 max_age; -+ __u32 hello_time; -+ __u32 forward_delay; -+ __u32 bridge_max_age; -+ __u32 bridge_hello_time; -+ __u32 bridge_forward_delay; -+ __u8 topology_change; -+ __u8 topology_change_detected; -+ __u8 root_port; -+ __u8 stp_enabled; -+ __u32 ageing_time; -+ __u32 gc_interval; -+ __u32 hello_timer_value; -+ __u32 tcn_timer_value; -+ __u32 topology_change_timer_value; -+ __u32 gc_timer_value; -+}; -+ -+struct __port_info { -+ __u64 designated_root; -+ __u64 designated_bridge; -+ __u16 port_id; -+ __u16 designated_port; -+ __u32 path_cost; -+ __u32 designated_cost; -+ __u8 state; -+ __u8 top_change_ack; -+ __u8 config_pending; -+ __u8 unused0; -+ __u32 message_age_timer_value; -+ __u32 forward_delay_timer_value; -+ __u32 hold_timer_value; -+}; -+ -+struct __fdb_entry { -+ __u8 mac_addr[ETH_ALEN]; -+ __u8 port_no; -+ __u8 is_local; -+ __u32 ageing_timer_value; -+ __u8 port_hi; -+ __u8 pad0; -+ __u16 unused; -+}; -+#endif /* BRCTL_GET_VERSION */ - - #define MAX_BRIDGES 1024 - #define MAX_PORTS 1024 --- -2.10.1 - From bae792e4c04b5f6ac34befd1334ddc715801a165 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 10 Nov 2016 15:27:13 +0200 Subject: [PATCH 1421/3392] Revert "norm: add patch to fix musl build" This reverts commit e74d4fc4932df4ea42381acb44d616241275b79a. With the applied musl/kernel headers conflict workaround this patch is no longer necessary. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...move-kernel-headers-include-musl-fix.patch | 55 ------------------- 1 file changed, 55 deletions(-) delete mode 100644 package/norm/0003-remove-kernel-headers-include-musl-fix.patch diff --git a/package/norm/0003-remove-kernel-headers-include-musl-fix.patch b/package/norm/0003-remove-kernel-headers-include-musl-fix.patch deleted file mode 100644 index 7581c10b79..0000000000 --- a/package/norm/0003-remove-kernel-headers-include-musl-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -Remove kernel header includes causing issues with musl - -Include the kernel headers from netfilter causes a conflict with the - way of defining the IPPROTO_* constants, resulting in -the following build failure: - -In file included from /home/peko/autobuild/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/netdb.h:9:0, - from /home/peko/autobuild/instance-0/output/build/norm-1.5r6/protolib/include/protoAddress.h:13, - from /home/peko/autobuild/instance-0/output/build/norm-1.5r6/protolib/include/protoDetour.h:5, - from ../protolib/src/linux/linuxDetour.cpp:3: -/home/peko/autobuild/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/in.h:28:3: error: expected identifier before numeric constant - IPPROTO_IP = 0, /* Dummy protocol for TCP */ - ^ -/home/peko/autobuild/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/in.h:28:3: error: expected '}' before numeric constant -/home/peko/autobuild/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/in.h:28:3: error: expected unqualified-id before numeric constant -In file included from /home/peko/autobuild/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/netfilter.h:7:0, - from /home/peko/autobuild/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/netfilter_ipv4.h:8, - from ../protolib/src/linux/linuxDetour.cpp:10: -/home/peko/autobuild/instance-0/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/in.h:79:1: error: expected declaration before '}' token - }; - ^ - -Since from musl's developers perspective including kernel headers is -seen as being unsafe, we simply duplicate the necessary netfilter -definitions (there are just a few) instead of including some kernel -headers. - -Signed-off-by: Thomas Petazzoni - -Index: b/protolib/src/linux/linuxDetour.cpp -=================================================================== ---- a/protolib/src/linux/linuxDetour.cpp -+++ b/protolib/src/linux/linuxDetour.cpp -@@ -7,15 +7,18 @@ - #include // for atoi(), getenv() - #include - #include // for close() --#include // for NF_IP_LOCAL_OUT, etc --#include // for NF_IP6_LOCAL_OUT, etc --#include // for NF_ACCEPT, etc - #include - - #include // for fcntl(), etc - #include // for ETH_P_IP - #include // for ARPHRD_ETHER - -+/* From netfilter kernel headers */ -+#define NF_IP_LOCAL_OUT 3 -+ -+#define NF_DROP 0 -+#define NF_ACCEPT 1 -+ - /** NOTES: - * - * 1) This newer implementation of LinuxDetour uses netfilter_queue From d149dae430d09dfb77d5a938e5581def5b866735 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 18 Nov 2016 11:46:02 +0000 Subject: [PATCH 1422/3392] tiff: fix website URL Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/tiff/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tiff/Config.in b/package/tiff/Config.in index 6e5c176588..092a7f3fca 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -3,7 +3,7 @@ menuconfig BR2_PACKAGE_TIFF help Library for handling TIFF (Tag Image File Format) images. - http://www.remotesensing.org/libtiff/ + http://simplesystems.org/libtiff/ if BR2_PACKAGE_TIFF From d9eeadbcc340c5e345d7c4d96b572e0e37f262da Mon Sep 17 00:00:00 2001 From: Joao Pinto Date: Fri, 18 Nov 2016 18:01:56 +0000 Subject: [PATCH 1423/3392] configs: snps_aarch64_vdk_defconfig: kernel pointing to 4.6 Previously the vdk solution was using a Linaro kernel that doesn't build with gcc 5.x. Since there is no point in using Linaro anymore for this solution, this patch makes the aarch64 vdk defconfig point to the 4.6 Linux kernel. Signed-off-by: Joao Pinto Signed-off-by: Thomas Petazzoni --- configs/snps_aarch64_vdk_defconfig | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/configs/snps_aarch64_vdk_defconfig b/configs/snps_aarch64_vdk_defconfig index f165a9a39d..b55dce1ad6 100644 --- a/configs/snps_aarch64_vdk_defconfig +++ b/configs/snps_aarch64_vdk_defconfig @@ -1,12 +1,10 @@ BR2_aarch64=y -# Linux headers same as kernel, a 3.18 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y BR2_TARGET_GENERIC_HOSTNAME="vdk-buildroot" BR2_TARGET_GENERIC_ISSUE="Welcome to SNPS VDK by Buildroot" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.linaro.org/kernel/linux-linaro-tracking.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux-linaro-3.18-2014.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/synopsys/vdk/linux-vdk-aarch64-defconfig" BR2_TARGET_ROOTFS_EXT2=y From a233fd0a6303e977d0bc50d56a984213512d895c Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Fri, 18 Nov 2016 17:36:05 +0100 Subject: [PATCH 1424/3392] tslib: bump version to 1.2 * The first patch is removed because the input-raw plugin is now enabled in tslib's provided ts.conf * The second patch added 2 programs to tslib. The whole patch is removed because: - ts_finddev is now part of tslib. - inputattach is part of the 'Linux console project' located here: https://sourceforge.net/projects/linuxconsole/ Signed-off-by: Martin Kepplinger Signed-off-by: Thomas Petazzoni --- package/tslib/0001-enable_raw_module.patch | 14 - ...02-add_finddef_and_inputattach_utils.patch | 718 ------------------ package/tslib/tslib.hash | 2 +- package/tslib/tslib.mk | 2 +- 4 files changed, 2 insertions(+), 734 deletions(-) delete mode 100644 package/tslib/0001-enable_raw_module.patch delete mode 100644 package/tslib/0002-add_finddef_and_inputattach_utils.patch diff --git a/package/tslib/0001-enable_raw_module.patch b/package/tslib/0001-enable_raw_module.patch deleted file mode 100644 index cb89338cf7..0000000000 --- a/package/tslib/0001-enable_raw_module.patch +++ /dev/null @@ -1,14 +0,0 @@ -Enable raw module by default - -Signed-off-by: Daniel Nyström - -diff -Naur tslib-e000d35a.orig/etc/ts.conf tslib-e000d35a/etc/ts.conf ---- tslib-e000d35a.orig/etc/ts.conf 2010-12-21 18:54:45.000000000 +0100 -+++ tslib-e000d35a/etc/ts.conf 2010-12-21 18:55:03.000000000 +0100 -@@ -1,5 +1,5 @@ - # Uncomment if you wish to use the linux input layer event interface --# module_raw input -+module_raw input - - # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d - # module_raw collie diff --git a/package/tslib/0002-add_finddef_and_inputattach_utils.patch b/package/tslib/0002-add_finddef_and_inputattach_utils.patch deleted file mode 100644 index dcc6ec75ae..0000000000 --- a/package/tslib/0002-add_finddef_and_inputattach_utils.patch +++ /dev/null @@ -1,718 +0,0 @@ -diff -Naur tslib-org/tests/Makefile.am tslib-1.0/tests/Makefile.am ---- tslib-org/tests/Makefile.am 2006-08-25 00:02:55.000000000 +0300 -+++ tslib-1.0/tests/Makefile.am 2007-05-07 17:39:54.000000000 +0300 -@@ -12,7 +12,7 @@ - AM_CFLAGS = $(DEBUGFLAGS) - INCLUDES = -I$(top_srcdir)/src - --bin_PROGRAMS = ts_test ts_calibrate ts_print ts_print_raw ts_harvest -+bin_PROGRAMS = ts_test ts_calibrate ts_print ts_print_raw ts_harvest ts_finddev inputattach - - ts_test_SOURCES = ts_test.c fbutils.c fbutils.h font_8x8.c font_8x16.c font.h - ts_test_LDADD = $(top_builddir)/src/libts.la -@@ -27,4 +27,10 @@ - ts_calibrate_LDADD = $(top_builddir)/src/libts.la - - ts_harvest_SOURCES = ts_harvest.c fbutils.c fbutils.h testutils.c testutils.h font_8x8.c font_8x16.c font.h --ts_harvest_LDADD = $(top_builddir)/src/libts.la -+ts_harvest_LDADD = $(top_builddir)/src/libts.la -+ -+ts_finddev_SOURCES = ts_finddev.c -+ts_finddev_LDADD = $(top_builddir)/src/libts.la -+ -+inputattach_SOURCES = inputattach.c -+inputattach_LDADD = -diff -Naur tslib-org/tests/inputattach.c tslib-1.0/tests/inputattach.c ---- tslib-org/tests/inputattach.c 1970-01-01 02:00:00.000000000 +0200 -+++ tslib-1.0/tests/inputattach.c 2007-05-07 17:36:37.000000000 +0300 -@@ -0,0 +1,611 @@ -+/* -+ * $Id: inputattach.c,v 1.24 2006/02/08 12:19:31 vojtech Exp $ -+ * -+ * Copyright (c) 1999-2000 Vojtech Pavlik -+ * -+ * Sponsored by SuSE -+ * -+ * Twiddler support Copyright (c) 2001 Arndt Schoenewald -+ * Sponsored by Quelltext AG (http://www.quelltext-ag.de), Dortmund, Germany -+ */ -+ -+/* -+ * Input line discipline attach program -+ */ -+ -+/* -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * Should you need to contact me, the author, you can do so either by -+ * e-mail - mail your message to , or by paper mail: -+ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic -+ */ -+ -+/* softa note: -+cvs version is here: -+http://cvs.sourceforge.net/viewcvs.py/ *checkout* /linuxconsole/ruby/utils/inputattach.c -+*/ -+ -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+// softa patch! -+/* -+ * Serio types -+ */ -+#ifndef SERIO_UNKNOWN -+ #define SERIO_UNKNOWN 0x00 -+#endif -+#ifndef SERIO_MSC -+ #define SERIO_MSC 0x01 -+#endif -+#ifndef SERIO_SUN -+ #define SERIO_SUN 0x02 -+#endif -+#ifndef SERIO_MS -+ #define SERIO_MS 0x03 -+#endif -+#ifndef SERIO_MP -+ #define SERIO_MP 0x04 -+#endif -+#ifndef SERIO_MZ -+ #define SERIO_MZ 0x05 -+#endif -+#ifndef SERIO_MZP -+ #define SERIO_MZP 0x06 -+#endif -+#ifndef SERIO_MZPP -+ #define SERIO_MZPP 0x07 -+#endif -+#ifndef SERIO_VSXXXAA -+ #define SERIO_VSXXXAA 0x08 -+#endif -+#ifndef SERIO_SUNKBD -+ #define SERIO_SUNKBD 0x10 -+#endif -+#ifndef SERIO_WARRIOR -+ #define SERIO_WARRIOR 0x18 -+#endif -+#ifndef SERIO_SPACEORB -+ #define SERIO_SPACEORB 0x19 -+#endif -+#ifndef SERIO_MAGELLAN -+ #define SERIO_MAGELLAN 0x1a -+#endif -+#ifndef SERIO_SPACEBALL -+ #define SERIO_SPACEBALL 0x1b -+#endif -+#ifndef SERIO_GUNZE -+ #define SERIO_GUNZE 0x1c -+#endif -+#ifndef SERIO_IFORCE -+ #define SERIO_IFORCE 0x1d -+#endif -+#ifndef SERIO_STINGER -+ #define SERIO_STINGER 0x1e -+#endif -+#ifndef SERIO_NEWTON -+ #define SERIO_NEWTON 0x1f -+#endif -+#ifndef SERIO_STOWAWAY -+ #define SERIO_STOWAWAY 0x20 -+#endif -+#ifndef SERIO_H3600 -+ #define SERIO_H3600 0x21 -+#endif -+#ifndef SERIO_PS2SER -+ #define SERIO_PS2SER 0x22 -+#endif -+#ifndef SERIO_TWIDKBD -+ #define SERIO_TWIDKBD 0x23 -+#endif -+#ifndef SERIO_TWIDJOY -+ #define SERIO_TWIDJOY 0x24 -+#endif -+#ifndef SERIO_HIL -+ #define SERIO_HIL 0x25 -+#endif -+#ifndef SERIO_SNES232 -+ #define SERIO_SNES232 0x26 -+#endif -+#ifndef SERIO_SEMTECH -+ #define SERIO_SEMTECH 0x27 -+#endif -+#ifndef SERIO_LKKBD -+ #define SERIO_LKKBD 0x28 -+#endif -+#ifndef SERIO_ELO -+ #define SERIO_ELO 0x29 -+#endif -+#ifndef SERIO_MICROTOUCH -+ #define SERIO_MICROTOUCH 0x30 -+#endif -+#ifndef SERIO_PENMOUNT -+ #define SERIO_PENMOUNT 0x31 -+#endif -+#ifndef SERIO_TOUCHRIGHT -+ #define SERIO_TOUCHRIGHT 0x32 -+#endif -+#ifndef SERIO_TOUCHWIN -+ #define SERIO_TOUCHWIN 0x33 -+#endif -+// end softa patch! -+ -+int readchar(int fd, unsigned char *c, int timeout) -+{ -+ struct timeval tv; -+ fd_set set; -+ -+ tv.tv_sec = 0; -+ tv.tv_usec = timeout * 1000; -+ -+ FD_ZERO(&set); -+ FD_SET(fd, &set); -+ -+ if (!select(fd+1, &set, NULL, NULL, &tv)) return -1; -+ if (read(fd, c, 1) != 1) return -1; -+ -+ return 0; -+} -+ -+ -+ -+void setline(int fd, int flags, int speed) -+{ -+ struct termios t; -+ -+ tcgetattr(fd, &t); -+ -+ t.c_cflag = flags | CREAD | HUPCL | CLOCAL; -+ t.c_iflag = IGNBRK | IGNPAR; -+ t.c_oflag = 0; -+ t.c_lflag = 0; -+ t.c_cc[VMIN ] = 1; -+ t.c_cc[VTIME] = 0; -+ -+ cfsetispeed(&t, speed); -+ cfsetospeed(&t, speed); -+ -+ tcsetattr(fd, TCSANOW, &t); -+} -+ -+int logitech_command(int fd, char *c) -+{ -+ int i; -+ unsigned char d; -+ for (i = 0; c[i]; i++) { -+ write(fd, c + i, 1); -+ if (readchar(fd, &d, 1000)) -+ return -1; -+ if (c[i] != d) -+ return -1; -+ } -+ return 0; -+} -+ -+int magellan_init(int fd, long *id, long *extra) -+{ -+ write(fd, "m3\rpBB\rz\r", 9); -+ return 0; -+} -+ -+int warrior_init(int fd, long *id, long *extra) -+{ -+ if (logitech_command(fd, "*S")) return -1; -+ setline(fd, CS8, B4800); -+ return 0; -+} -+ -+int spaceball_waitchar(int fd, unsigned char c, unsigned char *d, int timeout) -+{ -+ unsigned char b = 0; -+ -+ while (!readchar(fd, &b, timeout)) { -+ if (b == 0x0a) continue; -+ *d++ = b; -+ if (b == c) break; -+ } -+ -+ *d = 0; -+ -+ return -(b != c); -+} -+ -+int spaceball_waitcmd(int fd, char c, char *d) -+{ -+ int i; -+ -+ for (i = 0; i < 8; i++) { -+ if (spaceball_waitchar(fd, 0x0d, d, 1000)) -+ return -1; -+ if (d[0] == c) -+ return 0; -+ } -+ -+ return -1; -+} -+ -+int spaceball_cmd(int fd, char *c, char *d) -+{ -+ int i; -+ -+ for (i = 0; c[i]; i++) -+ write(fd, c + i, 1); -+ write(fd, "\r", 1); -+ -+ i = spaceball_waitcmd(fd, toupper(c[0]), d); -+ -+ return i; -+} -+ -+#define SPACEBALL_1003 1 -+#define SPACEBALL_2003B 3 -+#define SPACEBALL_2003C 4 -+#define SPACEBALL_3003C 7 -+#define SPACEBALL_4000FLX 8 -+#define SPACEBALL_4000FLX_L 9 -+ -+int spaceball_init(int fd, long *id, long *extra) -+{ -+ char r[64]; -+ -+ if (spaceball_waitchar(fd, 0x11, r, 4000) || -+ spaceball_waitchar(fd, 0x0d, r, 1000)) -+ return -1; -+ -+ if (spaceball_waitcmd(fd, '@', r)) -+ return -1; -+ -+ if (strncmp("@1 Spaceball alive", r, 18)) -+ return -1; -+ -+ if (spaceball_waitcmd(fd, '@', r)) -+ return -1; -+ -+ if (spaceball_cmd(fd, "hm", r)) -+ return -1; -+ -+ if (!strncmp("Hm2003B", r, 7)) -+ *id = SPACEBALL_2003B; -+ if (!strncmp("Hm2003C", r, 7)) -+ *id = SPACEBALL_2003C; -+ if (!strncmp("Hm3003C", r, 7)) -+ *id = SPACEBALL_3003C; -+ -+ if (!strncmp("HvFirmware", r, 10)) { -+ -+ if (spaceball_cmd(fd, "\"", r)) -+ return -1; -+ -+ if (strncmp("\"1 Spaceball 4000 FLX", r, 21)) -+ return -1; -+ -+ if (spaceball_waitcmd(fd, '"', r)) -+ return -1; -+ -+ if (strstr(r, " L ")) -+ *id = SPACEBALL_4000FLX_L; -+ else -+ *id = SPACEBALL_4000FLX; -+ -+ if (spaceball_waitcmd(fd, '"', r)) -+ return -1; -+ -+ if (spaceball_cmd(fd, "YS", r)) -+ return -1; -+ -+ if (spaceball_cmd(fd, "M", r)) -+ return -1; -+ -+ return 0; -+ } -+ -+ if (spaceball_cmd(fd, "P@A@A", r) || -+ spaceball_cmd(fd, "FT@", r) || -+ spaceball_cmd(fd, "MSS", r)) -+ return -1; -+ -+ return 0; -+} -+ -+int stinger_init(int fd, long *id, long *extra) -+{ -+ int i; -+ unsigned char c; -+ unsigned char *response = "\r\n0600520058C272"; -+ -+ if (write(fd, " E5E5", 5) != 5) /* Enable command */ -+ return -1; -+ -+ for (i = 0; i < 16; i++) /* Check for Stinger */ -+ if (readchar(fd, &c, 200) || (c != response[i])) -+ return -1; -+ -+ return 0; -+} -+ -+int mzp_init(int fd, long *id, long *extra) -+{ -+ if (logitech_command(fd, "*X*q")) return -1; -+ setline(fd, CS8, B9600); -+ return 0; -+} -+ -+int newton_init(int fd, long *id, long *extra) -+{ -+ int i; -+ unsigned char c; -+ unsigned char response[35] = -+ { 0x16, 0x10, 0x02, 0x64, 0x5f, 0x69, 0x64, 0x00, -+ 0x00, 0x00, 0x0c, 0x6b, 0x79, 0x62, 0x64, 0x61, -+ 0x70, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x01, 0x6e, -+ 0x6f, 0x66, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x10, -+ 0x03, 0xdd, 0xe7 }; -+ -+ for (i = 0; i < 35; i++) -+ if (readchar(fd, &c, 400) || (c != response[i])) -+ return -1; -+ -+ return 0; -+} -+ -+int twiddler_init(int fd, long *id, long *extra) -+{ -+ unsigned char c[10]; -+ int count, line; -+ -+ /* Turn DTR off, otherwise the Twiddler won't send any data. */ -+ if (ioctl(fd, TIOCMGET, &line)) return -1; -+ line &= ~TIOCM_DTR; -+ if (ioctl(fd, TIOCMSET, &line)) return -1; -+ -+ /* Check whether the device on the serial line is the Twiddler. -+ * -+ * The Twiddler sends data packets of 5 bytes which have the following -+ * properties: the MSB is 0 on the first and 1 on all other bytes, and -+ * the high order nibble of the last byte is always 0x8. -+ * -+ * We read and check two of those 5 byte packets to be sure that we -+ * are indeed talking to a Twiddler. */ -+ -+ /* Read at most 5 bytes until we find one with the MSB set to 0 */ -+ for (count = 0; count < 5; count++) { -+ if (readchar(fd, c+0, 500)) return -1; -+ if ((c[0] & 0x80) == 0) break; -+ } -+ -+ if (count == 5) { -+ /* Could not find header byte in data stream */ -+ return -1; -+ } -+ -+ /* Read remaining 4 bytes plus the full next data packet */ -+ for (count = 1; count < 10; count++) { -+ if (readchar(fd, c+count, 500)) return -1; -+ } -+ -+ /* Check whether the bytes of both data packets obey the rules */ -+ for (count = 1; count < 10; count++) { -+ if ((count % 5 == 0 && (c[count] & 0x80) != 0) -+ || (count % 5 == 4 && (c[count] & 0xF0) != 0x80) -+ || (count % 5 != 0 && (c[count] & 0x80) != 0x80)) { -+ /* Invalid byte in data packet */ -+ return -1; -+ } -+ } -+ -+ return 0; -+} -+ -+int penmount_init(int fd, long *id, long *extra) -+{ -+ unsigned char init_cmd[5] = { 0xF2, 0x00, 0x00, 0x00, 0x00 }; -+ unsigned char start_cmd[5] = { 0xF1, 0x00, 0x00, 0x00, 0x00 }; -+ unsigned char c[10]; -+ int count; -+ -+ /* try to initialize device */ -+ if (write( fd, init_cmd, 5 ) != 5) -+ return -1; -+ -+ /* read the responce */ -+ for (count = 0; count < 5; count ++) { -+ if (readchar(fd, c+0, 500)) return -1; -+ if (c[0] == 0xf2) break; -+ } -+ -+ if (readchar(fd, c+1, 500)) return -1; -+ if (c[1] != 0xd9) return -1; -+ -+ if (readchar(fd, c+2, 500)) return -1; -+ if (c[2] != 0x0a) return -1; -+ -+ /* the device is present! start it! */ -+ if (write( fd, start_cmd, 5 ) != 5) -+ return -1; -+ -+ return 0; -+} -+ -+int dump_init(int fd, long *id, long *extra) -+{ -+ unsigned char c, o = 0; -+ -+ c = 0x80; -+ -+ if (write(fd, &c, 1) != 1) /* Enable command */ -+ return -1; -+ -+ while (1) -+ if (!readchar(fd, &c, 1)) { -+ printf("%02x (%c) ", c, ((c > 32) && (c < 127)) ? c : 'x'); -+ o = 1; -+ } else { -+ if (o) { -+ printf("\n"); -+ o = 0; -+ } -+ } -+} -+ -+struct input_types { -+ char name[16]; -+ char name2[16]; -+ int speed; -+ int flags; -+ unsigned long type; -+ unsigned long id; -+ unsigned long extra; -+ int flush; -+ int (*init)(int fd, long *id, long *extra); -+}; -+ -+struct input_types input_types[] = { -+ -+{ "--sunkbd", "-skb", B1200, CS8, SERIO_SUNKBD, 0, 0, 1, NULL }, -+{ "--lkkbd", "-lk", B4800, CS8|CSTOPB, SERIO_LKKBD, 0, 0, 1, NULL }, -+{ "--vsxxx-aa", "-vs", B4800, CS8|CSTOPB|PARENB|PARODD,SERIO_VSXXXAA, 0, 0, 1, NULL }, -+{ "--spaceorb", "-orb", B9600, CS8, SERIO_SPACEORB, 0, 0, 1, NULL }, -+{ "--spaceball", "-sbl", B9600, CS8, SERIO_SPACEBALL,0, 0, 0, spaceball_init }, -+{ "--magellan", "-mag", B9600, CS8 | CSTOPB | CRTSCTS, SERIO_MAGELLAN, 0, 0, 1, magellan_init }, -+{ "--warrior", "-war", B1200, CS7 | CSTOPB, SERIO_WARRIOR, 0, 0, 1, warrior_init }, -+{ "--stinger", "-sting", B1200, CS8, SERIO_STINGER, 0, 0, 1, stinger_init }, -+{ "--mousesystems", "-msc", B1200, CS8, SERIO_MSC, 0, 0x01, 1, NULL }, -+{ "--sunmouse", "-sun", B1200, CS8, SERIO_SUN, 0, 0x01, 1, NULL }, -+{ "--microsoft", "-bare", B1200, CS7, SERIO_MS, 0, 0, 1, NULL }, -+{ "--mshack", "-ms", B1200, CS7, SERIO_MS, 0, 0x01, 1, NULL }, -+{ "--mouseman", "-mman", B1200, CS7, SERIO_MP, 0, 0x01, 1, NULL }, -+{ "--intellimouse", "-ms3", B1200, CS7, SERIO_MZ, 0, 0x11, 1, NULL }, -+{ "--mmwheel", "-mmw", B1200, CS7 | CSTOPB, SERIO_MZP, 0, 0x13, 1, mzp_init }, -+{ "--iforce", "-ifor", B38400, CS8, SERIO_IFORCE, 0, 0, 0, NULL }, -+{ "--newtonkbd", "-newt", B9600, CS8, SERIO_NEWTON, 0, 0, 0, newton_init }, -+{ "--h3600ts", "-ipaq", B115200, CS8, SERIO_H3600, 0, 0, 0, NULL }, -+{ "--stowawaykbd", "-ipaqkbd", B115200, CS8, SERIO_STOWAWAY, 0, 0, 0, NULL }, -+{ "--ps2serkbd", "-ps2ser", B1200, CS8, SERIO_PS2SER, 0, 0, 1, NULL }, -+{ "--twiddler", "-twid", B2400, CS8, SERIO_TWIDKBD, 0, 0, 0, twiddler_init }, -+{ "--twiddler-joy", "-twidjoy", B2400, CS8, SERIO_TWIDJOY, 0, 0, 0, twiddler_init }, -+{ "--elotouch", "-elo", B9600, CS8 | CRTSCTS, SERIO_ELO, 0, 0, 0, NULL }, -+{ "--elo4002", "-elo6b", B9600, CS8 | CRTSCTS, SERIO_ELO, 1, 0, 0, NULL }, -+{ "--elo271-140", "-elo4b", B9600, CS8 | CRTSCTS, SERIO_ELO, 2, 0, 0, NULL }, -+{ "--elo261-280", "-elo3b", B9600, CS8 | CRTSCTS, SERIO_ELO, 3, 0, 0, NULL }, -+{ "--dump", "-dump", B2400, CS8, 0, 0, 0, 0, dump_init }, -+{ "--dmc9000", "-dmc", B19200, CS8, SERIO_PENMOUNT, 0, 0, 0, penmount_init }, -+{ "", "", 0, 0 } -+ -+}; -+ -+int main(int argc, char **argv) -+{ -+ unsigned long devt; -+ int ldisc; -+ int type; -+ long id, extra; -+ int fd; -+ char c; -+ -+ if (argc < 2 || argc > 3 || !strcmp("--help", argv[1])) { -+ puts(""); -+ puts("Usage: inputttach "); -+ puts(""); -+ puts("Modes:"); -+ puts(" --sunkbd -skb Sun Type 4 and Type 5 keyboards"); -+ puts(" --lkkbd -lk DEC LK201 / LK401 keyboards"); -+ puts(" --vsxxx-aa -vs DEC VSXXX-AA / VSXXX-GA mouse and VSXXX-AB tablet"); -+ puts(" --spaceorb -orb SpaceOrb 360 / SpaceBall Avenger"); -+ puts(" --spaceball -sbl SpaceBall 2003 / 3003 / 4000 FLX"); -+ puts(" --magellan -mag Magellan / SpaceMouse"); -+ puts(" --warrior -war WingMan Warrior"); -+ puts(" --stinger -stng Gravis Stinger"); -+ puts(" --mousesystems -msc 3-button Mouse Systems mice"); -+ puts(" --sunmouse -sun 3-button Sun mice"); -+ puts(" --microsoft -bare 2-button Microsoft mice"); -+ puts(" --mshack -ms 3-button mice in Microsoft mode"); -+ puts(" --mouseman -mman 3-button Logitech and Genius mice"); -+ puts(" --intellimouse -ms3 Microsoft IntelliMouse"); -+ puts(" --mmwheel -mmw Logitech mice with 4-5 buttons or wheel"); -+ puts(" --iforce -ifor I-Force joysticks and wheels"); -+ puts(" --h3600ts -ipaq Ipaq h3600 touchscreen"); -+ puts(" --stowawaykbd -ipaqkbd Stowaway keyboard"); -+ puts(" --ps2serkbd -ps2ser PS/2 via serial keyboard"); -+ puts(" --twiddler -twid Handykey Twiddler chording keyboard"); -+ puts(" --twiddler-joy -twidjoy Handykey Twiddler used as a joystick"); -+ puts(" --dmc9000 -dmc DMC9000/Penpount touchscreen"); -+ puts(""); -+ return 1; -+ } -+ -+ for (type = 0; input_types[type].speed; type++) { -+ if (!strncasecmp(argv[1], input_types[type].name, 16) || -+ !strncasecmp(argv[1], input_types[type].name2, 16)) -+ break; -+ } -+ -+ if (!input_types[type].speed) { -+ fprintf(stderr, "inputattach: invalid mode\n"); -+ return 1; -+ } -+ -+ if ((fd = open(argv[2], O_RDWR | O_NOCTTY | O_NONBLOCK)) < 0) { -+ perror("inputattach"); -+ return 1; -+ } -+ -+ setline(fd, input_types[type].flags, input_types[type].speed); -+ -+ if (input_types[type].flush) -+ while (!readchar(fd, &c, 100)); -+ -+ id = input_types[type].id; -+ extra = input_types[type].extra; -+ -+ if (input_types[type].init && input_types[type].init(fd, &id, &extra)) { -+ fprintf(stderr, "inputattach: device initialization failed\n"); -+ return 1; -+ } -+ -+ ldisc = N_MOUSE; -+ if(ioctl(fd, TIOCSETD, &ldisc)) { -+ fprintf(stderr, "inputattach: can't set line discipline\n"); -+ return 1; -+ } -+ -+ devt = input_types[type].type | (id << 8) | (extra << 16); -+ -+ if(ioctl(fd, SPIOCSTYPE, &devt)) { -+ fprintf(stderr, "inputattach: can't set device type\n"); -+ return 1; -+ } -+ -+ read(fd, NULL, 0); -+ -+ ldisc = 0; -+ ioctl(fd, TIOCSETD, &ldisc); -+ close(fd); -+ -+ return 0; -+} -diff -Naur tslib-org/tests/ts_finddev.c tslib-1.0/tests/ts_finddev.c ---- tslib-org/tests/ts_finddev.c 1970-01-01 02:00:00.000000000 +0200 -+++ tslib-1.0/tests/ts_finddev.c 2007-05-07 17:36:37.000000000 +0300 -@@ -0,0 +1,75 @@ -+/* -+ * tslib/src/ts_print.c -+ * -+ * Derived from tslib/src/ts_test.c by Douglas Lowder -+ * Just prints touchscreen events -- does not paint them on framebuffer -+ * -+ * This file is placed under the GPL. Please see the file -+ * COPYING for more details. -+ * -+ * Basic test program for touchscreen library. -+ */ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "tslib.h" -+ -+void usage( int argc, char** argv ) { -+ printf( "Usage: %s device_name wait_for_sec\n", argv[0] ); -+ printf( "\tdevice_name - tdevice to probe, example /dev/input/event0\n" ); -+ printf( "\twait_for_sec - wait seconds for touch event, if 0 - dont wait!\n" ); -+ printf( "\tReturn codes:\n" ); -+ printf( "\t 0 - timeout expired without receiving event.\n" ); -+ printf( "\t But this maybe is TouchScreen.\n" ); -+ printf( "\t -1 - this is NOT TouchScreen device!\n" ); -+ printf( "\t 1 - this is TouchScreen for shure!\n" ); -+ exit(-1); -+} -+ -+void alarm_handler( int sig ) { -+ // time is expired! -+ exit(0); -+} -+ -+int main( int argc, char** argv ) -+{ -+ struct tsdev *ts; -+ struct ts_sample samp; -+ char *tsdevice=NULL; -+ int waitsec; -+ int ret; -+ -+ if (argc != 3) -+ usage( argc, argv ); -+ -+ tsdevice = argv[1]; -+ waitsec = atoi( argv[2] ); -+ if (waitsec < 0) -+ usage( argc, argv ); -+ -+ ts = ts_open( tsdevice, 0 ); -+ if (!ts) -+ return -1; -+ if (ts_config(ts)) -+ return -1; -+ -+ if (!waitsec) { -+ return 0; -+ } -+ -+ printf( "Probe device %s, Please Touch Screen Anywhere in %i seconds! ... \n", tsdevice, waitsec ); -+ signal( SIGALRM, alarm_handler ); -+ alarm( waitsec ); -+ ret = ts_read_raw(ts, &samp, 1 ); -+ if (ret) -+ return 1; -+ -+ return -1; -+} diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index e3ddce54fe..fc493e78d0 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,2 +1,2 @@ # Locally generated -sha256 121750e9ae0f05ce840ab8dbefdae1297258f0a69dd1967f55c40ac6e87d5ee9 tslib-1.1.tar.gz +sha256 b6450f4d1bc8f4fbbb796a2d1210aee3ccf9ecf302a368dddf279c63eb634833 tslib-1.2.tar.gz diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 1100247905..6437f60c3d 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.1 +TSLIB_VERSION = 1.2 TSLIB_SITE = https://github.com/kergoth/tslib/releases/download/$(TSLIB_VERSION) TSLIB_LICENSE = GPL, LGPL TSLIB_LICENSE_FILES = COPYING From d20845c447d5b6a9d4ef5d1fc2c82b2dfb70480b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 18 Nov 2016 23:00:12 +0100 Subject: [PATCH 1425/3392] qwt: fix qt5 opengl support Qt5base BR2_PACKAGE_QT5BASE_OPENGL_LIB depends on BR2_PACKAGE_QT5BASE_OPENGL (see package/qt5/qt5base/Config.in), so select it. Fixes [1]: cp: cannot stat '.../output/host/usr/sh4-buildroot-linux-uclibc/sysroot/usr/lib/libQt5OpenGL.so.*': No such file or directory [1] http://autobuild.buildroot.net/results/262/2623d48194b778c92134f9bceea923749b26ac6b Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qwt/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qwt/Config.in b/package/qwt/Config.in index dabbda2775..a678637b6c 100644 --- a/package/qwt/Config.in +++ b/package/qwt/Config.in @@ -30,6 +30,7 @@ config BR2_PACKAGE_QWT_OPENGL depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_QT) || \ (BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_PACKAGE_QT5) select BR2_PACKAGE_QT_OPENGL if BR2_PACKAGE_QT + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5 endif From 8715e8da11ce8b7e584b8c7170c32f25111a9e19 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 17 Nov 2016 16:41:25 -0300 Subject: [PATCH 1426/3392] mesa3d: add patch to fix wayland-scanner issues mesa3d tries to use the pkg-config specified wayland-scanner when wayland is enabled, which points to /usr/bin/wayland-scanner which is incorrect. The correct fix is trying to use the PATH wayland-scanner first if it's available rather than the pkg-config specified one, since tweaking a staging .pc file with a host binary is wrong. Fixes: http://autobuild.buildroot.net/results/c0c/c0ca3778c390a33c27073553ca3bef7ac7c5784b/ Patch sent upstream: https://lists.freedesktop.org/archives/mesa-dev/2016-November/135665.html Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- ...vert-order-for-wayland-scanner-check.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch diff --git a/package/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch b/package/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch new file mode 100644 index 0000000000..e32031eca1 --- /dev/null +++ b/package/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch @@ -0,0 +1,39 @@ +From 60ee5191a0c074251862a15b12afdc9db0b2df38 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Thu, 17 Nov 2016 15:36:54 -0300 +Subject: [PATCH] configure.ac: invert order for wayland-scanner check + +When cross-compiling the .pc file might point to the wrong +wayland-scanner binary (target rather than host) resulting in a +non-executable and wrong scanner. +Try searching the PATH first, and if that fails fall back into +pkg-config. + +Signed-off-by: Gustavo Zacarias +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5f30ae8..461792e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2025,11 +2025,11 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then + AC_MSG_ERROR([cannot build egl state tracker without EGL library]) + fi + +-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, +- WAYLAND_SCANNER='') ++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) + if test "x$WAYLAND_SCANNER" = x; then +- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) ++ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], ++ WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, ++ WAYLAND_SCANNER='') + fi + + # Do per-EGL platform setups and checks +-- +2.7.3 + From ef5596aa03b6376604305b20527e6de51e2b6f11 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 18 Nov 2016 07:39:37 +0200 Subject: [PATCH 1427/3392] olsr: fix package name display Use the package name, olsr, instead of the tarball file name. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/olsr/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/olsr/Config.in b/package/olsr/Config.in index 2f3d024bd6..85c5b4da1f 100644 --- a/package/olsr/Config.in +++ b/package/olsr/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_OLSR - bool "olsrd" + bool "olsr" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS From 320d73ab1bb56aa7505dfe800770f15ca3aa5fc5 Mon Sep 17 00:00:00 2001 From: Pieterjan Camerlynck Date: Thu, 17 Nov 2016 17:54:20 +0100 Subject: [PATCH 1428/3392] package/udisks: fix daemon path in systemd service file Signed-off-by: Pieterjan Camerlynck Signed-off-by: Thomas Petazzoni --- .../0002-Fix-systemd-service-file.patch | 33 +++++++++++++++++++ package/udisks/udisks.mk | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 package/udisks/0002-Fix-systemd-service-file.patch diff --git a/package/udisks/0002-Fix-systemd-service-file.patch b/package/udisks/0002-Fix-systemd-service-file.patch new file mode 100644 index 0000000000..ea347aef73 --- /dev/null +++ b/package/udisks/0002-Fix-systemd-service-file.patch @@ -0,0 +1,33 @@ +From bf8b4362cef24a6f747e4329305a4939c8f585d1 Mon Sep 17 00:00:00 2001 +From: David King +Date: Thu, 2 Jul 2015 13:49:22 +0100 +Subject: [PATCH] Fix systemd service file + +udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks. + +https://bugzilla.redhat.com/show_bug.cgi?id=1238664 +https://bugs.freedesktop.org/show_bug.cgi?id=91191 + +[This patch has been backported from upstream: +https://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=bf8b4362cef24a6f747e4329305a4939c8f585d1] +Signed-off-by: Pieterjan Camerlynck +--- + data/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/Makefile.am b/data/Makefile.am +index 411ea0f..08af5f4 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -31,7 +31,7 @@ systemdservicedir = $(systemdsystemunitdir) + systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) + + $(systemdservice_DATA): $(systemdservice_in_files) Makefile +- @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ ++ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + endif + + udevrulesdir = $(slashlibdir)/udev/rules.d +-- +2.7.4 + diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk index eea79e5659..4d3ede71b1 100644 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@ -8,6 +8,8 @@ UDISKS_VERSION = 1.0.5 UDISKS_SITE = http://hal.freedesktop.org/releases UDISKS_LICENSE = GPLv2+ UDISKS_LICENSE_FILES = COPYING +# For 0002-Fix-systemd-service-file.patch +UDISKS_AUTORECONF = YES UDISKS_DEPENDENCIES = \ sg3_utils \ From 59d047fa58edadb985ac3ccc4d16fcd0b6f58731 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 7 Nov 2016 00:14:08 +0100 Subject: [PATCH 1429/3392] configs/olimex_a20_olinuxino_lime_mali: bump kernel version This commit changes the kernel version used by the olimex_a20_olinuxino_lime_mali in order to use a version that builds fine with gcc 5.x. This kernel repository is listed in https://linux-sunxi.org/Linux#External_links as a possible replacement for the aging 3.4 sunxi kernel. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime_mali_defconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime_mali_defconfig b/configs/olimex_a20_olinuxino_lime_mali_defconfig index b2d7dd564a..35af5f9ce1 100644 --- a/configs/olimex_a20_olinuxino_lime_mali_defconfig +++ b/configs/olimex_a20_olinuxino_lime_mali_defconfig @@ -17,8 +17,10 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot-mali.cmd $(TARGET_D # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux-sunxi,linux-sunxi,sunxi-v3.4.103-r1)/sunxi-v3.4.103-r1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/dan-and/linux-sunxi.git" +# based on Linux version 3.4.113 +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dbabbacbbf8984dea0a8c893b38b376a6ecbb3c1" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sun7i" BR2_LINUX_KERNEL_INSTALL_TARGET=y From 4d907c71d469359452ea307aef7ad27632f64176 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 14:50:05 +0100 Subject: [PATCH 1430/3392] kvm-unit-tests: pass the --processor configure argument The configure script uses this to set the -mcpu option. If nothing is passed, it defaults to -mcpu=cortex-a15 for arm, and -mcpu=cortex-a57 for aarch64, which may conflict with the actual architecture. The --processor option is only really used for arm and aarch64, but it doesn't hurt to also pass it for the other arches. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/kvm-unit-tests/kvm-unit-tests.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 6e1c2dfcfb..0ddb017802 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -28,6 +28,7 @@ endif KVM_UNIT_TESTS_CONF_OPTS =\ --arch="$(KVM_UNIT_TESTS_ARCH)" \ + --processor="$(call qstrip,$(BR2_GCC_TARGET_CPU))" \ --endian="$(KVM_UNIT_TESTS_ENDIAN)" # For all architectures but x86-64, we use the target From 592188e34b8790ecdb249803318270857dab1d13 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 14:50:06 +0100 Subject: [PATCH 1431/3392] kvm-unit-tests: only enable for ARM on Cortex-A{7,12,15,17} The library uses the hypervisor instruction HVC, which is only available on ARMv7-A with Hypervisor extensions. This is limited to Cortex-A{7,12,15,17}. In addition the build unconditionally passes -marm so it also needs ARM instructions to be available, but that is already implied by the CPU selection. Implicitly fixes http://autobuild.buildroot.net/results/53d109fd9055fd20387bb857aced5f89cf3086fd though it is still not clear why ld doesn't accept the -Ttext=... option there. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: A12 and A17 also have the virtualization extensions.] Signed-off-by: Thomas Petazzoni --- package/kvm-unit-tests/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index f704a8e0c3..72656462e1 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -4,7 +4,9 @@ config BR2_PACKAGE_KVM_UNIT_TESTS # on i386 and x86-64, __builtin_reachable is used, so we need # gcc 4.5 at least. on i386, we use the target gcc, while on # x86-64 we use the host gcc (see .mk file for details) - depends on BR2_arm || \ + # On ARM, it uses virtualization extensions + depends on BR2_cortex_a7 || BR2_cortex_a12 || \ + BR2_cortex_a15 || BR2_cortex_a17 || \ (BR2_i386 && BR2_TOOLCHAIN_GCC_AT_LEAST_4_5) || \ BR2_powerpc64 || \ BR2_powerpc64le || \ From d082d20a8ae3afd0638627fba662aaba7319ec69 Mon Sep 17 00:00:00 2001 From: Jerry Evans Date: Sun, 20 Nov 2016 13:28:36 +0000 Subject: [PATCH 1432/3392] docs/manual: fix documentation about BR2_EXTERNAL__PATH variable The BR2_EXTERNAL documentation improperly tells to use the BR2_EXTERNAL__DIR variable to reference the location of the BR2_EXTERNAL directory. But in fact the variable is named BR2_EXTERNAL__PATH. In addition, some closing double quotes were missing. This commit fixes both of those issues. Signed-off-by: Jerry Evans Signed-off-by: Thomas Petazzoni --- docs/manual/customize-outside-br.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/customize-outside-br.txt b/docs/manual/customize-outside-br.txt index 70efabe228..2ebb44724d 100644 --- a/docs/manual/customize-outside-br.txt +++ b/docs/manual/customize-outside-br.txt @@ -217,8 +217,8 @@ illustration, of course): | `---- | |- Config.in - | |source "$BR2_EXTERNAL_BAR_42_DIR/package/pkg-1/Config.in - | |source "$BR2_EXTERNAL_BAR_42_DIR/package/pkg-2/Config.in + | |source "$BR2_EXTERNAL_BAR_42_PATH/package/pkg-1/Config.in" + | |source "$BR2_EXTERNAL_BAR_42_PATH/package/pkg-2/Config.in" | | | |config BAR_42_FLASH_ADDR | | hex "my-board flash address" @@ -229,7 +229,7 @@ illustration, of course): | |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk)) | | | |flash-my-board: - | | $(BR2_EXTERNAL_BAR_42_DIR)/board/my-board/flash-image \ + | | $(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/flash-image \ | | --image $(BINARIES_DIR)/image.bin \ | | --address $(BAR_42_FLASH_ADDR) | `---- From 63a20d5dfebe83e2b2bd683dc78ebdf787dff100 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Sat, 19 Nov 2016 17:57:14 -0500 Subject: [PATCH 1433/3392] dosfstools: update URL in Config.in.host Update URL in Config.in.host to match Config.in. Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- package/dosfstools/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dosfstools/Config.in.host b/package/dosfstools/Config.in.host index 6156c5a3cf..fc488c0c6f 100644 --- a/package/dosfstools/Config.in.host +++ b/package/dosfstools/Config.in.host @@ -3,4 +3,4 @@ config BR2_PACKAGE_HOST_DOSFSTOOLS help Tools for creating and checking DOS FAT filesystems. - http://www.daniel-baumann.ch/software/dosfstools/ + https://github.com/dosfstools/dosfstools From 4f5f48199116119a2b69c42b95cee0594eee8774 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 20 Nov 2016 23:34:21 +0100 Subject: [PATCH 1434/3392] libfribi: fix 'usptream' typo in comment Signed-off-by: Peter Korsgaard --- package/libfribidi/libfribidi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index 86e722a211..751a1b6066 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -15,7 +15,7 @@ LIBFRIBIDI_INSTALL_STAGING = YES LIBFRIBIDI_AUTORECONF = YES LIBFRIBIDI_DEPENDENCIES = host-pkgconf # libglib2 dependency causes a build failure, and this optional -# dependency is going to be removed usptream, see +# dependency is going to be removed upstream, see # https://github.com/behdad/fribidi/pull/14 LIBFRIBIDI_CONF_OPTS = --with-glib=no From 0085734dc92d5e9024f1b511c32c4eab536f6a73 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 21 Nov 2016 13:43:06 +0000 Subject: [PATCH 1435/3392] ruby: bump version to 2.3.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index d480f0743d..8182e2c158 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,2 +1,2 @@ -# From https://www.ruby-lang.org/en/news/2016/11/15/ruby-2-3-2-released/ -sha256 5c78f311045ce48160092160444dec2744941a5e37d7865032978bd5bf392f0c ruby-2.3.2.tar.xz +# From https://www.ruby-lang.org/en/news/2016/11/21/ruby-2-3-3-released/ +sha256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc ruby-2.3.3.tar.xz diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 631f270e43..b8e03ac07f 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 2.3 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 RUBY_VERSION_EXT = 2.3.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From fe13efe19dde41409a72d625919807f3841767fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Mon, 21 Nov 2016 11:15:29 -0500 Subject: [PATCH 1436/3392] fs/ext2: fix double quoted label MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the commit 6dd7bbb59134799ed3d7343f238b3b02592faebf, the label does not need anymore to be quoted. Even worse it *must* not be simple-quoted, unless the label will contain the double-quotes from the config variable BR2_TARGET_ROOTFS_EXT2_LABEL. The commit mentionned above has replaced echo by printf: - echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT) + $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) Since this commit the rootfs label contains extra double-quotes. $ blkid /dev/mmcblk0: LABEL=""BR 2016.08"" UUID="xxx" ^ ^ With this fix, the extra double-quotes have disappeared: /dev/mmcblk0: LABEL="BR 2016.11-rc2" UUID="yyy" Signed-off-by: Gaël PORTAY Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- fs/ext2/ext2.mk | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk index 7417f81cf0..cfb34c4565 100644 --- a/fs/ext2/ext2.mk +++ b/fs/ext2/ext2.mk @@ -20,12 +20,11 @@ ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),0) EXT2_OPTS += -r $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) endif -# Not qstrip-ing the variable, because it may contain spaces, but we must -# qstrip it when checking. Furthermore, we need to further quote it, so -# that the quotes do not get eaten by the echo statement when creating the -# fakeroot script -ifneq ($(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_LABEL)),) -EXT2_OPTS += -l '$(BR2_TARGET_ROOTFS_EXT2_LABEL)' +# qstrip results in stripping consecutive spaces into a single one. So the +# variable is not qstrip-ed to preserve the integrity of the string value. +EXT2_LABEL := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL)) +ifneq ($(EXT2_LABEL),) +EXT2_OPTS += -l "$(EXT2_LABEL)" endif ROOTFS_EXT2_DEPENDENCIES = host-mke2img From 568013ecae874e6560a650bbfcc4a91f0f232fd1 Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Mon, 21 Nov 2016 17:08:05 +0300 Subject: [PATCH 1437/3392] mpfr: Fix obsolete ARC asm constraints "mpfr" library build was failing due to obsolete ARC asm constraints. This commit replaces obsolete "J" constraints with up-to-date "Cal" ones in order to fix "mpfr" build for ARC. Fixes: http://autobuild.buildroot.net/results/579/579de571270ad562fbb1699224d557d16276704b// Signed-off-by: Vlad Zakharov Signed-off-by: Thomas Petazzoni --- ...001-Fix-obsolete-ARC-asm-constraints.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch diff --git a/package/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch b/package/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch new file mode 100644 index 0000000000..12590cfd30 --- /dev/null +++ b/package/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch @@ -0,0 +1,37 @@ +mpfr-longlong.h: Fix obsolete ARC asm constraints + +This patch replaces obsolete ARC "J" asm constraint with +up-to-date "Cal" constraint. +The patch should be applied to upstream "mpfr" library and +after that it should be removed from buildroot as soon as +mpfr version with current fix will come up. + +Signed-off-by: Vlad Zakharov +Signed-off-by: Claudiu Zissulescu +--- +Index: /src/mpfr-longlong.h +=================================================================== +--- /src/mpfr-longlong.h (revision 10963) ++++ /src/mpfr-longlong.h (working copy) +@@ -416,17 +416,17 @@ + : "=r" (sh), \ + "=&r" (sl) \ + : "r" ((USItype) (ah)), \ +- "rIJ" ((USItype) (bh)), \ ++ "rICal" ((USItype) (bh)), \ + "%r" ((USItype) (al)), \ +- "rIJ" ((USItype) (bl))) ++ "rICal" ((USItype) (bl))) + #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("sub.f\t%1, %4, %5\n\tsbc\t%0, %2, %3" \ + : "=r" (sh), \ + "=&r" (sl) \ + : "r" ((USItype) (ah)), \ +- "rIJ" ((USItype) (bh)), \ ++ "rICal" ((USItype) (bh)), \ + "r" ((USItype) (al)), \ +- "rIJ" ((USItype) (bl))) ++ "rICal" ((USItype) (bl))) + #endif + + #if defined (__arm__) && (defined (__thumb2__) || !defined (__thumb__)) \ From 99d06dbd3d6fea30ad5b6d1037527e795e457fba Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 21 Nov 2016 10:49:27 +0000 Subject: [PATCH 1438/3392] linux-headers: bump 3.2.x and 4.{4, 8}.x series Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8bfad444f1..5c42d53f7e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -223,7 +223,7 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.83" if BR2_KERNEL_HEADERS_3_2 + default "3.2.84" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.104" if BR2_KERNEL_HEADERS_3_10 default "3.12.67" if BR2_KERNEL_HEADERS_3_12 @@ -232,9 +232,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.35" if BR2_KERNEL_HEADERS_4_1 - default "4.4.31" if BR2_KERNEL_HEADERS_4_4 + default "4.4.34" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.10" if BR2_KERNEL_HEADERS_4_7 - default "4.8.7" if BR2_KERNEL_HEADERS_4_8 + default "4.8.10" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From c88713070e2d6aa799fe9c8b4d01a413e2e5fbe3 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 21 Nov 2016 10:49:28 +0000 Subject: [PATCH 1439/3392] linux: bump default to version 4.8.10 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 7e141a21a5..d8ac5fa558 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.7)" + bool "Latest version (4.8.10)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.10" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From ebd63d405f3feaec2798cf950c91adbcd112f344 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 21 Nov 2016 10:13:50 +0000 Subject: [PATCH 1440/3392] tiff: bump version to 4.0.7 (security) Fixed CVEs: - CVE-2016-3622 - CVE-2016-3623 - CVE-2016-5321 - CVE-2016-5323 - CVE-2016-5652 - CVE-2016-5875 - CVE-2014-8127 - CVE-2015-8665 - CVE-2015-8683 - CVE-2016-9273 - CVE-2016-9448 Release notes: http://www.simplesystems.org/libtiff/v4.0.7.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/tiff/tiff.hash | 2 +- package/tiff/tiff.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 7ff746f6c9..4439a35f39 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 4d57a50907b510e3049a4bba0d7888930fdfc16ce49f1bf693e5b6247370d68c tiff-4.0.6.tar.gz +sha256 9f43a2cfb9589e5cecaa66e16bf87f814c945f22df7ba600d63aac4632c4f019 tiff-4.0.7.tar.gz diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index a53d7bb3b8..ffb1a425cb 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIFF_VERSION = 4.0.6 +TIFF_VERSION = 4.0.7 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = COPYRIGHT From 8528db817d7466fc9b5d5c2c619b57f184cdaca7 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 21 Nov 2016 00:02:17 +0100 Subject: [PATCH 1441/3392] taskd: add patch for correct gnutls libraries in static build The CMakeLists.txt was using the wrong variables names to add to includes and libs, so the additional libraries for static build weren't added to the link command. Patch sent upstream to taskwarrior-dev@googlegroups.com but it doesn't seem to be very active. Fixes: http://autobuild.buildroot.net/results/d01e947fa807336ffcfd0fad27397af8e7442833 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- ...rrect-variables-for-GnuTLS-detection.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch diff --git a/package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch b/package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch new file mode 100644 index 0000000000..f2365ea298 --- /dev/null +++ b/package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch @@ -0,0 +1,32 @@ +From 88fee5c6eb2271d3de6b9878cd29a0494999aa18 Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" +Date: Sun, 20 Nov 2016 23:46:45 +0100 +Subject: [PATCH] Use correct variables for GnuTLS detection + +At least with recent CMake, it seems the variables created by +find_package (GnuTLS) are called PC_GNUTLS_INCLUDE_DIRS and +PC_GNUTLS_LIBRARIES. + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d8125d9..ccf827b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,8 +110,8 @@ message ("-- Looking for GnuTLS") + find_package (GnuTLS REQUIRED) + if (GNUTLS_FOUND) + set (HAVE_LIBGNUTLS true) +- set (TASKD_INCLUDE_DIRS ${TASKD_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR}) +- set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${GNUTLS_LIBRARIES}) ++ set (TASKD_INCLUDE_DIRS ${TASKD_INCLUDE_DIRS} ${PC_GNUTLS_INCLUDE_DIRS}) ++ set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${PC_GNUTLS_LIBRARIES}) + endif (GNUTLS_FOUND) + + message ("-- Looking for libuuid") +-- +2.10.2 + From fe0607e68beeec7d33693194b76f7fff8e9be2ef Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 23:28:58 +0100 Subject: [PATCH 1442/3392] xapp_xload: fix musl build xapp_xload tries to include protocols/rwhod.h, which isn't available on musl. Fortunately, the package also has stub code that can be enabled with -DRLOADSTUB (this is done e.g. on Cygwin). This should probably be detected in configure, but that's a lot more work. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xload/xapp_xload.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk index 1db0db5717..364d247a95 100644 --- a/package/x11r7/xapp_xload/xapp_xload.mk +++ b/package/x11r7/xapp_xload/xapp_xload.mk @@ -11,4 +11,9 @@ XAPP_XLOAD_LICENSE = MIT XAPP_XLOAD_LICENSE_FILES = COPYING XAPP_XLOAD_DEPENDENCIES = xlib_libXaw +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +# musl doesn't have rwhod.h, but xload can replace it with stubs +XAPP_XLOAD_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -DRLOADSTUB" +endif + $(eval $(autotools-package)) From edc18ac932242771f047f5fc3c09f545e140cd07 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 20 Nov 2016 23:33:59 +0100 Subject: [PATCH 1443/3392] libuv: needs NPTL Fixes: http://autobuild.buildroot.net/results/b81/b81583dea1bdf3777b2f2736c84fef90aa10f30b/ http://autobuild.buildroot.net/results/93f/93f1c4dcaa9a20ec62c547b839cd334ed1b5fbe4/ http://autobuild.buildroot.net/results/030/030ef0a9bd51a2c52d6026e0c1e383a9bdae3c4f/ http://autobuild.buildroot.net/results/fff/fff2098f707d9827ec5e1fd38fe742dd2b695ead/ libuv uses pthread_barrier_* functions, which aren't available with linuxthreads. Notice that libuv contains a local prototype for these functions, so libuv is able to build and the error only triggers when applications try to link against it. Also propagate this dependency to the reverse deps of libuv. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/libuv/Config.in | 6 +++--- package/luv/Config.in | 6 +++--- package/luvi/Config.in | 6 +++--- package/moarvm/Config.in | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/libuv/Config.in b/package/libuv/Config.in index 26cb97eecf..93fbd56557 100644 --- a/package/libuv/Config.in +++ b/package/libuv/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBUV bool "libuv" - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_barrier_* depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS help @@ -9,6 +9,6 @@ config BR2_PACKAGE_LIBUV https://github.com/libuv/libuv -comment "libuv needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "libuv needs a toolchain w/ NPTL, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS depends on BR2_USE_MMU diff --git a/package/luv/Config.in b/package/luv/Config.in index 787d16269b..b085baf546 100644 --- a/package/luv/Config.in +++ b/package/luv/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LUV bool "luv" select BR2_PACKAGE_LIBUV - depends on BR2_TOOLCHAIN_HAS_THREADS # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv help @@ -9,6 +9,6 @@ config BR2_PACKAGE_LUV https://github.com/luvit/luv -comment "luv needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "luv needs a toolchain w/ NPTL, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS depends on BR2_USE_MMU diff --git a/package/luvi/Config.in b/package/luvi/Config.in index 2f01f5c2fa..18317f401e 100644 --- a/package/luvi/Config.in +++ b/package/luvi/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LUVI bool "luvi" - depends on BR2_TOOLCHAIN_HAS_THREADS # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv depends on BR2_PACKAGE_LUAJIT @@ -22,8 +22,8 @@ config BR2_PACKAGE_LUVI https://github.com/luvit/luvi -comment "luvi needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "luvi needs a toolchain w/ NPTL, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS depends on BR2_USE_MMU comment "luvi needs LuaJIT" diff --git a/package/moarvm/Config.in b/package/moarvm/Config.in index 3e0a1045ec..69d9a3e42f 100644 --- a/package/moarvm/Config.in +++ b/package/moarvm/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_MOARVM bool "moarvm" - depends on BR2_TOOLCHAIN_HAS_THREADS # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on !BR2_STATIC_LIBS # libuv depends on BR2_USE_MMU # libuv depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # libatomic_ops @@ -15,8 +15,8 @@ config BR2_PACKAGE_MOARVM http://moarvm.com -comment "moarvm needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS +comment "moarvm needs a toolchain w/ NPTL, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS depends on BR2_USE_MMU depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS depends on !BR2_sparc64 && !BR2_sparc From fb45f199e509d05be4bc696b740f995918fe9eb6 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 17:04:41 +0100 Subject: [PATCH 1444/3392] openblas: disable OpenMP For powerpc (and powerpc only), the openblas build system will enable USE_OPENMP when threads are enabled. But the toolchain wasn't necessarily built with OpenMP support. So explicitly disable OpenMP - for all architectures, not just powerpc, just to keep things simple. We could have autodetected whether OpenMP is available at configure time, but that would be more of a feature patch, it's up to upstream to do that. Fixes: http://autobuild.buildroot.net/results/423b5e79cd4342d6c160ed478054b294b0826c6a http://autobuild.buildroot.net/results/c9e554c8f880b49b3c9203725ac5e6565b7e5c6f Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/openblas/openblas.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 9583e0ea29..a26e10a43c 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -31,6 +31,9 @@ else OPENBLAS_MAKE_OPTS += USE_THREAD=0 endif +# We don't know if OpenMP is available or not, so disable +OPENBLAS_MAKE_OPTS += USE_OPENMP=0 + # Static-only/Shared-only toggle ifeq ($(BR2_STATIC_LIBS),y) OPENBLAS_MAKE_OPTS += NO_SHARED=1 From a227cf11f4bbc4149d3f13e3f5aee59c34b9c49a Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 17:45:26 +0100 Subject: [PATCH 1445/3392] mplayer: disable for FLAT mplayer uses a homegrown configure script that calls 'gcc -v | tail -1' to find the gcc version. However, our toolchain wrapper adds -Wl,-elf2flt to the gcc arguments. This triggers gcc to do an actual compile (rather than just printing version info and exiting), and that compile fails because of the missing definition of main(). The last line of the output is therefore: collect2: error: ld returned 1 exit status and configure doesn't find a version in there. It then falls back to using the host gcc instead, which breaks things completely a bit further down the line. Since mplayer probably isn't very useful on noMMU architectures anyway, just disable it completely for FLAT. Fixes: http://autobuild.buildroot.net/results/58cf28a3acd518633a1d8ea719bc70aefbdfb311 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/mplayer/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in index 76bb6f077c..8474b0ec48 100644 --- a/package/mplayer/Config.in +++ b/package/mplayer/Config.in @@ -6,6 +6,9 @@ config BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS || BR2_m68k || BR2_microblaze || BR2_nios2) # Broken support for Date: Mon, 21 Nov 2016 19:32:18 +0100 Subject: [PATCH 1446/3392] ptpd2: fix bfin compile by avoiding gcc bug Fixes: http://autobuild.buildroot.net/results/cb967c8af006caa9272e800968f794ca018a7a27 http://autobuild.buildroot.net/results/9a046dc5ef390e562b89338f0afeaef14b945458 Signed-off-by: Waldemar Brodkorb [Thomas: also pass TARGET_CFLAGS.] Signed-off-by: Thomas Petazzoni --- package/ptpd2/ptpd2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/ptpd2/ptpd2.mk b/package/ptpd2/ptpd2.mk index da6a10684b..d53b13534c 100644 --- a/package/ptpd2/ptpd2.mk +++ b/package/ptpd2/ptpd2.mk @@ -24,6 +24,12 @@ else PTPD2_CONF_OPTS += --disable-snmp endif +# GCC bug with Os/O1/O2/O3 +# internal compiler error: in gen_add2_insn, at optabs.c:4454 +ifeq ($(BR2_bfin),y) +PTPD2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0" +endif + define PTPD2_INSTALL_INIT_SYSV $(INSTALL) -m 755 -D package/ptpd2/S65ptpd2 \ $(TARGET_DIR)/etc/init.d/S65ptpd2 From 48341ce1cb827df0862b5545900ed6b50ea6f03a Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 15:54:34 +0100 Subject: [PATCH 1447/3392] mpv: needs atomics or 8-byte sync The wscript checks the following. 'func': check_libs(['atomic'], check_statement('stdint.h', 'int64_t test = 0;' 'test = __atomic_add_fetch(&test, 1, __ATOMIC_SEQ_CST)')), and 'func': check_statement('stdint.h', 'int64_t test = 0;' '__typeof__(test) x = ({int a = 1; a;});' 'test = __sync_add_and_fetch(&test, 1)'), It fails if neither of these are available. Fixes http://autobuild.buildroot.net/results/8c20f719f784af1312294600e39004c1d382368a Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/mpv/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 25288a43d4..2719981467 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MPV depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE @@ -17,5 +18,6 @@ config BR2_PACKAGE_MPV comment "mpv needs a toolchain w/ threads, gcc >= 4.5" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 From cbc2fd07b0089e49ecad851bd2ac38f177111d8a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 20 Nov 2016 16:03:00 -0200 Subject: [PATCH 1448/3392] configs/imx28evk: Bump to kernel 4.8.8 Kernel 4.8.8 brings commit 235bde1ed3f0ff ("net: fec: Call swap_buffer() prior to IP header alignment"), which makes Ethernet functional again on mx28. Bump to this version. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/freescale_imx28evk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/freescale_imx28evk_defconfig b/configs/freescale_imx28evk_defconfig index 790c338251..9c870cfcf5 100644 --- a/configs/freescale_imx28evk_defconfig +++ b/configs/freescale_imx28evk_defconfig @@ -11,7 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.8" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" From 99b3e821339aeac59c45ddb3c482f4ec3e09ecf6 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 23:13:26 +0100 Subject: [PATCH 1449/3392] qextserialport: define QEXTSERIALPORT_CONFIGURE_CMDS only once Distinguish qt/qt5 by defining QEXTSERIALPORT_QMAKE, like is done e.g. for quazip. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/qextserialport/qextserialport.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk index 39e04075b7..11b1cc89c7 100644 --- a/package/qextserialport/qextserialport.mk +++ b/package/qextserialport/qextserialport.mk @@ -12,15 +12,15 @@ QEXTSERIALPORT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT),y) QEXTSERIALPORT_DEPENDENCIES += qt -define QEXTSERIALPORT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE)) -endef +QEXTSERIALPORT_QMAKE = $(QT_QMAKE) else ifeq ($(BR2_PACKAGE_QT5),y) QEXTSERIALPORT_DEPENDENCIES += qt5base +QEXTSERIALPORT_QMAKE = $(QT5_QMAKE) +endif + define QEXTSERIALPORT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE)) + (cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE)) endef -endif define QEXTSERIALPORT_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) From 18af7b57870169581c5b38df94260dc1d40f7610 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 23:13:27 +0100 Subject: [PATCH 1450/3392] qextserialport: remove useless () around configure command Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/qextserialport/qextserialport.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk index 11b1cc89c7..f48f596898 100644 --- a/package/qextserialport/qextserialport.mk +++ b/package/qextserialport/qextserialport.mk @@ -19,7 +19,7 @@ QEXTSERIALPORT_QMAKE = $(QT5_QMAKE) endif define QEXTSERIALPORT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE)) + cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE) endef define QEXTSERIALPORT_BUILD_CMDS From 8ad8e9917fd1ea37a4866ef00ce42fd029a72bae Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 23:13:28 +0100 Subject: [PATCH 1451/3392] qextserialport: use 'make install' to install to staging qmake hardcodes the path to the sysroot in the install commands, so we can't use it for target. But it's perfectly usable for staging. By using 'make install', we get: - the extserialport.prf file is installed to the mkspecs directory and libqextserialport.prl in staging/usr/lib, so qmake can do its magic and add the necessary compiler options; - it also works for static build, when *.so files don't exist. The QExtSerialPort and qextserialport.pc files are created by Buildroot so they still have to be installed explicitly. Note that upstream installs in the QtExtSerialPort directory, not QExtSerialPort, so we follow that decision. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas Petazzoni [Thomas: also adjust 0003-pkgconfig.patch to fix the header path.] Signed-off-by: Thomas Petazzoni --- package/qextserialport/0002-main-include.patch | 2 +- package/qextserialport/0003-pkgconfig.patch | 2 +- package/qextserialport/qextserialport.mk | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/qextserialport/0002-main-include.patch b/package/qextserialport/0002-main-include.patch index 858f3354d5..27f67f65ae 100644 --- a/package/qextserialport/0002-main-include.patch +++ b/package/qextserialport/0002-main-include.patch @@ -1,7 +1,7 @@ Create a main include file QExtSerialPort This main include file will be installed in - so that Qt applications can use this + so that Qt applications can use this library by including header files in a Qt-like style. Signed-off-by: Thomas Petazzoni diff --git a/package/qextserialport/0003-pkgconfig.patch b/package/qextserialport/0003-pkgconfig.patch index d67f3fcbb3..bb55ad782e 100644 --- a/package/qextserialport/0003-pkgconfig.patch +++ b/package/qextserialport/0003-pkgconfig.patch @@ -10,7 +10,7 @@ Index: qextserialport-ef4af2a2ee3f/qextserialport.pc +prefix=/usr +exec_prefix=${prefix} +libdir=${prefix}/lib -+includedir=${prefix}/include/QExtSerialPort ++includedir=${prefix}/include/QtExtSerialPort + +Name: QtExtSerialPort +Description: QtExtSerialPort library diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk index f48f596898..15cb74cbd4 100644 --- a/package/qextserialport/qextserialport.mk +++ b/package/qextserialport/qextserialport.mk @@ -27,10 +27,8 @@ define QEXTSERIALPORT_BUILD_CMDS endef define QEXTSERIALPORT_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/include/QExtSerialPort - cp $(@D)/src/*.h $(STAGING_DIR)/usr/include/QExtSerialPort/ - cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QExtSerialPort/ - cp -a $(@D)/*.so* $(STAGING_DIR)/usr/lib/ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install + cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QtExtSerialPort/ cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/ endef From f09b33a0abe964a137041f52afb111d351c9e5ff Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 20 Nov 2016 23:13:29 +0100 Subject: [PATCH 1452/3392] qextserialport: fix static build By default, qextserialport will attempt to build a shared library. qesp_static has to be set in CONFIG to build static. Note that static+shared is not supported, in that case we just build shared. The install target commands also have to be gated in that case, because the *.so files don't exist. For completeness we both set QEXTSERIALPORT_INSTALL_STAGING to NO and don't define QEXTSERIALPORT_INSTALL_TARGET_CMDS for static builds, although one of them would be sufficient. Fixes: http://autobuild.buildroot.net/results/c9233ad71fd60d0e6a85731a8bd4e598bd84947a Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/qextserialport/qextserialport.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk index 15cb74cbd4..3641353a3f 100644 --- a/package/qextserialport/qextserialport.mk +++ b/package/qextserialport/qextserialport.mk @@ -10,6 +10,10 @@ QEXTSERIALPORT_LICENSE = MIT QEXTSERIALPORT_LICENSE_FILES = LICENSE.md QEXTSERIALPORT_INSTALL_STAGING = YES +ifeq ($(BR2_STATIC_LIBS),y) +QEXTSERIALPORT_CONF_OPTS += CONFIG+=qesp_static +endif + ifeq ($(BR2_PACKAGE_QT),y) QEXTSERIALPORT_DEPENDENCIES += qt QEXTSERIALPORT_QMAKE = $(QT_QMAKE) @@ -19,7 +23,7 @@ QEXTSERIALPORT_QMAKE = $(QT5_QMAKE) endif define QEXTSERIALPORT_CONFIGURE_CMDS - cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE) + cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE) $(QEXTSERIALPORT_CONF_OPTS) endef define QEXTSERIALPORT_BUILD_CMDS @@ -32,8 +36,12 @@ define QEXTSERIALPORT_INSTALL_STAGING_CMDS cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/ endef +ifeq ($(BR2_STATIC_LIBS),y) +QEXTSERIALPORT_INSTALL_STAGING = NO +else define QEXTSERIALPORT_INSTALL_TARGET_CMDS cp -a $(@D)/*.so.* $(TARGET_DIR)/usr/lib endef +endif $(eval $(generic-package)) From be4b3575d5ac5cf89ddb1c709ff6a8128ff4131c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 17:08:57 +0000 Subject: [PATCH 1453/3392] gstreamer1/gstreamer1: bump version to 1.10.1 Release notes: https://gstreamer.freedesktop.org/releases/gstreamer/1.10.1.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 8bd7782a5d..40677da20a 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.0.tar.xz.sha256sum -sha256 1e7778fabe480185bfc4ce552f0860de1443f6618a68a86ccdd65854fed37207 gstreamer-1.10.0.tar.xz +# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.1.tar.xz.sha256sum +sha256 f68df996e0e699382b935bb4783dd402c301377df18f57e28e0318c4b3bff6da gstreamer-1.10.1.tar.xz diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index cb111f2f4c..794abc4b30 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.10.0 +GSTREAMER1_VERSION = 1.10.1 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From 2e3a4d553a5f712af811295a507682b576b4ca81 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 17:08:58 +0000 Subject: [PATCH 1454/3392] gstreamer1/gst1-plugins-base: bump version to 1.10.1 Release notes: https://gstreamer.freedesktop.org/releases/gst-plugins-base/1.10.1.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index f4a43ca284..70aad4d3f4 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.0.tar.xz.sha256sum -sha256 bfcdef97dfc69a0bbdb4403c47aae4e53def176bf0b781c5d818550536cfe94a gst-plugins-base-1.10.0.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.1.tar.xz.sha256sum +sha256 66cfee294c7aaf9d7867eaba4841ca6254ea74f1a8b53e1289f4d3b9b6c976c9 gst-plugins-base-1.10.1.tar.xz diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index c5686b3eff..c89c22d039 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.10.0 +GST1_PLUGINS_BASE_VERSION = 1.10.1 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From f4e85aa02346cc2f14a7e798a6073257e463e8d3 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 17:08:59 +0000 Subject: [PATCH 1455/3392] gstreamer1/gst1-plugins-good: bump version to 1.10.1 Release notes: https://gstreamer.freedesktop.org/releases/gst-plugins-good/1.10.1.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index a00db6cc43..9977e2fc30 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.0.tar.xz.sha256sum -sha256 7a03559763f5634ab1b4b2edd3e9f7442bdd4657187e20ea5e1887ae46371de2 gst-plugins-good-1.10.0.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.1.tar.xz.sha256sum +sha256 a7642ea7e7c17fb67e94d0c17e56757b6577fa7ed244ff8c11031841d3556cc2 gst-plugins-good-1.10.1.tar.xz diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index ca3bfaa15e..9da0c217a7 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.10.0 +GST1_PLUGINS_GOOD_VERSION = 1.10.1 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From ad20c2c7ba10dc632c713761883df19c5430e121 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 17:09:00 +0000 Subject: [PATCH 1456/3392] gstreamer1/gst1-plugins-ugly: bump version to 1.10.1 Release notes: https://gstreamer.freedesktop.org/releases/gst-plugins-ugly/1.10.1.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 57845256bc..fd6fe7c3c6 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.0.tar.xz.sha256sum -sha256 97de8d1903abb54305732e6b8781c8c42f5cc5a2a548a8f31b38c189e81a55e0 gst-plugins-ugly-1.10.0.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.1.tar.xz.sha256sum +sha256 a5ecd59fc2091eeb52368de81cc6a91c1a1c19dc5bdde85ce90e1eed5d4183c2 gst-plugins-ugly-1.10.1.tar.xz diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 40234a1afe..55b8e92072 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.10.0 +GST1_PLUGINS_UGLY_VERSION = 1.10.1 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From d6f5fe3b79d40b583dbb43d3dbaa5e3790a00e18 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 17:09:02 +0000 Subject: [PATCH 1457/3392] gstreamer1/gst1-libav: bump version to 1.10.1 Release notes: https://gstreamer.freedesktop.org/releases/gst-libav/1.10.1.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 329d1d6aa1..1bb714f15a 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.0.tar.xz.sha256sum -sha256 af98204411c78abb98233c1858f2886be6401304d24be218752bbbcede9bd85b gst-libav-1.10.0.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.1.tar.xz.sha256sum +sha256 27b28b8de0e6dff1e3952428e8ed8ba4a12f452f789ac0ae9bbe50f00a5c72c7 gst-libav-1.10.1.tar.xz diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 718ebdb318..eec630310f 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.10.0 +GST1_LIBAV_VERSION = 1.10.1 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_CONF_OPTS = --with-system-libav From 92daf66b7b52df5b4f9ca33c3132a3a2fbebc4b0 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 17:09:03 +0000 Subject: [PATCH 1458/3392] gstreamer1/gst1-rtsp-server: bump version to 1.10.1 Release notes: https://gstreamer.freedesktop.org/releases/gst-rtsp-server/1.10.1.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 597f0b20d6..b2e789d889 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,2 +1,2 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.0.tar.xz.sha256sum -sha256 aa72a94cccdd2387ad25dc65c5c0b1f76269c3997cbde348232eec2a1565b3cd gst-rtsp-server-1.10.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.1.tar.xz.sha256sum +sha256 ddc0c2699598623c2d19d3a2856fb73365496a949783537b238f44bc51e5b005 gst-rtsp-server-1.10.1.tar.xz diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 4ff44c9e2a..b5854e174d 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.10.0 +GST1_RTSP_SERVER_VERSION = 1.10.1 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPLv2+ From 4e8937b7ca484426daab3864a7e5489f3a3a77be Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 17:09:04 +0000 Subject: [PATCH 1459/3392] gstreamer1/gst1-validate: bump version to 1.10.1 Release notes: https://gstreamer.freedesktop.org/releases/gst-validate/1.10.1.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-validate/gst1-validate.hash | 4 ++-- package/gstreamer1/gst1-validate/gst1-validate.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-validate/gst1-validate.hash b/package/gstreamer1/gst1-validate/gst1-validate.hash index f08e1b71a6..adfb2fa45c 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.hash +++ b/package/gstreamer1/gst1-validate/gst1-validate.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.0.tar.xz.sha256sum -sha256 a99a5cd1dfa5d021dd0197b32b04a20348479c097ebeb1f4c36161d70048a176 gst-validate-1.10.0.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.1.tar.xz.sha256sum +sha256 07ae671a3e77c5480d2c1732175dd3b3255b6937ac55d4b3e69a90f8e3043f75 gst-validate-1.10.1.tar.xz diff --git a/package/gstreamer1/gst1-validate/gst1-validate.mk b/package/gstreamer1/gst1-validate/gst1-validate.mk index 94595a6ce4..cb857d03fb 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.mk +++ b/package/gstreamer1/gst1-validate/gst1-validate.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VALIDATE_VERSION = 1.10.0 +GST1_VALIDATE_VERSION = 1.10.1 GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate GST1_VALIDATE_LICENSE = LGPLv2.1+ From 98e254b46c2dc31990cd89b7e132b0991db9bc7f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 17:09:05 +0000 Subject: [PATCH 1460/3392] gstreamer1/gst1-omx: bump version to 1.10.1 Release notes: https://gstreamer.freedesktop.org/releases/gst-omx/1.10.1.html Also fixed hash URL. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 653c93c589..bf10f0a1a2 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,2 +1,2 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/ -sha256 89f7da36abcf278200f561fa9d8d7042ad1459aa211cdc81c4c1a3d2162e9e7f gst-omx-1.10.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.1.tar.xz.sha256sum +sha256 1b07b9ceb4552c0911af1e3b97987e3314c601eacfbc09f1cca8632e98581231 gst-omx-1.10.1.tar.xz diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f0b39c9f9d..c9343174f7 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.10.0 +GST_OMX_VERSION = 1.10.1 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From a01c4cda3e738d19898244bf09fcb317dada32d1 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 15:55:08 +0000 Subject: [PATCH 1461/3392] wireshark: bump version to 2.2.2 (security) Release notes: https://www.wireshark.org/docs/relnotes/wireshark-2.2.2.html Security fixes: wnpa-sec-2016-62. DTN infinite loop. wnpa-sec-2016-61. DCERPC crash. wnpa-sec-2016-60. OpenFlow crash. wnpa-sec-2016-59. AllJoyn crash. wnpa-sec-2016-58. Profinet I/O long loop. For more details: https://www.wireshark.org/security/ Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 21c003ffc2..c90f5bbe0c 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,2 +1,2 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.1.txt -sha256 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 wireshark-2.2.1.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.2.txt +sha256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 wireshark-2.2.2.tar.bz2 diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 227ead6a92..6a40b8e640 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.1 +WIRESHARK_VERSION = 2.2.2 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 9f11224615d51c8fa366a3e51ac107e1263b14b8 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 16:32:29 +0000 Subject: [PATCH 1462/3392] ser2net: bump version to 3.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/ser2net/ser2net.hash | 2 +- package/ser2net/ser2net.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ser2net/ser2net.hash b/package/ser2net/ser2net.hash index 3e62f1c3f2..1b9364329f 100644 --- a/package/ser2net/ser2net.hash +++ b/package/ser2net/ser2net.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 e8aaf6c629c78bbc424e8a6810758061f9c68a4ffea0faf7c5031de26ce1c3e1 ser2net-3.0.tar.gz +sha256 e91cf85ab2c1769e17be7726b133f8f3ad197e9d4b445bb0b0d2f3f97f88a083 ser2net-3.2.tar.gz diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk index 01aee95d6d..8090c067bb 100644 --- a/package/ser2net/ser2net.mk +++ b/package/ser2net/ser2net.mk @@ -4,7 +4,7 @@ # ################################################################################ -SER2NET_VERSION = 3.0 +SER2NET_VERSION = 3.2 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPLv2+ SER2NET_LICENSE_FILES = COPYING From 291388e5455d94363221a48b16feeeb76217506c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 16:42:32 +0000 Subject: [PATCH 1463/3392] libgtk2: bump version to 2.24.31 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libgtk2/libgtk2.hash | 4 ++-- package/libgtk2/libgtk2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk2/libgtk2.hash b/package/libgtk2/libgtk2.hash index 175702f751..3388c5cda2 100644 --- a/package/libgtk2/libgtk2.hash +++ b/package/libgtk2/libgtk2.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.30.sha256sum -sha256 0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50 gtk+-2.24.30.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.31.sha256sum +sha256 68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658 gtk+-2.24.31.tar.xz diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 94fa97f204..cf8b2f4eee 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK2_VERSION_MAJOR = 2.24 -LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).30 +LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).31 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) LIBGTK2_INSTALL_STAGING = YES From db5bcab79b3460b80163c98bb92b3c6fd08706f7 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 15:41:58 +0000 Subject: [PATCH 1464/3392] btrfs-progs: bump version to 4.8.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index de9c56b930..83a96246fb 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 81c023f519c8565b23eddb90e6d0eec2be63ee52e440708e418539dbaa635c5f btrfs-progs-v4.8.2.tar.xz +sha256 c1a60c317d2fcaf8420779d2d0717ae53882c2bc22bc44e3bdcd5efb7ca68ef2 btrfs-progs-v4.8.3.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 2dd9246352..e2deb57700 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.8.2 +BTRFS_PROGS_VERSION = 4.8.3 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib From a6978c38d56611c3098530c48f4cbd212733b416 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 18 Nov 2016 07:03:48 +0100 Subject: [PATCH 1465/3392] uclibc-ng-test: new package The next release of uClibc-ng (1.0.20) will remove the test suite. Add a separate package before the next release. Signed-off-by: Waldemar Brodkorb [Thomas: rewrap Config.in help text.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/uclibc-ng-test/Config.in | 22 ++++++++++++ package/uclibc-ng-test/uclibc-ng-test.mk | 45 ++++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 package/uclibc-ng-test/Config.in create mode 100644 package/uclibc-ng-test/uclibc-ng-test.mk diff --git a/package/Config.in b/package/Config.in index 7c91215d69..b2e1a2a41b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -114,6 +114,7 @@ menu "Debugging, profiling and benchmark" source "package/tinymembench/Config.in" source "package/trace-cmd/Config.in" source "package/trinity/Config.in" + source "package/uclibc-ng-test/Config.in" source "package/valgrind/Config.in" source "package/whetstone/Config.in" endmenu diff --git a/package/uclibc-ng-test/Config.in b/package/uclibc-ng-test/Config.in new file mode 100644 index 0000000000..0f093d1d50 --- /dev/null +++ b/package/uclibc-ng-test/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_UCLIBC_NG_TEST + bool "uclibc-ng-test" + help + Enabling this option will compile and install the uClibc-ng + test suite. This is useful if you want to check if the + uClibc-ng library is working for your architecture and/or + help developing uClibc-ng. + + The test suite will be installed into + /usr/lib/uclibc-ng-test directory. To run the test suite + enter the /usr/lib/uclibc-ng-test/test directory and type + "sh uclibcng-testrunner.sh". + + See the /usr/lib/uclibc-ng-test/test/README for additional + information. + + This is not needed at all for normal builds, so you can + safely say no if you do not plan to dig into your C library. + + The tests can also be used for GNU libc or musl. + + http://www.uclibc-ng.org diff --git a/package/uclibc-ng-test/uclibc-ng-test.mk b/package/uclibc-ng-test/uclibc-ng-test.mk new file mode 100644 index 0000000000..f6700a91ea --- /dev/null +++ b/package/uclibc-ng-test/uclibc-ng-test.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# uclibc-ng-test +# +################################################################################ + +UCLIBC_NG_TEST_VERSION = 4ad1c23ae2eb30888cda520c739cc26150512487 +UCLIBC_NG_TEST_SITE = git://uclibc-ng.org/git/uclibc-ng-test +UCLIBC_NG_TEST_LICENSE = LGPLv2.1+ +UCLIBC_NG_TEST_LICENSE_FILES = COPYING.LIB + +ifeq ($(BR2_USE_WCHAR),) +UCLIBC_NG_TEST_MAKE_ENV += NO_WCHAR=1 +endif +ifeq ($(BR2_ENABLE_LOCALE),) +UCLIBC_NG_TEST_MAKE_ENV += NO_LOCALE=1 +endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 NO_THREADS=1 +endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) +UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 NO_NPTL=1 +endif +# most NPTL/TLS tests use dlopen +ifeq ($(BR2_STATIC_LIBS),y) +UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 NO_NPTL=1 NO_DL=1 +endif + +# to execute tests in a deterministic order, call test_gen separately +define UCLIBC_NG_TEST_BUILD_CMDS + $(TARGET_MAKE_ENV) $(UCLIBC_NG_TEST_MAKE_ENV) $(MAKE) -C $(@D) \ + CC="$(TARGET_CC)" \ + UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + test_compile + $(TARGET_MAKE_ENV) $(UCLIBC_NG_TEST_MAKE_ENV) $(MAKE1) -C $(@D) \ + CC="$(TARGET_CC)" \ + UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + test_gen +endef + +define UCLIBC_NG_TEST_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install +endef + +$(eval $(generic-package)) From 47329fb4cff4f482d7b9a03a54cbd314e817bf32 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Wed, 16 Nov 2016 15:26:01 -0800 Subject: [PATCH 1466/3392] package/e2fsprogs: disable use of magic.h RHEL 5.x does have magic.h, but it does not define all expected symbols. In particular, the NO_CHECK symbols were only added in file 4.20 and RHEL 5.x is using 4.17. Don't use magic.h and libmagic when building host package. Suggested-by: Thomas Petazzoni Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni --- package/e2fsprogs/e2fsprogs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 022ba5283a..b6e79d246b 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -51,6 +51,12 @@ endif # for util/subst.c to build properly. E2FSPROGS_CONF_ENV += BUILD_CFLAGS="-DHAVE_SYS_STAT_H" +# Disable use of the host magic.h, as on older hosts (e.g. RHEL 5) +# it doesn't provide definitions expected by e2fsprogs support lib. +HOST_E2FSPROGS_CONF_ENV += \ + ac_cv_header_magic_h=no \ + ac_cv_lib_magic_magic_file=no + ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) # util-linux libuuid pulls in libintl if needed, so ensure we also # link against it, otherwise static linking fails From 82f7217b334cc5e86ed81b62c3c184a44c813405 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Tue, 22 Nov 2016 10:18:21 +0100 Subject: [PATCH 1467/3392] gnuradio: gr-fec: add missing dependency to gsl gr-fec needs gsl. Without this dependency cmake search gsl in the host system. This issue produce errors like : arm-buildroot-linux-uclibcgnueabihf-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include' make[3]: *** [gr-fec/lib/CMakeFiles/gnuradio-fec.dir/reed-solomon/encode_rs.c.o] Error 1 Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/gnuradio/Config.in | 1 + package/gnuradio/gnuradio.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 50f5e7fa19..8301afe8f2 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -49,6 +49,7 @@ config BR2_PACKAGE_GNURADIO_CTRLPORT config BR2_PACKAGE_GNURADIO_FEC bool "gr-fec support" select BR2_PACKAGE_GNURADIO_BLOCKS + select BR2_PACKAGE_GSL help FEC signal processing blocks diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 5cb00d2416..f1817f61c2 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -89,6 +89,7 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_FEC),y) +GNURADIO_DEPENDENCIES += gsl GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=ON else GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=OFF From f56bb924aed8eb3f52ce017dd6185b07754737ab Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 17 Nov 2016 09:47:31 +0200 Subject: [PATCH 1468/3392] audit: add an explanation of musl disable Based on commit c17af71d2c2 (package/audit: not available for musl) add a comment that explains why audit is disabled for musl. Cc: Yann E. MORIN Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/audit/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/audit/Config.in b/package/audit/Config.in index 7550f3a6cd..023ac79d30 100644 --- a/package/audit/Config.in +++ b/package/audit/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_AUDIT depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_USES_MUSL # strndupa() help The audit package contains the user space utilities for storing and searching the audit records generated by From ee5d4b72b9ea0f5f446acd579cfa2f0cb1311378 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 17 Nov 2016 10:18:29 +0200 Subject: [PATCH 1469/3392] canfestival: comment on musl disable Based on commit 4d00a4058b9e5 (can-festival: disable on musl) and a previous fix attempt[1], add a comment explaining why build with musl is disabled. [1] http://patchwork.ozlabs.org/patch/509731/ Cc: Arnout Vandecappelle Cc: "Yann E. MORIN" Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/canfestival/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/canfestival/Config.in b/package/canfestival/Config.in index 5522afe54f..ca949565f5 100644 --- a/package/canfestival/Config.in +++ b/package/canfestival/Config.in @@ -11,7 +11,7 @@ comment "canfestival needs a glibc or uClibc toolchain w/ threads and dynamic li config BR2_PACKAGE_CANFESTIVAL bool "canfestival" depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_USES_MUSL # sigval_t depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS help From 79573562fd5e9c455ebd9061b2370e886ee2da29 Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Thu, 17 Nov 2016 15:42:50 +1100 Subject: [PATCH 1470/3392] package/qemu: enable for powerpc64 and powerpc64le Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index ea6b94605c..e935ef9c61 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET bool # Only tested on these architectures default y if BR2_aarch64 || BR2_i386 || BR2_mips || BR2_mipsel \ - || BR2_x86_64 || BR2_arm + || BR2_x86_64 || BR2_arm \ + || BR2_powerpc64 || BR2_powerpc64le comment "QEMU requires a toolchain with wchar, threads" depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET From 8055a2ab6a4c84d275dce78264626115f1de318c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 17 Nov 2016 17:09:01 +0000 Subject: [PATCH 1471/3392] gstreamer1/gst1-plugins-bad: bump version to 1.10.1 Release notes: https://gstreamer.freedesktop.org/releases/gst-plugins-bad/1.10.1.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 34f3dc2af9..3b14e291fb 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.0.tar.xz.sha256sum -sha256 3d5f9d16e1a3ee7c5c024494cc3a3420007bfdce6f94511317ae004972811c4f gst-plugins-bad-1.10.0.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.1.tar.xz.sha256sum +sha256 133e0ed9fe21011b15d3898e3d3a9d17ab74eed31996da2e353353e688ca921d gst-plugins-bad-1.10.1.tar.xz diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 098cf2b5da..317248996d 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.10.0 +GST1_PLUGINS_BAD_VERSION = 1.10.1 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From 6d98b57527ba3393511c97ad42164d647ad543ed Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 7 Nov 2016 02:19:57 +0100 Subject: [PATCH 1472/3392] toolchain-external: reorder the contents of toolchain-external.mk When the toolchain-external logic will be split into separate packages, the order in which things are defined in toolchain-external.mk no makes less sense. So reorder things in a more logical fashion. Also add a few more comments to the different sections. No functional changes at all. The output of 'make -qp' hasn't changed, except for the order of arguments in TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour [Arnout: split off into separate patch, slightly change some comments, reordered some parts] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external/toolchain-external.mk | 882 +++++++++--------- 1 file changed, 460 insertions(+), 422 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index b7a36bea12..180a63da58 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -63,79 +63,9 @@ # $(HOST_DIR)/usr/bin like for the internal toolchains, and the rest # of Buildroot is handled identical for the 2 toolchain types. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) -TOOLCHAIN_EXTERNAL_LIBS += libatomic.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.* -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy) -TOOLCHAIN_EXTERNAL_LIBS += ld-linux-armhf.so.* -else -TOOLCHAIN_EXTERNAL_LIBS += ld*.so.* -endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -TOOLCHAIN_EXTERNAL_LIBS += libpthread.so.* -ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),) -TOOLCHAIN_EXTERNAL_LIBS += libthread_db.so.* -endif # gdbserver -endif # ! no threads -endif - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y) -TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* -endif - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) -TOOLCHAIN_EXTERNAL_LIBS += libc.so libgcc_s.so.* -endif - -ifeq ($(BR2_INSTALL_LIBSTDCPP),y) -TOOLCHAIN_EXTERNAL_LIBS += libstdc++.so.* -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) -TOOLCHAIN_EXTERNAL_LIBS += libgfortran.so.* -# fortran needs quadmath on x86 and x86_64 -ifeq ($(BR2_TOOLCHAIN_HAS_LIBQUADMATH),y) -TOOLCHAIN_EXTERNAL_LIBS += libquadmath.so* -endif -endif - -TOOLCHAIN_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS)) - -# Details about sysroot directory selection. -# -# To find the sysroot directory, we use the trick of looking for the -# 'libc.a' file with the -print-file-name gcc option, and then -# mangling the path to find the base directory of the sysroot. -# -# Note that we do not use the -print-sysroot option, because it is -# only available since gcc 4.4.x, and we only recently dropped support -# for 4.2.x and 4.3.x. -# -# When doing this, we don't pass any option to gcc that could select a -# multilib variant (such as -march) as we want the "main" sysroot, -# which contains all variants of the C library in the case of multilib -# toolchains. We use the TARGET_CC_NO_SYSROOT variable, which is the -# path of the cross-compiler, without the --sysroot=$(STAGING_DIR), -# since what we want to find is the location of the original toolchain -# sysroot. This "main" sysroot directory is stored in SYSROOT_DIR. -# -# Then, multilib toolchains are a little bit more complicated, since -# they in fact have multiple sysroots, one for each variant supported -# by the toolchain. So we need to find the particular sysroot we're -# interested in. # -# To do so, we ask the compiler where its sysroot is by passing all -# flags (including -march and al.), except the --sysroot flag since we -# want to the compiler to tell us where its original sysroot -# is. ARCH_SUBDIR will contain the subdirectory, in the main -# SYSROOT_DIR, that corresponds to the selected architecture -# variant. ARCH_SYSROOT_DIR will contain the full path to this -# location. +# Definitions of where the toolchain can be found # -# One might wonder why we don't just bother with ARCH_SYSROOT_DIR. The -# fact is that in multilib toolchains, the header files are often only -# present in the main sysroot, and only the libraries are available in -# each variant-specific sysroot directory. - TOOLCHAIN_EXTERNAL_PREFIX = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR = $(HOST_DIR)/opt/ext-toolchain @@ -164,8 +94,6 @@ endif # $(wildcard ...) here. TOOLCHAIN_EXTERNAL_SUFFIX = \ $(if $(wildcard $(TOOLCHAIN_EXTERNAL_BIN)/*.br_real),.br_real) -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ - -DBR_CROSS_PATH_SUFFIX='"$(TOOLCHAIN_EXTERNAL_SUFFIX)"' TOOLCHAIN_EXTERNAL_CROSS = $(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)- TOOLCHAIN_EXTERNAL_CC = $(TOOLCHAIN_EXTERNAL_CROSS)gcc$(TOOLCHAIN_EXTERNAL_SUFFIX) @@ -173,16 +101,52 @@ TOOLCHAIN_EXTERNAL_CXX = $(TOOLCHAIN_EXTERNAL_CROSS)g++$(TOOLCHAIN_EXTERNAL_SUFF TOOLCHAIN_EXTERNAL_FC = $(TOOLCHAIN_EXTERNAL_CROSS)gfortran$(TOOLCHAIN_EXTERNAL_SUFFIX) TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf$(TOOLCHAIN_EXTERNAL_SUFFIX) -ifeq ($(filter $(HOST_DIR)/%,$(TOOLCHAIN_EXTERNAL_BIN)),) -# TOOLCHAIN_EXTERNAL_BIN points outside HOST_DIR => absolute path -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ - -DBR_CROSS_PATH_ABS='"$(TOOLCHAIN_EXTERNAL_BIN)"' + +# +# Definitions of the list of libraries that should be copied to the target. +# +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) +TOOLCHAIN_EXTERNAL_LIBS += libatomic.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.* +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy) +TOOLCHAIN_EXTERNAL_LIBS += ld-linux-armhf.so.* else -# TOOLCHAIN_EXTERNAL_BIN points inside HOST_DIR => relative path -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ - -DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"' +TOOLCHAIN_EXTERNAL_LIBS += ld*.so.* +endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +TOOLCHAIN_EXTERNAL_LIBS += libpthread.so.* +ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),) +TOOLCHAIN_EXTERNAL_LIBS += libthread_db.so.* +endif # gdbserver +endif # ! no threads +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y) +TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) +TOOLCHAIN_EXTERNAL_LIBS += libc.so libgcc_s.so.* +endif + +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +TOOLCHAIN_EXTERNAL_LIBS += libstdc++.so.* +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) +TOOLCHAIN_EXTERNAL_LIBS += libgfortran.so.* +# fortran needs quadmath on x86 and x86_64 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBQUADMATH),y) +TOOLCHAIN_EXTERNAL_LIBS += libquadmath.so* endif +endif + +TOOLCHAIN_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS)) + +# +# Definition of the CFLAGS to use with the external toolchain, as well as the +# common toolchain wrapper build arguments +# ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),) CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU)) else @@ -248,58 +212,420 @@ TOOLCHAIN_EXTERNAL_CFLAGS += -msoft-float TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_SOFTFLOAT=1 endif -# musl does not provide an implementation for sys/queue.h or sys/cdefs.h. -# So, add the musl-compat-headers package that will install those files, -# into the staging directory: -# sys/queue.h: header from NetBSD -# sys/cdefs.h: minimalist header bundled in Buildroot -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -TOOLCHAIN_EXTERNAL_DEPENDENCIES += musl-compat-headers +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ + -DBR_CROSS_PATH_SUFFIX='"$(TOOLCHAIN_EXTERNAL_SUFFIX)"' + +ifeq ($(filter $(HOST_DIR)/%,$(TOOLCHAIN_EXTERNAL_BIN)),) +# TOOLCHAIN_EXTERNAL_BIN points outside HOST_DIR => absolute path +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ + -DBR_CROSS_PATH_ABS='"$(TOOLCHAIN_EXTERNAL_BIN)"' +else +# TOOLCHAIN_EXTERNAL_BIN points inside HOST_DIR => relative path +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ + -DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"' endif -# The Codescape toolchain uses a sysroot layout that places them -# side-by-side instead of nested like multilibs. A symlink is needed -# much like for the nested sysroots which are handled in -# copy_toolchain_sysroot but there is not enough information in there -# to determine whether the sysroot layout was nested or side-by-side. -# Add the symlink here for now. -define TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_SYMLINK - $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ - ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ - ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} + +# +# The following functions creates the symbolic links needed to get the +# cross-compilation tools visible in $(HOST_DIR)/usr/bin. Some of +# links are done directly to the corresponding tool in the external +# toolchain installation directory, while some other links are done to +# the toolchain wrapper (preprocessor, C, C++ and Fortran compiler) +# +# We skip gdb symlink when we are building our own gdb to prevent two +# gdb's in $(HOST_DIR)/usr/bin. +# +# The LTO support in gcc creates wrappers for ar, ranlib and nm which load +# the lto plugin. These wrappers are called *-gcc-ar, *-gcc-ranlib, and +# *-gcc-nm and should be used instead of the real programs when -flto is +# used. However, we should not add the toolchain wrapper for them, and they +# match the *cc-* pattern. Therefore, an additional case is added for *-ar, +# *-ranlib and *-nm. +define TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER + $(Q)cd $(HOST_DIR)/usr/bin; \ + for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \ + base=$${i##*/}; \ + case "$$base" in \ + *-ar|*-ranlib|*-nm) \ + ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ + ;; \ + *cc|*cc-*|*++|*++-*|*cpp|*-gfortran) \ + ln -sf toolchain-wrapper $$base; \ + ;; \ + *gdb|*gdbtui) \ + if test "$(BR2_PACKAGE_HOST_GDB)" != "y"; then \ + ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ + fi \ + ;; \ + *) \ + ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ + ;; \ + esac; \ + done endef -# Special fixup for Codescape MIPS toolchains, that have bin- and -# sbin- directories. We create symlinks bin -> bin- and sbin -# -> sbin- so that the rest of Buildroot can find the toolchain -# tools in the appropriate location. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS)$(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS),y) -ifeq ($(BR2_MIPS_OABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX = o32 -else ifeq ($(BR2_MIPS_NABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX = n32 -else ifeq ($(BR2_MIPS_NABI64),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX = n64 -endif -define TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_STAGING_FIXUPS - rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin - ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin - ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin -endef -endif +# Various utility functions used by the external toolchain package +# infrastructure. Those functions are mainly responsible for: +# +# - installation the toolchain libraries to $(TARGET_DIR) +# - copying the toolchain sysroot to $(STAGING_DIR) +# - installing a gdbinit file +# +# Details about sysroot directory selection. +# +# To find the sysroot directory, we use the trick of looking for the +# 'libc.a' file with the -print-file-name gcc option, and then +# mangling the path to find the base directory of the sysroot. +# +# Note that we do not use the -print-sysroot option, because it is +# only available since gcc 4.4.x, and we only recently dropped support +# for 4.2.x and 4.3.x. +# +# When doing this, we don't pass any option to gcc that could select a +# multilib variant (such as -march) as we want the "main" sysroot, +# which contains all variants of the C library in the case of multilib +# toolchains. We use the TARGET_CC_NO_SYSROOT variable, which is the +# path of the cross-compiler, without the --sysroot=$(STAGING_DIR), +# since what we want to find is the location of the original toolchain +# sysroot. This "main" sysroot directory is stored in SYSROOT_DIR. +# +# Then, multilib toolchains are a little bit more complicated, since +# they in fact have multiple sysroots, one for each variant supported +# by the toolchain. So we need to find the particular sysroot we're +# interested in. +# +# To do so, we ask the compiler where its sysroot is by passing all +# flags (including -march and al.), except the --sysroot flag since we +# want to the compiler to tell us where its original sysroot +# is. ARCH_SUBDIR will contain the subdirectory, in the main +# SYSROOT_DIR, that corresponds to the selected architecture +# variant. ARCH_SYSROOT_DIR will contain the full path to this +# location. +# +# One might wonder why we don't just bother with ARCH_SYSROOT_DIR. The +# fact is that in multilib toolchains, the header files are often only +# present in the main sysroot, and only the libraries are available in +# each variant-specific sysroot directory. -# Special handling for Blackfin toolchain, because of the split in two -# tarballs, and the organization of tarball contents. The tarballs -# contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories, -# which themselves contain the toolchain. This is why we strip more -# components than usual. -define TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT - $(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS) | \ - $(TAR) --strip-components=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) - + +# toolchain_find_sysroot returns the sysroot location for the given +# compiler + flags. We need to handle cases where libc.a is in: +# +# - lib/ +# - usr/lib/ +# - lib32/ +# - lib64/ +# - lib32-fp/ (Cavium toolchain) +# - lib64-fp/ (Cavium toolchain) +# - usr/lib// (Linaro toolchain) +# +# And variations on these. +define toolchain_find_sysroot +$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:(usr/)?lib(32|64)?([^/]*)?/([^/]*/)?libc\.a::') endef -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM),y) +# Returns the lib subdirectory for the given compiler + flags (i.e +# typically lib32 or lib64 for some toolchains) +define toolchain_find_libdir +$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?([^/]*)?)/([^/]*/)?libc.a:\2:') +endef + +# Returns the location of the libc.a file for the given compiler + flags +define toolchain_find_libc_a +$$(readlink -f $$(LANG=C $(1) -print-file-name=libc.a)) +endef + +# Integration of the toolchain into Buildroot: find the main sysroot +# and the variant-specific sysroot, then copy the needed libraries to +# the $(TARGET_DIR) and copy the whole sysroot (libraries and headers) +# to $(STAGING_DIR). +# +# Variables are defined as follows: +# +# LIBC_A_LOCATION: location of the libc.a file in the default +# multilib variant (allows to find the main +# sysroot directory) +# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/usr/lib/libc.a +# +# SYSROOT_DIR: the main sysroot directory, deduced from +# LIBC_A_LOCATION by removing the +# usr/lib[32|64]/libc.a part of the path. +# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/ +# +# ARCH_LIBC_A_LOCATION: location of the libc.a file in the selected +# multilib variant (taking into account the +# CFLAGS). Allows to find the sysroot of the +# selected multilib variant. +# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/libc.a +# +# ARCH_SYSROOT_DIR: the sysroot of the selected multilib variant, +# deduced from ARCH_LIBC_A_LOCATION by removing +# usr/lib[32|64]/libc.a at the end of the path. +# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/ +# +# ARCH_LIB_DIR: 'lib', 'lib32' or 'lib64' depending on where libraries +# are stored. Deduced from ARCH_LIBC_A_LOCATION by +# looking at usr/lib??/libc.a. +# Ex: lib +# +# ARCH_SUBDIR: the relative location of the sysroot of the selected +# multilib variant compared to the main sysroot. +# Ex: mips16/soft-float/el +# +# SUPPORT_LIB_DIR: some toolchains, such as recent Linaro toolchains, +# store GCC support libraries (libstdc++, +# libgcc_s, etc.) outside of the sysroot. In +# this case, SUPPORT_LIB_DIR is set to a +# non-empty value, and points to the directory +# where these support libraries are +# available. Those libraries will be copied to +# our sysroot, and the directory will also be +# considered when searching libraries for copy +# to the target filesystem. +# +# Please be very careful to check the major toolchain sources: +# Buildroot, Crosstool-NG, CodeSourcery and Linaro +# before doing any modification on the below logic. + +ifeq ($(BR2_STATIC_LIBS),) +define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS + $(Q)$(call MESSAGE,"Copying external toolchain libraries to target...") + $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ + $(call copy_toolchain_lib_root,$$libs); \ + done +endef +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),y) +define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER + $(Q)$(call MESSAGE,"Copying gdbserver") + $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + gdbserver_found=0 ; \ + for d in $${ARCH_SYSROOT_DIR}/usr \ + $${ARCH_SYSROOT_DIR}/../debug-root/usr \ + $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \ + $(TOOLCHAIN_EXTERNAL_INSTALL_DIR); do \ + if test -f $${d}/bin/gdbserver ; then \ + install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \ + gdbserver_found=1 ; \ + break ; \ + fi ; \ + done ; \ + if [ $${gdbserver_found} -eq 0 ] ; then \ + echo "Could not find gdbserver in external toolchain" ; \ + exit 1 ; \ + fi +endef +endif + +define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS + $(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \ + ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + SUPPORT_LIB_DIR="" ; \ + if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \ + LIBSTDCPP_A_LOCATION=$$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \ + if [ -e "$${LIBSTDCPP_A_LOCATION}" ]; then \ + SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \ + fi ; \ + fi ; \ + if [ "$${SYSROOT_DIR}" == "$${ARCH_SYSROOT_DIR}" ] ; then \ + ARCH_SUBDIR="" ; \ + elif [ "`dirname $${ARCH_SYSROOT_DIR}`" = "`dirname $${SYSROOT_DIR}`" ] ; then \ + SYSROOT_DIR_DIRNAME=`dirname $${SYSROOT_DIR}`/ ; \ + ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR_DIRNAME}(.*)/$$:\1:"` ; \ + else \ + ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \ + fi ; \ + $(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \ + $(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) +endef + +# Create a symlink from (usr/)$(ARCH_LIB_DIR) to lib. +# Note: the skeleton package additionally creates lib32->lib or lib64->lib +# (as appropriate) +# +# $1: destination directory (TARGET_DIR / STAGING_DIR) +create_lib_symlinks = \ + $(Q)DESTDIR="$(strip $1)" ; \ + ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + if [ ! -e "$${DESTDIR}/$${ARCH_LIB_DIR}" -a ! -e "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ]; then \ + ln -snf lib "$${DESTDIR}/$${ARCH_LIB_DIR}" ; \ + ln -snf lib "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ; \ + fi + +define TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK + $(call create_lib_symlinks,$(STAGING_DIR)) +endef + +define TOOLCHAIN_EXTERNAL_CREATE_TARGET_LIB_SYMLINK + $(call create_lib_symlinks,$(TARGET_DIR)) +endef + +# +# Generate gdbinit file for use with Buildroot +# +define TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT + $(Q)if test -f $(TARGET_CROSS)gdb ; then \ + $(call MESSAGE,"Installing gdbinit"); \ + $(gen_gdbinit_file); \ + fi +endef + +# Various utility functions used by the external toolchain based on musl. + +# musl does not provide an implementation for sys/queue.h or sys/cdefs.h. +# So, add the musl-compat-headers package that will install those files, +# into the staging directory: +# sys/queue.h: header from NetBSD +# sys/cdefs.h: minimalist header bundled in Buildroot +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +TOOLCHAIN_EXTERNAL_DEPENDENCIES += musl-compat-headers +endif + +# With the musl C library, the libc.so library directly plays the role +# of the dynamic library loader. We just need to create a symbolic +# link to libc.so with the appropriate name. +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) +ifeq ($(BR2_i386),y) +MUSL_ARCH = i386 +else ifeq ($(BR2_ARM_EABIHF),y) +MUSL_ARCH = armhf +else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:y) +MUSL_ARCH = mipsel-sf +else ifeq ($(BR2_sh),y) +MUSL_ARCH = sh +else +MUSL_ARCH = $(ARCH) +endif +define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK + ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1 +endef +TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK +endif + +# +# Various functions used by the external toolchain package +# infrastructure to handle the Blackfin specific +# BR2_BFIN_INSTALL_FDPIC_SHARED and BR2_BFIN_INSTALL_FLAT_SHARED +# options. +# + +# Special installation target used on the Blackfin architecture when +# FDPIC is not the primary binary format being used, but the user has +# nonetheless requested the installation of the FDPIC libraries to the +# target filesystem. +ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y) +define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC + $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to staging...") + $(Q)FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \ + FDPIC_SYSROOT_DIR="$(call toolchain_find_sysroot,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + FDPIC_LIB_DIR="$(call toolchain_find_libdir,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + FDPIC_SUPPORT_LIB_DIR="" ; \ + if test `find $${FDPIC_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \ + FDPIC_LIBSTDCPP_A_LOCATION=$$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \ + if [ -e "$${FDPIC_LIBSTDCPP_A_LOCATION}" ]; then \ + FDPIC_SUPPORT_LIB_DIR=`readlink -f $${FDPIC_LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \ + fi ; \ + fi ; \ + $(call copy_toolchain_sysroot,$${FDPIC_SYSROOT_DIR},$${FDPIC_SYSROOT_DIR},,$${FDPIC_LIB_DIR},$${FDPIC_SUPPORT_LIB_DIR}) +endef +define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FDPIC + $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") + $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ + $(call copy_toolchain_lib_root,$$libs); \ + done +endef +endif + +# Special installation target used on the Blackfin architecture when +# shared FLAT is not the primary format being used, but the user has +# nonetheless requested the installation of the shared FLAT libraries +# to the target filesystem. The flat libraries are found and linked +# according to the index in name "libN.so". Index 1 is reserved for +# the standard C library. Customer libraries can use 4 and above. +ifeq ($(BR2_BFIN_INSTALL_FLAT_SHARED),y) +define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FLAT + $(Q)$(call MESSAGE,"Install external toolchain FLAT libraries to target...") + $(Q)FLAT_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))../../bfin-uclinux/bin/bfin-uclinux-gcc ; \ + FLAT_LIBC_A_LOCATION=`$${FLAT_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -mid-shared-library -print-file-name=libc`; \ + if [ -f $${FLAT_LIBC_A_LOCATION} -a ! -h $${FLAT_LIBC_A_LOCATION} ] ; then \ + $(INSTALL) -D $${FLAT_LIBC_A_LOCATION} $(TARGET_DIR)/lib/lib1.so; \ + fi +endef +endif + +# uClibc-ng dynamic loader is called ld-uClibc.so.1, but gcc is not +# patched specifically for uClibc-ng, so it continues to generate +# binaries that expect the dynamic loader to be named ld-uClibc.so.0, +# like with the original uClibc. Therefore, we create an additional +# symbolic link to make uClibc-ng systems work properly. +define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO + $(Q)if test -e $(TARGET_DIR)/lib/ld-uClibc.so.1; then \ + ln -sf ld-uClibc.so.1 $(TARGET_DIR)/lib/ld-uClibc.so.0 ; \ + fi + $(Q)if test -e $(TARGET_DIR)/lib/ld64-uClibc.so.1; then \ + ln -sf ld64-uClibc.so.1 $(TARGET_DIR)/lib/ld64-uClibc.so.0 ; \ + fi +endef + +TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES +TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO + +# In fact, we don't need to download the toolchain, since it is already +# available on the system, so force the site and source to be empty so +# that nothing will be downloaded/extracted. +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED),y) +TOOLCHAIN_EXTERNAL_SITE = +TOOLCHAIN_EXTERNAL_SOURCE = +endif + +# The Codescape toolchain uses a sysroot layout that places them +# side-by-side instead of nested like multilibs. A symlink is needed +# much like for the nested sysroots which are handled in +# copy_toolchain_sysroot but there is not enough information in there +# to determine whether the sysroot layout was nested or side-by-side. +# Add the symlink here for now. +define TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_SYMLINK + $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ + ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ + ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} +endef + +# Special fixup for Codescape MIPS toolchains, that have bin- and +# sbin- directories. We create symlinks bin -> bin- and sbin +# -> sbin- so that the rest of Buildroot can find the toolchain +# tools in the appropriate location. +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS)$(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS),y) +ifeq ($(BR2_MIPS_OABI32),y) +TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX = o32 +else ifeq ($(BR2_MIPS_NABI32),y) +TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX = n32 +else ifeq ($(BR2_MIPS_NABI64),y) +TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX = n64 +endif + +define TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_STAGING_FIXUPS + rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin + ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin + ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin +endef +endif + +# Special handling for Blackfin toolchain, because of the split in two +# tarballs, and the organization of tarball contents. The tarballs +# contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories, +# which themselves contain the toolchain. This is why we strip more +# components than usual. +define TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT + $(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS) | \ + $(TAR) --strip-components=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) - +endef + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM),y) TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi TOOLCHAIN_EXTERNAL_SOURCE = arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A),y) @@ -439,60 +765,21 @@ TOOLCHAIN_EXTERNAL_ACTUAL_SOURCE_TARBALL ?= \ $(subst -i686-pc-linux-gnu.tar.bz2,.src.tar.bz2,$(subst -i686-pc-linux-gnu-i386-linux.tar.bz2,-i686-pc-linux-gnu.src.tar.bz2,$(TOOLCHAIN_EXTERNAL_SOURCE))) endif -# In fact, we don't need to download the toolchain, since it is already -# available on the system, so force the site and source to be empty so -# that nothing will be downloaded/extracted. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED),y) -TOOLCHAIN_EXTERNAL_SITE = -TOOLCHAIN_EXTERNAL_SOURCE = -endif - -TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO - -TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES - # Normal handling of downloaded toolchain tarball extraction. ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) TOOLCHAIN_EXTERNAL_EXCLUDES = usr/lib/locale/* -# As a regular package, the toolchain gets extracted in $(@D), but -# since it's actually a fairly special package, we need it to be moved -# into TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR. -define TOOLCHAIN_EXTERNAL_MOVE - rm -rf $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) - mkdir -p $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) - mv $(@D)/* $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)/ -endef -TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += \ - TOOLCHAIN_EXTERNAL_MOVE -endif - -# Returns the location of the libc.a file for the given compiler + flags -define toolchain_find_libc_a -$$(readlink -f $$(LANG=C $(1) -print-file-name=libc.a)) -endef - -# Returns the sysroot location for the given compiler + flags. We need -# to handle cases where libc.a is in: -# -# - lib/ -# - usr/lib/ -# - lib32/ -# - lib64/ -# - lib32-fp/ (Cavium toolchain) -# - lib64-fp/ (Cavium toolchain) -# - usr/lib// (Linaro toolchain) -# -# And variations on these. -define toolchain_find_sysroot -$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:(usr/)?lib(32|64)?([^/]*)?/([^/]*/)?libc\.a::') -endef - -# Returns the lib subdirectory for the given compiler + flags (i.e -# typically lib32 or lib64 for some toolchains) -define toolchain_find_libdir -$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?([^/]*)?)/([^/]*/)?libc.a:\2:') +# As a regular package, the toolchain gets extracted in $(@D), but +# since it's actually a fairly special package, we need it to be moved +# into TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR. +define TOOLCHAIN_EXTERNAL_MOVE + rm -rf $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) + mkdir -p $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) + mv $(@D)/* $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)/ endef +TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += \ + TOOLCHAIN_EXTERNAL_MOVE +endif # Checks for an already installed toolchain: check the toolchain # location, check that it is usable, and then verify that it @@ -528,255 +815,6 @@ define TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS $(Q)$(call check_toolchain_ssp,$(TOOLCHAIN_EXTERNAL_CC)) endef -# With the musl C library, the libc.so library directly plays the role -# of the dynamic library loader. We just need to create a symbolic -# link to libc.so with the appropriate name. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) -ifeq ($(BR2_i386),y) -MUSL_ARCH = i386 -else ifeq ($(BR2_ARM_EABIHF),y) -MUSL_ARCH = armhf -else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:y) -MUSL_ARCH = mipsel-sf -else ifeq ($(BR2_sh),y) -MUSL_ARCH = sh -else -MUSL_ARCH = $(ARCH) -endif -define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK - ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1 -endef -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK -endif - -# Create a symlink from (usr/)$(ARCH_LIB_DIR) to lib. -# Note: the skeleton package additionally creates lib32->lib or lib64->lib -# (as appropriate) -# -# $1: destination directory (TARGET_DIR / STAGING_DIR) -create_lib_symlinks = \ - $(Q)DESTDIR="$(strip $1)" ; \ - ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - if [ ! -e "$${DESTDIR}/$${ARCH_LIB_DIR}" -a ! -e "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ]; then \ - ln -snf lib "$${DESTDIR}/$${ARCH_LIB_DIR}" ; \ - ln -snf lib "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ; \ - fi - -define TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK - $(call create_lib_symlinks,$(STAGING_DIR)) -endef - -define TOOLCHAIN_EXTERNAL_CREATE_TARGET_LIB_SYMLINK - $(call create_lib_symlinks,$(TARGET_DIR)) -endef - -# Integration of the toolchain into Buildroot: find the main sysroot -# and the variant-specific sysroot, then copy the needed libraries to -# the $(TARGET_DIR) and copy the whole sysroot (libraries and headers) -# to $(STAGING_DIR). -# -# Variables are defined as follows: -# -# LIBC_A_LOCATION: location of the libc.a file in the default -# multilib variant (allows to find the main -# sysroot directory) -# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/usr/lib/libc.a -# -# SYSROOT_DIR: the main sysroot directory, deduced from -# LIBC_A_LOCATION by removing the -# usr/lib[32|64]/libc.a part of the path. -# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/ -# -# ARCH_LIBC_A_LOCATION: location of the libc.a file in the selected -# multilib variant (taking into account the -# CFLAGS). Allows to find the sysroot of the -# selected multilib variant. -# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/libc.a -# -# ARCH_SYSROOT_DIR: the sysroot of the selected multilib variant, -# deduced from ARCH_LIBC_A_LOCATION by removing -# usr/lib[32|64]/libc.a at the end of the path. -# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/ -# -# ARCH_LIB_DIR: 'lib', 'lib32' or 'lib64' depending on where libraries -# are stored. Deduced from ARCH_LIBC_A_LOCATION by -# looking at usr/lib??/libc.a. -# Ex: lib -# -# ARCH_SUBDIR: the relative location of the sysroot of the selected -# multilib variant compared to the main sysroot. -# Ex: mips16/soft-float/el -# -# SUPPORT_LIB_DIR: some toolchains, such as recent Linaro toolchains, -# store GCC support libraries (libstdc++, -# libgcc_s, etc.) outside of the sysroot. In -# this case, SUPPORT_LIB_DIR is set to a -# non-empty value, and points to the directory -# where these support libraries are -# available. Those libraries will be copied to -# our sysroot, and the directory will also be -# considered when searching libraries for copy -# to the target filesystem. -# -# Please be very careful to check the major toolchain sources: -# Buildroot, Crosstool-NG, CodeSourcery and Linaro -# before doing any modification on the below logic. - -ifeq ($(BR2_STATIC_LIBS),) -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS - $(Q)$(call MESSAGE,"Copying external toolchain libraries to target...") - $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ - $(call copy_toolchain_lib_root,$$libs); \ - done -endef -endif - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),y) -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER - $(Q)$(call MESSAGE,"Copying gdbserver") - $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - gdbserver_found=0 ; \ - for d in $${ARCH_SYSROOT_DIR}/usr \ - $${ARCH_SYSROOT_DIR}/../debug-root/usr \ - $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \ - $(TOOLCHAIN_EXTERNAL_INSTALL_DIR); do \ - if test -f $${d}/bin/gdbserver ; then \ - install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \ - gdbserver_found=1 ; \ - break ; \ - fi ; \ - done ; \ - if [ $${gdbserver_found} -eq 0 ] ; then \ - echo "Could not find gdbserver in external toolchain" ; \ - exit 1 ; \ - fi -endef -endif - -define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS - $(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \ - ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - SUPPORT_LIB_DIR="" ; \ - if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \ - LIBSTDCPP_A_LOCATION=$$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \ - if [ -e "$${LIBSTDCPP_A_LOCATION}" ]; then \ - SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \ - fi ; \ - fi ; \ - if [ "$${SYSROOT_DIR}" == "$${ARCH_SYSROOT_DIR}" ] ; then \ - ARCH_SUBDIR="" ; \ - elif [ "`dirname $${ARCH_SYSROOT_DIR}`" = "`dirname $${SYSROOT_DIR}`" ] ; then \ - SYSROOT_DIR_DIRNAME=`dirname $${SYSROOT_DIR}`/ ; \ - ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR_DIRNAME}(.*)/$$:\1:"` ; \ - else \ - ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \ - fi ; \ - $(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \ - $(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) -endef - -# Special installation target used on the Blackfin architecture when -# FDPIC is not the primary binary format being used, but the user has -# nonetheless requested the installation of the FDPIC libraries to the -# target filesystem. -ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y) -define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC - $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to staging...") - $(Q)FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \ - FDPIC_SYSROOT_DIR="$(call toolchain_find_sysroot,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - FDPIC_LIB_DIR="$(call toolchain_find_libdir,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - FDPIC_SUPPORT_LIB_DIR="" ; \ - if test `find $${FDPIC_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \ - FDPIC_LIBSTDCPP_A_LOCATION=$$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \ - if [ -e "$${FDPIC_LIBSTDCPP_A_LOCATION}" ]; then \ - FDPIC_SUPPORT_LIB_DIR=`readlink -f $${FDPIC_LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \ - fi ; \ - fi ; \ - $(call copy_toolchain_sysroot,$${FDPIC_SYSROOT_DIR},$${FDPIC_SYSROOT_DIR},,$${FDPIC_LIB_DIR},$${FDPIC_SUPPORT_LIB_DIR}) -endef -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FDPIC - $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") - $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ - $(call copy_toolchain_lib_root,$$libs); \ - done -endef -endif - -# Special installation target used on the Blackfin architecture when -# shared FLAT is not the primary format being used, but the user has -# nonetheless requested the installation of the shared FLAT libraries -# to the target filesystem. The flat libraries are found and linked -# according to the index in name "libN.so". Index 1 is reserved for -# the standard C library. Customer libraries can use 4 and above. -ifeq ($(BR2_BFIN_INSTALL_FLAT_SHARED),y) -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FLAT - $(Q)$(call MESSAGE,"Install external toolchain FLAT libraries to target...") - $(Q)FLAT_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))../../bfin-uclinux/bin/bfin-uclinux-gcc ; \ - FLAT_LIBC_A_LOCATION=`$${FLAT_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -mid-shared-library -print-file-name=libc`; \ - if [ -f $${FLAT_LIBC_A_LOCATION} -a ! -h $${FLAT_LIBC_A_LOCATION} ] ; then \ - $(INSTALL) -D $${FLAT_LIBC_A_LOCATION} $(TARGET_DIR)/lib/lib1.so; \ - fi -endef -endif - -# Build toolchain wrapper for preprocessor, C, C++ and Fortran compilers -# and setup symlinks for everything else. Skip gdb symlink when we are -# building our own gdb to prevent two gdb's in output/host/usr/bin. -# The LTO support in gcc creates wrappers for ar, ranlib and nm which load -# the lto plugin. These wrappers are called *-gcc-ar, *-gcc-ranlib, and -# *-gcc-nm and should be used instead of the real programs when -flto is -# used. However, we should not add the toolchain wrapper for them, and they -# match the *cc-* pattern. Therefore, an additional case is added for *-ar, -# *-ranlib and *-nm. -define TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER - $(Q)cd $(HOST_DIR)/usr/bin; \ - for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \ - base=$${i##*/}; \ - case "$$base" in \ - *-ar|*-ranlib|*-nm) \ - ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ - ;; \ - *cc|*cc-*|*++|*++-*|*cpp|*-gfortran) \ - ln -sf toolchain-wrapper $$base; \ - ;; \ - *gdb|*gdbtui) \ - if test "$(BR2_PACKAGE_HOST_GDB)" != "y"; then \ - ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ - fi \ - ;; \ - *) \ - ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ - ;; \ - esac; \ - done -endef - -# -# Generate gdbinit file for use with Buildroot -# -define TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT - $(Q)if test -f $(TARGET_CROSS)gdb ; then \ - $(call MESSAGE,"Installing gdbinit"); \ - $(gen_gdbinit_file); \ - fi -endef - -# uClibc-ng dynamic loader is called ld-uClibc.so.1, but gcc is not -# patched specifically for uClibc-ng, so it continues to generate -# binaries that expect the dynamic loader to be named ld-uClibc.so.0, -# like with the original uClibc. Therefore, we create an additional -# symbolic link to make uClibc-ng systems work properly. -define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO - $(Q)if test -e $(TARGET_DIR)/lib/ld-uClibc.so.1; then \ - ln -sf ld-uClibc.so.1 $(TARGET_DIR)/lib/ld-uClibc.so.0 ; \ - fi - $(Q)if test -e $(TARGET_DIR)/lib/ld64-uClibc.so.1; then \ - ln -sf ld64-uClibc.so.1 $(TARGET_DIR)/lib/ld64-uClibc.so.0 ; \ - fi -endef - TOOLCHAIN_EXTERNAL_BUILD_CMDS = $(TOOLCHAIN_WRAPPER_BUILD) define TOOLCHAIN_EXTERNAL_INSTALL_STAGING_CMDS From da20a8b43d4b68e7cb0117ee8de773afe026cfc1 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 7 Nov 2016 02:19:58 +0100 Subject: [PATCH 1473/3392] toolchain-external: move parts to pkg-toolchain-external.mk pkg-toolchain-external.mk will be used later to define the toolchain-external-package infra. Most of the variable and macro definitions are shared with the legacy generic-package based toolchain-external. Move these to pkg-toolchain-external.mk. pkg-toolchain-external.mk is included implicitly by the include toolchain/*/*.mk in the top-level Makefile. The order of inclusion is not defined, but that doesn't matter because none of the variables defined in pkg-toolchain-external.mk are used in conditions or in rules in toolchain-external.mk, only in recursively-expanded variables. No functional changes at all. The output of 'make -qp' hasn't changed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour [Arnout: split off into separate patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../pkg-toolchain-external.mk | 570 ++++++++++++++++++ .../toolchain-external/toolchain-external.mk | 570 +----------------- 2 files changed, 573 insertions(+), 567 deletions(-) create mode 100644 toolchain/toolchain-external/pkg-toolchain-external.mk diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk new file mode 100644 index 0000000000..583b0d6cf1 --- /dev/null +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -0,0 +1,570 @@ +################################################################################ +# External toolchain package infrastructure +# +# This package infrastructure implements the support for external +# toolchains, i.e toolchains that are available pre-built, ready to +# use. Such toolchain may either be readily available on the Web +# (Linaro, Sourcery CodeBench, from processor vendors) or may be built +# with tools like Crosstool-NG or Buildroot itself. So far, we have +# tested this with: +# +# * Toolchains generated by Crosstool-NG +# * Toolchains generated by Buildroot +# * Toolchains provided by Linaro for the ARM and AArch64 +# architectures +# * Sourcery CodeBench toolchains (from Mentor Graphics) for the ARM, +# MIPS, PowerPC, x86, x86_64 and NIOS 2 architectures. For the MIPS +# toolchain, the -muclibc variant isn't supported yet, only the +# default glibc-based variant is. +# * Analog Devices toolchains for the Blackfin architecture +# * Xilinx toolchains for the Microblaze architecture +# * Synopsys DesignWare toolchains for ARC cores +# +# The basic principle is the following +# +# 1. If the toolchain is not pre-installed, download and extract it +# in $(TOOLCHAIN_EXTERNAL_INSTALL_DIR). Otherwise, +# $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) points to were the toolchain has +# already been installed by the user. +# +# 2. For all external toolchains, perform some checks on the +# conformity between the toolchain configuration described in the +# Buildroot menuconfig system, and the real configuration of the +# external toolchain. This is for example important to make sure that +# the Buildroot configuration system knows whether the toolchain +# supports RPC, IPv6, locales, large files, etc. Unfortunately, these +# things cannot be detected automatically, since the value of these +# options (such as BR2_TOOLCHAIN_HAS_NATIVE_RPC) are needed at +# configuration time because these options are used as dependencies +# for other options. And at configuration time, we are not able to +# retrieve the external toolchain configuration. +# +# 3. Copy the libraries needed at runtime to the target directory, +# $(TARGET_DIR). Obviously, things such as the C library, the dynamic +# loader and a few other utility libraries are needed if dynamic +# applications are to be executed on the target system. +# +# 4. Copy the libraries and headers to the staging directory. This +# will allow all further calls to gcc to be made using --sysroot +# $(STAGING_DIR), which greatly simplifies the compilation of the +# packages when using external toolchains. So in the end, only the +# cross-compiler binaries remains external, all libraries and headers +# are imported into the Buildroot tree. +# +# 5. Build a toolchain wrapper which executes the external toolchain +# with a number of arguments (sysroot/march/mtune/..) hardcoded, +# so we're sure the correct configuration is always used and the +# toolchain behaves similar to an internal toolchain. +# This toolchain wrapper and symlinks are installed into +# $(HOST_DIR)/usr/bin like for the internal toolchains, and the rest +# of Buildroot is handled identical for the 2 toolchain types. +################################################################################ + +# +# Definitions of where the toolchain can be found +# + +TOOLCHAIN_EXTERNAL_PREFIX = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) +TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR = $(HOST_DIR)/opt/ext-toolchain + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) +TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) +else +TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) +endif + +ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),) +ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),) +# if no path set, figure it out from path +TOOLCHAIN_EXTERNAL_BIN := $(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc)) +endif +else +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX),y) +TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin +else +TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin +endif +endif + +# If this is a buildroot toolchain, it already has a wrapper which we want to +# bypass. Since this is only evaluated after it has been extracted, we can use +# $(wildcard ...) here. +TOOLCHAIN_EXTERNAL_SUFFIX = \ + $(if $(wildcard $(TOOLCHAIN_EXTERNAL_BIN)/*.br_real),.br_real) + +TOOLCHAIN_EXTERNAL_CROSS = $(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)- +TOOLCHAIN_EXTERNAL_CC = $(TOOLCHAIN_EXTERNAL_CROSS)gcc$(TOOLCHAIN_EXTERNAL_SUFFIX) +TOOLCHAIN_EXTERNAL_CXX = $(TOOLCHAIN_EXTERNAL_CROSS)g++$(TOOLCHAIN_EXTERNAL_SUFFIX) +TOOLCHAIN_EXTERNAL_FC = $(TOOLCHAIN_EXTERNAL_CROSS)gfortran$(TOOLCHAIN_EXTERNAL_SUFFIX) +TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf$(TOOLCHAIN_EXTERNAL_SUFFIX) + + +# +# Definitions of the list of libraries that should be copied to the target. +# +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) +TOOLCHAIN_EXTERNAL_LIBS += libatomic.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.* +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy) +TOOLCHAIN_EXTERNAL_LIBS += ld-linux-armhf.so.* +else +TOOLCHAIN_EXTERNAL_LIBS += ld*.so.* +endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +TOOLCHAIN_EXTERNAL_LIBS += libpthread.so.* +ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),) +TOOLCHAIN_EXTERNAL_LIBS += libthread_db.so.* +endif # gdbserver +endif # ! no threads +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y) +TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) +TOOLCHAIN_EXTERNAL_LIBS += libc.so libgcc_s.so.* +endif + +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +TOOLCHAIN_EXTERNAL_LIBS += libstdc++.so.* +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) +TOOLCHAIN_EXTERNAL_LIBS += libgfortran.so.* +# fortran needs quadmath on x86 and x86_64 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBQUADMATH),y) +TOOLCHAIN_EXTERNAL_LIBS += libquadmath.so* +endif +endif + +TOOLCHAIN_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS)) + + +# +# Definition of the CFLAGS to use with the external toolchain, as well as the +# common toolchain wrapper build arguments +# +ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),) +CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU)) +else +CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION)) +endif +CC_TARGET_ARCH_ := $(call qstrip,$(BR2_GCC_TARGET_ARCH)) +CC_TARGET_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_ABI)) +CC_TARGET_FPU_ := $(call qstrip,$(BR2_GCC_TARGET_FPU)) +CC_TARGET_FLOAT_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) +CC_TARGET_MODE_ := $(call qstrip,$(BR2_GCC_TARGET_MODE)) + +# march/mtune/floating point mode needs to be passed to the external toolchain +# to select the right multilib variant +ifeq ($(BR2_x86_64),y) +TOOLCHAIN_EXTERNAL_CFLAGS += -m64 +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_64 +endif +ifneq ($(CC_TARGET_ARCH_),) +TOOLCHAIN_EXTERNAL_CFLAGS += -march=$(CC_TARGET_ARCH_) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ARCH='"$(CC_TARGET_ARCH_)"' +endif +ifneq ($(CC_TARGET_CPU_),) +TOOLCHAIN_EXTERNAL_CFLAGS += -mcpu=$(CC_TARGET_CPU_) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_CPU='"$(CC_TARGET_CPU_)"' +endif +ifneq ($(CC_TARGET_ABI_),) +TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"' +endif +ifneq ($(CC_TARGET_FPU_),) +TOOLCHAIN_EXTERNAL_CFLAGS += -mfpu=$(CC_TARGET_FPU_) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_FPU='"$(CC_TARGET_FPU_)"' +endif +ifneq ($(CC_TARGET_FLOAT_ABI_),) +TOOLCHAIN_EXTERNAL_CFLAGS += -mfloat-abi=$(CC_TARGET_FLOAT_ABI_) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(CC_TARGET_FLOAT_ABI_)"' +endif +ifneq ($(CC_TARGET_MODE_),) +TOOLCHAIN_EXTERNAL_CFLAGS += -m$(CC_TARGET_MODE_) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_MODE='"$(CC_TARGET_MODE_)"' +endif +ifeq ($(BR2_BINFMT_FLAT),y) +TOOLCHAIN_EXTERNAL_CFLAGS += -Wl,-elf2flt +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_BINFMT_FLAT +endif +ifeq ($(BR2_mipsel)$(BR2_mips64el),y) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_MIPS_TARGET_LITTLE_ENDIAN +TOOLCHAIN_EXTERNAL_CFLAGS += -EL +endif +ifeq ($(BR2_mips)$(BR2_mips64),y) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_MIPS_TARGET_BIG_ENDIAN +TOOLCHAIN_EXTERNAL_CFLAGS += -EB +endif +ifeq ($(BR2_arceb),y) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ARC_TARGET_BIG_ENDIAN +TOOLCHAIN_EXTERNAL_CFLAGS += -EB +endif + +TOOLCHAIN_EXTERNAL_CFLAGS += $(call qstrip,$(BR2_TARGET_OPTIMIZATION)) + +ifeq ($(BR2_SOFT_FLOAT),y) +TOOLCHAIN_EXTERNAL_CFLAGS += -msoft-float +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_SOFTFLOAT=1 +endif + +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ + -DBR_CROSS_PATH_SUFFIX='"$(TOOLCHAIN_EXTERNAL_SUFFIX)"' + +ifeq ($(filter $(HOST_DIR)/%,$(TOOLCHAIN_EXTERNAL_BIN)),) +# TOOLCHAIN_EXTERNAL_BIN points outside HOST_DIR => absolute path +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ + -DBR_CROSS_PATH_ABS='"$(TOOLCHAIN_EXTERNAL_BIN)"' +else +# TOOLCHAIN_EXTERNAL_BIN points inside HOST_DIR => relative path +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ + -DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"' +endif + + +# +# The following functions creates the symbolic links needed to get the +# cross-compilation tools visible in $(HOST_DIR)/usr/bin. Some of +# links are done directly to the corresponding tool in the external +# toolchain installation directory, while some other links are done to +# the toolchain wrapper (preprocessor, C, C++ and Fortran compiler) +# +# We skip gdb symlink when we are building our own gdb to prevent two +# gdb's in $(HOST_DIR)/usr/bin. +# +# The LTO support in gcc creates wrappers for ar, ranlib and nm which load +# the lto plugin. These wrappers are called *-gcc-ar, *-gcc-ranlib, and +# *-gcc-nm and should be used instead of the real programs when -flto is +# used. However, we should not add the toolchain wrapper for them, and they +# match the *cc-* pattern. Therefore, an additional case is added for *-ar, +# *-ranlib and *-nm. +define TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER + $(Q)cd $(HOST_DIR)/usr/bin; \ + for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \ + base=$${i##*/}; \ + case "$$base" in \ + *-ar|*-ranlib|*-nm) \ + ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ + ;; \ + *cc|*cc-*|*++|*++-*|*cpp|*-gfortran) \ + ln -sf toolchain-wrapper $$base; \ + ;; \ + *gdb|*gdbtui) \ + if test "$(BR2_PACKAGE_HOST_GDB)" != "y"; then \ + ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ + fi \ + ;; \ + *) \ + ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ + ;; \ + esac; \ + done +endef + + +# Various utility functions used by the external toolchain package +# infrastructure. Those functions are mainly responsible for: +# +# - installation the toolchain libraries to $(TARGET_DIR) +# - copying the toolchain sysroot to $(STAGING_DIR) +# - installing a gdbinit file +# +# Details about sysroot directory selection. +# +# To find the sysroot directory, we use the trick of looking for the +# 'libc.a' file with the -print-file-name gcc option, and then +# mangling the path to find the base directory of the sysroot. +# +# Note that we do not use the -print-sysroot option, because it is +# only available since gcc 4.4.x, and we only recently dropped support +# for 4.2.x and 4.3.x. +# +# When doing this, we don't pass any option to gcc that could select a +# multilib variant (such as -march) as we want the "main" sysroot, +# which contains all variants of the C library in the case of multilib +# toolchains. We use the TARGET_CC_NO_SYSROOT variable, which is the +# path of the cross-compiler, without the --sysroot=$(STAGING_DIR), +# since what we want to find is the location of the original toolchain +# sysroot. This "main" sysroot directory is stored in SYSROOT_DIR. +# +# Then, multilib toolchains are a little bit more complicated, since +# they in fact have multiple sysroots, one for each variant supported +# by the toolchain. So we need to find the particular sysroot we're +# interested in. +# +# To do so, we ask the compiler where its sysroot is by passing all +# flags (including -march and al.), except the --sysroot flag since we +# want to the compiler to tell us where its original sysroot +# is. ARCH_SUBDIR will contain the subdirectory, in the main +# SYSROOT_DIR, that corresponds to the selected architecture +# variant. ARCH_SYSROOT_DIR will contain the full path to this +# location. +# +# One might wonder why we don't just bother with ARCH_SYSROOT_DIR. The +# fact is that in multilib toolchains, the header files are often only +# present in the main sysroot, and only the libraries are available in +# each variant-specific sysroot directory. + + +# toolchain_find_sysroot returns the sysroot location for the given +# compiler + flags. We need to handle cases where libc.a is in: +# +# - lib/ +# - usr/lib/ +# - lib32/ +# - lib64/ +# - lib32-fp/ (Cavium toolchain) +# - lib64-fp/ (Cavium toolchain) +# - usr/lib// (Linaro toolchain) +# +# And variations on these. +define toolchain_find_sysroot +$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:(usr/)?lib(32|64)?([^/]*)?/([^/]*/)?libc\.a::') +endef + +# Returns the lib subdirectory for the given compiler + flags (i.e +# typically lib32 or lib64 for some toolchains) +define toolchain_find_libdir +$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?([^/]*)?)/([^/]*/)?libc.a:\2:') +endef + +# Returns the location of the libc.a file for the given compiler + flags +define toolchain_find_libc_a +$$(readlink -f $$(LANG=C $(1) -print-file-name=libc.a)) +endef + +# Integration of the toolchain into Buildroot: find the main sysroot +# and the variant-specific sysroot, then copy the needed libraries to +# the $(TARGET_DIR) and copy the whole sysroot (libraries and headers) +# to $(STAGING_DIR). +# +# Variables are defined as follows: +# +# LIBC_A_LOCATION: location of the libc.a file in the default +# multilib variant (allows to find the main +# sysroot directory) +# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/usr/lib/libc.a +# +# SYSROOT_DIR: the main sysroot directory, deduced from +# LIBC_A_LOCATION by removing the +# usr/lib[32|64]/libc.a part of the path. +# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/ +# +# ARCH_LIBC_A_LOCATION: location of the libc.a file in the selected +# multilib variant (taking into account the +# CFLAGS). Allows to find the sysroot of the +# selected multilib variant. +# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/libc.a +# +# ARCH_SYSROOT_DIR: the sysroot of the selected multilib variant, +# deduced from ARCH_LIBC_A_LOCATION by removing +# usr/lib[32|64]/libc.a at the end of the path. +# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/ +# +# ARCH_LIB_DIR: 'lib', 'lib32' or 'lib64' depending on where libraries +# are stored. Deduced from ARCH_LIBC_A_LOCATION by +# looking at usr/lib??/libc.a. +# Ex: lib +# +# ARCH_SUBDIR: the relative location of the sysroot of the selected +# multilib variant compared to the main sysroot. +# Ex: mips16/soft-float/el +# +# SUPPORT_LIB_DIR: some toolchains, such as recent Linaro toolchains, +# store GCC support libraries (libstdc++, +# libgcc_s, etc.) outside of the sysroot. In +# this case, SUPPORT_LIB_DIR is set to a +# non-empty value, and points to the directory +# where these support libraries are +# available. Those libraries will be copied to +# our sysroot, and the directory will also be +# considered when searching libraries for copy +# to the target filesystem. +# +# Please be very careful to check the major toolchain sources: +# Buildroot, Crosstool-NG, CodeSourcery and Linaro +# before doing any modification on the below logic. + +ifeq ($(BR2_STATIC_LIBS),) +define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS + $(Q)$(call MESSAGE,"Copying external toolchain libraries to target...") + $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ + $(call copy_toolchain_lib_root,$$libs); \ + done +endef +endif + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),y) +define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER + $(Q)$(call MESSAGE,"Copying gdbserver") + $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + gdbserver_found=0 ; \ + for d in $${ARCH_SYSROOT_DIR}/usr \ + $${ARCH_SYSROOT_DIR}/../debug-root/usr \ + $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \ + $(TOOLCHAIN_EXTERNAL_INSTALL_DIR); do \ + if test -f $${d}/bin/gdbserver ; then \ + install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \ + gdbserver_found=1 ; \ + break ; \ + fi ; \ + done ; \ + if [ $${gdbserver_found} -eq 0 ] ; then \ + echo "Could not find gdbserver in external toolchain" ; \ + exit 1 ; \ + fi +endef +endif + +define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS + $(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \ + ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + SUPPORT_LIB_DIR="" ; \ + if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \ + LIBSTDCPP_A_LOCATION=$$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \ + if [ -e "$${LIBSTDCPP_A_LOCATION}" ]; then \ + SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \ + fi ; \ + fi ; \ + if [ "$${SYSROOT_DIR}" == "$${ARCH_SYSROOT_DIR}" ] ; then \ + ARCH_SUBDIR="" ; \ + elif [ "`dirname $${ARCH_SYSROOT_DIR}`" = "`dirname $${SYSROOT_DIR}`" ] ; then \ + SYSROOT_DIR_DIRNAME=`dirname $${SYSROOT_DIR}`/ ; \ + ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR_DIRNAME}(.*)/$$:\1:"` ; \ + else \ + ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \ + fi ; \ + $(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \ + $(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) +endef + +# Create a symlink from (usr/)$(ARCH_LIB_DIR) to lib. +# Note: the skeleton package additionally creates lib32->lib or lib64->lib +# (as appropriate) +# +# $1: destination directory (TARGET_DIR / STAGING_DIR) +create_lib_symlinks = \ + $(Q)DESTDIR="$(strip $1)" ; \ + ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + if [ ! -e "$${DESTDIR}/$${ARCH_LIB_DIR}" -a ! -e "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ]; then \ + ln -snf lib "$${DESTDIR}/$${ARCH_LIB_DIR}" ; \ + ln -snf lib "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ; \ + fi + +define TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK + $(call create_lib_symlinks,$(STAGING_DIR)) +endef + +define TOOLCHAIN_EXTERNAL_CREATE_TARGET_LIB_SYMLINK + $(call create_lib_symlinks,$(TARGET_DIR)) +endef + +# +# Generate gdbinit file for use with Buildroot +# +define TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT + $(Q)if test -f $(TARGET_CROSS)gdb ; then \ + $(call MESSAGE,"Installing gdbinit"); \ + $(gen_gdbinit_file); \ + fi +endef + +# Various utility functions used by the external toolchain based on musl. + +# musl does not provide an implementation for sys/queue.h or sys/cdefs.h. +# So, add the musl-compat-headers package that will install those files, +# into the staging directory: +# sys/queue.h: header from NetBSD +# sys/cdefs.h: minimalist header bundled in Buildroot +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +TOOLCHAIN_EXTERNAL_DEPENDENCIES += musl-compat-headers +endif + +# With the musl C library, the libc.so library directly plays the role +# of the dynamic library loader. We just need to create a symbolic +# link to libc.so with the appropriate name. +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) +ifeq ($(BR2_i386),y) +MUSL_ARCH = i386 +else ifeq ($(BR2_ARM_EABIHF),y) +MUSL_ARCH = armhf +else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:y) +MUSL_ARCH = mipsel-sf +else ifeq ($(BR2_sh),y) +MUSL_ARCH = sh +else +MUSL_ARCH = $(ARCH) +endif +define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK + ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1 +endef +TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK +endif + +# +# Various functions used by the external toolchain package +# infrastructure to handle the Blackfin specific +# BR2_BFIN_INSTALL_FDPIC_SHARED and BR2_BFIN_INSTALL_FLAT_SHARED +# options. +# + +# Special installation target used on the Blackfin architecture when +# FDPIC is not the primary binary format being used, but the user has +# nonetheless requested the installation of the FDPIC libraries to the +# target filesystem. +ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y) +define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC + $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to staging...") + $(Q)FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \ + FDPIC_SYSROOT_DIR="$(call toolchain_find_sysroot,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + FDPIC_LIB_DIR="$(call toolchain_find_libdir,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ + FDPIC_SUPPORT_LIB_DIR="" ; \ + if test `find $${FDPIC_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \ + FDPIC_LIBSTDCPP_A_LOCATION=$$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \ + if [ -e "$${FDPIC_LIBSTDCPP_A_LOCATION}" ]; then \ + FDPIC_SUPPORT_LIB_DIR=`readlink -f $${FDPIC_LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \ + fi ; \ + fi ; \ + $(call copy_toolchain_sysroot,$${FDPIC_SYSROOT_DIR},$${FDPIC_SYSROOT_DIR},,$${FDPIC_LIB_DIR},$${FDPIC_SUPPORT_LIB_DIR}) +endef +define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FDPIC + $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") + $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ + $(call copy_toolchain_lib_root,$$libs); \ + done +endef +endif + +# Special installation target used on the Blackfin architecture when +# shared FLAT is not the primary format being used, but the user has +# nonetheless requested the installation of the shared FLAT libraries +# to the target filesystem. The flat libraries are found and linked +# according to the index in name "libN.so". Index 1 is reserved for +# the standard C library. Customer libraries can use 4 and above. +ifeq ($(BR2_BFIN_INSTALL_FLAT_SHARED),y) +define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FLAT + $(Q)$(call MESSAGE,"Install external toolchain FLAT libraries to target...") + $(Q)FLAT_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))../../bfin-uclinux/bin/bfin-uclinux-gcc ; \ + FLAT_LIBC_A_LOCATION=`$${FLAT_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -mid-shared-library -print-file-name=libc`; \ + if [ -f $${FLAT_LIBC_A_LOCATION} -a ! -h $${FLAT_LIBC_A_LOCATION} ] ; then \ + $(INSTALL) -D $${FLAT_LIBC_A_LOCATION} $(TARGET_DIR)/lib/lib1.so; \ + fi +endef +endif + +# uClibc-ng dynamic loader is called ld-uClibc.so.1, but gcc is not +# patched specifically for uClibc-ng, so it continues to generate +# binaries that expect the dynamic loader to be named ld-uClibc.so.0, +# like with the original uClibc. Therefore, we create an additional +# symbolic link to make uClibc-ng systems work properly. +define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO + $(Q)if test -e $(TARGET_DIR)/lib/ld-uClibc.so.1; then \ + ln -sf ld-uClibc.so.1 $(TARGET_DIR)/lib/ld-uClibc.so.0 ; \ + fi + $(Q)if test -e $(TARGET_DIR)/lib/ld64-uClibc.so.1; then \ + ln -sf ld64-uClibc.so.1 $(TARGET_DIR)/lib/ld64-uClibc.so.0 ; \ + fi +endef diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 180a63da58..be1b5e4bee 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -4,573 +4,9 @@ # ################################################################################ -# -# This package implements the support for external toolchains, i.e -# toolchains that are available pre-built, ready to use. Such toolchain -# may either be readily available on the Web (Linaro, Sourcery -# CodeBench, from processor vendors) or may be built with tools like -# Crosstool-NG or Buildroot itself. So far, we have tested this -# with: -# -# * Toolchains generated by Crosstool-NG -# * Toolchains generated by Buildroot -# * Toolchains provided by Linaro for the ARM and AArch64 -# architectures -# * Sourcery CodeBench toolchains (from Mentor Graphics) for the ARM, -# MIPS, PowerPC, x86, x86_64 and NIOS 2 architectures. For the MIPS -# toolchain, the -muclibc variant isn't supported yet, only the -# default glibc-based variant is. -# * Analog Devices toolchains for the Blackfin architecture -# * Xilinx toolchains for the Microblaze architecture -# * Synopsys DesignWare toolchains for ARC cores -# -# The basic principle is the following -# -# 1. If the toolchain is not pre-installed, download and extract it -# in $(TOOLCHAIN_EXTERNAL_INSTALL_DIR). Otherwise, -# $(TOOLCHAIN_EXTERNAL_INSTALL_DIR) points to were the toolchain has -# already been installed by the user. -# -# 2. For all external toolchains, perform some checks on the -# conformity between the toolchain configuration described in the -# Buildroot menuconfig system, and the real configuration of the -# external toolchain. This is for example important to make sure that -# the Buildroot configuration system knows whether the toolchain -# supports RPC, IPv6, locales, large files, etc. Unfortunately, these -# things cannot be detected automatically, since the value of these -# options (such as BR2_TOOLCHAIN_HAS_NATIVE_RPC) are needed at -# configuration time because these options are used as dependencies -# for other options. And at configuration time, we are not able to -# retrieve the external toolchain configuration. -# -# 3. Copy the libraries needed at runtime to the target directory, -# $(TARGET_DIR). Obviously, things such as the C library, the dynamic -# loader and a few other utility libraries are needed if dynamic -# applications are to be executed on the target system. -# -# 4. Copy the libraries and headers to the staging directory. This -# will allow all further calls to gcc to be made using --sysroot -# $(STAGING_DIR), which greatly simplifies the compilation of the -# packages when using external toolchains. So in the end, only the -# cross-compiler binaries remains external, all libraries and headers -# are imported into the Buildroot tree. -# -# 5. Build a toolchain wrapper which executes the external toolchain -# with a number of arguments (sysroot/march/mtune/..) hardcoded, -# so we're sure the correct configuration is always used and the -# toolchain behaves similar to an internal toolchain. -# This toolchain wrapper and symlinks are installed into -# $(HOST_DIR)/usr/bin like for the internal toolchains, and the rest -# of Buildroot is handled identical for the 2 toolchain types. - -# -# Definitions of where the toolchain can be found -# - -TOOLCHAIN_EXTERNAL_PREFIX = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) -TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR = $(HOST_DIR)/opt/ext-toolchain - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) -TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) -else -TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) -endif - -ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),) -ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),) -# if no path set, figure it out from path -TOOLCHAIN_EXTERNAL_BIN := $(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc)) -endif -else -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX),y) -TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin -else -TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin -endif -endif - -# If this is a buildroot toolchain, it already has a wrapper which we want to -# bypass. Since this is only evaluated after it has been extracted, we can use -# $(wildcard ...) here. -TOOLCHAIN_EXTERNAL_SUFFIX = \ - $(if $(wildcard $(TOOLCHAIN_EXTERNAL_BIN)/*.br_real),.br_real) - -TOOLCHAIN_EXTERNAL_CROSS = $(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)- -TOOLCHAIN_EXTERNAL_CC = $(TOOLCHAIN_EXTERNAL_CROSS)gcc$(TOOLCHAIN_EXTERNAL_SUFFIX) -TOOLCHAIN_EXTERNAL_CXX = $(TOOLCHAIN_EXTERNAL_CROSS)g++$(TOOLCHAIN_EXTERNAL_SUFFIX) -TOOLCHAIN_EXTERNAL_FC = $(TOOLCHAIN_EXTERNAL_CROSS)gfortran$(TOOLCHAIN_EXTERNAL_SUFFIX) -TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf$(TOOLCHAIN_EXTERNAL_SUFFIX) - - -# -# Definitions of the list of libraries that should be copied to the target. -# -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) -TOOLCHAIN_EXTERNAL_LIBS += libatomic.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.* -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy) -TOOLCHAIN_EXTERNAL_LIBS += ld-linux-armhf.so.* -else -TOOLCHAIN_EXTERNAL_LIBS += ld*.so.* -endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -TOOLCHAIN_EXTERNAL_LIBS += libpthread.so.* -ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),) -TOOLCHAIN_EXTERNAL_LIBS += libthread_db.so.* -endif # gdbserver -endif # ! no threads -endif - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y) -TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* -endif - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) -TOOLCHAIN_EXTERNAL_LIBS += libc.so libgcc_s.so.* -endif - -ifeq ($(BR2_INSTALL_LIBSTDCPP),y) -TOOLCHAIN_EXTERNAL_LIBS += libstdc++.so.* -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) -TOOLCHAIN_EXTERNAL_LIBS += libgfortran.so.* -# fortran needs quadmath on x86 and x86_64 -ifeq ($(BR2_TOOLCHAIN_HAS_LIBQUADMATH),y) -TOOLCHAIN_EXTERNAL_LIBS += libquadmath.so* -endif -endif - -TOOLCHAIN_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS)) - - -# -# Definition of the CFLAGS to use with the external toolchain, as well as the -# common toolchain wrapper build arguments -# -ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),) -CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU)) -else -CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION)) -endif -CC_TARGET_ARCH_ := $(call qstrip,$(BR2_GCC_TARGET_ARCH)) -CC_TARGET_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_ABI)) -CC_TARGET_FPU_ := $(call qstrip,$(BR2_GCC_TARGET_FPU)) -CC_TARGET_FLOAT_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) -CC_TARGET_MODE_ := $(call qstrip,$(BR2_GCC_TARGET_MODE)) - -# march/mtune/floating point mode needs to be passed to the external toolchain -# to select the right multilib variant -ifeq ($(BR2_x86_64),y) -TOOLCHAIN_EXTERNAL_CFLAGS += -m64 -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_64 -endif -ifneq ($(CC_TARGET_ARCH_),) -TOOLCHAIN_EXTERNAL_CFLAGS += -march=$(CC_TARGET_ARCH_) -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ARCH='"$(CC_TARGET_ARCH_)"' -endif -ifneq ($(CC_TARGET_CPU_),) -TOOLCHAIN_EXTERNAL_CFLAGS += -mcpu=$(CC_TARGET_CPU_) -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_CPU='"$(CC_TARGET_CPU_)"' -endif -ifneq ($(CC_TARGET_ABI_),) -TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_) -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"' -endif -ifneq ($(CC_TARGET_FPU_),) -TOOLCHAIN_EXTERNAL_CFLAGS += -mfpu=$(CC_TARGET_FPU_) -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_FPU='"$(CC_TARGET_FPU_)"' -endif -ifneq ($(CC_TARGET_FLOAT_ABI_),) -TOOLCHAIN_EXTERNAL_CFLAGS += -mfloat-abi=$(CC_TARGET_FLOAT_ABI_) -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(CC_TARGET_FLOAT_ABI_)"' -endif -ifneq ($(CC_TARGET_MODE_),) -TOOLCHAIN_EXTERNAL_CFLAGS += -m$(CC_TARGET_MODE_) -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_MODE='"$(CC_TARGET_MODE_)"' -endif -ifeq ($(BR2_BINFMT_FLAT),y) -TOOLCHAIN_EXTERNAL_CFLAGS += -Wl,-elf2flt -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_BINFMT_FLAT -endif -ifeq ($(BR2_mipsel)$(BR2_mips64el),y) -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_MIPS_TARGET_LITTLE_ENDIAN -TOOLCHAIN_EXTERNAL_CFLAGS += -EL -endif -ifeq ($(BR2_mips)$(BR2_mips64),y) -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_MIPS_TARGET_BIG_ENDIAN -TOOLCHAIN_EXTERNAL_CFLAGS += -EB -endif -ifeq ($(BR2_arceb),y) -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ARC_TARGET_BIG_ENDIAN -TOOLCHAIN_EXTERNAL_CFLAGS += -EB -endif - -TOOLCHAIN_EXTERNAL_CFLAGS += $(call qstrip,$(BR2_TARGET_OPTIMIZATION)) - -ifeq ($(BR2_SOFT_FLOAT),y) -TOOLCHAIN_EXTERNAL_CFLAGS += -msoft-float -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_SOFTFLOAT=1 -endif - -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ - -DBR_CROSS_PATH_SUFFIX='"$(TOOLCHAIN_EXTERNAL_SUFFIX)"' - -ifeq ($(filter $(HOST_DIR)/%,$(TOOLCHAIN_EXTERNAL_BIN)),) -# TOOLCHAIN_EXTERNAL_BIN points outside HOST_DIR => absolute path -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ - -DBR_CROSS_PATH_ABS='"$(TOOLCHAIN_EXTERNAL_BIN)"' -else -# TOOLCHAIN_EXTERNAL_BIN points inside HOST_DIR => relative path -TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ - -DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"' -endif - - -# -# The following functions creates the symbolic links needed to get the -# cross-compilation tools visible in $(HOST_DIR)/usr/bin. Some of -# links are done directly to the corresponding tool in the external -# toolchain installation directory, while some other links are done to -# the toolchain wrapper (preprocessor, C, C++ and Fortran compiler) -# -# We skip gdb symlink when we are building our own gdb to prevent two -# gdb's in $(HOST_DIR)/usr/bin. -# -# The LTO support in gcc creates wrappers for ar, ranlib and nm which load -# the lto plugin. These wrappers are called *-gcc-ar, *-gcc-ranlib, and -# *-gcc-nm and should be used instead of the real programs when -flto is -# used. However, we should not add the toolchain wrapper for them, and they -# match the *cc-* pattern. Therefore, an additional case is added for *-ar, -# *-ranlib and *-nm. -define TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER - $(Q)cd $(HOST_DIR)/usr/bin; \ - for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \ - base=$${i##*/}; \ - case "$$base" in \ - *-ar|*-ranlib|*-nm) \ - ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ - ;; \ - *cc|*cc-*|*++|*++-*|*cpp|*-gfortran) \ - ln -sf toolchain-wrapper $$base; \ - ;; \ - *gdb|*gdbtui) \ - if test "$(BR2_PACKAGE_HOST_GDB)" != "y"; then \ - ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ - fi \ - ;; \ - *) \ - ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ - ;; \ - esac; \ - done -endef - - -# Various utility functions used by the external toolchain package -# infrastructure. Those functions are mainly responsible for: -# -# - installation the toolchain libraries to $(TARGET_DIR) -# - copying the toolchain sysroot to $(STAGING_DIR) -# - installing a gdbinit file -# -# Details about sysroot directory selection. -# -# To find the sysroot directory, we use the trick of looking for the -# 'libc.a' file with the -print-file-name gcc option, and then -# mangling the path to find the base directory of the sysroot. -# -# Note that we do not use the -print-sysroot option, because it is -# only available since gcc 4.4.x, and we only recently dropped support -# for 4.2.x and 4.3.x. -# -# When doing this, we don't pass any option to gcc that could select a -# multilib variant (such as -march) as we want the "main" sysroot, -# which contains all variants of the C library in the case of multilib -# toolchains. We use the TARGET_CC_NO_SYSROOT variable, which is the -# path of the cross-compiler, without the --sysroot=$(STAGING_DIR), -# since what we want to find is the location of the original toolchain -# sysroot. This "main" sysroot directory is stored in SYSROOT_DIR. -# -# Then, multilib toolchains are a little bit more complicated, since -# they in fact have multiple sysroots, one for each variant supported -# by the toolchain. So we need to find the particular sysroot we're -# interested in. -# -# To do so, we ask the compiler where its sysroot is by passing all -# flags (including -march and al.), except the --sysroot flag since we -# want to the compiler to tell us where its original sysroot -# is. ARCH_SUBDIR will contain the subdirectory, in the main -# SYSROOT_DIR, that corresponds to the selected architecture -# variant. ARCH_SYSROOT_DIR will contain the full path to this -# location. -# -# One might wonder why we don't just bother with ARCH_SYSROOT_DIR. The -# fact is that in multilib toolchains, the header files are often only -# present in the main sysroot, and only the libraries are available in -# each variant-specific sysroot directory. - - -# toolchain_find_sysroot returns the sysroot location for the given -# compiler + flags. We need to handle cases where libc.a is in: -# -# - lib/ -# - usr/lib/ -# - lib32/ -# - lib64/ -# - lib32-fp/ (Cavium toolchain) -# - lib64-fp/ (Cavium toolchain) -# - usr/lib// (Linaro toolchain) -# -# And variations on these. -define toolchain_find_sysroot -$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:(usr/)?lib(32|64)?([^/]*)?/([^/]*/)?libc\.a::') -endef - -# Returns the lib subdirectory for the given compiler + flags (i.e -# typically lib32 or lib64 for some toolchains) -define toolchain_find_libdir -$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?([^/]*)?)/([^/]*/)?libc.a:\2:') -endef - -# Returns the location of the libc.a file for the given compiler + flags -define toolchain_find_libc_a -$$(readlink -f $$(LANG=C $(1) -print-file-name=libc.a)) -endef - -# Integration of the toolchain into Buildroot: find the main sysroot -# and the variant-specific sysroot, then copy the needed libraries to -# the $(TARGET_DIR) and copy the whole sysroot (libraries and headers) -# to $(STAGING_DIR). -# -# Variables are defined as follows: -# -# LIBC_A_LOCATION: location of the libc.a file in the default -# multilib variant (allows to find the main -# sysroot directory) -# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/usr/lib/libc.a -# -# SYSROOT_DIR: the main sysroot directory, deduced from -# LIBC_A_LOCATION by removing the -# usr/lib[32|64]/libc.a part of the path. -# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/ -# -# ARCH_LIBC_A_LOCATION: location of the libc.a file in the selected -# multilib variant (taking into account the -# CFLAGS). Allows to find the sysroot of the -# selected multilib variant. -# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/libc.a -# -# ARCH_SYSROOT_DIR: the sysroot of the selected multilib variant, -# deduced from ARCH_LIBC_A_LOCATION by removing -# usr/lib[32|64]/libc.a at the end of the path. -# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/ -# -# ARCH_LIB_DIR: 'lib', 'lib32' or 'lib64' depending on where libraries -# are stored. Deduced from ARCH_LIBC_A_LOCATION by -# looking at usr/lib??/libc.a. -# Ex: lib -# -# ARCH_SUBDIR: the relative location of the sysroot of the selected -# multilib variant compared to the main sysroot. -# Ex: mips16/soft-float/el -# -# SUPPORT_LIB_DIR: some toolchains, such as recent Linaro toolchains, -# store GCC support libraries (libstdc++, -# libgcc_s, etc.) outside of the sysroot. In -# this case, SUPPORT_LIB_DIR is set to a -# non-empty value, and points to the directory -# where these support libraries are -# available. Those libraries will be copied to -# our sysroot, and the directory will also be -# considered when searching libraries for copy -# to the target filesystem. -# -# Please be very careful to check the major toolchain sources: -# Buildroot, Crosstool-NG, CodeSourcery and Linaro -# before doing any modification on the below logic. - -ifeq ($(BR2_STATIC_LIBS),) -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS - $(Q)$(call MESSAGE,"Copying external toolchain libraries to target...") - $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ - $(call copy_toolchain_lib_root,$$libs); \ - done -endef -endif - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),y) -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER - $(Q)$(call MESSAGE,"Copying gdbserver") - $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - gdbserver_found=0 ; \ - for d in $${ARCH_SYSROOT_DIR}/usr \ - $${ARCH_SYSROOT_DIR}/../debug-root/usr \ - $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \ - $(TOOLCHAIN_EXTERNAL_INSTALL_DIR); do \ - if test -f $${d}/bin/gdbserver ; then \ - install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \ - gdbserver_found=1 ; \ - break ; \ - fi ; \ - done ; \ - if [ $${gdbserver_found} -eq 0 ] ; then \ - echo "Could not find gdbserver in external toolchain" ; \ - exit 1 ; \ - fi -endef -endif - -define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS - $(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \ - ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - SUPPORT_LIB_DIR="" ; \ - if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \ - LIBSTDCPP_A_LOCATION=$$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \ - if [ -e "$${LIBSTDCPP_A_LOCATION}" ]; then \ - SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \ - fi ; \ - fi ; \ - if [ "$${SYSROOT_DIR}" == "$${ARCH_SYSROOT_DIR}" ] ; then \ - ARCH_SUBDIR="" ; \ - elif [ "`dirname $${ARCH_SYSROOT_DIR}`" = "`dirname $${SYSROOT_DIR}`" ] ; then \ - SYSROOT_DIR_DIRNAME=`dirname $${SYSROOT_DIR}`/ ; \ - ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR_DIRNAME}(.*)/$$:\1:"` ; \ - else \ - ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \ - fi ; \ - $(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \ - $(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) -endef - -# Create a symlink from (usr/)$(ARCH_LIB_DIR) to lib. -# Note: the skeleton package additionally creates lib32->lib or lib64->lib -# (as appropriate) -# -# $1: destination directory (TARGET_DIR / STAGING_DIR) -create_lib_symlinks = \ - $(Q)DESTDIR="$(strip $1)" ; \ - ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - if [ ! -e "$${DESTDIR}/$${ARCH_LIB_DIR}" -a ! -e "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ]; then \ - ln -snf lib "$${DESTDIR}/$${ARCH_LIB_DIR}" ; \ - ln -snf lib "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ; \ - fi - -define TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK - $(call create_lib_symlinks,$(STAGING_DIR)) -endef - -define TOOLCHAIN_EXTERNAL_CREATE_TARGET_LIB_SYMLINK - $(call create_lib_symlinks,$(TARGET_DIR)) -endef - -# -# Generate gdbinit file for use with Buildroot -# -define TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT - $(Q)if test -f $(TARGET_CROSS)gdb ; then \ - $(call MESSAGE,"Installing gdbinit"); \ - $(gen_gdbinit_file); \ - fi -endef - -# Various utility functions used by the external toolchain based on musl. - -# musl does not provide an implementation for sys/queue.h or sys/cdefs.h. -# So, add the musl-compat-headers package that will install those files, -# into the staging directory: -# sys/queue.h: header from NetBSD -# sys/cdefs.h: minimalist header bundled in Buildroot -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -TOOLCHAIN_EXTERNAL_DEPENDENCIES += musl-compat-headers -endif - -# With the musl C library, the libc.so library directly plays the role -# of the dynamic library loader. We just need to create a symbolic -# link to libc.so with the appropriate name. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) -ifeq ($(BR2_i386),y) -MUSL_ARCH = i386 -else ifeq ($(BR2_ARM_EABIHF),y) -MUSL_ARCH = armhf -else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:y) -MUSL_ARCH = mipsel-sf -else ifeq ($(BR2_sh),y) -MUSL_ARCH = sh -else -MUSL_ARCH = $(ARCH) -endif -define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK - ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1 -endef -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK -endif - -# -# Various functions used by the external toolchain package -# infrastructure to handle the Blackfin specific -# BR2_BFIN_INSTALL_FDPIC_SHARED and BR2_BFIN_INSTALL_FLAT_SHARED -# options. -# - -# Special installation target used on the Blackfin architecture when -# FDPIC is not the primary binary format being used, but the user has -# nonetheless requested the installation of the FDPIC libraries to the -# target filesystem. -ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y) -define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC - $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to staging...") - $(Q)FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \ - FDPIC_SYSROOT_DIR="$(call toolchain_find_sysroot,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - FDPIC_LIB_DIR="$(call toolchain_find_libdir,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - FDPIC_SUPPORT_LIB_DIR="" ; \ - if test `find $${FDPIC_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \ - FDPIC_LIBSTDCPP_A_LOCATION=$$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \ - if [ -e "$${FDPIC_LIBSTDCPP_A_LOCATION}" ]; then \ - FDPIC_SUPPORT_LIB_DIR=`readlink -f $${FDPIC_LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \ - fi ; \ - fi ; \ - $(call copy_toolchain_sysroot,$${FDPIC_SYSROOT_DIR},$${FDPIC_SYSROOT_DIR},,$${FDPIC_LIB_DIR},$${FDPIC_SUPPORT_LIB_DIR}) -endef -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FDPIC - $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") - $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ - $(call copy_toolchain_lib_root,$$libs); \ - done -endef -endif - -# Special installation target used on the Blackfin architecture when -# shared FLAT is not the primary format being used, but the user has -# nonetheless requested the installation of the shared FLAT libraries -# to the target filesystem. The flat libraries are found and linked -# according to the index in name "libN.so". Index 1 is reserved for -# the standard C library. Customer libraries can use 4 and above. -ifeq ($(BR2_BFIN_INSTALL_FLAT_SHARED),y) -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FLAT - $(Q)$(call MESSAGE,"Install external toolchain FLAT libraries to target...") - $(Q)FLAT_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))../../bfin-uclinux/bin/bfin-uclinux-gcc ; \ - FLAT_LIBC_A_LOCATION=`$${FLAT_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -mid-shared-library -print-file-name=libc`; \ - if [ -f $${FLAT_LIBC_A_LOCATION} -a ! -h $${FLAT_LIBC_A_LOCATION} ] ; then \ - $(INSTALL) -D $${FLAT_LIBC_A_LOCATION} $(TARGET_DIR)/lib/lib1.so; \ - fi -endef -endif - -# uClibc-ng dynamic loader is called ld-uClibc.so.1, but gcc is not -# patched specifically for uClibc-ng, so it continues to generate -# binaries that expect the dynamic loader to be named ld-uClibc.so.0, -# like with the original uClibc. Therefore, we create an additional -# symbolic link to make uClibc-ng systems work properly. -define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO - $(Q)if test -e $(TARGET_DIR)/lib/ld-uClibc.so.1; then \ - ln -sf ld-uClibc.so.1 $(TARGET_DIR)/lib/ld-uClibc.so.0 ; \ - fi - $(Q)if test -e $(TARGET_DIR)/lib/ld64-uClibc.so.1; then \ - ln -sf ld64-uClibc.so.1 $(TARGET_DIR)/lib/ld64-uClibc.so.0 ; \ - fi -endef +# All the definition that are common between the toolchain-external +# generic package and the toolchain-external-package infrastructure +# can be found in pkg-toolchain-external.mk TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO From 1c99d70e5210f9d7b475736e0360ed63d16584f2 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 7 Nov 2016 02:19:59 +0100 Subject: [PATCH 1474/3392] toolchain-external: introduce toolchain-external-package The toolchain-external-package infrastructure is just a copy of the toolchain-external commands, replacing TOOLCHAIN_EXTERNAL by $(2) and adding double-dollars everywhere. toolchain-external itself is converted to a virtual package, but it is faked a little to make sue the toolchains that haven't been converted to toolchain-external-package yet keep on working. The TOOLCHAIN_EXTERNAL_MOVE commands don't have to be redefined for every toolchain-external-package instance, so that is moved out into the common part of pkg-toolchain-external.mk. The musl-compat-headers dependency stays in the toolchain-external package itself. The musl ld link is duplicated in the legacy toolchain-external and the toolchain-external-package, because they have separate hooks. The handling of TOOLCHAIN_EXTERNAL_BIN deserves some special attention, because its value will be different for different toolchain-external-package instances. However, the value only depends on variables that are set by Kconfig (BR2_TOOLCHAIN_EXTERNAL_PREFIX and BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD) so it can easily be used in the generic part. So we don't have to do anything specific for this variable after all. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas Petazzoni Cc: Romain Naour Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 8 ++ .../pkg-toolchain-external.mk | 124 ++++++++++++++++-- .../toolchain-external/toolchain-external.mk | 48 +++++-- 3 files changed, 159 insertions(+), 21 deletions(-) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 5324599bf7..65a4216cd8 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -667,6 +667,14 @@ config BR2_TOOLCHAIN_EXTERNAL_MUSL # Compatibility headers: cdefs.h, queue.h select BR2_PACKAGE_MUSL_COMPAT_HEADERS +# Make sure the virtual-package infra checks the provider +config BR2_PACKAGE_HAS_TOOLCHAIN_EXTERNAL + bool + default y + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + string + if BR2_TOOLCHAIN_EXTERNAL_CUSTOM choice diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 583b0d6cf1..3cac5202d3 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -98,6 +98,17 @@ TOOLCHAIN_EXTERNAL_CXX = $(TOOLCHAIN_EXTERNAL_CROSS)g++$(TOOLCHAIN_EXTERNAL_SUFF TOOLCHAIN_EXTERNAL_FC = $(TOOLCHAIN_EXTERNAL_CROSS)gfortran$(TOOLCHAIN_EXTERNAL_SUFFIX) TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf$(TOOLCHAIN_EXTERNAL_SUFFIX) +# Normal handling of downloaded toolchain tarball extraction. +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) +# As a regular package, the toolchain gets extracted in $(@D), but +# since it's actually a fairly special package, we need it to be moved +# into TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR. +define TOOLCHAIN_EXTERNAL_MOVE + rm -rf $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) + mkdir -p $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) + mv $(@D)/* $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)/ +endef +endif # # Definitions of the list of libraries that should be copied to the target. @@ -474,15 +485,6 @@ endef # Various utility functions used by the external toolchain based on musl. -# musl does not provide an implementation for sys/queue.h or sys/cdefs.h. -# So, add the musl-compat-headers package that will install those files, -# into the staging directory: -# sys/queue.h: header from NetBSD -# sys/cdefs.h: minimalist header bundled in Buildroot -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -TOOLCHAIN_EXTERNAL_DEPENDENCIES += musl-compat-headers -endif - # With the musl C library, the libc.so library directly plays the role # of the dynamic library loader. We just need to create a symbolic # link to libc.so with the appropriate name. @@ -501,7 +503,6 @@ endif define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1 endef -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK endif # @@ -568,3 +569,106 @@ define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO ln -sf ld64-uClibc.so.1 $(TARGET_DIR)/lib/ld64-uClibc.so.0 ; \ fi endef + + +################################################################################ +# inner-toolchain-external-package -- defines the generic installation rules +# for external toolchain packages +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including a HOST_ prefix +# for host packages +# argument 3 is the uppercase package name, without the HOST_ prefix +# for host packages +# argument 4 is the type (target or host) +################################################################################ +define inner-toolchain-external-package + +$(2)_INSTALL_STAGING = YES +$(2)_ADD_TOOLCHAIN_DEPENDENCY = NO + +# In fact, we don't need to download the toolchain, since it is already +# available on the system, so force the site and source to be empty so +# that nothing will be downloaded/extracted. +ifeq ($$(BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED),y) +$(2)_SITE = +$(2)_SOURCE = +endif + +ifeq ($$(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) +$(2)_EXCLUDES = usr/lib/locale/* + +$(2)_POST_EXTRACT_HOOKS += \ + TOOLCHAIN_EXTERNAL_MOVE +endif + +# Checks for an already installed toolchain: check the toolchain +# location, check that it is usable, and then verify that it +# matches the configuration provided in Buildroot: ABI, C++ support, +# kernel headers version, type of C library and all C library features. +define $(2)_CONFIGURE_CMDS + $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ + $$(call check_kernel_headers_version,\ + $$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC)),\ + $$(call qstrip,$$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))); \ + $$(call check_gcc_version,$$(TOOLCHAIN_EXTERNAL_CC),\ + $$(call qstrip,$$(BR2_TOOLCHAIN_GCC_AT_LEAST))); \ + if test "$$(BR2_arm)" = "y" ; then \ + $$(call check_arm_abi,\ + "$$(TOOLCHAIN_EXTERNAL_CC) $$(TOOLCHAIN_EXTERNAL_CFLAGS)",\ + $$(TOOLCHAIN_EXTERNAL_READELF)) ; \ + fi ; \ + if test "$$(BR2_INSTALL_LIBSTDCPP)" = "y" ; then \ + $$(call check_cplusplus,$$(TOOLCHAIN_EXTERNAL_CXX)) ; \ + fi ; \ + if test "$$(BR2_TOOLCHAIN_HAS_FORTRAN)" = "y" ; then \ + $$(call check_fortran,$$(TOOLCHAIN_EXTERNAL_FC)) ; \ + fi ; \ + if test "$$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)" = "y" ; then \ + $$(call check_uclibc,$$$${SYSROOT_DIR}) ; \ + elif test "$$(BR2_TOOLCHAIN_EXTERNAL_MUSL)" = "y" ; then \ + $$(call check_musl,$$$${SYSROOT_DIR}) ; \ + else \ + $$(call check_glibc,$$$${SYSROOT_DIR}) ; \ + fi + $$(Q)$$(call check_toolchain_ssp,$$(TOOLCHAIN_EXTERNAL_CC)) +endef + +$(2)_TOOLCHAIN_WRAPPER_ARGS += $$(TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS) + +$(2)_BUILD_CMDS = $$(TOOLCHAIN_WRAPPER_BUILD) + +define $(2)_INSTALL_STAGING_CMDS + $$(TOOLCHAIN_WRAPPER_INSTALL) + $$(TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK) + $$(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS) + $$(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC) + $$(TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER) + $$(TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT) +endef + +ifeq ($$(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) +$(2)_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK +endif + +# Even though we're installing things in both the staging, the host +# and the target directory, we do everything within the +# install-staging step, arbitrarily. +define $(2)_INSTALL_TARGET_CMDS + $$(TOOLCHAIN_EXTERNAL_CREATE_TARGET_LIB_SYMLINK) + $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS) + $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER) + $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FDPIC) + $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FLAT) + $$(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO) +endef + +# Call the generic package infrastructure to generate the necessary +# make targets +$(call inner-generic-package,$(1),$(2),$(3),$(4)) + +endef + +toolchain-external-package = $(call inner-toolchain-external-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index be1b5e4bee..bcbcb2ef96 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -4,12 +4,31 @@ # ################################################################################ +TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO + +# musl does not provide an implementation for sys/queue.h or sys/cdefs.h. +# So, add the musl-compat-headers package that will install those files, +# into the staging directory: +# sys/queue.h: header from NetBSD +# sys/cdefs.h: minimalist header bundled in Buildroot +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +TOOLCHAIN_EXTERNAL_DEPENDENCIES += musl-compat-headers +endif + # All the definition that are common between the toolchain-external # generic package and the toolchain-external-package infrastructure # can be found in pkg-toolchain-external.mk +# Legacy toolchains that don't use the toolchain-external-package infrastructure +# yet. We can recognise that because no provider is set. +ifeq ($(call qstrip,$(BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL)),) + +# Now we are the provider. However, we can't set it to ourselves or we'll get a +# circular dependency. Let's set it to a target that we always depend on +# instead. +BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL = skeleton + TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES -TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO # In fact, we don't need to download the toolchain, since it is already # available on the system, so force the site and source to be empty so @@ -201,18 +220,9 @@ TOOLCHAIN_EXTERNAL_ACTUAL_SOURCE_TARBALL ?= \ $(subst -i686-pc-linux-gnu.tar.bz2,.src.tar.bz2,$(subst -i686-pc-linux-gnu-i386-linux.tar.bz2,-i686-pc-linux-gnu.src.tar.bz2,$(TOOLCHAIN_EXTERNAL_SOURCE))) endif -# Normal handling of downloaded toolchain tarball extraction. ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) TOOLCHAIN_EXTERNAL_EXCLUDES = usr/lib/locale/* -# As a regular package, the toolchain gets extracted in $(@D), but -# since it's actually a fairly special package, we need it to be moved -# into TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR. -define TOOLCHAIN_EXTERNAL_MOVE - rm -rf $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) - mkdir -p $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) - mv $(@D)/* $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR)/ -endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += \ TOOLCHAIN_EXTERNAL_MOVE endif @@ -262,6 +272,10 @@ define TOOLCHAIN_EXTERNAL_INSTALL_STAGING_CMDS $(TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT) endef +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) +TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK +endif + # Even though we're installing things in both the staging, the host # and the target directory, we do everything within the # install-staging step, arbitrarily. @@ -274,5 +288,17 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_CMDS $(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO) endef -$(eval $(generic-package)) +endif # BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + +# Since a virtual package is just a generic package, we can still +# define commands for the legacy toolchains. +$(eval $(virtual-package)) + +# Ensure the external-toolchain package has a prefix defined. +# This comes after the virtual-package definition, which checks the provider. +ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) +ifeq ($(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)),) +$(error No prefix selected for external toolchain package $(BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL). Configuration error) +endif +endif From f1f2ae5f26af4b5c76fb86e0203344fb5fcea346 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:00 +0100 Subject: [PATCH 1475/3392] toolchain-external-linaro-aarch64: new package This commit adds a new package for the Linaro external toolchain for the AArch64 architecture. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 30 ++++++++----------- .../Config.in | 15 ++++++++++ .../Config.in.options | 9 ++++++ .../toolchain-external-linaro-aarch64.hash | 3 ++ .../toolchain-external-linaro-aarch64.mk | 16 ++++++++++ .../toolchain-external.hash | 4 +-- .../toolchain-external/toolchain-external.mk | 9 ++---- 7 files changed, 59 insertions(+), 27 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 65a4216cd8..096f435d02 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -8,6 +8,12 @@ choice comment "glibc toolchains only available with shared lib support" depends on BR2_STATIC_LIBS +# Kept toolchains sorted by architecture in order to use some toolchain +# as default choice + +# Aarch64 (use Linaro toolchain by default) +source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in" + comment "Linaro toolchains available for Cortex-A + EABIhf" depends on BR2_arm || BR2_armeb depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF @@ -485,22 +491,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX Toolchain for the Blackfin architecture, from http://blackfin.uclinux.org. -config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 - bool "Linaro AArch64 2016.05" - depends on BR2_aarch64 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Toolchain for the AArch64 architecture, from - http://www.linaro.org/engineering/armv8/ - config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 bool "CodeSourcery AArch64 2014.11" depends on BR2_aarch64 @@ -628,7 +618,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE - default "aarch64-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 default "aarch64-amd-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 default "mips-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS default "nios2-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII @@ -675,6 +664,13 @@ config BR2_PACKAGE_HAS_TOOLCHAIN_EXTERNAL config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL string +# Kept toolchains sorted as in the choice above +# The toolchain Config.in.options must define +# BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL and BR2_TOOLCHAIN_EXTERNAL_PREFIX + +# Aarch64 +source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options" + if BR2_TOOLCHAIN_EXTERNAL_CUSTOM choice diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in new file mode 100644 index 0000000000..662f7d7449 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in @@ -0,0 +1,15 @@ +config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 + bool "Linaro AArch64 2016.05" + depends on BR2_aarch64 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + select BR2_TOOLCHAIN_HAS_FORTRAN + help + Toolchain for the AArch64 architecture, from + http://www.linaro.org/engineering/armv8/ diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options new file mode 100644 index 0000000000..099c6c0d07 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "aarch64-linux-gnu" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-linaro-aarch64" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash new file mode 100644 index 0000000000..7a2c038181 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d43227248f282a652da42322fcf4abfd3021f2a2f62e0cf6e242d82f55966ba9 gcc-linaro-5.3.1-2016.05-i686_aarch64-linux-gnu.tar.xz +sha256 1941dcf6229d6706bcb89b7976d5d43d170efdd17c27d5fe1738e7ecf22adc37 gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk new file mode 100644 index 0000000000..a0543a75e4 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# toolchain-external-linaro-aarch64 +# +################################################################################ + +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2016.05 +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu + +ifeq ($(HOSTARCH),x86) +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz +else +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz +endif + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 41c2ab3ace..fd1bc6d5f8 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -34,13 +34,11 @@ sha256 f2febf3b3c565536461ad4405f1bcb835d75a6afb2a8bec958a1248cb4b81fc7 arago-2 sha256 254af7d02eb3bcc8345c78e131700bc995d65b68232caaed21150a5fd1456070 arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2 sha256 25fbf0513ad7322b15cbaae964cafadcbb4c939f2708f57f40b8f9f2d601122b arago-toolchain-2011.09-sources.tar.bz2 -# ARM and Aarch64 toolchains from Linaro +# ARM toolchains from Linaro sha256 f1421c580ce977226f4fefc9c409b3b423260cc65a6e9dc6da88bb3478a521a0 gcc-linaro-5.3.1-2016.05-i686_arm-linux-gnueabihf.tar.xz sha256 987941c9fffdf56ffcbe90e8984673c16648c477b537fcf43add22fa62f161cd gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz sha256 f6e9c0d3320760fe8f89e9ec3acdd7b4da7eff889c094b4a2acc286fd46f334f gcc-linaro-5.3.1-2016.05-i686_armeb-linux-gnueabihf.tar.xz sha256 6cf41c8944be56279cc14992aa075174b7a4c5938502536266eaaeef048f9440 gcc-linaro-5.3.1-2016.05-x86_64_armeb-linux-gnueabihf.tar.xz -sha256 d43227248f282a652da42322fcf4abfd3021f2a2f62e0cf6e242d82f55966ba9 gcc-linaro-5.3.1-2016.05-i686_aarch64-linux-gnu.tar.xz -sha256 1941dcf6229d6706bcb89b7976d5d43d170efdd17c27d5fe1738e7ecf22adc37 gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu.tar.xz # Codescape toolchains from Imagination Technologies # From: http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-03/downloads.html diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index bcbcb2ef96..8a3e4daa72 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -148,13 +148,6 @@ TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2014R1-RC2.i386.tar.bz2 TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2 TOOLCHAIN_EXTERNAL_STRIP_COMPONENTS = 3 TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64),y) -TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/aarch64-linux-gnu -ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-i686_aarch64-linux-gnu.tar.xz -else -TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu.tar.xz -endif else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64),y) TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/aarch64-amd-linux-gnu TOOLCHAIN_EXTERNAL_SOURCE = aarch64-amd-2014.11-95-aarch64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 @@ -302,3 +295,5 @@ ifeq ($(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)),) $(error No prefix selected for external toolchain package $(BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL). Configuration error) endif endif + +include toolchain/toolchain-external/*/*.mk From f0f2498c7f4e0b6cb6afeb752d885bf9ea821b83 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:01 +0100 Subject: [PATCH 1476/3392] toolchain-external-codesourcery-aarch64: new package This commit adds a new package for the Sourcery CodeBench external toolchain for the AArch64 architecture. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 21 ++---------------- .../Config.in | 17 ++++++++++++++ .../Config.in.options | 9 ++++++++ ...olchain-external-codesourcery-aarch64.hash | 3 +++ ...toolchain-external-codesourcery-aarch64.mk | 22 +++++++++++++++++++ .../toolchain-external.hash | 3 --- .../toolchain-external/toolchain-external.mk | 11 ---------- 7 files changed, 53 insertions(+), 33 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 096f435d02..ecf96189bb 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -13,6 +13,7 @@ comment "glibc toolchains only available with shared lib support" # Aarch64 (use Linaro toolchain by default) source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in" +source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in" comment "Linaro toolchains available for Cortex-A + EABIhf" depends on BR2_arm || BR2_armeb @@ -491,24 +492,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX Toolchain for the Blackfin architecture, from http://blackfin.uclinux.org. -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - bool "CodeSourcery AArch64 2014.11" - depends on BR2_aarch64 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - help - Sourcery CodeBench toolchain for the AArch64 architecture, - from Mentor Graphics. It uses gcc 4.9.1, binutils - 2.24.51.20140217, glibc 2.20, gdb 7.7.50 and kernel headers - 3.16.2. - config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS bool "Musl 1.1.12 toolchain" depends on (BR2_arm && BR2_ARM_EABI && BR2_USE_MMU) || \ @@ -618,7 +601,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE - default "aarch64-amd-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 default "mips-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS default "nios2-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII default "sh-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH @@ -670,6 +652,7 @@ config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL # Aarch64 source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options" +source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options" if BR2_TOOLCHAIN_EXTERNAL_CUSTOM diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in new file mode 100644 index 0000000000..2fbb218ecc --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in @@ -0,0 +1,17 @@ +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 + bool "CodeSourcery AArch64 2014.11" + depends on BR2_aarch64 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + help + Sourcery CodeBench toolchain for the AArch64 architecture, + from Mentor Graphics. It uses gcc 4.9.1, binutils + 2.24.51.20140217, glibc 2.20, gdb 7.7.50 and kernel headers + 3.16.2. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options new file mode 100644 index 0000000000..1eab839216 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "aarch64-amd-linux-gnu" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-codesourcery-aarch64" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash new file mode 100644 index 0000000000..f7d3f29fdc --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 405aada821146755c5f2df566375c2a682456d6b8451ee47b88cf1a52b093676 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 3f50dd6ee433eb5b6992a1071b988e50379a738f54f58722bc60081613764716 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk new file mode 100644 index 0000000000..bc58c44c71 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# toolchain-external-codesourcery-aarch64 +# +################################################################################ + +TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION = 2014.11-95 +TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SOURCE = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 +TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_ACTUAL_SOURCE_TARBALL = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 + +define TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_STAGING_FIXUP + ln -sf ld-2.20.so $(STAGING_DIR)/lib/ld-linux-aarch64.so.1 +endef +TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_STAGING_FIXUP + +define TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_TARGET_FIXUP + ln -sf ld-2.20.so $(TARGET_DIR)/lib/ld-linux-aarch64.so.1 +endef +TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_TARGET_FIXUP + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index fd1bc6d5f8..666cd0234c 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -21,9 +21,6 @@ sha256 1a9519e415a1e6892c760bf21f7e98f3a633a9d1c5bb8781a96d338e4dd62717 ia32-20 # AMD64 sha256 3c31206c8b9277f409ee00e4777ba82dfa6da2a4ca0926501cd5fb6bbd1b407e amd-2015.11-139-x86_64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 sha256 0b673f5035f97d5d03c31272cddab0f117d39ad76a5ad2a3bc98c156571527de amd-2015.11-139-x86_64-amd-linux-gnu.src.tar.bz2 -# Aarch64 -sha256 405aada821146755c5f2df566375c2a682456d6b8451ee47b88cf1a52b093676 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 3f50dd6ee433eb5b6992a1071b988e50379a738f54f58722bc60081613764716 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu.src.tar.bz2 # MIPS sha256 d354447c4c5160439dafd5464fa3a0266dd41e79f973477238e4f0215a6b5397 mips-2016.05-8-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2 sha256 2658e55d5b71bba25d6f77e868e18b200ea5f75c8add7ed3a9266e716d9adfff mips-2016.05-8-mips-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 8a3e4daa72..2571539227 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -148,17 +148,6 @@ TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2014R1-RC2.i386.tar.bz2 TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2 TOOLCHAIN_EXTERNAL_STRIP_COMPONENTS = 3 TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64),y) -TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/aarch64-amd-linux-gnu -TOOLCHAIN_EXTERNAL_SOURCE = aarch64-amd-2014.11-95-aarch64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 -define TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_STAGING_FIXUP - ln -sf ld-2.20.so $(STAGING_DIR)/lib/ld-linux-aarch64.so.1 -endef -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_STAGING_FIXUP -define TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_TARGET_FIXUP - ln -sf ld-2.20.so $(TARGET_DIR)/lib/ld-linux-aarch64.so.1 -endef -TOOLCHAIN_EXTERNAL_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_TARGET_FIXUP else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS),y) TOOLCHAIN_EXTERNAL_VERSION = 1.1.12 TOOLCHAIN_EXTERNAL_SITE = https://googledrive.com/host/0BwnS5DMB0YQ6bDhPZkpOYVFhbk0/musl-$(TOOLCHAIN_EXTERNAL_VERSION) From 21cb9d4c8adb65ccfd64ed82ddff23e9fae4595d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:02 +0100 Subject: [PATCH 1477/3392] toolchain-external-linaro-arm: new package This commit adds a new package for the Linaro external toolchain for the ARM architecture. The legacy implementation is removed. The comment about availability is duplicated for arm and armeb. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 32 ++++--------------- .../toolchain-external-linaro-arm/Config.in | 27 ++++++++++++++++ .../Config.in.options | 9 ++++++ .../toolchain-external-linaro-arm.hash | 3 ++ .../toolchain-external-linaro-arm.mk | 16 ++++++++++ .../toolchain-external.hash | 2 -- .../toolchain-external/toolchain-external.mk | 7 ---- 7 files changed, 62 insertions(+), 34 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index ecf96189bb..bffb9fd969 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -15,34 +15,14 @@ comment "glibc toolchains only available with shared lib support" source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in" source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in" +# ARM (use Linaro toolchain by default) +source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" + comment "Linaro toolchains available for Cortex-A + EABIhf" - depends on BR2_arm || BR2_armeb + depends on BR2_armeb depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS -config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM - bool "Linaro ARM 2016.05" - depends on BR2_arm - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_ARM_EABIHF - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Linaro toolchain for the ARM architecture. It uses Linaro - GCC 2016.05 (based on gcc 5.3.1), Linaro GDB 2016.05 (based on - GDB 7.11.1), glibc 2.21, Binutils 2016.05 (based on 2.25). It - generates code that runs on all Cortex-A profile devices, - but tuned for the Cortex-A9. The code generated is Thumb 2, - with the hard floating point calling convention, and uses - the VFPv3-D16 FPU instructions. - config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB bool "Linaro armeb 2016.05" depends on BR2_armeb @@ -596,7 +576,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX string default "arc-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arcle default "arceb-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arceb - default "arm-linux-gnueabihf" if BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM default "armeb-linux-gnueabihf" if BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A @@ -654,6 +633,9 @@ config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options" +# ARM +source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options" + if BR2_TOOLCHAIN_EXTERNAL_CUSTOM choice diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in new file mode 100644 index 0000000000..bf8649acfb --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -0,0 +1,27 @@ +comment "Linaro toolchains available for Cortex-A + EABIhf" + depends on BR2_arm + depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF + depends on !BR2_STATIC_LIBS + +config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM + bool "Linaro ARM 2016.05" + depends on BR2_arm + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_ARM_EABIHF + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + select BR2_TOOLCHAIN_HAS_FORTRAN + help + Linaro toolchain for the ARM architecture. It uses Linaro + GCC 2016.05 (based on gcc 5.3.1), Linaro GDB 2016.05 (based on + GDB 7.11.1), glibc 2.21, Binutils 2016.05 (based on 2.25). It + generates code that runs on all Cortex-A profile devices, + but tuned for the Cortex-A9. The code generated is Thumb 2, + with the hard floating point calling convention, and uses + the VFPv3-D16 FPU instructions. diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options new file mode 100644 index 0000000000..dcbc6599d9 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "arm-linux-gnueabihf" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-linaro-arm" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash new file mode 100644 index 0000000000..8106426214 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f1421c580ce977226f4fefc9c409b3b423260cc65a6e9dc6da88bb3478a521a0 gcc-linaro-5.3.1-2016.05-i686_arm-linux-gnueabihf.tar.xz +sha256 987941c9fffdf56ffcbe90e8984673c16648c477b537fcf43add22fa62f161cd gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk new file mode 100644 index 0000000000..64918cac02 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# toolchain-external-linaro-arm +# +################################################################################ + +TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2016.05 +TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf + +ifeq ($(HOSTARCH),x86) +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz +else +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz +endif + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 666cd0234c..945bf210d8 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -32,8 +32,6 @@ sha256 254af7d02eb3bcc8345c78e131700bc995d65b68232caaed21150a5fd1456070 arago-2 sha256 25fbf0513ad7322b15cbaae964cafadcbb4c939f2708f57f40b8f9f2d601122b arago-toolchain-2011.09-sources.tar.bz2 # ARM toolchains from Linaro -sha256 f1421c580ce977226f4fefc9c409b3b423260cc65a6e9dc6da88bb3478a521a0 gcc-linaro-5.3.1-2016.05-i686_arm-linux-gnueabihf.tar.xz -sha256 987941c9fffdf56ffcbe90e8984673c16648c477b537fcf43add22fa62f161cd gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz sha256 f6e9c0d3320760fe8f89e9ec3acdd7b4da7eff889c094b4a2acc286fd46f334f gcc-linaro-5.3.1-2016.05-i686_armeb-linux-gnueabihf.tar.xz sha256 6cf41c8944be56279cc14992aa075174b7a4c5938502536266eaaeef048f9440 gcc-linaro-5.3.1-2016.05-x86_64_armeb-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 2571539227..410ff18ed6 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -101,13 +101,6 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS rm -rf $(@D)/arago-2011.09/ endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM),y) -TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/arm-linux-gnueabihf -ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-i686_arm-linux-gnueabihf.tar.xz -else -TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz -endif else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB),y) TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/armeb-linux-gnueabihf ifeq ($(HOSTARCH),x86) From 5b3c5b336b9a6f8341167686f3dbf52b1b0e722b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:03 +0100 Subject: [PATCH 1478/3392] toolchain-external-codesourcery-arm: new package This commit adds a new package for the Sourcery CodeBench external toolchain for the ARM architecture. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 37 +------------------ .../Config.in | 33 +++++++++++++++++ .../Config.in.options | 9 +++++ .../toolchain-external-codesourcery-arm.hash | 3 ++ .../toolchain-external-codesourcery-arm.mk | 13 +++++++ .../toolchain-external.hash | 3 -- .../toolchain-external/toolchain-external.mk | 5 +-- 7 files changed, 61 insertions(+), 42 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index bffb9fd969..dfc8e70a03 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -17,6 +17,7 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Con # ARM (use Linaro toolchain by default) source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" +source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in" comment "Linaro toolchains available for Cortex-A + EABIhf" depends on BR2_armeb @@ -45,40 +46,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB generated is Thumb 2, with the hard floating point calling convention, and uses the VFPv3-D16 FPU instructions. -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM - bool "Sourcery CodeBench ARM 2014.05" - depends on BR2_arm - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_ARM_EABI - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - help - Sourcery CodeBench toolchain for the ARM architecture, from - Mentor Graphics. It uses gcc 4.8.3, binutils 2.24.51, glibc - 2.18 and gdb 7.7.50, kernel headers 3.13. It has support - for the following variants: - - ARMv5TE, little endian, soft-float, glibc - Select ARM926T, ARM10T, XScale or another ARMv5 core - Select BR2_SOFT_FLOAT - - ARMv4T, little endian, soft-float, glibc - Select ARM720T, ARM920T, ARM922T or another ARMv4 core - Select BR2_SOFT_FLOAT - - ARMv7-A, Thumb 2, little endian, soft-float, glibc - Select Cortex-A8, Cortex-A9 or another ARMv7-A core - Select BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mthumb - -comment "Sourcery CodeBench toolchains available for the EABI ABI" - depends on BR2_arm - depends on !BR2_ARM_EABI - depends on !BR2_STATIC_LIBS - config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" depends on BR2_arm @@ -577,7 +544,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arc-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arcle default "arceb-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arceb default "armeb-linux-gnueabihf" if BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB - default "arm-none-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE default "mips-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS @@ -635,6 +601,7 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Con # ARM source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options" +source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options" if BR2_TOOLCHAIN_EXTERNAL_CUSTOM diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in new file mode 100644 index 0000000000..037985b06a --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in @@ -0,0 +1,33 @@ +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM + bool "Sourcery CodeBench ARM 2014.05" + depends on BR2_arm + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_ARM_EABI + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + Sourcery CodeBench toolchain for the ARM architecture, from + Mentor Graphics. It uses gcc 4.8.3, binutils 2.24.51, glibc + 2.18 and gdb 7.7.50, kernel headers 3.13. It has support + for the following variants: + - ARMv5TE, little endian, soft-float, glibc + Select ARM926T, ARM10T, XScale or another ARMv5 core + Select BR2_SOFT_FLOAT + - ARMv4T, little endian, soft-float, glibc + Select ARM720T, ARM920T, ARM922T or another ARMv4 core + Select BR2_SOFT_FLOAT + - ARMv7-A, Thumb 2, little endian, soft-float, glibc + Select Cortex-A8, Cortex-A9 or another ARMv7-A core + Select BR2_SOFT_FLOAT + Set BR2_TARGET_OPTIMIZATION to -mthumb + +comment "Sourcery CodeBench toolchains available for the EABI ABI" + depends on BR2_arm + depends on !BR2_ARM_EABI + depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options new file mode 100644 index 0000000000..7f3654dc70 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "arm-none-linux-gnueabi" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-codesourcery-arm" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash new file mode 100644 index 0000000000..535f4aaf99 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 39ee0e789034334ecc89af94e838e3a4815400ac5ff980f808f466b04778532e arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 +sha256 e16a5b1e41d7ff1e74161f9405182001bc8d1360d89564e73911032e6966cc0d arm-2014.05-29-arm-none-linux-gnueabi.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk new file mode 100644 index 0000000000..f96a0e0b6e --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# toolchain-external-codesourcery-arm +# +################################################################################ + +TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION = 2014.05-29 + +TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SOURCE = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 +TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_ACTUAL_SOURCE_TARBALL = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 945bf210d8..d2cf44b32d 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -6,9 +6,6 @@ sha256 e424e90d8481d942a40266d78d1488726561fed3ec38403094f98055e61889d0 blackfi sha256 c65b1b4b918d5185349d62a3b7bf43b4b21e1175c52598ec047ca56b3f11d857 blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2 # Mentor's Sourcery CodeBench Lite toolchains -# ARM -sha256 39ee0e789034334ecc89af94e838e3a4815400ac5ff980f808f466b04778532e arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 -sha256 e16a5b1e41d7ff1e74161f9405182001bc8d1360d89564e73911032e6966cc0d arm-2014.05-29-arm-none-linux-gnueabi.src.tar.bz2 # NiosII sha256 750639290744adda931c81fa2cd2ffc2bde972488047824dcfaa53c42562191d sourceryg++-2016.05-10-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 sha256 3dc1c2685c0472059547dd7becb5dc991541b8176af39fa7aa5f601d38b9879a sourceryg++-2016.05-10-nios2-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 410ff18ed6..f8d22b47b8 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -80,10 +80,7 @@ define TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT $(TAR) --strip-components=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) - endef -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM),y) -TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi -TOOLCHAIN_EXTERNAL_SOURCE = arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A),y) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A),y) TOOLCHAIN_EXTERNAL_SITE = http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports TOOLCHAIN_EXTERNAL_SOURCE = arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2 TOOLCHAIN_EXTERNAL_ACTUAL_SOURCE_TARBALL = arago-toolchain-2011.09-sources.tar.bz2 From 71a66e8beccc5a3e37310b529bf7782bd466ee4d Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 7 Nov 2016 02:20:04 +0100 Subject: [PATCH 1479/3392] toolchain-external-codesourcery-arm: Cortex-A12 and Cortex-A17 not supported It's gcc 4.8.3 which doesn't support those cores yet. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external-codesourcery-arm/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in index 037985b06a..3cdfc860ab 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in @@ -3,6 +3,8 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM depends on BR2_arm depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABI + # Unsupported ARM cores + depends on !BR2_cortex_a12 && !BR2_cortex_a17 depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP From c428f456383cabc798d436a04e74a95aca1e321b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:05 +0100 Subject: [PATCH 1480/3392] toolchain-external-linaro-armeb: new package This commit adds a new package for the Linaro external toolchain for the ARM Big-endian architecture. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 32 +++---------------- .../toolchain-external-linaro-armeb/Config.in | 26 +++++++++++++++ .../Config.in.options | 9 ++++++ .../toolchain-external-linaro-armeb.hash | 3 ++ .../toolchain-external-linaro-armeb.mk | 16 ++++++++++ .../toolchain-external.hash | 4 --- .../toolchain-external/toolchain-external.mk | 7 ---- 7 files changed, 59 insertions(+), 38 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash create mode 100644 toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index dfc8e70a03..a19e41a34d 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -19,32 +19,8 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Con source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in" -comment "Linaro toolchains available for Cortex-A + EABIhf" - depends on BR2_armeb - depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF - depends on !BR2_STATIC_LIBS - -config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB - bool "Linaro armeb 2016.05" - depends on BR2_armeb - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_ARM_EABIHF - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - help - Linaro toolchain for the ARM big endian architecture. It - uses Linaro GCC 2016.05 (based on gcc 5.3.1), Linaro GDB - 2016.05 (based on GDB 7.11.1), glibc 2.21, Binutils 2016.05 - (based on 2.25). It generates code that runs on all Cortex-A - profile devices, but tuned for the Cortex-A9. The code - generated is Thumb 2, with the hard floating point calling - convention, and uses the VFPv3-D16 FPU instructions. +# ARM big-endian +source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" @@ -543,7 +519,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX string default "arc-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arcle default "arceb-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arceb - default "armeb-linux-gnueabihf" if BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE default "mips-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS @@ -603,6 +578,9 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Con source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options" +# ARM big-endian +source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options" + if BR2_TOOLCHAIN_EXTERNAL_CUSTOM choice diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in new file mode 100644 index 0000000000..ed84c47550 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -0,0 +1,26 @@ +comment "Linaro toolchains available for Cortex-A + EABIhf" + depends on BR2_armeb + depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF + depends on !BR2_STATIC_LIBS + +config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB + bool "Linaro armeb 2016.05" + depends on BR2_armeb + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_ARM_EABIHF + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + help + Linaro toolchain for the ARM big endian architecture. It + uses Linaro GCC 2016.05 (based on gcc 5.3.1), Linaro GDB + 2016.05 (based on GDB 7.11.1), glibc 2.21, Binutils 2016.05 + (based on 2.25). It generates code that runs on all Cortex-A + profile devices, but tuned for the Cortex-A9. The code + generated is Thumb 2, with the hard floating point calling + convention, and uses the VFPv3-D16 FPU instructions. diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options new file mode 100644 index 0000000000..225e90f009 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "armeb-linux-gnueabihf" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-linaro-armeb" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash new file mode 100644 index 0000000000..7952b5087e --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f6e9c0d3320760fe8f89e9ec3acdd7b4da7eff889c094b4a2acc286fd46f334f gcc-linaro-5.3.1-2016.05-i686_armeb-linux-gnueabihf.tar.xz +sha256 6cf41c8944be56279cc14992aa075174b7a4c5938502536266eaaeef048f9440 gcc-linaro-5.3.1-2016.05-x86_64_armeb-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk new file mode 100644 index 0000000000..cf2f3ad2c7 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# toolchain-external-linaro-armeb +# +################################################################################ + +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2016.05 +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf + +ifeq ($(HOSTARCH),x86) +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz +else +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz +endif + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index d2cf44b32d..3740ca4633 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -28,10 +28,6 @@ sha256 f2febf3b3c565536461ad4405f1bcb835d75a6afb2a8bec958a1248cb4b81fc7 arago-2 sha256 254af7d02eb3bcc8345c78e131700bc995d65b68232caaed21150a5fd1456070 arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2 sha256 25fbf0513ad7322b15cbaae964cafadcbb4c939f2708f57f40b8f9f2d601122b arago-toolchain-2011.09-sources.tar.bz2 -# ARM toolchains from Linaro -sha256 f6e9c0d3320760fe8f89e9ec3acdd7b4da7eff889c094b4a2acc286fd46f334f gcc-linaro-5.3.1-2016.05-i686_armeb-linux-gnueabihf.tar.xz -sha256 6cf41c8944be56279cc14992aa075174b7a4c5938502536266eaaeef048f9440 gcc-linaro-5.3.1-2016.05-x86_64_armeb-linux-gnueabihf.tar.xz - # Codescape toolchains from Imagination Technologies # From: http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-03/downloads.html sha256 e3c1f292ac6a9f12480af431c85a7ed9dfa011a52fd62a50be3363ec6b9bc872 Codescape.GNU.Tools.Package.2016.05-03.for.MIPS.IMG.Linux.CentOS-5.x86.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index f8d22b47b8..7dfcac3684 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -98,13 +98,6 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS rm -rf $(@D)/arago-2011.09/ endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB),y) -TOOLCHAIN_EXTERNAL_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/armeb-linux-gnueabihf -ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-i686_armeb-linux-gnueabihf.tar.xz -else -TOOLCHAIN_EXTERNAL_SOURCE = gcc-linaro-5.3.1-2016.05-x86_64_armeb-linux-gnueabihf.tar.xz -endif else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS),y) TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu TOOLCHAIN_EXTERNAL_SOURCE = mips-2016.05-8-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2 From cfacefecc3d3832be1ec3c4c576e7a612067186c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:06 +0100 Subject: [PATCH 1481/3392] toolchain-external-blackfin-uclinux: new package This commit adds a new package for the Analog Devices external toolchain for the Blackfin architecture. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 26 ++++----------- .../Config.in | 17 ++++++++++ .../Config.in.options | 10 ++++++ .../toolchain-external-blackfin-uclinux.hash | 3 ++ .../toolchain-external-blackfin-uclinux.mk | 33 +++++++++++++++++++ .../toolchain-external.hash | 4 --- .../toolchain-external/toolchain-external.mk | 16 --------- 7 files changed, 69 insertions(+), 40 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.hash create mode 100644 toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index a19e41a34d..f8e04f54e8 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -22,6 +22,9 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config. # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" +# Blackfin +source "toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in" + config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" depends on BR2_arm @@ -397,24 +400,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 Other architecture variants (beyond Pentium-4/Xeon) are supported as well, but glibc is not optimised for it. -config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX - bool "Blackfin.uclinux.org 2014R1" - depends on BR2_bfin - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_USE_WCHAR - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Toolchain for the Blackfin architecture, from - http://blackfin.uclinux.org. - config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS bool "Musl 1.1.12 toolchain" depends on (BR2_arm && BR2_ARM_EABI && BR2_USE_MMU) || \ @@ -526,8 +511,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "sh-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 default "x86_64-amd-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 - default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX && BR2_BINFMT_FLAT - default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX && BR2_BINFMT_FDPIC default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABI default "arm-linux-musleabihf" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABIHF default "mips-img-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS @@ -581,6 +564,9 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config. # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options" +# Blackfin +source "toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options" + if BR2_TOOLCHAIN_EXTERNAL_CUSTOM choice diff --git a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in new file mode 100644 index 0000000000..8b299e857c --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in @@ -0,0 +1,17 @@ +config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX + bool "Blackfin.uclinux.org 2014R1" + depends on BR2_bfin + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_USE_WCHAR + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 + select BR2_TOOLCHAIN_HAS_FORTRAN + help + Toolchain for the Blackfin architecture, from + http://blackfin.uclinux.org. diff --git a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options new file mode 100644 index 0000000000..3b7f457eb8 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options @@ -0,0 +1,10 @@ +if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "bfin-uclinux" if BR2_BINFMT_FLAT + default "bfin-linux-uclibc" if BR2_BINFMT_FDPIC + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-blackfin-uclinux" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.hash b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.hash new file mode 100644 index 0000000000..b320d94ef0 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 e424e90d8481d942a40266d78d1488726561fed3ec38403094f98055e61889d0 blackfin-toolchain-2014R1-RC2.i386.tar.bz2 +sha256 c65b1b4b918d5185349d62a3b7bf43b4b21e1175c52598ec047ca56b3f11d857 blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.mk b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.mk new file mode 100644 index 0000000000..0a48220e3d --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# toolchain-external-blackfin-uclinux +# +################################################################################ + +TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION_MAJOR = 2014R1 +TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION = $(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION_MAJOR)-RC2 + +ifeq ($(BR2_BINFMT_FLAT),y) +TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_SUBDIR = bfin-uclinux +else +TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_SUBDIR = bfin-linux-uclibc +endif + +TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_SITE = http://downloads.sourceforge.net/project/adi-toolchain/$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION_MAJOR)/$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION)/i386 +TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_SOURCE = blackfin-toolchain-$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION).i386.tar.bz2 +TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION).i386.tar.bz2 + +TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_STRIP_COMPONENTS = 3 + +# Special handling for Blackfin toolchain, because of the split in two +# tarballs, and the organization of tarball contents. The tarballs +# contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories, +# which themselves contain the toolchain. This is why we strip more +# components than usual. +define TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_UCLIBC_EXTRA_EXTRACT + $(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_EXTRA_DOWNLOADS)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_EXTRA_DOWNLOADS) | \ + $(TAR) --strip-components=3 -C $(@D) $(TAR_OPTIONS) - +endef +TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_UCLIBC_EXTRA_EXTRACT + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 3740ca4633..16c2e19e88 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -1,10 +1,6 @@ ###################################### # Next hashes are all locally computed -# Blackfin toolchains from Analog Devices -sha256 e424e90d8481d942a40266d78d1488726561fed3ec38403094f98055e61889d0 blackfin-toolchain-2014R1-RC2.i386.tar.bz2 -sha256 c65b1b4b918d5185349d62a3b7bf43b4b21e1175c52598ec047ca56b3f11d857 blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2 - # Mentor's Sourcery CodeBench Lite toolchains # NiosII sha256 750639290744adda931c81fa2cd2ffc2bde972488047824dcfaa53c42562191d sourceryg++-2016.05-10-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 7dfcac3684..4b21b4fa51 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -70,16 +70,6 @@ define TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_STAGING_FIXUPS endef endif -# Special handling for Blackfin toolchain, because of the split in two -# tarballs, and the organization of tarball contents. The tarballs -# contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories, -# which themselves contain the toolchain. This is why we strip more -# components than usual. -define TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT - $(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS) | \ - $(TAR) --strip-components=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) - -endef - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A),y) TOOLCHAIN_EXTERNAL_SITE = http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports TOOLCHAIN_EXTERNAL_SOURCE = arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2 @@ -125,12 +115,6 @@ TOOLCHAIN_EXTERNAL_SOURCE = Codescape.GNU.Tools.Package.2016.05-03.for.MIPS.MTI. TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_SYMLINK TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_STAGING_FIXUPS TOOLCHAIN_EXTERNAL_STRIP_COMPONENTS = 2 -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX),y) -TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2014R1/2014R1-RC2/i386 -TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2014R1-RC2.i386.tar.bz2 -TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2 -TOOLCHAIN_EXTERNAL_STRIP_COMPONENTS = 3 -TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_BLACKFIN_UCLIBC_EXTRA_EXTRACT else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS),y) TOOLCHAIN_EXTERNAL_VERSION = 1.1.12 TOOLCHAIN_EXTERNAL_SITE = https://googledrive.com/host/0BwnS5DMB0YQ6bDhPZkpOYVFhbk0/musl-$(TOOLCHAIN_EXTERNAL_VERSION) From 1e1bef57fbd316b08fb06d584162223072745825 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:07 +0100 Subject: [PATCH 1482/3392] toolchain-external-codesourcery-mips: new package This commit adds a new package for the Sourcery CodeBench external toolchain for the MIPS architecture. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 101 ++---------------- .../Config.in | 93 ++++++++++++++++ .../Config.in.options | 9 ++ .../toolchain-external-codesourcery-mips.hash | 3 + .../toolchain-external-codesourcery-mips.mk | 13 +++ .../toolchain-external.hash | 3 - .../toolchain-external/toolchain-external.mk | 3 - 7 files changed, 124 insertions(+), 101 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index f8e04f54e8..1f49975595 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -25,6 +25,9 @@ source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" # Blackfin source "toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in" +# MIPS (use codesourcery toolchain by default) +source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in" + config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" depends on BR2_arm @@ -70,100 +73,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE This toolchain uses software-floating point. -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS - bool "Sourcery CodeBench MIPS 2016.05" - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on BR2_MIPS_CPU_MIPS32R2 || BR2_MIPS_CPU_MIPS64R2 - # Unsupported MIPS cores - depends on !BR2_mips_interaptiv - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_MIPS_NABI32 - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - help - Sourcery CodeBench toolchain for the MIPS architecture, from - Mentor Graphics. It uses gcc 5.3, binutils 2.25.51, glibc - 2.23, uClibc 0.9.30 and gdb 7.10.50, kernel headers 4.4.1. It - has support for the following variants: - - MIPS32r2 - Big-Endian, 2008 NaN, O32 - Select MIPS (big endian) core - Disable BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mnan=2008 - - MIPS32r2 - Big-Endian, O32 - Select MIPS (big endian) core - Disable BR2_SOFT_FLOAT - - MIPS32r2 - Big-Endian, O32, MIPS16 - Select MIPS (big endian) core - Disable BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mips16 - - MIPS32r2 - Big-Endian, Soft-Float, O32 - Select MIPS (big endian) core - Select BR2_SOFT_FLOAT - - MIPS32r2 - Big-Endian, Soft-Float, O32, MIPS16 - Select MIPS (big endian) core - Select BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mips16 - - MIPS32r2 - Little-Endian, 2008 NaN, O32 - Select MIPS (little endian) core - Disable BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mnan=2008 - - MIPS32r2 - Little-Endian, O32 - Select MIPS (little endian) core - Disable BR2_SOFT_FLOAT - - MIPS32r2 - Little-Endian, O32, MIPS16 - Select MIPS (little endian) core - Disable BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mips16 - - MIPS32r2 - Little-Endian, Soft-Float, O32 - Select MIPS (little endian) core - Select BR2_SOFT_FLOAT - - MIPS32r2 - Little-Endian, Soft-Float, O32, MIPS16 - Select MIPS (little endian) core - Select BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mips16 - - MIPS32r2 - Little-Endian, Soft-Float, O32, microMIPS - Select MIPS (little endian) core - Select BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mmicromips - - MIPS32r2 - uClibc, Big-Endian, 2008 NaN, O32 - Not usable in Buildroot yet. - - MIPS32r2 - uClibc, Big-Endian, O32 - Not usable in Buildroot yet. - - MIPS32r2 - uClibc, Big-Endian, Soft-Float, O32 - Not usable in Buildroot yet. - - MIPS32r2 - uClibc, Little-Endian, 2008 NaN, O32 - Not usable in Buildroot yet. - - MIPS32r2 - uClibc, Little-Endian, O32 - Not usable in Buildroot yet. - - MIPS32r2 - uClibc, Little-Endian, Soft-Float, O32 - Not usable in Buildroot yet. - - MIPS64r2 - Big-Endian, N64 - Select MIPS64 (big endian) core - Select the n64 ABI - Disable BR2_SOFT_FLOAT - - MIPS64r2 - Big-Endian, Soft-Float, N64 - Select MIPS64 (big endian) core - Select the n64 ABI - Select BR2_SOFT_FLOAT - - MIPS64r2 - Little-Endian, N64 - Select MIPS64 (little endian) core - Select the n64 ABI - Disable BR2_SOFT_FLOAT - - MIPS64r2 - Little-Endian, Soft-Float, N64 - Select MIPS64 (little endian) core - Select the n64 ABI - Select BR2_SOFT_FLOAT - -comment "Sourcery CodeBench toolchains are only available for MIPS/MIPS64 o32 and n64" - depends on BR2_MIPS_NABI32 - depends on !BR2_STATIC_LIBS - config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS bool "Codescape IMG GNU Linux Toolchain 2016.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el @@ -506,7 +415,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arceb-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arceb default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE - default "mips-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS default "nios2-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII default "sh-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 @@ -567,6 +475,9 @@ source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.o # Blackfin source "toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options" +# MIPS +source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options" + if BR2_TOOLCHAIN_EXTERNAL_CUSTOM choice diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in new file mode 100644 index 0000000000..6a13ae6cd6 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in @@ -0,0 +1,93 @@ +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS + bool "Sourcery CodeBench MIPS 2016.05" + depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + depends on BR2_MIPS_CPU_MIPS32R2 || BR2_MIPS_CPU_MIPS64R2 + # Unsupported MIPS cores + depends on !BR2_mips_interaptiv + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_MIPS_NABI32 + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 + select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + help + Sourcery CodeBench toolchain for the MIPS architecture, from + Mentor Graphics. It uses gcc 5.3, binutils 2.25.51, glibc + 2.23, uClibc 0.9.30 and gdb 7.10.50, kernel headers 4.4.1. It + has support for the following variants: + - MIPS32r2 - Big-Endian, 2008 NaN, O32 + Select MIPS (big endian) core + Disable BR2_SOFT_FLOAT + Set BR2_TARGET_OPTIMIZATION to -mnan=2008 + - MIPS32r2 - Big-Endian, O32 + Select MIPS (big endian) core + Disable BR2_SOFT_FLOAT + - MIPS32r2 - Big-Endian, O32, MIPS16 + Select MIPS (big endian) core + Disable BR2_SOFT_FLOAT + Set BR2_TARGET_OPTIMIZATION to -mips16 + - MIPS32r2 - Big-Endian, Soft-Float, O32 + Select MIPS (big endian) core + Select BR2_SOFT_FLOAT + - MIPS32r2 - Big-Endian, Soft-Float, O32, MIPS16 + Select MIPS (big endian) core + Select BR2_SOFT_FLOAT + Set BR2_TARGET_OPTIMIZATION to -mips16 + - MIPS32r2 - Little-Endian, 2008 NaN, O32 + Select MIPS (little endian) core + Disable BR2_SOFT_FLOAT + Set BR2_TARGET_OPTIMIZATION to -mnan=2008 + - MIPS32r2 - Little-Endian, O32 + Select MIPS (little endian) core + Disable BR2_SOFT_FLOAT + - MIPS32r2 - Little-Endian, O32, MIPS16 + Select MIPS (little endian) core + Disable BR2_SOFT_FLOAT + Set BR2_TARGET_OPTIMIZATION to -mips16 + - MIPS32r2 - Little-Endian, Soft-Float, O32 + Select MIPS (little endian) core + Select BR2_SOFT_FLOAT + - MIPS32r2 - Little-Endian, Soft-Float, O32, MIPS16 + Select MIPS (little endian) core + Select BR2_SOFT_FLOAT + Set BR2_TARGET_OPTIMIZATION to -mips16 + - MIPS32r2 - Little-Endian, Soft-Float, O32, microMIPS + Select MIPS (little endian) core + Select BR2_SOFT_FLOAT + Set BR2_TARGET_OPTIMIZATION to -mmicromips + - MIPS32r2 - uClibc, Big-Endian, 2008 NaN, O32 + Not usable in Buildroot yet. + - MIPS32r2 - uClibc, Big-Endian, O32 + Not usable in Buildroot yet. + - MIPS32r2 - uClibc, Big-Endian, Soft-Float, O32 + Not usable in Buildroot yet. + - MIPS32r2 - uClibc, Little-Endian, 2008 NaN, O32 + Not usable in Buildroot yet. + - MIPS32r2 - uClibc, Little-Endian, O32 + Not usable in Buildroot yet. + - MIPS32r2 - uClibc, Little-Endian, Soft-Float, O32 + Not usable in Buildroot yet. + - MIPS64r2 - Big-Endian, N64 + Select MIPS64 (big endian) core + Select the n64 ABI + Disable BR2_SOFT_FLOAT + - MIPS64r2 - Big-Endian, Soft-Float, N64 + Select MIPS64 (big endian) core + Select the n64 ABI + Select BR2_SOFT_FLOAT + - MIPS64r2 - Little-Endian, N64 + Select MIPS64 (little endian) core + Select the n64 ABI + Disable BR2_SOFT_FLOAT + - MIPS64r2 - Little-Endian, Soft-Float, N64 + Select MIPS64 (little endian) core + Select the n64 ABI + Select BR2_SOFT_FLOAT + +comment "Sourcery CodeBench toolchains are only available for MIPS/MIPS64 o32 and n64" + depends on BR2_MIPS_NABI32 + depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options new file mode 100644 index 0000000000..677cc67d67 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "mips-linux-gnu" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-codesourcery-mips" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash new file mode 100644 index 0000000000..2d80338e7b --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 d354447c4c5160439dafd5464fa3a0266dd41e79f973477238e4f0215a6b5397 mips-2016.05-8-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 2658e55d5b71bba25d6f77e868e18b200ea5f75c8add7ed3a9266e716d9adfff mips-2016.05-8-mips-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk new file mode 100644 index 0000000000..5117d475cb --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# toolchain-external-codesourcery-mips +# +################################################################################ + +TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_VERSION = 2016.05-8 + +TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_SOURCE = mips-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 +TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_ACTUAL_SOURCE_TARBALL = mips-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 16c2e19e88..1a0ff725c2 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -14,9 +14,6 @@ sha256 1a9519e415a1e6892c760bf21f7e98f3a633a9d1c5bb8781a96d338e4dd62717 ia32-20 # AMD64 sha256 3c31206c8b9277f409ee00e4777ba82dfa6da2a4ca0926501cd5fb6bbd1b407e amd-2015.11-139-x86_64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 sha256 0b673f5035f97d5d03c31272cddab0f117d39ad76a5ad2a3bc98c156571527de amd-2015.11-139-x86_64-amd-linux-gnu.src.tar.bz2 -# MIPS -sha256 d354447c4c5160439dafd5464fa3a0266dd41e79f973477238e4f0215a6b5397 mips-2016.05-8-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 2658e55d5b71bba25d6f77e868e18b200ea5f75c8add7ed3a9266e716d9adfff mips-2016.05-8-mips-linux-gnu.src.tar.bz2 # ARM toolchains from Texas Instrument's Arago project # There is one source file that covers both binary distributions. diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 4b21b4fa51..e7bc754409 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -88,9 +88,6 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS rm -rf $(@D)/arago-2011.09/ endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS),y) -TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/mips-linux-gnu -TOOLCHAIN_EXTERNAL_SOURCE = mips-2016.05-8-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII),y) TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/nios2-linux-gnu TOOLCHAIN_EXTERNAL_SOURCE = sourceryg++-2016.05-10-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 From 95c75fc8346c6e4caf419bf449ba8d8972cd3be5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:08 +0100 Subject: [PATCH 1483/3392] toolchain-external-codescape-img-mips: new package This commit adds a new package for the Codescape IMG external toolchain for the MIPS architecture. The legacy implementation is removed. The Codescape hacks for IMG and MTI are duplicated. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 66 +------------------ .../Config.in | 62 +++++++++++++++++ .../Config.in.options | 9 +++ ...toolchain-external-codescape-img-mips.hash | 3 + .../toolchain-external-codescape-img-mips.mk | 47 +++++++++++++ .../toolchain-external.hash | 1 - .../toolchain-external/toolchain-external.mk | 8 +-- 7 files changed, 124 insertions(+), 72 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash create mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 1f49975595..c76941a954 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -27,6 +27,7 @@ source "toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config. # MIPS (use codesourcery toolchain by default) source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in" +source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in" config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" @@ -73,69 +74,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE This toolchain uses software-floating point. -config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - bool "Codescape IMG GNU Linux Toolchain 2016.05" - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Codescape IMG GNU Linux Toolchain 2015.10 for the MIPS - architecture, from Imagination Technologies. It uses gcc - 4.9.2, binutils 2.24.90, glibc 2.20, gdb 7.9.1 and kernel - headers 4.0. It has support for the following variants: - - MIPS32r6 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r6 - Big-Endian, Soft-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI, microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS64r6 - Big-Endian, Hard-Float, 2008 NaN, n32 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Little-Endian, Hard-Float, 2008 NaN, n32 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Big-Endian, Hard-Float, 2008 NaN, n64 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Little-Endian, Hard-Float, 2008 NaN, n64 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' - config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS bool "Codescape MTI GNU Linux Toolchain 2016.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el @@ -421,7 +359,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "x86_64-amd-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABI default "arm-linux-musleabihf" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABIHF - default "mips-img-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS default "mips-mti-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS default "armeb-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_armeb default "i486-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_i386 @@ -477,6 +414,7 @@ source "toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config. # MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options" +source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options" if BR2_TOOLCHAIN_EXTERNAL_CUSTOM diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in new file mode 100644 index 0000000000..1f0d4d11b9 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in @@ -0,0 +1,62 @@ +config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS + bool "Codescape IMG GNU Linux Toolchain 2016.05" + depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + select BR2_TOOLCHAIN_HAS_FORTRAN + help + Codescape IMG GNU Linux Toolchain 2015.10 for the MIPS + architecture, from Imagination Technologies. It uses gcc + 4.9.2, binutils 2.24.90, glibc 2.20, gdb 7.9.1 and kernel + headers 4.0. It has support for the following variants: + - MIPS32r6 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI + Select 'MIPS (big endian)' Target Architecture + Select 'mips 32r6' Target Architecture Variant + Disable 'Use soft-float' + - MIPS32r6 - Big-Endian, Soft-Float, 2008 NaN, o32 ABI + Select 'MIPS (big endian)' Target Architecture + Select 'mips 32r6' Target Architecture Variant + Enable 'Use soft-float' + - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI + Select 'MIPS (little endian)' Target Architecture + Select 'mips 32r6' Target Architecture Variant + Disable 'Use soft-float' + - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI + Select 'MIPS (little endian)' Target Architecture + Select 'mips 32r6' Target Architecture Variant + Enable 'Use soft-float' + - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, microMIPS + Select 'MIPS (little endian)' Target Architecture + Select 'mips 32r6' Target Architecture Variant + Disable 'Use soft-float' + Set BR2_TARGET_OPTIMIZATION to '-mmicromips' + - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI, microMIPS + Select 'MIPS (little endian)' Target Architecture + Select 'mips 32r6' Target Architecture Variant + Enable 'Use soft-float' + Set BR2_TARGET_OPTIMIZATION to '-mmicromips' + - MIPS64r6 - Big-Endian, Hard-Float, 2008 NaN, n32 ABI + Select 'MIPS64 (big endian)' Target Architecture + Select 'mips 64r6' Target Architecture Variant + Select 'n32' Target ABI + Disable 'Use soft-float' + - MIPS64r6 - Little-Endian, Hard-Float, 2008 NaN, n32 ABI + Select 'MIPS64 (little endian)' Target Architecture + Select 'mips 64r6' Target Architecture Variant + Select 'n32' Target ABI + Disable 'Use soft-float' + - MIPS64r6 - Big-Endian, Hard-Float, 2008 NaN, n64 ABI + Select 'MIPS64 (big endian)' Target Architecture + Select 'mips 64r6' Target Architecture Variant + Select 'n64' Target ABI + Disable 'Use soft-float' + - MIPS64r6 - Little-Endian, Hard-Float, 2008 NaN, n64 ABI + Select 'MIPS64 (little endian)' Target Architecture + Select 'mips 64r6' Target Architecture Variant + Select 'n64' Target ABI + Disable 'Use soft-float' diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options new file mode 100644 index 0000000000..3eaa2a9522 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "mips-img-linux-gnu" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-codescape-img-mips" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash new file mode 100644 index 0000000000..e4ae9e1e11 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash @@ -0,0 +1,3 @@ +# Codescape toolchains from Imagination Technologies +# From: http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-03/downloads.html +sha256 e3c1f292ac6a9f12480af431c85a7ed9dfa011a52fd62a50be3363ec6b9bc872 Codescape.GNU.Tools.Package.2016.05-03.for.MIPS.IMG.Linux.CentOS-5.x86.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk new file mode 100644 index 0000000000..b4decfbff0 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# toolchain-external-codescape-img-mips +# +################################################################################ + +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION = 2016.05-03 +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SITE = http://codescape-mips-sdk.imgtec.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION) +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STRIP_COMPONENTS = 2 + +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-5.x86.tar.gz + +# Special fixup for Codescape MIPS toolchains, that have bin- and +# sbin- directories. We create symlinks bin -> bin- and sbin +# -> sbin- so that the rest of Buildroot can find the toolchain +# tools in the appropriate location. +ifeq ($(BR2_MIPS_OABI32),y) +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = o32 +else ifeq ($(BR2_MIPS_NABI32),y) +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = n32 +else ifeq ($(BR2_MIPS_NABI64),y) +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = n64 +endif + +define TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STAGING_FIXUPS + rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin + ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin + ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin +endef + +# The Codescape toolchain uses a sysroot layout that places them +# side-by-side instead of nested like multilibs. A symlink is needed +# much like for the nested sysroots which are handled in +# copy_toolchain_sysroot but there is not enough information in there +# to determine whether the sysroot layout was nested or side-by-side. +# Add the symlink here for now. +define TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SYMLINK + $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ + ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ + ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} +endef + +TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_POST_INSTALL_STAGING_HOOKS += \ + TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STAGING_FIXUPS \ + TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SYMLINK + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 1a0ff725c2..962263c4a3 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -23,7 +23,6 @@ sha256 25fbf0513ad7322b15cbaae964cafadcbb4c939f2708f57f40b8f9f2d601122b arago-t # Codescape toolchains from Imagination Technologies # From: http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-03/downloads.html -sha256 e3c1f292ac6a9f12480af431c85a7ed9dfa011a52fd62a50be3363ec6b9bc872 Codescape.GNU.Tools.Package.2016.05-03.for.MIPS.IMG.Linux.CentOS-5.x86.tar.gz sha256 10b8ab6d7c492abc19ecabafedc6bc5f12ff88107a3cb76dc452b3a9522d9c56 Codescape.GNU.Tools.Package.2016.05-03.for.MIPS.MTI.Linux.CentOS-5.x86.tar.gz # Synopsys DesignWare ARC toolchains diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index e7bc754409..2acf9dda24 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -54,7 +54,7 @@ endef # sbin- directories. We create symlinks bin -> bin- and sbin # -> sbin- so that the rest of Buildroot can find the toolchain # tools in the appropriate location. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS)$(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS),y) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS),y) ifeq ($(BR2_MIPS_OABI32),y) TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX = o32 else ifeq ($(BR2_MIPS_NABI32),y) @@ -100,12 +100,6 @@ TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64),y) TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/x86_64-amd-linux-gnu TOOLCHAIN_EXTERNAL_SOURCE = amd-2015.11-139-x86_64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS),y) -TOOLCHAIN_EXTERNAL_SITE = http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-03 -TOOLCHAIN_EXTERNAL_SOURCE = Codescape.GNU.Tools.Package.2016.05-03.for.MIPS.IMG.Linux.CentOS-5.x86.tar.gz -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_SYMLINK -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_STAGING_FIXUPS -TOOLCHAIN_EXTERNAL_STRIP_COMPONENTS = 2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS),y) TOOLCHAIN_EXTERNAL_SITE = http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-03 TOOLCHAIN_EXTERNAL_SOURCE = Codescape.GNU.Tools.Package.2016.05-03.for.MIPS.MTI.Linux.CentOS-5.x86.tar.gz From c4a62fa6278058461ff9e501ba6e822486453493 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:09 +0100 Subject: [PATCH 1484/3392] toolchain-external-codescape-mti-mips: new package This commit adds a new package for the Codescape MTI external toolchain for the MIPS architecture. The legacy implementation is removed. The Codescape hacks for IMG and MTI are duplicated. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 77 +------------------ .../Config.in | 73 ++++++++++++++++++ .../Config.in.options | 9 +++ ...toolchain-external-codescape-mti-mips.hash | 3 + .../toolchain-external-codescape-mti-mips.mk | 47 +++++++++++ .../toolchain-external.hash | 4 - .../toolchain-external/toolchain-external.mk | 38 --------- 7 files changed, 134 insertions(+), 117 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash create mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index c76941a954..d2e1d3b127 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -28,6 +28,7 @@ source "toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config. # MIPS (use codesourcery toolchain by default) source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in" source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in" +source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in" config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" @@ -74,80 +75,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE This toolchain uses software-floating point. -config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - bool "Codescape MTI GNU Linux Toolchain 2016.05" - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ - BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Codescape MTI GNU Linux Toolchain 2015.10 for the MIPS - architecture, from Imagination Technologies. It uses gcc - 4.9.2, binutils 2.24.90, glibc 2.20, gdb 7.9.1 and kernel - headers 4.0. It has support for the following variants: - - MIPS32r2 - Big-Endian, Hard-Float, Legacy NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r2 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mnan=2008' - - MIPS32r2 - Big-Endian, Soft-Float, Legacy NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, Legacy NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mnan=2008' - - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI, microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS64r2 - Big-Endian, Hard-Float, Legacy NaN, n32 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Little-Endian, Hard-Float, Legacy NaN, n32 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Big-Endian, Hard-Float, Legacy NaN, n64 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Little-Endian, Hard-Float, Legacy NaN, n64 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' - config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII bool "Sourcery CodeBench Nios-II 2016.05" depends on BR2_nios2 @@ -359,7 +286,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "x86_64-amd-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABI default "arm-linux-musleabihf" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABIHF - default "mips-mti-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS default "armeb-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_armeb default "i486-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_i386 default "mips-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && (BR2_mips && !BR2_SOFT_FLOAT) @@ -415,6 +341,7 @@ source "toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config. # MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options" +source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options" if BR2_TOOLCHAIN_EXTERNAL_CUSTOM diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in new file mode 100644 index 0000000000..f899467e3b --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -0,0 +1,73 @@ +config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS + bool "Codescape MTI GNU Linux Toolchain 2016.05" + depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ + BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + select BR2_TOOLCHAIN_HAS_FORTRAN + help + Codescape MTI GNU Linux Toolchain 2015.10 for the MIPS + architecture, from Imagination Technologies. It uses gcc + 4.9.2, binutils 2.24.90, glibc 2.20, gdb 7.9.1 and kernel + headers 4.0. It has support for the following variants: + - MIPS32r2 - Big-Endian, Hard-Float, Legacy NaN, o32 ABI + Select 'MIPS (big endian)' Target Architecture + Select 'mips 32r2' Target Architecture Variant + Disable 'Use soft-float' + - MIPS32r2 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI + Select 'MIPS (big endian)' Target Architecture + Select 'mips 32r2' Target Architecture Variant + Disable 'Use soft-float' + Set BR2_TARGET_OPTIMIZATION to '-mnan=2008' + - MIPS32r2 - Big-Endian, Soft-Float, Legacy NaN, o32 ABI + Select 'MIPS (big endian)' Target Architecture + Select 'mips 32r2' Target Architecture Variant + Enable 'Use soft-float' + - MIPS32r2 - Little-Endian, Hard-Float, Legacy NaN, o32 ABI + Select 'MIPS (little endian)' Target Architecture + Select 'mips 32r2' Target Architecture Variant + Disable 'Use soft-float' + - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI + Select 'MIPS (little endian)' Target Architecture + Select 'mips 32r2' Target Architecture Variant + Disable 'Use soft-float' + Set BR2_TARGET_OPTIMIZATION to '-mnan=2008' + - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI + Select 'MIPS (little endian)' Target Architecture + Select 'mips 32r2' Target Architecture Variant + Enable 'Use soft-float' + - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, microMIPS + Select 'MIPS (little endian)' Target Architecture + Select 'mips 32r2' Target Architecture Variant + Enable 'Use soft-float' + Set BR2_TARGET_OPTIMIZATION to '-mmicromips' + - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI, microMIPS + Select 'MIPS (little endian)' Target Architecture + Select 'mips 32r2' Target Architecture Variant + Disable 'Use soft-float' + Set BR2_TARGET_OPTIMIZATION to '-mmicromips' + - MIPS64r2 - Big-Endian, Hard-Float, Legacy NaN, n32 ABI + Select 'MIPS64 (big endian)' Target Architecture + Select 'mips 64r2' Target Architecture Variant + Select 'n32' Target ABI + Disable 'Use soft-float' + - MIPS64r2 - Little-Endian, Hard-Float, Legacy NaN, n32 ABI + Select 'MIPS64 (little endian)' Target Architecture + Select 'mips 64r2' Target Architecture Variant + Select 'n32' Target ABI + Disable 'Use soft-float' + - MIPS64r2 - Big-Endian, Hard-Float, Legacy NaN, n64 ABI + Select 'MIPS64 (big endian)' Target Architecture + Select 'mips 64r2' Target Architecture Variant + Select 'n64' Target ABI + Disable 'Use soft-float' + - MIPS64r2 - Little-Endian, Hard-Float, Legacy NaN, n64 ABI + Select 'MIPS64 (little endian)' Target Architecture + Select 'mips 64r2' Target Architecture Variant + Select 'n64' Target ABI + Disable 'Use soft-float' diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options new file mode 100644 index 0000000000..464c9b8448 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "mips-mti-linux-gnu" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-codescape-mti-mips" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash new file mode 100644 index 0000000000..0d785f2af1 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash @@ -0,0 +1,3 @@ +# Codescape toolchains from Imagination Technologies +# From: http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-03/downloads.html +sha256 10b8ab6d7c492abc19ecabafedc6bc5f12ff88107a3cb76dc452b3a9522d9c56 Codescape.GNU.Tools.Package.2016.05-03.for.MIPS.MTI.Linux.CentOS-5.x86.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk new file mode 100644 index 0000000000..e5733ca082 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# toolchain-external-codescape-mti-mips +# +################################################################################ + +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION = 2016.05-03 +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SITE = http://codescape-mips-sdk.imgtec.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION) +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STRIP_COMPONENTS = 2 + +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-5.x86.tar.gz + +# Special fixup for Codescape MIPS toolchains, that have bin- and +# sbin- directories. We create symlinks bin -> bin- and sbin +# -> sbin- so that the rest of Buildroot can find the toolchain +# tools in the appropriate location. +ifeq ($(BR2_MIPS_OABI32),y) +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = o32 +else ifeq ($(BR2_MIPS_NABI32),y) +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = n32 +else ifeq ($(BR2_MIPS_NABI64),y) +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = n64 +endif + +define TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STAGING_FIXUPS + rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin + ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin + ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin +endef + +# The Codescape toolchain uses a sysroot layout that places them +# side-by-side instead of nested like multilibs. A symlink is needed +# much like for the nested sysroots which are handled in +# copy_toolchain_sysroot but there is not enough information in there +# to determine whether the sysroot layout was nested or side-by-side. +# Add the symlink here for now. +define TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SYMLINK + $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ + ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ + ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} +endef + +TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_POST_INSTALL_STAGING_HOOKS += \ + TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STAGING_FIXUPS \ + TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SYMLINK + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 962263c4a3..83859e7e29 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -21,10 +21,6 @@ sha256 f2febf3b3c565536461ad4405f1bcb835d75a6afb2a8bec958a1248cb4b81fc7 arago-2 sha256 254af7d02eb3bcc8345c78e131700bc995d65b68232caaed21150a5fd1456070 arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2 sha256 25fbf0513ad7322b15cbaae964cafadcbb4c939f2708f57f40b8f9f2d601122b arago-toolchain-2011.09-sources.tar.bz2 -# Codescape toolchains from Imagination Technologies -# From: http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-03/downloads.html -sha256 10b8ab6d7c492abc19ecabafedc6bc5f12ff88107a3cb76dc452b3a9522d9c56 Codescape.GNU.Tools.Package.2016.05-03.for.MIPS.MTI.Linux.CentOS-5.x86.tar.gz - # Synopsys DesignWare ARC toolchains sha256 1fa4ea2c8616623205f1c7beca02ea31b019099528a7433e5b020b0876b93bf3 arc_gnu_2014.12_prebuilt_uclibc_le_arc700_linux_install.tar.gz sha256 1080f07fcae2bfc176a3ea8d30b9ed8eaecab70fb786639d6ec70cae8322df10 arc_gnu_2014.12_prebuilt_uclibc_be_arc700_linux_install.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 2acf9dda24..31a53d21d9 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -38,38 +38,6 @@ TOOLCHAIN_EXTERNAL_SITE = TOOLCHAIN_EXTERNAL_SOURCE = endif -# The Codescape toolchain uses a sysroot layout that places them -# side-by-side instead of nested like multilibs. A symlink is needed -# much like for the nested sysroots which are handled in -# copy_toolchain_sysroot but there is not enough information in there -# to determine whether the sysroot layout was nested or side-by-side. -# Add the symlink here for now. -define TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_SYMLINK - $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ - ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ - ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} -endef - -# Special fixup for Codescape MIPS toolchains, that have bin- and -# sbin- directories. We create symlinks bin -> bin- and sbin -# -> sbin- so that the rest of Buildroot can find the toolchain -# tools in the appropriate location. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS),y) -ifeq ($(BR2_MIPS_OABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX = o32 -else ifeq ($(BR2_MIPS_NABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX = n32 -else ifeq ($(BR2_MIPS_NABI64),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX = n64 -endif - -define TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_STAGING_FIXUPS - rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin - ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin - ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin -endef -endif - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A),y) TOOLCHAIN_EXTERNAL_SITE = http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports TOOLCHAIN_EXTERNAL_SOURCE = arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2 @@ -100,12 +68,6 @@ TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64),y) TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/x86_64-amd-linux-gnu TOOLCHAIN_EXTERNAL_SOURCE = amd-2015.11-139-x86_64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS),y) -TOOLCHAIN_EXTERNAL_SITE = http://codescape-mips-sdk.imgtec.com/components/toolchain/2016.05-03 -TOOLCHAIN_EXTERNAL_SOURCE = Codescape.GNU.Tools.Package.2016.05-03.for.MIPS.MTI.Linux.CentOS-5.x86.tar.gz -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_SYMLINK -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_CODESCAPE_MIPS_STAGING_FIXUPS -TOOLCHAIN_EXTERNAL_STRIP_COMPONENTS = 2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS),y) TOOLCHAIN_EXTERNAL_VERSION = 1.1.12 TOOLCHAIN_EXTERNAL_SITE = https://googledrive.com/host/0BwnS5DMB0YQ6bDhPZkpOYVFhbk0/musl-$(TOOLCHAIN_EXTERNAL_VERSION) From f61661bc51b266c10482bcf35af61e2814ce693e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:10 +0100 Subject: [PATCH 1485/3392] toolchain-external-codesourcery-niosII: new package This commit adds a new package for the Sourcery CodeBench external toolchain for the nios-II architecture. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 25 +++++-------------- .../Config.in | 17 +++++++++++++ .../Config.in.options | 9 +++++++ ...oolchain-external-codesourcery-niosII.hash | 3 +++ .../toolchain-external-codesourcery-niosII.mk | 13 ++++++++++ .../toolchain-external.hash | 3 --- .../toolchain-external/toolchain-external.mk | 3 --- 7 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index d2e1d3b127..e628279b99 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -30,6 +30,9 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in" source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in" +# NIOSII +source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in" + config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" depends on BR2_arm @@ -75,24 +78,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE This toolchain uses software-floating point. -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - bool "Sourcery CodeBench Nios-II 2016.05" - depends on BR2_nios2 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # based-on binutils-2.25.1 - help - Sourcery CodeBench toolchain for the Nios-II architecture, - from Mentor Graphics. It uses gcc 5.3, binutils 2.25.51, - glibc 2.23, gdb 7.10.50 and kernel headers 4.4. - config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH bool "Sourcery CodeBench SH 2012.09" depends on BR2_sh4a || BR2_sh4aeb @@ -280,7 +265,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arceb-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arceb default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE - default "nios2-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII default "sh-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 default "x86_64-amd-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 @@ -343,6 +327,9 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options" +# NIOSII +source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options" + if BR2_TOOLCHAIN_EXTERNAL_CUSTOM choice diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in new file mode 100644 index 0000000000..54eed8c792 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in @@ -0,0 +1,17 @@ +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII + bool "Sourcery CodeBench Nios-II 2016.05" + depends on BR2_nios2 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 + select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # based-on binutils-2.25.1 + help + Sourcery CodeBench toolchain for the Nios-II architecture, + from Mentor Graphics. It uses gcc 5.3, binutils 2.25.51, + glibc 2.23, gdb 7.10.50 and kernel headers 4.4. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options new file mode 100644 index 0000000000..07cc5ede94 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "nios2-linux-gnu" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-codesourcery-niosII" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash new file mode 100644 index 0000000000..a60c49f839 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 750639290744adda931c81fa2cd2ffc2bde972488047824dcfaa53c42562191d sourceryg++-2016.05-10-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 3dc1c2685c0472059547dd7becb5dc991541b8176af39fa7aa5f601d38b9879a sourceryg++-2016.05-10-nios2-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk new file mode 100644 index 0000000000..3eb6679675 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# toolchain-external-codesourcery-niosII +# +################################################################################ + +TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2016.05-10 + +TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SOURCE = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 +TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_ACTUAL_SOURCE_TARBALL = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 83859e7e29..5c98fe3b04 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -2,9 +2,6 @@ # Next hashes are all locally computed # Mentor's Sourcery CodeBench Lite toolchains -# NiosII -sha256 750639290744adda931c81fa2cd2ffc2bde972488047824dcfaa53c42562191d sourceryg++-2016.05-10-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 3dc1c2685c0472059547dd7becb5dc991541b8176af39fa7aa5f601d38b9879a sourceryg++-2016.05-10-nios2-linux-gnu.src.tar.bz2 # SuperH sha256 59d6766fde244931aa52db01433d5acd051998762a931121c5fc109536a1a802 renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2 sha256 e2e58c10e52395d5d35157e35f85233f713c6f9223a652dfc56194cfd2eed004 renesas-2012.09-61-sh-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 31a53d21d9..fde0564610 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -56,9 +56,6 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS rm -rf $(@D)/arago-2011.09/ endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII),y) -TOOLCHAIN_EXTERNAL_SITE = http://sourcery.mentor.com/public/gnu_toolchain/nios2-linux-gnu -TOOLCHAIN_EXTERNAL_SOURCE = sourceryg++-2016.05-10-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH),y) TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu TOOLCHAIN_EXTERNAL_SOURCE = renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2 From a3b686591c72019e9568ab8e8b9c267a95abf6bb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:11 +0100 Subject: [PATCH 1486/3392] toolchain-external-codesourcery-sh: new package This commit adds a new package for the Sourcery CodeBench external toolchain for the SuperH 4a architecture. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 33 ++++--------------- .../Config.in | 25 ++++++++++++++ .../Config.in.options | 9 +++++ .../toolchain-external-codesourcery-sh.hash | 3 ++ .../toolchain-external-codesourcery-sh.mk | 13 ++++++++ .../toolchain-external.hash | 3 -- .../toolchain-external/toolchain-external.mk | 3 -- 7 files changed, 56 insertions(+), 33 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.hash create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index e628279b99..8e06b052d1 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -33,6 +33,9 @@ source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Confi # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in" +# SH4a +source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in" + config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" depends on BR2_arm @@ -78,32 +81,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE This toolchain uses software-floating point. -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH - bool "Sourcery CodeBench SH 2012.09" - depends on BR2_sh4a || BR2_sh4aeb - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - help - Sourcery CodeBench toolchain for the SuperH architecture, - from Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51, - glibc 2.16, uClibc 0.9.30, gdb 7.4.50 and kernel headers - 3.5.4. It has support for the following variants: - - SH4A, glibc, little endian - Default. - - SH4A, glibc, big endian - Add -mb to BR2_TARGET_OPTIMIZATION - - SH4A, uClibc, little endian - Not usable in Buildroot yet. - - SH4A, uClibc, big endian - Not usable in Buildroot yet. - config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 bool "Sourcery CodeBench AMD64 2015.11" depends on BR2_x86_64 @@ -265,7 +242,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arceb-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arceb default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE - default "sh-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 default "x86_64-amd-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABI @@ -330,6 +306,9 @@ source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Confi # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options" +# SH4a +source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options" + if BR2_TOOLCHAIN_EXTERNAL_CUSTOM choice diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in new file mode 100644 index 0000000000..a47dab7611 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in @@ -0,0 +1,25 @@ +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH + bool "Sourcery CodeBench SH 2012.09" + depends on BR2_sh4a || BR2_sh4aeb + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + help + Sourcery CodeBench toolchain for the SuperH architecture, + from Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51, + glibc 2.16, uClibc 0.9.30, gdb 7.4.50 and kernel headers + 3.5.4. It has support for the following variants: + - SH4A, glibc, little endian + Default. + - SH4A, glibc, big endian + Add -mb to BR2_TARGET_OPTIMIZATION + - SH4A, uClibc, little endian + Not usable in Buildroot yet. + - SH4A, uClibc, big endian + Not usable in Buildroot yet. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options new file mode 100644 index 0000000000..90061cef49 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "sh-linux-gnu" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-codesourcery-sh" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.hash new file mode 100644 index 0000000000..ff2ba5f473 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 59d6766fde244931aa52db01433d5acd051998762a931121c5fc109536a1a802 renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 e2e58c10e52395d5d35157e35f85233f713c6f9223a652dfc56194cfd2eed004 renesas-2012.09-61-sh-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.mk new file mode 100644 index 0000000000..5370bb22a8 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# toolchain-external-sourcery-sh +# +################################################################################ + +TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_VERSION = 2012.09-61 + +TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_SOURCE = renesas-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 +TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_ACTUAL_SOURCE_TARBALL = renesas-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 5c98fe3b04..18b3e1aa1d 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -2,9 +2,6 @@ # Next hashes are all locally computed # Mentor's Sourcery CodeBench Lite toolchains -# SuperH -sha256 59d6766fde244931aa52db01433d5acd051998762a931121c5fc109536a1a802 renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 e2e58c10e52395d5d35157e35f85233f713c6f9223a652dfc56194cfd2eed004 renesas-2012.09-61-sh-linux-gnu.src.tar.bz2 # x86 sha256 ea804cf02014369da52abc4f64e91e96bde2dd2230aca96109459013d4545458 ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 sha256 1a9519e415a1e6892c760bf21f7e98f3a633a9d1c5bb8781a96d338e4dd62717 ia32-2012.09-62-i686-pc-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index fde0564610..9aabab612c 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -56,9 +56,6 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS rm -rf $(@D)/arago-2011.09/ endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH),y) -TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/sh-linux-gnu -TOOLCHAIN_EXTERNAL_SOURCE = renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86),y) TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 From a66b8191f4c57b11874bb29c5d49e244f727d21a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 7 Nov 2016 02:20:12 +0100 Subject: [PATCH 1487/3392] toolchain-external-codesourcery-amd64: new package This commit adds a new package for the Sourcery CodeBench external toolchain for the AMD-64 architecture. The legacy implementation is removed. Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 32 ++++--------------- .../Config.in | 24 ++++++++++++++ .../Config.in.options | 9 ++++++ ...toolchain-external-codesourcery-amd64.hash | 3 ++ .../toolchain-external-codesourcery-amd64.mk | 12 +++++++ .../toolchain-external.hash | 3 -- .../toolchain-external/toolchain-external.mk | 3 -- 7 files changed, 54 insertions(+), 32 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 8e06b052d1..2689c91dd9 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -36,6 +36,9 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Conf # SH4a source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in" +# x86/x86_64 (use amd64 toolchain by default for AMD64) +source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in" + config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" depends on BR2_arm @@ -81,31 +84,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE This toolchain uses software-floating point. -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 - bool "Sourcery CodeBench AMD64 2015.11" - depends on BR2_x86_64 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS - depends on BR2_x86_jaguar || BR2_x86_steamroller - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - help - Sourcery CodeBench toolchain for the amd64 (x86_64) - architectures, from Mentor Graphics. It uses gcc 5.2, - binutils 2.25.51, glibc 2.22, gdb 7.10.50 and kernel headers - 4.2. It has support for the following variants: - - AMD Puma/Jaguar (family 16h), glibc - Default for x86_64, nothing special to do. - - AMD Steamroller (family 15h), glibc - Select a steamroller core. - No other architecture variants are supported since glibc - is optimized for one of these two baselines. - config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 bool "Sourcery CodeBench x86/x86_64 2012.09" depends on BR2_i386 || BR2_x86_64 @@ -243,7 +221,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 - default "x86_64-amd-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABI default "arm-linux-musleabihf" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABIHF default "armeb-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_armeb @@ -309,6 +286,9 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Conf # SH4a source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options" +# x86/x86_64 +source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options" + if BR2_TOOLCHAIN_EXTERNAL_CUSTOM choice diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in new file mode 100644 index 0000000000..86486c818d --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in @@ -0,0 +1,24 @@ +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 + bool "Sourcery CodeBench AMD64 2015.11" + depends on BR2_x86_64 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_STATIC_LIBS + depends on BR2_x86_jaguar || BR2_x86_steamroller + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + help + Sourcery CodeBench toolchain for the amd64 (x86_64) + architectures, from Mentor Graphics. It uses gcc 5.2, + binutils 2.25.51, glibc 2.22, gdb 7.10.50 and kernel headers + 4.2. It has support for the following variants: + - AMD Puma/Jaguar (family 16h), glibc + Default for x86_64, nothing special to do. + - AMD Steamroller (family 15h), glibc + Select a steamroller core. + No other architecture variants are supported since glibc + is optimized for one of these two baselines. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options new file mode 100644 index 0000000000..2ab23026e9 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "x86_64-amd-linux-gnu" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-codesourcery-amd64" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash new file mode 100644 index 0000000000..ea5f300d73 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 3c31206c8b9277f409ee00e4777ba82dfa6da2a4ca0926501cd5fb6bbd1b407e amd-2015.11-139-x86_64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 0b673f5035f97d5d03c31272cddab0f117d39ad76a5ad2a3bc98c156571527de amd-2015.11-139-x86_64-amd-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk new file mode 100644 index 0000000000..4b8e31c070 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/toolchain-external-codesourcery-amd64.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# toolchain-external-codesourcery-amd64 +# +################################################################################ + +TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_VERSION = 2015.11-139 +TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_SOURCE = amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 +TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_ACTUAL_SOURCE_TARBALL = amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 18b3e1aa1d..b873abe984 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -5,9 +5,6 @@ # x86 sha256 ea804cf02014369da52abc4f64e91e96bde2dd2230aca96109459013d4545458 ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 sha256 1a9519e415a1e6892c760bf21f7e98f3a633a9d1c5bb8781a96d338e4dd62717 ia32-2012.09-62-i686-pc-linux-gnu.src.tar.bz2 -# AMD64 -sha256 3c31206c8b9277f409ee00e4777ba82dfa6da2a4ca0926501cd5fb6bbd1b407e amd-2015.11-139-x86_64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 0b673f5035f97d5d03c31272cddab0f117d39ad76a5ad2a3bc98c156571527de amd-2015.11-139-x86_64-amd-linux-gnu.src.tar.bz2 # ARM toolchains from Texas Instrument's Arago project # There is one source file that covers both binary distributions. diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 9aabab612c..3cb9024879 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -59,9 +59,6 @@ TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86),y) TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64),y) -TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/x86_64-amd-linux-gnu -TOOLCHAIN_EXTERNAL_SOURCE = amd-2015.11-139-x86_64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS),y) TOOLCHAIN_EXTERNAL_VERSION = 1.1.12 TOOLCHAIN_EXTERNAL_SITE = https://googledrive.com/host/0BwnS5DMB0YQ6bDhPZkpOYVFhbk0/musl-$(TOOLCHAIN_EXTERNAL_VERSION) From 25429ba260df5689e734721e9c1e8bc017dc5e95 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:13 +0100 Subject: [PATCH 1488/3392] toolchain-external-codesourcery-x86: new package This commit adds a new package for the Sourcery CodeBench external toolchain for the i386/x86_64 architecture. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 33 ++----------------- .../Config.in | 29 ++++++++++++++++ .../Config.in.options | 9 +++++ .../toolchain-external-codesourcery-x86.hash | 3 ++ .../toolchain-external-codesourcery-x86.mk | 12 +++++++ .../toolchain-external.hash | 5 --- .../toolchain-external/toolchain-external.mk | 3 -- 7 files changed, 55 insertions(+), 39 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.hash create mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 2689c91dd9..cddfca8a42 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -38,6 +38,7 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.i # x86/x86_64 (use amd64 toolchain by default for AMD64) source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in" +source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in" config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" @@ -84,36 +85,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE This toolchain uses software-floating point. -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 - bool "Sourcery CodeBench x86/x86_64 2012.09" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS - depends on !BR2_x86_jaguar - depends on !BR2_x86_steamroller - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - help - Sourcery CodeBench toolchain for the x86/x86_64 - architectures, from Mentor Graphics. It uses gcc 4.7.2, - binutils 2.23.51, glibc 2.16, gdb 7.4.50 and kernel headers - 3.5.4. It has support for the following variants: - - Intel Pentium 4, glibc, 32 bits - Default for x86, nothing special to do. - - Intel Atom, glibc, 32 bits - Select an Atom core - - Intel Xeon, glibc, 64 bits - Default for x86_64, nothing special to do. - - Intel Core 2, glibc, 64 bits - Select a Core 2 core - Other architecture variants (beyond Pentium-4/Xeon) are - supported as well, but glibc is not optimised for it. - config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS bool "Musl 1.1.12 toolchain" depends on (BR2_arm && BR2_ARM_EABI && BR2_USE_MMU) || \ @@ -220,7 +191,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arceb-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arceb default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE - default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABI default "arm-linux-musleabihf" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABIHF default "armeb-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_armeb @@ -288,6 +258,7 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.i # x86/x86_64 source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options" +source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options" if BR2_TOOLCHAIN_EXTERNAL_CUSTOM diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in new file mode 100644 index 0000000000..bcbdd26938 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in @@ -0,0 +1,29 @@ +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 + bool "Sourcery CodeBench x86/x86_64 2012.09" + depends on BR2_i386 || BR2_x86_64 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_STATIC_LIBS + depends on !BR2_x86_jaguar + depends on !BR2_x86_steamroller + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + help + Sourcery CodeBench toolchain for the x86/x86_64 + architectures, from Mentor Graphics. It uses gcc 4.7.2, + binutils 2.23.51, glibc 2.16, gdb 7.4.50 and kernel headers + 3.5.4. It has support for the following variants: + - Intel Pentium 4, glibc, 32 bits + Default for x86, nothing special to do. + - Intel Atom, glibc, 32 bits + Select an Atom core + - Intel Xeon, glibc, 64 bits + Default for x86_64, nothing special to do. + - Intel Core 2, glibc, 64 bits + Select a Core 2 core + Other architecture variants (beyond Pentium-4/Xeon) are + supported as well, but glibc is not optimised for it. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options new file mode 100644 index 0000000000..65b62f3236 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "i686-pc-linux-gnu" + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-codesourcery-x86" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.hash new file mode 100644 index 0000000000..a003f7ab3c --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 ea804cf02014369da52abc4f64e91e96bde2dd2230aca96109459013d4545458 ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 +sha256 1a9519e415a1e6892c760bf21f7e98f3a633a9d1c5bb8781a96d338e4dd62717 ia32-2012.09-62-i686-pc-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.mk new file mode 100644 index 0000000000..5ee6991c0c --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# toolchain-external-codesourcery-x86 +# +################################################################################ + +TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_VERSION = 2012.09-62 +TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_SOURCE = ia32-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i386-linux.tar.bz2 +TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_ACTUAL_SOURCE_TARBALL = ia32-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index b873abe984..8926bf87f6 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -1,11 +1,6 @@ ###################################### # Next hashes are all locally computed -# Mentor's Sourcery CodeBench Lite toolchains -# x86 -sha256 ea804cf02014369da52abc4f64e91e96bde2dd2230aca96109459013d4545458 ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 -sha256 1a9519e415a1e6892c760bf21f7e98f3a633a9d1c5bb8781a96d338e4dd62717 ia32-2012.09-62-i686-pc-linux-gnu.src.tar.bz2 - # ARM toolchains from Texas Instrument's Arago project # There is one source file that covers both binary distributions. sha256 f2febf3b3c565536461ad4405f1bcb835d75a6afb2a8bec958a1248cb4b81fc7 arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 3cb9024879..7e4539e19a 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -56,9 +56,6 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS rm -rf $(@D)/arago-2011.09/ endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86),y) -TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu -TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS),y) TOOLCHAIN_EXTERNAL_VERSION = 1.1.12 TOOLCHAIN_EXTERNAL_SITE = https://googledrive.com/host/0BwnS5DMB0YQ6bDhPZkpOYVFhbk0/musl-$(TOOLCHAIN_EXTERNAL_VERSION) From 06ba7f9e1ca5dcc726b1881a40c7c13e3fbcedec Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:14 +0100 Subject: [PATCH 1489/3392] toolchain-external-musl-cross: new package This commit adds a new package for the pre-built Musl external toolchains. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 48 +++---------------- .../toolchain-external-musl-cross/Config.in | 30 ++++++++++++ .../Config.in.options | 19 ++++++++ .../toolchain-external-musl-cross.hash | 12 +++++ .../toolchain-external-musl-cross.mk | 12 +++++ .../toolchain-external.hash | 13 ----- .../toolchain-external/toolchain-external.mk | 26 ---------- 7 files changed, 79 insertions(+), 81 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-musl-cross/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.hash create mode 100644 toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index cddfca8a42..5188e1a5eb 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -40,6 +40,9 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.i source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in" source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in" +# Musl based toolchains (after all the others) +source "toolchain/toolchain-external/toolchain-external-musl-cross/Config.in" + config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" depends on BR2_arm @@ -85,37 +88,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE This toolchain uses software-floating point. -config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS - bool "Musl 1.1.12 toolchain" - depends on (BR2_arm && BR2_ARM_EABI && BR2_USE_MMU) || \ - (BR2_arm && BR2_ARM_EABIHF && !BR2_ARM_CPU_ARMV4 && BR2_USE_MMU) || \ - (BR2_armeb && BR2_ARM_EABI && !BR2_ARM_CPU_ARMV7A && BR2_USE_MMU) || \ - BR2_i386 || (BR2_mips && !BR2_SOFT_FLOAT) || \ - BR2_mipsel || (BR2_powerpc && BR2_powerpc_CLASSIC) || \ - BR2_sh4 || BR2_sh4eb || \ - BR2_x86_64 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && !BR2_mips_m5101 - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - select BR2_TOOLCHAIN_EXTERNAL_MUSL - select BR2_TOOLCHAIN_HAS_SSP - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - help - Toolchain based on the Musl C library, provided by the - musl-cross project. It uses gcc 5.3, binutils 2.25.1 and - musl 1.1.12. It does not have a cross debugger included. - - The ARM soft-float toolchain is built for ARMv4t, while the - ARM hard-float toolchain is built for ARMv5t. - The x86 toolchain is built for i486. - - http://musl.codu.org/ - config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC bool "Synopsys ARC 2014.12 toolchain" depends on BR2_arc @@ -191,17 +163,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arceb-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arceb default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE - default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABI - default "arm-linux-musleabihf" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm && BR2_ARM_EABIHF - default "armeb-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_armeb - default "i486-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_i386 - default "mips-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && (BR2_mips && !BR2_SOFT_FLOAT) - default "mipsel-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && (BR2_mipsel && !BR2_SOFT_FLOAT) - default "mipsel-sf-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && (BR2_mipsel && BR2_SOFT_FLOAT) - default "powerpc-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_powerpc - default "sh4-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_sh4 - default "sh4eb-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_sh4eb - default "x86_64-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_x86_64 default BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX \ if BR2_TOOLCHAIN_EXTERNAL_CUSTOM @@ -260,6 +221,9 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.i source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options" +# Musl based toolchains +source "toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options" + if BR2_TOOLCHAIN_EXTERNAL_CUSTOM choice diff --git a/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in b/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in new file mode 100644 index 0000000000..5cffa2dad3 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in @@ -0,0 +1,30 @@ +config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS + bool "Musl 1.1.12 toolchain" + depends on (BR2_arm && BR2_ARM_EABI && BR2_USE_MMU) || \ + (BR2_arm && BR2_ARM_EABIHF && !BR2_ARM_CPU_ARMV4 && BR2_USE_MMU) || \ + (BR2_armeb && BR2_ARM_EABI && !BR2_ARM_CPU_ARMV7A && BR2_USE_MMU) || \ + BR2_i386 || (BR2_mips && !BR2_SOFT_FLOAT) || \ + BR2_mipsel || (BR2_powerpc && BR2_powerpc_CLASSIC) || \ + BR2_sh4 || BR2_sh4eb || \ + BR2_x86_64 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + # Unsupported MIPS cores + depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && !BR2_mips_m5101 + # Unsupported for MIPS R6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 + select BR2_TOOLCHAIN_EXTERNAL_MUSL + select BR2_TOOLCHAIN_HAS_SSP + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + help + Toolchain based on the Musl C library, provided by the + musl-cross project. It uses gcc 5.3, binutils 2.25.1 and + musl 1.1.12. It does not have a cross debugger included. + + The ARM soft-float toolchain is built for ARMv4t, while the + ARM hard-float toolchain is built for ARMv5t. + The x86 toolchain is built for i486. + + http://musl.codu.org/ diff --git a/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options b/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options new file mode 100644 index 0000000000..cd12355e3e --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options @@ -0,0 +1,19 @@ +if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "arm-linux-musleabi" if BR2_arm && BR2_ARM_EABI + default "arm-linux-musleabihf" if BR2_arm && BR2_ARM_EABIHF + default "armeb-linux-musleabi" if BR2_armeb + default "i486-linux-musl" if BR2_i386 + default "mips-linux-musl" if (BR2_mips && !BR2_SOFT_FLOAT) + default "mipsel-linux-musl" if (BR2_mipsel && !BR2_SOFT_FLOAT) + default "mipsel-sf-linux-musl" if (BR2_mipsel && BR2_SOFT_FLOAT) + default "powerpc-linux-musl" if BR2_powerpc + default "sh4-linux-musl" if BR2_sh4 + default "sh4eb-linux-musl" if BR2_sh4eb + default "x86_64-linux-musl" if BR2_x86_64 + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-musl-cross" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.hash b/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.hash new file mode 100644 index 0000000000..beef8fdc75 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.hash @@ -0,0 +1,12 @@ +# Locally calculated +sha256 e32c23d0b83639fc10ad06666ec086b66453b9be44415fe1a818c3c3b526dfb1 crossx86-armeb-linux-musleabi-1.1.12.tar.xz +sha256 eb81bd5d6ada454c6e854b18bfa8dc801333782152166f6cab9fb7cd11692987 crossx86-arm-linux-musleabi-1.1.12.tar.xz +sha256 a050da284ff22d291ae71dfc249ebdedb18334b8d626804760ce7d5963e392e6 crossx86-arm-linux-musleabihf-1.1.12.tar.xz +sha256 18d07f5c8f4cfe373461cf21cf7b1bfefa820a37e96a69b68e0f315d528b4286 crossx86-i486-linux-musl-1.1.12.tar.xz +sha256 1c1480c2618097e402fe804c1431fbd49b0d43520af81d4c1a695a2fa13a3922 crossx86-mipsel-linux-musl-1.1.12.tar.xz +sha256 f0a8b3eb0566138ab3cc77bc09648be15bc325da974ec98b9e67f2fb82be3295 crossx86-mipsel-sf-linux-musl-1.1.12.tar.xz +sha256 6a99989c3dff56776981f6760b2c54dcb9e4032be1d649968bb06c04f2e64177 crossx86-mips-linux-musl-1.1.12.tar.xz +sha256 c082adc3e8b0750bb22ca82628524fd525fd77f534517ac5a66e7ac5a297ee6e crossx86-powerpc-linux-musl-1.1.12.tar.xz +sha256 8c6c9ebb54040e47947b4d3af6823d01fef2bb6ee81b18903c801030c066092b crossx86-sh4eb-linux-musl-1.1.12.tar.xz +sha256 ae9a0a5a60226aa086a56628cfd5c1d283c9dffdca37891d7e6adc2bd21ac2e0 crossx86-sh4-linux-musl-1.1.12.tar.xz +sha256 27e0ea1043a58aebeadf1dacd67e47fd0b5c19fc36f42c9374e5fa3308df09c6 crossx86-x86_64-linux-musl-1.1.12.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.mk b/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.mk new file mode 100644 index 0000000000..966505b771 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# toolchain-external-musl-cross +# +################################################################################ + +TOOLCHAIN_EXTERNAL_MUSL_CROSS_VERSION = 1.1.12 +TOOLCHAIN_EXTERNAL_MUSL_CROSS_SITE = https://googledrive.com/host/0BwnS5DMB0YQ6bDhPZkpOYVFhbk0/musl-$(TOOLCHAIN_EXTERNAL_MUSL_CROSS_VERSION) + +TOOLCHAIN_EXTERNAL_MUSL_CROSS_SOURCE = crossx86-$(TOOLCHAIN_EXTERNAL_PREFIX)-$(TOOLCHAIN_EXTERNAL_MUSL_CROSS_VERSION).tar.xz + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index 8926bf87f6..a286ef2923 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -12,16 +12,3 @@ sha256 1fa4ea2c8616623205f1c7beca02ea31b019099528a7433e5b020b0876b93bf3 arc_gnu sha256 1080f07fcae2bfc176a3ea8d30b9ed8eaecab70fb786639d6ec70cae8322df10 arc_gnu_2014.12_prebuilt_uclibc_be_arc700_linux_install.tar.gz sha256 aaaf6facd1f60a3cd2a537154ea39cd7d70501c175e30e01a97e8df6cb8226c7 arc_gnu_2014.12_prebuilt_uclibc_le_archs_linux_install.tar.gz sha256 30711c5f15762764d4cd5ec1e6ced5b1fddd03aac41c424b0c4ec8a45d5d79cd arc_gnu_2014.12_prebuilt_uclibc_be_archs_linux_install.tar.gz - -# Prebuilt musl toolchains from musl-cross -sha256 e32c23d0b83639fc10ad06666ec086b66453b9be44415fe1a818c3c3b526dfb1 crossx86-armeb-linux-musleabi-1.1.12.tar.xz -sha256 eb81bd5d6ada454c6e854b18bfa8dc801333782152166f6cab9fb7cd11692987 crossx86-arm-linux-musleabi-1.1.12.tar.xz -sha256 a050da284ff22d291ae71dfc249ebdedb18334b8d626804760ce7d5963e392e6 crossx86-arm-linux-musleabihf-1.1.12.tar.xz -sha256 18d07f5c8f4cfe373461cf21cf7b1bfefa820a37e96a69b68e0f315d528b4286 crossx86-i486-linux-musl-1.1.12.tar.xz -sha256 1c1480c2618097e402fe804c1431fbd49b0d43520af81d4c1a695a2fa13a3922 crossx86-mipsel-linux-musl-1.1.12.tar.xz -sha256 f0a8b3eb0566138ab3cc77bc09648be15bc325da974ec98b9e67f2fb82be3295 crossx86-mipsel-sf-linux-musl-1.1.12.tar.xz -sha256 6a99989c3dff56776981f6760b2c54dcb9e4032be1d649968bb06c04f2e64177 crossx86-mips-linux-musl-1.1.12.tar.xz -sha256 c082adc3e8b0750bb22ca82628524fd525fd77f534517ac5a66e7ac5a297ee6e crossx86-powerpc-linux-musl-1.1.12.tar.xz -sha256 8c6c9ebb54040e47947b4d3af6823d01fef2bb6ee81b18903c801030c066092b crossx86-sh4eb-linux-musl-1.1.12.tar.xz -sha256 ae9a0a5a60226aa086a56628cfd5c1d283c9dffdca37891d7e6adc2bd21ac2e0 crossx86-sh4-linux-musl-1.1.12.tar.xz -sha256 27e0ea1043a58aebeadf1dacd67e47fd0b5c19fc36f42c9374e5fa3308df09c6 crossx86-x86_64-linux-musl-1.1.12.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 7e4539e19a..0680473ef9 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -56,32 +56,6 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS rm -rf $(@D)/arago-2011.09/ endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS),y) -TOOLCHAIN_EXTERNAL_VERSION = 1.1.12 -TOOLCHAIN_EXTERNAL_SITE = https://googledrive.com/host/0BwnS5DMB0YQ6bDhPZkpOYVFhbk0/musl-$(TOOLCHAIN_EXTERNAL_VERSION) -ifeq ($(BR2_arm)$(BR2_ARM_EABI),yy) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-arm-linux-musleabi-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -else ifeq ($(BR2_arm)$(BR2_ARM_EABIHF),yy) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-arm-linux-musleabihf-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -else ifeq ($(BR2_armeb),y) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-armeb-linux-musleabi-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -else ifeq ($(BR2_i386),y) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-i486-linux-musl-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -else ifeq ($(BR2_mips),y) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-mips-linux-musl-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-mipsel-linux-musl-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:y) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-mipsel-sf-linux-musl-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -else ifeq ($(BR2_powerpc),y) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-powerpc-linux-musl-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -else ifeq ($(BR2_sh4),y) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-sh4-linux-musl-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -else ifeq ($(BR2_sh4eb),y) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-sh4eb-linux-musl-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -else ifeq ($(BR2_x86_64),y) -TOOLCHAIN_EXTERNAL_SOURCE = crossx86-x86_64-linux-musl-$(TOOLCHAIN_EXTERNAL_VERSION).tar.xz -endif else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC),y) TOOLCHAIN_EXTERNAL_SITE = https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2014.12 ifeq ($(BR2_arc750d)$(BR2_arc770d),y) From ec54092c916440501006bfa51a820eb953100510 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:15 +0100 Subject: [PATCH 1490/3392] toolchain-external-custom: new package This commit adds a new package to support custom external toolchains. The legacy implementation is removed. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 351 +----------------- .../toolchain-external-custom/Config.in | 5 + .../Config.in.options | 334 +++++++++++++++++ .../toolchain-external-custom.mk | 15 + .../toolchain-external/toolchain-external.mk | 6 - 5 files changed, 361 insertions(+), 350 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-custom/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-custom/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 5188e1a5eb..e592ec2528 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -43,6 +43,11 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config. # Musl based toolchains (after all the others) source "toolchain/toolchain-external/toolchain-external-musl-cross/Config.in" +# Kept last, so it remains the non-default choice, unless there isn't +# any available toolchain profile for the currently selected +# architecture. +source "toolchain/toolchain-external/toolchain-external-custom/Config.in" + config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09" depends on BR2_arm @@ -109,12 +114,6 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC Toolchain for the ARC cores, from https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases -config BR2_TOOLCHAIN_EXTERNAL_CUSTOM - bool "Custom toolchain" - help - Use this option to use a custom toolchain pre-installed on - your system. - endchoice choice @@ -146,25 +145,12 @@ config BR2_TOOLCHAIN_EXTERNAL_PATH help Path to where the external toolchain is installed. -config BR2_TOOLCHAIN_EXTERNAL_URL - string "Toolchain URL" - depends on BR2_TOOLCHAIN_EXTERNAL_CUSTOM && BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD - help - URL of the custom toolchain tarball to download and install. - -config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX - string "Toolchain prefix" - depends on BR2_TOOLCHAIN_EXTERNAL_CUSTOM - default "$(ARCH)-linux" - config BR2_TOOLCHAIN_EXTERNAL_PREFIX string default "arc-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arcle default "arceb-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arceb default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE - default BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX \ - if BR2_TOOLCHAIN_EXTERNAL_CUSTOM config BR2_TOOLCHAIN_EXTERNAL_GLIBC bool @@ -224,331 +210,8 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config. # Musl based toolchains source "toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options" -if BR2_TOOLCHAIN_EXTERNAL_CUSTOM - -choice - bool "External toolchain gcc version" - default BR2_TOOLCHAIN_EXTERNAL_GCC_4_3 - help - Set to the gcc version that is used by your external - toolchain. - -config BR2_TOOLCHAIN_EXTERNAL_GCC_6 - bool "6.x" - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - -config BR2_TOOLCHAIN_EXTERNAL_GCC_5 - bool "5.x" - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - -config BR2_TOOLCHAIN_EXTERNAL_GCC_4_9 - bool "4.9.x" - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - -config BR2_TOOLCHAIN_EXTERNAL_GCC_4_8 - bool "4.8.x" - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - -config BR2_TOOLCHAIN_EXTERNAL_GCC_4_7 - bool "4.7.x" - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - -config BR2_TOOLCHAIN_EXTERNAL_GCC_4_6 - bool "4.6.x" - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 - -config BR2_TOOLCHAIN_EXTERNAL_GCC_4_5 - bool "4.5.x" - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - -config BR2_TOOLCHAIN_EXTERNAL_GCC_4_4 - bool "4.4.x" - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 - -config BR2_TOOLCHAIN_EXTERNAL_GCC_4_3 - bool "4.3.x" - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 - -endchoice - -choice - bool "External toolchain kernel headers series" - default BR2_TOOLCHAIN_EXTERNAL_HEADERS_REALLY_OLD - help - Set to the kernel headers version that were used to build - this external toolchain. - - This is used to hide/show some packages that have strict - requirements on the version of kernel headers. - - If unsure what version your toolchain is using, you can look - at the value of LINUX_VERSION_CODE in linux/version.h in your - toolchain. The Linux version is M.m.p, with: - M = ( LINUX_VERSION_CODE >> 16 ) & 0xFF - m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF - p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8 - bool "4.8.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_7 - bool "4.7.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_6 - bool "4.6.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_5 - bool "4.5.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4 - bool "4.4.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_3 - bool "4.3.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_2 - bool "4.2.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1 - bool "4.1.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_0 - bool "4.0.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_19 - bool "3.19.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_18 - bool "3.18.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17 - bool "3.17.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_16 - bool "3.16.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_15 - bool "3.15.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_14 - bool "3.14.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_13 - bool "3.13.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12 - bool "3.12.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_11 - bool "3.11.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10 - bool "3.10.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_9 - bool "3.9.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_8 - bool "3.8.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_7 - bool "3.7.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_6 - bool "3.6.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_5 - bool "3.5.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_4 - bool "3.4.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3 - bool "3.3.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_2 - bool "3.2.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_1 - bool "3.1.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_0 - bool "3.0.x" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - -config BR2_TOOLCHAIN_EXTERNAL_HEADERS_REALLY_OLD - bool "2.6.x" - -endchoice - -choice - prompt "External toolchain C library" - default BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC - -config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC - bool "uClibc/uClibc-ng" - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - # For the time being, we assume that all custom external - # toolchains have shadow password support. - select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS - help - Select this option if your external toolchain uses the - uClibc (available from http://www.uclibc.org/) - or uClibc-ng (available from http://www.uclibc-ng.org) - C library. - -config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC - bool "glibc/eglibc" - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - help - Select this option if your external toolchain uses the GNU C - library (available from https://www.gnu.org/software/libc/) - or its variant the eglibc library (http://www.eglibc.org/). - - Note: eglibc is a variant of glibc that (among other things) - can be configured to exclude some of its features. Using a - toolchain with eglibc configured to exclude key features may - cause build failures to some packages. - -comment "glibc only available with shared lib support" - depends on BR2_STATIC_LIBS - -config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL - bool "musl" - select BR2_TOOLCHAIN_EXTERNAL_MUSL - help - Select this option if your external toolchain uses the - 'musl' C library, available from http://www.musl-libc.org/. - -endchoice - -if BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC - -config BR2_TOOLCHAIN_EXTERNAL_WCHAR - bool "Toolchain has WCHAR support?" - select BR2_USE_WCHAR - help - Select this option if your external toolchain supports - WCHAR. If you don't know, leave the default value, Buildroot - will tell you if it's correct or not. - -config BR2_TOOLCHAIN_EXTERNAL_LOCALE - bool "Toolchain has locale support?" - select BR2_TOOLCHAIN_EXTERNAL_WCHAR - select BR2_ENABLE_LOCALE - help - Select this option if your external toolchain has locale - support. If you don't know, leave the default value, - Buildroot will tell you if it's correct or not. - -config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS - bool "Toolchain has threads support?" - select BR2_TOOLCHAIN_HAS_THREADS - default y - help - Select this option if your external toolchain has thread - support. If you don't know, leave the default value, - Buildroot will tell you if it's correct or not. - -if BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS - -config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG - bool "Toolchain has threads debugging support?" - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - default y - help - Select this option if your external toolchain has thread - debugging support. If you don't know, leave the default - value, Buildroot will tell you if it's correct or not. - -config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL - bool "Toolchain has NPTL threads support?" - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - default y - help - Select this option if your external toolchain uses the NPTL - (Native Posix Thread Library) implementation of Posix - threads. If you don't know, leave the default value, - Buildroot will tell you if it's correct or not. - -endif # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS - -endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC - -config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP - bool "Toolchain has SSP support?" - select BR2_TOOLCHAIN_HAS_SSP - default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC - default y if BR2_TOOLCHAIN_EXTERNAL_MUSL - help - Selection this option if your external toolchain has Stack - Smashing Protection support enabled. If you don't know, - leave the default value, Buildroot will tell you if it's - correct or not. - -config BR2_TOOLCHAIN_EXTERNAL_INET_RPC - bool "Toolchain has RPC support?" - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL - default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC - help - Select this option if your external toolchain supports - RPC. If you don't know, leave the default value, Buildroot - will tell you if it's correct or not. - -config BR2_TOOLCHAIN_EXTERNAL_CXX - bool "Toolchain has C++ support?" - select BR2_INSTALL_LIBSTDCPP - help - Select this option if your external toolchain has C++ - support. If you don't know, leave the default value, - Buildroot will tell you if it's correct or not. - -config BR2_TOOLCHAIN_EXTERNAL_FORTRAN - bool "Toolchain has Fortran support?" - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Select this option if your external toolchain has Fortran - support. If you don't know, leave the default value, - Buildroot will tell you if it's correct or not. - -config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS - string "Extra toolchain libraries to be copied to target" - help - If your external toolchain provides extra libraries that - need to be copied to the target filesystem, enter them - here, separated by spaces. - -endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM +# Custom toolchains +source "toolchain/toolchain-external/toolchain-external-custom/Config.in.options" config BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY bool "Copy gdb server to the Target" diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in b/toolchain/toolchain-external/toolchain-external-custom/Config.in new file mode 100644 index 0000000000..a913feb34e --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in @@ -0,0 +1,5 @@ +config BR2_TOOLCHAIN_EXTERNAL_CUSTOM + bool "Custom toolchain" + help + Use this option to use a custom toolchain pre-installed on + your system. diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options new file mode 100644 index 0000000000..cdc25559fa --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -0,0 +1,334 @@ +if BR2_TOOLCHAIN_EXTERNAL_CUSTOM + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-custom" + +config BR2_TOOLCHAIN_EXTERNAL_URL + string "Toolchain URL" + depends on BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD + help + URL of the custom toolchain tarball to download and install. + +config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX + string "Toolchain prefix" + default "$(ARCH)-linux" + +choice + bool "External toolchain gcc version" + default BR2_TOOLCHAIN_EXTERNAL_GCC_4_3 + help + Set to the gcc version that is used by your external + toolchain. + +config BR2_TOOLCHAIN_EXTERNAL_GCC_6 + bool "6.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 + +config BR2_TOOLCHAIN_EXTERNAL_GCC_5 + bool "5.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + +config BR2_TOOLCHAIN_EXTERNAL_GCC_4_9 + bool "4.9.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +config BR2_TOOLCHAIN_EXTERNAL_GCC_4_8 + bool "4.8.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +config BR2_TOOLCHAIN_EXTERNAL_GCC_4_7 + bool "4.7.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + +config BR2_TOOLCHAIN_EXTERNAL_GCC_4_6 + bool "4.6.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + +config BR2_TOOLCHAIN_EXTERNAL_GCC_4_5 + bool "4.5.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + +config BR2_TOOLCHAIN_EXTERNAL_GCC_4_4 + bool "4.4.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 + +config BR2_TOOLCHAIN_EXTERNAL_GCC_4_3 + bool "4.3.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 + +endchoice + +choice + bool "External toolchain kernel headers series" + default BR2_TOOLCHAIN_EXTERNAL_HEADERS_REALLY_OLD + help + Set to the kernel headers version that were used to build + this external toolchain. + + This is used to hide/show some packages that have strict + requirements on the version of kernel headers. + + If unsure what version your toolchain is using, you can look + at the value of LINUX_VERSION_CODE in linux/version.h in your + toolchain. The Linux version is M.m.p, with: + M = ( LINUX_VERSION_CODE >> 16 ) & 0xFF + m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF + p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8 + bool "4.8.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_7 + bool "4.7.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_6 + bool "4.6.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_5 + bool "4.5.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4 + bool "4.4.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_3 + bool "4.3.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_2 + bool "4.2.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1 + bool "4.1.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_0 + bool "4.0.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_19 + bool "3.19.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_18 + bool "3.18.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17 + bool "3.17.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_16 + bool "3.16.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_15 + bool "3.15.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_14 + bool "3.14.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_13 + bool "3.13.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12 + bool "3.12.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_11 + bool "3.11.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10 + bool "3.10.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_9 + bool "3.9.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_8 + bool "3.8.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_7 + bool "3.7.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_6 + bool "3.6.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_5 + bool "3.5.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_4 + bool "3.4.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_3 + bool "3.3.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_2 + bool "3.2.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_1 + bool "3.1.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_0 + bool "3.0.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_REALLY_OLD + bool "2.6.x" + +endchoice + +choice + prompt "External toolchain C library" + default BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC + +config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC + bool "uClibc/uClibc-ng" + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + # For the time being, we assume that all custom external + # toolchains have shadow password support. + select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS + help + Select this option if your external toolchain uses the + uClibc (available from http://www.uclibc.org/) + or uClibc-ng (available from http://www.uclibc-ng.org) + C library. + +config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC + bool "glibc/eglibc" + depends on !BR2_STATIC_LIBS + select BR2_TOOLCHAIN_EXTERNAL_GLIBC + help + Select this option if your external toolchain uses the GNU C + library (available from https://www.gnu.org/software/libc/) + or its variant the eglibc library (http://www.eglibc.org/). + + Note: eglibc is a variant of glibc that (among other things) + can be configured to exclude some of its features. Using a + toolchain with eglibc configured to exclude key features may + cause build failures to some packages. + +comment "(e)glibc only available with shared lib support" + depends on BR2_STATIC_LIBS + +config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL + bool "musl (experimental)" + select BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Select this option if your external toolchain uses the + 'musl' C library, available from http://www.musl-libc.org/. + +endchoice + +if BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC + +config BR2_TOOLCHAIN_EXTERNAL_WCHAR + bool "Toolchain has WCHAR support?" + select BR2_USE_WCHAR + help + Select this option if your external toolchain supports + WCHAR. If you don't know, leave the default value, Buildroot + will tell you if it's correct or not. + +config BR2_TOOLCHAIN_EXTERNAL_LOCALE + bool "Toolchain has locale support?" + select BR2_TOOLCHAIN_EXTERNAL_WCHAR + select BR2_ENABLE_LOCALE + help + Select this option if your external toolchain has locale + support. If you don't know, leave the default value, + Buildroot will tell you if it's correct or not. + +config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS + bool "Toolchain has threads support?" + select BR2_TOOLCHAIN_HAS_THREADS + default y + help + Select this option if your external toolchain has thread + support. If you don't know, leave the default value, + Buildroot will tell you if it's correct or not. + +if BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS + +config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG + bool "Toolchain has threads debugging support?" + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + default y + help + Select this option if your external toolchain has thread + debugging support. If you don't know, leave the default + value, Buildroot will tell you if it's correct or not. + +config BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL + bool "Toolchain has NPTL threads support?" + select BR2_TOOLCHAIN_HAS_THREADS_NPTL + default y + help + Select this option if your external toolchain uses the NPTL + (Native Posix Thread Library) implementation of Posix + threads. If you don't know, leave the default value, + Buildroot will tell you if it's correct or not. + +endif # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS + +endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC + +config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP + bool "Toolchain has SSP support?" + select BR2_TOOLCHAIN_HAS_SSP + default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC + default y if BR2_TOOLCHAIN_EXTERNAL_MUSL + help + Selection this option if your external toolchain has Stack + Smashing Protection support enabled. If you don't know, + leave the default value, Buildroot will tell you if it's + correct or not. + +config BR2_TOOLCHAIN_EXTERNAL_INET_RPC + bool "Toolchain has RPC support?" + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL + default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC + help + Select this option if your external toolchain supports + RPC. If you don't know, leave the default value, Buildroot + will tell you if it's correct or not. + +config BR2_TOOLCHAIN_EXTERNAL_CXX + bool "Toolchain has C++ support?" + select BR2_INSTALL_LIBSTDCPP + help + Select this option if your external toolchain has C++ + support. If you don't know, leave the default value, + Buildroot will tell you if it's correct or not. + +config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS + string "Extra toolchain libraries to be copied to target" + help + If your external toolchain provides extra libraries that + need to be copied to the target filesystem, enter them + here, separated by spaces. They will be copied to the + target's /lib directory. + +endif diff --git a/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk b/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk new file mode 100644 index 0000000000..c4ae6125ef --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# toolchain-external-custom +# +################################################################################ + +TOOLCHAIN_EXTERNAL_CUSTOM_SITE = $(patsubst %/,%,$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))) +TOOLCHAIN_EXTERNAL_CUSTOM_SOURCE = $(notdir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL))) + +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CUSTOM),y) +# We can't check hashes for custom downloaded toolchains +BR_NO_CHECK_HASH_FOR += $(TOOLCHAIN_EXTERNAL_SOURCE) +endif + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 0680473ef9..e13d240c2f 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -69,12 +69,6 @@ else TOOLCHAIN_EXTERNAL_SYNOPSYS_ENDIANESS = be endif TOOLCHAIN_EXTERNAL_SOURCE = arc_gnu_2014.12_prebuilt_uclibc_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ENDIANESS)_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_CORE)_linux_install.tar.gz -else -# Custom toolchain -TOOLCHAIN_EXTERNAL_SITE = $(patsubst %/,%,$(dir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL)))) -TOOLCHAIN_EXTERNAL_SOURCE = $(notdir $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_URL))) -# We can't check hashes for custom downloaded toolchains -BR_NO_CHECK_HASH_FOR += $(TOOLCHAIN_EXTERNAL_SOURCE) endif # Some toolchain vendors have a regular file naming pattern. From a7ec35815272925b92d34e764b4a6079f14d0786 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 7 Nov 2016 02:20:16 +0100 Subject: [PATCH 1491/3392] toolchain-external-arc: new package This commit adds a new package for the Synopsys external toolchain for the ARC architecture. The legacy implementation is removed. Note that this toolchain is marked as BROKEN, but 2016.09 seems about to be released so maybe it will be unbroken soon. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 29 ++++--------------- .../toolchain-external-synopsys-arc/Config.in | 20 +++++++++++++ .../Config.in.options | 10 +++++++ .../toolchain-external-synopsys-arc.hash | 5 ++++ .../toolchain-external-synopsys-arc.mk | 24 +++++++++++++++ .../toolchain-external.hash | 6 ---- .../toolchain-external/toolchain-external.mk | 13 --------- 7 files changed, 65 insertions(+), 42 deletions(-) create mode 100644 toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in create mode 100644 toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options create mode 100644 toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash create mode 100644 toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index e592ec2528..fb337033f0 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -15,6 +15,9 @@ comment "glibc toolchains only available with shared lib support" source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in" source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in" +# ARC +source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in" + # ARM (use Linaro toolchain by default) source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in" @@ -93,27 +96,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE This toolchain uses software-floating point. -config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC - bool "Synopsys ARC 2014.12 toolchain" - depends on BR2_arc - depends on BR2_HOSTARCH = "x86_64" - # does not provide IPv6, and lacks many uClibc features - # expected by Buildroot. The next Synopsys toolchain version - # should fix those problems. - depends on BROKEN - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_ENABLE_LOCALE - select BR2_USE_WCHAR - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - help - Toolchain for the ARC cores, from - https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases - endchoice choice @@ -147,8 +129,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PATH config BR2_TOOLCHAIN_EXTERNAL_PREFIX string - default "arc-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arcle - default "arceb-linux" if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC && BR2_arceb default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE @@ -182,6 +162,9 @@ config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options" +# ARC +source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options" + # ARM source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options" diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in new file mode 100644 index 0000000000..641eca8484 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -0,0 +1,20 @@ +config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC + bool "Synopsys ARC 2014.12 toolchain" + depends on BR2_arc + depends on BR2_HOSTARCH = "x86_64" + # does not provide IPv6, and lacks many uClibc features + # expected by Buildroot. The next Synopsys toolchain version + # should fix those problems. + depends on BROKEN + select BR2_TOOLCHAIN_EXTERNAL_UCLIBC + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_ENABLE_LOCALE + select BR2_USE_WCHAR + select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_DEBUG + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + Toolchain for the ARC cores, from + https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options new file mode 100644 index 0000000000..ceb7dd0081 --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options @@ -0,0 +1,10 @@ +if BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC + +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + default "arc-linux" if BR2_arcle + default "arceb-linux" if BR2_arceb + +config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL + default "toolchain-external-synopsys-arc" + +endif diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash new file mode 100644 index 0000000000..b684cced9a --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 1fa4ea2c8616623205f1c7beca02ea31b019099528a7433e5b020b0876b93bf3 arc_gnu_2014.12_prebuilt_uclibc_le_arc700_linux_install.tar.gz +sha256 1080f07fcae2bfc176a3ea8d30b9ed8eaecab70fb786639d6ec70cae8322df10 arc_gnu_2014.12_prebuilt_uclibc_be_arc700_linux_install.tar.gz +sha256 aaaf6facd1f60a3cd2a537154ea39cd7d70501c175e30e01a97e8df6cb8226c7 arc_gnu_2014.12_prebuilt_uclibc_le_archs_linux_install.tar.gz +sha256 30711c5f15762764d4cd5ec1e6ced5b1fddd03aac41c424b0c4ec8a45d5d79cd arc_gnu_2014.12_prebuilt_uclibc_be_archs_linux_install.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk new file mode 100644 index 0000000000..14ea5e350c --- /dev/null +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# toolchain-external-synopsys-arc +# +################################################################################ + +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2014.12 +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SITE = https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION) + +ifeq ($(BR2_arc750d)$(BR2_arc770d),y) +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_CORE = arc700 +else +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_CORE = archs +endif + +ifeq ($(BR2_arcle),y) +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_ENDIANESS = le +else +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_ENDIANESS = be +endif + +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SOURCE = arc_gnu_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)_prebuilt_uclibc_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ENDIANESS)_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_CORE)_linux_install.tar.gz + +$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash index a286ef2923..cc93998a58 100644 --- a/toolchain/toolchain-external/toolchain-external.hash +++ b/toolchain/toolchain-external/toolchain-external.hash @@ -6,9 +6,3 @@ sha256 f2febf3b3c565536461ad4405f1bcb835d75a6afb2a8bec958a1248cb4b81fc7 arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2 sha256 254af7d02eb3bcc8345c78e131700bc995d65b68232caaed21150a5fd1456070 arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2 sha256 25fbf0513ad7322b15cbaae964cafadcbb4c939f2708f57f40b8f9f2d601122b arago-toolchain-2011.09-sources.tar.bz2 - -# Synopsys DesignWare ARC toolchains -sha256 1fa4ea2c8616623205f1c7beca02ea31b019099528a7433e5b020b0876b93bf3 arc_gnu_2014.12_prebuilt_uclibc_le_arc700_linux_install.tar.gz -sha256 1080f07fcae2bfc176a3ea8d30b9ed8eaecab70fb786639d6ec70cae8322df10 arc_gnu_2014.12_prebuilt_uclibc_be_arc700_linux_install.tar.gz -sha256 aaaf6facd1f60a3cd2a537154ea39cd7d70501c175e30e01a97e8df6cb8226c7 arc_gnu_2014.12_prebuilt_uclibc_le_archs_linux_install.tar.gz -sha256 30711c5f15762764d4cd5ec1e6ced5b1fddd03aac41c424b0c4ec8a45d5d79cd arc_gnu_2014.12_prebuilt_uclibc_be_archs_linux_install.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index e13d240c2f..53f558369e 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -56,19 +56,6 @@ define TOOLCHAIN_EXTERNAL_FIXUP_CMDS rm -rf $(@D)/arago-2011.09/ endef TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC),y) -TOOLCHAIN_EXTERNAL_SITE = https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-2014.12 -ifeq ($(BR2_arc750d)$(BR2_arc770d),y) -TOOLCHAIN_EXTERNAL_SYNOPSYS_CORE = arc700 -else -TOOLCHAIN_EXTERNAL_SYNOPSYS_CORE = archs -endif -ifeq ($(BR2_arcle),y) -TOOLCHAIN_EXTERNAL_SYNOPSYS_ENDIANESS = le -else -TOOLCHAIN_EXTERNAL_SYNOPSYS_ENDIANESS = be -endif -TOOLCHAIN_EXTERNAL_SOURCE = arc_gnu_2014.12_prebuilt_uclibc_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ENDIANESS)_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_CORE)_linux_install.tar.gz endif # Some toolchain vendors have a regular file naming pattern. From b5c00f09085251a122b0af08438685fa2304b73d Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 7 Nov 2016 02:20:17 +0100 Subject: [PATCH 1492/3392] toolchain-external: remove Arago toolchains The Arago toolchains are no longer maintained and haven't been updated for a long time. With this removal, all the legacy toolchain-external support can be removed as well. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 12 ++ toolchain/toolchain-external/Config.in | 53 +------- .../toolchain-external.hash | 8 -- .../toolchain-external/toolchain-external.mk | 123 ------------------ 4 files changed, 15 insertions(+), 181 deletions(-) delete mode 100644 toolchain/toolchain-external/toolchain-external.hash diff --git a/Config.in.legacy b/Config.in.legacy index 53fcf4e31f..c0b84980b6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,18 @@ endif ############################################################################### comment "Legacy options removed in 2017.02" +config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A + bool "Arago ARMv7 2011.09 removed" + select BR2_LEGACY + help + The Arago toolchains are every old and not updated anymore. + +config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE + bool "Arago ARMv5 2011.09 removed" + select BR2_LEGACY + help + The Arago toolchains are every old and not updated anymore. + config BR2_PACKAGE_SNOWBALL_HDMISERVICE bool "snowball-hdmiservice removed" select BR2_LEGACY diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index fb337033f0..2c39e5ae59 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -51,51 +51,6 @@ source "toolchain/toolchain-external/toolchain-external-musl-cross/Config.in" # architecture. source "toolchain/toolchain-external/toolchain-external-custom/Config.in" -config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A - bool "Arago ARMv7 2011.09" - depends on BR2_arm - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_ARM_CPU_ARMV7A - depends on BR2_ARM_EABI - depends on BR2_ARM_CPU_HAS_VFPV3 - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - # kernel headers: 2.6.31 - help - Texas Instruments Arago 2011.09 toolchain, with gcc 4.5.3, - binutils 2.20.1, glibc 2.12, gdb 7.2. - - This toolchain uses -mfloat-abi=softfp (i.e can use FPU - instructions, but passes floating point function arguments - in integer registers), and requires a VFPv3 floating point - unit to work properly. This unit is available on most - Cortex-A ARM processors, but not all. - -config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE - bool "Arago ARMv5 2011.09" - depends on BR2_arm - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_ARM_CPU_ARMV4 - depends on BR2_ARM_EABI - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - # kernel headers: 2.6.31 - help - Texas Instruments Arago ARMv5 2011.09 toolchain, with gcc - 4.5.3, binutils 2.20.1, glibc 2.12, gdb 7.2. - - This toolchain uses software-floating point. - endchoice choice @@ -127,11 +82,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PATH help Path to where the external toolchain is installed. -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - string - default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A - default "arm-arago-linux-gnueabi" if BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE - config BR2_TOOLCHAIN_EXTERNAL_GLIBC bool select BR2_TOOLCHAIN_USES_GLIBC @@ -154,6 +104,9 @@ config BR2_PACKAGE_HAS_TOOLCHAIN_EXTERNAL config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL string +config BR2_TOOLCHAIN_EXTERNAL_PREFIX + string + # Kept toolchains sorted as in the choice above # The toolchain Config.in.options must define # BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL and BR2_TOOLCHAIN_EXTERNAL_PREFIX diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash deleted file mode 100644 index cc93998a58..0000000000 --- a/toolchain/toolchain-external/toolchain-external.hash +++ /dev/null @@ -1,8 +0,0 @@ -###################################### -# Next hashes are all locally computed - -# ARM toolchains from Texas Instrument's Arago project -# There is one source file that covers both binary distributions. -sha256 f2febf3b3c565536461ad4405f1bcb835d75a6afb2a8bec958a1248cb4b81fc7 arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2 -sha256 254af7d02eb3bcc8345c78e131700bc995d65b68232caaed21150a5fd1456070 arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2 -sha256 25fbf0513ad7322b15cbaae964cafadcbb4c939f2708f57f40b8f9f2d601122b arago-toolchain-2011.09-sources.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 53f558369e..48de1e71f2 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -15,129 +15,6 @@ ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) TOOLCHAIN_EXTERNAL_DEPENDENCIES += musl-compat-headers endif -# All the definition that are common between the toolchain-external -# generic package and the toolchain-external-package infrastructure -# can be found in pkg-toolchain-external.mk - -# Legacy toolchains that don't use the toolchain-external-package infrastructure -# yet. We can recognise that because no provider is set. -ifeq ($(call qstrip,$(BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL)),) - -# Now we are the provider. However, we can't set it to ourselves or we'll get a -# circular dependency. Let's set it to a target that we always depend on -# instead. -BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL = skeleton - -TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES - -# In fact, we don't need to download the toolchain, since it is already -# available on the system, so force the site and source to be empty so -# that nothing will be downloaded/extracted. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED),y) -TOOLCHAIN_EXTERNAL_SITE = -TOOLCHAIN_EXTERNAL_SOURCE = -endif - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A),y) -TOOLCHAIN_EXTERNAL_SITE = http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports -TOOLCHAIN_EXTERNAL_SOURCE = arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2 -TOOLCHAIN_EXTERNAL_ACTUAL_SOURCE_TARBALL = arago-toolchain-2011.09-sources.tar.bz2 -define TOOLCHAIN_EXTERNAL_FIXUP_CMDS - mv $(@D)/arago-2011.09/armv7a/* $(@D)/ - rm -rf $(@D)/arago-2011.09/ -endef -TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE),y) -TOOLCHAIN_EXTERNAL_SITE = http://software-dl.ti.com/sdoemb/sdoemb_public_sw/arago_toolchain/2011_09/exports -TOOLCHAIN_EXTERNAL_SOURCE = arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2 -TOOLCHAIN_EXTERNAL_ACTUAL_SOURCE_TARBALL = arago-toolchain-2011.09-sources.tar.bz2 -define TOOLCHAIN_EXTERNAL_FIXUP_CMDS - mv $(@D)/arago-2011.09/armv5te/* $(@D)/ - rm -rf $(@D)/arago-2011.09/ -endef -TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_FIXUP_CMDS -endif - -# Some toolchain vendors have a regular file naming pattern. -# For them, mass-define _ACTUAL_SOURCE_TARBALL based _SITE. -ifneq ($(findstring sourcery.mentor.com/public/gnu_toolchain,$(TOOLCHAIN_EXTERNAL_SITE)),) -TOOLCHAIN_EXTERNAL_ACTUAL_SOURCE_TARBALL ?= \ - $(subst -i686-pc-linux-gnu.tar.bz2,.src.tar.bz2,$(subst -i686-pc-linux-gnu-i386-linux.tar.bz2,-i686-pc-linux-gnu.src.tar.bz2,$(TOOLCHAIN_EXTERNAL_SOURCE))) -endif - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) -TOOLCHAIN_EXTERNAL_EXCLUDES = usr/lib/locale/* - -TOOLCHAIN_EXTERNAL_POST_EXTRACT_HOOKS += \ - TOOLCHAIN_EXTERNAL_MOVE -endif - -# Checks for an already installed toolchain: check the toolchain -# location, check that it is usable, and then verify that it -# matches the configuration provided in Buildroot: ABI, C++ support, -# kernel headers version, type of C library and all C library features. -define TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS - $(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC)) - $(Q)$(call check_unusable_toolchain,$(TOOLCHAIN_EXTERNAL_CC)) - $(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \ - $(call check_kernel_headers_version,\ - $(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC)),\ - $(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))); \ - $(call check_gcc_version,$(TOOLCHAIN_EXTERNAL_CC),\ - $(call qstrip,$(BR2_TOOLCHAIN_GCC_AT_LEAST))); \ - if test "$(BR2_arm)" = "y" ; then \ - $(call check_arm_abi,\ - "$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS)",\ - $(TOOLCHAIN_EXTERNAL_READELF)) ; \ - fi ; \ - if test "$(BR2_INSTALL_LIBSTDCPP)" = "y" ; then \ - $(call check_cplusplus,$(TOOLCHAIN_EXTERNAL_CXX)) ; \ - fi ; \ - if test "$(BR2_TOOLCHAIN_HAS_FORTRAN)" = "y" ; then \ - $(call check_fortran,$(TOOLCHAIN_EXTERNAL_FC)) ; \ - fi ; \ - if test "$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)" = "y" ; then \ - $(call check_uclibc,$${SYSROOT_DIR}) ; \ - elif test "$(BR2_TOOLCHAIN_EXTERNAL_MUSL)" = "y" ; then \ - $(call check_musl,$${SYSROOT_DIR}) ; \ - else \ - $(call check_glibc,$${SYSROOT_DIR}) ; \ - fi - $(Q)$(call check_toolchain_ssp,$(TOOLCHAIN_EXTERNAL_CC)) -endef - -TOOLCHAIN_EXTERNAL_BUILD_CMDS = $(TOOLCHAIN_WRAPPER_BUILD) - -define TOOLCHAIN_EXTERNAL_INSTALL_STAGING_CMDS - $(TOOLCHAIN_WRAPPER_INSTALL) - $(TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK) - $(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS) - $(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC) - $(TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER) - $(TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT) -endef - -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) -TOOLCHAIN_EXTERNAL_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK -endif - -# Even though we're installing things in both the staging, the host -# and the target directory, we do everything within the -# install-staging step, arbitrarily. -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_CMDS - $(TOOLCHAIN_EXTERNAL_CREATE_TARGET_LIB_SYMLINK) - $(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS) - $(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER) - $(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FDPIC) - $(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FLAT) - $(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO) -endef - -endif # BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - - -# Since a virtual package is just a generic package, we can still -# define commands for the legacy toolchains. $(eval $(virtual-package)) # Ensure the external-toolchain package has a prefix defined. From 9befe94baf990ee6331e77edb40e286e9dc4df8d Mon Sep 17 00:00:00 2001 From: Gilles Chanteperdrix Date: Wed, 23 Nov 2016 13:58:40 +0100 Subject: [PATCH 1493/3392] Makefile: generate SOURCE_DATE_EPOCH for reproducible builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When reproducibility is requested, generate a global SOURCE_DATE_EPOCH environment variable which contains either the date of Buildroot last commit if running from a git repository, or the latest release date. This means that all packages embedding build dates will appear to have the same build date, so in case of new commit or release, all packages will appear to have been changed, even though some of them may not have changed in fact. The meaning of SOURCE_DATE_EPOCH is specified by the following specification: https://reproducible-builds.org/specs/source-date-epoch/ Signed-off-by: Gilles Chanteperdrix Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index eff814b8c6..8acbe58655 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,8 @@ all: # Set and export the version string export BR2_VERSION := 2016.11-rc1 +# Actual time the release is cut (for reproducible builds) +BR2_VERSION_EPOCH = 1478206447 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -249,6 +251,8 @@ ifeq ($(BR2_REPRODUCIBLE),y) export TZ=UTC export LANG=C export LC_ALL=C +BR2_VERSION_GIT_EPOCH = $(shell GIT_DIR=$(TOPDIR)/.git $(GIT) log -1 --format=%at) +export SOURCE_DATE_EPOCH = $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH)) endif # To put more focus on warnings, be less verbose as default From 9b91b21dae40d6db1c320a76cfdbabeedcb2d1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 23 Nov 2016 13:58:42 +0100 Subject: [PATCH 1494/3392] Makefile: add '-n' to gzip invocations to improve reproducibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Default invocation to gzip include timestamp in output file. This feature is incompatible with BR2_REPRODUCIBLE. It is possible to disable it with '-n'. The environment variable GZIP can hold a set of default options for gzip. So instead to find all gzip invocation in build process, we just export 'GZIP=-n'. Notice bzip2, lzma and xz are not impacted by this problem. On the other hand, lzop does include timestamp and does not provide any way to disable it. This work was sponsored by `BA Robotic Systems'. Signed-off-by: Jérôme Pouiller Reviewed-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8acbe58655..9e588dae7d 100644 --- a/Makefile +++ b/Makefile @@ -251,6 +251,7 @@ ifeq ($(BR2_REPRODUCIBLE),y) export TZ=UTC export LANG=C export LC_ALL=C +export GZIP = -n BR2_VERSION_GIT_EPOCH = $(shell GIT_DIR=$(TOPDIR)/.git $(GIT) log -1 --format=%at) export SOURCE_DATE_EPOCH = $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH)) endif From 59f9c4ca9feb2c070df508c7196f06a6e87307b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 23 Nov 2016 13:58:43 +0100 Subject: [PATCH 1495/3392] fs/tar: make results reproducible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to make tar images reproducible, force files order in tarball. This work was sponsored by `BA Robotic Systems'. Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- fs/tar/tar.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk index 11c69c5a8b..b14c977d76 100644 --- a/fs/tar/tar.mk +++ b/fs/tar/tar.mk @@ -7,7 +7,8 @@ TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS)) define ROOTFS_TAR_CMD - tar $(TAR_OPTS) -cf $@ --numeric-owner -C $(TARGET_DIR) . + (cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \ + tar $(TAR_OPTS) -cf $@ --null -T - --no-recursion --numeric-owner) endef $(eval $(call ROOTFS_TARGET,tar)) From af109fb44469a89b2576d167b02f02a811d13c12 Mon Sep 17 00:00:00 2001 From: Gilles Chanteperdrix Date: Wed, 23 Nov 2016 13:58:44 +0100 Subject: [PATCH 1496/3392] linux: override build timestamp for reproducible builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Linux kernel include a few information about build environment in its binary. This feature is incompatible with BR2_REPRODUCIBLE. This patch overload build information when BR2_REPRODUCIBLE is enabled. Note that usage of KBUILD_BUILD_TIMESTAMP is not mandatory since Buildroot use `fakedate'. However, native solution is prefered when upstream provide one. Signed-off-by: Gilles Chanteperdrix Reviewed-by: "Yann E. MORIN" Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index 988427ca7c..7e826ccdf0 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -94,6 +94,14 @@ LINUX_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ BR_BINARIES_DIR=$(BINARIES_DIR) +ifeq ($(BR2_REPRODUCIBLE),y) +LINUX_MAKE_ENV += \ + KBUILD_BUILD_VERSION=1 \ + KBUILD_BUILD_USER=buildroot \ + KBUILD_BUILD_HOST=buildroot \ + KBUILD_BUILD_TIMESTAMP="$(shell date -d @$(SOURCE_DATE_EPOCH))" +endif + # Get the real Linux version, which tells us where kernel modules are # going to be installed in the target filesystem. LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` From a8254d32fd839ebd0a96863579832678eb6e0038 Mon Sep 17 00:00:00 2001 From: Gilles Chanteperdrix Date: Wed, 23 Nov 2016 13:58:46 +0100 Subject: [PATCH 1497/3392] busybox: disable build timestamps for reproducible builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Busybox includes some information about the build environment in its binary. For BR2_REPRODUCIBLE, remove that information. Signed-off-by: Gilles Chanteperdrix Signed-off-by: Jérôme Pouiller Reviewed-by: "Yann E. MORIN" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/busybox/busybox.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index fc23a90a29..f4a241d38b 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -36,6 +36,12 @@ BUSYBOX_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ CFLAGS="$(BUSYBOX_CFLAGS)" \ CFLAGS_busybox="$(BUSYBOX_CFLAGS_busybox)" + +ifeq ($(BR2_REPRODUCIBLE),y) +BUSYBOX_MAKE_ENV += \ + KCONFIG_NOTIMESTAMP=1 +endif + BUSYBOX_MAKE_OPTS = \ CC="$(TARGET_CC)" \ ARCH=$(KERNEL_ARCH) \ From 68db7210fd8e76120c27cdc4a1fe591de67c06c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 23 Nov 2016 13:58:47 +0100 Subject: [PATCH 1498/3392] fs/common: lock modification times in $TARGET_DIR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure all files in $TARGET_DIR have a defined modification time before to generate filesystems. This work was sponsored by `BA Robotic Systems'. Signed-off-by: Jérôme Pouiller Reviewed-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- fs/common.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/common.mk b/fs/common.mk index 2dbef4d7b0..981dcb1aa2 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -95,6 +95,9 @@ endif $$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \ echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) +ifeq ($$(BR2_REPRODUCIBLE),y) + echo "find $$(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$$(SOURCE_DATE_EPOCH)" >> $$(FAKEROOT_SCRIPT) +endif $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/pseudo -- $$(FAKEROOT_SCRIPT) From bedb16105dd6742d3209af7ef45c23a8bb1c077f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 23 Nov 2016 13:58:56 +0100 Subject: [PATCH 1499/3392] Config.in: improve BR2_REPRODUCIBLE help text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Config.in b/Config.in index 5cf0c4d290..98096dff12 100644 --- a/Config.in +++ b/Config.in @@ -707,6 +707,12 @@ config BR2_REPRODUCIBLE this allows to generate exactly identical binaries from one build to the other, including on different machines. + The current implementation is restricted to builds with the + same output directory. Many (absolute) paths are recorded in + intermediary files, and it is very likely that some of these + paths leak into the target rootfs. If you build with the + same O=... path, however, the result is identical. + This is labeled as an experimental feature, as not all packages behave properly to ensure reproducibility. From 3111f6a5109678fa08be44792b4708fd7d09eb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 23 Nov 2016 13:58:57 +0100 Subject: [PATCH 1500/3392] Makefile: make exported variable definitions consistent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use a space before and after the equal sign when defining the TZ, LANG and LC_ALL variables, as suggested by the Buildroot coding style. Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9e588dae7d..7c582e5d78 100644 --- a/Makefile +++ b/Makefile @@ -248,9 +248,9 @@ endif # timezone and locale may affect build output ifeq ($(BR2_REPRODUCIBLE),y) -export TZ=UTC -export LANG=C -export LC_ALL=C +export TZ = UTC +export LANG = C +export LC_ALL = C export GZIP = -n BR2_VERSION_GIT_EPOCH = $(shell GIT_DIR=$(TOPDIR)/.git $(GIT) log -1 --format=%at) export SOURCE_DATE_EPOCH = $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH)) From 207294ffa9bbc0a01476646ed37afbd866b74191 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 23 Nov 2016 15:14:04 +0100 Subject: [PATCH 1501/3392] makedevs: remove target package The makedevs package is a fork of the makedevs tool from busybox. It is part of the Buildroot infrastructure, not something that should be used on the target. It something like this is needed on the target, upstream busybox should be used. And if one of the Buildroot-specific features is needed, then that feature should be upstreamed to busybox. Besides, there were already two things wrong with the target package: - it didn't take into account the overlap with busybox (no depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS, no dependency on busybox); - it didn't take into account the libcap feature. The target package was introduced more or less accidentally in 81cd9d45 where the intention was to make it more similar to other packages. So, kill it with fire. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/makedevs/Config.in | 5 ----- package/makedevs/makedevs.mk | 10 ---------- 4 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 package/makedevs/Config.in diff --git a/Config.in.legacy b/Config.in.legacy index c0b84980b6..cfb127610a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,13 @@ endif ############################################################################### comment "Legacy options removed in 2017.02" +config BR2_PACKAGE_MAKEDEVS + bool "makedevs removed" + select BR2_LEGACY + help + The makedevs tool is part of busybox. The Buildroot fork + should not be used outside of the Buildroot infrastructure. + config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A bool "Arago ARMv7 2011.09 removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index b2e1a2a41b..b076dfd8b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -170,7 +170,6 @@ menu "Filesystem and flash utilities" source "package/genext2fs/Config.in" source "package/genpart/Config.in" source "package/genromfs/Config.in" - source "package/makedevs/Config.in" source "package/mmc-utils/Config.in" source "package/mtd/Config.in" source "package/mtools/Config.in" diff --git a/package/makedevs/Config.in b/package/makedevs/Config.in deleted file mode 100644 index 923150dd6d..0000000000 --- a/package/makedevs/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_MAKEDEVS - bool "makedevs" - help - The makedevs utility allows to create a set of device files - according to a configuration file. diff --git a/package/makedevs/makedevs.mk b/package/makedevs/makedevs.mk index 95933c4f4e..9bd684f036 100644 --- a/package/makedevs/makedevs.mk +++ b/package/makedevs/makedevs.mk @@ -15,15 +15,6 @@ HOST_MAKEDEVS_CFLAGS += -DEXTENDED_ATTRIBUTES HOST_MAKEDEVS_LDFLAGS += -lcap endif -define MAKEDEVS_BUILD_CMDS - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ - package/makedevs/makedevs.c -o $(@D)/makedevs -endef - -define MAKEDEVS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/makedevs $(TARGET_DIR)/usr/sbin/makedevs -endef - define HOST_MAKEDEVS_BUILD_CMDS $(HOSTCC) $(HOST_MAKEDEVS_CFLAGS) package/makedevs/makedevs.c \ -o $(@D)/makedevs $(HOST_MAKEDEVS_LDFLAGS) @@ -33,5 +24,4 @@ define HOST_MAKEDEVS_INSTALL_CMDS $(INSTALL) -D -m 755 $(@D)/makedevs $(HOST_DIR)/usr/bin/makedevs endef -$(eval $(generic-package)) $(eval $(host-generic-package)) From 921c94720bfff3dacd7c84216298046a75dec59c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Nov 2016 12:20:16 +0100 Subject: [PATCH 1502/3392] gcc: the special workaround for ARC is no longer required It seems with the change to gcc 6.x based toolchain this workaround is no longer required. Tested with an arc hs toolchain. Signed-off-by: Waldemar Brodkorb Acked-by: Alexey Brodkin Signed-off-by: Thomas Petazzoni --- package/gcc/gcc-initial/gcc-initial.mk | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index 7bb988bdf7..a51e29cfc7 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -25,19 +25,6 @@ HOST_GCC_INITIAL_SUBDIR = build HOST_GCC_INITIAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK -# gcc on ARC has a bug: in its libgcc, even when no C library is -# available (--with-newlib is passed, and therefore inhibit_libc is -# defined), it tries to use the C library for the libgmon -# library. Since it's not needed in gcc-initial, we disabled it here. -ifeq ($(BR2_GCC_VERSION_ARC),y) -define HOST_GCC_INITIAL_DISABLE_LIBGMON - $(SED) 's/crtbeginS.o libgmon.a crtg.o/crtbeginS.o crtg.o/' \ - $(@D)/libgcc/config.host -endef -HOST_GCC_INITIAL_POST_PATCH_HOOKS += HOST_GCC_INITIAL_DISABLE_LIBGMON -HOST_GCC_INITIAL_POST_RSYNC_HOOKS += HOST_GCC_INITIAL_DISABLE_LIBGMON -endif - HOST_GCC_INITIAL_CONF_OPTS = \ $(HOST_GCC_COMMON_CONF_OPTS) \ --enable-languages=c \ From 5b7013c4ae3c4b183303204710a4bb3d717a4558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 22 Nov 2016 15:53:33 -0500 Subject: [PATCH 1503/3392] Makefile: fix ignored trace at target-finalize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make may throw an error (but ignored) trace when cleaning up the rootfs. The target-finalize rule intends to remove the folder `$(TARGET_DIR)/usr/share' but this directory may still contain items (such as the `udhcpc' helper script) and causes the rmdir to fail. The stderr output is redirected to /dev/null but it returns and error which is escaped by the leading `-'; but make reports an ignored-error. See the log below: $ make (...) rm -rf (...)/target/usr/share/gtk-doc rmdir (...)/target/usr/share rmdir: failed to remove '(...)/target/usr/share': Directory not empty make[1]: [Makefile:650: target-finalize] Error 1 (ignored) find /(...)/target -type f \( -perm /111 -o -name '*.so*' \) -not \( -name 'libpthread*.so*' -o -name 'ld-*.so*' -o -name '*.ko' \) -print0 | xargs -0 (...)/host/usr/bin/arm-buildroot-linux-uclibcgnueabihf-strip --remove-section=.comment --remove-section=.note 2>/dev/null || true This patch apply the same rule at the instruction immediately after: * redirecting stderr to /dev/null (already done) and * executing true if the `rmdir' instruction fails. Signed-off-by: Gaël PORTAY Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7c582e5d78..4f6269faa3 100644 --- a/Makefile +++ b/Makefile @@ -668,7 +668,7 @@ endif rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc rm -rf $(TARGET_DIR)/usr/share/gtk-doc - -rmdir $(TARGET_DIR)/usr/share 2>/dev/null + rmdir $(TARGET_DIR)/usr/share 2>/dev/null || true $(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true # See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads From d634d9dda7f3c328d63469cb628c79da49a09e89 Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Wed, 23 Nov 2016 13:25:02 +1100 Subject: [PATCH 1504/3392] package/qemu: enable host QEMU for powerpc64/powerpc64le Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index cf23f16a3c..ae4e0ad221 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -34,6 +34,8 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p # mips64 mips64 # mips64el mips64el # powerpc ppc +# powerpc64 ppc64 +# powerpc64le ppc64 (ppc64 supports little-endian) # sh2a not supported # sh4 sh4 # sh4eb sh4eb @@ -55,6 +57,12 @@ endif ifeq ($(HOST_QEMU_ARCH),powerpc) HOST_QEMU_ARCH = ppc endif +ifeq ($(HOST_QEMU_ARCH),powerpc64) +HOST_QEMU_ARCH = ppc64 +endif +ifeq ($(HOST_QEMU_ARCH),powerpc64le) +HOST_QEMU_ARCH = ppc64 +endif ifeq ($(HOST_QEMU_ARCH),sh4a) HOST_QEMU_ARCH = sh4 endif From 171d4103c565d618ac6dfc61dedf3e1a310e8d6c Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Tue, 22 Nov 2016 21:23:02 -0500 Subject: [PATCH 1505/3392] Makefile: fix distclean removal of $(O) The distclean target no longer removes the "output" directory for in-tree builds, because $(O) is no longer just "output" in that case. Change the test to be against "$(CURDIR)/output", to match the O setting, and a similar test elsewhere in the same Makefile. Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 37e4bd4dbd..13239616a8 100644 --- a/Makefile +++ b/Makefile @@ -928,7 +928,7 @@ clean: $(LEGAL_INFO_DIR) $(GRAPHS_DIR) distclean: clean -ifeq ($(O),output) +ifeq ($(O),$(CURDIR)/output) rm -rf $(O) endif rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \ From f4cd8ceb9cfa908f3cdf0fffb94f1c854ddd24c4 Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Tue, 22 Nov 2016 13:42:25 +0300 Subject: [PATCH 1506/3392] trousers: Pass "-mno-compact-casesi" when building for ARCv1 Compact casesi patterns don't have a reload version. This causes build failures of "trousers" package for ARC. Current patch disables compact casesi patterns for ARCv1 (750D and 770D) via passing "-mno-compact-casesi" option when compiling "trousers". This change is a temporary workaround and the feature is going to be fixed in the next ARC toolchain release version. Fixes: http://autobuild.buildroot.org/results/d2c/d2c16d8ba022b070c4dbeba5e7ea41f14d706691// Signed-off-by: Vlad Zakharov Signed-off-by: Thomas Petazzoni --- package/trousers/trousers.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/trousers/trousers.mk b/package/trousers/trousers.mk index 3d9e0badc2..4fc949909e 100644 --- a/package/trousers/trousers.mk +++ b/package/trousers/trousers.mk @@ -18,6 +18,10 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) TROUSERS_DEPENDENCIES += libiconv endif +ifeq ($(BR2_arc770d)$(BR2_arc750d),y) +TROUSERS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-casesi" +endif + # The TrouSerS build system attempts to create the tss user and group # on the host system. Disable the user checking feature as a # workaround. From b14b02698ecb6deb5b2676a0a7747b67ae19d709 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 19 Nov 2016 11:52:26 +0100 Subject: [PATCH 1507/3392] core/br2-external: restore compatibility with old distros Currently, the br2-external script uses bash-4's associative arrays. However, some oldish enterprise-class distros like RHEL5 still use bash-3.1 which lacks associative arrays. We restore compatibility with those oldish distros using 'eval' to emulate associative arrays, as suggested by Arnout. Reported-by: Ricardo Martincoski Signed-off-by: "Yann E. MORIN" Cc: Ricardo Martincoski Cc: Thomas De Schampheleire Cc: Arnout Vandecappelle Cc: Max Filippov Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- support/scripts/br2-external | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 055dc08555..84bc334f77 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -1,10 +1,12 @@ #!/bin/bash set -e -# The names and locations of the br2-external trees, once validated. +# This script must be able to run with bash-3.1, so it can't use +# associative arrays. Instead, it emulates them using 'eval'. It +# can however use indexed arrays, supported since at least bash-3.0. + +# The names of the br2-external trees, once validated. declare -a BR2_EXT_NAMES -declare -A BR2_EXT_PATHS -declare -A BR2_EXT_DESCS # URL to manual for help in converting old br2-external trees. # Escape '#' so that make does not consider it a comment. @@ -68,7 +70,7 @@ do_validate() { do_validate_one() { local br2_ext="${1}" - local br2_name br2_desc n + local br2_name br2_desc n d if [ ! -d "${br2_ext}" ]; then error "'%s': no such file or directory\n" "${br2_ext}" @@ -91,9 +93,10 @@ do_validate_one() { error "'%s': name '%s' contains invalid chars: '%s'\n" \ "${br2_ext}" "${br2_name//\$/\$\$}" "${n//\$/\$\$}" fi - if [ -n "${BR2_EXT_PATHS["${br2_name}"]}" ]; then + eval d="\"\${BR2_EXT_PATHS_${br2_name}}\"" + if [ -n "${d}" ]; then error "'%s': name '%s' is already used in '%s'\n" \ - "${br2_ext}" "${br2_name}" "${BR2_EXT_PATHS["${br2_name}"]}" + "${br2_ext}" "${br2_name}" "${d}" fi br2_desc="$(sed -r -e '/^desc: +(.*)$/!d; s//\1/' "${br2_ext}/external.desc")" if [ ! -f "${br2_ext}/external.mk" ]; then @@ -105,8 +108,8 @@ do_validate_one() { # Register this br2-external tree BR2_EXT_NAMES+=( "${br2_name}" ) - BR2_EXT_PATHS["${br2_name}"]="${br2_ext}" - BR2_EXT_DESCS["${br2_name}"]="${br2_desc:-${br2_name}}" + eval BR2_EXT_PATHS_${br2_name}="\"\${br2_ext}\"" + eval BR2_EXT_DESCS_${br2_name}="\"\${br2_desc:-\${br2_name}}\"" } # Generate the .mk snippet that defines makefile variables @@ -117,13 +120,10 @@ do_mk() { printf '#\n# Automatically generated file; DO NOT EDIT.\n#\n' printf '\n' - # We can't use ${BR2_EXT_NAMES[@]} directly: it is not guaranteed - # to be in the order paths were added (because it is an associative - # array). So we need to iterate on BR2_EXT_NAMES, which is sorted - # in the order names were added (because it is an indexed array). printf 'BR2_EXTERNAL ?=' for br2_name in "${BR2_EXT_NAMES[@]}"; do - printf ' %s' "${BR2_EXT_PATHS["${br2_name}"]}" + eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" + printf ' %s' "${br2_ext}" done printf '\n' @@ -138,8 +138,8 @@ do_mk() { fi for br2_name in "${BR2_EXT_NAMES[@]}"; do - br2_desc="${BR2_EXT_DESCS["${br2_name}"]}" - br2_ext="${BR2_EXT_PATHS["${br2_name}"]}" + eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" + eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" printf '\n' printf 'BR2_EXTERNAL_NAMES += %s\n' "${br2_name}" printf 'BR2_EXTERNAL_DIRS += %s\n' "${br2_ext}" @@ -165,8 +165,8 @@ do_kconfig() { printf '\n' for br2_name in "${BR2_EXT_NAMES[@]}"; do - br2_desc="${BR2_EXT_DESCS["${br2_name}"]}" - br2_ext="${BR2_EXT_PATHS["${br2_name}"]}" + eval br2_desc="\"\${BR2_EXT_DESCS_${br2_name}}\"" + eval br2_ext="\"\${BR2_EXT_PATHS_${br2_name}}\"" if [ ${#BR2_EXT_NAMES[@]} -gt 1 ]; then printf 'menu "%s"\n' "${br2_desc}" fi From b4c050e9afed7a8dc302e6e1014cc4ffb508590d Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Fri, 25 Nov 2016 14:00:42 +0300 Subject: [PATCH 1508/3392] gpsd: Fix building with gcc 6.x When building C++ parts of gpsd (for example Qt bindings) with gcc 6.x following failure happens, see [1]: ------------------------------>8------------------------------- :0:0: warning: "_LARGEFILE_SOURCE" redefined :0:0: note: this is the location of the previous definition In file included from clock_gettime.c:10:0: compiler.h: In function 'void memory_barrier()': compiler.h:93:25: error: 'memory_order_seq_cst' was not declared in this scope atomic_thread_fence(memory_order_seq_cst); ^~~~~~~~~~~~~~~~~~~~ compiler.h:93:25: note: suggested alternative: In file included from .../output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.2.1/atomic:41:0, from compiler.h:75, from clock_gettime.c:10: .../output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.2.1/bits/atomic_base.h:62:7: note: 'memory_order_seq_cst' memory_order_seq_cst ^~~~~~~~~~~~~~~~~~~~ In file included from clock_gettime.c:10:0: compiler.h:93:45: error: 'atomic_thread_fence' was not declared in this scope atomic_thread_fence(memory_order_seq_cst); ^ compiler.h:93:45: note: suggested alternative: In file included from .../output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.2.1/atomic:41:0, from compiler.h:75, from clock_gettime.c:10: .../output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.2.1/bits/atomic_base.h:101:3: note: 'std::atomic_thread_fence' atomic_thread_fence(memory_order __m) noexcept ^~~~~~~~~~~~~~~~~~~ scons: *** [qt-clock_gettime.os] Error 1 scons: building terminated because of errors. ------------------------------>8------------------------------- As discussed on gpsd mailng list here [2] the only work-around as of today is to add "-std=gnu++98" to both CFLAGS and CXXFLAGS which we implement here. Fixes: http://autobuild.buildroot.net/results/e8593a8ebf2f05cc93235a8129a2ba8b839d6d90 http://autobuild.buildroot.net/results/ff766f4f514c9cb4891873167f4e9b7870051883 http://autobuild.buildroot.net/results/1a4/1a4dbd9ee5e0c7255843228731beab030ca005ca http://autobuild.buildroot.net/results/1a4/1a4dbd9ee5e0c7255843228731beab030ca005ca and many others, see http://autobuild.buildroot.net/?reason=gpsd-3.16 [1] http://autobuild.buildroot.net/results/e85/e8593a8ebf2f05cc93235a8129a2ba8b839d6d90/build-end.log [2] http://lists.nongnu.org/archive/html/gpsd-dev/2016-09/msg00082.html Signed-off-by: Alexey Brodkin Cc: Thomas Petazzoni Cc: Bernd Kuhls Cc: Sergio Prado Cc: James Knight Signed-off-by: Thomas Petazzoni --- package/gpsd/gpsd.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 4fe5d18b1a..73067d3b15 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -33,6 +33,8 @@ endif # Build libgpsmm if we've got C++ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GPSD_LDFLAGS += -lstdc++ +GPSD_CFLAGS += -std=gnu++98 +GPSD_CXXFLAGS += -std=gnu++98 GPSD_SCONS_OPTS += libgpsmm=yes else GPSD_SCONS_OPTS += libgpsmm=no From ccd49eec60a037504f9f832115ae64803d8f1b1c Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Thu, 24 Nov 2016 23:37:45 +0100 Subject: [PATCH 1509/3392] qextserialport: install QExtSerialPort header with qmake Instead of manually copying the QExtSerialPort header introduced in patch 0002, update the patch to include this header in the qmake project file so it gets properly installed. While we're at it, convert to a git-formatted patch. Fixes: http://autobuild.buildroot.net/results/818b564a6e23bcecf4afc7e53811227b08e5f4eb http://autobuild.buildroot.net/results/0b6c2d7c63329f5e790f02ccd29f14a317eadc71 http://autobuild.buildroot.net/results/ac552b63c6fb099a136066cda421f68e639808fa Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- ...e-a-main-include-file-QExtSerialPort.patch | 43 +++++++++++++++++++ .../qextserialport/0002-main-include.patch | 15 ------- package/qextserialport/qextserialport.mk | 1 - 3 files changed, 43 insertions(+), 16 deletions(-) create mode 100644 package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch delete mode 100644 package/qextserialport/0002-main-include.patch diff --git a/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch b/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch new file mode 100644 index 0000000000..1f143041ac --- /dev/null +++ b/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch @@ -0,0 +1,43 @@ +From 62fbe9c3539945df6204501b7e3ae0d51db075a3 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 24 Nov 2016 22:30:40 +0100 +Subject: [PATCH] Create a main include file QExtSerialPort + +This main include file will be installed in + so that Qt applications can use this +library by including header files in a Qt-like style. + +Signed-off-by: Thomas Petazzoni +[Arnout: add it to qextserialport.pri so it is installed] +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + src/QExtSerialPort | 2 ++ + src/qextserialport.pri | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + create mode 100644 src/QExtSerialPort + +diff --git a/src/QExtSerialPort b/src/QExtSerialPort +new file mode 100644 +index 0000000..a48aeea +--- /dev/null ++++ b/src/QExtSerialPort +@@ -0,0 +1,2 @@ ++#include "qextserialport.h" ++#include "qextserialenumerator.h" +diff --git a/src/qextserialport.pri b/src/qextserialport.pri +index 461d56f..f8a678d 100644 +--- a/src/qextserialport.pri ++++ b/src/qextserialport.pri +@@ -3,7 +3,8 @@ DEPENDPATH += $$PWD + + PUBLIC_HEADERS += $$PWD/qextserialport.h \ + $$PWD/qextserialenumerator.h \ +- $$PWD/qextserialport_global.h ++ $$PWD/qextserialport_global.h \ ++ $$PWD/QExtSerialPort + + HEADERS += $$PUBLIC_HEADERS \ + $$PWD/qextserialport_p.h \ +-- +2.10.2 + diff --git a/package/qextserialport/0002-main-include.patch b/package/qextserialport/0002-main-include.patch deleted file mode 100644 index 27f67f65ae..0000000000 --- a/package/qextserialport/0002-main-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -Create a main include file QExtSerialPort - -This main include file will be installed in - so that Qt applications can use this -library by including header files in a Qt-like style. - -Signed-off-by: Thomas Petazzoni - -Index: qextserialport-ef4af2a2ee3f/src/QExtSerialPort -=================================================================== ---- /dev/null -+++ qextserialport-ef4af2a2ee3f/src/QExtSerialPort -@@ -0,0 +1,2 @@ -+#include "qextserialport.h" -+#include "qextserialenumerator.h" diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk index 3641353a3f..62bf3b016d 100644 --- a/package/qextserialport/qextserialport.mk +++ b/package/qextserialport/qextserialport.mk @@ -32,7 +32,6 @@ endef define QEXTSERIALPORT_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QtExtSerialPort/ cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/ endef From 9d5241615af6fcd134d9937fc4c00ea33825d6db Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Thu, 24 Nov 2016 23:37:46 +0100 Subject: [PATCH 1510/3392] qextserialport: tell qmake to generate .pc file Instead of creating our own .pc file with a patch, just tell qmake to do it by adding create_pc to CONFIG. This corrects the .pc file for Qt5. Previously, the include directory was set to /usr/include, while for Qt5 it should be /usr/include/qt5. This hasn't caused any autobuild failures since no other package uses qextserialport. Note, however, that the package is now called Qt5ExtSerialPort in Qt5, while before it was qextserialport like in the Qt4 case. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- ...d-a-pkgconfig-file-to-ease-usage-wit.patch | 28 +++++++++++++++++++ package/qextserialport/0003-pkgconfig.patch | 19 ------------- package/qextserialport/qextserialport.mk | 1 - 3 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 package/qextserialport/0003-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch delete mode 100644 package/qextserialport/0003-pkgconfig.patch diff --git a/package/qextserialport/0003-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch b/package/qextserialport/0003-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch new file mode 100644 index 0000000000..09e26a961c --- /dev/null +++ b/package/qextserialport/0003-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch @@ -0,0 +1,28 @@ +From 14d4d3e7b5c748118acffddd397fb67b37fd5054 Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" +Date: Thu, 24 Nov 2016 22:44:02 +0100 +Subject: [PATCH] Tell qmake to add a pkgconfig file to ease usage with + applications + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + qextserialport.pro | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/qextserialport.pro b/qextserialport.pro +index 8d2c03a..2fcb39c 100644 +--- a/qextserialport.pro ++++ b/qextserialport.pro +@@ -42,7 +42,8 @@ TEMPLATE=lib + include(src/qextserialport.pri) + + #create_prl is needed, otherwise, MinGW can't found libqextserialport1.a +-CONFIG += create_prl ++CONFIG += create_prl create_pc ++QMAKE_PKGCONFIG_DESTDIR = pkgconfig + + #mac framework is designed for shared library + macx:qesp_mac_framework:qesp_static: CONFIG -= qesp_static +-- +2.10.2 + diff --git a/package/qextserialport/0003-pkgconfig.patch b/package/qextserialport/0003-pkgconfig.patch deleted file mode 100644 index bb55ad782e..0000000000 --- a/package/qextserialport/0003-pkgconfig.patch +++ /dev/null @@ -1,19 +0,0 @@ -Add a pkgconfig file to ease usage with applications - -Signed-off-by: Thomas Petazzoni - -Index: qextserialport-ef4af2a2ee3f/qextserialport.pc -=================================================================== ---- /dev/null -+++ qextserialport-ef4af2a2ee3f/qextserialport.pc -@@ -0,0 +1,10 @@ -+prefix=/usr -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=${prefix}/include/QtExtSerialPort -+ -+Name: QtExtSerialPort -+Description: QtExtSerialPort library -+Version: 1.2.0 -+Libs: -L${libdir} -lqextserialport -+Cflags: -I${includedir} diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk index 62bf3b016d..11009467eb 100644 --- a/package/qextserialport/qextserialport.mk +++ b/package/qextserialport/qextserialport.mk @@ -32,7 +32,6 @@ endef define QEXTSERIALPORT_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/ endef ifeq ($(BR2_STATIC_LIBS),y) From 1683c91c127098326b4e94fe9a440f95c474b813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 24 Nov 2016 22:18:18 +0100 Subject: [PATCH 1511/3392] package/ola: fix missing numpy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OLAs RDM test option needs NumPy. Note that we need to pass `ac_cv_have_pymod_numpy=yes` as NumPy builds some shared libraries and ola checks for NumPy using a host Python test program which fails with 'wrong ELF class'. Fixes: http://autobuild.buildroot.net/results/750/750c9bcc753e2c1b7b05d6c43fabf4c405e15f04/ http://autobuild.buildroot.net/results/24a/24ada1e0ec695cb12028048728a9d1e2bcf75a03/ http://autobuild.buildroot.net/results/111/111c5f3eed6a5931de27a1b0b02be6e2114198e6/ .. and more. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/ola/Config.in | 2 ++ package/ola/ola.mk | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/package/ola/Config.in b/package/ola/Config.in index 7b56f5ca9d..2f1d33ef28 100644 --- a/package/ola/Config.in +++ b/package/ola/Config.in @@ -54,6 +54,8 @@ config BR2_PACKAGE_OLA_EXAMPLES config BR2_PACKAGE_OLA_RDM_TESTS bool "rdm tests" depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_NUMPY help Build OLA RDM tests. diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 75ab25e164..93e84a6838 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -87,6 +87,11 @@ endif ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y) OLA_CONF_OPTS += --enable-rdm-tests +OLA_DEPENDENCIES += python-numpy +# needed as numpy builds some shared libraries and ola checks for +# numpy using a host python test program which fails with 'wrong ELF +# class'. +OLA_CONF_ENV = ac_cv_have_pymod_numpy=yes else OLA_CONF_OPTS += --disable-rdm-tests endif From 0c029a7acc2023d171aafd3e9f546a950c8c3264 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 25 Nov 2016 21:54:35 +0100 Subject: [PATCH 1512/3392] quagga: fix typo s/BPG/BGP/ Fixes bug #9431. Reported-by: xichaoli Signed-off-by: Thomas Petazzoni --- package/quagga/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/quagga/Config.in b/package/quagga/Config.in index 56b8cad93c..4eacaf047a 100644 --- a/package/quagga/Config.in +++ b/package/quagga/Config.in @@ -25,9 +25,9 @@ config BR2_PACKAGE_QUAGGA_TCP_ZEBRA on different hosts. config BR2_PACKAGE_QUAGGA_BGPD - bool "BPGv4+ protocol" + bool "BGPv4+ protocol" help - Build bpgd daemon. + Build bgpd daemon. config BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE bool "BGP route announcement" From 3fdb3af6316278400446511a7e6c53cde43f4a09 Mon Sep 17 00:00:00 2001 From: Dagg Stompler Date: Fri, 25 Nov 2016 09:48:46 +0200 Subject: [PATCH 1513/3392] odroid-scripts: init display as early as possible this commit will init the display as early as possible so the user can see on screen the boot process. the displey init will be called after the logging init to provide some logging of the init. Signed-off-by: Dagg Stompler Signed-off-by: Thomas Petazzoni --- package/odroid-scripts/{S50odroidc2_fb => S02odroidc2_fb} | 0 package/odroid-scripts/odroid-scripts.mk | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename package/odroid-scripts/{S50odroidc2_fb => S02odroidc2_fb} (100%) diff --git a/package/odroid-scripts/S50odroidc2_fb b/package/odroid-scripts/S02odroidc2_fb similarity index 100% rename from package/odroid-scripts/S50odroidc2_fb rename to package/odroid-scripts/S02odroidc2_fb diff --git a/package/odroid-scripts/odroid-scripts.mk b/package/odroid-scripts/odroid-scripts.mk index 858ec37fe8..72e7b95880 100644 --- a/package/odroid-scripts/odroid-scripts.mk +++ b/package/odroid-scripts/odroid-scripts.mk @@ -29,8 +29,8 @@ define ODROID_SCRIPTS_INSTALL_INIT_SYSTEMD endef define ODROID_SCRIPTS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/odroid-scripts/S50odroidc2_fb \ - $(TARGET_DIR)/etc/init.d/S50odroidc2_fb + $(INSTALL) -D -m 0755 package/odroid-scripts/S02odroidc2_fb \ + $(TARGET_DIR)/etc/init.d/S02odroidc2_fb endef $(eval $(generic-package)) From df6788e72be6e547cca067fa2da7d498ca3e4233 Mon Sep 17 00:00:00 2001 From: Dagg Stompler Date: Fri, 25 Nov 2016 09:52:55 +0200 Subject: [PATCH 1514/3392] odroid-scripts: bump version to cfd289b1d69136b8bfd725d90cd648da4654f2bd - add support for new monitor modes. - fix cvbs modes Signed-off-by: Dagg Stompler Signed-off-by: Thomas Petazzoni --- package/odroid-scripts/odroid-scripts.hash | 2 +- package/odroid-scripts/odroid-scripts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/odroid-scripts/odroid-scripts.hash b/package/odroid-scripts/odroid-scripts.hash index 8fd4b2c642..e5a262d209 100644 --- a/package/odroid-scripts/odroid-scripts.hash +++ b/package/odroid-scripts/odroid-scripts.hash @@ -1,2 +1,2 @@ # Locally computed hash -sha256 779e8beccf8c66d51e495a4cc0e6eccf72c295499a1ecdc0740aa4459de786a0 odroid-scripts-a252de04562dcf8d8a4918a544b45a9e3d46d2fb.tar.gz +sha256 9d61472ee6aed2d1a7b5afdcb91b823003c8524a242572f24f89d4e57323daf3 odroid-scripts-cfd289b1d69136b8bfd725d90cd648da4654f2bd.tar.gz diff --git a/package/odroid-scripts/odroid-scripts.mk b/package/odroid-scripts/odroid-scripts.mk index 72e7b95880..fc1940dcef 100644 --- a/package/odroid-scripts/odroid-scripts.mk +++ b/package/odroid-scripts/odroid-scripts.mk @@ -4,7 +4,7 @@ # ################################################################################ -ODROID_SCRIPTS_VERSION = a252de04562dcf8d8a4918a544b45a9e3d46d2fb +ODROID_SCRIPTS_VERSION = cfd289b1d69136b8bfd725d90cd648da4654f2bd ODROID_SCRIPTS_SITE = $(call github,mdrjr,c2_bootini,$(ODROID_SCRIPTS_VERSION)) ODROID_SCRIPTS_LICENSE = unclear From f36dccef818bb8ef36e15a71094c2e6eb66de463 Mon Sep 17 00:00:00 2001 From: Sam Mendoza-Jonas Date: Fri, 25 Nov 2016 13:19:53 +1100 Subject: [PATCH 1515/3392] package/kexec-lite: Update to latest version Upstream kexec-lite now has support for kexec on POWER9 based machines. Update so this works in simulators and is ready for when real machines are available. Signed-off-by: Samuel Mendoza-Jonas Acked-by: Joel Stanley Signed-off-by: Thomas Petazzoni --- package/kexec-lite/kexec-lite.hash | 2 +- package/kexec-lite/kexec-lite.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kexec-lite/kexec-lite.hash b/package/kexec-lite/kexec-lite.hash index e8179b7021..0f212241da 100644 --- a/package/kexec-lite/kexec-lite.hash +++ b/package/kexec-lite/kexec-lite.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2300187bf25616c382cb2f191a2eb13033e019511854794ce234a76cf9f5ad6b kexec-lite-783fb4a811d0b0f8cc2ed68fa7872dcad56a3944.tar.gz +sha256 5786ddc0c94ead4fd4a1fded44bb1da0c9bc91af08049fed373ea161603e1e1f kexec-lite-86e45a47e8cc1f598ccfa9b873a23067f4ecc36f.tar.gz diff --git a/package/kexec-lite/kexec-lite.mk b/package/kexec-lite/kexec-lite.mk index 27bc20485d..2467306dab 100644 --- a/package/kexec-lite/kexec-lite.mk +++ b/package/kexec-lite/kexec-lite.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_LITE_VERSION = 783fb4a811d0b0f8cc2ed68fa7872dcad56a3944 +KEXEC_LITE_VERSION = 86e45a47e8cc1f598ccfa9b873a23067f4ecc36f KEXEC_LITE_SITE = $(call github,antonblanchard,kexec-lite,$(KEXEC_LITE_VERSION)) KEXEC_LITE_LICENSE = GPLv2+ KEXEC_LITE_DEPENDENCIES = elfutils dtc From 9d49e3c0e9e16995bf712865fe8df5d029eeea7f Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Thu, 24 Nov 2016 16:56:42 +1100 Subject: [PATCH 1516/3392] package/qemu: fixup enable host QEMU for powerpc64/powerpc64le Fixes next commit d634d9dda7f3c328d63469cb628c79da49a09e89, which itself fixes: http://autobuild.buildroot.net/results/f58ec73d906a5da49a88ed78492e3b5bf8cecdd4/ Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index ae4e0ad221..45fc0fad0a 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -35,7 +35,7 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p # mips64el mips64el # powerpc ppc # powerpc64 ppc64 -# powerpc64le ppc64 (ppc64 supports little-endian) +# powerpc64le ppc64le # sh2a not supported # sh4 sh4 # sh4eb sh4eb @@ -61,7 +61,7 @@ ifeq ($(HOST_QEMU_ARCH),powerpc64) HOST_QEMU_ARCH = ppc64 endif ifeq ($(HOST_QEMU_ARCH),powerpc64le) -HOST_QEMU_ARCH = ppc64 +HOST_QEMU_ARCH = ppc64le endif ifeq ($(HOST_QEMU_ARCH),sh4a) HOST_QEMU_ARCH = sh4 From 5a8d3f83b54c901fb84525148dfc1bf58b98798b Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Wed, 23 Nov 2016 13:25:02 +1100 Subject: [PATCH 1517/3392] package/qemu: enable host QEMU for powerpc64/powerpc64le Needed to fix: http://autobuild.buildroot.net/results/f58ec73d906a5da49a88ed78492e3b5bf8cecdd4/ Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index cf23f16a3c..ae4e0ad221 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -34,6 +34,8 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p # mips64 mips64 # mips64el mips64el # powerpc ppc +# powerpc64 ppc64 +# powerpc64le ppc64 (ppc64 supports little-endian) # sh2a not supported # sh4 sh4 # sh4eb sh4eb @@ -55,6 +57,12 @@ endif ifeq ($(HOST_QEMU_ARCH),powerpc) HOST_QEMU_ARCH = ppc endif +ifeq ($(HOST_QEMU_ARCH),powerpc64) +HOST_QEMU_ARCH = ppc64 +endif +ifeq ($(HOST_QEMU_ARCH),powerpc64le) +HOST_QEMU_ARCH = ppc64 +endif ifeq ($(HOST_QEMU_ARCH),sh4a) HOST_QEMU_ARCH = sh4 endif From d2ff457e88ff4106f97e29516d467978827d30c2 Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Thu, 24 Nov 2016 16:56:42 +1100 Subject: [PATCH 1518/3392] package/qemu: fixup enable host QEMU for powerpc64/powerpc64le Fixes next commit d634d9dda7f3c328d63469cb628c79da49a09e89, which itself fixes: http://autobuild.buildroot.net/results/f58ec73d906a5da49a88ed78492e3b5bf8cecdd4/ Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index ae4e0ad221..45fc0fad0a 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -35,7 +35,7 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p # mips64el mips64el # powerpc ppc # powerpc64 ppc64 -# powerpc64le ppc64 (ppc64 supports little-endian) +# powerpc64le ppc64le # sh2a not supported # sh4 sh4 # sh4eb sh4eb @@ -61,7 +61,7 @@ ifeq ($(HOST_QEMU_ARCH),powerpc64) HOST_QEMU_ARCH = ppc64 endif ifeq ($(HOST_QEMU_ARCH),powerpc64le) -HOST_QEMU_ARCH = ppc64 +HOST_QEMU_ARCH = ppc64le endif ifeq ($(HOST_QEMU_ARCH),sh4a) HOST_QEMU_ARCH = sh4 From 72dcc7c252e7be65ff3e66bcf5dd20b49e2de915 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 25 Nov 2016 22:40:59 +0100 Subject: [PATCH 1519/3392] qextserialport: fix line endings in patch 0002 Fixes: http://autobuild.buildroot.net/results/074d379e4d491dd454726bed666a7e1028333ef7/ Signed-off-by: Thomas Petazzoni --- ...e-a-main-include-file-QExtSerialPort.patch | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch b/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch index 1f143041ac..e1d99f0fcb 100644 --- a/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch +++ b/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch @@ -28,16 +28,13 @@ diff --git a/src/qextserialport.pri b/src/qextserialport.pri index 461d56f..f8a678d 100644 --- a/src/qextserialport.pri +++ b/src/qextserialport.pri -@@ -3,7 +3,8 @@ DEPENDPATH += $$PWD - - PUBLIC_HEADERS += $$PWD/qextserialport.h \ - $$PWD/qextserialenumerator.h \ -- $$PWD/qextserialport_global.h -+ $$PWD/qextserialport_global.h \ -+ $$PWD/QExtSerialPort - - HEADERS += $$PUBLIC_HEADERS \ - $$PWD/qextserialport_p.h \ --- -2.10.2 - +@@ -3,7 +3,8 @@ + + PUBLIC_HEADERS += $$PWD/qextserialport.h \ + $$PWD/qextserialenumerator.h \ +- $$PWD/qextserialport_global.h ++ $$PWD/qextserialport_global.h \ ++ $$PWD/QExtSerialPort + + HEADERS += $$PUBLIC_HEADERS \ + $$PWD/qextserialport_p.h \ From 23b949fdb0f7a4d2582929defa8c17ff5b1a5d1a Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 23 Nov 2016 14:39:09 +0000 Subject: [PATCH 1520/3392] moarvm: bump version to 2016.11 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/moarvm/moarvm.hash | 2 +- package/moarvm/moarvm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 514a1bfe80..2e49811d14 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 d8cb9fe74267dd933c3e405b098dea99cb9c0561aedb06e8efd8ddaef43396d0 MoarVM-2016.10.tar.gz +sha256 5eaa8ff47b1c25e023a900947f88222fffe0884ce74652659ecd2265ae2d1387 MoarVM-2016.11.tar.gz diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index d2421fd78a..644432eda7 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2016.10 +MOARVM_VERSION = 2016.11 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 From 40cbdf6de070db116e44a52b4a232d24ce850186 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 23 Nov 2016 14:39:10 +0000 Subject: [PATCH 1521/3392] moarvm: use pkgconfig to find libraries and headers MoarVM's Configure.pl script uses pkgconfig to find libraries and headers, but it uses the one installed in the host machine which is wrong and can lead to errors of unsafe include paths. Instead, make it depend on the host-pkgconf package and specify the path to our pkgconfig binary by using the --pkgconfig configure option. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/moarvm/moarvm.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 644432eda7..80bd19c92d 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -10,7 +10,7 @@ MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 MOARVM_LICENSE_FILES = Artistic2.txt MOARVM_INSTALL_STAGING = YES -MOARVM_DEPENDENCIES = host-luajit libuv libtommath libatomic_ops +MOARVM_DEPENDENCIES = host-luajit host-pkgconf libuv libtommath libatomic_ops MOARVM_CONF_OPTS = \ --build=$(GNU_HOST_NAME) \ @@ -19,6 +19,7 @@ MOARVM_CONF_OPTS = \ --cc="$(TARGET_CC)" \ --ld="$(TARGET_CC)" \ --prefix="/usr" \ + --pkgconfig=$(PKG_CONFIG_HOST_BINARY) \ --lua=$(HOST_DIR)/usr/bin/luajit \ --has-libuv \ --has-libtommath \ From a8981b3785d6719bc8a2869a5931ab3abd48a2b4 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 23 Nov 2016 14:39:11 +0000 Subject: [PATCH 1522/3392] moarvm: enable optional support for libffi Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/moarvm/moarvm.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 80bd19c92d..d09117471f 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -25,6 +25,11 @@ MOARVM_CONF_OPTS = \ --has-libtommath \ --has-libatomic +ifeq ($(BR2_PACKAGE_LIBFFI),y) +MOARVM_CONF_OPTS += --has-libffi +MOARVM_DEPENDENCIES += libffi +endif + ifeq ($(BR2_ENDIAN),"BIG") MOARVM_CONF_OPTS += --big-endian endif From 507025a933c2b1624a4e9929e3a1fed9dfc4ff44 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 23 Nov 2016 14:39:12 +0000 Subject: [PATCH 1523/3392] moarvm: select libffi when building for MIPS Otherwise the compilation will fail like this: ./libmoar.so: undefined reference to `dcCallbackThunkEntry' See: https://github.com/MoarVM/MoarVM/issues/222 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/moarvm/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/moarvm/Config.in b/package/moarvm/Config.in index 3e0a1045ec..76343d1199 100644 --- a/package/moarvm/Config.in +++ b/package/moarvm/Config.in @@ -9,6 +9,9 @@ config BR2_PACKAGE_MOARVM select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LIBTOMMATH select BR2_PACKAGE_LIBATOMIC_OPS + # dyncall does not work on MIPS; libffi needs to be used. + # See: https://github.com/MoarVM/MoarVM/issues/222 + select BR2_PACKAGE_LIBFFI if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el help Short for "Metamodel On A Runtime", MoarVM is a virtual machine built especially for Rakudo Perl 6 and the NQP Compiler Toolchain. From 8fa73e6bd692d07bb27a0f1864a30f992d5d5c31 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 23 Nov 2016 14:39:13 +0000 Subject: [PATCH 1524/3392] libatomic_ops: add support for MIPS architecture Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libatomic_ops/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/libatomic_ops/Config.in b/package/libatomic_ops/Config.in index c6fe7a03b4..e9206f3395 100644 --- a/package/libatomic_ops/Config.in +++ b/package/libatomic_ops/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS bool - default y if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_sparc || BR2_sparc64 || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64 + default y if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_sparc || BR2_sparc64 || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64 || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + # Unsupported for MIPS R6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 config BR2_PACKAGE_LIBATOMIC_OPS bool "libatomic_ops" From abeab9ce934ad26785d476492d06b3ad38000f41 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 23 Nov 2016 14:39:14 +0000 Subject: [PATCH 1525/3392] libatomic_ops: bump version to 7.4.4 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libatomic_ops/libatomic_ops.hash | 2 +- package/libatomic_ops/libatomic_ops.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libatomic_ops/libatomic_ops.hash b/package/libatomic_ops/libatomic_ops.hash index d91f7059d0..47a281ddf2 100644 --- a/package/libatomic_ops/libatomic_ops.hash +++ b/package/libatomic_ops/libatomic_ops.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2616be0a2f70f7e3eb12f131a36e32723ed5a1928f17b886c3e7c62f7ed14339 libatomic_ops-libatomic_ops-7_4_2.tar.gz +sha256 ef8335676f18a111f885d48810ab090fb6bfad94e5a5dd76cdccd2a536828662 libatomic_ops-libatomic_ops-7_4_4.tar.gz diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index fd45726750..b5e217237c 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBATOMIC_OPS_VERSION = libatomic_ops-7_4_2 +LIBATOMIC_OPS_VERSION = libatomic_ops-7_4_4 LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,$(LIBATOMIC_OPS_VERSION)) LIBATOMIC_OPS_AUTORECONF = YES From 006ba68a3020477e8358eb0253acaf15220b84b5 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Thu, 24 Nov 2016 00:40:34 +0100 Subject: [PATCH 1526/3392] toolchain-external: support gcc < 4.3 We currently support gcc as old as 4.3. However, Buildroot works perfectly well with even older gcc versions (tested with 4.1). So we can add an option BR2_TOOLCHAIN_EXTERNAL_GCC_OLD to support that. The help text of this option is written with plenty of discouragement. We use _OLD and not something like _PRE_4_3, because at some point we will likely remove the 4.3 option and what would then require a name change. We don't set any _AT_LEAST option in this case because it's no use - there is no lower bound on the version in this case. We therefore leave BR2_TOOLCHAIN_GCC_AT_LEAST empty (the implicit default). When it is empty, we don't do a version check at all in check_gcc_version (previously we errored out when it was empty). Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- toolchain/helpers.mk | 3 +-- .../toolchain-external-custom/Config.in.options | 11 +++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 3991bc1cf1..72e7292353 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -145,8 +145,7 @@ check_kernel_headers_version = \ check_gcc_version = \ expected_version="$(strip $2)" ; \ if [ -z "$${expected_version}" ]; then \ - printf "Internal error, gcc version unknown (no GCC_AT_LEAST_X_Y selected)\n"; \ - exit 1 ; \ + exit 0 ; \ fi; \ real_version=`$(1) --version | sed -r -e '1!d; s/^[^)]+\) ([^[:space:]]+).*/\1/;'` ; \ if [[ ! "$${real_version}" =~ ^$${expected_version}\. ]] ; then \ diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index cdc25559fa..5ff2491e19 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -59,6 +59,17 @@ config BR2_TOOLCHAIN_EXTERNAL_GCC_4_3 bool "4.3.x" select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 +config BR2_TOOLCHAIN_EXTERNAL_GCC_OLD + bool "older" + help + Use this option if your GCC version is older than any of the + above. + + Note that the Buildroot community doesn't do any testing with + such old toolchains. Some packages may fail to build in + surprising ways, or the generated root filesystem may not + work at all. Use such old toolchains at your own risk. + endchoice choice From 311bc137da2952445683413794f3ebc8e477c9ef Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Thu, 24 Nov 2016 00:40:35 +0100 Subject: [PATCH 1527/3392] toolchain: kill ADI Blackfin toolchain This toolchain has many problems which are fixed in contemporary gcc and uClibc-ng. In addition, several hacks are needed to be able to work with this toolchain. All these hacks are removed as well. Also the package exceptions for this toolchain are removed. The BR2_BFIN_INSTALL_FDPIC_SHARED and BR2_BFIN_INSTALL_FLAT_SHARED options don't get a legacy entry. For the ADI toolchain, there already is a legacy entry, so it doesn't make sense to add it twice. For other external toolchains, these options didn't actually work, because they rely on the specific layout of the ADI toolchain. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 8 +++ package/glog/Config.in | 3 - package/php-amqp/Config.in | 2 - package/rabbitmq-c/Config.in | 4 -- package/tinycbor/Config.in | 2 - package/x264/Config.in | 1 - toolchain/toolchain-external/Config.in | 33 ----------- .../pkg-toolchain-external.mk | 59 ------------------- .../Config.in | 17 ------ .../Config.in.options | 10 ---- .../toolchain-external-blackfin-uclinux.hash | 3 - .../toolchain-external-blackfin-uclinux.mk | 33 ----------- 12 files changed, 8 insertions(+), 167 deletions(-) delete mode 100644 toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.mk diff --git a/Config.in.legacy b/Config.in.legacy index cfb127610a..aeefb392c3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2017.02" +config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX + bool "Blackfin.uclinux.org 2014R1 toolchain removed" + select BR2_LEGACY + help + The ADI Blackfin toolchain has many bugs which are fixed in + more recent gcc and uClibc-ng releases. Use the Buildroot + toolchain instead. + config BR2_PACKAGE_MAKEDEVS bool "makedevs removed" select BR2_LEGACY diff --git a/package/glog/Config.in b/package/glog/Config.in index f708758101..534997af49 100644 --- a/package/glog/Config.in +++ b/package/glog/Config.in @@ -3,14 +3,11 @@ config BR2_PACKAGE_GLOG depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - # build issues with this external toolchain - depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX help C++ implementation of the Google logging module https://github.com/google/glog comment "glog needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/package/php-amqp/Config.in b/package/php-amqp/Config.in index 253bfa7b7c..0aa2021f5a 100644 --- a/package/php-amqp/Config.in +++ b/package/php-amqp/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PHP_AMQP bool "php-amqp" depends on BR2_PACKAGE_PHP depends on BR2_TOOLCHAIN_HAS_THREADS # rabbitmq-c - depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX # rabbitmq-c select BR2_PACKAGE_RABBITMQ_C help Communicate with any AMQP compliant server. @@ -11,4 +10,3 @@ config BR2_PACKAGE_PHP_AMQP comment "php-amqp needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX diff --git a/package/rabbitmq-c/Config.in b/package/rabbitmq-c/Config.in index 0d08233a70..b330c90474 100644 --- a/package/rabbitmq-c/Config.in +++ b/package/rabbitmq-c/Config.in @@ -1,9 +1,6 @@ config BR2_PACKAGE_RABBITMQ_C bool "rabbitmq-c" depends on BR2_TOOLCHAIN_HAS_THREADS - # too old uClibc, not providing posix_spawn functions - # http://autobuild.buildroot.net/results/a6c3e79c61c5a535970d03bf37b068349f766a7f/ - depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX help This is a C-language AMQP client library for use with v2.0+ of the RabbitMQ broker. @@ -12,4 +9,3 @@ config BR2_PACKAGE_RABBITMQ_C comment "rabbitmq-c needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX diff --git a/package/tinycbor/Config.in b/package/tinycbor/Config.in index cf176e46fe..41f0b5fac3 100644 --- a/package/tinycbor/Config.in +++ b/package/tinycbor/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_TINYCBOR bool "tinycbor" - # package uses fopencookie(), not available with this toolchain - depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX help Concise Binary Object Representation (CBOR) Library diff --git a/package/x264/Config.in b/package/x264/Config.in index 7bf2319f26..be3ab3f3e2 100644 --- a/package/x264/Config.in +++ b/package/x264/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_X264 bool "x264" - depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX # madvise() help x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 2c39e5ae59..c007e623fd 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -25,9 +25,6 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config. # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" -# Blackfin -source "toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in" - # MIPS (use codesourcery toolchain by default) source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in" source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in" @@ -125,9 +122,6 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config. # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options" -# Blackfin -source "toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options" - # MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options" @@ -156,31 +150,4 @@ config BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY Copy the gdbserver provided by the external toolchain to the target. -# When the FDPIC shared binary format is used, the corresponding libraries are -# always installed. When a different binary format is used, we offer the option -# of installing the FDPIC shared libraries. -config BR2_BFIN_INSTALL_FDPIC_SHARED - bool "Install FDPIC shared libraries" - depends on BR2_bfin && !BR2_BINFMT_FDPIC - help - The Linux kernel supports running both FDPIC and FLAT applications - concurrently if the binary format specific libraries are installed - properly. This option allows developer to install FDPIC libraries - into a buildroot rootfs image built with binary format that is not - FDPIC. - -# When the FLAT shared binary format is used, we force the installation -# of the corresponding libraries. When a different binary format is -# used, we offer the option of installing the FLAT shared libraries. -config BR2_BFIN_INSTALL_FLAT_SHARED - bool "Install FLAT shared libraries" if !BR2_BINFMT_FLAT_SHARED - depends on BR2_bfin - default y if BR2_BINFMT_FLAT_SHARED - help - The Linux kernel supports running both FDPIC and FLAT applications - concurrently if the binary format specific libraries are installed - properly. This option allows developer to install FLAT libraries - into a buildroot rootfs image built with binary format that is not - shared FLAT. - endif # BR2_TOOLCHAIN_EXTERNAL diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 3cac5202d3..e0a8b410c0 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -16,7 +16,6 @@ # MIPS, PowerPC, x86, x86_64 and NIOS 2 architectures. For the MIPS # toolchain, the -muclibc variant isn't supported yet, only the # default glibc-based variant is. -# * Analog Devices toolchains for the Blackfin architecture # * Xilinx toolchains for the Microblaze architecture # * Synopsys DesignWare toolchains for ARC cores # @@ -79,12 +78,8 @@ ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),) TOOLCHAIN_EXTERNAL_BIN := $(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc)) endif else -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX),y) -TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin -else TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin endif -endif # If this is a buildroot toolchain, it already has a wrapper which we want to # bypass. Since this is only evaluated after it has been extracted, we can use @@ -505,57 +500,6 @@ define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK endef endif -# -# Various functions used by the external toolchain package -# infrastructure to handle the Blackfin specific -# BR2_BFIN_INSTALL_FDPIC_SHARED and BR2_BFIN_INSTALL_FLAT_SHARED -# options. -# - -# Special installation target used on the Blackfin architecture when -# FDPIC is not the primary binary format being used, but the user has -# nonetheless requested the installation of the FDPIC libraries to the -# target filesystem. -ifeq ($(BR2_BFIN_INSTALL_FDPIC_SHARED),y) -define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC - $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to staging...") - $(Q)FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \ - FDPIC_SYSROOT_DIR="$(call toolchain_find_sysroot,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - FDPIC_LIB_DIR="$(call toolchain_find_libdir,$${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \ - FDPIC_SUPPORT_LIB_DIR="" ; \ - if test `find $${FDPIC_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \ - FDPIC_LIBSTDCPP_A_LOCATION=$$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \ - if [ -e "$${FDPIC_LIBSTDCPP_A_LOCATION}" ]; then \ - FDPIC_SUPPORT_LIB_DIR=`readlink -f $${FDPIC_LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \ - fi ; \ - fi ; \ - $(call copy_toolchain_sysroot,$${FDPIC_SYSROOT_DIR},$${FDPIC_SYSROOT_DIR},,$${FDPIC_LIB_DIR},$${FDPIC_SUPPORT_LIB_DIR}) -endef -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FDPIC - $(Q)$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") - $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ - $(call copy_toolchain_lib_root,$$libs); \ - done -endef -endif - -# Special installation target used on the Blackfin architecture when -# shared FLAT is not the primary format being used, but the user has -# nonetheless requested the installation of the shared FLAT libraries -# to the target filesystem. The flat libraries are found and linked -# according to the index in name "libN.so". Index 1 is reserved for -# the standard C library. Customer libraries can use 4 and above. -ifeq ($(BR2_BFIN_INSTALL_FLAT_SHARED),y) -define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FLAT - $(Q)$(call MESSAGE,"Install external toolchain FLAT libraries to target...") - $(Q)FLAT_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))../../bfin-uclinux/bin/bfin-uclinux-gcc ; \ - FLAT_LIBC_A_LOCATION=`$${FLAT_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -mid-shared-library -print-file-name=libc`; \ - if [ -f $${FLAT_LIBC_A_LOCATION} -a ! -h $${FLAT_LIBC_A_LOCATION} ] ; then \ - $(INSTALL) -D $${FLAT_LIBC_A_LOCATION} $(TARGET_DIR)/lib/lib1.so; \ - fi -endef -endif - # uClibc-ng dynamic loader is called ld-uClibc.so.1, but gcc is not # patched specifically for uClibc-ng, so it continues to generate # binaries that expect the dynamic loader to be named ld-uClibc.so.0, @@ -644,7 +588,6 @@ define $(2)_INSTALL_STAGING_CMDS $$(TOOLCHAIN_WRAPPER_INSTALL) $$(TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK) $$(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS) - $$(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC) $$(TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER) $$(TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT) endef @@ -660,8 +603,6 @@ define $(2)_INSTALL_TARGET_CMDS $$(TOOLCHAIN_EXTERNAL_CREATE_TARGET_LIB_SYMLINK) $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS) $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER) - $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FDPIC) - $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_BFIN_FLAT) $$(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO) endef diff --git a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in deleted file mode 100644 index 8b299e857c..0000000000 --- a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX - bool "Blackfin.uclinux.org 2014R1" - depends on BR2_bfin - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_USE_WCHAR - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Toolchain for the Blackfin architecture, from - http://blackfin.uclinux.org. diff --git a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options deleted file mode 100644 index 3b7f457eb8..0000000000 --- a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/Config.in.options +++ /dev/null @@ -1,10 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "bfin-uclinux" if BR2_BINFMT_FLAT - default "bfin-linux-uclibc" if BR2_BINFMT_FDPIC - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-blackfin-uclinux" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.hash b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.hash deleted file mode 100644 index b320d94ef0..0000000000 --- a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 e424e90d8481d942a40266d78d1488726561fed3ec38403094f98055e61889d0 blackfin-toolchain-2014R1-RC2.i386.tar.bz2 -sha256 c65b1b4b918d5185349d62a3b7bf43b4b21e1175c52598ec047ca56b3f11d857 blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.mk b/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.mk deleted file mode 100644 index 0a48220e3d..0000000000 --- a/toolchain/toolchain-external/toolchain-external-blackfin-uclinux/toolchain-external-blackfin-uclinux.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# toolchain-external-blackfin-uclinux -# -################################################################################ - -TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION_MAJOR = 2014R1 -TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION = $(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION_MAJOR)-RC2 - -ifeq ($(BR2_BINFMT_FLAT),y) -TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_SUBDIR = bfin-uclinux -else -TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_SUBDIR = bfin-linux-uclibc -endif - -TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_SITE = http://downloads.sourceforge.net/project/adi-toolchain/$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION_MAJOR)/$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION)/i386 -TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_SOURCE = blackfin-toolchain-$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION).i386.tar.bz2 -TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_VERSION).i386.tar.bz2 - -TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_STRIP_COMPONENTS = 3 - -# Special handling for Blackfin toolchain, because of the split in two -# tarballs, and the organization of tarball contents. The tarballs -# contain ./opt/uClinux/{bfin-uclinux,bfin-linux-uclibc} directories, -# which themselves contain the toolchain. This is why we strip more -# components than usual. -define TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_UCLIBC_EXTRA_EXTRACT - $(call suitable-extractor,$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_EXTRA_DOWNLOADS)) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_EXTRA_DOWNLOADS) | \ - $(TAR) --strip-components=3 -C $(@D) $(TAR_OPTIONS) - -endef -TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_POST_EXTRACT_HOOKS += TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_UCLIBC_EXTRA_EXTRACT - -$(eval $(toolchain-external-package)) From fa627738266e5c5c45f6250657ac113cc99df5a3 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Tue, 22 Nov 2016 14:11:09 +0100 Subject: [PATCH 1528/3392] python3: do not use the system OpenSSL in the host variant host-python3 currently detect if there is an usable OpenSSL installation and conditionnaly compiles the 'ssl', '_ssl' and '_hashlib' modules. This may break compilation if the system's OpenSSL has been updated to 1.1.0 because of a bug in python, see https://bugs.python.org/issue26470 for details. Unlike Python 2.7, Python 3 unconditionnaly compiles fallbacks for common hash algorithm, so disabling OpenSSL will still leave Python 3 with implementations of common hash algorithm. This adds a patch to configure.ac patch to implement a --disable-openssl option. Signed-off-by: Nicolas Cavallari Tested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- ...031-Add-an-option-to-disable-openssl.patch | 23 +++++++++++++++++++ package/python3/python3.mk | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 package/python3/0031-Add-an-option-to-disable-openssl.patch diff --git a/package/python3/0031-Add-an-option-to-disable-openssl.patch b/package/python3/0031-Add-an-option-to-disable-openssl.patch new file mode 100644 index 0000000000..d4375203b4 --- /dev/null +++ b/package/python3/0031-Add-an-option-to-disable-openssl.patch @@ -0,0 +1,23 @@ +From: Nicolas Cavallari +Subject: [PATCH] Add an option to disable openssl support. + +Signed-off-by: Nicolas Cavallari +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/configure.ac ++++ b/configure.ac +@@ -3027,6 +3027,12 @@ + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" + fi]) + ++AC_ARG_ENABLE(openssl, ++ AS_HELP_STRING([--disable-openssl], [disable openssl support]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), diff --git a/package/python3/python3.mk b/package/python3/python3.mk index f355ae9e6c..8bfae79f58 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -36,7 +36,8 @@ HOST_PYTHON3_CONF_OPTS += \ --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ - --disable-ossaudiodev + --disable-ossaudiodev \ + --disable-openssl # Make sure that LD_LIBRARY_PATH overrides -rpath. # This is needed because libpython may be installed at the same time that From 83e207d7bc52fbcb38b33dc387f37da333d3e248 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 25 Nov 2016 23:45:00 +0100 Subject: [PATCH 1529/3392] taskd: fix static linking issue with libuuid/libintl libuuid depends on libintl in specific scenarios, but since taskd wasn't using pkg-config to detect libuuid, this dependency on libintl was not taken into account. This commit adds a patch to taskd that uses pkg-config to detect libuuid. Fixes: http://autobuild.buildroot.net/results/cb5ea871812651025722d42508d4f37702088800/ Signed-off-by: Thomas Petazzoni --- ...eLists-use-pkg-config-uuid-detection.patch | 40 +++++++++++++++++++ package/taskd/taskd.mk | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch diff --git a/package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch b/package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch new file mode 100644 index 0000000000..34139fef74 --- /dev/null +++ b/package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch @@ -0,0 +1,40 @@ +CMakeLists.txt: use pkg-config to detect uuid when possible + +In order to take into account the libraries used by libuuid when +building statically, using pkg-config is recommended. This patch +therefore improves the CMakeLists.txt to use pkg-config to detect +libuuid when pkg-config is available. + +Signed-off-by: Thomas Petazzoni + +Index: b/CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,7 @@ + + include (CheckFunctionExists) + include (CheckStructHasMember) ++include (FindPkgConfig) + + set (HAVE_CMAKE true) + +@@ -119,8 +120,16 @@ + # Apple and FreeBSD include the uuid functions in their libc, rather than libuuid + check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER) + else (DARWIN OR FREEBSD) +- find_path (UUID_INCLUDE_DIR uuid/uuid.h) +- find_library (UUID_LIBRARY NAMES uuid) ++ if(PKG_CONFIG_FOUND) ++ pkg_check_modules(PC_UUID uuid) ++ if(PC_UUID_FOUND) ++ set (UUID_INCLUDE_DIR ${PC_UUID_INCLUDE_DIRS}) ++ set (UUID_LIBRARY ${PC_UUID_LIBRARIES}) ++ endif(PC_UUID_FOUND) ++ else(PKG_CONFIG_FOUND) ++ find_path (UUID_INCLUDE_DIR uuid/uuid.h) ++ find_library (UUID_LIBRARY NAMES uuid) ++ endif(PKG_CONFIG_FOUND) + if (UUID_INCLUDE_DIR AND UUID_LIBRARY) + set (TASKD_INCLUDE_DIRS ${TASKD_INCLUDE_DIRS} ${UUID_INCLUDE_DIR}) + set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${UUID_LIBRARY}) diff --git a/package/taskd/taskd.mk b/package/taskd/taskd.mk index 34a260ea0e..b19be68912 100644 --- a/package/taskd/taskd.mk +++ b/package/taskd/taskd.mk @@ -8,6 +8,6 @@ TASKD_VERSION = 1.1.0 TASKD_SITE = http://taskwarrior.org/download TASKD_LICENSE = MIT TASKD_LICENSE_FILES = COPYING -TASKD_DEPENDENCIES = gnutls util-linux +TASKD_DEPENDENCIES = gnutls util-linux host-pkgconf $(eval $(cmake-package)) From 1ffcf364b6e9894a876dc581a090f87685945412 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 14 Nov 2016 13:15:41 +0000 Subject: [PATCH 1530/3392] cmake: bump version to 3.7.0 libuv is now a required dependency. Signed-off-by: Vicente Olivert Riera Tested-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/cmake/Config.in | 9 +++++++-- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 6f04a4ad39..716d80ec55 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -20,11 +20,14 @@ config BR2_PACKAGE_CMAKE_CTEST select BR2_PACKAGE_EXPAT select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_XZ + select BR2_PACKAGE_LIBUV depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp depends on BR2_USE_WCHAR # libarchive depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS # libuv + depends on BR2_USE_MMU # libuv help CTest is a testing tool distributed as a part of CMake. It can be used to automate updating (using CVS for example), @@ -34,7 +37,9 @@ config BR2_PACKAGE_CMAKE_CTEST http://www.cmake.org/ -comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7" +comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, threads" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS + depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index f846dc9541..687e5a4483 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,2 +1,2 @@ -# From http://www.cmake.org/files/v3.6/cmake-3.6.3-SHA-256.txt -sha256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe cmake-3.6.3.tar.gz +# From http://www.cmake.org/files/v3.7/cmake-3.7.0-SHA-256.txt +sha256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 cmake-3.7.0.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index fadb09ebdd..522d7fec87 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.6 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 +CMAKE_VERSION_MAJOR = 3.7 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt @@ -22,7 +22,7 @@ CMAKE_LICENSE_FILES = Copyright.txt # the system-wide libraries instead of rebuilding and statically # linking with the ones bundled into the CMake sources. -CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz +CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv CMAKE_CONF_OPTS = \ -DKWSYS_LFS_WORKS=TRUE \ From 40a60b7545beea2d1ea852481cbf779d740e1d66 Mon Sep 17 00:00:00 2001 From: James Knight Date: Fri, 18 Nov 2016 15:26:31 -0500 Subject: [PATCH 1531/3392] chrony: enable pps support Chrony has the ability to support PPS. Its enablement is determined primarily from the existence of `sys/timepps.h`. This file is provided from the pps-tools package. Adjusting Chrony's Makefile to depend on the pps-tools package if a developer has included pps-tools as part of a build. Relates to 2cfc966f431c7c715b3fc11ca0467d47432fca33. Signed-off-by: James Knight Signed-off-by: Thomas Petazzoni --- package/chrony/chrony.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index adfbd3664b..5f3160e199 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -34,6 +34,12 @@ else CHRONY_CONF_OPTS += --disable-readline 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) +CHRONY_DEPENDENCIES += pps-tools +endif + define CHRONY_CONFIGURE_CMDS cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPTS) endef From 1938ad4efa3a78275979467b521fb3545c5c6f9e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 26 Nov 2016 09:42:58 +0100 Subject: [PATCH 1532/3392] qemu-ppc: fixup wrong startup example, use either -hda or -drive Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- board/qemu/ppc-g3beige/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/ppc-g3beige/readme.txt b/board/qemu/ppc-g3beige/readme.txt index 070fcbbb32..3bd88a6e39 100644 --- a/board/qemu/ppc-g3beige/readme.txt +++ b/board/qemu/ppc-g3beige/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user + qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. From 9cf9f1e3495463e46937f4f7ccc45a541cda5eca Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 25 Nov 2016 23:26:22 +0100 Subject: [PATCH 1533/3392] package/efl: bump to 1.18.3 Bug fixes release: https://www.enlightenment.org/news/efl-1.18.3 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 18393a43e6..4077ddd436 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,2 +1,2 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.2.tar.xz.sha256 -sha256 292faf76557fe56a6bc15b48b5ea3eb1f0790e2ed7f2ade4ae79ef7973d67bed efl-1.18.2.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.3.tar.xz.sha256 +sha256 0748ec0847f543d96b149cb3a84e6438724e827a38d530922ecb4bd59d3e64c0 efl-1.18.3.tar.xz diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 777ef3c848..17d3163c87 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.18.2 +EFL_VERSION = 1.18.3 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+ From 21a0ca235d1886c94d0e3ff4ab91a38a33720287 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 14 Nov 2016 14:01:36 +0000 Subject: [PATCH 1534/3392] package/{mesa3d, mesa3d-headers}: bump version to 13.0.1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 4 ++-- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index b3b80ebc8e..523d10b077 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 = 13.0.0 +MESA3D_HEADERS_VERSION = 13.0.1 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 7dbe1ac8fa..0fab1de644 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2016-November/000264.html -sha256 94edb4ebff82066a68be79d9c2627f15995e1fe10f67ab3fc63deb842027d727 mesa-13.0.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2016-November/000270.html +sha256 71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731 mesa-13.0.1.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index e17db5c6f1..031ce883c1 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 = 13.0.0 +MESA3D_VERSION = 13.0.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos From 16a4241cb7829e5bf3a010329d38fef992d123ee Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Tue, 22 Nov 2016 00:43:39 +0100 Subject: [PATCH 1535/3392] gcc: backport upstream patch for sync_8 in !glibc gcc 4.7 introduced the sync_8 builtin functions for ARM. For ARM < v7, this requires calling into the kernel. However, the failure path of that call reports an error with the __write() function, which is a glibc internal function. Therefore, it fails to link with uClibc or musl. This was fixed in gcc 5.2.0, by replacing the __write() with a plain write(). For sync_8 itself we have solved this with the conditions on BR2_TOOLCHAIN_ARM_HAS_SYNC_8. However, the same function is also used for the implementation of atomics. For the internal toolchain, we can fix this by backporting the patch to 4.9.4 and 4.8.5. Fixes: http://autobuild.buildroot.net/results/1db64b4830f499621e44523e0ef68191505e2ce9 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- ...059-libgcc-should-not-use-__write-fo.patch | 43 +++++++++++++++++++ ...059-libgcc-should-not-use-__write-fo.patch | 43 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 package/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch create mode 100644 package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch diff --git a/package/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch b/package/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch new file mode 100644 index 0000000000..d8c6723ed3 --- /dev/null +++ b/package/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch @@ -0,0 +1,43 @@ +From edb9057c195c41dd7bcd8603e5fd420359edd520 Mon Sep 17 00:00:00 2001 +From: nsz +Date: Mon, 23 Nov 2015 15:17:55 +0000 +Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for + printing fatal error + +libgcc/ + PR target/68059 + * config/arm/linux-atomic-64bit.c (__write): Rename to... + (write): ...this and fix the return type. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230762 138bc75d-0d04-0410-961f-82ee72b054a4 + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + libgcc/config/arm/linux-atomic-64bit.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgcc/config/arm/linux-atomic-64bit.c b/libgcc/config/arm/linux-atomic-64bit.c +index 7aa8dfc..570b4ce 100644 +--- a/libgcc/config/arm/linux-atomic-64bit.c ++++ b/libgcc/config/arm/linux-atomic-64bit.c +@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + kernels; we check for that in an init section and bail out rather + unceremoneously. */ + +-extern unsigned int __write (int fd, const void *buf, unsigned int count); ++extern int write (int fd, const void *buf, unsigned int count); + extern void abort (void); + + /* Kernel helper for compare-and-exchange. */ +@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelper (void) + for the user - I'm not sure I can rely on much else being + available at this point, so do the same as generic-morestack.c + write () and abort (). */ +- __write (2 /* stderr. */, err, sizeof (err)); ++ write (2 /* stderr. */, err, sizeof (err)); + abort (); + } + }; +-- +2.10.2 + diff --git a/package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch b/package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch new file mode 100644 index 0000000000..fd2bc69538 --- /dev/null +++ b/package/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch @@ -0,0 +1,43 @@ +From 80bc14a5249da7054b716229206b453f339b4a5e Mon Sep 17 00:00:00 2001 +From: nsz +Date: Mon, 23 Nov 2015 15:17:55 +0000 +Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for + printing fatal error + +libgcc/ + PR target/68059 + * config/arm/linux-atomic-64bit.c (__write): Rename to... + (write): ...this and fix the return type. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230762 138bc75d-0d04-0410-961f-82ee72b054a4 + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + libgcc/config/arm/linux-atomic-64bit.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgcc/config/arm/linux-atomic-64bit.c b/libgcc/config/arm/linux-atomic-64bit.c +index 5b8c6e2..9078673 100644 +--- a/libgcc/config/arm/linux-atomic-64bit.c ++++ b/libgcc/config/arm/linux-atomic-64bit.c +@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + kernels; we check for that in an init section and bail out rather + unceremoneously. */ + +-extern unsigned int __write (int fd, const void *buf, unsigned int count); ++extern int write (int fd, const void *buf, unsigned int count); + extern void abort (void); + + /* Kernel helper for compare-and-exchange. */ +@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelper (void) + for the user - I'm not sure I can rely on much else being + available at this point, so do the same as generic-morestack.c + write () and abort (). */ +- __write (2 /* stderr. */, err, sizeof (err)); ++ write (2 /* stderr. */, err, sizeof (err)); + abort (); + } + }; +-- +2.10.2 + From ac6785f12cc6b24e66f3d16eb6058d7c5db6014e Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Wed, 23 Nov 2016 11:16:52 +1100 Subject: [PATCH 1536/3392] package/qemu: add option to include tools Add an option to QEMU to include the "tools" (configure option: --enable-tools) in the target. This adds a dependency on pixman, but that's already present. Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in | 5 +++++ package/qemu/qemu.mk | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index e935ef9c61..b9c1ca1816 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -107,4 +107,9 @@ comment "FDT support needs a toolchain w/ dynamic library" endif # BR2_PACKAGE_QEMU_HAS_EMULS +config BR2_PACKAGE_QEMU_TOOLS + bool "Enable tools" + help + Say 'y' here to include tools packaged with QEMU (e.g. qemu-img). + endif # BR2_PACKAGE_QEMU diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 45fc0fad0a..bc707cf7e6 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -204,6 +204,12 @@ else QEMU_OPTS += --disable-fdt endif +ifeq ($(BR2_PACKAGE_QEMU_TOOLS),y) +QEMU_OPTS += --enable-tools +else +QEMU_OPTS += --disable-tools +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS @@ -242,7 +248,6 @@ define QEMU_CONFIGURE_CMDS --disable-strip \ --disable-seccomp \ --disable-sparse \ - --disable-tools \ $(QEMU_OPTS) \ ) endef From d764abd1b9b4535acd57924b092925845afb0e28 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 26 Nov 2016 12:28:34 -0200 Subject: [PATCH 1537/3392] linux-headers: bump 4.{4, 8}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 5c42d53f7e..6d616c3fbc 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -232,9 +232,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.35" if BR2_KERNEL_HEADERS_4_1 - default "4.4.34" if BR2_KERNEL_HEADERS_4_4 + default "4.4.35" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.10" if BR2_KERNEL_HEADERS_4_7 - default "4.8.10" if BR2_KERNEL_HEADERS_4_8 + default "4.8.11" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From c11156270601758cb2c877d56a4568d4e57372f9 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 26 Nov 2016 12:28:35 -0200 Subject: [PATCH 1538/3392] linux: bump default to version 4.8.11 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index d8ac5fa558..6a7838d797 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.10)" + bool "Latest version (4.8.11)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.10" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.11" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 7497818be7e4fcab7f18edcc5aa857ca93a7d201 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Sun, 27 Nov 2016 16:32:02 +0200 Subject: [PATCH 1539/3392] efivar: bump to version 30 Use newest release. Signed-off-by: Andy Shevchenko Signed-off-by: Thomas Petazzoni --- ...-avoid-the-multiple-definitions-bug-.patch | 29 +++++++++++++++++++ package/efivar/efivar.hash | 2 +- package/efivar/efivar.mk | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 package/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch diff --git a/package/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch b/package/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch new file mode 100644 index 0000000000..2bc3ff243f --- /dev/null +++ b/package/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch @@ -0,0 +1,29 @@ +From 314eb67b239e60c2ed3700e2baf9cd0e590465f3 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 27 Oct 2016 09:19:18 -0400 +Subject: [PATCH] Use -z muldefs to avoid the multiple definitions bug + without -flto + +This fixes github issue #64 + +Signed-off-by: Peter Jones +Signed-off-by: Andy Shevchenko +--- + Make.defaults | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Make.defaults b/Make.defaults +index aa974d9..c9d599f 100644 +--- a/Make.defaults ++++ b/Make.defaults +@@ -32,6 +32,7 @@ cflags = $(CFLAGS) -I${TOPDIR}/src/include/efivar/ \ + clang_ccldflags = + gcc_ccldflags = + ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \ ++ -Wl,-z,muldefs \ + $(if $(findstring clang,$(CCLD)),$(clang_ccldflags),) \ + $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \ + $(call pkg-config-ccldflags) +-- +2.10.2 + diff --git a/package/efivar/efivar.hash b/package/efivar/efivar.hash index 3671bbc05e..e337b96450 100644 --- a/package/efivar/efivar.hash +++ b/package/efivar/efivar.hash @@ -1,2 +1,2 @@ # locally computed hash -sha256 7fed0b31fe796d7dfef40cccb97b8bb0b806f16e568074ad2d456be30e195f5e efivar-28.tar.gz +sha256 20709c76311f8eb8be92977b7ac008ce62501fa9f7fe885a784321540fc352f9 efivar-30.tar.gz diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index cff3ac1d11..913322e2f6 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFIVAR_VERSION = 28 +EFIVAR_VERSION = 30 EFIVAR_SITE = $(call github,rhinstaller,efivar,$(EFIVAR_VERSION)) EFIVAR_LICENSE = LGPLv2.1 EFIVAR_LICENSE_FILES = COPYING From 64551a8f5f7fd8cb8dd92cb3198ceff8f112b343 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Sun, 27 Nov 2016 16:32:03 +0200 Subject: [PATCH 1540/3392] efivar: allow build with uClibc Details at https://github.com/rhinstaller/efivar/issues/76. Signed-off-by: Andy Shevchenko [Thomas: tweak the dependency, efivar still doesn't build with musl.] Signed-off-by: Thomas Petazzoni --- .../efivar/0002-Allow-build-with-uClibc.patch | 38 +++++++++++++++++++ package/efivar/Config.in | 7 ++-- 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 package/efivar/0002-Allow-build-with-uClibc.patch diff --git a/package/efivar/0002-Allow-build-with-uClibc.patch b/package/efivar/0002-Allow-build-with-uClibc.patch new file mode 100644 index 0000000000..7c195872b0 --- /dev/null +++ b/package/efivar/0002-Allow-build-with-uClibc.patch @@ -0,0 +1,38 @@ +From 2255601757a8a58baddad2d37d0bcc6b003a3732 Mon Sep 17 00:00:00 2001 +From: Andy Shevchenko +Date: Fri, 25 Nov 2016 19:42:27 +0200 +Subject: [PATCH] Allow build with uClibc + +Basically this replaces type definitions in . + +Signed-off-by: Andy Shevchenko +--- + src/export.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/export.c b/src/export.c +index 7f2d4dd..72c02d1 100644 +--- a/src/export.c ++++ b/src/export.c +@@ -21,11 +21,17 @@ + #include + #include + #include +-#include + + #include + #include "lib.h" + ++#ifdef __UCLIBC__ ++typedef int_least16_t char16_t; ++typedef int_least32_t char32_t; ++#else ++#include ++#endif ++ + #define EFIVAR_MAGIC 0xf3df1597 + + #define ATTRS_UNSET 0xa5a5a5a5a5a5a5a5 +-- +2.10.2 + diff --git a/package/efivar/Config.in b/package/efivar/Config.in index 466a30ac5a..1bdb6cad63 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -9,9 +9,8 @@ config BR2_PACKAGE_EFIVAR # toolchains. depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \ !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - # doesn't build with uclibc due to lack of uchar.h # doesn't build with musl due to lack of __bswap_constant_16 - depends on BR2_TOOLCHAIN_USES_GLIBC + depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_POPT help @@ -19,9 +18,9 @@ config BR2_PACKAGE_EFIVAR https://github.com/rhinstaller/efivar -comment "efivar requires a glibc toolchain w/ headers >= 3.12, gcc >= 4.9" +comment "efivar requires a glibc or uClibc toolchain w/ headers >= 3.12, gcc >= 4.9" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ - !BR2_TOOLCHAIN_USES_GLIBC || \ + BR2_TOOLCHAIN_USES_MUSL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \ !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII From 3ae07b4746fcf7457a6ab3bd990df97fdd9e1fbe Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Sun, 27 Nov 2016 16:32:04 +0200 Subject: [PATCH 1541/3392] efibootmrg: Allow build with uClibc Details at https://github.com/rhinstaller/efibootmgr/issues/61. Signed-off-by: Andy Shevchenko [Thomas: efivar still doesn't build on musl, so same for efibootmgr.] Signed-off-by: Thomas Petazzoni --- .../0001-Allow-build-with-uClibc.patch | 40 +++++++++++++++++++ package/efibootmgr/Config.in | 7 ++-- package/efibootmgr/efibootmgr.mk | 8 ++-- 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 package/efibootmgr/0001-Allow-build-with-uClibc.patch diff --git a/package/efibootmgr/0001-Allow-build-with-uClibc.patch b/package/efibootmgr/0001-Allow-build-with-uClibc.patch new file mode 100644 index 0000000000..fd29233dc3 --- /dev/null +++ b/package/efibootmgr/0001-Allow-build-with-uClibc.patch @@ -0,0 +1,40 @@ +From bbfcc60497c326576bb23cb01d90115ef3cf6947 Mon Sep 17 00:00:00 2001 +From: Andy Shevchenko +Date: Fri, 25 Nov 2016 20:26:52 +0200 +Subject: [PATCH] Remove unneeded include + +This fixes the build with uClibc. + +Signed-off-by: Andy Shevchenko +--- + src/efibootdump.c | 1 - + src/eficonman.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/efibootdump.c b/src/efibootdump.c +index 6ff8360..7c5a1c5 100644 +--- a/src/efibootdump.c ++++ b/src/efibootdump.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include + + #include "error.h" +diff --git a/src/eficonman.c b/src/eficonman.c +index 2c2be38..9bfae79 100644 +--- a/src/eficonman.c ++++ b/src/eficonman.c +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + #include + + #define _(String) gettext (String) +-- +2.10.2 + diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 988bf6d651..8b29938d8a 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -1,10 +1,11 @@ config BR2_PACKAGE_EFIBOOTMGR bool "efibootmgr" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar - depends on BR2_TOOLCHAIN_USES_GLIBC # efivar + depends on !BR2_TOOLCHAIN_USES_MUSL # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \ !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII # efivar + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_EFIVAR help A Linux user-space application to modify the Intel Extensible @@ -14,9 +15,9 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhinstaller/efibootmgr -comment "efibootmgr requires a glibc toolchain w/ headers >= 3.12, gcc >= 4.9" +comment "efibootmgr requires a glibc or uClibc toolchain w/ headers >= 3.12, gcc >= 4.9" depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ - !BR2_TOOLCHAIN_USES_GLIBC || \\ + BR2_TOOLCHAIN_USES_MUSL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \ !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk index 731d6e9f59..487c8ca666 100644 --- a/package/efibootmgr/efibootmgr.mk +++ b/package/efibootmgr/efibootmgr.mk @@ -8,7 +8,8 @@ EFIBOOTMGR_VERSION = 14 EFIBOOTMGR_SITE = $(call github,rhinstaller,efibootmgr,$(EFIBOOTMGR_VERSION)) EFIBOOTMGR_LICENSE = GPLv2+ EFIBOOTMGR_LICENSE_FILES = COPYING -EFIBOOTMGR_DEPENDENCIES = efivar +EFIBOOTMGR_DEPENDENCIES = efivar $(if $(BR2_NEEDS_GETTEXT),gettext) +EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(if $(BR2_NEEDS_GETTEXT),-lintl) define EFIBOOTMSR_PATCH_HEADER_PATH $(SED) 's,-I/,-I$(STAGING_DIR)/,' $(@D)/Makefile @@ -17,11 +18,12 @@ endef EFIBOOTMGR_POST_PATCH_HOOKS += EFIBOOTMSR_PATCH_HEADER_PATH define EFIBOOTMGR_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D) endef define EFIBOOTMGR_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ DESTDIR=$(TARGET_DIR) install endef From 01354e1a0f4333ffee40a20260a5689e3846560c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Nov 2016 00:40:27 +0100 Subject: [PATCH 1542/3392] fs/ubifs: work around fakeroot / sed -i issue on systems with SELinux enabled Fixes #9386 GNU sed -i misbehaves on systems with SELinux enabled, as it tries to copy to the SELinux security context (xattr) from the source file to to the new destination file, which fails under fakeroot and leaves the file with 000 permissions, causing ubinize to fail when it cannot read to configuration file. So as a workaround, combine the install and tweak steps in a single sed with a redirect to the destination file instead. Signed-off-by: Peter Korsgaard --- fs/ubifs/ubi.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/ubifs/ubi.mk b/fs/ubifs/ubi.mk index cda4bf489e..e488cb5f8a 100644 --- a/fs/ubifs/ubi.mk +++ b/fs/ubifs/ubi.mk @@ -20,9 +20,11 @@ else UBINIZE_CONFIG_FILE_PATH = fs/ubifs/ubinize.cfg endif +# don't use sed -i as it misbehaves on systems with SELinux enabled when this is +# executed through fakeroot (see #9386) define ROOTFS_UBI_CMD - $(INSTALL) -m 0644 $(UBINIZE_CONFIG_FILE_PATH) $(BUILD_DIR)/ubinize.cfg - $(SED) 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' $(BUILD_DIR)/ubinize.cfg + sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \ + $(UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg $(HOST_DIR)/usr/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg rm $(BUILD_DIR)/ubinize.cfg endef From 0f496d77db5f877edfb18746a706bb8061aa0500 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Nov 2016 20:33:05 +0100 Subject: [PATCH 1543/3392] Revert "package/pseudo: provide better legacy handling for fakeroot" This reverts commit 499f28fc7ce6184c8017ccd229ffc973a520adde. Signed-off-by: Peter Korsgaard --- package/pseudo/pseudo-wrapper | 9 +-------- package/pseudo/pseudo.mk | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/package/pseudo/pseudo-wrapper b/package/pseudo/pseudo-wrapper index 9c8dbdbfab..feaa7fcecb 100644 --- a/package/pseudo/pseudo-wrapper +++ b/package/pseudo/pseudo-wrapper @@ -1,12 +1,5 @@ #!/bin/sh -if [ "${0##*/}" = "fakeroot" ]; then - cat >&2 <<-_EOF_ - WARNING: fakeroot has been replaced with pseudo. - WARNING: Update your script(s) to use pseudo or pseudo-wrapper instead. - _EOF_ -fi - export PSEUDO_PREFIX="$(dirname "${0%/*}")" export PSEUDO_OPTS="-t0" if [ -n "${TARGET_DIR}" ]; then @@ -16,4 +9,4 @@ if [ -n "${BASE_DIR}" ]; then export PSEUDO_LOCALSTATEDIR="${BASE_DIR}/build/.pseudodb" fi -exec "${0%/*}/pseudo" "${@}" +exec "${0%-wrapper}" "${@}" diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index aa2a9c78a0..7701825343 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -33,7 +33,7 @@ endef HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_INSTALL_WRAPPER define HOST_PSEUDO_FAKEROOT_SYMLINK - ln -sf pseudo-wrapper $(HOST_DIR)/usr/bin/fakeroot + ln -sf pseudo $(HOST_DIR)/usr/bin/fakeroot endef HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_FAKEROOT_SYMLINK From 9b2f9b137ce14bbca01f18c3a4357bd3219a6b9f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Nov 2016 21:11:49 +0100 Subject: [PATCH 1544/3392] Revert "fs: call the pseudo wrapper" This reverts commit 74a3e75bb8208a8f3bb8426549fce1ea09b3be8a. Signed-off-by: Peter Korsgaard --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 22f3de5e2c..2dbef4d7b0 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -97,7 +97,7 @@ endif echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) - PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/pseudo-wrapper -- $$(FAKEROOT_SCRIPT) + PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/pseudo -- $$(FAKEROOT_SCRIPT) $$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE) -@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE) ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),) From ca41a78c2dcbb9874c0d4c285eb10e3ba1633ee1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Nov 2016 20:33:29 +0100 Subject: [PATCH 1545/3392] Revert "package/pseudo: wrap the real pseudo with a wrapper" This reverts commit a1d602a74d53f5610852c1763014632de145bf8b. Signed-off-by: Peter Korsgaard --- package/pseudo/pseudo-wrapper | 12 ------------ package/pseudo/pseudo.mk | 6 ------ 2 files changed, 18 deletions(-) delete mode 100644 package/pseudo/pseudo-wrapper diff --git a/package/pseudo/pseudo-wrapper b/package/pseudo/pseudo-wrapper deleted file mode 100644 index feaa7fcecb..0000000000 --- a/package/pseudo/pseudo-wrapper +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -export PSEUDO_PREFIX="$(dirname "${0%/*}")" -export PSEUDO_OPTS="-t0" -if [ -n "${TARGET_DIR}" ]; then - export PSEUDO_PASSWD="${TARGET_DIR}" -fi -if [ -n "${BASE_DIR}" ]; then - export PSEUDO_LOCALSTATEDIR="${BASE_DIR}/build/.pseudodb" -fi - -exec "${0%-wrapper}" "${@}" diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index 7701825343..a924e10c45 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -26,12 +26,6 @@ HOST_PSEUDO_CONF_OPTS = \ --libdir=$(HOST_DIR)/usr/lib \ --with-sqlite=$(HOST_DIR)/usr -define HOST_PSEUDO_INSTALL_WRAPPER - $(INSTALL) -D -m 0755 $(HOST_PSEUDO_PKGDIR)/pseudo-wrapper \ - $(HOST_DIR)/usr/bin/pseudo-wrapper -endef -HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_INSTALL_WRAPPER - define HOST_PSEUDO_FAKEROOT_SYMLINK ln -sf pseudo $(HOST_DIR)/usr/bin/fakeroot endef From 4c6d5e33ae1bdfc85c9734897c357a804bfd7435 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Nov 2016 20:33:50 +0100 Subject: [PATCH 1546/3392] Revert "makedevs: make device node creation idempotent" This reverts commit c85cd189dc1ded92b78c5968860ff447ec9815ad. Signed-off-by: Peter Korsgaard --- package/makedevs/makedevs.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c index bcf0e0f000..7092b1475e 100644 --- a/package/makedevs/makedevs.c +++ b/package/makedevs/makedevs.c @@ -601,7 +601,6 @@ int main(int argc, char **argv) dev_t rdev; unsigned i; char *full_name_inc; - struct stat st; if (type == 'p') { mode |= S_IFIFO; @@ -623,23 +622,10 @@ int main(int argc, char **argv) for (i = start; i <= start + count; i++) { sprintf(full_name_inc, count ? "%s%u" : "%s", full_name, i); rdev = makedev(major, minor + (i - start) * increment); - if (stat(full_name_inc, &st) == 0) { - if ((mode & S_IFMT) != (st.st_mode & S_IFMT)) { - bb_error_msg("line %d: node %s exists but is of wrong file type", linenum, full_name_inc); - ret = EXIT_FAILURE; - continue; - } - if (st.st_rdev != rdev) { - bb_error_msg("line %d: node %s exists but is wrong device number", linenum, full_name_inc); - ret = EXIT_FAILURE; - continue; - } - } else if (mknod(full_name_inc, mode, rdev) < 0) { + if (mknod(full_name_inc, mode, rdev) < 0) { bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc); ret = EXIT_FAILURE; - continue; - } - if (chown(full_name_inc, uid, gid) < 0) { + } else if (chown(full_name_inc, uid, gid) < 0) { bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc); ret = EXIT_FAILURE; } else if (chmod(full_name_inc, mode) < 0) { From 907ea41c5298e6d086c49fb7507e1db036d3c4d2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Nov 2016 20:31:50 +0100 Subject: [PATCH 1547/3392] Revert "package/fakeroot: remove" This reverts commit 325cff36f74b07545389b81cee0a2acef55b487c. Signed-off-by: Peter Korsgaard --- package/fakeroot/0001-hide-dlsym-error.patch | 34 ++++++++++++++++++++ package/fakeroot/fakeroot.hash | 4 +++ package/fakeroot/fakeroot.mk | 20 ++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 package/fakeroot/0001-hide-dlsym-error.patch create mode 100644 package/fakeroot/fakeroot.hash create mode 100644 package/fakeroot/fakeroot.mk diff --git a/package/fakeroot/0001-hide-dlsym-error.patch b/package/fakeroot/0001-hide-dlsym-error.patch new file mode 100644 index 0000000000..2c61fab248 --- /dev/null +++ b/package/fakeroot/0001-hide-dlsym-error.patch @@ -0,0 +1,34 @@ +Description: Hide error from dlsym() + dlsym(), starting in glibc 2.24 actually reports errors. In our case, + we try to get ACL functions which are not in the glibc. This causes + failures in test suites, so hide those messages for non-debugging + purposes for now. It also makes the build logs annoying to read. +Author: Julian Andres Klode +Origin: vendor +Bug-Debian: https://bugs.debian.org/830912 +Forwarded: no +Last-Update: 2016-08-12 + +Signed-off-by: Maxime Hadjinlian + +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -256,10 +256,16 @@ void load_library_symbols(void){ + /* clear dlerror() just in case dlsym() legitimately returns NULL */ + msg = dlerror(); + *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); ++ + if ( (msg = dlerror()) != NULL){ +- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); +-/* abort ();*/ ++#ifdef LIBFAKEROOT_DEBUGGING ++ if (fakeroot_debug) { ++ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); ++/* abort ();*/ ++ } ++#endif + } ++ + } + } + diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash new file mode 100644 index 0000000000..f0d436e5c3 --- /dev/null +++ b/package/fakeroot/fakeroot.hash @@ -0,0 +1,4 @@ +# From http://snapshot.debian.org/package/fakeroot/1.20.2-1/ +sha1 367040df07043edb630942b21939e493f3fad888 fakeroot_1.20.2.orig.tar.bz2 +# Calculated based on the hash above +sha256 7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2 diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk new file mode 100644 index 0000000000..168cd13a48 --- /dev/null +++ b/package/fakeroot/fakeroot.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# fakeroot +# +################################################################################ + +FAKEROOT_VERSION = 1.20.2 +FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2 +FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot +# Force capabilities detection off +# For now these are process capabilities (faked) rather than file +# so they're of no real use +HOST_FAKEROOT_CONF_ENV = \ + ac_cv_header_sys_capability_h=no \ + ac_cv_func_capset=no + +FAKEROOT_LICENSE = GPLv3+ +FAKEROOT_LICENSE_FILES = COPYING + +$(eval $(host-autotools-package)) From 6d3e05690f3ecfdd1512393f7afd67e0042d05f0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Nov 2016 20:34:22 +0100 Subject: [PATCH 1548/3392] Revert "package/pseudo: add a legacy symlink to emulate fakeroot" This reverts commit 7158403805f650e8e34de6c0ac0dcd9b565c679b. Signed-off-by: Peter Korsgaard --- package/pseudo/pseudo.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk index a924e10c45..8144cca825 100644 --- a/package/pseudo/pseudo.mk +++ b/package/pseudo/pseudo.mk @@ -26,9 +26,4 @@ HOST_PSEUDO_CONF_OPTS = \ --libdir=$(HOST_DIR)/usr/lib \ --with-sqlite=$(HOST_DIR)/usr -define HOST_PSEUDO_FAKEROOT_SYMLINK - ln -sf pseudo $(HOST_DIR)/usr/bin/fakeroot -endef -HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_FAKEROOT_SYMLINK - $(eval $(host-autotools-package)) From 79061fe52f9cf5925f603d938feddfe41aab340e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Nov 2016 21:13:54 +0100 Subject: [PATCH 1549/3392] Revert "fs: use pseudo instead of fakeroot" This reverts commit 8035ceb56cc3ba2541aba0d0ead3f29900d9e310. Moving to pseudo brought a number of issues (and longer compilation time), so lets stick with fakeroot now that the reported ubi issue has been worked around. Signed-off-by: Peter Korsgaard --- fs/common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 2dbef4d7b0..2b31e12934 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -43,7 +43,7 @@ ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) define ROOTFS_TARGET_INTERNAL # extra deps -ROOTFS_$(2)_DEPENDENCIES += host-pseudo host-makedevs \ +ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \ $$(if $$(PACKAGES_USERS)$$(ROOTFS_USERS_TABLES),host-mkpasswd) ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) @@ -97,7 +97,7 @@ endif echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) - PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/pseudo -- $$(FAKEROOT_SCRIPT) + PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT) $$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE) -@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE) ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),) From d45465e4880748685fdd26eb9e4a137a1cbb1e39 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 26 Nov 2016 12:36:03 -0200 Subject: [PATCH 1550/3392] configs/mx6: Bump to kernel 4.8.11 Kernel 4.8.11 brings commit 5f95e68daae397 ("clk: imx: fix integer overflow in AV PLL round rate"), which fixes a PLL calculation bug, so bump to this version. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6ulpico_defconfig | 2 +- configs/mx6udoo_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/imx6ulpico_defconfig b/configs/imx6ulpico_defconfig index 71277d9b82..5ad8d7941e 100644 --- a/configs/imx6ulpico_defconfig +++ b/configs/imx6ulpico_defconfig @@ -17,7 +17,7 @@ BR2_GLOBAL_PATCH_DIR="board/technexion/imx6ulpico/patches" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.11" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/technexion/imx6ulpico/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 1ca2be4f6a..8c1b28ab5e 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -15,7 +15,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.11" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 9d67242653eb14bd5af2a4a7637c27b52e30f619 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Nov 2016 16:37:45 +0100 Subject: [PATCH 1551/3392] uclibc: add madvise macro patch from upstream Fixes: http://autobuild.buildroot.net/results/6f296139633df24031b20d8bd5191e0f5928ec68 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...dvise-related-macros-for-noMMU-targe.patch | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 package/uclibc/0002-do-not-define-madvise-related-macros-for-noMMU-targe.patch diff --git a/package/uclibc/0002-do-not-define-madvise-related-macros-for-noMMU-targe.patch b/package/uclibc/0002-do-not-define-madvise-related-macros-for-noMMU-targe.patch new file mode 100644 index 0000000000..31e763a4d6 --- /dev/null +++ b/package/uclibc/0002-do-not-define-madvise-related-macros-for-noMMU-targe.patch @@ -0,0 +1,66 @@ +From 2ca4e8dcbd35e5c6da41a195550d741ccb2f7978 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sat, 26 Nov 2016 19:47:41 +0100 +Subject: [PATCH] do not define madvise related macros for noMMU targets + +Signed-off-by: Waldemar Brodkorb +--- + libc/sysdeps/linux/common/bits/mman-common.h | 41 +++++++++++++++------------- + 1 file changed, 22 insertions(+), 19 deletions(-) + +diff --git a/libc/sysdeps/linux/common/bits/mman-common.h b/libc/sysdeps/linux/common/bits/mman-common.h +index 6cde5da..5b20da4 100644 +--- a/libc/sysdeps/linux/common/bits/mman-common.h ++++ b/libc/sysdeps/linux/common/bits/mman-common.h +@@ -83,26 +83,29 @@ + # define MREMAP_FIXED 2 + #endif + ++/* only define for MMU targets, no-MMU does not support madvise. */ ++#ifdef __ARCH_USE_MMU__ + /* Advice to `madvise'. */ +-#ifdef __USE_BSD +-# define MADV_NORMAL 0 /* No further special treatment. */ +-# define MADV_RANDOM 1 /* Expect random page references. */ +-# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */ +-# define MADV_WILLNEED 3 /* Will need these pages. */ +-# define MADV_DONTNEED 4 /* Don't need these pages. */ +-# define MADV_REMOVE 9 /* Remove these pages and resources. */ +-# define MADV_DONTFORK 10 /* Do not inherit across fork. */ +-# define MADV_DOFORK 11 /* Do inherit across fork. */ +-# define MADV_MERGEABLE 12 /* KSM may merge identical pages. */ +-# define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages. */ +-# define MADV_HWPOISON 100 /* Poison a page for testing. */ +-#endif ++# ifdef __USE_BSD ++# define MADV_NORMAL 0 /* No further special treatment. */ ++# define MADV_RANDOM 1 /* Expect random page references. */ ++# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */ ++# define MADV_WILLNEED 3 /* Will need these pages. */ ++# define MADV_DONTNEED 4 /* Don't need these pages. */ ++# define MADV_REMOVE 9 /* Remove these pages and resources. */ ++# define MADV_DONTFORK 10 /* Do not inherit across fork. */ ++# define MADV_DOFORK 11 /* Do inherit across fork. */ ++# define MADV_MERGEABLE 12 /* KSM may merge identical pages. */ ++# define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages. */ ++# define MADV_HWPOISON 100 /* Poison a page for testing. */ ++# endif + + /* The POSIX people had to invent similar names for the same things. */ +-#ifdef __USE_XOPEN2K +-# define POSIX_MADV_NORMAL 0 /* No further special treatment. */ +-# define POSIX_MADV_RANDOM 1 /* Expect random page references. */ +-# define POSIX_MADV_SEQUENTIAL 2 /* Expect sequential page references. */ +-# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */ +-# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */ ++# ifdef __USE_XOPEN2K ++# define POSIX_MADV_NORMAL 0 /* No further special treatment. */ ++# define POSIX_MADV_RANDOM 1 /* Expect random page references. */ ++# define POSIX_MADV_SEQUENTIAL 2 /* Expect sequential page references. */ ++# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */ ++# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */ ++# endif + #endif +-- +2.1.4 + From 1546afad3c2ed25acb03ec960377bef64f63e0ec Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Nov 2016 16:57:04 +0100 Subject: [PATCH 1552/3392] gcc: add patch to support musl on ppc Tested with a boot in Qemu (g3beige). Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/gcc/5.4.0/911-ppc-musl-support.patch | 75 ++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 package/gcc/5.4.0/911-ppc-musl-support.patch diff --git a/package/gcc/5.4.0/911-ppc-musl-support.patch b/package/gcc/5.4.0/911-ppc-musl-support.patch new file mode 100644 index 0000000000..f4905a4232 --- /dev/null +++ b/package/gcc/5.4.0/911-ppc-musl-support.patch @@ -0,0 +1,75 @@ +Add support for musl on ppc32 + +Signed-off-by: Waldemar Brodkorb + +diff -Nur gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h gcc-5.4.0/gcc/config/rs6000/sysv4.h +--- gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h 2015-09-24 15:46:45.000000000 +0200 ++++ gcc-5.4.0/gcc/config/rs6000/sysv4.h 2016-11-27 13:12:33.226953738 +0100 +@@ -537,6 +537,9 @@ + #ifndef CC1_SECURE_PLT_DEFAULT_SPEC + #define CC1_SECURE_PLT_DEFAULT_SPEC "" + #endif ++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC ++#define LINK_SECURE_PLT_DEFAULT_SPEC "" ++#endif + + /* Pass -G xxx to the compiler. */ + #undef CC1_SPEC +@@ -757,17 +760,23 @@ + + #define LINK_START_LINUX_SPEC "" + ++#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","") ++ + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER \ ++ "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + + #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -889,6 +898,7 @@ + { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ + { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ + { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ ++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ + { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ + { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ + { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ +diff -Nur gcc-5.4.0.orig/gcc/config/rs6000/sysv4le.h gcc-5.4.0/gcc/config/rs6000/sysv4le.h +--- gcc-5.4.0.orig/gcc/config/rs6000/sysv4le.h 2015-09-24 15:46:45.000000000 +0200 ++++ gcc-5.4.0/gcc/config/rs6000/sysv4le.h 2016-11-27 13:12:33.226953738 +0100 +@@ -31,3 +31,5 @@ + /* Little-endian PowerPC64 Linux uses the ELF v2 ABI by default. */ + #define LINUX64_DEFAULT_ABI_ELFv2 + ++#undef MUSL_DYNAMIC_LINKER_E ++#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","le") +diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc +--- gcc-5.4.0.orig/gcc/config.gcc 2015-09-10 16:17:53.000000000 +0200 ++++ gcc-5.4.0/gcc/config.gcc 2016-11-27 13:14:17.149638148 +0100 +@@ -2413,6 +2413,10 @@ + powerpc*-*-linux*paired*) + tm_file="${tm_file} rs6000/750cl.h" ;; + esac ++ case ${target} in ++ powerpc*-*-linux*-musl*) ++ enable_secureplt=yes ;; ++ esac + if test x${enable_secureplt} = xyes; then + tm_file="rs6000/secureplt.h ${tm_file}" + fi From cbe1f288d41e268c053d4355d65102eda721da2d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Nov 2016 22:11:33 +0100 Subject: [PATCH 1553/3392] imagemagick: security bump to 7.0.3-8 Fixes CVE-2016-9556 (Heap buffer overflow in IsPixelGray). Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- 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 4bdfe8f177..9eb3a9e860 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 140b99f33a3326aed92132a7cd054ee962a6e2562064c68495640411aa4571d7 ImageMagick-7.0.3-7.tar.xz +sha256 dc128b281c255d71d754934408d278b3ca314253103ca2501cd0b8d5ec98db74 ImageMagick-7.0.3-8.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 4f5c3be7e7..f384fc38dc 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.3-7 +IMAGEMAGICK_VERSION = 7.0.3-8 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From 6ce49353422b76f28d6e0c7166e3b98b8c089434 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 11:40:22 +0100 Subject: [PATCH 1554/3392] package/ffmpeg: bump version to 3.2.1 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 541f421de6..aa9f0f738b 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da ffmpeg-3.2.tar.xz +sha256 1ecf93da5d601e6fb3096c65cbe33fdaf042d690a3c50c4efadb0a9b74f2badf ffmpeg-3.2.1.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index de6d8416c3..699de2ac8f 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.2 +FFMPEG_VERSION = 3.2.1 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From b56a301a17d4ac38211132d51ccd46f42c08a37d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 11:40:23 +0100 Subject: [PATCH 1555/3392] package/libdrm: bump version to 2.4.73 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdrm/libdrm.hash | 4 ++-- package/libdrm/libdrm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index bda054eb01..3131705228 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2016-October/119998.html -sha256 c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8 libdrm-2.4.71.tar.bz2 +# From https://lists.freedesktop.org/archives/dri-devel/2016-November/123704.html +sha256 96bfd39242fe168017d95f22e141645a35591f5902a7d98c2fa4ca8c31df5e4d libdrm-2.4.73.tar.bz2 diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index cce50236f4..b4e1aada79 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.71 +LIBDRM_VERSION = 2.4.73 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = http://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From 7ffd68ba9235ccde6da70debabe1a38136b897f1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:04 +0100 Subject: [PATCH 1556/3392] package/x11r7/xdriver_xf86-input-joystick: bump version to 1.6.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-input-joystick.hash | 4 ++-- .../xdriver_xf86-input-joystick.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash index 5fac77e689..feec2d3777 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002136.html -sha1 61658b8d829fdaed6064c7c26232c3884d359187 xf86-input-joystick-1.6.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-November/002742.html +sha256 9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab xf86-input-joystick-1.6.3.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk index 76f257727f..5bc2a5cafb 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.2 +XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.3 XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT From 87d88afe4b2e504a895b199a0330d8f9fee95f00 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:05 +0100 Subject: [PATCH 1557/3392] package/x11r7/xdriver_xf86-input-keyboard: bump version to 1.9.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-input-keyboard.hash | 4 ++-- .../xdriver_xf86-input-keyboard.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash index 11fcc601d7..eccfa74dc8 100644 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash +++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002559.html -sha256 1ac8ff39bf9da7d2fc7fd6c24515726e8138340c0518ab8c606e008cf93ca211 xf86-input-keyboard-1.8.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-November/002739.html +sha256 f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388 xf86-input-keyboard-1.9.0.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk index eb2d58287f..01a6859cd4 100644 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk +++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.8.1 +XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.9.0 XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_KEYBOARD_LICENSE = MIT From 8e5380db9ed0e92c60bc29a624a30bb1f0ef0e19 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:06 +0100 Subject: [PATCH 1558/3392] package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash | 4 ++-- .../xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash index 5a62d13178..caba427b22 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2014-August/002471.html -sha256 3485d375779c08406f0789feedde15933dc703158a086ddac638598f479fc5ce xf86-input-mouse-1.9.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-November/002740.html +sha256 f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f xf86-input-mouse-1.9.2.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index e1bd81a55f..5bcbeb70fd 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.1 +XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.2 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT From c7e5e0f406fb40aa7f9426166c7041556e8b2b39 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:07 +0100 Subject: [PATCH 1559/3392] package/x11r7/xdriver_xf86-input-synaptics: bump version to 1.9.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../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 3cb0758089..2c31600b0a 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-November/002652.html -sha256 d39f100c74f3673778b53f17bab7690161925e25dd998a15dd8cc69b52e83f01 xf86-input-synaptics-1.8.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-November/002744.html +sha256 afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a xf86-input-synaptics-1.9.0.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 d6164d0daf..6bd9cc49c5 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.3 +XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.9.0 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 415893dfe16ff4b73fdbb35f2b6c2cf1d357b204 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:08 +0100 Subject: [PATCH 1560/3392] package/x11r7/xdriver_xf86-video-amdgpu: bump version to 1.2.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash | 4 ++-- .../xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash index 816f0754bd..32ff1646d1 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash @@ -1,2 +1,2 @@ -# From https://lists.x.org/archives/xorg-announce/2016-September/002708.html -sha256 6ee87fed6d70d12353ca7ac02f8321a30d770626bf56f62f0e27970a33690779 xf86-video-amdgpu-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-November/002741.html +sha256 275b1aac5f127f55ba3d7480a1df89eace1d02650e24e46908067fc875e76c8f xf86-video-amdgpu-1.2.0.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index 4e12e12063..d858e14096 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 1.1.2 +XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 1.2.0 XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT From a68c52366fa6becd6d238e46a6d85854bfbfca7e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:09 +0100 Subject: [PATCH 1561/3392] package/x11r7/xdriver_xf86-video-ati: bump version to 7.8.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash | 4 ++-- .../x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash index 469e0572bb..fe5ae0ea70 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash @@ -1,2 +1,2 @@ -# From https://lists.x.org/archives/xorg-announce/2016-September/002707.html -sha256 00a58588db62ee309095c5c5920bbd248d965e8627f88affe68a73b18865078d xf86-video-ati-7.7.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-November/002738.html +sha256 401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa xf86-video-ati-7.8.0.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index 02a457b067..ea701672c2 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ATI_VERSION = 7.7.1 +XDRIVER_XF86_VIDEO_ATI_VERSION = 7.8.0 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT From 19ad486c6ba6f2af2a26559aabff64c891d9fcd6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:10 +0100 Subject: [PATCH 1562/3392] package/x11r7/xdriver_xf86-video-openchrome: bump version to 0.5.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-openchrome.hash | 4 ++-- .../xdriver_xf86-video-openchrome.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash index b3aef580ba..2d29fae3a7 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash @@ -1,2 +1,2 @@ -# Locally computed -sha256 73e7966d01d0d644d3b9204e8bfc106cb99069c58e981626e7352f2693e3e927 xf86-video-openchrome-0.4.0.tar.bz2 +# From https://lists.freedesktop.org/archives/openchrome-devel/2016-July/002890.html +sha1 9c7ad349de6dd350252ccda8da56fa1e2a6afa32 xf86-video-openchrome-0.5.0.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk index 83c12b2055..9ab032b6bc 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.4.0 +XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.5.0 XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE = MIT From c58598019394cc70d08fbcfe22bfc8aa3e03b32d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:11 +0100 Subject: [PATCH 1563/3392] package/x11r7/xdriver_xf86-video-vmware: bump version to 13.2.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash | 4 ++-- .../xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash index 10d31d02fc..8d948a7d4c 100644 --- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash +++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002521.html -sha256 3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc xf86-video-vmware-13.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-November/002743.html +sha256 e2f7f7101fba7f53b268e7a25908babbf155b3984fb5268b3d244eb6c11bf62b xf86-video-vmware-13.2.1.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk index ea4dd48215..ef262f8942 100644 --- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk +++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.1.0 +XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.2.1 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_VMWARE_LICENSE = MIT From f08ab40b606cb757f55e8390806842d1e7ca6684 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:12 +0100 Subject: [PATCH 1564/3392] package/x11r7/xdriver_xf86-video-*: mass addition of patches for ABI 23 support (xserver_xorg-server 1.19+) Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-glint/0002-abi23.patch | 33 ++++++++++++++++ .../xdriver_xf86-video-mga/0002-abi23.patch | 33 ++++++++++++++++ .../xdriver_xf86-video-nv/0002-abi23.patch | 39 +++++++++++++++++++ .../xdriver_xf86-video-r128/0002-abi23.patch | 33 ++++++++++++++++ .../0002-abi23.patch | 39 +++++++++++++++++++ .../0001-abi23.patch | 33 ++++++++++++++++ .../xdriver_xf86-video-tdfx/0002-abi23.patch | 39 +++++++++++++++++++ .../0001-abi23.patch | 33 ++++++++++++++++ 8 files changed, 282 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch create mode 100644 package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch create mode 100644 package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch create mode 100644 package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch create mode 100644 package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch create mode 100644 package/x11r7/xdriver_xf86-video-siliconmotion/0001-abi23.patch create mode 100644 package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch create mode 100644 package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch new file mode 100644 index 0000000000..1d8f7f22c2 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch @@ -0,0 +1,33 @@ +From 2eb4d03d2280deec4d6f1b06aaa16477a641af9a Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson +--- +Downloaded from: +https://cgit.freedesktop.org/xorg/driver/xf86-video-glint/commit/?id=2eb4d03d2280deec4d6f1b06aaa16477a641af9a + +Signed-off-by: Bernd Kuhls + +diff --git a/src/compat-api.h b/src/compat-api.h +index 6bc946f..89976e4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -75,8 +75,13 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch new file mode 100644 index 0000000000..b2b691789e --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch @@ -0,0 +1,33 @@ +From df094bfffe4ef097bfd9a569f2d2e35649c1a3c7 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-mga/commit/?id=df094bfffe4ef097bfd9a569f2d2e35649c1a3c7 + +Signed-off-by: Bernd Kuhls + +diff --git a/src/compat-api.h b/src/compat-api.h +index 6bc946f..89976e4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -75,8 +75,13 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch new file mode 100644 index 0000000000..7b7bb34cd9 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch @@ -0,0 +1,39 @@ +From 42e260a7ab630fdfa4664f467dad25e7178ff809 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-nv/commit/?id=42e260a7ab630fdfa4664f467dad25e7178ff809 + +Signed-off-by: Bernd Kuhls + +diff --git a/src/compat-api.h b/src/compat-api.h +index 0a87cf5..62d9481 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -78,11 +78,19 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++ ++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result ++#define WAKEUPHANDLER_ARGS arg, result ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + + #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask + #define WAKEUPHANDLER_ARGS arg, result, read_mask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch new file mode 100644 index 0000000000..e79ffdfb60 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch @@ -0,0 +1,33 @@ +From 5ab23b3a8ef18ab9ff96ac8be174380d36e185e5 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-r128/commit/?id=5ab23b3a8ef18ab9ff96ac8be174380d36e185e5 + +Signed-off-by: Bernd Kuhls + +diff --git a/src/compat-api.h b/src/compat-api.h +index 6bc946f..89976e4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -75,8 +75,13 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch new file mode 100644 index 0000000000..248758545b --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch @@ -0,0 +1,39 @@ +From de3e1803314820968502156703d5bfe3fab24972 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-savage/commit/?id=de3e1803314820968502156703d5bfe3fab24972 + +Signed-off-by: Bernd Kuhls + +diff --git a/src/compat-api.h b/src/compat-api.h +index 98ba435..44daea4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -78,11 +78,19 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++ ++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result ++#define WAKEUPHANDLER_ARGS arg, result ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + + #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask + #define WAKEUPHANDLER_ARGS arg, result, read_mask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/0001-abi23.patch b/package/x11r7/xdriver_xf86-video-siliconmotion/0001-abi23.patch new file mode 100644 index 0000000000..2cd6e637bb --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-siliconmotion/0001-abi23.patch @@ -0,0 +1,33 @@ +From e67f3949648c20e16ac756ae28ea4a2b4a1d0f4c Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-siliconmotion/patch/?id=e67f3949648c20e16ac756ae28ea4a2b4a1d0f4c + +Signed-off-by: Bernd Kuhls + +diff --git a/src/compat-api.h b/src/compat-api.h +index 6bc946f..89976e4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -75,8 +75,13 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch new file mode 100644 index 0000000000..7e5d650f95 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch @@ -0,0 +1,39 @@ +From b99390efcb55d7d4a68e8c595119c1af4426fc0b Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-tdfx/patch/?id=b99390efcb55d7d4a68e8c595119c1af4426fc0b + +Signed-off-by: Bernd Kuhls + +diff --git a/src/compat-api.h b/src/compat-api.h +index 98ba435..44daea4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -78,11 +78,19 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++ ++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result ++#define WAKEUPHANDLER_ARGS arg, result ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + + #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask + #define WAKEUPHANDLER_ARGS arg, result, read_mask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch b/package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch new file mode 100644 index 0000000000..d9aecd535e --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch @@ -0,0 +1,33 @@ +From b5f4d35327863a14224d2a63885cd8b3b83a1815 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-trident/patch/?id=b5f4d35327863a14224d2a63885cd8b3b83a1815 + +Signed-off-by: Bernd Kuhls + +diff --git a/src/compat-api.h b/src/compat-api.h +index 6bc946f..89976e4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -75,8 +75,13 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + From c55fb8ad22be6d95b8b521d208cad0cfa7d75d07 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:13 +0100 Subject: [PATCH 1565/3392] package/x11r7/xdriver_xf86-video-qxl: Add patches for newer xserver_xorg-server releases 0002-xserverfix.patch added xlib_libXfont as new dependency. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-systemincludes.patch | 39 ++++++++++++++ .../0002-xserverfix.patch | 51 +++++++++++++++++++ .../x11r7/xdriver_xf86-video-qxl/Config.in | 1 + .../xdriver_xf86-video-qxl.mk | 3 ++ 4 files changed, 94 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-qxl/0001-systemincludes.patch create mode 100644 package/x11r7/xdriver_xf86-video-qxl/0002-xserverfix.patch diff --git a/package/x11r7/xdriver_xf86-video-qxl/0001-systemincludes.patch b/package/x11r7/xdriver_xf86-video-qxl/0001-systemincludes.patch new file mode 100644 index 0000000000..0c681f2898 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-qxl/0001-systemincludes.patch @@ -0,0 +1,39 @@ +From 83e00bb5f9b74c0d7059c189d747ec3c24c7798a Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau +Date: Tue, 4 Aug 2015 17:36:12 +0200 +Subject: Use <> for system-includes + +These headers come from /usr/include/xorg/ so it's clearer if they are +included using <>. While at it, I've reordered them alphabetically. +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=83e00bb5f9b74c0d7059c189d747ec3c24c7798a + +Signed-off-by: Bernd Kuhls + +diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c +index 3e4c075..6201712 100644 +--- a/src/uxa/uxa-damage.c ++++ b/src/uxa/uxa-damage.c +@@ -27,12 +27,13 @@ + #include + #include "uxa-priv.h" + ++#include ++#include ++#include ++#include ++#include + #include +-#include "scrnintstr.h" +-#include "windowstr.h" +-#include "dixfontstr.h" +-#include "gcstruct.h" +-#include "picturestr.h" ++ + #include "uxa-damage.h" + + typedef struct _damageGCPriv { +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-qxl/0002-xserverfix.patch b/package/x11r7/xdriver_xf86-video-qxl/0002-xserverfix.patch new file mode 100644 index 0000000000..c38d42e95b --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-qxl/0002-xserverfix.patch @@ -0,0 +1,51 @@ +From a184774ad161031cceed264d62d48ebd019ac800 Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau +Date: Mon, 3 Aug 2015 20:12:05 +0200 +Subject: Fix compilation with newer Xorg versions + +Xorg 1.18 stopped exporting some xfont related symbols in its +headers/shared libraries, which causes QXL to fail to build: + +uxa-damage.c:947:5: error: implicit declaration of function 'QueryGlyphExtents' [-Werror=implicit-function-declaration] + QueryGlyphExtents(font, charinfo, n, &extents); + +The missing definition can be found in xfont, so this commit addes the +needed configure.ac checks and includes. +Note that dixfontstr.h must be included before the xfont headers or this +will cause compile-time warnings on older Xorg versions (eg 1.17) +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=a184774ad161031cceed264d62d48ebd019ac800 + +Signed-off-by: Bernd Kuhls + +diff --git a/configure.ac b/configure.ac +index 6555a8d..7e95b01 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) + XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) + + # Obtain compiler/linker options for the driver dependencies +-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) ++PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto xfont $REQUIRED_MODULES) + + + save_CFLAGS="$CFLAGS" +diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c +index 6201712..a6d1ee3 100644 +--- a/src/uxa/uxa-damage.c ++++ b/src/uxa/uxa-damage.c +@@ -33,6 +33,9 @@ + #include + #include + #include ++#include ++#include ++#include + + #include "uxa-damage.h" + +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-qxl/Config.in b/package/x11r7/xdriver_xf86-video-qxl/Config.in index 5f05f6876b..04bde0f824 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/Config.in +++ b/package/x11r7/xdriver_xf86-video-qxl/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_QXL select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_UDEV # for KMS select BR2_PACKAGE_LIBPCIACCESS select BR2_PACKAGE_SPICE_PROTOCOL + select BR2_PACKAGE_XLIB_LIBXFONT select BR2_PACKAGE_XPROTO_FONTSPROTO select BR2_PACKAGE_XPROTO_XPROTO help diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk index ddc4191a47..30cd7a20c2 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk @@ -7,6 +7,8 @@ XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.4 XDRIVER_XF86_VIDEO_QXL_SOURCE = xf86-video-qxl-$(XDRIVER_XF86_VIDEO_QXL_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_QXL_SITE = http://xorg.freedesktop.org/releases/individual/driver +# 0002-xserverfix.patch +XDRIVER_XF86_VIDEO_QXL_AUTORECONF = YES XDRIVER_XF86_VIDEO_QXL_LICENSE = MIT XDRIVER_XF86_VIDEO_QXL_LICENSE_FILES = COPYING @@ -16,6 +18,7 @@ XDRIVER_XF86_VIDEO_QXL_CONF_OPTS = \ XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES = \ libpciaccess \ spice-protocol \ + xlib_libXfont \ xproto_fontsproto \ xproto_xproto \ xserver_xorg-server From c2a79469b28f77d65bf44ca180493f26497f0bf5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Nov 2016 12:06:14 +0100 Subject: [PATCH 1566/3392] package/x11r7/xdriver_xf86-video-sis: Add patch for ABI 23 support (xserver_xorg-server 1.19+) Re-numbered patches as well. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-sis/0002-abi23.patch | 33 +++++++++++++++++++ .../{0007-xi.patch => 0003-xi.patch} | 0 2 files changed, 33 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch rename package/x11r7/xdriver_xf86-video-sis/{0007-xi.patch => 0003-xi.patch} (100%) diff --git a/package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch new file mode 100644 index 0000000000..109f745373 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch @@ -0,0 +1,33 @@ +From 96fee560cd8bf7bf27048ce5fe67b7af6838c8d0 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=96fee560cd8bf7bf27048ce5fe67b7af6838c8d0 + +Signed-off-by: Bernd Kuhls + +diff --git a/src/compat-api.h b/src/compat-api.h +index 6bc946f..89976e4 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -75,8 +75,13 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-sis/0007-xi.patch b/package/x11r7/xdriver_xf86-video-sis/0003-xi.patch similarity index 100% rename from package/x11r7/xdriver_xf86-video-sis/0007-xi.patch rename to package/x11r7/xdriver_xf86-video-sis/0003-xi.patch From 6caa76db22ad952f3fe6329da39defed060d8980 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Tue, 22 Nov 2016 21:31:31 -0500 Subject: [PATCH 1567/3392] Makefile: drop redundant shell call when deriving BASE_DIR Commit 173135df5b69dfd5ae6fe6cf2de8833c6f74c143 ("core: re-enter make if $(CURDIR) or $(O) are not canonical paths") introduced the CANONICAL_O variable, defined as: CANONICAL_O := $(shell mkdir -p $(O) >/dev/null 2>&1)$(realpath $(O)) This duplicates the definition of BASE_DIR, by different means: BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd) So one of these shell calls is redundant. CANONICAL_O is defined first, so this commit replaces the BASE_DIR derivation with $(CANONICAL_O). Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4f6269faa3..55d928de38 100644 --- a/Makefile +++ b/Makefile @@ -174,10 +174,10 @@ endif # bash prints the name of the directory on 'cd ' if CDPATH is # set, so unset it here to not cause problems. Notice that the export -# line doesn't affect the environment of $(shell ..) calls, so -# explictly throw away any output from 'cd' here. +# line doesn't affect the environment of $(shell ..) calls. export CDPATH := -BASE_DIR := $(shell mkdir -p $(O) && cd $(O) >/dev/null && pwd) + +BASE_DIR := $(CANONICAL_O) $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist)) From 344566a778914d0161749619a3b1f00de0154e95 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 27 Nov 2016 22:41:18 +0100 Subject: [PATCH 1568/3392] gst1-plugins-good: add upstream patches to fix security issue in flic decoder As detailed by Chris Evans, the flic decoder contains a buffer overflow which can be exploited to cause arbitrary code execution as the user running gstreamer: https://scarybeastsecurity.blogspot.be/2016/11/0day-exploit-advancing-exploitation.html Fixes CVE-2016-9634, CVE-2016-9635 and CVE-2016-9636. add the upstream patches to fix this issue. Signed-off-by: Peter Korsgaard --- ...lxdec-add-some-write-bounds-checking.patch | 305 +++++ ...x-some-warnings-comparing-unsigned-0.patch | 50 + ...t-unref-parent-in-the-chain-function.patch | 29 + ...-logic-based-on-GstByteReader-Writer.patch | 1039 +++++++++++++++++ 4 files changed, 1423 insertions(+) create mode 100644 package/gstreamer1/gst1-plugins-good/0001-flxdec-add-some-write-bounds-checking.patch create mode 100644 package/gstreamer1/gst1-plugins-good/0002-flxdec-fix-some-warnings-comparing-unsigned-0.patch create mode 100644 package/gstreamer1/gst1-plugins-good/0003-flxdec-Don-t-unref-parent-in-the-chain-function.patch create mode 100644 package/gstreamer1/gst1-plugins-good/0004-flxdec-rewrite-logic-based-on-GstByteReader-Writer.patch diff --git a/package/gstreamer1/gst1-plugins-good/0001-flxdec-add-some-write-bounds-checking.patch b/package/gstreamer1/gst1-plugins-good/0001-flxdec-add-some-write-bounds-checking.patch new file mode 100644 index 0000000000..c8a76520e6 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-good/0001-flxdec-add-some-write-bounds-checking.patch @@ -0,0 +1,305 @@ +From ec66c7c584f0b41c98e93758d9b53bd6dd582df2 Mon Sep 17 00:00:00 2001 +From: Matthew Waters +Date: Tue, 22 Nov 2016 19:05:00 +1100 +Subject: [PATCH] flxdec: add some write bounds checking + +Without checking the bounds of the frame we are writing into, we can +write off the end of the destination buffer. + +https://scarybeastsecurity.blogspot.dk/2016/11/0day-exploit-advancing-exploitation.html + +https://bugzilla.gnome.org/show_bug.cgi?id=774834 +Signed-off-by: Peter Korsgaard +--- + gst/flx/gstflxdec.c | 116 +++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 91 insertions(+), 25 deletions(-) + +diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c +index 604be2f..d51a8e6 100644 +--- a/gst/flx/gstflxdec.c ++++ b/gst/flx/gstflxdec.c +@@ -74,9 +74,9 @@ static gboolean gst_flxdec_src_query_handler (GstPad * pad, GstObject * parent, + GstQuery * query); + + static void flx_decode_color (GstFlxDec *, guchar *, guchar *, gint); +-static void flx_decode_brun (GstFlxDec *, guchar *, guchar *); +-static void flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *); +-static void flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *); ++static gboolean flx_decode_brun (GstFlxDec *, guchar *, guchar *); ++static gboolean flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *); ++static gboolean flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *); + + #define rndalign(off) ((off) + ((off) & 1)) + +@@ -203,13 +203,14 @@ gst_flxdec_sink_event_handler (GstPad * pad, GstObject * parent, + return ret; + } + +-static void ++static gboolean + flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data, + guchar * dest) + { + FlxFrameChunk *hdr; ++ gboolean ret = TRUE; + +- g_return_if_fail (data != NULL); ++ g_return_val_if_fail (data != NULL, FALSE); + + while (count--) { + hdr = (FlxFrameChunk *) data; +@@ -228,17 +229,17 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data, + break; + + case FLX_BRUN: +- flx_decode_brun (flxdec, data, dest); ++ ret = flx_decode_brun (flxdec, data, dest); + data += rndalign (hdr->size) - FlxFrameChunkSize; + break; + + case FLX_LC: +- flx_decode_delta_fli (flxdec, data, dest); ++ ret = flx_decode_delta_fli (flxdec, data, dest); + data += rndalign (hdr->size) - FlxFrameChunkSize; + break; + + case FLX_SS2: +- flx_decode_delta_flc (flxdec, data, dest); ++ ret = flx_decode_delta_flc (flxdec, data, dest); + data += rndalign (hdr->size) - FlxFrameChunkSize; + break; + +@@ -256,7 +257,12 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data, + data += rndalign (hdr->size) - FlxFrameChunkSize; + break; + } ++ ++ if (!ret) ++ break; + } ++ ++ return ret; + } + + +@@ -289,13 +295,13 @@ flx_decode_color (GstFlxDec * flxdec, guchar * data, guchar * dest, gint scale) + } + } + +-static void ++static gboolean + flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest) + { + gulong count, lines, row; + guchar x; + +- g_return_if_fail (flxdec != NULL); ++ g_return_val_if_fail (flxdec != NULL, FALSE); + + lines = flxdec->hdr.height; + while (lines--) { +@@ -313,12 +319,21 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest) + if (count > 0x7f) { + /* literal run */ + count = 0x100 - count; ++ if ((glong) row - count < 0) { ++ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected."); ++ return FALSE; ++ } + row -= count; + + while (count--) + *dest++ = *data++; + + } else { ++ if ((glong) row - count < 0) { ++ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected."); ++ return FALSE; ++ } ++ + /* replicate run */ + row -= count; + x = *data++; +@@ -328,22 +343,28 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest) + } + } + } ++ ++ return TRUE; + } + +-static void ++static gboolean + flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest) + { + gulong count, packets, lines, start_line; + guchar *start_p, x; + +- g_return_if_fail (flxdec != NULL); +- g_return_if_fail (flxdec->delta_data != NULL); ++ g_return_val_if_fail (flxdec != NULL, FALSE); ++ g_return_val_if_fail (flxdec->delta_data != NULL, FALSE); + + /* use last frame for delta */ + memcpy (dest, flxdec->delta_data, flxdec->size); + + start_line = (data[0] + (data[1] << 8)); + lines = (data[2] + (data[3] << 8)); ++ if (start_line + lines > flxdec->hdr.height) { ++ GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. too many lines."); ++ return FALSE; ++ } + data += 4; + + /* start position of delta */ +@@ -356,7 +377,8 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest) + + while (packets--) { + /* skip count */ +- dest += *data++; ++ guchar skip = *data++; ++ dest += skip; + + /* RLE count */ + count = *data++; +@@ -364,12 +386,24 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest) + if (count > 0x7f) { + /* literal run */ + count = 0x100 - count; +- x = *data++; + ++ if (skip + count > flxdec->hdr.width) { ++ GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. " ++ "line too long."); ++ return FALSE; ++ } ++ ++ x = *data++; + while (count--) + *dest++ = x; + + } else { ++ if (skip + count > flxdec->hdr.width) { ++ GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. " ++ "line too long."); ++ return FALSE; ++ } ++ + /* replicate run */ + while (count--) + *dest++ = *data++; +@@ -378,21 +412,27 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest) + start_p += flxdec->hdr.width; + dest = start_p; + } ++ ++ return TRUE; + } + +-static void ++static gboolean + flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest) + { + gulong count, lines, start_l, opcode; + guchar *start_p; + +- g_return_if_fail (flxdec != NULL); +- g_return_if_fail (flxdec->delta_data != NULL); ++ g_return_val_if_fail (flxdec != NULL, FALSE); ++ g_return_val_if_fail (flxdec->delta_data != NULL, FALSE); + + /* use last frame for delta */ + memcpy (dest, flxdec->delta_data, flxdec->size); + + lines = (data[0] + (data[1] << 8)); ++ if (lines > flxdec->hdr.height) { ++ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. too many lines."); ++ return FALSE; ++ } + data += 2; + + start_p = dest; +@@ -405,9 +445,15 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest) + while ((opcode = (data[0] + (data[1] << 8))) & 0xc000) { + data += 2; + if ((opcode & 0xc000) == 0xc000) { +- /* skip count */ +- start_l += (0x10000 - opcode); +- dest += flxdec->hdr.width * (0x10000 - opcode); ++ /* line skip count */ ++ gulong skip = (0x10000 - opcode); ++ if (skip > flxdec->hdr.height) { ++ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. " ++ "skip line count too big."); ++ return FALSE; ++ } ++ start_l += skip; ++ dest += flxdec->hdr.width * skip; + } else { + /* last pixel */ + dest += flxdec->hdr.width; +@@ -419,7 +465,8 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest) + /* last opcode is the packet count */ + while (opcode--) { + /* skip count */ +- dest += *data++; ++ guchar skip = *data++; ++ dest += skip; + + /* RLE count */ + count = *data++; +@@ -427,12 +474,25 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest) + if (count > 0x7f) { + /* replicate word run */ + count = 0x100 - count; ++ ++ if (skip + count > flxdec->hdr.width) { ++ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. " ++ "line too long."); ++ return FALSE; ++ } ++ + while (count--) { + *dest++ = data[0]; + *dest++ = data[1]; + } + data += 2; + } else { ++ if (skip + count > flxdec->hdr.width) { ++ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. " ++ "line too long."); ++ return FALSE; ++ } ++ + /* literal word run */ + while (count--) { + *dest++ = *data++; +@@ -442,6 +502,8 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest) + } + lines--; + } ++ ++ return TRUE; + } + + static GstFlowReturn +@@ -571,9 +633,13 @@ gst_flxdec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) + out = gst_buffer_new_and_alloc (flxdec->size * 4); + + /* decode chunks */ +- flx_decode_chunks (flxdec, +- ((FlxFrameType *) chunk)->chunks, +- chunk + FlxFrameTypeSize, flxdec->frame_data); ++ if (!flx_decode_chunks (flxdec, ++ ((FlxFrameType *) chunk)->chunks, ++ chunk + FlxFrameTypeSize, flxdec->frame_data)) { ++ GST_ELEMENT_ERROR (flxdec, STREAM, DECODE, ++ ("%s", "Could not decode chunk"), NULL); ++ return GST_FLOW_ERROR; ++ } + + /* save copy of the current frame for possible delta. */ + memcpy (flxdec->delta_data, flxdec->frame_data, flxdec->size); +-- +2.10.2 + diff --git a/package/gstreamer1/gst1-plugins-good/0002-flxdec-fix-some-warnings-comparing-unsigned-0.patch b/package/gstreamer1/gst1-plugins-good/0002-flxdec-fix-some-warnings-comparing-unsigned-0.patch new file mode 100644 index 0000000000..bf10ba68d2 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-good/0002-flxdec-fix-some-warnings-comparing-unsigned-0.patch @@ -0,0 +1,50 @@ +From af7f70e60e364b551c2589dee5fb458a83fa0e7e Mon Sep 17 00:00:00 2001 +From: Matthew Waters +Date: Tue, 22 Nov 2016 23:46:00 +1100 +Subject: [PATCH] flxdec: fix some warnings comparing unsigned < 0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +bf43f44fcfada5ec4a3ce60cb374340486fe9fac was comparing an unsigned +expression to be < 0 which was always false. + +gstflxdec.c: In function ‘flx_decode_brun’: +gstflxdec.c:322:33: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] + if ((glong) row - count < 0) { + ^ +gstflxdec.c:332:33: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] + if ((glong) row - count < 0) { + ^ + +https://bugzilla.gnome.org/show_bug.cgi?id=774834 +Signed-off-by: Peter Korsgaard +--- + gst/flx/gstflxdec.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c +index d51a8e6..e675c99 100644 +--- a/gst/flx/gstflxdec.c ++++ b/gst/flx/gstflxdec.c +@@ -319,7 +319,7 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest) + if (count > 0x7f) { + /* literal run */ + count = 0x100 - count; +- if ((glong) row - count < 0) { ++ if ((glong) row - (glong) count < 0) { + GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected."); + return FALSE; + } +@@ -329,7 +329,7 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest) + *dest++ = *data++; + + } else { +- if ((glong) row - count < 0) { ++ if ((glong) row - (glong) count < 0) { + GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected."); + return FALSE; + } +-- +2.10.2 + diff --git a/package/gstreamer1/gst1-plugins-good/0003-flxdec-Don-t-unref-parent-in-the-chain-function.patch b/package/gstreamer1/gst1-plugins-good/0003-flxdec-Don-t-unref-parent-in-the-chain-function.patch new file mode 100644 index 0000000000..f14b1fe1cf --- /dev/null +++ b/package/gstreamer1/gst1-plugins-good/0003-flxdec-Don-t-unref-parent-in-the-chain-function.patch @@ -0,0 +1,29 @@ +From 1b574eddf789a59aff11ee0b6eb3fe1af288ff06 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +Date: Wed, 23 Nov 2016 11:20:49 +0200 +Subject: [PATCH] flxdec: Don't unref() parent in the chain function + +We don't own the reference here, it is owned by the caller and given to +us for the scope of this function. Leftover mistake from 0.10 porting. + +https://bugzilla.gnome.org/show_bug.cgi?id=774897 +Signed-off-by: Peter Korsgaard +--- + gst/flx/gstflxdec.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c +index e675c99..a237976 100644 +--- a/gst/flx/gstflxdec.c ++++ b/gst/flx/gstflxdec.c +@@ -677,7 +677,6 @@ wrong_type: + { + GST_ELEMENT_ERROR (flxdec, STREAM, WRONG_TYPE, (NULL), + ("not a flx file (type %x)", flxh->type)); +- gst_object_unref (flxdec); + return GST_FLOW_ERROR; + } + } +-- +2.10.2 + diff --git a/package/gstreamer1/gst1-plugins-good/0004-flxdec-rewrite-logic-based-on-GstByteReader-Writer.patch b/package/gstreamer1/gst1-plugins-good/0004-flxdec-rewrite-logic-based-on-GstByteReader-Writer.patch new file mode 100644 index 0000000000..43592605a6 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-good/0004-flxdec-rewrite-logic-based-on-GstByteReader-Writer.patch @@ -0,0 +1,1039 @@ +From 7c7a9f8df1b545eec1ef4461b742c3696d4d0e9e Mon Sep 17 00:00:00 2001 +From: Matthew Waters +Date: Wed, 23 Nov 2016 07:09:06 +1100 +Subject: [PATCH] flxdec: rewrite logic based on GstByteReader/Writer + +Solves overreading/writing the given arrays and will error out if the +streams asks to do that. + +Also does more error checking that the stream is valid and won't +overrun any allocated arrays. Also mitigate integer overflow errors +calculating allocation sizes. + +https://bugzilla.gnome.org/show_bug.cgi?id=774859 +Signed-off-by: Peter Korsgaard +--- + gst/flx/flx_color.c | 1 - + gst/flx/flx_fmt.h | 72 ------- + gst/flx/gstflxdec.c | 610 ++++++++++++++++++++++++++++++++++++---------------- + gst/flx/gstflxdec.h | 4 +- + 4 files changed, 427 insertions(+), 260 deletions(-) + +diff --git a/gst/flx/flx_color.c b/gst/flx/flx_color.c +index 047bfdf..3a58135 100644 +--- a/gst/flx/flx_color.c ++++ b/gst/flx/flx_color.c +@@ -101,7 +101,6 @@ flx_set_palette_vector (FlxColorSpaceConverter * flxpal, guint start, guint num, + } else { + memcpy (&flxpal->palvec[start * 3], newpal, grab * 3); + } +- + } + + void +diff --git a/gst/flx/flx_fmt.h b/gst/flx/flx_fmt.h +index 9ab31ba..abff200 100644 +--- a/gst/flx/flx_fmt.h ++++ b/gst/flx/flx_fmt.h +@@ -123,78 +123,6 @@ typedef struct _FlxFrameType + } FlxFrameType; + #define FlxFrameTypeSize 10 + +-#if G_BYTE_ORDER == G_BIG_ENDIAN +-#define LE_TO_BE_16(i16) ((guint16) (((i16) << 8) | ((i16) >> 8))) +-#define LE_TO_BE_32(i32) \ +- (((guint32) (LE_TO_BE_16((guint16) (i32))) << 16) | (LE_TO_BE_16((i32) >> 16))) +- +-#define FLX_FRAME_TYPE_FIX_ENDIANNESS(frm_type_p) \ +- do { \ +- (frm_type_p)->chunks = LE_TO_BE_16((frm_type_p)->chunks); \ +- (frm_type_p)->delay = LE_TO_BE_16((frm_type_p)->delay); \ +- } while(0) +- +-#define FLX_HUFFMAN_TABLE_FIX_ENDIANNESS(hffmn_table_p) \ +- do { \ +- (hffmn_table_p)->codelength = \ +- LE_TO_BE_16((hffmn_table_p)->codelength); \ +- (hffmn_table_p)->numcodes = LE_TO_BE_16((hffmn_table_p)->numcodes); \ +- } while(0) +- +-#define FLX_SEGMENT_TABLE_FIX_ENDIANNESS(sgmnt_table_p) \ +- ((sgmnt_table_p)->segments = LE_TO_BE_16((sgmnt_table_p)->segments)) +- +-#define FLX_PREFIX_CHUNK_FIX_ENDIANNESS(prfx_chnk_p) \ +- do { \ +- (prfx_chnk_p)->chunks = LE_TO_BE_16((prfx_chnk_p)->chunks); \ +- } while(0) +- +-#define FLX_FRAME_CHUNK_FIX_ENDIANNESS(frm_chnk_p) \ +- do { \ +- (frm_chnk_p)->size = LE_TO_BE_32((frm_chnk_p)->size); \ +- (frm_chnk_p)->id = LE_TO_BE_16((frm_chnk_p)->id); \ +- } while(0) +- +-#define FLX_HDR_FIX_ENDIANNESS(hdr_p) \ +- do { \ +- (hdr_p)->size = LE_TO_BE_32((hdr_p)->size); \ +- (hdr_p)->type = LE_TO_BE_16((hdr_p)->type); \ +- (hdr_p)->frames = LE_TO_BE_16((hdr_p)->frames); \ +- (hdr_p)->width = LE_TO_BE_16((hdr_p)->width); \ +- (hdr_p)->height = LE_TO_BE_16((hdr_p)->height); \ +- (hdr_p)->depth = LE_TO_BE_16((hdr_p)->depth); \ +- (hdr_p)->flags = LE_TO_BE_16((hdr_p)->flags); \ +- (hdr_p)->speed = LE_TO_BE_32((hdr_p)->speed); \ +- (hdr_p)->reserved1 = LE_TO_BE_16((hdr_p)->reserved1); \ +- (hdr_p)->created = LE_TO_BE_32((hdr_p)->created); \ +- (hdr_p)->creator = LE_TO_BE_32((hdr_p)->creator); \ +- (hdr_p)->updated = LE_TO_BE_32((hdr_p)->updated); \ +- (hdr_p)->updater = LE_TO_BE_32((hdr_p)->updater); \ +- (hdr_p)->aspect_dx = LE_TO_BE_16((hdr_p)->aspect_dx); \ +- (hdr_p)->aspect_dy = LE_TO_BE_16((hdr_p)->aspect_dy); \ +- (hdr_p)->ext_flags = LE_TO_BE_16((hdr_p)->ext_flags); \ +- (hdr_p)->keyframes = LE_TO_BE_16((hdr_p)->keyframes); \ +- (hdr_p)->totalframes = LE_TO_BE_16((hdr_p)->totalframes); \ +- (hdr_p)->req_memory = LE_TO_BE_32((hdr_p)->req_memory); \ +- (hdr_p)->max_regions = LE_TO_BE_16((hdr_p)->max_regions); \ +- (hdr_p)->transp_num = LE_TO_BE_16((hdr_p)->transp_num); \ +- (hdr_p)->oframe1 = LE_TO_BE_32((hdr_p)->oframe1); \ +- (hdr_p)->oframe2 = LE_TO_BE_32((hdr_p)->oframe2); \ +- } while(0) +-#else +- +-#define LE_TO_BE_16(i16) ((i16)) +-#define LE_TO_BE_32(i32) ((i32)) +- +-#define FLX_FRAME_TYPE_FIX_ENDIANNESS(frm_type_p) +-#define FLX_HUFFMAN_TABLE_FIX_ENDIANNESS(hffmn_table_p) +-#define FLX_SEGMENT_TABLE_FIX_ENDIANNESS(sgmnt_table_p) +-#define FLX_PREFIX_CHUNK_FIX_ENDIANNESS(prfx_chnk_p) +-#define FLX_FRAME_CHUNK_FIX_ENDIANNESS(frm_chnk_p) +-#define FLX_HDR_FIX_ENDIANNESS(hdr_p) +- +-#endif /* G_BYTE_ORDER == G_BIG_ENDIAN */ +- + G_END_DECLS + + #endif /* __GST_FLX_FMT_H__ */ +diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c +index a237976..aa1bed5 100644 +--- a/gst/flx/gstflxdec.c ++++ b/gst/flx/gstflxdec.c +@@ -1,5 +1,6 @@ + /* GStreamer + * Copyright (C) <1999> Erik Walthinsen ++ * Copyright (C) <2016> Matthew Waters + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public +@@ -24,6 +25,7 @@ + /* + * http://www.coolutils.com/Formats/FLI + * http://woodshole.er.usgs.gov/operations/modeling/flc.html ++ * http://www.compuphase.com/flic.htm + */ + + #ifdef HAVE_CONFIG_H +@@ -73,10 +75,14 @@ static GstStateChangeReturn gst_flxdec_change_state (GstElement * element, + static gboolean gst_flxdec_src_query_handler (GstPad * pad, GstObject * parent, + GstQuery * query); + +-static void flx_decode_color (GstFlxDec *, guchar *, guchar *, gint); +-static gboolean flx_decode_brun (GstFlxDec *, guchar *, guchar *); +-static gboolean flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *); +-static gboolean flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *); ++static gboolean flx_decode_color (GstFlxDec * flxdec, GstByteReader * reader, ++ GstByteWriter * writer, gint scale); ++static gboolean flx_decode_brun (GstFlxDec * flxdec, ++ GstByteReader * reader, GstByteWriter * writer); ++static gboolean flx_decode_delta_fli (GstFlxDec * flxdec, ++ GstByteReader * reader, GstByteWriter * writer); ++static gboolean flx_decode_delta_flc (GstFlxDec * flxdec, ++ GstByteReader * reader, GstByteWriter * writer); + + #define rndalign(off) ((off) + ((off) & 1)) + +@@ -204,57 +210,59 @@ gst_flxdec_sink_event_handler (GstPad * pad, GstObject * parent, + } + + static gboolean +-flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data, +- guchar * dest) ++flx_decode_chunks (GstFlxDec * flxdec, gulong n_chunks, GstByteReader * reader, ++ GstByteWriter * writer) + { +- FlxFrameChunk *hdr; + gboolean ret = TRUE; + +- g_return_val_if_fail (data != NULL, FALSE); +- +- while (count--) { +- hdr = (FlxFrameChunk *) data; +- FLX_FRAME_CHUNK_FIX_ENDIANNESS (hdr); +- data += FlxFrameChunkSize; ++ while (n_chunks--) { ++ GstByteReader chunk; ++ guint32 size; ++ guint16 type; ++ ++ if (!gst_byte_reader_get_uint32_le (reader, &size)) ++ goto parse_error; ++ if (!gst_byte_reader_get_uint16_le (reader, &type)) ++ goto parse_error; ++ GST_LOG_OBJECT (flxdec, "chunk has type 0x%02x size %d", type, size); ++ ++ if (!gst_byte_reader_get_sub_reader (reader, &chunk, ++ size - FlxFrameChunkSize)) { ++ GST_ERROR_OBJECT (flxdec, "Incorrect size in the chunk header"); ++ goto error; ++ } + +- switch (hdr->id) { ++ switch (type) { + case FLX_COLOR64: +- flx_decode_color (flxdec, data, dest, 2); +- data += rndalign (hdr->size) - FlxFrameChunkSize; ++ ret = flx_decode_color (flxdec, &chunk, writer, 2); + break; + + case FLX_COLOR256: +- flx_decode_color (flxdec, data, dest, 0); +- data += rndalign (hdr->size) - FlxFrameChunkSize; ++ ret = flx_decode_color (flxdec, &chunk, writer, 0); + break; + + case FLX_BRUN: +- ret = flx_decode_brun (flxdec, data, dest); +- data += rndalign (hdr->size) - FlxFrameChunkSize; ++ ret = flx_decode_brun (flxdec, &chunk, writer); + break; + + case FLX_LC: +- ret = flx_decode_delta_fli (flxdec, data, dest); +- data += rndalign (hdr->size) - FlxFrameChunkSize; ++ ret = flx_decode_delta_fli (flxdec, &chunk, writer); + break; + + case FLX_SS2: +- ret = flx_decode_delta_flc (flxdec, data, dest); +- data += rndalign (hdr->size) - FlxFrameChunkSize; ++ ret = flx_decode_delta_flc (flxdec, &chunk, writer); + break; + + case FLX_BLACK: +- memset (dest, 0, flxdec->size); ++ ret = gst_byte_writer_fill (writer, 0, flxdec->size); + break; + + case FLX_MINI: +- data += rndalign (hdr->size) - FlxFrameChunkSize; + break; + + default: +- GST_WARNING ("Unimplented chunk type: 0x%02x size: %d - skipping", +- hdr->id, hdr->size); +- data += rndalign (hdr->size) - FlxFrameChunkSize; ++ GST_WARNING ("Unimplemented chunk type: 0x%02x size: %d - skipping", ++ type, size); + break; + } + +@@ -263,43 +271,60 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data, + } + + return ret; ++ ++parse_error: ++ GST_ERROR_OBJECT (flxdec, "Failed to decode chunk"); ++error: ++ return FALSE; + } + + +-static void +-flx_decode_color (GstFlxDec * flxdec, guchar * data, guchar * dest, gint scale) ++static gboolean ++flx_decode_color (GstFlxDec * flxdec, GstByteReader * reader, ++ GstByteWriter * writer, gint scale) + { +- guint packs, count, indx; ++ guint8 count, indx; ++ guint16 packs; + +- g_return_if_fail (flxdec != NULL); +- +- packs = (data[0] + (data[1] << 8)); +- +- data += 2; ++ if (!gst_byte_reader_get_uint16_le (reader, &packs)) ++ goto error; + indx = 0; + +- GST_LOG ("GstFlxDec: cmap packs: %d", packs); ++ GST_LOG ("GstFlxDec: cmap packs: %d", (guint) packs); + while (packs--) { ++ const guint8 *data; ++ guint16 actual_count; ++ + /* color map index + skip count */ +- indx += *data++; ++ if (!gst_byte_reader_get_uint8 (reader, &indx)) ++ goto error; + + /* number of rgb triplets */ +- count = *data++ & 0xff; +- if (count == 0) +- count = 256; ++ if (!gst_byte_reader_get_uint8 (reader, &count)) ++ goto error; + +- GST_LOG ("GstFlxDec: cmap count: %d (indx: %d)", count, indx); +- flx_set_palette_vector (flxdec->converter, indx, count, data, scale); ++ actual_count = count == 0 ? 256 : count; + +- data += (count * 3); ++ if (!gst_byte_reader_get_data (reader, count * 3, &data)) ++ goto error; ++ ++ GST_LOG_OBJECT (flxdec, "cmap count: %d (indx: %d)", actual_count, indx); ++ flx_set_palette_vector (flxdec->converter, indx, actual_count, ++ (guchar *) data, scale); + } ++ ++ return TRUE; ++ ++error: ++ GST_ERROR_OBJECT (flxdec, "Error decoding color palette"); ++ return FALSE; + } + + static gboolean +-flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest) ++flx_decode_brun (GstFlxDec * flxdec, GstByteReader * reader, ++ GstByteWriter * writer) + { +- gulong count, lines, row; +- guchar x; ++ gulong lines, row; + + g_return_val_if_fail (flxdec != NULL, FALSE); + +@@ -310,82 +335,125 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest) + * contain more then 255 RLE packets. we use the frame + * width instead. + */ +- data++; ++ if (!gst_byte_reader_skip (reader, 1)) ++ goto error; + + row = flxdec->hdr.width; + while (row) { +- count = *data++; ++ gint8 count; ++ ++ if (!gst_byte_reader_get_int8 (reader, &count)) ++ goto error; ++ ++ if (count <= 0) { ++ const guint8 *data; + +- if (count > 0x7f) { + /* literal run */ +- count = 0x100 - count; +- if ((glong) row - (glong) count < 0) { +- GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected."); ++ count = ABS (count); ++ ++ GST_LOG_OBJECT (flxdec, "have literal run of size %d", count); ++ ++ if (count > row) { ++ GST_ERROR_OBJECT (flxdec, "Invalid BRUN line detected. " ++ "bytes to write exceeds the end of the row"); + return FALSE; + } + row -= count; + +- while (count--) +- *dest++ = *data++; +- ++ if (!gst_byte_reader_get_data (reader, count, &data)) ++ goto error; ++ if (!gst_byte_writer_put_data (writer, data, count)) ++ goto error; + } else { +- if ((glong) row - (glong) count < 0) { +- GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected."); ++ guint8 x; ++ ++ GST_LOG_OBJECT (flxdec, "have replicate run of size %d", count); ++ ++ if (count > row) { ++ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected." ++ "bytes to write exceeds the end of the row"); + return FALSE; + } + + /* replicate run */ + row -= count; +- x = *data++; + +- while (count--) +- *dest++ = x; ++ if (!gst_byte_reader_get_uint8 (reader, &x)) ++ goto error; ++ if (!gst_byte_writer_fill (writer, x, count)) ++ goto error; + } + } + } + + return TRUE; ++ ++error: ++ GST_ERROR_OBJECT (flxdec, "Failed to decode BRUN packet"); ++ return FALSE; + } + + static gboolean +-flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest) ++flx_decode_delta_fli (GstFlxDec * flxdec, GstByteReader * reader, ++ GstByteWriter * writer) + { +- gulong count, packets, lines, start_line; +- guchar *start_p, x; ++ guint16 start_line, lines; ++ guint line_start_i; + + g_return_val_if_fail (flxdec != NULL, FALSE); + g_return_val_if_fail (flxdec->delta_data != NULL, FALSE); + + /* use last frame for delta */ +- memcpy (dest, flxdec->delta_data, flxdec->size); ++ if (!gst_byte_writer_put_data (writer, flxdec->delta_data, flxdec->size)) ++ goto error; ++ ++ if (!gst_byte_reader_get_uint16_le (reader, &start_line)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &lines)) ++ goto error; ++ GST_LOG_OBJECT (flxdec, "height %d start line %d line count %d", ++ flxdec->hdr.height, start_line, lines); + +- start_line = (data[0] + (data[1] << 8)); +- lines = (data[2] + (data[3] << 8)); + if (start_line + lines > flxdec->hdr.height) { + GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. too many lines."); + return FALSE; + } +- data += 4; + +- /* start position of delta */ +- dest += (flxdec->hdr.width * start_line); +- start_p = dest; ++ line_start_i = flxdec->hdr.width * start_line; ++ if (!gst_byte_writer_set_pos (writer, line_start_i)) ++ goto error; + + while (lines--) { ++ guint8 packets; ++ + /* packet count */ +- packets = *data++; ++ if (!gst_byte_reader_get_uint8 (reader, &packets)) ++ goto error; ++ GST_LOG_OBJECT (flxdec, "have %d packets", packets); + + while (packets--) { + /* skip count */ +- guchar skip = *data++; +- dest += skip; ++ guint8 skip; ++ gint8 count; ++ if (!gst_byte_reader_get_uint8 (reader, &skip)) ++ goto error; ++ ++ /* skip bytes */ ++ if (!gst_byte_writer_set_pos (writer, ++ gst_byte_writer_get_pos (writer) + skip)) ++ goto error; + + /* RLE count */ +- count = *data++; ++ if (!gst_byte_reader_get_int8 (reader, &count)) ++ goto error; ++ ++ if (count < 0) { ++ guint8 x; + +- if (count > 0x7f) { + /* literal run */ +- count = 0x100 - count; ++ count = ABS (count); ++ GST_LOG_OBJECT (flxdec, "have literal run of size %d at offset %d", ++ count, skip); + + if (skip + count > flxdec->hdr.width) { + GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. " +@@ -393,11 +461,16 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest) + return FALSE; + } + +- x = *data++; +- while (count--) +- *dest++ = x; +- ++ if (!gst_byte_reader_get_uint8 (reader, &x)) ++ goto error; ++ if (!gst_byte_writer_fill (writer, x, count)) ++ goto error; + } else { ++ const guint8 *data; ++ ++ GST_LOG_OBJECT (flxdec, "have replicate run of size %d at offset %d", ++ count, skip); ++ + if (skip + count > flxdec->hdr.width) { + GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. " + "line too long."); +@@ -405,45 +478,60 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest) + } + + /* replicate run */ +- while (count--) +- *dest++ = *data++; ++ if (!gst_byte_reader_get_data (reader, count, &data)) ++ goto error; ++ if (!gst_byte_writer_put_data (writer, data, count)) ++ goto error; + } + } +- start_p += flxdec->hdr.width; +- dest = start_p; ++ line_start_i += flxdec->hdr.width; ++ if (!gst_byte_writer_set_pos (writer, line_start_i)) ++ goto error; + } + + return TRUE; ++ ++error: ++ GST_ERROR_OBJECT (flxdec, "Failed to decode FLI packet"); ++ return FALSE; + } + + static gboolean +-flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest) ++flx_decode_delta_flc (GstFlxDec * flxdec, GstByteReader * reader, ++ GstByteWriter * writer) + { +- gulong count, lines, start_l, opcode; +- guchar *start_p; ++ guint16 lines, start_l; + + g_return_val_if_fail (flxdec != NULL, FALSE); + g_return_val_if_fail (flxdec->delta_data != NULL, FALSE); + + /* use last frame for delta */ +- memcpy (dest, flxdec->delta_data, flxdec->size); ++ if (!gst_byte_writer_put_data (writer, flxdec->delta_data, flxdec->size)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &lines)) ++ goto error; + +- lines = (data[0] + (data[1] << 8)); + if (lines > flxdec->hdr.height) { + GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. too many lines."); + return FALSE; + } +- data += 2; + +- start_p = dest; + start_l = lines; + + while (lines) { +- dest = start_p + (flxdec->hdr.width * (start_l - lines)); ++ guint16 opcode; ++ ++ if (!gst_byte_writer_set_pos (writer, ++ flxdec->hdr.width * (start_l - lines))) ++ goto error; + + /* process opcode(s) */ +- while ((opcode = (data[0] + (data[1] << 8))) & 0xc000) { +- data += 2; ++ while (TRUE) { ++ if (!gst_byte_reader_get_uint16_le (reader, &opcode)) ++ goto error; ++ if ((opcode & 0xc000) == 0) ++ break; ++ + if ((opcode & 0xc000) == 0xc000) { + /* line skip count */ + gulong skip = (0x10000 - opcode); +@@ -453,27 +541,44 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest) + return FALSE; + } + start_l += skip; +- dest += flxdec->hdr.width * skip; ++ if (!gst_byte_writer_set_pos (writer, ++ gst_byte_writer_get_pos (writer) + flxdec->hdr.width * skip)) ++ goto error; + } else { + /* last pixel */ +- dest += flxdec->hdr.width; +- *dest++ = (opcode & 0xff); ++ if (!gst_byte_writer_set_pos (writer, ++ gst_byte_writer_get_pos (writer) + flxdec->hdr.width)) ++ goto error; ++ if (!gst_byte_writer_put_uint8 (writer, opcode & 0xff)) ++ goto error; + } + } +- data += 2; + + /* last opcode is the packet count */ ++ GST_LOG_OBJECT (flxdec, "have %d packets", opcode); + while (opcode--) { + /* skip count */ +- guchar skip = *data++; +- dest += skip; ++ guint8 skip; ++ gint8 count; ++ ++ if (!gst_byte_reader_get_uint8 (reader, &skip)) ++ goto error; ++ if (!gst_byte_writer_set_pos (writer, ++ gst_byte_writer_get_pos (writer) + skip)) ++ goto error; + + /* RLE count */ +- count = *data++; ++ if (!gst_byte_reader_get_int8 (reader, &count)) ++ goto error; ++ ++ if (count < 0) { ++ guint16 x; + +- if (count > 0x7f) { + /* replicate word run */ +- count = 0x100 - count; ++ count = ABS (count); ++ ++ GST_LOG_OBJECT (flxdec, "have replicate run of size %d at offset %d", ++ count, skip); + + if (skip + count > flxdec->hdr.width) { + GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. " +@@ -481,22 +586,31 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest) + return FALSE; + } + ++ if (!gst_byte_reader_get_uint16_le (reader, &x)) ++ goto error; ++ + while (count--) { +- *dest++ = data[0]; +- *dest++ = data[1]; ++ if (!gst_byte_writer_put_uint16_le (writer, x)) { ++ goto error; ++ } + } +- data += 2; + } else { ++ GST_LOG_OBJECT (flxdec, "have literal run of size %d at offset %d", ++ count, skip); ++ + if (skip + count > flxdec->hdr.width) { + GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. " + "line too long."); + return FALSE; + } + +- /* literal word run */ + while (count--) { +- *dest++ = *data++; +- *dest++ = *data++; ++ guint16 x; ++ ++ if (!gst_byte_reader_get_uint16_le (reader, &x)) ++ goto error; ++ if (!gst_byte_writer_put_uint16_le (writer, x)) ++ goto error; + } + } + } +@@ -504,13 +618,91 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest) + } + + return TRUE; ++ ++error: ++ GST_ERROR_OBJECT (flxdec, "Failed to decode FLI packet"); ++ return FALSE; ++} ++ ++static gboolean ++_read_flx_header (GstFlxDec * flxdec, GstByteReader * reader, FlxHeader * flxh) ++{ ++ memset (flxh, 0, sizeof (*flxh)); ++ ++ if (!gst_byte_reader_get_uint32_le (reader, &flxh->size)) ++ goto error; ++ if (flxh->size < FlxHeaderSize) { ++ GST_ERROR_OBJECT (flxdec, "Invalid file size in the header"); ++ return FALSE; ++ } ++ ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->type)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->frames)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->width)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->height)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->depth)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->flags)) ++ goto error; ++ if (!gst_byte_reader_get_uint32_le (reader, &flxh->speed)) ++ goto error; ++ if (!gst_byte_reader_skip (reader, 2)) /* reserved */ ++ goto error; ++ /* FLC */ ++ if (!gst_byte_reader_get_uint32_le (reader, &flxh->created)) ++ goto error; ++ if (!gst_byte_reader_get_uint32_le (reader, &flxh->creator)) ++ goto error; ++ if (!gst_byte_reader_get_uint32_le (reader, &flxh->updated)) ++ goto error; ++ if (!gst_byte_reader_get_uint32_le (reader, &flxh->updater)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->aspect_dx)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->aspect_dy)) ++ goto error; ++ /* EGI */ ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->ext_flags)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->keyframes)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->totalframes)) ++ goto error; ++ if (!gst_byte_reader_get_uint32_le (reader, &flxh->req_memory)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->max_regions)) ++ goto error; ++ if (!gst_byte_reader_get_uint16_le (reader, &flxh->transp_num)) ++ goto error; ++ if (!gst_byte_reader_skip (reader, 24)) /* reserved */ ++ goto error; ++ /* FLC */ ++ if (!gst_byte_reader_get_uint32_le (reader, &flxh->oframe1)) ++ goto error; ++ if (!gst_byte_reader_get_uint32_le (reader, &flxh->oframe2)) ++ goto error; ++ if (!gst_byte_reader_skip (reader, 40)) /* reserved */ ++ goto error; ++ ++ return TRUE; ++ ++error: ++ GST_ERROR_OBJECT (flxdec, "Error reading file header"); ++ return FALSE; + } + + static GstFlowReturn + gst_flxdec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) + { ++ GstByteReader reader; ++ GstBuffer *input; ++ GstMapInfo map_info; + GstCaps *caps; +- guint avail; ++ guint available; + GstFlowReturn res = GST_FLOW_OK; + + GstFlxDec *flxdec; +@@ -521,31 +713,50 @@ gst_flxdec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) + g_return_val_if_fail (flxdec != NULL, GST_FLOW_ERROR); + + gst_adapter_push (flxdec->adapter, buf); +- avail = gst_adapter_available (flxdec->adapter); ++ available = gst_adapter_available (flxdec->adapter); ++ input = gst_adapter_get_buffer (flxdec->adapter, available); ++ if (!gst_buffer_map (input, &map_info, GST_MAP_READ)) { ++ GST_ELEMENT_ERROR (flxdec, STREAM, DECODE, ++ ("%s", "Failed to map buffer"), (NULL)); ++ goto error; ++ } ++ gst_byte_reader_init (&reader, map_info.data, map_info.size); + + if (flxdec->state == GST_FLXDEC_READ_HEADER) { +- if (avail >= FlxHeaderSize) { +- const guint8 *data = gst_adapter_map (flxdec->adapter, FlxHeaderSize); ++ if (available >= FlxHeaderSize) { ++ GstByteReader header; + GstCaps *templ; + +- memcpy ((gchar *) & flxdec->hdr, data, FlxHeaderSize); +- FLX_HDR_FIX_ENDIANNESS (&(flxdec->hdr)); +- gst_adapter_unmap (flxdec->adapter); ++ if (!gst_byte_reader_get_sub_reader (&reader, &header, FlxHeaderSize)) { ++ GST_ELEMENT_ERROR (flxdec, STREAM, DECODE, ++ ("%s", "Could not read header"), (NULL)); ++ goto unmap_input_error; ++ } + gst_adapter_flush (flxdec->adapter, FlxHeaderSize); ++ available -= FlxHeaderSize; ++ ++ if (!_read_flx_header (flxdec, &header, &flxdec->hdr)) { ++ GST_ELEMENT_ERROR (flxdec, STREAM, DECODE, ++ ("%s", "Failed to parse header"), (NULL)); ++ goto unmap_input_error; ++ } + + flxh = &flxdec->hdr; + + /* check header */ + if (flxh->type != FLX_MAGICHDR_FLI && +- flxh->type != FLX_MAGICHDR_FLC && flxh->type != FLX_MAGICHDR_FLX) +- goto wrong_type; ++ flxh->type != FLX_MAGICHDR_FLC && flxh->type != FLX_MAGICHDR_FLX) { ++ GST_ELEMENT_ERROR (flxdec, STREAM, WRONG_TYPE, (NULL), ++ ("not a flx file (type %x)", flxh->type)); ++ goto unmap_input_error; ++ } + +- GST_LOG ("size : %d", flxh->size); +- GST_LOG ("frames : %d", flxh->frames); +- GST_LOG ("width : %d", flxh->width); +- GST_LOG ("height : %d", flxh->height); +- GST_LOG ("depth : %d", flxh->depth); +- GST_LOG ("speed : %d", flxh->speed); ++ GST_INFO_OBJECT (flxdec, "size : %d", flxh->size); ++ GST_INFO_OBJECT (flxdec, "frames : %d", flxh->frames); ++ GST_INFO_OBJECT (flxdec, "width : %d", flxh->width); ++ GST_INFO_OBJECT (flxdec, "height : %d", flxh->height); ++ GST_INFO_OBJECT (flxdec, "depth : %d", flxh->depth); ++ GST_INFO_OBJECT (flxdec, "speed : %d", flxh->speed); + + flxdec->next_time = 0; + +@@ -573,18 +784,32 @@ gst_flxdec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) + gst_pad_set_caps (flxdec->srcpad, caps); + gst_caps_unref (caps); + +- if (flxh->depth <= 8) +- flxdec->converter = +- flx_colorspace_converter_new (flxh->width, flxh->height); ++ /* zero means 8 */ ++ if (flxh->depth == 0) ++ flxh->depth = 8; ++ ++ if (flxh->depth != 8) { ++ GST_ELEMENT_ERROR (flxdec, STREAM, WRONG_TYPE, ++ ("%s", "Don't know how to decode non 8 bit depth streams"), (NULL)); ++ goto unmap_input_error; ++ } ++ ++ flxdec->converter = ++ flx_colorspace_converter_new (flxh->width, flxh->height); + + if (flxh->type == FLX_MAGICHDR_FLC || flxh->type == FLX_MAGICHDR_FLX) { +- GST_LOG ("(FLC) aspect_dx : %d", flxh->aspect_dx); +- GST_LOG ("(FLC) aspect_dy : %d", flxh->aspect_dy); +- GST_LOG ("(FLC) oframe1 : 0x%08x", flxh->oframe1); +- GST_LOG ("(FLC) oframe2 : 0x%08x", flxh->oframe2); ++ GST_INFO_OBJECT (flxdec, "(FLC) aspect_dx : %d", flxh->aspect_dx); ++ GST_INFO_OBJECT (flxdec, "(FLC) aspect_dy : %d", flxh->aspect_dy); ++ GST_INFO_OBJECT (flxdec, "(FLC) oframe1 : 0x%08x", flxh->oframe1); ++ GST_INFO_OBJECT (flxdec, "(FLC) oframe2 : 0x%08x", flxh->oframe2); + } + + flxdec->size = ((guint) flxh->width * (guint) flxh->height); ++ if (flxdec->size >= G_MAXSIZE / 4) { ++ GST_ELEMENT_ERROR (flxdec, STREAM, DECODE, ++ ("%s", "Cannot allocate required memory"), (NULL)); ++ goto unmap_input_error; ++ } + + /* create delta and output frame */ + flxdec->frame_data = g_malloc (flxdec->size); +@@ -596,55 +821,66 @@ gst_flxdec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) + GstBuffer *out; + + /* while we have enough data in the adapter */ +- while (avail >= FlxFrameChunkSize && res == GST_FLOW_OK) { +- FlxFrameChunk flxfh; +- guchar *chunk; +- const guint8 *data; +- GstMapInfo map; +- +- chunk = NULL; +- data = gst_adapter_map (flxdec->adapter, FlxFrameChunkSize); +- memcpy (&flxfh, data, FlxFrameChunkSize); +- FLX_FRAME_CHUNK_FIX_ENDIANNESS (&flxfh); +- gst_adapter_unmap (flxdec->adapter); +- +- switch (flxfh.id) { +- case FLX_FRAME_TYPE: +- /* check if we have the complete frame */ +- if (avail < flxfh.size) +- goto need_more_data; +- +- /* flush header */ +- gst_adapter_flush (flxdec->adapter, FlxFrameChunkSize); +- +- chunk = gst_adapter_take (flxdec->adapter, +- flxfh.size - FlxFrameChunkSize); +- FLX_FRAME_TYPE_FIX_ENDIANNESS ((FlxFrameType *) chunk); +- if (((FlxFrameType *) chunk)->chunks == 0) +- break; ++ while (available >= FlxFrameChunkSize && res == GST_FLOW_OK) { ++ guint32 size; ++ guint16 type; + +- /* create 32 bits output frame */ +-// res = gst_pad_alloc_buffer_and_set_caps (flxdec->srcpad, +-// GST_BUFFER_OFFSET_NONE, +-// flxdec->size * 4, GST_PAD_CAPS (flxdec->srcpad), &out); +-// if (res != GST_FLOW_OK) +-// break; ++ if (!gst_byte_reader_get_uint32_le (&reader, &size)) ++ goto parse_error; ++ if (available < size) ++ goto need_more_data; + +- out = gst_buffer_new_and_alloc (flxdec->size * 4); ++ available -= size; ++ gst_adapter_flush (flxdec->adapter, size); ++ ++ if (!gst_byte_reader_get_uint16_le (&reader, &type)) ++ goto parse_error; ++ ++ switch (type) { ++ case FLX_FRAME_TYPE:{ ++ GstByteReader chunks; ++ GstByteWriter writer; ++ guint16 n_chunks; ++ GstMapInfo map; ++ ++ GST_LOG_OBJECT (flxdec, "Have frame type 0x%02x of size %d", type, ++ size); ++ ++ if (!gst_byte_reader_get_sub_reader (&reader, &chunks, ++ size - FlxFrameChunkSize)) ++ goto parse_error; ++ ++ if (!gst_byte_reader_get_uint16_le (&chunks, &n_chunks)) ++ goto parse_error; ++ GST_LOG_OBJECT (flxdec, "Have %d chunks", n_chunks); ++ ++ if (n_chunks == 0) ++ break; ++ if (!gst_byte_reader_skip (&chunks, 8)) /* reserved */ ++ goto parse_error; ++ ++ gst_byte_writer_init_with_data (&writer, flxdec->frame_data, ++ flxdec->size, TRUE); + + /* decode chunks */ +- if (!flx_decode_chunks (flxdec, +- ((FlxFrameType *) chunk)->chunks, +- chunk + FlxFrameTypeSize, flxdec->frame_data)) { ++ if (!flx_decode_chunks (flxdec, n_chunks, &chunks, &writer)) { + GST_ELEMENT_ERROR (flxdec, STREAM, DECODE, + ("%s", "Could not decode chunk"), NULL); +- return GST_FLOW_ERROR; ++ goto unmap_input_error; + } ++ gst_byte_writer_reset (&writer); + + /* save copy of the current frame for possible delta. */ + memcpy (flxdec->delta_data, flxdec->frame_data, flxdec->size); + +- gst_buffer_map (out, &map, GST_MAP_WRITE); ++ out = gst_buffer_new_and_alloc (flxdec->size * 4); ++ if (!gst_buffer_map (out, &map, GST_MAP_WRITE)) { ++ GST_ELEMENT_ERROR (flxdec, STREAM, DECODE, ++ ("%s", "Could not map output buffer"), NULL); ++ gst_buffer_unref (out); ++ goto unmap_input_error; ++ } ++ + /* convert current frame. */ + flx_colorspace_convert (flxdec->converter, flxdec->frame_data, + map.data); +@@ -655,30 +891,32 @@ gst_flxdec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) + + res = gst_pad_push (flxdec->srcpad, out); + break; ++ } + default: +- /* check if we have the complete frame */ +- if (avail < flxfh.size) +- goto need_more_data; +- +- gst_adapter_flush (flxdec->adapter, flxfh.size); ++ GST_DEBUG_OBJECT (flxdec, "Unknown frame type 0x%02x, skipping %d", ++ type, size); ++ if (!gst_byte_reader_skip (&reader, size - FlxFrameChunkSize)) ++ goto parse_error; + break; + } +- +- g_free (chunk); +- +- avail = gst_adapter_available (flxdec->adapter); + } + } ++ ++ gst_buffer_unmap (input, &map_info); ++ gst_buffer_unref (input); ++ + need_more_data: + return res; + + /* ERRORS */ +-wrong_type: +- { +- GST_ELEMENT_ERROR (flxdec, STREAM, WRONG_TYPE, (NULL), +- ("not a flx file (type %x)", flxh->type)); +- return GST_FLOW_ERROR; +- } ++parse_error: ++ GST_ELEMENT_ERROR (flxdec, STREAM, DECODE, ++ ("%s", "Failed to parse stream"), (NULL)); ++unmap_input_error: ++ gst_buffer_unmap (input, &map_info); ++ gst_buffer_unref (input); ++error: ++ return GST_FLOW_ERROR; + } + + static GstStateChangeReturn +diff --git a/gst/flx/gstflxdec.h b/gst/flx/gstflxdec.h +index 3f9a0aa..4fd8dfd 100644 +--- a/gst/flx/gstflxdec.h ++++ b/gst/flx/gstflxdec.h +@@ -23,6 +23,8 @@ + #include + + #include ++#include ++#include + #include "flx_color.h" + + G_BEGIN_DECLS +@@ -45,7 +47,7 @@ struct _GstFlxDec { + + guint8 *delta_data, *frame_data; + GstAdapter *adapter; +- gulong size; ++ gsize size; + GstFlxDecState state; + gint64 frame_time; + gint64 next_time; +-- +2.10.2 + From e64ee501a0c8a8700c9a5f0e03e2f6979a0f810d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 28 Nov 2016 19:53:51 +0100 Subject: [PATCH 1569/3392] postgresql: fix pgac_cv_snprintf_long_long_int_modifier Supplementary change the pgac_cv_snprintf_long_long_int_modifier from complete format '%lld' to modifier 'll' version only (forgotten in commit 02c43157ab09f6fe4078fd1145fc9d403d66c089 ([1])). Fixes Bug 9451 ([2]). [1] https://git.buildroot.net/buildroot/commit/?id=02c43157ab09f6fe4078fd1145fc9d403d66c089 [2] https://bugs.busybox.net/show_bug.cgi?id=9451 Reported-by: Daniel Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index d46e8c0ec8..786ef4876a 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -13,7 +13,7 @@ POSTGRESQL_INSTALL_STAGING = YES POSTGRESQL_CONFIG_SCRIPTS = pg_config POSTGRESQL_CONF_ENV = \ ac_cv_type_struct_sockaddr_in6=yes \ - pgac_cv_snprintf_long_long_int_modifier="%lld" \ + pgac_cv_snprintf_long_long_int_modifier="ll" \ pgac_cv_snprintf_size_t_support=yes POSTGRESQL_CONF_OPTS = --disable-rpath From 114f5a9310744c2ce5dcc1d254d443d172b25a42 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 25 Nov 2016 19:00:16 +0100 Subject: [PATCH 1570/3392] autossh: honour LDFLAGS Fixes: http://autobuild.buildroot.net/results/08a458572a2e9c599dd32b837b1e5c02a6721973 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/autossh/0001-honour-LDFLAGS.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 package/autossh/0001-honour-LDFLAGS.patch diff --git a/package/autossh/0001-honour-LDFLAGS.patch b/package/autossh/0001-honour-LDFLAGS.patch new file mode 100644 index 0000000000..2e6160b8fd --- /dev/null +++ b/package/autossh/0001-honour-LDFLAGS.patch @@ -0,0 +1,16 @@ +Honour LDFLAGS, especially required when static linking + +Signed-off-by: Waldemar Brodkorb + +diff -Nur autossh-1.4e.orig/Makefile.in autossh-1.4e/Makefile.in +--- autossh-1.4e.orig/Makefile.in 2015-02-10 05:41:58.000000000 +0100 ++++ autossh-1.4e/Makefile.in 2016-11-25 12:49:06.052122855 +0100 +@@ -31,7 +31,7 @@ + + + $(TARGET): $(OFILES) +- $(CC) $(CPPFLAGS) -o $(TARGET) $(OFILES) $(LIBS) ++ $(CC) $(CPPFLAGS) $(LDFLAGS) -o $(TARGET) $(OFILES) $(LIBS) + + clean: + - /bin/rm -f *.o *.a *.core *~ From 008ab8d590e59b34bb5d0eebd48bd97e1a553dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Mon, 14 Nov 2016 14:22:36 +0100 Subject: [PATCH 1571/3392] ntp: fix missing optional dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ntpq and ntpdc may depends on libedit and libcap. $ arm-linux-readelf -d ./usr/bin/ntpdc | grep NEEDED 0x00000001 (NEEDED) Shared library: [libcap.so.2] 0x00000001 (NEEDED) Shared library: [libm.so.6] 0x00000001 (NEEDED) Shared library: [libedit.so.0] 0x00000001 (NEEDED) Shared library: [libncursesw.so.6] 0x00000001 (NEEDED) Shared library: [libssl.so.1.0.0] 0x00000001 (NEEDED) Shared library: [libcrypto.so.1.0.0] 0x00000001 (NEEDED) Shared library: [libpthread.so.0] 0x00000001 (NEEDED) Shared library: [libc.so.6] However, build order with these libraries is not defined. In order to keep things simple, we enforce build order even if ntpq/ntpdc are not selected. Signed-off-by: Jérôme Pouiller [Thomas: use --without-lineeditlibs.] Signed-off-by: Thomas Petazzoni --- package/ntp/ntp.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 0b6304b109..7f9e0d6785 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -28,6 +28,20 @@ else NTP_CONF_OPTS += --without-crypto --disable-openssl-random endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +NTP_CONF_OPTS += --enable-linuxcaps +NTP_DEPENDENCIES += libcap +else +NTP_CONF_OPTS += --disable-linuxcaps +endif + +ifeq ($(BR2_PACKAGE_LIBEDIT),y) +NTP_CONF_OPTS += --with-lineeditlibs=edit +NTP_DEPENDENCIES += libedit +else +NTP_CONF_OPTS += --without-lineeditlibs +endif + ifeq ($(BR2_PACKAGE_NTP_NTPSNMPD),y) NTP_CONF_OPTS += \ --with-net-snmp-config=$(STAGING_DIR)/usr/bin/net-snmp-config From e920e521ac012e5f40720290341d8abceb41a6a6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 28 Nov 2016 22:01:02 +0100 Subject: [PATCH 1572/3392] roseapplepi: add kernel patches to fix linux build issues with gcc 5 Backport 2 patches from upstream (from 3.18-rc1) for gcc 5.x support and a patch from Marco Franceschetti (https://github.com/vonfritz/kernel/) to fix gcc 5.x compat issues in the bsp wifi drivers. Signed-off-by: Peter Korsgaard --- .../0002-kernel-add-support-for-gcc-5.patch | 99 ++++++++++++++ ...inux-use-static-inline-in-ARM-ftrace.patch | 54 ++++++++ .../0004-Fix-compile-errors-with-gcc5.patch | 121 ++++++++++++++++++ 3 files changed, 274 insertions(+) create mode 100644 board/roseapplepi/patches/linux/0002-kernel-add-support-for-gcc-5.patch create mode 100644 board/roseapplepi/patches/linux/0003-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch create mode 100644 board/roseapplepi/patches/linux/0004-Fix-compile-errors-with-gcc5.patch diff --git a/board/roseapplepi/patches/linux/0002-kernel-add-support-for-gcc-5.patch b/board/roseapplepi/patches/linux/0002-kernel-add-support-for-gcc-5.patch new file mode 100644 index 0000000000..8d3c703e3a --- /dev/null +++ b/board/roseapplepi/patches/linux/0002-kernel-add-support-for-gcc-5.patch @@ -0,0 +1,99 @@ +From 96b4fb75d15be65edc5494579e4a944534042f99 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Oct 2014 15:51:05 -0700 +Subject: [PATCH] kernel: add support for gcc 5 + +We're missing include/linux/compiler-gcc5.h which is required now +because gcc branched off to v5 in trunk. + +Just copy the relevant bits out of include/linux/compiler-gcc4.h, +no new code is added as of now. + +This fixes a build error when using gcc 5. + +Signed-off-by: Sasha Levin +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +(cherry picked from commit 71458cfc782eafe4b27656e078d379a34e472adf) +Signed-off-by: Peter Korsgaard +--- + include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + create mode 100644 include/linux/compiler-gcc5.h + +diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h +new file mode 100644 +index 0000000..cdd1cc2 +--- /dev/null ++++ b/include/linux/compiler-gcc5.h +@@ -0,0 +1,66 @@ ++#ifndef __LINUX_COMPILER_H ++#error "Please don't include directly, include instead." ++#endif ++ ++#define __used __attribute__((__used__)) ++#define __must_check __attribute__((warn_unused_result)) ++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) ++ ++/* Mark functions as cold. gcc will assume any path leading to a call ++ to them will be unlikely. This means a lot of manual unlikely()s ++ are unnecessary now for any paths leading to the usual suspects ++ like BUG(), printk(), panic() etc. [but let's keep them for now for ++ older compilers] ++ ++ Early snapshots of gcc 4.3 don't support this and we can't detect this ++ in the preprocessor, but we can live with this because they're unreleased. ++ Maketime probing would be overkill here. ++ ++ gcc also has a __attribute__((__hot__)) to move hot functions into ++ a special section, but I don't see any sense in this right now in ++ the kernel context */ ++#define __cold __attribute__((__cold__)) ++ ++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) ++ ++#ifndef __CHECKER__ ++# define __compiletime_warning(message) __attribute__((warning(message))) ++# define __compiletime_error(message) __attribute__((error(message))) ++#endif /* __CHECKER__ */ ++ ++/* ++ * Mark a position in code as unreachable. This can be used to ++ * suppress control flow warnings after asm blocks that transfer ++ * control elsewhere. ++ * ++ * Early snapshots of gcc 4.5 don't support this and we can't detect ++ * this in the preprocessor, but we can live with this because they're ++ * unreleased. Really, we need to have autoconf for the kernel. ++ */ ++#define unreachable() __builtin_unreachable() ++ ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) ++ ++/* ++ * Tell the optimizer that something else uses this function or variable. ++ */ ++#define __visible __attribute__((externally_visible)) ++ ++/* ++ * GCC 'asm goto' miscompiles certain code sequences: ++ * ++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 ++ * ++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. ++ * Fixed in GCC 4.8.2 and later versions. ++ * ++ * (asm goto is automatically volatile - the naming reflects this.) ++ */ ++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) ++ ++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP ++#define __HAVE_BUILTIN_BSWAP32__ ++#define __HAVE_BUILTIN_BSWAP64__ ++#define __HAVE_BUILTIN_BSWAP16__ ++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ +-- +2.10.2 + diff --git a/board/roseapplepi/patches/linux/0003-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/board/roseapplepi/patches/linux/0003-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch new file mode 100644 index 0000000000..da38f26679 --- /dev/null +++ b/board/roseapplepi/patches/linux/0003-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch @@ -0,0 +1,54 @@ +From 8ac9a3f6dbf00d861134bea3f2c930defed6311a Mon Sep 17 00:00:00 2001 +From: Behan Webster +Date: Wed, 24 Sep 2014 01:06:46 +0100 +Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h + +With compilers which follow the C99 standard (like modern versions of gcc and +clang), "extern inline" does the wrong thing (emits code for an externally +linkable version of the inline function). In this case using static inline +and removing the NULL version of return_address in return_address.c does +the right thing. + +Signed-off-by: Behan Webster +Reviewed-by: Mark Charlebois +Acked-by: Steven Rostedt +Signed-off-by: Russell King +(cherry picked from commit aeea3592a13bf12861943e44fc48f1f270941f8d) +Signed-off-by: Peter Korsgaard +--- + arch/arm/include/asm/ftrace.h | 2 +- + arch/arm/kernel/return_address.c | 5 ----- + 2 files changed, 1 insertion(+), 6 deletions(-) + +diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h +index f89515a..2bb8cac 100644 +--- a/arch/arm/include/asm/ftrace.h ++++ b/arch/arm/include/asm/ftrace.h +@@ -45,7 +45,7 @@ void *return_address(unsigned int); + + #else + +-extern inline void *return_address(unsigned int level) ++static inline void *return_address(unsigned int level) + { + return NULL; + } +diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c +index 2f8f523..a3b587f 100755 +--- a/arch/arm/kernel/return_address.c ++++ b/arch/arm/kernel/return_address.c +@@ -63,11 +63,6 @@ void *return_address(unsigned int level) + //#warning "TODO: return_address should use unwind tables" + //#endif + +-void *return_address(unsigned int level) +-{ +- return NULL; +-} +- + #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ + + EXPORT_SYMBOL_GPL(return_address); +-- +2.10.2 + diff --git a/board/roseapplepi/patches/linux/0004-Fix-compile-errors-with-gcc5.patch b/board/roseapplepi/patches/linux/0004-Fix-compile-errors-with-gcc5.patch new file mode 100644 index 0000000000..d76e2851b5 --- /dev/null +++ b/board/roseapplepi/patches/linux/0004-Fix-compile-errors-with-gcc5.patch @@ -0,0 +1,121 @@ +From ef34609395c72a1e777ef9c3fb6ce60aa92976bb Mon Sep 17 00:00:00 2001 +From: Marco Franceschetti +Date: Sun, 13 Mar 2016 09:44:54 +0100 +Subject: [PATCH] Fix compile errors with gcc5 + +(cherry picked from commit e824d45043efd49607f66c89c921b07c1523bf9e) +Signed-off-by: Peter Korsgaard +--- + drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h | 6 +++--- + drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h | 6 +++--- + drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h | 6 +++--- + drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h | 6 +++--- + 4 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h +index fc293c4..0898cd4 100755 +--- a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h ++++ b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h +@@ -1314,18 +1314,18 @@ enum ieee80211_state { + (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ + (((Addr[5]) & 0xff) == 0xff)) + #else +-extern __inline int is_multicast_mac_addr(const u8 *addr) ++static __inline int is_multicast_mac_addr(const u8 *addr) + { + return ((addr[0] != 0xff) && (0x01 & addr[0])); + } + +-extern __inline int is_broadcast_mac_addr(const u8 *addr) ++static __inline int is_broadcast_mac_addr(const u8 *addr) + { + return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ + (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); + } + +-extern __inline int is_zero_mac_addr(const u8 *addr) ++static __inline int is_zero_mac_addr(const u8 *addr) + { + return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ + (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); +diff --git a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h +index 09475ef..56e0f5a 100755 +--- a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h ++++ b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h +@@ -1318,18 +1318,18 @@ enum ieee80211_state { + (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ + (((Addr[5]) & 0xff) == 0xff)) + #else +-extern __inline int is_multicast_mac_addr(const u8 *addr) ++static __inline int is_multicast_mac_addr(const u8 *addr) + { + return ((addr[0] != 0xff) && (0x01 & addr[0])); + } + +-extern __inline int is_broadcast_mac_addr(const u8 *addr) ++static __inline int is_broadcast_mac_addr(const u8 *addr) + { + return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ + (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); + } + +-extern __inline int is_zero_mac_addr(const u8 *addr) ++static __inline int is_zero_mac_addr(const u8 *addr) + { + return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ + (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); +diff --git a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h +index 5dfc421..95144b6 100755 +--- a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h ++++ b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h +@@ -1314,18 +1314,18 @@ enum ieee80211_state { + (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ + (((Addr[5]) & 0xff) == 0xff)) + #else +-extern __inline int is_multicast_mac_addr(const u8 *addr) ++static __inline int is_multicast_mac_addr(const u8 *addr) + { + return ((addr[0] != 0xff) && (0x01 & addr[0])); + } + +-extern __inline int is_broadcast_mac_addr(const u8 *addr) ++static __inline int is_broadcast_mac_addr(const u8 *addr) + { + return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ + (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); + } + +-extern __inline int is_zero_mac_addr(const u8 *addr) ++static __inline int is_zero_mac_addr(const u8 *addr) + { + return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ + (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); +diff --git a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h +index 09475ef..56e0f5a 100755 +--- a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h ++++ b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h +@@ -1318,18 +1318,18 @@ enum ieee80211_state { + (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ + (((Addr[5]) & 0xff) == 0xff)) + #else +-extern __inline int is_multicast_mac_addr(const u8 *addr) ++static __inline int is_multicast_mac_addr(const u8 *addr) + { + return ((addr[0] != 0xff) && (0x01 & addr[0])); + } + +-extern __inline int is_broadcast_mac_addr(const u8 *addr) ++static __inline int is_broadcast_mac_addr(const u8 *addr) + { + return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ + (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); + } + +-extern __inline int is_zero_mac_addr(const u8 *addr) ++static __inline int is_zero_mac_addr(const u8 *addr) + { + return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ + (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); +-- +2.10.2 + From ee99fe4088d0c75b3d2cfcd321d8af60b8fc959a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 28 Nov 2016 22:55:38 +0100 Subject: [PATCH 1573/3392] gst1-plugins-bad: add upstream patch to fix security issue in vmnc decoder As detailed by Chris Evans, the vmnc decoder contains an integer overflow which can be exploited: https://scarybeastsecurity.blogspot.be/2016/11/0day-poc-risky-design-decisions-in.html Fixes CVE-2016-9445 and CVE-2016-9446. Signed-off-by: Peter Korsgaard --- ...y-check-width-height-before-using-it.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/gstreamer1/gst1-plugins-bad/0001-vmncdec-Sanity-check-width-height-before-using-it.patch diff --git a/package/gstreamer1/gst1-plugins-bad/0001-vmncdec-Sanity-check-width-height-before-using-it.patch b/package/gstreamer1/gst1-plugins-bad/0001-vmncdec-Sanity-check-width-height-before-using-it.patch new file mode 100644 index 0000000000..ebc87bb9e9 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/0001-vmncdec-Sanity-check-width-height-before-using-it.patch @@ -0,0 +1,51 @@ +From 465091253bb3c3198d055b2e9f02d95237204663 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +Date: Wed, 16 Nov 2016 20:41:39 +0200 +Subject: [PATCH] vmncdec: Sanity-check width/height before using it + +We will allocate a screen area of width*height*bpp bytes, however this +calculation can easily overflow if too high width or height are given +inside the stream. Nonetheless we would just assume that enough memory +was allocated, try to fill it and overwrite as much memory as wanted. + +Also allocate the screen area filled with zeroes to ensure that we start +with full-black and not any random (or not so random) data. + +https://scarybeastsecurity.blogspot.gr/2016/11/0day-poc-risky-design-decisions-in.html + +Ideally we should just remove this plugin in favour of the one in +gst-libav, which generally seems to be of better code quality. + +https://bugzilla.gnome.org/show_bug.cgi?id=774533 +Signed-off-by: Peter Korsgaard +--- + gst/vmnc/vmncdec.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gst/vmnc/vmncdec.c b/gst/vmnc/vmncdec.c +index 5504302..a843136 100644 +--- a/gst/vmnc/vmncdec.c ++++ b/gst/vmnc/vmncdec.c +@@ -261,7 +261,7 @@ vmnc_handle_wmvi_rectangle (GstVMncDec * dec, struct RfbRectangle *rect, + gst_video_codec_state_unref (state); + + g_free (dec->imagedata); +- dec->imagedata = g_malloc (dec->format.width * dec->format.height * ++ dec->imagedata = g_malloc0 (dec->format.width * dec->format.height * + dec->format.bytes_per_pixel); + GST_DEBUG_OBJECT (dec, "Allocated image data at %p", dec->imagedata); + +@@ -791,6 +791,10 @@ vmnc_handle_packet (GstVMncDec * dec, const guint8 * data, int len, + GST_WARNING_OBJECT (dec, "Rectangle out of range, type %d", r.type); + return ERROR_INVALID; + } ++ } else if (r.width > 16384 || r.height > 16384) { ++ GST_WARNING_OBJECT (dec, "Width or height too high: %ux%u", r.width, ++ r.height); ++ return ERROR_INVALID; + } + + switch (r.type) { +-- +2.10.2 + From 93106e9e1fd2f722b92e3da9a0e6cc9a5a379cb2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 28 Nov 2016 23:47:40 +0100 Subject: [PATCH 1574/3392] Update for 2016.11-rc3 Signed-off-by: Peter Korsgaard --- CHANGES | 30 ++++++++++++++++++++++++++++++ Makefile | 2 +- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 22 ++++++++++++++++++++++ 4 files changed, 62 insertions(+), 10 deletions(-) diff --git a/CHANGES b/CHANGES index c4c063c2a2..ddbb01798b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,33 @@ +2016.11-rc3, Released November 28th, 2016 + + Fixes all over the tree, including a number of security fixes. + + The move from fakeroot to pseudo unfortunately brought a + number of issues. The SELinux issue described in #9386 which + triggered the move to pseudo has been investigated further and + a workaround implemented and the pseudo changes reverted. + + Linux kernel: update default to 4.8.11. + + Defconfigs: Updates/fixes for imx28ek, mx6udoo, imx6ulpico, + olimex a20 olinuxino lime malo, roseapplepi, synopsis aarch64 + vdk, axs101, axs103 and hs38 smd vdk. + + Updated/fixed packages: autossh, chrony, dosfstools, + dtv-scan-tables, e2fsprogs, gcc, gdb, gnuchess, gnuradio, + gpsd, gst1-plugins-bad, gst1-plugins-good, imagemagick, + kvm-unit-tests, libfribi, libuv, mesa3d, mpfr, mplayer, mpv, + ntp, ola, olsr, openblas, openjpeg, openssh, postgresql, + ptpd2python3, qemu, qextserialport, qt5base, quagga, xqwt, + taskd, tiff, tremor, trousers, udisks, uclibc, wireshark, + xapp_xload, xenomai, xmlstarlet + + Issues resolved (http://bugs.buildroot.org): + + #9386: ubinize fails with or without custom config + #9431: A misspelling + #9446: make raspberrypi3_defconfig compilation failure + 2016.11-rc2, Released November 13th, 2016 Fixes all over the tree. diff --git a/Makefile b/Makefile index 13239616a8..1ce5f5be5d 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2016.11-rc2 +export BR2_VERSION := 2016.11-rc3 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 41b12bfcad..51899ff65a 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

      buildroot-2016.08.1.tar.bz2

      -

      Latest release candidate: 2016.11-rc2

      +

      Latest release candidate: 2016.11-rc3

      - +
      - +
      -

      buildroot-2016.11-rc2.tar.gz

      -

      PGP signature

      +

      buildroot-2016.11-rc3.tar.gz

      +

      PGP signature

      - +
      - +
      -

      buildroot-2016.11-rc2.tar.bz2

      -

      PGP signature

      +

      buildroot-2016.11-rc3.tar.bz2

      +

      PGP signature

      diff --git a/docs/website/news.html b/docs/website/news.html index 2f4d4689bb..11fd18a308 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

      News

        +
      • +
        +
        +
        +

        2016.11-rc3 released

        +

        28 November 2016

        +
        +
        +

        Release candidate 3 is out with more cleanups and security + / build fixes. See + the CHANGES + file for details.

        +

        Head to the downloads page to + pick up + the 2016.11-rc3 + release candidate, and report any problems found to + the mailing list + or bug tracker.

        +
        +
        +
        • +
      • From 737c804f1ca870c9a126443d47b3ce5021b974f1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 29 Nov 2016 06:41:02 +0200 Subject: [PATCH 1575/3392] bzip2: update homepage link Avoid a redirect. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/bzip2/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bzip2/Config.in b/package/bzip2/Config.in index e8e03cf08e..dbc82496df 100644 --- a/package/bzip2/Config.in +++ b/package/bzip2/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_BZIP2 available techniques, while being around twice as fast at compression and six times faster at decompression. - http://sources.redhat.com/bzip2/ + http://www.bzip.org From 97f8aa4005be8456af52cacd5cfb4b077e55b5fa Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 29 Nov 2016 11:23:03 +0000 Subject: [PATCH 1576/3392] jasper: bump version to 1.900.31 (security) Fixed CVEs: - CVE-2016-9387 - CVE-2016-9388 - CVE-2016-9389 - CVE-2016-9390 - CVE-2016-9391 - CVE-2016-9392 - CVE-2016-9393 - CVE-2016-9394 - CVE-2016-9395 - CVE-2016-9396 - CVE-2016-9397 - CVE-2016-9398 - CVE-2016-9399 - CVE-2016-9557 - CVE-2016-9560 Changes to jasper.mk: - Switched site method to GitHub. 1.900.31 is not released as a tarball in the official website. - Autoreconf necessary since there isn't any configure script. We need to generate it. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/jasper/jasper.hash | 2 +- package/jasper/jasper.mk | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/jasper/jasper.hash b/package/jasper/jasper.hash index fdadbb283d..64ddfa4841 100644 --- a/package/jasper/jasper.hash +++ b/package/jasper/jasper.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6c942ae79108cd6a359e5bc34ea03565bd33ac20f6814cb09c4f92298b6b1cb8 jasper-1.900.22.tar.gz +sha256 0099084dce9fa0a318b48a5ed2a12ac7cff3324f3fd4459833e6fe2ff583fb2c jasper-version-1.900.31.tar.gz diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index bacb1a6cfe..e8b8aaa9b5 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -4,12 +4,16 @@ # ################################################################################ -JASPER_VERSION = 1.900.22 -JASPER_SITE = http://www.ece.uvic.ca/~frodo/jasper/software +JASPER_VERSION = version-1.900.31 +JASPER_SITE = $(call github,mdadams,jasper,$(JASPER_VERSION)) JASPER_INSTALL_STAGING = YES JASPER_DEPENDENCIES = jpeg JASPER_LICENSE = JasPer License Version 2.0 JASPER_LICENSE_FILES = LICENSE + +# No configure script included. We need to generate it. +JASPER_AUTORECONF = YES + JASPER_CONF_OPTS = --disable-strict # Xtensa gcc is unable to generate correct code with -O0 enabled by From 286c6b4e4d7dd79310d500cb276b6d6a1fea2f0d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 29 Nov 2016 22:51:38 +0100 Subject: [PATCH 1577/3392] CHANGES: fix s/malo/mali/ typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: François Perrad Signed-off-by: Peter Korsgaard --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ddbb01798b..880770923e 100644 --- a/CHANGES +++ b/CHANGES @@ -10,7 +10,7 @@ Linux kernel: update default to 4.8.11. Defconfigs: Updates/fixes for imx28ek, mx6udoo, imx6ulpico, - olimex a20 olinuxino lime malo, roseapplepi, synopsis aarch64 + olimex a20 olinuxino lime mali, roseapplepi, synopsis aarch64 vdk, axs101, axs103 and hs38 smd vdk. Updated/fixed packages: autossh, chrony, dosfstools, From bf116466d2deb6c9f8f661c08142b43b0f4667e4 Mon Sep 17 00:00:00 2001 From: Lucile Quirion Date: Tue, 29 Nov 2016 12:17:03 -0500 Subject: [PATCH 1578/3392] docs/manual: fix typo Also remove dangling reference to virtual package lists. Signed-off-by: Lucile Quirion Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-directory.txt | 3 --- docs/manual/customize-outside-br.txt | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index a74761cda8..5dba962bd4 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -384,9 +384,6 @@ openGL libraries. See xref:virtual-package-tutorial[] for more on the virtual packages. -See xref:virtual-package-list[] for the symbols to depend on if your package -depends on a feature provided by a virtual package. - === The +.mk+ file [[adding-packages-mk]] diff --git a/docs/manual/customize-outside-br.txt b/docs/manual/customize-outside-br.txt index 2ebb44724d..ea0e12033e 100644 --- a/docs/manual/customize-outside-br.txt +++ b/docs/manual/customize-outside-br.txt @@ -178,7 +178,7 @@ the br2-external tree. Buildroot will automatically show them in the output of +make list-defconfigs+ and allow them to be loaded with the normal +make _defconfig+ command. They will be visible in the 'make list-defconfigs' output, below an +External configs+ label that -contains the name of the br2-extermnal tree they are defined in. +contains the name of the br2-external tree they are defined in. .Note: If a defconfig file is present in more than one br2-external tree, then From b6e77c91e81a39e2910f320870441cdb16156974 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 29 Nov 2016 10:34:11 +0000 Subject: [PATCH 1579/3392] vala: bump version to 0.34.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index 95566d1317..b5abcc3b01 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,2 +1,2 @@ -# From https://download.gnome.org/sources/vala/0.34/vala-0.34.2.sha256sum -sha256 765e9c2b429a66db93247940f8588319b43f35c173d057bcae5717a97d765c41 vala-0.34.2.tar.xz +# From https://download.gnome.org/sources/vala/0.34/vala-0.34.3.sha256sum +sha256 f0fad71aca03cdeadf749ca47f56296a4ddd1a25f4e2f09f0ff9e1e3afbcac3f vala-0.34.3.tar.xz diff --git a/package/vala/vala.mk b/package/vala/vala.mk index a208bdc8cb..6eaa7c40f0 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ################################################################################ VALA_VERSION_MAJOR = 0.34 -VALA_VERSION = $(VALA_VERSION_MAJOR).2 +VALA_VERSION = $(VALA_VERSION_MAJOR).3 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPLv2.1+ From 8af8c9d15fc4b8861e14b118b14339d0bb62f03d Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 29 Nov 2016 11:29:19 +0000 Subject: [PATCH 1580/3392] sqlite: bump version to 3150200 (3.15.2) Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.hash | 4 ++-- package/sqlite/sqlite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index bb24f94efc..7839dc9036 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,4 +1,4 @@ # From http://www.sqlite.org/download.html -sha1 47404fe5c43936160ad0e90bddedc99367da7a9b sqlite-autoconf-3150100.tar.gz +sha1 31f52169bcfeef9efb61480d0950e928ad059552 sqlite-autoconf-3150200.tar.gz # Calculated based on the hash above -sha256 5dfa89b7697ee3c2ac7b44e8e157e7f204bf999c866afcaa8bb1c7ff656ae2c5 sqlite-autoconf-3150100.tar.gz +sha256 07b35063b9386865b78226cdaca9a299d938a87aaa8fdc4d73edb0cef30f3149 sqlite-autoconf-3150200.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 3f44f82b17..cb032498d0 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3150100 +SQLITE_VERSION = 3150200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2016 SQLITE_LICENSE = Public domain From cc12905292994ec6ba1cfe3c3d12994f203c050d Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 29 Nov 2016 11:41:05 +0000 Subject: [PATCH 1581/3392] btrfs-progs: bump version to 4.8.4 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 83a96246fb..6d262a162f 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 c1a60c317d2fcaf8420779d2d0717ae53882c2bc22bc44e3bdcd5efb7ca68ef2 btrfs-progs-v4.8.3.tar.xz +sha256 bf26ead666c337a62a74bc9ec7f8dd9ee200e60e5fe5289967d53328eff261c5 btrfs-progs-v4.8.4.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index e2deb57700..e780903dc3 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.8.3 +BTRFS_PROGS_VERSION = 4.8.4 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib From 7746a37856a9ac0138a5a4e94a829e0f08b3bbcc Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 29 Nov 2016 11:38:13 +0000 Subject: [PATCH 1582/3392] package/{mesa3d, mesa3d-headers}: bump version to 13.0.2 Signed-off-by: Vicente Olivert Riera 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 523d10b077..3cb0d27390 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 = 13.0.1 +MESA3D_HEADERS_VERSION = 13.0.2 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION) MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 0fab1de644..dfab5e2a70 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2016-November/000270.html -sha256 71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731 mesa-13.0.1.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2016-November/000274.html +sha256 a6ed622645f4ed61da418bf65adde5bcc4bb79023c36ba7d6b45b389da4416d5 mesa-13.0.2.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 031ce883c1..a0186587fd 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 = 13.0.1 +MESA3D_VERSION = 13.0.2 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos From a8ab83fada243a14bb0e0c3966b69900f264996b Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 09:45:05 +0000 Subject: [PATCH 1583/3392] git: bump version to 2.11.0 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 0815641c10..ee7615797e 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 94802903dd707d85ca3b9a2be35e936a54ce86375f52c6a789efe7ce7e238671 git-2.10.2.tar.xz +sha256 7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b git-2.11.0.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index a7768ac53b..7d4d363639 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.10.2 +GIT_VERSION = 2.11.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2 LGPLv2.1+ From 6fecb71847415677dcfe7001eb4bd6b1d43d117b Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 29 Nov 2016 12:24:03 +0000 Subject: [PATCH 1584/3392] readline: bump version to 7.0 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/readline/0001-patchlevel-1.patch | 47 ----------------- package/readline/0002-patchlevel-2.patch | 48 ----------------- package/readline/0003-patchlevel-3.patch | 51 ------------------ package/readline/0004-patchlevel-4.patch | 49 ----------------- package/readline/0005-patchlevel-5.patch | 62 ---------------------- package/readline/0006-patchlevel-6.patch | 67 ------------------------ package/readline/0007-patchlevel-7.patch | 51 ------------------ package/readline/0008-patchlevel-8.patch | 51 ------------------ package/readline/readline.hash | 2 +- package/readline/readline.mk | 2 +- 10 files changed, 2 insertions(+), 428 deletions(-) delete mode 100644 package/readline/0001-patchlevel-1.patch delete mode 100644 package/readline/0002-patchlevel-2.patch delete mode 100644 package/readline/0003-patchlevel-3.patch delete mode 100644 package/readline/0004-patchlevel-4.patch delete mode 100644 package/readline/0005-patchlevel-5.patch delete mode 100644 package/readline/0006-patchlevel-6.patch delete mode 100644 package/readline/0007-patchlevel-7.patch delete mode 100644 package/readline/0008-patchlevel-8.patch diff --git a/package/readline/0001-patchlevel-1.patch b/package/readline/0001-patchlevel-1.patch deleted file mode 100644 index 8593073b9b..0000000000 --- a/package/readline/0001-patchlevel-1.patch +++ /dev/null @@ -1,47 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-001 - -Signed-off-by: Gustavo Zacarias - - READLINE PATCH REPORT - ===================== - -Readline-Release: 6.3 -Patch-ID: readline63-001 - -Bug-Reported-by: Daan van Rossum -Bug-Reference-ID: <20140307072523.GA14250@flash.uchicago.edu> -Bug-Reference-URL: - -Bug-Description: - -The `.' command in vi mode cannot undo multi-key commands beginning with -`c', `d', and `y' (command plus motion specifier). - -Patch (apply with `patch -p0'): - -*** a/readline-6.3/readline.c 2013-10-28 14:58:06.000000000 -0400 ---- b/readline.c 2014-03-07 15:20:33.000000000 -0500 -*************** -*** 965,969 **** - if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && - key != ANYOTHERKEY && -! rl_key_sequence_length == 1 && /* XXX */ - _rl_vi_textmod_command (key)) - _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); ---- 965,969 ---- - if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && - key != ANYOTHERKEY && -! _rl_dispatching_keymap == vi_movement_keymap && - _rl_vi_textmod_command (key)) - _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); -*** a/readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 ---- b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -*************** -*** 1,3 **** - # Do not edit -- exists only for use by patch - -! 5 ---- 1,3 ---- - # Do not edit -- exists only for use by patch - -! 1 diff --git a/package/readline/0002-patchlevel-2.patch b/package/readline/0002-patchlevel-2.patch deleted file mode 100644 index a8a94e0810..0000000000 --- a/package/readline/0002-patchlevel-2.patch +++ /dev/null @@ -1,48 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-002 - -Signed-off-by: Gustavo Zacarias - - READLINE PATCH REPORT - ===================== - -Readline-Release: 6.3 -Patch-ID: readline63-002 - -Bug-Reported-by: Anatol Pomozov -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html - -Bug-Description: - -When in callback mode, some readline commands can cause readline to seg -fault by passing invalid contexts to callback functions. - -Patch (apply with `patch -p0'): - -*** a/readline-6.3/readline.c 2013-10-28 14:58:06.000000000 -0400 ---- b/readline.c 2014-03-10 14:15:02.000000000 -0400 -*************** -*** 745,749 **** - - RL_CHECK_SIGNALS (); -! if (r == 0) /* success! */ - { - _rl_keyseq_chain_dispose (); ---- 745,750 ---- - - RL_CHECK_SIGNALS (); -! /* We only treat values < 0 specially to simulate recursion. */ -! if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */ - { - _rl_keyseq_chain_dispose (); -*** a/readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 ---- b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -*************** -*** 1,3 **** - # Do not edit -- exists only for use by patch - -! 1 ---- 1,3 ---- - # Do not edit -- exists only for use by patch - -! 2 diff --git a/package/readline/0003-patchlevel-3.patch b/package/readline/0003-patchlevel-3.patch deleted file mode 100644 index 195ed554e9..0000000000 --- a/package/readline/0003-patchlevel-3.patch +++ /dev/null @@ -1,51 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-003 - -Signed-off-by: Gustavo Zacarias - - READLINE PATCH REPORT - ===================== - -Readline-Release: 6.3 -Patch-ID: readline63-003 - -Bug-Reported-by: -Bug-Reference-ID: -Bug-Reference-URL: - -Bug-Description: - -There are debugging functions in the readline release that are theoretically -exploitable as security problems. They are not public functions, but have -global linkage. - -Patch (apply with `patch -p0'): - -*** a/readline-6.3/util.c 2013-09-02 13:36:12.000000000 -0400 ---- b/util.c 2014-03-20 10:25:53.000000000 -0400 -*************** -*** 477,480 **** ---- 479,483 ---- - } - -+ #if defined (DEBUG) - #if defined (USE_VARARGS) - static FILE *_rl_tracefp; -*************** -*** 539,542 **** ---- 542,546 ---- - } - #endif -+ #endif /* DEBUG */ - - -*** a/readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 ---- b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -*************** -*** 1,3 **** - # Do not edit -- exists only for use by patch - -! 2 ---- 1,3 ---- - # Do not edit -- exists only for use by patch - -! 3 diff --git a/package/readline/0004-patchlevel-4.patch b/package/readline/0004-patchlevel-4.patch deleted file mode 100644 index 86ab3d5079..0000000000 --- a/package/readline/0004-patchlevel-4.patch +++ /dev/null @@ -1,49 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-004 - -Signed-off-by: Gustavo Zacarias - - READLINE PATCH REPORT - ===================== - -Readline-Release: 6.3 -Patch-ID: readline63-004 - -Bug-Reported-by: Egmont Koblinger -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html - -Bug-Description: - -The signal handling changes to bash and readline (to avoid running any code -in a signal handler context) cause the cursor to be placed on the wrong -line of a multi-line command after a ^C interrupts editing. - -Patch (apply with `patch -p0'): - -*** a/readline-6.3-patched/display.c 2013-12-27 13:10:56.000000000 -0500 ---- b/display.c 2014-03-27 11:52:45.000000000 -0400 -*************** -*** 2678,2682 **** - if (_rl_echoing_p) - { -! _rl_move_vert (_rl_vis_botlin); - _rl_vis_botlin = 0; - fflush (rl_outstream); ---- 2678,2683 ---- - if (_rl_echoing_p) - { -! if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */ -! _rl_move_vert (_rl_vis_botlin); - _rl_vis_botlin = 0; - fflush (rl_outstream); -*** a/readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 ---- b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -*************** -*** 1,3 **** - # Do not edit -- exists only for use by patch - -! 3 ---- 1,3 ---- - # Do not edit -- exists only for use by patch - -! 4 diff --git a/package/readline/0005-patchlevel-5.patch b/package/readline/0005-patchlevel-5.patch deleted file mode 100644 index 6e73c7f263..0000000000 --- a/package/readline/0005-patchlevel-5.patch +++ /dev/null @@ -1,62 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-005 - -Signed-off-by: Gustavo Zacarias - - READLINE PATCH REPORT - ===================== - -Readline-Release: 6.3 -Patch-ID: readline63-005 - -Bug-Reported-by: Juergen Daubert -Bug-Reference-ID: <20140303180430.GA7346@jue.netz> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00002.html - -Bug-Description: - -There are still applications using the deprecated Function/VFunction/etc. -typedefs in rltypedefs.h. This patch restores the typedefs, but attempts -to mark them as deprecated using gcc/clang attributes. Thanks to Max Horn -for the suggestion. - -Patch (apply with `patch -p0'): - -*** a/readline-6.3-patched/rltypedefs.h 2011-03-26 14:53:31.000000000 -0400 ---- b/rltypedefs.h 2014-04-10 11:30:45.000000000 -0400 -*************** -*** 27,30 **** ---- 27,49 ---- - #endif - -+ /* Old-style, attempt to mark as deprecated in some way people will notice. */ -+ -+ #if !defined (_FUNCTION_DEF) -+ # define _FUNCTION_DEF -+ -+ #if defined(__GNUC__) || defined(__clang__) -+ typedef int Function () __attribute__ ((deprecated)); -+ typedef void VFunction () __attribute__ ((deprecated)); -+ typedef char *CPFunction () __attribute__ ((deprecated)); -+ typedef char **CPPFunction () __attribute__ ((deprecated)); -+ #else -+ typedef int Function (); -+ typedef void VFunction (); -+ typedef char *CPFunction (); -+ typedef char **CPPFunction (); -+ #endif -+ -+ #endif /* _FUNCTION_DEF */ -+ - /* New style. */ - -*** a/readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 ---- b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -*************** -*** 1,3 **** - # Do not edit -- exists only for use by patch - -! 4 ---- 1,3 ---- - # Do not edit -- exists only for use by patch - -! 5 diff --git a/package/readline/0006-patchlevel-6.patch b/package/readline/0006-patchlevel-6.patch deleted file mode 100644 index b28b53c7ab..0000000000 --- a/package/readline/0006-patchlevel-6.patch +++ /dev/null @@ -1,67 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-006 - -Signed-off-by: Gustavo Zacarias - - READLINE PATCH REPORT - ===================== - -Readline-Release: 6.3 -Patch-ID: readline63-006 - -Bug-Reported-by: -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00069.html - -Bug-Description: - -Using reverse-i-search when horizontal scrolling is enabled does not redisplay -the entire line containing the successful search results. - -Patch (apply with `patch -p0'): - -*** a/readline-6.3-patched/display.c 2014-04-08 18:19:36.000000000 -0400 ---- b/display.c 2014-04-20 18:32:52.000000000 -0400 -*************** -*** 1638,1642 **** - the spot of first difference is before the end of the invisible chars, - lendiff needs to be adjusted. */ -! if (current_line == 0 && !_rl_horizontal_scroll_mode && - current_invis_chars != visible_wrap_offset) - { ---- 1638,1642 ---- - the spot of first difference is before the end of the invisible chars, - lendiff needs to be adjusted. */ -! if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */ - current_invis_chars != visible_wrap_offset) - { -*************** -*** 1826,1831 **** - _rl_last_c_pos += bytes_to_insert; - - if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new))) -! goto clear_rest_of_line; - } - } ---- 1826,1836 ---- - _rl_last_c_pos += bytes_to_insert; - -+ /* XXX - we only want to do this if we are at the end of the line -+ so we move there with _rl_move_cursor_relative */ - if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new))) -! { -! _rl_move_cursor_relative (ne-new, new); -! goto clear_rest_of_line; -! } - } - } -*** a/readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 ---- b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -*************** -*** 1,3 **** - # Do not edit -- exists only for use by patch - -! 5 ---- 1,3 ---- - # Do not edit -- exists only for use by patch - -! 6 diff --git a/package/readline/0007-patchlevel-7.patch b/package/readline/0007-patchlevel-7.patch deleted file mode 100644 index 4c6f59cd24..0000000000 --- a/package/readline/0007-patchlevel-7.patch +++ /dev/null @@ -1,51 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-007 - -Signed-off-by: Gustavo Zacarias - - READLINE PATCH REPORT - ===================== - -Readline-Release: 6.3 -Patch-ID: readline63-007 - -Bug-Reported-by: John Lenton -Bug-Reference-ID: -Bug-Reference-URL: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1317476 - -Bug-Description: - -Readline should allow SIGALRM and SIGVTALRM (if available) to `interrupt' -rl_getc and cause the handler to run when not in a signal handling context. - -Patch (apply with `patch -p0'): - -*** a/readline-6.3-patched/input.c 2014-01-10 15:07:08.000000000 -0500 ---- b/input.c 2014-05-30 16:20:56.000000000 -0400 -*************** -*** 535,540 **** ---- 538,551 ---- - else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM) - return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); -+ /* keyboard-generated signals of interest */ - else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT) - RL_CHECK_SIGNALS (); -+ /* non-keyboard-generated signals of interest */ -+ else if (_rl_caught_signal == SIGALRM -+ #if defined (SIGVTALRM) -+ || _rl_caught_signal == SIGVTALRM -+ #endif -+ ) -+ RL_CHECK_SIGNALS (); - - if (rl_signal_event_hook) -*** a/readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 ---- b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -*************** -*** 1,3 **** - # Do not edit -- exists only for use by patch - -! 6 ---- 1,3 ---- - # Do not edit -- exists only for use by patch - -! 7 diff --git a/package/readline/0008-patchlevel-8.patch b/package/readline/0008-patchlevel-8.patch deleted file mode 100644 index 412ba352d6..0000000000 --- a/package/readline/0008-patchlevel-8.patch +++ /dev/null @@ -1,51 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-008 - -Signed-off-by: Gustavo Zacarias - - READLINE PATCH REPORT - ===================== - -Readline-Release: 6.3 -Patch-ID: readline63-008 - -Bug-Reported-by: Jared Yanovich -Bug-Reference-ID: <20140625225019.GJ17044@nightderanger.psc.edu> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html - -Bug-Description: - -When the readline `revert-all-at-newline' option is set, pressing newline -when the current line is one retrieved from history results in a double free -and a segmentation fault. - -Patch (apply with `patch -p0'): - -*** a/readline-6.3-patched/misc.c 2012-09-01 18:03:11.000000000 -0400 ---- b/misc.c 2014-06-30 13:41:19.000000000 -0400 -*************** -*** 462,465 **** ---- 462,466 ---- - /* Set up rl_line_buffer and other variables from history entry */ - rl_replace_from_history (entry, 0); /* entry->line is now current */ -+ entry->data = 0; /* entry->data is now current undo list */ - /* Undo all changes to this history entry */ - while (rl_undo_list) -*************** -*** 469,473 **** - FREE (entry->line); - entry->line = savestring (rl_line_buffer); -- entry->data = 0; - } - entry = previous_history (); ---- 470,473 ---- -*** a/readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 ---- b/patchlevel 2014-03-21 08:28:40.000000000 -0400 -*************** -*** 1,3 **** - # Do not edit -- exists only for use by patch - -! 7 ---- 1,3 ---- - # Do not edit -- exists only for use by patch - -! 8 diff --git a/package/readline/readline.hash b/package/readline/readline.hash index d8833e9192..43f8c64bb2 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 readline-6.3.tar.gz +sha256 750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 readline-7.0.tar.gz diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 763197085e..ed4e1442ee 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 6.3 +READLINE_VERSION = 7.0 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses From cde22e1fd340492f6f017c9f9a2d749391961887 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 29 Nov 2016 12:24:04 +0000 Subject: [PATCH 1585/3392] bash: bump version to 4.4 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/bash/0031-patchlevel-31.patch | 116 ------------- package/bash/0032-patchlevel-32.patch | 55 ------- package/bash/0033-patchlevel-33.patch | 229 -------------------------- package/bash/0034-patchlevel-34.patch | 94 ----------- package/bash/0035-patchlevel-35.patch | 67 -------- package/bash/0036-patchlevel-36.patch | 61 ------- package/bash/0037-patchlevel-37.patch | 47 ------ package/bash/0038-patchlevel-38.patch | 92 ----------- package/bash/0039-patchlevel-39.patch | 61 ------- package/bash/0040-patchlevel-40.patch | 51 ------ package/bash/0041-patchlevel-41.patch | 76 --------- package/bash/0042-patchlevel-42.patch | 59 ------- package/bash/0043-patchlevel-43.patch | 63 ------- package/bash/0044-patchlevel-44.patch | 52 ------ package/bash/0045-patchlevel-45.patch | 56 ------- package/bash/0046-patchlevel-46.patch | 59 ------- package/bash/bash.hash | 2 +- package/bash/bash.mk | 2 +- 18 files changed, 2 insertions(+), 1240 deletions(-) delete mode 100644 package/bash/0031-patchlevel-31.patch delete mode 100644 package/bash/0032-patchlevel-32.patch delete mode 100644 package/bash/0033-patchlevel-33.patch delete mode 100644 package/bash/0034-patchlevel-34.patch delete mode 100644 package/bash/0035-patchlevel-35.patch delete mode 100644 package/bash/0036-patchlevel-36.patch delete mode 100644 package/bash/0037-patchlevel-37.patch delete mode 100644 package/bash/0038-patchlevel-38.patch delete mode 100644 package/bash/0039-patchlevel-39.patch delete mode 100644 package/bash/0040-patchlevel-40.patch delete mode 100644 package/bash/0041-patchlevel-41.patch delete mode 100644 package/bash/0042-patchlevel-42.patch delete mode 100644 package/bash/0043-patchlevel-43.patch delete mode 100644 package/bash/0044-patchlevel-44.patch delete mode 100644 package/bash/0045-patchlevel-45.patch delete mode 100644 package/bash/0046-patchlevel-46.patch diff --git a/package/bash/0031-patchlevel-31.patch b/package/bash/0031-patchlevel-31.patch deleted file mode 100644 index d285a1f882..0000000000 --- a/package/bash/0031-patchlevel-31.patch +++ /dev/null @@ -1,116 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-031 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-031 - -Bug-Reported-by: lolilolicon -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00139.html - -Bug-Description: - -The new nameref assignment functionality introduced in bash-4.3 did not perform -enough validation on the variable value and would create variables with -invalid names. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3-patched/subst.h 2014-01-11 21:02:27.000000000 -0500 ---- b/subst.h 2014-09-01 12:16:56.000000000 -0400 -*************** -*** 48,51 **** ---- 48,52 ---- - #define ASS_MKGLOBAL 0x0008 /* force global assignment */ - #define ASS_NAMEREF 0x0010 /* assigning to nameref variable */ -+ #define ASS_FROMREF 0x0020 /* assigning from value of nameref variable */ - - /* Flags for the string extraction functions. */ -*** a/bash-4.3-patched/variables.c 2014-05-15 08:26:50.000000000 -0400 ---- b/variables.c 2014-09-01 14:37:44.000000000 -0400 -*************** -*** 2504,2511 **** - int hflags, aflags; - { -! char *newval; - SHELL_VAR *entry; - - entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name, table); - /* Follow the nameref chain here if this is the global variables table */ - if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table == global_variables->table) ---- 2566,2590 ---- - int hflags, aflags; - { -! char *newname, *newval; - SHELL_VAR *entry; -+ #if defined (ARRAY_VARS) -+ arrayind_t ind; -+ char *subp; -+ int sublen; -+ #endif - -+ newname = 0; -+ #if defined (ARRAY_VARS) -+ if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference (name)) -+ { -+ newname = array_variable_name (name, &subp, &sublen); -+ if (newname == 0) -+ return (SHELL_VAR *)NULL; /* XXX */ -+ entry = hash_lookup (newname, table); -+ } -+ else -+ #endif - entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name, table); -+ - /* Follow the nameref chain here if this is the global variables table */ - if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table == global_variables->table) -*************** -*** 2538,2541 **** ---- 2617,2630 ---- - } - } -+ #if defined (ARRAY_VARS) -+ else if (entry == 0 && newname) -+ { -+ entry = make_new_array_variable (newname); /* indexed array by default */ -+ if (entry == 0) -+ return entry; -+ ind = array_expand_index (name, subp, sublen); -+ bind_array_element (entry, ind, value, aflags); -+ } -+ #endif - else if (entry == 0) - { -*************** -*** 2658,2662 **** - if (nameref_cell (nv) == 0) - return (bind_variable_internal (nv->name, value, nvc->table, 0, flags)); -! return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags)); - } - else ---- 2747,2752 ---- - if (nameref_cell (nv) == 0) - return (bind_variable_internal (nv->name, value, nvc->table, 0, flags)); -! /* XXX - bug here with ref=array[index] */ -! return (bind_variable_internal (nameref_cell (nv), value, nvc->table, 0, flags|ASS_FROMREF)); - } - else -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 30 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 31 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0032-patchlevel-32.patch b/package/bash/0032-patchlevel-32.patch deleted file mode 100644 index 6cdc0f1e81..0000000000 --- a/package/bash/0032-patchlevel-32.patch +++ /dev/null @@ -1,55 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-032 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-032 - -Bug-Reported-by: crispusfairbairn@gmail.com -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00013.html - -Bug-Description: - -When bash is running in Posix mode, it allows signals -- including SIGCHLD -- -to interrupt the `wait' builtin, as Posix requires. However, the interrupt -causes bash to not run a SIGCHLD trap for all exited children. This patch -fixes the issue and restores the documented behavior in Posix mode. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3-patched/jobs.c 2014-05-14 09:20:15.000000000 -0400 ---- b/jobs.c 2014-09-09 11:50:38.000000000 -0400 -*************** -*** 3340,3344 **** - { - interrupt_immediately = 0; -! trap_handler (SIGCHLD); /* set pending_traps[SIGCHLD] */ - wait_signal_received = SIGCHLD; - /* If we're in a signal handler, let CHECK_WAIT_INTR pick it up; ---- 3346,3352 ---- - { - interrupt_immediately = 0; -! /* This was trap_handler (SIGCHLD) but that can lose traps if -! children_exited > 1 */ -! queue_sigchld_trap (children_exited); - wait_signal_received = SIGCHLD; - /* If we're in a signal handler, let CHECK_WAIT_INTR pick it up; -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 31 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 32 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0033-patchlevel-33.patch b/package/bash/0033-patchlevel-33.patch deleted file mode 100644 index 45fb686e33..0000000000 --- a/package/bash/0033-patchlevel-33.patch +++ /dev/null @@ -1,229 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-033 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-033 - -Bug-Reported-by: mickael9@gmail.com, Jan Rome -Bug-Reference-ID: <20140907224046.382ED3610CC@mickael-laptop.localdomain>, - <540D661D.50908@gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00029.html - http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00030.html - -Bug-Description: - -Bash does not clean up the terminal state in all cases where bash or -readline modifies it and bash is subsequently terminated by a fatal signal. -This happens when the `read' builtin modifies the terminal settings, both -when readline is active and when it is not. It occurs most often when a script -installs a trap that exits on a signal without re-sending the signal to itself. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3-patched/shell.c 2014-01-14 08:04:32.000000000 -0500 ---- b/shell.c 2014-12-22 10:27:50.000000000 -0500 -*************** -*** 74,77 **** ---- 74,78 ---- - - #if defined (READLINE) -+ # include - # include "bashline.h" - #endif -*************** -*** 910,913 **** ---- 912,923 ---- - fflush (stderr); - -+ /* Clean up the terminal if we are in a state where it's been modified. */ -+ #if defined (READLINE) -+ if (RL_ISSTATE (RL_STATE_TERMPREPPED) && rl_deprep_term_function) -+ (*rl_deprep_term_function) (); -+ #endif -+ if (read_tty_modified ()) -+ read_tty_cleanup (); -+ - /* Do trap[0] if defined. Allow it to override the exit status - passed to us. */ -*** a/bash-4.3-patched/builtins/read.def 2014-10-01 12:57:38.000000000 -0400 ---- b/builtins/read.def 2014-12-22 10:48:54.000000000 -0500 -*************** -*** 141,148 **** - int sigalrm_seen; - -! static int reading; - static SigHandler *old_alrm; - static unsigned char delim; - - /* In all cases, SIGALRM just sets a flag that we check periodically. This - avoids problems with the semi-tricky stuff we do with the xfree of ---- 141,150 ---- - int sigalrm_seen; - -! static int reading, tty_modified; - static SigHandler *old_alrm; - static unsigned char delim; - -+ static struct ttsave termsave; -+ - /* In all cases, SIGALRM just sets a flag that we check periodically. This - avoids problems with the semi-tricky stuff we do with the xfree of -*************** -*** 189,193 **** - SHELL_VAR *var; - TTYSTRUCT ttattrs, ttset; -- struct ttsave termsave; - #if defined (ARRAY_VARS) - WORD_LIST *alist; ---- 191,194 ---- -*************** -*** 222,226 **** - USE_VAR(lastsig); - -! sigalrm_seen = reading = 0; - - i = 0; /* Index into the string that we are reading. */ ---- 223,227 ---- - USE_VAR(lastsig); - -! sigalrm_seen = reading = tty_modified = 0; - - i = 0; /* Index into the string that we are reading. */ -*************** -*** 439,442 **** ---- 440,445 ---- - goto assign_vars; - } -+ if (interactive_shell == 0) -+ initialize_terminating_signals (); - old_alrm = set_signal_handler (SIGALRM, sigalrm); - add_unwind_protect (reset_alarm, (char *)NULL); -*************** -*** 483,487 **** ---- 486,493 ---- - if (i < 0) - sh_ttyerror (1); -+ tty_modified = 1; - add_unwind_protect ((Function *)ttyrestore, (char *)&termsave); -+ if (interactive_shell == 0) -+ initialize_terminating_signals (); - } - } -*************** -*** 498,502 **** ---- 504,511 ---- - sh_ttyerror (1); - -+ tty_modified = 1; - add_unwind_protect ((Function *)ttyrestore, (char *)&termsave); -+ if (interactive_shell == 0) -+ initialize_terminating_signals (); - } - -*************** -*** 589,592 **** ---- 598,603 ---- - else - lastsig = 0; -+ if (terminating_signal && tty_modified) -+ ttyrestore (&termsave); /* fix terminal before exiting */ - CHECK_TERMSIG; - eof = 1; -*************** -*** 979,982 **** ---- 990,1007 ---- - { - ttsetattr (ttp->fd, ttp->attrs); -+ tty_modified = 0; -+ } -+ -+ void -+ read_tty_cleanup () -+ { -+ if (tty_modified) -+ ttyrestore (&termsave); -+ } -+ -+ int -+ read_tty_modified () -+ { -+ return (tty_modified); - } - -*** ./bash-4.3-patched/builtins/common.h 2014-10-01 12:57:47.000000000 -0400 ---- b/builtins/common.h 2014-12-22 10:10:14.000000000 -0500 -*************** -*** 123,126 **** ---- 141,148 ---- - extern void getopts_reset __P((int)); - -+ /* Functions from read.def */ -+ extern void read_tty_cleanup __P((void)); -+ extern int read_tty_modified __P((void)); -+ - /* Functions from set.def */ - extern int minus_o_option_value __P((char *)); -*** a/bash-4.3-patched/bashline.c 2014-05-14 09:22:39.000000000 -0400 ---- b/bashline.c 2014-09-08 11:28:56.000000000 -0400 -*************** -*** 203,206 **** ---- 203,207 ---- - extern int array_needs_making; - extern int posixly_correct, no_symbolic_links; -+ extern int sigalrm_seen; - extern char *current_prompt_string, *ps1_prompt; - extern STRING_INT_ALIST word_token_alist[]; -*************** -*** 4209,4214 **** - /* If we're going to longjmp to top_level, make sure we clean up readline. - check_signals will call QUIT, which will eventually longjmp to top_level, -! calling run_interrupt_trap along the way. */ -! if (interrupt_state) - rl_cleanup_after_signal (); - bashline_reset_event_hook (); ---- 4262,4268 ---- - /* If we're going to longjmp to top_level, make sure we clean up readline. - check_signals will call QUIT, which will eventually longjmp to top_level, -! calling run_interrupt_trap along the way. The check for sigalrm_seen is -! to clean up the read builtin's state. */ -! if (terminating_signal || interrupt_state || sigalrm_seen) - rl_cleanup_after_signal (); - bashline_reset_event_hook (); -*** a/bash-4.3-patched/sig.c 2014-01-10 15:06:06.000000000 -0500 ---- b/sig.c 2014-09-08 11:26:33.000000000 -0400 -*************** -*** 533,538 **** - /* Set the event hook so readline will call it after the signal handlers - finish executing, so if this interrupted character input we can get -! quick response. */ -! if (interactive_shell && interactive && no_line_editing == 0) - bashline_set_event_hook (); - #endif ---- 533,540 ---- - /* Set the event hook so readline will call it after the signal handlers - finish executing, so if this interrupted character input we can get -! quick response. If readline is active or has modified the terminal we -! need to set this no matter what the signal is, though the check for -! RL_STATE_TERMPREPPED is possibly redundant. */ -! if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED)) - bashline_set_event_hook (); - #endif -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 32 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 33 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0034-patchlevel-34.patch b/package/bash/0034-patchlevel-34.patch deleted file mode 100644 index 79c8945c5c..0000000000 --- a/package/bash/0034-patchlevel-34.patch +++ /dev/null @@ -1,94 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-034 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-034 - -Bug-Reported-by: Dreamcat4 -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-05/msg00001.html - -Bug-Description: - -If neither the -f nor -v options is supplied to unset, and a name argument is -found to be a function and unset, subsequent name arguments are not treated as -variables before attempting to unset a function by that name. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3-patched/builtins/set.def 2013-04-19 07:20:34.000000000 -0400 ---- b/builtins/set.def 2015-05-05 13:25:36.000000000 -0400 -*************** -*** 752,758 **** ---- 797,805 ---- - { - int unset_function, unset_variable, unset_array, opt, nameref, any_failed; -+ int global_unset_func, global_unset_var; - char *name; - - unset_function = unset_variable = unset_array = nameref = any_failed = 0; -+ global_unset_func = global_unset_var = 0; - - reset_internal_getopt (); -*************** -*** 762,769 **** - { - case 'f': -! unset_function = 1; - break; - case 'v': -! unset_variable = 1; - break; - case 'n': ---- 809,816 ---- - { - case 'f': -! global_unset_func = 1; - break; - case 'v': -! global_unset_var = 1; - break; - case 'n': -*************** -*** 778,782 **** - list = loptend; - -! if (unset_function && unset_variable) - { - builtin_error (_("cannot simultaneously unset a function and a variable")); ---- 825,829 ---- - list = loptend; - -! if (global_unset_func && global_unset_var) - { - builtin_error (_("cannot simultaneously unset a function and a variable")); -*************** -*** 796,799 **** ---- 843,849 ---- - name = list->word->word; - -+ unset_function = global_unset_func; -+ unset_variable = global_unset_var; -+ - #if defined (ARRAY_VARS) - unset_array = 0; - -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 33 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 34 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0035-patchlevel-35.patch b/package/bash/0035-patchlevel-35.patch deleted file mode 100644 index c18b60dc56..0000000000 --- a/package/bash/0035-patchlevel-35.patch +++ /dev/null @@ -1,67 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-035 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-035 - -Bug-Reported-by: -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00045.html - -Bug-Description: - -A locale with a long name can trigger a buffer overflow and core dump. This -applies on systems that do not have locale_charset in libc, are not using -GNU libiconv, and are not using the libintl that ships with bash in lib/intl. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3-patched/lib/sh/unicode.c 2014-01-30 16:47:19.000000000 -0500 ---- b/lib/sh/unicode.c 2015-05-01 08:58:30.000000000 -0400 -*************** -*** 79,83 **** - if (s) - { -! strcpy (charsetbuf, s+1); - t = strchr (charsetbuf, '@'); - if (t) ---- 79,84 ---- - if (s) - { -! strncpy (charsetbuf, s+1, sizeof (charsetbuf) - 1); -! charsetbuf[sizeof (charsetbuf) - 1] = '\0'; - t = strchr (charsetbuf, '@'); - if (t) -*************** -*** 85,89 **** - return charsetbuf; - } -! strcpy (charsetbuf, locale); - return charsetbuf; - } ---- 86,91 ---- - return charsetbuf; - } -! strncpy (charsetbuf, locale, sizeof (charsetbuf) - 1); -! charsetbuf[sizeof (charsetbuf) - 1] = '\0'; - return charsetbuf; - } -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 34 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 35 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0036-patchlevel-36.patch b/package/bash/0036-patchlevel-36.patch deleted file mode 100644 index f35b29b5bd..0000000000 --- a/package/bash/0036-patchlevel-36.patch +++ /dev/null @@ -1,61 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-036 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-036 - -Bug-Reported-by: emanuelczirai@cryptolab.net -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00071.html - -Bug-Description: - -When evaluating and setting integer variables, and the assignment fails to -create a variable (for example, when performing an operation on an array -variable with an invalid subscript), bash attempts to dereference a null -pointer, causing a segmentation violation. - -Patch (apply with `patch -p0'): - -*** a/bash-20150206/variables.c 2015-01-23 20:39:27.000000000 -0500 ---- b/variables.c 2015-02-19 13:56:12.000000000 -0500 -*************** -*** 2834,2841 **** - v = bind_variable (lhs, rhs, 0); - -! if (v && isint) -! VSETATTR (v, att_integer); -! -! VUNSETATTR (v, att_invisible); - - return (v); ---- 2834,2843 ---- - v = bind_variable (lhs, rhs, 0); - -! if (v) -! { -! if (isint) -! VSETATTR (v, att_integer); -! VUNSETATTR (v, att_invisible); -! } - - return (v); -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 35 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 36 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0037-patchlevel-37.patch b/package/bash/0037-patchlevel-37.patch deleted file mode 100644 index 5f8aff356c..0000000000 --- a/package/bash/0037-patchlevel-37.patch +++ /dev/null @@ -1,47 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-037 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-037 - -Bug-Reported-by: Greg Wooledge -Bug-Reference-ID: <20150204144240.GN13956@eeg.ccf.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00007.html - -Bug-Description: - -If an associative array uses `@' or `*' as a subscript, `declare -p' produces -output that cannot be reused as input. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3-patched/assoc.c 2011-11-05 16:39:05.000000000 -0400 ---- b/assoc.c 2015-02-04 15:28:25.000000000 -0500 -*************** -*** 437,440 **** ---- 440,445 ---- - if (sh_contains_shell_metas (tlist->key)) - istr = sh_double_quote (tlist->key); -+ else if (ALL_ELEMENT_SUB (tlist->key[0]) && tlist->key[1] == '\0') -+ istr = sh_double_quote (tlist->key); - else - istr = tlist->key; -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 36 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 37 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0038-patchlevel-38.patch b/package/bash/0038-patchlevel-38.patch deleted file mode 100644 index 09fd9c2ec0..0000000000 --- a/package/bash/0038-patchlevel-38.patch +++ /dev/null @@ -1,92 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-038 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-038 - -Bug-Reported-by: worley@alum.mit.edu (Dale R. Worley) -Bug-Reference-ID: <201406100051.s5A0pCeB014978@hobgoblin.ariadne.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00028.html - -Bug-Description: - -There are a number of instances where `time' is not recognized as a reserved -word when the shell grammar says it should be. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3-patched/parse.y 2014-04-07 11:56:12.000000000 -0400 ---- b/parse.y 2014-06-11 10:25:53.000000000 -0400 -*************** -*** 2819,2827 **** - case OR_OR: - case '&': - case DO: - case THEN: - case ELSE: - case '{': /* } */ -! case '(': /* ) */ - case BANG: /* ! time pipeline */ - case TIME: /* time time pipeline */ ---- 2819,2832 ---- - case OR_OR: - case '&': -+ case WHILE: - case DO: -+ case UNTIL: -+ case IF: - case THEN: -+ case ELIF: - case ELSE: - case '{': /* } */ -! case '(': /* )( */ -! case ')': /* only valid in case statement */ - case BANG: /* ! time pipeline */ - case TIME: /* time time pipeline */ -*** a/bash-4.3-patched/y.tab.c 2014-10-05 13:52:50.000000000 -0400 ---- b/y.tab.c 2015-05-19 15:08:43.000000000 -0400 -*************** -*** 5131,5139 **** - case OR_OR: - case '&': - case DO: - case THEN: - case ELSE: - case '{': /* } */ -! case '(': /* ) */ - case BANG: /* ! time pipeline */ - case TIME: /* time time pipeline */ ---- 5131,5144 ---- - case OR_OR: - case '&': -+ case WHILE: - case DO: -+ case UNTIL: -+ case IF: - case THEN: -+ case ELIF: - case ELSE: - case '{': /* } */ -! case '(': /* )( */ -! case ')': /* only valid in case statement */ - case BANG: /* ! time pipeline */ - case TIME: /* time time pipeline */ -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 37 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 38 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0039-patchlevel-39.patch b/package/bash/0039-patchlevel-39.patch deleted file mode 100644 index 2a555b96c1..0000000000 --- a/package/bash/0039-patchlevel-39.patch +++ /dev/null @@ -1,61 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-039 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-039 - -Bug-Reported-by: SN -Bug-Reference-ID: <54E2554C.205@gazeta.pl> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00060.html - -Bug-Description: - -Using the output of `declare -p' when run in a function can result in variables -that are invisible to `declare -p'. This problem occurs when an assignment -builtin such as `declare' receives a quoted compound array assignment as one of -its arguments. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3-patched/arrayfunc.c 2014-10-01 13:08:48.000000000 -0400 ---- b/arrayfunc.c 2015-02-19 14:33:05.000000000 -0500 -*************** -*** 405,408 **** ---- 405,411 ---- - else - array_insert (a, i, l->word->word); -+ -+ VUNSETATTR (var, att_invisible); /* no longer invisible */ -+ - return var; - } -*************** -*** 635,638 **** ---- 638,645 ---- - if (nlist) - dispose_words (nlist); -+ -+ if (var) -+ VUNSETATTR (var, att_invisible); /* no longer invisible */ -+ - return (var); - } -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 38 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 39 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0040-patchlevel-40.patch b/package/bash/0040-patchlevel-40.patch deleted file mode 100644 index 2a03c45a92..0000000000 --- a/package/bash/0040-patchlevel-40.patch +++ /dev/null @@ -1,51 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-040 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-040 - -Bug-Reported-by: Jean Delvare -Bug-Reference-ID: <20150609180231.5f463695@endymion.delvare> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00033.html - -Bug-Description: - -There is a memory leak that occurs when bash expands an array reference on -the rhs of an assignment statement. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3-patched/subst.c 2014-10-01 12:57:47.000000000 -0400 ---- b/subst.c 2015-06-22 09:16:53.000000000 -0400 -*************** -*** 5783,5787 **** - if (pflags & PF_ASSIGNRHS) - { -! temp = array_variable_name (name, &tt, (int *)0); - if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']') - temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype, &ind); ---- 5783,5787 ---- - if (pflags & PF_ASSIGNRHS) - { -! var = array_variable_part (name, &tt, (int *)0); - if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']') - temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype, &ind); -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 39 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 40 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0041-patchlevel-41.patch b/package/bash/0041-patchlevel-41.patch deleted file mode 100644 index c8ba4b1081..0000000000 --- a/package/bash/0041-patchlevel-41.patch +++ /dev/null @@ -1,76 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-041 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-041 - -Bug-Reported-by: Hanno Böck -Bug-Reference-ID: <20150623131106.6f111da9@pc1>, <20150707004640.0e61d2f9@pc1> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00089.html, - http://lists.gnu.org/archive/html/bug-bash/2015-07/msg00018.html - -Bug-Description: - -There are several out-of-bounds read errors that occur when completing command -lines where assignment statements appear before the command name. The first -two appear only when programmable completion is enabled; the last one only -happens when listing possible completions. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3.40/bashline.c 2014-12-29 14:39:43.000000000 -0500 ---- b/bashline.c 2015-08-12 10:21:58.000000000 -0400 -*************** -*** 1469,1476 **** ---- 1469,1489 ---- - os = start; - n = 0; -+ was_assignment = 0; - s = find_cmd_start (os); - e = find_cmd_end (end); - do - { -+ /* Don't read past the end of rl_line_buffer */ -+ if (s > rl_end) -+ { -+ s1 = s = e1; -+ break; -+ } -+ /* Or past point if point is within an assignment statement */ -+ else if (was_assignment && s > rl_point) -+ { -+ s1 = s = e1; -+ break; -+ } - /* Skip over assignment statements preceding a command name. If we - don't find a command name at all, we can perform command name -*** a/bash-4.3.40/lib/readline/complete.c 2013-10-14 09:27:10.000000000 -0400 ---- b/lib/readline/complete.c 2015-07-31 09:34:39.000000000 -0400 -*************** -*** 690,693 **** ---- 690,695 ---- - if (temp == 0 || *temp == '\0') - return (pathname); -+ else if (temp[1] == 0 && temp == pathname) -+ return (pathname); - /* If the basename is NULL, we might have a pathname like '/usr/src/'. - Look for a previous slash and, if one is found, return the portion -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 40 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 41 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0042-patchlevel-42.patch b/package/bash/0042-patchlevel-42.patch deleted file mode 100644 index bb3471c63f..0000000000 --- a/package/bash/0042-patchlevel-42.patch +++ /dev/null @@ -1,59 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-042 - -Signed-off-by: Gustavo Zacarias - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-042 - -Bug-Reported-by: Nathan Neulinger -Bug-Reference-ID: <558EFDF2.7060402@neulinger.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-06/msg00096.html - -Bug-Description: - -There is a problem when parsing command substitutions containing `case' -commands within pipelines that causes the parser to not correctly identify -the end of the command substitution. - -Patch (apply with `patch -p0'): - -*** a/bash-4.3-patched/parse.y 2015-05-18 19:27:05.000000000 -0400 ---- b/parse.y 2015-06-29 10:59:27.000000000 -0400 -*************** -*** 3709,3712 **** ---- 3709,3714 ---- - tflags |= LEX_INWORD; - lex_wlen = 0; -+ if (tflags & LEX_RESWDOK) -+ lex_rwlen = 0; - } - } -*** a/bash-4.3-patched/y.tab.c 2015-05-18 19:27:05.000000000 -0400 ---- b/y.tab.c 2015-06-29 10:59:27.000000000 -0400 -*************** -*** 6021,6024 **** ---- 6021,6026 ---- - tflags |= LEX_INWORD; - lex_wlen = 0; -+ if (tflags & LEX_RESWDOK) -+ lex_rwlen = 0; - } - } -*** a/bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 41 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 42 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0043-patchlevel-43.patch b/package/bash/0043-patchlevel-43.patch deleted file mode 100644 index a30a9817c9..0000000000 --- a/package/bash/0043-patchlevel-43.patch +++ /dev/null @@ -1,63 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-043 - -Signed-off-by: Bernd Kuhls - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-043 - -Bug-Reported-by: lolilolicon -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00040.html - -Bug-Description: - -When the lastpipe option is enabled, the last component can contain nested -pipelines and cause a segmentation fault under certain circumestances. - -Patch (apply with `patch -p0'): - -*** a/execute_cmd.c 2014-07-30 10:26:52.000000000 -0400 ---- b/execute_cmd.c 2014-08-15 08:55:24.000000000 -0400 -*************** -*** 2406,2412 **** - { - #if defined (JOB_CONTROL) -! append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid); -! #endif - lstdin = wait_for (lastpid); - #if defined (JOB_CONTROL) - /* If wait_for removes the job from the jobs table, use result of last ---- 2433,2447 ---- - { - #if defined (JOB_CONTROL) -! if (INVALID_JOB (lastpipe_jid) == 0) -! { -! append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid); -! lstdin = wait_for (lastpid); -! } -! else -! lstdin = wait_for_single_pid (lastpid); /* checks bgpids list */ -! #else - lstdin = wait_for (lastpid); -+ #endif -+ - #if defined (JOB_CONTROL) - /* If wait_for removes the job from the jobs table, use result of last -*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 42 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 43 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0044-patchlevel-44.patch b/package/bash/0044-patchlevel-44.patch deleted file mode 100644 index 62d541222a..0000000000 --- a/package/bash/0044-patchlevel-44.patch +++ /dev/null @@ -1,52 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-044 - -Signed-off-by: Bernd Kuhls - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-044 - -Bug-Reported-by: Ondrej Oprala -Bug-Reference-ID: <539ED55B.2080103@redhat.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html - -Bug-Description: - -A typo prevents the `compat42' shopt option from working as intended. - -Patch (apply with `patch -p0'): - -diff -rC 2 bash-4.3.42/builtins/shopt.def bash-4.3.43/builtins/shopt.def -*** a/builtins/shopt.def 2013-02-27 09:43:20.000000000 -0500 ---- b/builtins/shopt.def 2015-10-16 11:25:28.000000000 -0400 -*************** -*** 161,165 **** - { "compat40", &shopt_compat40, set_compatibility_level }, - { "compat41", &shopt_compat41, set_compatibility_level }, -! { "compat42", &shopt_compat41, set_compatibility_level }, - #if defined (READLINE) - { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, ---- 161,165 ---- - { "compat40", &shopt_compat40, set_compatibility_level }, - { "compat41", &shopt_compat41, set_compatibility_level }, -! { "compat42", &shopt_compat42, set_compatibility_level }, - #if defined (READLINE) - { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, - -*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 43 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 44 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0045-patchlevel-45.patch b/package/bash/0045-patchlevel-45.patch deleted file mode 100644 index bb11b1a055..0000000000 --- a/package/bash/0045-patchlevel-45.patch +++ /dev/null @@ -1,56 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-045 - -Signed-off-by: Bernd Kuhls - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-045 - -Bug-Reported-by: Basin Ilya -Bug-Reference-ID: <5624C0AC.8070802@gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-10/msg00141.html - -Bug-Description: - -If a file open attempted as part of a redirection fails because it is interrupted -by a signal, the shell needs to process any pending traps to allow the redirection -to be canceled. - -Patch (apply with `patch -p0'): - -*** a/redir.c 2014-12-03 10:47:38.000000000 -0500 ---- b/redir.c 2015-01-16 10:15:47.000000000 -0500 -*************** -*** 672,676 **** - e = errno; - if (fd < 0 && e == EINTR) -! QUIT; - errno = e; - } ---- 672,679 ---- - e = errno; - if (fd < 0 && e == EINTR) -! { -! QUIT; -! run_pending_traps (); -! } - errno = e; - } - -*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 44 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 45 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0046-patchlevel-46.patch b/package/bash/0046-patchlevel-46.patch deleted file mode 100644 index bc3798a088..0000000000 --- a/package/bash/0046-patchlevel-46.patch +++ /dev/null @@ -1,59 +0,0 @@ -From http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-046 - -Signed-off-by: Bernd Kuhls - - BASH PATCH REPORT - ================= - -Bash-Release: 4.3 -Patch-ID: bash43-046 - -Bug-Reported-by: Sergey Tselikh -Bug-Reference-ID: <20150816110235.91f3e12e3f20d20cdaad963e@gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-08/msg00080.html - -Bug-Description: - -An incorrect conversion from an indexed to associative array can result in a -core dump. - -Patch (apply with `patch -p0'): - -*** a/subst.c 2015-08-13 11:32:54.000000000 -0400 ---- b/subst.c 2015-08-18 10:13:59.000000000 -0400 -*************** -*** 9562,9566 **** - opts[opti] = '\0'; - if (opti > 0) -! make_internal_declare (tlist->word->word, opts); - - t = do_word_assignment (tlist->word, 0); ---- 9562,9573 ---- - opts[opti] = '\0'; - if (opti > 0) -! { -! t = make_internal_declare (tlist->word->word, opts); -! if (t != EXECUTION_SUCCESS) -! { -! last_command_exit_value = t; -! exp_jump_to_top_level (DISCARD); -! } -! } - - t = do_word_assignment (tlist->word, 0); - -*** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 ---- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 45 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 46 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/bash.hash b/package/bash/bash.hash index faf2364588..adbd60868a 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 317881019bbf2262fb814b7dd8e40632d13c3608d2f237800a8828fbb8a640dd bash-4.3.30.tar.gz +sha256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb bash-4.4.tar.gz diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 3cd8d8273c..090cf5224c 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 4.3.30 +BASH_VERSION = 4.4 BASH_SITE = $(BR2_GNU_MIRROR)/bash # Build after since bash is better than busybox shells BASH_DEPENDENCIES = ncurses readline host-bison \ From 372e9255b2cd475cb68f51413ad60bb205fc4793 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 29 Nov 2016 22:04:15 +0100 Subject: [PATCH 1586/3392] package/bluez5_utils: bump version to 5.43 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index cbb3aa3cad..b030f1a08a 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 21d1bc9150d3576296595217efb98a746b592389d25d5637e8bee5da7272593b bluez-5.39.tar.xz +sha256 16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15 bluez-5.43.tar.xz diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 49cc7c2176..66c3eab1e9 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -BLUEZ5_UTILS_VERSION = 5.39 +BLUEZ5_UTILS_VERSION = 5.43 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES From 39864e2702490fd3da45a94ec6010ba95c17449f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 11:25:09 +0000 Subject: [PATCH 1587/3392] gstreamer1/gstreamer1: bump version to 1.10.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 40677da20a..3fd7c6bebb 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.1.tar.xz.sha256sum -sha256 f68df996e0e699382b935bb4783dd402c301377df18f57e28e0318c4b3bff6da gstreamer-1.10.1.tar.xz +# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.2.tar.xz.sha256sum +sha256 150e8e81febac94c161d8141cde78a38038a8f56e8ec549f353da54994278d65 gstreamer-1.10.2.tar.xz diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 794abc4b30..6086e1329c 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.10.1 +GSTREAMER1_VERSION = 1.10.2 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From 3d9234e9d49c6e5046a09aea81af97a976d13d5c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 11:25:10 +0000 Subject: [PATCH 1588/3392] gstreamer1/gst1-plugins-base: bump version to 1.10.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 70aad4d3f4..3f4d0cd425 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.1.tar.xz.sha256sum -sha256 66cfee294c7aaf9d7867eaba4841ca6254ea74f1a8b53e1289f4d3b9b6c976c9 gst-plugins-base-1.10.1.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.2.tar.xz.sha256sum +sha256 fbc0d40fcb746d2efe2ea47444674029912f66e6107f232766d33b722b97de20 gst-plugins-base-1.10.2.tar.xz diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index c89c22d039..1014bd78df 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.10.1 +GST1_PLUGINS_BASE_VERSION = 1.10.2 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From c186857fca113c040d88db8af43dd426a27ccf95 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 11:25:11 +0000 Subject: [PATCH 1589/3392] gstreamer1/gst1-plugins-good: bump version to 1.10.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 9977e2fc30..98b7988698 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.1.tar.xz.sha256sum -sha256 a7642ea7e7c17fb67e94d0c17e56757b6577fa7ed244ff8c11031841d3556cc2 gst-plugins-good-1.10.1.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.2.tar.xz.sha256sum +sha256 198f325bcce982dce1ebeb36929a5f430b8bf9528e0d519e18df0b29e1d23313 gst-plugins-good-1.10.2.tar.xz diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 9da0c217a7..da0345497c 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.10.1 +GST1_PLUGINS_GOOD_VERSION = 1.10.2 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From 50722b3a33c116996c6208c2e7392819358a32cb Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 11:25:12 +0000 Subject: [PATCH 1590/3392] gstreamer1/gst1-plugins-bad: bump version to 1.10.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 3b14e291fb..999a4e8666 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.1.tar.xz.sha256sum -sha256 133e0ed9fe21011b15d3898e3d3a9d17ab74eed31996da2e353353e688ca921d gst-plugins-bad-1.10.1.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.2.tar.xz.sha256sum +sha256 0795ca9303a99cc7e44dda0e6e18524de02b39892e4b68eaba488f7b9db53a3a gst-plugins-bad-1.10.2.tar.xz diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 317248996d..ba9f30542e 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.10.1 +GST1_PLUGINS_BAD_VERSION = 1.10.2 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From a556083c332d0156287631f580de11acb5597d33 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 11:25:13 +0000 Subject: [PATCH 1591/3392] gstreamer1/gst1-plugins-ugly: bump version to 1.10.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index fd6fe7c3c6..a86fd64927 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.1.tar.xz.sha256sum -sha256 a5ecd59fc2091eeb52368de81cc6a91c1a1c19dc5bdde85ce90e1eed5d4183c2 gst-plugins-ugly-1.10.1.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.2.tar.xz.sha256sum +sha256 f303dd4c2ebc963e8b0b03c3069f70657bcf1cd62224d344ad579b3dda17ec9d gst-plugins-ugly-1.10.2.tar.xz diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 55b8e92072..b064c954cc 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.10.1 +GST1_PLUGINS_UGLY_VERSION = 1.10.2 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From 4c4f58edfb28cba186da55ac24069d9ef2b4a336 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 11:25:14 +0000 Subject: [PATCH 1592/3392] gstreamer1/gst1-libav: bump version to 1.10.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 1bb714f15a..8cda287f20 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.1.tar.xz.sha256sum -sha256 27b28b8de0e6dff1e3952428e8ed8ba4a12f452f789ac0ae9bbe50f00a5c72c7 gst-libav-1.10.1.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.2.tar.xz.sha256sum +sha256 a3dd7036211f061e1eda04f985b7a9dd1a91b754f767ff2587eb6ec28f44e73c gst-libav-1.10.2.tar.xz diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index eec630310f..8687ac652c 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.10.1 +GST1_LIBAV_VERSION = 1.10.2 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_CONF_OPTS = --with-system-libav From 6fd6ee91dfaeeb9c84d9971313d4100e364f5bd9 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 11:25:15 +0000 Subject: [PATCH 1593/3392] gstreamer1/gst1-rtsp-server: bump version to 1.10.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index b2e789d889..30cd68466b 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,2 +1,2 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.1.tar.xz.sha256sum -sha256 ddc0c2699598623c2d19d3a2856fb73365496a949783537b238f44bc51e5b005 gst-rtsp-server-1.10.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.2.tar.xz.sha256sum +sha256 822dd6f754fea2bbf3369a7c388372f49b74668fb57943c1888675e544b07235 gst-rtsp-server-1.10.2.tar.xz diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index b5854e174d..8fcaaf4726 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.10.1 +GST1_RTSP_SERVER_VERSION = 1.10.2 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPLv2+ From 29969daeb5aa13d9394f2fec2ce662ff96f3763e Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 11:25:16 +0000 Subject: [PATCH 1594/3392] gstreamer1/gst1-validate: bump version to 1.10.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-validate/gst1-validate.hash | 4 ++-- package/gstreamer1/gst1-validate/gst1-validate.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-validate/gst1-validate.hash b/package/gstreamer1/gst1-validate/gst1-validate.hash index adfb2fa45c..70b868ff0a 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.hash +++ b/package/gstreamer1/gst1-validate/gst1-validate.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.1.tar.xz.sha256sum -sha256 07ae671a3e77c5480d2c1732175dd3b3255b6937ac55d4b3e69a90f8e3043f75 gst-validate-1.10.1.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.2.tar.xz.sha256sum +sha256 be274418d78694cecb1be6c860f3f499baa4313eece60a654507ab14d6989ed7 gst-validate-1.10.2.tar.xz diff --git a/package/gstreamer1/gst1-validate/gst1-validate.mk b/package/gstreamer1/gst1-validate/gst1-validate.mk index cb857d03fb..69a78bde3a 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.mk +++ b/package/gstreamer1/gst1-validate/gst1-validate.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VALIDATE_VERSION = 1.10.1 +GST1_VALIDATE_VERSION = 1.10.2 GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate GST1_VALIDATE_LICENSE = LGPLv2.1+ From ae36ee017402e4eeba381366524dae26baa65bc3 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 11:25:17 +0000 Subject: [PATCH 1595/3392] gstreamer1/gst-omx: bump version to 1.10.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index bf10f0a1a2..d52b61fd6a 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,2 +1,2 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.1.tar.xz.sha256sum -sha256 1b07b9ceb4552c0911af1e3b97987e3314c601eacfbc09f1cca8632e98581231 gst-omx-1.10.1.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.2.tar.xz.sha256sum +sha256 c069a9cf775c92f889ca8f3b2fc718e428cd0579b7b805851a960c850a7aa497 gst-omx-1.10.2.tar.xz diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index c9343174f7..fcc7058b11 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.10.1 +GST_OMX_VERSION = 1.10.2 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From 4f29cc436b24a8007b065253babe27b9346a479e Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 11:25:18 +0000 Subject: [PATCH 1596/3392] gstreamer1/gst1-imx: bump version to 0.12.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-imx/gst1-imx.hash | 2 +- package/gstreamer1/gst1-imx/gst1-imx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gstreamer1/gst1-imx/gst1-imx.hash b/package/gstreamer1/gst1-imx/gst1-imx.hash index d345debc39..b0124aae25 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.hash +++ b/package/gstreamer1/gst1-imx/gst1-imx.hash @@ -1,2 +1,2 @@ # locally computed hash -sha256 a75f8bc3219fa3c62637f443cef0196c9eafb90aaa5af094847d007124895822 gst1-imx-0.12.2.tar.gz +sha256 a75f8bc3219fa3c62637f443cef0196c9eafb90aaa5af094847d007124895822 gst1-imx-0.12.3.tar.gz diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk index 3c6b1b6027..71b4e1e19e 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_IMX_VERSION = 0.12.2 +GST1_IMX_VERSION = 0.12.3 GST1_IMX_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX_VERSION)) GST1_IMX_LICENSE = LGPLv2+ From bf5487e21e539e474062ee3ace1ac8fb844e38a2 Mon Sep 17 00:00:00 2001 From: "tiago.brusamarello" Date: Wed, 30 Nov 2016 08:32:33 -0200 Subject: [PATCH 1597/3392] uboot: support -b option for mkenvimage When generating the environment image the target endianess should be taken in account for CRC calculation purposes. For big endian targets the -b flag should be passed to the mkenvimage tool. Signed-off-by: Tiago Brusamarello Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 3e347c1084..6b9d544546 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -223,6 +223,7 @@ define UBOOT_INSTALL_IMAGES_CMDS cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) | \ $(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \ $(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \ + $(if $(filter BIG,$(BR2_ENDIAN)),-b) \ -o $(BINARIES_DIR)/uboot-env.bin -) endef From 0689e77eecb88dc204688e9db670d56e4366f83f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Nov 2016 06:39:52 +0100 Subject: [PATCH 1598/3392] uclibc: disable posix_madvise for noMMU Now that the madvise defines are disabled for noMMU targets, architectures with MMU and noMMU support as ARM are failing to compile in noMMU mode, since the defines are used internally in posix_madvise.c. Disable compilation for posix_madvise() for noMMU. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- ...osix_madvise-not-available-for-noMMU.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/uclibc/0003-posix_madvise-not-available-for-noMMU.patch diff --git a/package/uclibc/0003-posix_madvise-not-available-for-noMMU.patch b/package/uclibc/0003-posix_madvise-not-available-for-noMMU.patch new file mode 100644 index 0000000000..008aac75e8 --- /dev/null +++ b/package/uclibc/0003-posix_madvise-not-available-for-noMMU.patch @@ -0,0 +1,30 @@ +From 9945c6d21797553e78cbef8034f6dd16b3824df5 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Mon, 28 Nov 2016 07:31:00 +0100 +Subject: [PATCH] posix_madvise not available for noMMU + +Signed-off-by: Waldemar Brodkorb +--- + libc/sysdeps/linux/common/posix_madvise.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libc/sysdeps/linux/common/posix_madvise.c b/libc/sysdeps/linux/common/posix_madvise.c +index 2f95bcb..541dabe 100644 +--- a/libc/sysdeps/linux/common/posix_madvise.c ++++ b/libc/sysdeps/linux/common/posix_madvise.c +@@ -4,6 +4,7 @@ + #include + #include + ++#ifdef __ARCH_USE_MMU__ + #if defined __NR_madvise && defined __USE_XOPEN2K && defined __UCLIBC_HAS_ADVANCED_REALTIME__ + int posix_madvise(void *addr, size_t len, int advice) + { +@@ -23,3 +24,4 @@ int posix_madvise(void *addr, size_t len, int advice) + return INTERNAL_SYSCALL_ERRNO (result, err); + } + #endif ++#endif +-- +2.1.4 + From cacfea6c263cfbfc450256b25f71dde29fa03f3b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 29 Nov 2016 22:42:59 +0100 Subject: [PATCH 1599/3392] toolchain-external: bump Linaro ARM toolchain to 2016.11 Tested with qemu-2.4.1-11.fc23 and the qemu_arm_vexpress_defconfig Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external-linaro-arm/Config.in | 10 +++++----- .../toolchain-external-linaro-arm.hash | 4 ++-- .../toolchain-external-linaro-arm.mk | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index bf8649acfb..cef42e7441 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -4,7 +4,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM - bool "Linaro ARM 2016.05" + bool "Linaro ARM 2016.11" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -14,13 +14,13 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 select BR2_TOOLCHAIN_HAS_FORTRAN help Linaro toolchain for the ARM architecture. It uses Linaro - GCC 2016.05 (based on gcc 5.3.1), Linaro GDB 2016.05 (based on - GDB 7.11.1), glibc 2.21, Binutils 2016.05 (based on 2.25). It + GCC 2016.11 (based on gcc 6.2.1), Linaro GDB 2016.11 (based on + GDB 7.12), glibc 2.23, Binutils 2016.11 (based on 2.27). It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated is Thumb 2, with the hard floating point calling convention, and uses diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash index 8106426214..d4452c3786 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f1421c580ce977226f4fefc9c409b3b423260cc65a6e9dc6da88bb3478a521a0 gcc-linaro-5.3.1-2016.05-i686_arm-linux-gnueabihf.tar.xz -sha256 987941c9fffdf56ffcbe90e8984673c16648c477b537fcf43add22fa62f161cd gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz +sha256 a2a4968bfb8537c1b3280b4f475d90d53a1a0f05f7afc7b43efed266cc4de446 gcc-linaro-6.2.1-2016.11-i686_arm-linux-gnueabihf.tar.xz +sha256 5eb7ab2f8a0b4b960900321505cd6923a072cb3e2412102f5f72a6e74c2f0a55 gcc-linaro-6.2.1-2016.11-x86_64_arm-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk index 64918cac02..e098f47757 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2016.05 -TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf +TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2016.11 +TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/6.2-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz endif $(eval $(toolchain-external-package)) From 5f4d9adc6d47ee5e1e77bf8e1b7ec1b9544d278e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 29 Nov 2016 22:43:00 +0100 Subject: [PATCH 1600/3392] toolchain-external: bump Linaro ARMeb toolchain to 2016.11 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external-linaro-armeb/Config.in | 12 ++++++------ .../toolchain-external-linaro-armeb.hash | 4 ++-- .../toolchain-external-linaro-armeb.mk | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index ed84c47550..b2fed7fb6c 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -4,7 +4,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB - bool "Linaro armeb 2016.05" + bool "Linaro armeb 2016.11" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -14,13 +14,13 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 help Linaro toolchain for the ARM big endian architecture. It - uses Linaro GCC 2016.05 (based on gcc 5.3.1), Linaro GDB - 2016.05 (based on GDB 7.11.1), glibc 2.21, Binutils 2016.05 - (based on 2.25). It generates code that runs on all Cortex-A + uses Linaro GCC 2016.11 (based on gcc 6.2.1), Linaro GDB + 2016.11 (based on GDB 7.12), glibc 2.23, Binutils 2016.11 + (based on 2.27). It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated is Thumb 2, with the hard floating point calling convention, and uses the VFPv3-D16 FPU instructions. diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash index 7952b5087e..a041539ba6 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f6e9c0d3320760fe8f89e9ec3acdd7b4da7eff889c094b4a2acc286fd46f334f gcc-linaro-5.3.1-2016.05-i686_armeb-linux-gnueabihf.tar.xz -sha256 6cf41c8944be56279cc14992aa075174b7a4c5938502536266eaaeef048f9440 gcc-linaro-5.3.1-2016.05-x86_64_armeb-linux-gnueabihf.tar.xz +sha256 05a34c56da56b9b1e1a61ad1217dc4e751e1d277932dbeaa82b6c242cf0f2ec9 gcc-linaro-6.2.1-2016.11-i686_armeb-linux-gnueabihf.tar.xz +sha256 319cb7c6363a3116357b163d0b4f9e0c27cfcb6153f3c26a34edf892819f12e5 gcc-linaro-6.2.1-2016.11-x86_64_armeb-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk index cf2f3ad2c7..ba138e1b50 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2016.05 -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2016.11 +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/6.2-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz endif $(eval $(toolchain-external-package)) From c72cca94b81a18b8a5d7debd1d0e15cef55c65c6 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 29 Nov 2016 22:43:01 +0100 Subject: [PATCH 1601/3392] toolchain-external: bump Linaro AArch64 toolchain to 2016.11 Tested with Qemu v2.7.0 and the qemu_aarch64_virt_defconfig Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../toolchain-external-linaro-aarch64/Config.in | 6 +++--- .../toolchain-external-linaro-aarch64.hash | 4 ++-- .../toolchain-external-linaro-aarch64.mk | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in index 662f7d7449..4dc8dacbe4 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 - bool "Linaro AArch64 2016.05" + bool "Linaro AArch64 2016.11" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS @@ -7,8 +7,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 select BR2_TOOLCHAIN_HAS_FORTRAN help Toolchain for the AArch64 architecture, from diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash index 7a2c038181..f7f4209060 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d43227248f282a652da42322fcf4abfd3021f2a2f62e0cf6e242d82f55966ba9 gcc-linaro-5.3.1-2016.05-i686_aarch64-linux-gnu.tar.xz -sha256 1941dcf6229d6706bcb89b7976d5d43d170efdd17c27d5fe1738e7ecf22adc37 gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu.tar.xz +sha256 057156a47b9cd68cdc0b48adcbe96c8249e3653b082f6c051dd75cb644f64b3a gcc-linaro-6.2.1-2016.11-i686_aarch64-linux-gnu.tar.xz +sha256 539cc29320bd84178cd093aae0b06b1ee5476511cecaba989faf9c6a1d4cdf81 gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk index a0543a75e4..fb498fe273 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2016.05 -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/5.3-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2016.11 +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/6.2-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-5.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz endif $(eval $(toolchain-external-package)) From 4277fbaec2222c075472ff0ab82c4611c6323a30 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 17:04:42 +0000 Subject: [PATCH 1602/3392] lttng-tools: bump version to 2.9.0 Drop sha256 hash. The combination of md5 and sha1 hashes is enough. Remove upstream patches: - 0001-Fix-snapshot-del-output-with-name-on-musl.patch https://github.com/lttng/lttng-tools/commit/07f5023712313d73ab3feac62390a2d50457b7aa - 0002-Fix-strerror_r-behavior-is-glibc-specific.patch https://github.com/lttng/lttng-tools/commit/b6dacfe27a91af50a1f81a2a7eadf4f34ca75769 - 0003-Set-thread-stack-size-to-ulimit-soft-value.patch https://github.com/lttng/lttng-tools/commit/1a1a34b40ab10a195633b1ed5e2e9b42fdae0a78 Release notes: https://lists.lttng.org/pipermail/lttng-dev/2016-November/026763.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- ...napshot-del-output-with-name-on-musl.patch | 32 -- ...trerror_r-behavior-is-glibc-specific.patch | 30 -- ...read-stack-size-to-ulimit-soft-value.patch | 431 ------------------ package/lttng-tools/lttng-tools.hash | 9 +- package/lttng-tools/lttng-tools.mk | 2 +- 5 files changed, 4 insertions(+), 500 deletions(-) delete mode 100644 package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch delete mode 100644 package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch delete mode 100644 package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch diff --git a/package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch b/package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch deleted file mode 100644 index 102a02bef5..0000000000 --- a/package/lttng-tools/0001-Fix-snapshot-del-output-with-name-on-musl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: mjeanson@efficios.com Michael Jeanson -Date: Wed, 15 Jun 2016 17:18:02 -0400 -Subject: [lttng-dev] [PATCH] Fix: snapshot del-output with name on musl - -Some implementations of strtol() like the one in musl will -return EINVAL in perror when no valid number was found in -the string. - -Signed-off-by: Michael Jeanson -[Philippe: grabbed from the mailing list: - https://lists.lttng.org/pipermail/lttng-dev/2016-June/026192.html - and adapted to 2.8.2.] -Signed-off-by: Philippe Proulx ---- - src/bin/lttng/commands/snapshot.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bin/lttng/commands/snapshot.c b/src/bin/lttng/commands/snapshot.c -index d948226..00aa5b7 100644 ---- a/src/bin/lttng/commands/snapshot.c -+++ b/src/bin/lttng/commands/snapshot.c -@@ -447,7 +447,7 @@ static int cmd_del_output(int argc, const char **argv) - - errno = 0; - id = strtol(argv[1], &name, 10); -- if (id == 0 && errno == 0) { -+ if (id == 0 && (errno == 0 || errno == EINVAL)) { - if (lttng_opt_mi) { - ret = mi_del_output(UINT32_MAX, name); - } else { --- -2.7.4 diff --git a/package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch b/package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch deleted file mode 100644 index e9ba74fac4..0000000000 --- a/package/lttng-tools/0002-Fix-strerror_r-behavior-is-glibc-specific.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fc743b22fc26eab9f9dbf48e4505ed2394924bba Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Mon, 13 Jun 2016 18:44:17 -0400 -Subject: [PATCH lttng-tools] Fix: strerror_r behavior is glibc specific - -Signed-off-by: Michael Jeanson -[Philippe: grabbed from the mailing list: - https://lists.lttng.org/pipermail/lttng-dev/2016-June/026194.html -] -Signed-off-by: Philippe Proulx ---- - src/common/error.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/error.h b/src/common/error.h -index 0fbd3a2..e8c811e 100644 ---- a/src/common/error.h -+++ b/src/common/error.h -@@ -198,7 +198,7 @@ static inline void __lttng_print_check_abort(enum lttng_error_level type) - - #define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ## args) - --#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) -+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) - - /* - * Version using XSI strerror_r. --- -2.7.4 - diff --git a/package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch b/package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch deleted file mode 100644 index c0dd06737a..0000000000 --- a/package/lttng-tools/0003-Set-thread-stack-size-to-ulimit-soft-value.patch +++ /dev/null @@ -1,431 +0,0 @@ -From 451f4d875537c073a966d6ccfb2fe08a497fbd7b Mon Sep 17 00:00:00 2001 -From: Michael Jeanson -Date: Wed, 15 Jun 2016 11:01:08 -0500 -Subject: [PATCH] Set thread stack size to ulimit soft value - -Signed-off-by: Michael Jeanson -[Philippe: grabbed from the mailing list: - https://lists.lttng.org/pipermail/lttng-dev/2016-June/026196.html -] -Signed-off-by: Philippe Proulx ---- - src/bin/lttng-consumerd/lttng-consumerd.c | 17 ++++++---- - src/bin/lttng-relayd/live.c | 10 +++--- - src/bin/lttng-relayd/live.h | 2 +- - src/bin/lttng-relayd/main.c | 14 +++++--- - src/bin/lttng-sessiond/main.c | 27 +++++++++------ - src/common/utils.c | 56 +++++++++++++++++++++++++++++++ - src/common/utils.h | 1 + - 7 files changed, 99 insertions(+), 28 deletions(-) - -diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c -index 00660fc..2f1d01c 100644 ---- a/src/bin/lttng-consumerd/lttng-consumerd.c -+++ b/src/bin/lttng-consumerd/lttng-consumerd.c -@@ -57,6 +57,8 @@ - static pthread_t channel_thread, data_thread, metadata_thread, - sessiond_thread, metadata_timer_thread, health_thread; - -+static pthread_attr_t *tattr; -+ - /* to count the number of times the user pressed ctrl+c */ - static int sigintcount = 0; - -@@ -351,6 +353,9 @@ int main(int argc, char **argv) - } - } - -+ /* Get stacksize limit */ -+ tattr = get_pthread_attr_stacksize(); -+ - /* - * Starting from here, we can create threads. This needs to be after - * lttng_daemonize due to RCU. -@@ -498,7 +503,7 @@ int main(int argc, char **argv) - } - - /* Create thread to manage the client socket */ -- ret = pthread_create(&health_thread, NULL, -+ ret = pthread_create(&health_thread, tattr, - thread_manage_health, (void *) NULL); - if (ret) { - errno = ret; -@@ -517,7 +522,7 @@ int main(int argc, char **argv) - cmm_smp_mb(); /* Read ready before following operations */ - - /* Create thread to manage channels */ -- ret = pthread_create(&channel_thread, NULL, -+ ret = pthread_create(&channel_thread, tattr, - consumer_thread_channel_poll, - (void *) ctx); - if (ret) { -@@ -528,7 +533,7 @@ int main(int argc, char **argv) - } - - /* Create thread to manage the polling/writing of trace metadata */ -- ret = pthread_create(&metadata_thread, NULL, -+ ret = pthread_create(&metadata_thread, tattr, - consumer_thread_metadata_poll, - (void *) ctx); - if (ret) { -@@ -539,7 +544,7 @@ int main(int argc, char **argv) - } - - /* Create thread to manage the polling/writing of trace data */ -- ret = pthread_create(&data_thread, NULL, consumer_thread_data_poll, -+ ret = pthread_create(&data_thread, tattr, consumer_thread_data_poll, - (void *) ctx); - if (ret) { - errno = ret; -@@ -549,7 +554,7 @@ int main(int argc, char **argv) - } - - /* Create the thread to manage the receive of fd */ -- ret = pthread_create(&sessiond_thread, NULL, -+ ret = pthread_create(&sessiond_thread, tattr, - consumer_thread_sessiond_poll, - (void *) ctx); - if (ret) { -@@ -563,7 +568,7 @@ int main(int argc, char **argv) - * Create the thread to manage the UST metadata periodic timer and - * live timer. - */ -- ret = pthread_create(&metadata_timer_thread, NULL, -+ ret = pthread_create(&metadata_timer_thread, tattr, - consumer_timer_thread, (void *) ctx); - if (ret) { - errno = ret; -diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c -index e2096ec..32efab1 100644 ---- a/src/bin/lttng-relayd/live.c -+++ b/src/bin/lttng-relayd/live.c -@@ -2147,13 +2147,13 @@ int relayd_live_join(void) - /* - * main - */ --int relayd_live_create(struct lttng_uri *uri) -+int relayd_live_create(struct lttng_uri *uri, const pthread_attr_t *tattr) - { - int ret = 0, retval = 0; - void *status; - int is_root; - -- if (!uri) { -+ if (!uri || !tattr) { - retval = -1; - goto exit_init_data; - } -@@ -2186,7 +2186,7 @@ int relayd_live_create(struct lttng_uri *uri) - } - - /* Setup the dispatcher thread */ -- ret = pthread_create(&live_dispatcher_thread, NULL, -+ ret = pthread_create(&live_dispatcher_thread, tattr, - thread_dispatcher, (void *) NULL); - if (ret) { - errno = ret; -@@ -2196,7 +2196,7 @@ int relayd_live_create(struct lttng_uri *uri) - } - - /* Setup the worker thread */ -- ret = pthread_create(&live_worker_thread, NULL, -+ ret = pthread_create(&live_worker_thread, tattr, - thread_worker, NULL); - if (ret) { - errno = ret; -@@ -2206,7 +2206,7 @@ int relayd_live_create(struct lttng_uri *uri) - } - - /* Setup the listener thread */ -- ret = pthread_create(&live_listener_thread, NULL, -+ ret = pthread_create(&live_listener_thread, tattr, - thread_listener, (void *) NULL); - if (ret) { - errno = ret; -diff --git a/src/bin/lttng-relayd/live.h b/src/bin/lttng-relayd/live.h -index 2b8a3a0..6cd85e9 100644 ---- a/src/bin/lttng-relayd/live.h -+++ b/src/bin/lttng-relayd/live.h -@@ -24,7 +24,7 @@ - - #include "lttng-relayd.h" - --int relayd_live_create(struct lttng_uri *live_uri); -+int relayd_live_create(struct lttng_uri *live_uri, const pthread_attr_t *tattr); - int relayd_live_stop(void); - int relayd_live_join(void); - -diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c -index 6ad6566..505e884 100644 ---- a/src/bin/lttng-relayd/main.c -+++ b/src/bin/lttng-relayd/main.c -@@ -119,6 +119,8 @@ static pthread_t dispatcher_thread; - static pthread_t worker_thread; - static pthread_t health_thread; - -+static pthread_attr_t *tattr; -+ - /* - * last_relay_stream_id_lock protects last_relay_stream_id increment - * atomicity on 32-bit architectures. -@@ -2778,6 +2780,8 @@ int main(int argc, char **argv) - } - } - -+ /* Get stack size limit */ -+ tattr = get_pthread_attr_stacksize(); - - /* Initialize thread health monitoring */ - health_relayd = health_app_create(NR_HEALTH_RELAYD_TYPES); -@@ -2840,7 +2844,7 @@ int main(int argc, char **argv) - } - - /* Create thread to manage the client socket */ -- ret = pthread_create(&health_thread, NULL, -+ ret = pthread_create(&health_thread, tattr, - thread_manage_health, (void *) NULL); - if (ret) { - errno = ret; -@@ -2850,7 +2854,7 @@ int main(int argc, char **argv) - } - - /* Setup the dispatcher thread */ -- ret = pthread_create(&dispatcher_thread, NULL, -+ ret = pthread_create(&dispatcher_thread, tattr, - relay_thread_dispatcher, (void *) NULL); - if (ret) { - errno = ret; -@@ -2860,7 +2864,7 @@ int main(int argc, char **argv) - } - - /* Setup the worker thread */ -- ret = pthread_create(&worker_thread, NULL, -+ ret = pthread_create(&worker_thread, tattr, - relay_thread_worker, NULL); - if (ret) { - errno = ret; -@@ -2870,7 +2874,7 @@ int main(int argc, char **argv) - } - - /* Setup the listener thread */ -- ret = pthread_create(&listener_thread, NULL, -+ ret = pthread_create(&listener_thread, tattr, - relay_thread_listener, (void *) NULL); - if (ret) { - errno = ret; -@@ -2879,7 +2883,7 @@ int main(int argc, char **argv) - goto exit_listener_thread; - } - -- ret = relayd_live_create(live_uri); -+ ret = relayd_live_create(live_uri, tattr); - if (ret) { - ERR("Starting live viewer threads"); - retval = -1; -diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c -index c8e4e53..b8f1bde 100644 ---- a/src/bin/lttng-sessiond/main.c -+++ b/src/bin/lttng-sessiond/main.c -@@ -212,6 +212,8 @@ static pthread_t ht_cleanup_thread; - static pthread_t agent_reg_thread; - static pthread_t load_session_thread; - -+static pthread_attr_t *tattr; -+ - /* - * UST registration command queue. This queue is tied with a futex and uses a N - * wakers / 1 waiter implemented and detailed in futex.c/.h -@@ -2402,7 +2404,7 @@ static int spawn_consumer_thread(struct consumer_data *consumer_data) - goto error; - } - -- ret = pthread_create(&consumer_data->thread, NULL, thread_manage_consumer, -+ ret = pthread_create(&consumer_data->thread, tattr, thread_manage_consumer, - consumer_data); - if (ret) { - errno = ret; -@@ -5638,6 +5640,9 @@ int main(int argc, char **argv) - goto exit_create_run_as_worker_cleanup; - } - -+ /* Get stack size limit */ -+ tattr = get_pthread_attr_stacksize(); -+ - /* - * Starting from here, we can create threads. This needs to be after - * lttng_daemonize due to RCU. -@@ -5672,7 +5677,7 @@ int main(int argc, char **argv) - } - - /* Create thread to clean up RCU hash tables */ -- ret = pthread_create(&ht_cleanup_thread, NULL, -+ ret = pthread_create(&ht_cleanup_thread, tattr, - thread_ht_cleanup, (void *) NULL); - if (ret) { - errno = ret; -@@ -6044,7 +6049,7 @@ int main(int argc, char **argv) - load_info->path = opt_load_session_path; - - /* Create health-check thread */ -- ret = pthread_create(&health_thread, NULL, -+ ret = pthread_create(&health_thread, tattr, - thread_manage_health, (void *) NULL); - if (ret) { - errno = ret; -@@ -6054,7 +6059,7 @@ int main(int argc, char **argv) - } - - /* Create thread to manage the client socket */ -- ret = pthread_create(&client_thread, NULL, -+ ret = pthread_create(&client_thread, tattr, - thread_manage_clients, (void *) NULL); - if (ret) { - errno = ret; -@@ -6064,7 +6069,7 @@ int main(int argc, char **argv) - } - - /* Create thread to dispatch registration */ -- ret = pthread_create(&dispatch_thread, NULL, -+ ret = pthread_create(&dispatch_thread, tattr, - thread_dispatch_ust_registration, (void *) NULL); - if (ret) { - errno = ret; -@@ -6074,7 +6079,7 @@ int main(int argc, char **argv) - } - - /* Create thread to manage application registration. */ -- ret = pthread_create(®_apps_thread, NULL, -+ ret = pthread_create(®_apps_thread, tattr, - thread_registration_apps, (void *) NULL); - if (ret) { - errno = ret; -@@ -6084,7 +6089,7 @@ int main(int argc, char **argv) - } - - /* Create thread to manage application socket */ -- ret = pthread_create(&apps_thread, NULL, -+ ret = pthread_create(&apps_thread, tattr, - thread_manage_apps, (void *) NULL); - if (ret) { - errno = ret; -@@ -6094,7 +6099,7 @@ int main(int argc, char **argv) - } - - /* Create thread to manage application notify socket */ -- ret = pthread_create(&apps_notify_thread, NULL, -+ ret = pthread_create(&apps_notify_thread, tattr, - ust_thread_manage_notify, (void *) NULL); - if (ret) { - errno = ret; -@@ -6104,7 +6109,7 @@ int main(int argc, char **argv) - } - - /* Create agent registration thread. */ -- ret = pthread_create(&agent_reg_thread, NULL, -+ ret = pthread_create(&agent_reg_thread, tattr, - agent_thread_manage_registration, (void *) NULL); - if (ret) { - errno = ret; -@@ -6116,7 +6121,7 @@ int main(int argc, char **argv) - /* Don't start this thread if kernel tracing is not requested nor root */ - if (is_root && !opt_no_kernel) { - /* Create kernel thread to manage kernel event */ -- ret = pthread_create(&kernel_thread, NULL, -+ ret = pthread_create(&kernel_thread, tattr, - thread_manage_kernel, (void *) NULL); - if (ret) { - errno = ret; -@@ -6127,7 +6132,7 @@ int main(int argc, char **argv) - } - - /* Create session loading thread. */ -- ret = pthread_create(&load_session_thread, NULL, thread_load_session, -+ ret = pthread_create(&load_session_thread, tattr, thread_load_session, - load_info); - if (ret) { - errno = ret; -diff --git a/src/common/utils.c b/src/common/utils.c -index 1e52ae0..593d6cc 100644 ---- a/src/common/utils.c -+++ b/src/common/utils.c -@@ -31,6 +31,8 @@ - #include - #include - #include -+#include -+#include - - #include - #include -@@ -1383,3 +1385,57 @@ int utils_show_man_page(int section, const char *page_name) - section_string, page_name, NULL); - return ret; - } -+ -+static bool pthread_ss_done = false; -+static pthread_attr_t *tattr = NULL; -+static pthread_attr_t tattr_value; -+ -+LTTNG_HIDDEN -+pthread_attr_t *get_pthread_attr_stacksize() { -+ int ret = 0; -+ size_t ptstacksize; -+ struct rlimit rlim; -+ -+ /* Return cached value */ -+ if (pthread_ss_done) { -+ goto end; -+ } -+ -+ /* Get stack size limits */ -+ ret = getrlimit(RLIMIT_STACK, &rlim); -+ if (ret < 0) { -+ PERROR("getrlimit"); -+ goto end; -+ } -+ DBG("Stack size limits: soft %lld, hard %lld bytes", -+ (long long) rlim.rlim_cur, -+ (long long) rlim.rlim_max); -+ -+ /* Get default thread stack size */ -+ ret = pthread_attr_getstacksize(&tattr_value, &ptstacksize); -+ if (ret < 0) { -+ PERROR("pthread_attr_getstacksize"); -+ goto end; -+ } -+ DBG("Default pthread stack size is %zu bytes", ptstacksize); -+ -+ /* Check if default thread stack size respects ulimits */ -+ if (ptstacksize < rlim.rlim_cur) { -+ DBG("Your libc doesn't honor stack size limits, setting thread stack size to soft limit (%lld bytes)", (long long) rlim.rlim_cur); -+ -+ /* Create pthread_attr_t struct with ulimit stack size */ -+ ret = pthread_attr_setstacksize(&tattr_value, rlim.rlim_cur); -+ if (ret < 0) { -+ PERROR("pthread_attr_setstacksize"); -+ goto end; -+ } -+ -+ /* Set pointer */ -+ tattr = &tattr_value; -+ } -+ -+ /* Enable cached value */ -+ pthread_ss_done = true; -+end: -+ return tattr; -+} -diff --git a/src/common/utils.h b/src/common/utils.h -index 7285f5c..568c123 100644 ---- a/src/common/utils.h -+++ b/src/common/utils.h -@@ -60,5 +60,6 @@ int utils_create_lock_file(const char *filepath); - int utils_recursive_rmdir(const char *path); - int utils_truncate_stream_file(int fd, off_t length); - int utils_show_man_page(int section, const char *page_name); -+pthread_attr_t *get_pthread_attr_stacksize(); - - #endif /* _COMMON_UTILS_H */ --- -2.7.4 - diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash index 267da806d5..729ccf283c 100644 --- a/package/lttng-tools/lttng-tools.hash +++ b/package/lttng-tools/lttng-tools.hash @@ -1,6 +1,3 @@ -# From http://lttng.org/files/lttng-tools/lttng-tools-2.8.2.tar.bz2.{md5,sha1} -md5 cac8d64111711ae1b632d0dc12fe92c1 lttng-tools-2.8.2.tar.bz2 -sha1 870874ba9644691de8e564a1fa1459aa5fef42ba lttng-tools-2.8.2.tar.bz2 - -# Locally generated -sha256 a07e00e9519dad2577d9330bcaf040ab3dc1b289fbcb8c702c39d520422e7565 lttng-tools-2.8.2.tar.bz2 +# From http://lttng.org/files/lttng-tools/lttng-tools-2.9.0.tar.bz2.{md5,sha1} +md5 75b5feb18aa2a136ebf70a14d2a5a6e5 lttng-tools-2.9.0.tar.bz2 +sha1 299158fd8614e45ee596d793696feb86cdea34b2 lttng-tools-2.9.0.tar.bz2 diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index 0591633b25..66ac687910 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.8.2 +LTTNG_TOOLS_VERSION = 2.9.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+ (include/lttng/*, src/lib/lttng-ctl/*) From 49ad7e6a696979165c0441c22df2b1d5dcac8658 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 17:04:43 +0000 Subject: [PATCH 1603/3392] lttng-modules: bump version to 2.9.0 Release notes: https://lists.lttng.org/pipermail/lttng-dev/2016-November/026760.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/lttng-modules/lttng-modules.hash | 6 +++--- package/lttng-modules/lttng-modules.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index ce725ec51a..d8314f6e79 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,3 +1,3 @@ -# From http://lttng.org/files/lttng-modules/lttng-modules-2.8.3.tar.bz2.{md5,sha1} -md5 424354c4834d20235dacd9a1fd7653b6 lttng-modules-2.8.3.tar.bz2 -sha1 862705784a54962f70226004f1fd0bf77f73f10f lttng-modules-2.8.3.tar.bz2 +# From http://lttng.org/files/lttng-modules/lttng-modules-2.9.0.tar.bz2.{md5,sha1} +md5 717df375ccb6f32bb297cc2f2e692bbf lttng-modules-2.9.0.tar.bz2 +sha1 819ee1c2a5a821b7fdc1c2fc102ef3079c32aad7 lttng-modules-2.9.0.tar.bz2 diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index 9ecf572d3a..aa0ac30b24 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.8.3 +LTTNG_MODULES_VERSION = 2.9.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 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) From 5b0dac7ef5d8106ec77d128c53f480fd8721c05c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 17:04:44 +0000 Subject: [PATCH 1604/3392] lttng-babeltrace: bump version to 1.5.0 Drop sha256 hash. The combination of md5 and sha1 hashes is enough. Release notes: https://lists.lttng.org/pipermail/lttng-dev/2016-November/026762.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/lttng-babeltrace/lttng-babeltrace.hash | 9 +++------ package/lttng-babeltrace/lttng-babeltrace.mk | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/lttng-babeltrace/lttng-babeltrace.hash b/package/lttng-babeltrace/lttng-babeltrace.hash index bca0bdb902..7f91b8b643 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.hash +++ b/package/lttng-babeltrace/lttng-babeltrace.hash @@ -1,6 +1,3 @@ -# From http://www.efficios.com/files/babeltrace/babeltrace-1.4.0.tar.bz2.{md5,sha1} -md5 fa99064048af5c9c6ff00e489ac809c2 babeltrace-1.4.0.tar.bz2 -sha1 3b162480ee883625e8581bf163817f78a4b6487b babeltrace-1.4.0.tar.bz2 - -# Locally generated -sha256 9469eeb22617cd12668683b04c27003e5337e9ac66ade914988df3642fc0d0e4 babeltrace-1.4.0.tar.bz2 +# From http://www.efficios.com/files/babeltrace/babeltrace-1.5.0.tar.bz2.{md5,sha1} +md5 43696383e44d1b85173db7cbd0335f06 babeltrace-1.5.0.tar.bz2 +sha1 13f106951c418632a2155ebe3cea51fa4929e748 babeltrace-1.5.0.tar.bz2 diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk index 59327dbf5d..7d4b520db0 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.mk +++ b/package/lttng-babeltrace/lttng-babeltrace.mk @@ -5,7 +5,7 @@ ################################################################################ LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace -LTTNG_BABELTRACE_VERSION = 1.4.0 +LTTNG_BABELTRACE_VERSION = 1.5.0 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code) LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE From cf865e061e38f1a32ae5c2d47e10c00441f33c4e Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 17:04:45 +0000 Subject: [PATCH 1605/3392] lttng-libust: bump version to 2.9.0 Drop sha256 hash. The combination of md5 and sha1 hashes is enough. Add a patch that fixes a build failure due to using the compiler of the host machine. The patch has been submitted as a pull request: https://github.com/lttng/lttng-ust/pull/41 Release notes: https://lists.lttng.org/pipermail/lttng-dev/2016-November/026761.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- ...efile.am-define-C-and-C-compilers-fo.patch | 49 +++++++++++++++++++ package/lttng-libust/lttng-libust.hash | 9 ++-- package/lttng-libust/lttng-libust.mk | 2 +- 3 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch diff --git a/package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch b/package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch new file mode 100644 index 0000000000..5172dbbf20 --- /dev/null +++ b/package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch @@ -0,0 +1,49 @@ +From f54894580da85e33f934c5c9bf5ab32d3fcce18b Mon Sep 17 00:00:00 2001 +From: Vicente Olivert Riera +Date: Wed, 30 Nov 2016 16:52:51 +0000 +Subject: [PATCH] doc/examples/Makefile.am: define C and C++ compilers for + CMake + +This prevents build failures when cross-compiling. + +If we don't define the compiler, it will use the one from the host +machine. For instance "/usr/bin/c++", which is incorrect. + +The failure looks like this: + +............................................................. +[ 10%] Building CXX object CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o +/usr/bin/c++ -Dtracepoint_provider_EXPORTS -I/br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/. -isystem /br/output/build/lttng-libust-2.9.0/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -o CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o -c /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp +In file included from /br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint.h:29:0, + from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h:32, + from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp:26: +/br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint-rcu.h:26:27: fatal error: urcu/compiler.h: No such file or directory + #include + ^ +compilation terminated. +............................................................. + +Pull request URL: https://github.com/lttng/lttng-ust/pull/41 + +Signed-off-by: Vicente Olivert Riera +--- + doc/examples/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am +index 424b844..5bc1f4c 100644 +--- a/doc/examples/Makefile.am ++++ b/doc/examples/Makefile.am +@@ -152,7 +152,9 @@ all-local: + cmake \ + -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \ + -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \ ++ -DCMAKE_C_COMPILER="$(CC)" \ + -DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \ ++ -DCMAKE_CXX_COMPILER="$(CXX)" \ + -DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \ + .. && \ +-- +2.10.1 + diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash index a4a2907477..e080361a57 100644 --- a/package/lttng-libust/lttng-libust.hash +++ b/package/lttng-libust/lttng-libust.hash @@ -1,6 +1,3 @@ -# From http://lttng.org/files/lttng-ust/lttng-ust-2.8.1.tar.bz2.{md5,sha1} -md5 be505077245dc05f93370a565eec15f4 lttng-ust-2.8.1.tar.bz2 -sha1 8bebdcbcb453d2643fb226dbe92de61764f1ee3b lttng-ust-2.8.1.tar.bz2 - -# Locally generated -sha256 6e41349107e83e7b43c69ed358e48788ca2fd095bad61737b850e3f3d2c0508a lttng-ust-2.8.1.tar.bz2 +# From http://lttng.org/files/lttng-ust/lttng-ust-2.9.0.tar.bz2.{md5,sha1} +md5 77f3378ba37a36801420bce87b702e9c lttng-ust-2.9.0.tar.bz2 +sha1 9937eae64540821b8597cce081e92be76e6b5568 lttng-ust-2.9.0.tar.bz2 diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index 7a83f46421..23cc745392 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.8.1 +LTTNG_LIBUST_VERSION = 2.9.0 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING From 34c6e2510e9f23f905123e1c1ff94f2acc84b38b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 30 Nov 2016 17:10:39 +0100 Subject: [PATCH 1606/3392] lsqlite3: bump to version 0.9.4 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lsqlite3/lsqlite3.hash | 2 +- package/lsqlite3/lsqlite3.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lsqlite3/lsqlite3.hash b/package/lsqlite3/lsqlite3.hash index 23273bbf91..e7d3ce024b 100644 --- a/package/lsqlite3/lsqlite3.hash +++ b/package/lsqlite3/lsqlite3.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b49b5941af92a6e7834a45f76dba1f6ea8f817cda373655f59c9da78416d1dfc lsqlite3-0.9.3-0.src.rock +sha256 090282f9b8df614d70d07442ba82de3cc02a2f44cb1059fda648155d4d7e52ef lsqlite3-0.9.4-2.src.rock diff --git a/package/lsqlite3/lsqlite3.mk b/package/lsqlite3/lsqlite3.mk index db65ae530f..6f6445d934 100644 --- a/package/lsqlite3/lsqlite3.mk +++ b/package/lsqlite3/lsqlite3.mk @@ -4,8 +4,8 @@ # ################################################################################ -LSQLITE3_VERSION = 0.9.3-0 -LSQLITE3_SUBDIR = lsqlite3_fsl09w +LSQLITE3_VERSION = 0.9.4-2 +LSQLITE3_SUBDIR = lsqlite3_fsl09x LSQLITE3_DEPENDENCIES = sqlite LSQLITE3_LICENSE = MIT From 35f10cd5baf555b7d2a22d954ea50ffb85e738f3 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 30 Nov 2016 17:10:40 +0100 Subject: [PATCH 1607/3392] lua-messagepack: bump to version 0.3.6 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lua-messagepack/lua-messagepack.hash | 4 ++-- package/lua-messagepack/lua-messagepack.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lua-messagepack/lua-messagepack.hash b/package/lua-messagepack/lua-messagepack.hash index 87e42d898d..d5858db27f 100644 --- a/package/lua-messagepack/lua-messagepack.hash +++ b/package/lua-messagepack/lua-messagepack.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7136e47a37f01960c244fe0ad42215e2cf6e96f50cb7292c5295fa3e93fd50c1 lua-messagepack-0.3.5-1.src.rock -sha256 b8d1c3cff8eef0b8ef1a3287228cfac4149933744235d3a5d88d65d4e3b048bb lua-messagepack-lua53-0.3.5-1.src.rock +sha256 706e99424cfd4d86deed10764fb2d0094bac006c0c5be449470992e9f0779ffa lua-messagepack-0.3.6-1.src.rock +sha256 d3a82aea6423213f399735b291a6887b230fb3bb9bcfe7b530532f1756308566 lua-messagepack-lua53-0.3.6-1.src.rock diff --git a/package/lua-messagepack/lua-messagepack.mk b/package/lua-messagepack/lua-messagepack.mk index f8cc132dcf..4bd3fddef3 100644 --- a/package/lua-messagepack/lua-messagepack.mk +++ b/package/lua-messagepack/lua-messagepack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.3.5 +LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.3.6 ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_MESSAGEPACK_VERSION = lua53-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 else From b022d9301f999481ac26af7d8074002be5d49705 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 30 Nov 2016 17:10:41 +0100 Subject: [PATCH 1608/3392] luarocks: bump to version 2.4.2 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/luarocks/luarocks.hash | 2 +- package/luarocks/luarocks.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index c35383a532..fb01993f09 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e429e0af9764bfd5cb640cac40f9d4ed1023fa17c052dff82ed0a41c05f3dcf9 luarocks-2.4.1.tar.gz +sha256 0e1ec34583e1b265e0fbafb64c8bd348705ad403fe85967fd05d3a659f74d2e5 luarocks-2.4.2.tar.gz diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 64c8d5b948..4e0d537ff7 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 2.4.1 +LUAROCKS_VERSION = 2.4.2 LUAROCKS_SITE = http://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING From c8fa916ffcc491c1ab0a7fc728d642ac34cc0abb Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 15:57:42 +0000 Subject: [PATCH 1609/3392] libgtk3: bump version to 3.22.4 Release notes: http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.4.news Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 1c58efc2fc..e1d93b3304 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.3.sha256sum -sha256 e190ab1a9a893861b8e8be341aa57bce8b7146d6445ebfe5a8ab64236fe82ed3 gtk+-3.22.3.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.4.sha256sum +sha256 7094a6fcfe133d01c578358bd5d3e499715f1a0206e87bd5cf6c834e301f387f gtk+-3.22.4.tar.xz diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 0b9a9992ef..4a686e0130 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.22 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).3 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).4 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPLv2+ From b7d89940a28777dc4226b421bc6498774c2446d9 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 30 Nov 2016 17:21:52 +0000 Subject: [PATCH 1610/3392] ncftp: bump version to 3.2.6 Upstream provides xz tarballs instead of bz2, so make the switch. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni --- package/ncftp/ncftp.hash | 2 +- package/ncftp/ncftp.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ncftp/ncftp.hash b/package/ncftp/ncftp.hash index 11695894f2..0a7c26c9b2 100644 --- a/package/ncftp/ncftp.hash +++ b/package/ncftp/ncftp.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 b4ebe2415761a5137cd1d313c8fc1352f26d8963cc9e9e354e29720aa2089d42 ncftp-3.2.5-src.tar.bz2 +sha256 7abd3e8f848f0efb4bb6a4bc5da58a59524d4378fc8d70a52adb0fe1fd00b89d ncftp-3.2.6-src.tar.xz diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 28b03b8800..5c88556a39 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -4,8 +4,8 @@ # ################################################################################ -NCFTP_VERSION = 3.2.5 -NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.bz2 +NCFTP_VERSION = 3.2.6 +NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz NCFTP_SITE = ftp://ftp.ncftp.com/ncftp NCFTP_TARGET_BINS = ncftp NCFTP_LICENSE = Clarified Artistic License From 41fc9e40a5c647d6d074da7f5a41892f3aca37d8 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 29 Nov 2016 15:36:51 -0800 Subject: [PATCH 1611/3392] package/gcc: fix ICE on xtensa, 6.2, PR target/78118 This fixes gcc build for xtensa configurations with call0 ABI. Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni --- .../870-xtensa-Fix-PR-target-78118.patch | 320 ++++++++++++++++++ 1 file changed, 320 insertions(+) create mode 100644 package/gcc/6.2.0/870-xtensa-Fix-PR-target-78118.patch diff --git a/package/gcc/6.2.0/870-xtensa-Fix-PR-target-78118.patch b/package/gcc/6.2.0/870-xtensa-Fix-PR-target-78118.patch new file mode 100644 index 0000000000..0598c76c2f --- /dev/null +++ b/package/gcc/6.2.0/870-xtensa-Fix-PR-target-78118.patch @@ -0,0 +1,320 @@ +From 0d2556fa652cc85b3d042e862a38dd07d454175a Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Wed, 26 Oct 2016 08:02:51 +0000 +Subject: [PATCH 1/2] xtensa: Fix PR target/78118 + +It started failing after the following commit: 32e90dc6a0cda45 ("PR +rtl-optimization/61047"). + +The change that made xtensa backend go ICE looks completely unrelated, +and indeed, the issue is caused by the side effect of +compute_frame_size() function call hidden in the +INITIAL_ELIMINATION_OFFSET macro. This call updates the value of the +xtensa_current_frame_size static variable, used in "return" instruction +predicate. Prior to the change the value of xtensa_current_frame_size was +set to 0 after the end of epilogue generation, which enabled the "return" +instruction for the CALL0 ABI, but after the change the additional +INITIAL_ELIMINATION_OFFSET calls make xtensa_current_frame_size non-zero +and "return" pattern unavailable. + +Get rid of the global xtensa_current_frame_size and +xtensa_callee_save_size variables by moving them into the +machine_function structure. Implement predicate for the "return" pattern +as a function. Don't communicate completion of epilogue generation +through zeroing of xtensa_current_frame_size, add explicit epilogue_done +variable to the machine_function structure. Don't update stack frame +layout after the completion of reload. + +2016-10-26 Max Filippov +gcc/ + * config/xtensa/xtensa-protos.h + (xtensa_use_return_instruction_p): New prototype. + * config/xtensa/xtensa.c (xtensa_current_frame_size, + xtensa_callee_save_size): Remove. + (struct machine_function): Add new fields: current_frame_size, + callee_save_size, frame_laid_out and epilogue_done. + (compute_frame_size, xtensa_expand_prologue, + xtensa_expand_epilogue): Replace xtensa_callee_save_size with + cfun->machine->callee_save_size and xtensa_current_frame_size + with cfun->machine->current_frame_size. + (compute_frame_size): Update cfun->machine->frame_laid_out and + don't update frame layout after reload completion. + (xtensa_expand_epilogue): Set cfun->machine->epilogue_done + instead of zeroing xtensa_current_frame_size. + (xtensa_use_return_instruction_p): New function. + * config/xtensa/xtensa.h (xtensa_current_frame_size): Remove + declaration. + (INITIAL_ELIMINATION_OFFSET): Use return value of + compute_frame_size instead of xtensa_current_frame_size value. + * config/xtensa/xtensa.md ("return" pattern): Use new predicate + function xtensa_use_return_instruction_p instead of inline code. + +Signed-off-by: Max Filippov +--- +Backported from: r241748 + + gcc/config/xtensa/xtensa-protos.h | 1 + + gcc/config/xtensa/xtensa.c | 82 ++++++++++++++++++++++++--------------- + gcc/config/xtensa/xtensa.h | 6 +-- + gcc/config/xtensa/xtensa.md | 2 +- + 4 files changed, 55 insertions(+), 36 deletions(-) + +diff --git a/gcc/config/xtensa/xtensa-protos.h b/gcc/config/xtensa/xtensa-protos.h +index f2ca526..873557f 100644 +--- a/gcc/config/xtensa/xtensa-protos.h ++++ b/gcc/config/xtensa/xtensa-protos.h +@@ -68,6 +68,7 @@ extern rtx xtensa_return_addr (int, rtx); + extern void xtensa_setup_frame_addresses (void); + extern int xtensa_dbx_register_number (int); + extern long compute_frame_size (int); ++extern bool xtensa_use_return_instruction_p (void); + extern void xtensa_expand_prologue (void); + extern void xtensa_expand_epilogue (void); + extern void order_regs_for_local_alloc (void); +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 64d089b..e49f784 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -78,11 +78,6 @@ enum internal_test + can support a given mode. */ + char xtensa_hard_regno_mode_ok[(int) MAX_MACHINE_MODE][FIRST_PSEUDO_REGISTER]; + +-/* Current frame size calculated by compute_frame_size. */ +-unsigned xtensa_current_frame_size; +-/* Callee-save area size in the current frame calculated by compute_frame_size. */ +-int xtensa_callee_save_size; +- + /* Largest block move to handle in-line. */ + #define LARGEST_MOVE_RATIO 15 + +@@ -94,6 +89,13 @@ struct GTY(()) machine_function + bool vararg_a7; + rtx vararg_a7_copy; + rtx_insn *set_frame_ptr_insn; ++ /* Current frame size calculated by compute_frame_size. */ ++ unsigned current_frame_size; ++ /* Callee-save area size in the current frame calculated by ++ compute_frame_size. */ ++ int callee_save_size; ++ bool frame_laid_out; ++ bool epilogue_done; + }; + + /* Vector, indexed by hard register number, which contains 1 for a +@@ -2628,24 +2630,29 @@ compute_frame_size (int size) + { + int regno; + ++ if (reload_completed && cfun->machine->frame_laid_out) ++ return cfun->machine->current_frame_size; ++ + /* Add space for the incoming static chain value. */ + if (cfun->static_chain_decl != NULL) + size += (1 * UNITS_PER_WORD); + +- xtensa_callee_save_size = 0; ++ cfun->machine->callee_save_size = 0; + for (regno = 0; regno < FIRST_PSEUDO_REGISTER; ++regno) + { + if (xtensa_call_save_reg(regno)) +- xtensa_callee_save_size += UNITS_PER_WORD; ++ cfun->machine->callee_save_size += UNITS_PER_WORD; + } + +- xtensa_current_frame_size = ++ cfun->machine->current_frame_size = + XTENSA_STACK_ALIGN (size +- + xtensa_callee_save_size ++ + cfun->machine->callee_save_size + + crtl->outgoing_args_size + + (WINDOW_SIZE * UNITS_PER_WORD)); +- xtensa_callee_save_size = XTENSA_STACK_ALIGN (xtensa_callee_save_size); +- return xtensa_current_frame_size; ++ cfun->machine->callee_save_size = ++ XTENSA_STACK_ALIGN (cfun->machine->callee_save_size); ++ cfun->machine->frame_laid_out = true; ++ return cfun->machine->current_frame_size; + } + + +@@ -2696,6 +2703,7 @@ xtensa_expand_prologue (void) + { + int regno; + HOST_WIDE_INT offset = 0; ++ int callee_save_size = cfun->machine->callee_save_size; + + /* -128 is a limit of single addi instruction. */ + if (total_size > 0 && total_size <= 128) +@@ -2709,7 +2717,7 @@ xtensa_expand_prologue (void) + add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); + offset = total_size - UNITS_PER_WORD; + } +- else if (xtensa_callee_save_size) ++ else if (callee_save_size) + { + /* 1020 is maximal s32i offset, if the frame is bigger than that + * we move sp to the end of callee-saved save area, save and then +@@ -2717,13 +2725,13 @@ xtensa_expand_prologue (void) + if (total_size > 1024) + { + insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, +- GEN_INT (-xtensa_callee_save_size))); ++ GEN_INT (-callee_save_size))); + RTX_FRAME_RELATED_P (insn) = 1; + note_rtx = gen_rtx_SET (stack_pointer_rtx, + plus_constant (Pmode, stack_pointer_rtx, +- -xtensa_callee_save_size)); ++ -callee_save_size)); + add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); +- offset = xtensa_callee_save_size - UNITS_PER_WORD; ++ offset = callee_save_size - UNITS_PER_WORD; + } + else + { +@@ -2759,13 +2767,13 @@ xtensa_expand_prologue (void) + { + rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); + emit_move_insn (tmp_reg, GEN_INT (total_size - +- xtensa_callee_save_size)); ++ callee_save_size)); + insn = emit_insn (gen_subsi3 (stack_pointer_rtx, + stack_pointer_rtx, tmp_reg)); + RTX_FRAME_RELATED_P (insn) = 1; + note_rtx = gen_rtx_SET (stack_pointer_rtx, + plus_constant (Pmode, stack_pointer_rtx, +- xtensa_callee_save_size - ++ callee_save_size - + total_size)); + add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); + } +@@ -2833,21 +2841,21 @@ xtensa_expand_epilogue (void) + int regno; + HOST_WIDE_INT offset; + +- if (xtensa_current_frame_size > (frame_pointer_needed ? 127 : 1024)) ++ if (cfun->machine->current_frame_size > (frame_pointer_needed ? 127 : 1024)) + { + rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); +- emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size - +- xtensa_callee_save_size)); ++ emit_move_insn (tmp_reg, GEN_INT (cfun->machine->current_frame_size - ++ cfun->machine->callee_save_size)); + emit_insn (gen_addsi3 (stack_pointer_rtx, frame_pointer_needed ? + hard_frame_pointer_rtx : stack_pointer_rtx, + tmp_reg)); +- offset = xtensa_callee_save_size - UNITS_PER_WORD; ++ offset = cfun->machine->callee_save_size - UNITS_PER_WORD; + } + else + { + if (frame_pointer_needed) + emit_move_insn (stack_pointer_rtx, hard_frame_pointer_rtx); +- offset = xtensa_current_frame_size - UNITS_PER_WORD; ++ offset = cfun->machine->current_frame_size - UNITS_PER_WORD; + } + + /* Prevent reordering of saved a0 update and loading it back from +@@ -2867,16 +2875,16 @@ xtensa_expand_epilogue (void) + } + } + +- if (xtensa_current_frame_size > 0) ++ if (cfun->machine->current_frame_size > 0) + { + if (frame_pointer_needed || /* always reachable with addi */ +- xtensa_current_frame_size > 1024 || +- xtensa_current_frame_size <= 127) ++ cfun->machine->current_frame_size > 1024 || ++ cfun->machine->current_frame_size <= 127) + { +- if (xtensa_current_frame_size <= 127) +- offset = xtensa_current_frame_size; ++ if (cfun->machine->current_frame_size <= 127) ++ offset = cfun->machine->current_frame_size; + else +- offset = xtensa_callee_save_size; ++ offset = cfun->machine->callee_save_size; + + emit_insn (gen_addsi3 (stack_pointer_rtx, + stack_pointer_rtx, +@@ -2885,7 +2893,8 @@ xtensa_expand_epilogue (void) + else + { + rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); +- emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size)); ++ emit_move_insn (tmp_reg, ++ GEN_INT (cfun->machine->current_frame_size)); + emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, + tmp_reg)); + } +@@ -2896,11 +2905,22 @@ xtensa_expand_epilogue (void) + stack_pointer_rtx, + EH_RETURN_STACKADJ_RTX)); + } +- xtensa_current_frame_size = 0; +- xtensa_callee_save_size = 0; ++ cfun->machine->epilogue_done = true; + emit_jump_insn (gen_return ()); + } + ++bool ++xtensa_use_return_instruction_p (void) ++{ ++ if (!reload_completed) ++ return false; ++ if (TARGET_WINDOWED_ABI) ++ return true; ++ if (compute_frame_size (get_frame_size ()) == 0) ++ return true; ++ return cfun->machine->epilogue_done; ++} ++ + void + xtensa_set_return_address (rtx address, rtx scratch) + { +diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h +index 82e9900..58eb1b2 100644 +--- a/gcc/config/xtensa/xtensa.h ++++ b/gcc/config/xtensa/xtensa.h +@@ -23,8 +23,6 @@ along with GCC; see the file COPYING3. If not see + + /* External variables defined in xtensa.c. */ + +-extern unsigned xtensa_current_frame_size; +- + /* Macros used in the machine description to select various Xtensa + configuration options. */ + #ifndef XCHAL_HAVE_MUL32_HIGH +@@ -477,14 +475,14 @@ enum reg_class + /* Specify the initial difference between the specified pair of registers. */ + #define INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET) \ + do { \ +- compute_frame_size (get_frame_size ()); \ ++ long frame_size = compute_frame_size (get_frame_size ()); \ + switch (FROM) \ + { \ + case FRAME_POINTER_REGNUM: \ + (OFFSET) = 0; \ + break; \ + case ARG_POINTER_REGNUM: \ +- (OFFSET) = xtensa_current_frame_size; \ ++ (OFFSET) = frame_size; \ + break; \ + default: \ + gcc_unreachable (); \ +diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md +index db54a12..fcdb6c8 100644 +--- a/gcc/config/xtensa/xtensa.md ++++ b/gcc/config/xtensa/xtensa.md +@@ -1663,7 +1663,7 @@ + (define_insn "return" + [(return) + (use (reg:SI A0_REG))] +- "(TARGET_WINDOWED_ABI || !xtensa_current_frame_size) && reload_completed" ++ "xtensa_use_return_instruction_p ()" + { + return TARGET_WINDOWED_ABI ? + (TARGET_DENSITY ? "retw.n" : "retw") : +-- +2.1.4 + From 1816f875409de16b91d002fd383ade793c93f504 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 29 Nov 2016 15:37:49 -0800 Subject: [PATCH 1612/3392] package/gcc: fix ICE on xtensa, 5.x and 6.x, PR target/78603 Zero overhead loop optimization pass may incorrectly put start of the loop between a call and its CALL_ARG_LOCATION note, resulting in the following build error: ../src/pjlib-test/thread.c: In function 'thread_test': ../src/pjlib-test/thread.c:328:1: internal compiler error: in dwarf2out_var_location, at dwarf2out.c:21846 Fixes: http://autobuild.buildroot.net/results/d919e1276ce1d39b4b3eb09937927d5959cd69a3/ Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni --- .../876-xtensa-Fix-PR-target-78603.patch | 37 +++++++++++++++++++ .../871-xtensa-Fix-PR-target-78603.patch | 37 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 package/gcc/5.4.0/876-xtensa-Fix-PR-target-78603.patch create mode 100644 package/gcc/6.2.0/871-xtensa-Fix-PR-target-78603.patch diff --git a/package/gcc/5.4.0/876-xtensa-Fix-PR-target-78603.patch b/package/gcc/5.4.0/876-xtensa-Fix-PR-target-78603.patch new file mode 100644 index 0000000000..628268ada4 --- /dev/null +++ b/package/gcc/5.4.0/876-xtensa-Fix-PR-target-78603.patch @@ -0,0 +1,37 @@ +From e178289a12a829ec47dc5038d91401f65381e71d Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 29 Nov 2016 13:09:17 -0800 +Subject: [PATCH 8/8] xtensa: Fix PR target/78603 + +2016-11-29 Max Filippov +gcc/ + * config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero + overhead loop start between a call and its CALL_ARG_LOCATION + note. + +Signed-off-by: Max Filippov +--- +Backported from: r242979 + + gcc/config/xtensa/xtensa.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 206ff80..36ab1e3 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -4182,7 +4182,10 @@ hwloop_optimize (hwloop_info loop) + entry_after = BB_END (entry_bb); + while (DEBUG_INSN_P (entry_after) + || (NOTE_P (entry_after) +- && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK)) ++ && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK ++ /* Make sure we don't split a call and its corresponding ++ CALL_ARG_LOCATION note. */ ++ && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION)) + entry_after = PREV_INSN (entry_after); + + emit_insn_after (seq, entry_after); +-- +2.1.4 + diff --git a/package/gcc/6.2.0/871-xtensa-Fix-PR-target-78603.patch b/package/gcc/6.2.0/871-xtensa-Fix-PR-target-78603.patch new file mode 100644 index 0000000000..0331814398 --- /dev/null +++ b/package/gcc/6.2.0/871-xtensa-Fix-PR-target-78603.patch @@ -0,0 +1,37 @@ +From 59cce7b304a8cbbb508ba21ab2f9052d3ee9a9e3 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 29 Nov 2016 13:09:17 -0800 +Subject: [PATCH 2/2] xtensa: Fix PR target/78603 + +2016-11-29 Max Filippov +gcc/ + * config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero + overhead loop start between a call and its CALL_ARG_LOCATION + note. + +Signed-off-by: Max Filippov +--- +Backported from: r242979 + + gcc/config/xtensa/xtensa.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index e49f784..70f698a 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -4158,7 +4158,10 @@ hwloop_optimize (hwloop_info loop) + entry_after = BB_END (entry_bb); + while (DEBUG_INSN_P (entry_after) + || (NOTE_P (entry_after) +- && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK)) ++ && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK ++ /* Make sure we don't split a call and its corresponding ++ CALL_ARG_LOCATION note. */ ++ && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION)) + entry_after = PREV_INSN (entry_after); + + emit_insn_after (seq, entry_after); +-- +2.1.4 + From 30b4f9bae075931c7f2aa3b1efcca247829e264f Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Wed, 30 Nov 2016 08:50:19 -0500 Subject: [PATCH 1613/3392] sane-backends: disable static configuration While sane-backends can be compiled statically, it requires selection of a subset of scanner backends. Without this, all backends are compiled and link errors such as the following are generated: ../backend/.libs/libsane.a(libepsonds_la-epsonds.o):(.bss+0xc): multiple definition of `source_list' ../backend/.libs/libsane.a(libepson2_la-epson2.o):(.data+0x40): first defined here ../backend/.libs/libsane.a(libepsonds_la-epsonds.o):(.data+0x10): multiple definition of `mode_params' ../backend/.libs/libsane.a(libepson2_la-epson2.o):(.data+0x0): first defined here collect2: error: ld returned 1 exit status Buildroot currently doesn't allow fine grained selection of backends, so this disables static builds. Fixes: http://autobuild.buildroot.net/results/89c/89c6e4ec1596def74e72eb071ef4bf0f1a7cc9f8/ http://autobuild.buildroot.net/results/92a/92a54c99a9ba918ece4c56d7beb985729bee700b/ http://autobuild.buildroot.net/results/1b9/1b9eac5303dfed638063f3b18dfff5571a2c4231/ http://autobuild.buildroot.net/results/366/366979d0bd21dc2bf7f0336b9653ef3fd4e11123/ Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/sane-backends/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/sane-backends/Config.in b/package/sane-backends/Config.in index 8156e858dc..3e5a27ffe0 100644 --- a/package/sane-backends/Config.in +++ b/package/sane-backends/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SANE_BACKENDS bool "sane-backends" depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS help SANE - Scanner Access Now Easy @@ -9,3 +10,7 @@ config BR2_PACKAGE_SANE_BACKENDS Backends are included automatically based on the libraries that have been selected: libusb, jpeg, tiff, avahi (with dbus and libglib2), and netsnmp. + +comment "sane-backends needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS From c43b09a99fca22cd2e03e9d8370a23aaf4066a19 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Mon, 28 Nov 2016 13:54:30 -0800 Subject: [PATCH 1614/3392] Revert "jasper: Disable debugging when building for xtensa" This reverts commit 71d9b0c1f06896f113b09e941aa84d979bff5710. Now that -mauto-litpools is in TARGET_ABI when building for xtensa, -O0 builds succeed, so this workaround is no longer needed. Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni --- package/jasper/jasper.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index db86ae88e1..b2da07d763 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -14,10 +14,4 @@ JASPER_LICENSE_FILES = LICENSE # needed to fix rpath issue (http://autobuild.buildroot.net/results/307/307cac65287420252a5bb64715d9a1edd90e72fa/) JASPER_AUTORECONF = YES -# Xtensa gcc is unable to generate correct code with -O0 enabled by -# --enable-debug. Allow package build but disable debug. -ifeq ($(BR2_xtensa)$(BR2_ENABLE_DEBUG),yy) -JASPER_CONF_OPTS += --disable-debug -endif - $(eval $(autotools-package)) From 5b0c52282f3d42d9472b302d8c592db0e2a30a87 Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Tue, 29 Nov 2016 09:57:29 +1100 Subject: [PATCH 1615/3392] package/libdvbcsa: fix altivec problems on powerpc64 Fixes: http://autobuild.buildroot.net/results/e6d22f5e0258c7ebb8a3ed39c11e014c721cd219 Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- .../libdvbcsa/0001-altivec-powerpc64.patch | 33 +++++++++++++++++++ package/libdvbcsa/libdvbcsa.mk | 1 + 2 files changed, 34 insertions(+) create mode 100644 package/libdvbcsa/0001-altivec-powerpc64.patch diff --git a/package/libdvbcsa/0001-altivec-powerpc64.patch b/package/libdvbcsa/0001-altivec-powerpc64.patch new file mode 100644 index 0000000000..3605c146a7 --- /dev/null +++ b/package/libdvbcsa/0001-altivec-powerpc64.patch @@ -0,0 +1,33 @@ +Fix compile on powerpc64/powerpc64le w/ altivec + +Correct the type of some vectors passed to vec_slo() or vec_sro(), which only +takes a char vector. + +Signed-off-by: Sam Bobroff + +--- a/src/dvbcsa_bs_altivec.h 2016-11-28 14:33:34.410021500 +1100 ++++ b/src/dvbcsa_bs_altivec.h 2016-11-28 14:34:25.442238715 +1100 +@@ -64,7 +64,7 @@ + } + case 0x29: { + dvbcsa_bs_word_t x = vec_splat_u8(10); +- return (dvbcsa_bs_word_t)vec_add(vec_splat_u8(0x1),vec_rl(x,x)); ++ return (dvbcsa_bs_word_t)vec_add((dvbcsa_bs_word_t)vec_splat_u8(0x1),vec_rl(x,x)); + } + case 0x40: { + dvbcsa_bs_word_t x = vec_splat_u8(4); +@@ -99,10 +99,10 @@ + #define SHVAL_14 BS_VAL8(0e) + #define SHVAL_7 BS_VAL8(07) + +-#define BS_SHL(a, n) ({ dvbcsa_bs_word_t x = SHVAL_##n; vec_sll(vec_slo((a), x), x); }) +-#define BS_SHR(a, n) ({ dvbcsa_bs_word_t x = SHVAL_##n; vec_srl(vec_sro((a), x), x); }) +-#define BS_SHL8(a, n) ({ dvbcsa_bs_word_t x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_slo((a), x); }) +-#define BS_SHR8(a, n) ({ dvbcsa_bs_word_t x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_sro((a), x); }) ++#define BS_SHL(a, n) ({ vector unsigned char x = SHVAL_##n; vec_sll(vec_slo((a), x), x); }) ++#define BS_SHR(a, n) ({ vector unsigned char x = SHVAL_##n; vec_srl(vec_sro((a), x), x); }) ++#define BS_SHL8(a, n) ({ vector unsigned char x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_slo((a), x); }) ++#define BS_SHR8(a, n) ({ vector unsigned char x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_sro((a), x); }) + + #define BS_EXTRACT8(a, n) ((uint8_t*)&(a))[15 - (n)] + diff --git a/package/libdvbcsa/libdvbcsa.mk b/package/libdvbcsa/libdvbcsa.mk index 1472537938..dfbb4c2257 100644 --- a/package/libdvbcsa/libdvbcsa.mk +++ b/package/libdvbcsa/libdvbcsa.mk @@ -24,6 +24,7 @@ endif ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) LIBDVBCSA_CONF_OPTS += --enable-altivec +LIBDVBCSA_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -flax-vector-conversions" else LIBDVBCSA_CONF_OPTS += --disable-altivec endif From a7eb052ff8ba9234b3f8dafc8cf3986f5b39428e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 30 Nov 2016 23:15:21 +0100 Subject: [PATCH 1616/3392] Update for 2016.11 Signed-off-by: Peter Korsgaard --- CHANGES | 11 +++++++++++ Makefile | 2 +- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 880770923e..d52bcddf6d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,14 @@ +2016.11, Released November 30th, 2016 + + Minor fixes. + + Updated/fixed packages: bzip2, gcc, jasper, sane-backends, + uboot, uclibc + + Issues resolved (http://bugs.buildroot.org): + + #9451: packages/postgresql/postgresql.mk contains wrong POST... + 2016.11-rc3, Released November 28th, 2016 Fixes all over the tree, including a number of security fixes. diff --git a/Makefile b/Makefile index 1ce5f5be5d..fbf217a940 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2016.11-rc3 +export BR2_VERSION := 2016.11 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 51899ff65a..d7eef3bbc6 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,40 +8,40 @@
        Download
        -

        Latest stable release: 2016.08.1

        +

        Latest stable release: 2016.11

        - +
        - +
        -

        buildroot-2016.08.1.tar.gz

        -

        PGP signature

        +

        buildroot-2016.11.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2016.08.1.tar.bz2

        -

        PGP signature

        +

        buildroot-2016.11.tar.bz2

        +

        PGP signature

        - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
        diff --git a/docs/website/news.html b/docs/website/news.html index 11fd18a308..f12dfc6393 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

        News

          +
        • +
          +
          +
          +

          2016.11 released

          +

          30 November 2016

          +
          +
          +

          The stable 2016.11 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2016.11 release.

          +
          +
          +
          • +
        • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 5e56d5d8a1..66d9505b0f 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2016.08' +RELEASE='2016.11' ### Change here for more memory/cores ### VM_MEMORY=2048 From 701b113747167b5cc57187c4c5f220e4245c08fb Mon Sep 17 00:00:00 2001 From: James Knight Date: Fri, 18 Nov 2016 13:50:53 -0500 Subject: [PATCH 1617/3392] rpm: switch to version 4.13.0 Switch from RPM5's implementation to rpm.org's more active stream [1]. The history of RPM and the common RPM5-fork is covered in an LWN article "Who maintains RPM?" [2]. Since rpm.org's implementation is used/ maintained on most RPM-based distributions as well as a series of other minor details (see [3]), the switch is being made. [1]: http://lists.buildroot.org/pipermail/buildroot/2015-August/137580.html [2]: https://lwn.net/Articles/196523/ [3]: https://patchwork.ozlabs.org/patch/668151/ Signed-off-by: James Knight [Thomas: adjust licensing.] Signed-off-by: Thomas Petazzoni --- package/rpm/0002-depends-fix.patch | 19 -- package/rpm/0003-exclude-some-tools.patch | 30 --- package/rpm/0004-ignore-shared-mutexes.patch | 12 - package/rpm/0005-no-parentdirs.patch | 14 -- package/rpm/0006-ordering-fix.patch | 45 ---- package/rpm/0007-parentdir-vs-requires.patch | 37 --- package/rpm/0008-short-circuit-c99.patch | 235 ------------------- package/rpm/Config.in | 22 +- package/rpm/rpm.hash | 7 +- package/rpm/rpm.mk | 89 ++++--- 10 files changed, 64 insertions(+), 446 deletions(-) delete mode 100644 package/rpm/0002-depends-fix.patch delete mode 100644 package/rpm/0003-exclude-some-tools.patch delete mode 100644 package/rpm/0004-ignore-shared-mutexes.patch delete mode 100644 package/rpm/0005-no-parentdirs.patch delete mode 100644 package/rpm/0006-ordering-fix.patch delete mode 100644 package/rpm/0007-parentdir-vs-requires.patch delete mode 100644 package/rpm/0008-short-circuit-c99.patch diff --git a/package/rpm/0002-depends-fix.patch b/package/rpm/0002-depends-fix.patch deleted file mode 100644 index 4a92775763..0000000000 --- a/package/rpm/0002-depends-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Bugfix included upstream - -diff -u --new-file --recursive rpm-5.2.0_vanilla/lib/depends.c rpm-5.2.0_depends-fix/lib/depends.c ---- rpm-5.2.0_vanilla/lib/depends.c 2009-05-23 01:23:46.000000000 +0000 -+++ rpm-5.2.0_depends-fix/lib/depends.c 2009-09-22 06:33:37.950783501 +0000 -@@ -2371,11 +2371,11 @@ - - memset(selected, 0, sizeof(*selected) * ts->orderCount); - -- if ((requires = rpmteDS(p, RPMTAG_REQUIRENAME)) != NULL) { -- - /* Avoid narcisstic relations. */ - selected[rpmtsiOc(pi)] = 1; - -+ if ((requires = rpmteDS(p, RPMTAG_REQUIRENAME)) != NULL) { -+ - /* T2. Next "q <- p" relation. */ - - /* First, do pre-requisites. */ diff --git a/package/rpm/0003-exclude-some-tools.patch b/package/rpm/0003-exclude-some-tools.patch deleted file mode 100644 index 2cbc7cbf6a..0000000000 --- a/package/rpm/0003-exclude-some-tools.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru rpm-5.2.0_vanilla/tools/Makefile.am rpm-5.2.0_exclude-some-tools/tools/Makefile.am ---- rpm-5.2.0_vanilla/tools/Makefile.am 2009-06-03 01:24:42.000000000 +0000 -+++ rpm-5.2.0_exclude-some-tools/tools/Makefile.am 2009-12-20 07:47:13.000000000 +0000 -@@ -45,9 +45,7 @@ - bin_PROGRAMS = rpm2cpio - - pkgbindir = @USRLIBRPM@/bin --pkgbin_PROGRAMS = \ -- rpmcache rpmdigest grep mtree rpmrepo rpmspecdump wget \ -- rpmcmp rpmdeps @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ -+pkgbin_PROGRAMS = - dist_man_MANS = rpmgrep.1 - - debugedit_SOURCES = debugedit.c hashtab.c -diff -ru rpm-5.2.0_vanilla/tools/Makefile.in rpm-5.2.0_exclude-some-tools/tools/Makefile.in ---- rpm-5.2.0_vanilla/tools/Makefile.in 2009-07-07 21:14:06.000000000 +0000 -+++ rpm-5.2.0_exclude-some-tools/tools/Makefile.in 2009-12-20 07:47:37.000000000 +0000 -@@ -39,11 +39,7 @@ - target_triplet = @target@ - EXTRA_PROGRAMS = rpmkey$(EXEEXT) debugedit$(EXEEXT) - bin_PROGRAMS = rpm2cpio$(EXEEXT) --pkgbin_PROGRAMS = rpmcache$(EXEEXT) rpmdigest$(EXEEXT) grep$(EXEEXT) \ -- mtree$(EXEEXT) rpmrepo$(EXEEXT) rpmspecdump$(EXEEXT) \ -- wget$(EXEEXT) rpmcmp$(EXEEXT) rpmdeps$(EXEEXT) \ -- @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ $(am__EXEEXT_1) \ -- $(am__EXEEXT_2) -+pkgbin_PROGRAMS = - @WITH_XAR_TRUE@am__append_1 = txar - @WITH_DB_INTERNAL_TRUE@@WITH_DB_TOOLS_INTEGRATED_TRUE@am__append_2 = db_tool - @WITH_DB_INTERNAL_TRUE@@WITH_DB_RPC_TRUE@@WITH_DB_TOOLS_INTEGRATED_TRUE@am__append_3 = \ diff --git a/package/rpm/0004-ignore-shared-mutexes.patch b/package/rpm/0004-ignore-shared-mutexes.patch deleted file mode 100644 index f19d6b6f32..0000000000 --- a/package/rpm/0004-ignore-shared-mutexes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru rpm-5.2.0_vanilla/db/env/env_open.c rpm-5.2.0_test/db/env/env_open.c ---- rpm-5.2.0_vanilla/db/env/env_open.c 2008-05-28 01:23:27.000000000 +0000 -+++ rpm-5.2.0_test/db/env/env_open.c 2009-12-24 14:54:55.000000000 +0000 -@@ -124,7 +124,7 @@ - } - } - --#ifdef HAVE_MUTEX_THREAD_ONLY -+#ifdef NK_HAVE_MUTEX_THREAD_ONLY - /* - * Currently we support one kind of mutex that is intra-process only, - * POSIX 1003.1 pthreads, because a variety of systems don't support diff --git a/package/rpm/0005-no-parentdirs.patch b/package/rpm/0005-no-parentdirs.patch deleted file mode 100644 index d05c99ad61..0000000000 --- a/package/rpm/0005-no-parentdirs.patch +++ /dev/null @@ -1,14 +0,0 @@ -Reduce parentdirs we use, parentdirs are used for ordering -Included upstream -diff -u --new-file --recursive rpm-5.1.9_vanilla/lib/depends.c rpm-5.1.9_no-parentdirs/lib/depends.c ---- rpm-5.1.9_vanilla/lib/depends.c 2009-04-12 19:46:17.000000000 +0000 -+++ rpm-5.1.9_no-parentdirs/lib/depends.c 2009-06-13 15:21:43.504999639 +0000 -@@ -2257,7 +2257,7 @@ - #define isAuto(_x) ((_x) & _autobits) - - /*@unchecked@*/ --static int slashDepth = 100; /* #slashes pemitted in parentdir deps. */ -+static int slashDepth = 2; /* #slashes pemitted in parentdir deps. */ - - static int countSlashes(const char * dn) - /*@*/ diff --git a/package/rpm/0006-ordering-fix.patch b/package/rpm/0006-ordering-fix.patch deleted file mode 100644 index a618e1f2c9..0000000000 --- a/package/rpm/0006-ordering-fix.patch +++ /dev/null @@ -1,45 +0,0 @@ -Included upstream ---- x/lib/depends.c 2009/05/15 13:40:58 1.445 -+++ y/lib/depends.c 2009/08/22 22:12:02 1.446 -@@ -2216,9 +2216,6 @@ - { - rpmte q, qprev; - -- /* Mark the package as queued. */ -- rpmteTSI(p)->tsi_queued = 1; -- - if ((*rp) == NULL) { /* 1st element */ - /*@-dependenttrans@*/ /* FIX: double indirection */ - (*rp) = (*qp) = p; -@@ -2238,6 +2235,12 @@ - /* XXX Insure removed after added. */ - if (rpmteType(p) == TR_REMOVED && rpmteType(p) != rpmteType(q)) - continue; -+ -+ /* XXX Follow all previous generations in the queue. */ -+ if (rpmteTSI(p)->tsi_queued > rpmteTSI(q)->tsi_queued) -+ continue; -+ -+ /* XXX Within a generation, queue behind more "important". */ - if (rpmteTSI(q)->tsi_qcnt <= rpmteTSI(p)->tsi_qcnt) - break; - } -@@ -2521,6 +2524,9 @@ - - if (rpmteTSI(p)->tsi_count != 0) - continue; -+ -+ /* Mark the package as queued. */ -+ rpmteTSI(p)->tsi_queued = orderingCount + 1; - rpmteTSI(p)->tsi_suc = NULL; - addQ(p, &q, &r, prefcolor); - qlen++; -@@ -2584,6 +2590,8 @@ - (void) rpmteSetParent(p, q); - (void) rpmteSetDegree(q, rpmteDegree(q)+1); - -+ /* Mark the package as queued. */ -+ rpmteTSI(p)->tsi_queued = orderingCount + 1; - /* XXX TODO: add control bit. */ - rpmteTSI(p)->tsi_suc = NULL; - /*@-nullstate@*/ /* XXX FIX: rpmteTSI(q)->tsi_suc can be NULL. */ diff --git a/package/rpm/0007-parentdir-vs-requires.patch b/package/rpm/0007-parentdir-vs-requires.patch deleted file mode 100644 index 309ab254e0..0000000000 --- a/package/rpm/0007-parentdir-vs-requires.patch +++ /dev/null @@ -1,37 +0,0 @@ -Avoid looking up files or directories that this package provides -Included upstream -diff -u --new-file --recursive rpm-5.2.0_vanilla/lib/depends.c rpm-5.2.0_parentdir-vs-requires/lib/depends.c ---- rpm-5.2.0_vanilla/lib/depends.c 2009-05-23 01:23:46.000000000 +0000 -+++ rpm-5.2.0_parentdir-vs-requires/lib/depends.c 2009-09-22 17:00:24.880956271 +0000 -@@ -2095,6 +2095,7 @@ - rpmtsi qi; rpmte q; - tsortInfo tsi; - nsType NSType = rpmdsNSType(requires); -+ const char * N = rpmdsN(requires); - fnpyKey key; - int teType = rpmteType(p); - alKey pkgKey; -@@ -2128,6 +2129,23 @@ - break; - } - -+ /* Avoid looking up files/directories that are "owned" by _THIS_ package. */ -+ if (*N == '/') { -+ rpmfi fi = rpmteFI(p, RPMTAG_BASENAMES); -+ int bingo = 0; -+ -+ fi = rpmfiInit(fi, 0); -+ while (rpmfiNext(fi) >= 0) { -+ const char * fn = rpmfiFN(fi); -+ if (strcmp(N, fn)) -+ continue; -+ bingo = 1; -+ break; -+ } -+ if (bingo) -+ return 0; -+ } -+ - pkgKey = RPMAL_NOMATCH; - key = rpmalSatisfiesDepend(al, requires, &pkgKey); - diff --git a/package/rpm/0008-short-circuit-c99.patch b/package/rpm/0008-short-circuit-c99.patch deleted file mode 100644 index 5d7b53a25d..0000000000 --- a/package/rpm/0008-short-circuit-c99.patch +++ /dev/null @@ -1,235 +0,0 @@ -Buildroot specific -diff -ru rpm-5.1.9_vanilla/xz/configure rpm-5.1.9_short-circuit-c99/xz/configure ---- rpm-5.1.9_vanilla/xz/configure 2009-04-18 16:47:23.000000000 +0000 -+++ rpm-5.1.9_short-circuit-c99/xz/configure 2009-08-04 08:25:59.000000000 +0000 -@@ -4970,214 +4970,7 @@ - am__fastdepCC_FALSE= - fi - -- -- { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5 --$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } --if test "${ac_cv_prog_cc_c99+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_prog_cc_c99=no --ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --#include --#include --#include --#include -- --// Check varargs macros. These examples are taken from C99 6.10.3.5. --#define debug(...) fprintf (stderr, __VA_ARGS__) --#define showlist(...) puts (#__VA_ARGS__) --#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) --static void --test_varargs_macros (void) --{ -- int x = 1234; -- int y = 5678; -- debug ("Flag"); -- debug ("X = %d\n", x); -- showlist (The first, second, and third items.); -- report (x>y, "x is %d but y is %d", x, y); --} -- --// Check long long types. --#define BIG64 18446744073709551615ull --#define BIG32 4294967295ul --#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) --#if !BIG_OK -- your preprocessor is broken; --#endif --#if BIG_OK --#else -- your preprocessor is broken; --#endif --static long long int bignum = -9223372036854775807LL; --static unsigned long long int ubignum = BIG64; -- --struct incomplete_array --{ -- int datasize; -- double data[]; --}; -- --struct named_init { -- int number; -- const wchar_t *name; -- double average; --}; -- --typedef const char *ccp; -- --static inline int --test_restrict (ccp restrict text) --{ -- // See if C++-style comments work. -- // Iterate through items via the restricted pointer. -- // Also check for declarations in for loops. -- for (unsigned int i = 0; *(text+i) != '\0'; ++i) -- continue; -- return 0; --} -- --// Check varargs and va_copy. --static void --test_varargs (const char *format, ...) --{ -- va_list args; -- va_start (args, format); -- va_list args_copy; -- va_copy (args_copy, args); -- -- const char *str; -- int number; -- float fnumber; -- -- while (*format) -- { -- switch (*format++) -- { -- case 's': // string -- str = va_arg (args_copy, const char *); -- break; -- case 'd': // int -- number = va_arg (args_copy, int); -- break; -- case 'f': // float -- fnumber = va_arg (args_copy, double); -- break; -- default: -- break; -- } -- } -- va_end (args_copy); -- va_end (args); --} -- --int --main () --{ -- -- // Check bool. -- _Bool success = false; -- -- // Check restrict. -- if (test_restrict ("String literal") == 0) -- success = true; -- char *restrict newvar = "Another string"; -- -- // Check varargs. -- test_varargs ("s, d' f .", "string", 65, 34.234); -- test_varargs_macros (); -- -- // Check flexible array members. -- struct incomplete_array *ia = -- malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); -- ia->datasize = 10; -- for (int i = 0; i < ia->datasize; ++i) -- ia->data[i] = i * 1.234; -- -- // Check named initializers. -- struct named_init ni = { -- .number = 34, -- .name = L"Test wide string", -- .average = 543.34343, -- }; -- -- ni.number = 58; -- -- int dynamic_array[ni.number]; -- dynamic_array[ni.number - 1] = 543; -- -- // work around unused variable warnings -- return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' -- || dynamic_array[ni.number - 1] != 543); -- -- ; -- return 0; --} --_ACEOF --for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 --do -- CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_prog_cc_c99=$ac_arg --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- --fi -- --rm -f core conftest.err conftest.$ac_objext -- test "x$ac_cv_prog_cc_c99" != "xno" && break --done --rm -f conftest.$ac_ext --CC=$ac_save_CC -- --fi --# AC_CACHE_VAL --case "x$ac_cv_prog_cc_c99" in -- x) -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } ;; -- xno) -- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 --$as_echo "unsupported" >&6; } ;; -- *) -- CC="$CC $ac_cv_prog_cc_c99" -- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5 --$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; --esac -- -- -- --if test x$ac_cv_prog_cc_c99 = xno ; then -- { { $as_echo "$as_me:$LINENO: error: No C99 compiler was found." >&5 --$as_echo "$as_me: error: No C99 compiler was found." >&2;} -- { (exit 1); exit 1; }; } --fi -+CC="$CC -std=c99" - - if test "x$CC" != xcc; then - { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 -diff -ru rpm-5.1.9_vanilla/xz/configure.ac rpm-5.1.9_short-circuit-c99/xz/configure.ac ---- rpm-5.1.9_vanilla/xz/configure.ac 2009-02-16 17:07:46.000000000 +0000 -+++ rpm-5.1.9_short-circuit-c99/xz/configure.ac 2009-08-04 08:25:28.000000000 +0000 -@@ -402,10 +402,7 @@ - AM_INIT_AUTOMAKE([1.10 foreign tar-v7 filename-length-max=99]) - AC_PROG_LN_S - --AC_PROG_CC_C99 --if test x$ac_cv_prog_cc_c99 = xno ; then -- AC_MSG_ERROR([No C99 compiler was found.]) --fi -+CC="$CC -std=c99" - - AM_PROG_CC_C_O - AM_PROG_AS diff --git a/package/rpm/Config.in b/package/rpm/Config.in index 2be646a16e..8b7705d105 100644 --- a/package/rpm/Config.in +++ b/package/rpm/Config.in @@ -1,28 +1,20 @@ comment "rpm needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - -comment "rpm needs a toolchain w/ gcc >= 5" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 && BR2_sh + depends on BR2_USE_MMU config BR2_PACKAGE_RPM bool "rpm" - # triggers internal compiler error - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_BEECRYPT + select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBNSS + select BR2_PACKAGE_BERKELEYDB + select BR2_PACKAGE_FILE select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_NEON - select BR2_PACKAGE_NEON_SSL - select BR2_PACKAGE_NEON_XML - select BR2_PACKAGE_NEON_ZLIB - select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_POPT select BR2_PACKAGE_ZLIB help - The RPM package management system. + The RPM Package Manager (RPM). - http://rpm5.org + http://www.rpm.org/ diff --git a/package/rpm/rpm.hash b/package/rpm/rpm.hash index 06657464ee..c9c4d659a1 100644 --- a/package/rpm/rpm.hash +++ b/package/rpm/rpm.hash @@ -1,2 +1,5 @@ -# Locally calculated -sha256 34a959c0ed670cadcdc52c6025e822fac6f5d1015e3b75123f53ebe53b923e98 rpm-5.2.0.tar.gz +# From http://rpm.org/wiki/Releases/4.13.0 +sha1 c6ce4f879ca6a75340921093105e5ef9d33381d3 rpm-4.13.0.tar.bz2 +# Locally computed +sha256 a3e5568d721737a24141737e6036bb39ba9dfbeaa03fa4a51cc7881a243e0c5d b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch +sha256 7ab0e08e143bb2d43d5b0553ee22ea34da15a611c597860a6110745467d20fa8 c810a0aca3f1148d2072d44b91b8cc9caeb4cf19.patch diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 7f346b213a..accb625eb9 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -4,61 +4,76 @@ # ################################################################################ -RPM_VERSION_MAJOR = 5.2 -RPM_VERSION = $(RPM_VERSION_MAJOR).0 -RPM_SITE = http://rpm5.org/files/rpm/rpm-$(RPM_VERSION_MAJOR) -RPM_DEPENDENCIES = host-pkgconf zlib beecrypt neon popt openssl -RPM_LICENSE = LGPLv2.1 -RPM_LICENSE_FILES = COPYING.LIB +RPM_VERSION = 4.13.0 +RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 +RPM_SITE = https://github.com/rpm-software-management/rpm/releases/download/rpm-$(RPM_VERSION)-release +RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib +RPM_LICENSE = GPLv2 or LGPLv2 (library only) +RPM_LICENSE_FILES = COPYING +RPM_PATCH = \ + https://github.com/rpm-software-management/rpm/commit/b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch \ + https://github.com/rpm-software-management/rpm/commit/c810a0aca3f1148d2072d44b91b8cc9caeb4cf19.patch -RPM_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon -DHAVE_MUTEX_THREAD_ONLY" \ - ac_cv_va_copy=yes +# b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch +# c810a0aca3f1148d2072d44b91b8cc9caeb4cf19.patch +RPM_AUTORECONF = YES RPM_CONF_OPTS = \ - --disable-build-versionscript \ + --disable-python \ --disable-rpath \ - --without-selinux \ - --without-python \ - --without-perl \ - --with-openssl=external \ - --with-zlib=external \ - --with-libbeecrypt=$(STAGING_DIR) \ - --with-popt=external + --with-external-db \ + --with-gnu-ld \ + --without-cap \ + --without-hackingdocs \ + --without-lua -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -RPM_DEPENDENCIES += gettext +ifeq ($(BR2_PACKAGE_ACL),y) +RPM_DEPENDENCIES += acl +RPM_CONF_OPTS += --with-acl +else +RPM_CONF_OPTS += --without-acl endif -ifeq ($(BR2_PACKAGE_PCRE),y) -RPM_DEPENDENCIES += pcre -RPM_CONF_OPTS += --with-pcre=external +ifeq ($(BR2_PACKAGE_LIBNSS),y) +RPM_DEPENDENCIES += libnss +RPM_CONF_OPTS += --without-beecrypt +RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr else -RPM_CONF_OPTS += --with-pcre=none +RPM_DEPENDENCIES += beecrypt +RPM_CONF_OPTS += --with-beecrypt +RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/beecrypt endif -ifeq ($(BR2_PACKAGE_FILE),y) -RPM_DEPENDENCIES += file -RPM_CONF_OPTS += --with-file=external +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) +RPM_DEPENDENCIES += gettext +RPM_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr else -RPM_CONF_OPTS += --with-file=none +RPM_CONF_OPTS += --without-libintl-prefix endif -# xz payload support needs a toolchain w/ C++ -ifeq ($(BR2_PACKAGE_XZ)$(BR2_INSTALL_LIBSTDCPP),yy) -RPM_DEPENDENCIES += xz -RPM_CONF_OPTS += --with-xz=external +ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) +RPM_DEPENDENCIES += libarchive +RPM_CONF_OPTS += --with-archive else -RPM_CONF_OPTS += --with-xz=none +RPM_CONF_OPTS += --without-archive endif -ifeq ($(BR2_PACKAGE_BZIP2),y) -RPM_CONF_OPTS += --with-bzip2 -RPM_DEPENDENCIES += bzip2 +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +RPM_DEPENDENCIES += libselinux +RPM_CONF_OPTS += --with-selinux +else +RPM_CONF_OPTS += --without-selinux endif -RPM_MAKE = $(MAKE1) +# RPM, when using NLS, requires GNU gettext's _nl_msg_cat_cntr, which is not +# provided in musl. +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +RPM_CONF_OPTS += --disable-nls +endif -RPM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) program_transform_name= install +# ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`). +RPM_CONF_ENV = \ + ac_cv_prog_cc_c99='-std=gnu99' \ + CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)" $(eval $(autotools-package)) From 6013266e58fccb59a406d45648985e307111445a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Mon, 14 Nov 2016 14:22:37 +0100 Subject: [PATCH 1618/3392] xterm: depend on libXinerama if appropriate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xterm may depends on libXinerama.so: $ arm-linux-readelf -d ./usr/bin/xterm | grep NEEDED 0x00000001 (NEEDED) Shared library: [libXft.so.2] 0x00000001 (NEEDED) Shared library: [libfontconfig.so.1] 0x00000001 (NEEDED) Shared library: [libXmu.so.6] 0x00000001 (NEEDED) Shared library: [libXaw.so.7] 0x00000001 (NEEDED) Shared library: [libXt.so.6] 0x00000001 (NEEDED) Shared library: [libX11.so.6] 0x00000001 (NEEDED) Shared library: [libXinerama.so.1] 0x00000001 (NEEDED) Shared library: [libXpm.so.4] 0x00000001 (NEEDED) Shared library: [libICE.so.6] 0x00000001 (NEEDED) Shared library: [libncursesw.so.6] 0x00000001 (NEEDED) Shared library: [libc.so.6] However, build order with libXinerama is not defined. Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- package/xterm/xterm.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index eba781ffb8..645de92e22 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -22,4 +22,11 @@ else XTERM_CONF_OPTS += --disable-freetype endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) +XTERM_DEPENDENCIES += xlib_libXinerama +XTERM_CONF_OPTS += --with-xinerama +else +XTERM_CONF_OPTS += --without-xinerama +endif + $(eval $(autotools-package)) From 42dd856ca930f79a831361e337d25fb8dd6e0dd1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 1 Dec 2016 22:13:19 +0100 Subject: [PATCH 1619/3392] Kickoff 2017.02 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fbf217a940..119839c3de 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2016.11 +export BR2_VERSION := 2017.02-git # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) From 18bd407ba441606b7782c7fc1c6902a96a1c5505 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 1 Dec 2016 22:43:17 +0100 Subject: [PATCH 1620/3392] gst1-imx: unbreak after 0.12.3 bump The 0.12.3 bump forgot to update the download hash and remove the now upstreamed patch, breaking the build. Signed-off-by: Peter Korsgaard --- ...2src-Add-V4L2_PIX_FMT_XRGB555X-check.patch | 33 ------------------- package/gstreamer1/gst1-imx/gst1-imx.hash | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 package/gstreamer1/gst1-imx/0001-v4l2src-Add-V4L2_PIX_FMT_XRGB555X-check.patch diff --git a/package/gstreamer1/gst1-imx/0001-v4l2src-Add-V4L2_PIX_FMT_XRGB555X-check.patch b/package/gstreamer1/gst1-imx/0001-v4l2src-Add-V4L2_PIX_FMT_XRGB555X-check.patch deleted file mode 100644 index 67ac055a6b..0000000000 --- a/package/gstreamer1/gst1-imx/0001-v4l2src-Add-V4L2_PIX_FMT_XRGB555X-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1ca05ebb7cb63607d14983948105dd1483ea6b65 Mon Sep 17 00:00:00 2001 -From: Gary Bisson -Date: Tue, 9 Aug 2016 10:26:15 +0200 -Subject: [PATCH] v4l2src: Add V4L2_PIX_FMT_XRGB555X check - -Since this format was added in kernel 3.18, any prior version will -fail to compile. - -Issue reported by Buildroot autobuilder with 3.10 kernel headers: -http://autobuild.buildroot.net/results/b46/b460a770c8f4e992d29dde8fe37fc23a949937f2/ - -Signed-off-by: Gary Bisson ---- - src/v4l2src/v4l2src.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/v4l2src/v4l2src.c b/src/v4l2src/v4l2src.c -index c77ae49..12b392a 100644 ---- a/src/v4l2src/v4l2src.c -+++ b/src/v4l2src/v4l2src.c -@@ -447,7 +447,9 @@ static GstCaps *gst_imx_v4l2src_caps_for_current_setup(GstImxV4l2VideoSrc *v4l2s - case V4L2_PIX_FMT_RGB555: - gst_fmt = GST_VIDEO_FORMAT_RGB15; - break; -+#ifdef V4L2_PIX_FMT_XRGB555X - case V4L2_PIX_FMT_XRGB555X: -+#endif - case V4L2_PIX_FMT_RGB555X: - gst_fmt = GST_VIDEO_FORMAT_BGR15; - break; --- -2.8.1 - diff --git a/package/gstreamer1/gst1-imx/gst1-imx.hash b/package/gstreamer1/gst1-imx/gst1-imx.hash index b0124aae25..e2e3971a2a 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.hash +++ b/package/gstreamer1/gst1-imx/gst1-imx.hash @@ -1,2 +1,2 @@ # locally computed hash -sha256 a75f8bc3219fa3c62637f443cef0196c9eafb90aaa5af094847d007124895822 gst1-imx-0.12.3.tar.gz +sha256 999c093e38768e51d14abbe7836c09b666bcb89f03f34dd3697a6e5b5e4a4086 gst1-imx-0.12.3.tar.gz From 492ac82ee4634fcfba601ffdb90b7cae42814672 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 1 Dec 2016 11:17:44 +0000 Subject: [PATCH 1621/3392] lvm2: bump version to 2.02.168 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 edc9360301..3619af8741 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 492b2f5ca462dbbb8e182befdb6ca60c7a31b16a39f59a38cabdcd0996d9e2c49ae56a2289def80b89da738176ac55cf13cbefd401feb7a1e3a6ef9a4c267f2b LVM2.2.02.167.tgz +sha512 ebff909e1c81919967373c55c7a95ba13ef4e0536b8ef1c28ed7e1c1eb9b9fd406a649d93b141822b24675ebece5a722247737c4e869fb7fb5eeb881a7f9102d LVM2.2.02.168.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index dd574218f7..ae9581caae 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.167 +LVM2_VERSION = 2.02.168 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES From 6c8caf7eee6dd2eed8d117f62c00e4ff153702f9 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 1 Dec 2016 12:05:17 +0000 Subject: [PATCH 1622/3392] subversion: bump version to 1.9.5 Also add a sha256 hash since upstream only provides one weak hash. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/subversion/subversion.hash | 5 ++++- package/subversion/subversion.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/subversion/subversion.hash b/package/subversion/subversion.hash index 926bbc5579..1a85961fe1 100644 --- a/package/subversion/subversion.hash +++ b/package/subversion/subversion.hash @@ -1,2 +1,5 @@ # From http://subversion.apache.org/download.cgi#recommended-release -sha1 bc7d51fdda43bea01e1272dfe9d23d0a9d6cd11c subversion-1.9.4.tar.bz2 +sha1 8bd6a44a1aed30c4c6b6b068488dafb44eaa6adf subversion-1.9.5.tar.bz2 +# Locally calculated after checking PGP signature +# https://www.apache.org/dist/subversion/subversion-1.9.5.tar.bz2.asc +sha256 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5 subversion-1.9.5.tar.bz2 diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk index 720a1a10e9..05569c11a7 100644 --- a/package/subversion/subversion.mk +++ b/package/subversion/subversion.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUBVERSION_VERSION = 1.9.4 +SUBVERSION_VERSION = 1.9.5 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = http://mirror.catn.com/pub/apache/subversion SUBVERSION_LICENSE = Apache-2.0 From a7adfa9ec1d4dfac1fda9600a67b7596af501d32 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 1 Dec 2016 12:23:33 +0000 Subject: [PATCH 1623/3392] gnuplot: bump version to 5.0.5 - 0001-configure-add-without-demo-option.patch adapted to new version. - --without-lisp-files configure option removed: doesn't exist anymore. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- ...01-configure-add-without-demo-option.patch | 61 ++++++++++--------- package/gnuplot/gnuplot.hash | 6 +- package/gnuplot/gnuplot.mk | 3 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/package/gnuplot/0001-configure-add-without-demo-option.patch b/package/gnuplot/0001-configure-add-without-demo-option.patch index ccca4e3aa7..a9abfd06ba 100644 --- a/package/gnuplot/0001-configure-add-without-demo-option.patch +++ b/package/gnuplot/0001-configure-add-without-demo-option.patch @@ -3,42 +3,35 @@ Add options to enable/disable docs and demos Originally written by Anthony Viallard . +[Vincent: adapt patch to 5.0.5 version] + Signed-off-by: Thomas Petazzoni +Signed-off-by: Vicente Olivert Riera -Index: gnuplot-4.6.0/configure.in -=================================================================== ---- gnuplot-4.6.0.orig/configure.in 2012-03-08 05:34:42.000000000 +0100 -+++ gnuplot-4.6.0/configure.in 2013-01-07 11:50:03.003804463 +0100 -@@ -748,6 +748,16 @@ - AC_ARG_WITH(lisp-files,dnl - [ --without-lisp-files do not build emacs lisp files]) +diff -rup a/configure.in b/configure.in +--- a/configure.in 2016-09-07 05:14:29.000000000 +0100 ++++ b/configure.in 2016-12-01 12:09:31.487464774 +0000 +@@ -818,6 +818,16 @@ if test "$with_cwdrc" = yes; then + [ Define if you want to read .gnuplot from current directory (SECURITY RISK!).]) + fi -+dnl Whether we want to build the demo files -+dnl Does nothing here, is passed on to the demo subdir -+AC_ARG_ENABLE(demo,dnl -+[ --disable-demo do not build demo files]) -+ +dnl Whether we want to build the doc files +dnl Does nothing here, is passed on to the doc subdir +AC_ARG_ENABLE(doc,dnl +[ --disable-doc do not build doc files]) ++ ++dnl Whether we want to build the demo files ++dnl Does nothing here, is passed on to the demo subdir ++AC_ARG_ENABLE(demo,dnl ++[ --disable-demo do not build demo files]) + dnl Sort help/subtopic tables by row or column AC_ARG_WITH(row-help,dnl [ --with-row-help format help and subtopic tables by row (default) -@@ -1200,6 +1210,24 @@ - fi - AC_SUBST(LISPDIR) +@@ -1303,6 +1313,24 @@ fi + dnl No configuration option for this one yet + AC_DEFINE(MAX_PARALLEL_AXES,7, [Maximum number of parallel axes supported]) -+dnl build demo files -+if test "$enable_demo" != no; then -+ AC_CONFIG_SUBDIRS(demo) -+ DEMOSUBDIR=demo -+else -+ DEMOSUBDIR= -+fi -+AC_SUBST(DEMOSUBDIR) -+ +dnl build doc files +if test "$enable_doc" != no; then + AC_CONFIG_SUBDIRS(docs) @@ -47,20 +40,28 @@ Index: gnuplot-4.6.0/configure.in + DOCSUBDIR= +fi +AC_SUBST(DOCSUBDIR) ++ ++dnl build demo files ++if test "$enable_demo" != no; then ++ AC_CONFIG_SUBDIRS(demo) ++ DEMOSUBDIR=demo ++else ++ DEMOSUBDIR= ++fi ++AC_SUBST(DEMOSUBDIR) + dnl Substitute variables AC_SUBST(PACKAGE) AC_SUBST(VERSION_MAJOR) -Index: gnuplot-4.6.0/Makefile.am -=================================================================== ---- gnuplot-4.6.0.orig/Makefile.am 2013-01-04 14:07:02.239120935 +0100 -+++ gnuplot-4.6.0/Makefile.am 2013-01-07 11:51:12.034846363 +0100 +diff -rup a/Makefile.am b/Makefile.am +--- a/Makefile.am 2014-05-30 17:38:08.000000000 +0100 ++++ b/Makefile.am 2016-12-01 12:09:31.488464794 +0000 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign 1.2h + AUTOMAKE_OPTIONS = foreign -SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share +SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README RELEASE_NOTES \ diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 37cc3e789a..a71d006594 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,3 +1,3 @@ -# From http://sourceforge.net/projects/gnuplot/files/gnuplot/4.6.6/ -md5 02a980b37ba181f7510816ed6440c9c1 gnuplot-4.6.6.tar.gz -sha1 012bd22b7be32da186b6bb015c0c6d876926c90b gnuplot-4.6.6.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.5/ +md5 c5e96fca73afbee4f57cbc1bfce6b3b8 gnuplot-5.0.5.tar.gz +sha1 c35f55657fdc33217dd70bbf3148578563ecaad1 gnuplot-5.0.5.tar.gz diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index a9e12045ec..3e00eefef8 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 4.6.6 +GNUPLOT_VERSION = 5.0.5 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright @@ -19,7 +19,6 @@ GNUPLOT_CONF_OPTS = \ --disable-demo \ --without-row-help \ --disable-history-file \ - --without-lisp-files \ --disable-wxwidgets \ --without-lua \ --without-latex \ From d96fafc3d346af8790df45557b16069d6ce81e79 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 1 Dec 2016 11:17:04 +0000 Subject: [PATCH 1624/3392] cmake: bump version to 3.7.1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 687e5a4483..7a22f21ea0 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,2 +1,2 @@ -# From http://www.cmake.org/files/v3.7/cmake-3.7.0-SHA-256.txt -sha256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 cmake-3.7.0.tar.gz +# From http://www.cmake.org/files/v3.7/cmake-3.7.1-SHA-256.txt +sha256 449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 cmake-3.7.1.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 522d7fec87..f4c61aa69f 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -5,7 +5,7 @@ ################################################################################ CMAKE_VERSION_MAJOR = 3.7 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt From 160f83db022a913679340cd029775ca87ee56d08 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 1 Dec 2016 19:30:51 +0100 Subject: [PATCH 1625/3392] libevdev: bump version to 1.5.5 And update 0001-configure-add-disable-runtime-tests-option.patch. For details see [1]. [1] https://lists.freedesktop.org/archives/input-tools/2016-November/001375.html Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...ure-add-disable-runtime-tests-option.patch | 23 +++++++++++++------ package/libevdev/libevdev.hash | 4 ++-- package/libevdev/libevdev.mk | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch b/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch index 405dff0e5a..6a829175c3 100644 --- a/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch +++ b/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch @@ -1,18 +1,18 @@ -From 95527e43845a5063a6125d7779a30d44c3b437ac Mon Sep 17 00:00:00 2001 +From fe965061b4306e3ca811ff86dc1ca29f7db9af18 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 11 Oct 2015 13:33:19 +0200 Subject: [PATCH] configure: add '--disable-runtime-tests' option Signed-off-by: Peter Seiderer --- - configure.ac | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + configure.ac | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 54a2510..286737b 100644 +index c1a9111..8fe7b8b 100644 --- a/configure.ac +++ b/configure.ac -@@ -74,7 +74,14 @@ else +@@ -76,13 +76,20 @@ else AC_MSG_WARN([check not found - skipping building unit tests]) fi AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"]) @@ -27,16 +27,25 @@ index 54a2510..286737b 100644 +AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x${enable_runtime_tests}x$HAVE_CHECK" = "xyesxyes"]) AM_CONDITIONAL(ENABLE_STATIC_LINK_TEST, [test "x$enable_static" = "xyes"]) + AC_ARG_ENABLE([test-run], + AS_HELP_STRING([--enable-test-run], [For internal use only]), + [run_tests="$enableval"], [run_tests="yes"]) +-AM_CONDITIONAL(RUN_TESTS, [test "x$run_tests" = "xyes"]) ++AM_CONDITIONAL(RUN_TESTS, [test "x${enable_runtime_tests}x$run_tests" = "xyesxyes"]) + with_cflags="" -@@ -159,7 +166,7 @@ AC_MSG_RESULT([ + if test "x$GCC" = "xyes"; then +@@ -167,8 +174,8 @@ AC_MSG_RESULT([ Libdir ${libdir} Build documentation ${have_doxygen} - Enable unit-tests ${HAVE_CHECK} +- Run unit-tests ${run_tests} + Enable unit-tests ${HAVE_CHECK} (runtime-tests: ${enable_runtime_tests}) ++ Run unit-tests ${run_tests} (runtime-tests: ${enable_runtime_tests}) Enable profiling ${enable_gcov} Static library symbol check ${static_symbol_leaks_test} ]) -- -2.1.4 +2.11.0 diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash index a2a5cd8acb..1dbdfdba74 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,2 +1,2 @@ -# Hash from https://lists.freedesktop.org/archives/input-tools/2016-August/001327.html -sha256 11fe76d62cc76fbc9dbf8e94696a80eee63780139161e5cf54c55ec21a8173a4 libevdev-1.5.4.tar.xz +# Hash from https://lists.freedesktop.org/archives/input-tools/2016-November/001375.html +sha256 320120782018b992956b3fa29495c323832860807ac8ea74537e636a0e0280b1 libevdev-1.5.5.tar.xz diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index ef660c77b0..fca362ff6f 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.5.4 +LIBEVDEV_VERSION = 1.5.5 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = X11 From 360a205d77bc472a8600c26e58cdb12de1f6b4ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 2 Dec 2016 08:34:59 +0100 Subject: [PATCH 1626/3392] package/upmpdcli: bump version to 1.2.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/upmpdcli/upmpdcli.hash | 2 +- package/upmpdcli/upmpdcli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index 847cdc23e1..0f9e408162 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,2 +1,2 @@ # Manually calculated: -sha256 a788796e634e243a5ac11db3b19ea872d2bff4d5fb673d058ab7a683ca029dae upmpdcli-1.2.8.tar.gz +sha256 a925dac1721fe002c16ed3c9e2de0370c2fe6c1e6f4f97a7551f20c6226cc0e2 upmpdcli-1.2.10.tar.gz diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 84a876362b..d1d6ab4b46 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.2.8 +UPMPDCLI_VERSION = 1.2.10 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING From 6cf6d3c65f711b5296bf63638c7bb0ff3ac334ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 2 Dec 2016 08:42:14 +0100 Subject: [PATCH 1627/3392] package/libuv: bump version to v1.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 75c7ffecd1..412479f0bc 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a6ca9f0648973d1463f46b495ce546ddcbe7cce2f04b32e802a15539e46c57ad libuv-v1.9.1.tar.gz +sha256 4b5f71939dd4272ebcfb8e04833e9a273a08b1bf1277d37d14085d7b04b19832 libuv-v1.10.1.tar.gz diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 11d51dda68..745c077269 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.9.1 +LIBUV_VERSION = v1.10.1 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From 16fdd76743118dea9321ef6e238a29605ec8e234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 2 Dec 2016 08:56:59 +0100 Subject: [PATCH 1628/3392] package/libxml-parser-perl: bump version to 2.44 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/libxml-parser-perl/libxml-parser-perl.hash | 2 +- package/libxml-parser-perl/libxml-parser-perl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libxml-parser-perl/libxml-parser-perl.hash b/package/libxml-parser-perl/libxml-parser-perl.hash index 4a8c0d305d..d8e0df5a27 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.hash +++ b/package/libxml-parser-perl/libxml-parser-perl.hash @@ -1,2 +1,2 @@ # locally computed hash -sha256 b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9 XML-Parser-2.41.tar.gz +sha256 1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216 XML-Parser-2.44.tar.gz diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk index 9e5325c863..e512815e3f 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.mk +++ b/package/libxml-parser-perl/libxml-parser-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXML_PARSER_PERL_VERSION = 2.41 +LIBXML_PARSER_PERL_VERSION = 2.44 LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz LIBXML_PARSER_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat From ae7ae2de0d1b65a152417ba869d2c1fcdfd910ba Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 2 Dec 2016 10:15:00 -0300 Subject: [PATCH 1629/3392] linux-headers: bump 4.{4, 8}.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6d616c3fbc..9cdd5faa41 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -232,9 +232,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.35" if BR2_KERNEL_HEADERS_4_1 - default "4.4.35" if BR2_KERNEL_HEADERS_4_4 + default "4.4.36" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.10" if BR2_KERNEL_HEADERS_4_7 - default "4.8.11" if BR2_KERNEL_HEADERS_4_8 + default "4.8.12" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 1c76560600089b98019642d6ec59bbd477b5f0e1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 2 Dec 2016 10:15:01 -0300 Subject: [PATCH 1630/3392] linux: bump default to version 4.8.12 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 6a7838d797..9ca9939d14 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.11)" + bool "Latest version (4.8.12)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.12" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From ba19cb915ac3475487d4a1b46d014fcabeb71fdb Mon Sep 17 00:00:00 2001 From: Marcin Nowakowski Date: Fri, 2 Dec 2016 12:51:57 +0100 Subject: [PATCH 1631/3392] kexec: fix build when BR2_STRIP_none=y When BR2_STRIP is set to none, a dummy 'true' app is used instead of strip utility. However, kexec package always requires a real strip executable as it is used to generate intermediate files during the build process. If 'true' is used the build system runs the following command: true --strip-debug -o purgatory/purgatory.ro purgatory/purgatory.ro.sym which obviously doesn't do anything useful and the build later fails with: bin/bin-to-hex purgatory < purgatory/purgatory.ro > kexec/purgatory.c /bin/sh: purgatory/purgatory.ro: No such file or directory kexec/Makefile:7: recipe for target 'kexec/purgatory.c' failed make[2]: *** [kexec/purgatory.c] Error 1 To resolve it always specify STRIP=$(CROSS_COMPILE)strip, regardless of buildroot configuration. [Peter: add a comment explaining why this is done] Signed-off-by: Marcin Nowakowski Signed-off-by: Peter Korsgaard --- package/kexec/kexec.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 4ca55e5bc3..0a74369785 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -10,6 +10,9 @@ KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPLv2 KEXEC_LICENSE_FILES = COPYING +# Makefile expects $STRIP -o to work, so needed for BR2_STRIP_none +KEXEC_MAKE_OPTS = STRIP="$(TARGET_CROSS)strip" + ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y) KEXEC_CONF_OPTS += --with-zlib KEXEC_DEPENDENCIES = zlib From 3229c7c12d6edee36c9fe0c8755d8bbdfc092a52 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 2 Dec 2016 11:23:19 -0300 Subject: [PATCH 1632/3392] dbus: bump to version 1.10.14 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- 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 27d38ea92d..14bee20455 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 210a79430b276eafc6406c71705e9140d25b9956d18068df98a70156dc0e475d dbus-1.10.12.tar.gz +sha256 23238f70353e38ce5ca183ebc9525c0d97ac00ef640ad29cf794782af6e6a083 dbus-1.10.14.tar.gz diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 86571286b5..c765e0ae26 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.10.12 +DBUS_VERSION = 1.10.14 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools) DBUS_LICENSE_FILES = COPYING From 2332aa1f0f4316fff7343d6976c656763c834eb8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 2 Dec 2016 11:02:24 -0300 Subject: [PATCH 1633/3392] btrfs-progs: bump to version 4.8.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 6d262a162f..8cc3769c77 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 bf26ead666c337a62a74bc9ec7f8dd9ee200e60e5fe5289967d53328eff261c5 btrfs-progs-v4.8.4.tar.xz +sha256 d247b1c022aca5def3415bfa51e00c566cce36660a3ee517d4b6a1af911a08ef btrfs-progs-v4.8.5.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index e780903dc3..bf37d57d12 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.8.4 +BTRFS_PROGS_VERSION = 4.8.5 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib From ed9924e4f434b01d20e0f4985671d47f73d6c92f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 2 Dec 2016 14:42:04 -0300 Subject: [PATCH 1634/3392] libxkbcommon: bump to version 0.7.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libxkbcommon/libxkbcommon.hash | 4 ++-- package/libxkbcommon/libxkbcommon.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index 693630a776..26770990da 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-April/027962.html -sha256 5b0887b080b42169096a61106661f8d35bae783f8b6c58f97ebcd3af83ea8760 libxkbcommon-0.6.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2016-November/031544.html +sha256 09351592312d67b438655f54da5b67853026662c4a57e6be4d225f04a9989798 libxkbcommon-0.7.0.tar.xz diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index 1f80348069..3a0600b892 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 0.6.1 +LIBXKBCOMMON_VERSION = 0.7.0 LIBXKBCOMMON_SITE = http://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 From aea747a1ad6ca9dc4b63692a6376959c40834f59 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 2 Dec 2016 14:42:34 -0300 Subject: [PATCH 1635/3392] libinput: bump to version 1.5.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libinput/libinput.hash | 4 ++-- package/libinput/libinput.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index 10c5e9da78..ea7bdf7b10 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031054.html -sha256 5a96559385ecfaa30f9e72ea89eb8ebbc97caf68e458f451f4ed62315311081c libinput-1.5.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2016-November/031926.html +sha256 ba26e2bc64ed551eaef193178ed06b07b97a09ac6f4e442f5f15bbc3f3174682 libinput-1.5.2.tar.xz diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 2005c4759a..765a3cb550 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.5.0 +LIBINPUT_VERSION = 1.5.2 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From 19eaddc935eacb31e48938caad9eb227dcb6eec9 Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Fri, 2 Dec 2016 21:38:12 +0300 Subject: [PATCH 1636/3392] toolchain: Bump ARC tools to arc-2016.09-rc2 As described at: 4520524ba055706236db9f00dd79f1b2e2e87fde this commit continues a series of updates of ARC tools. This time we're updating tools to arc-2016.09-rc2. This change contains a set of minor fixes and updates. Signed-off-by: Vlad Zakharov Signed-off-by: Peter Korsgaard --- package/binutils/Config.in.host | 2 +- .../{arc-2016.09-rc1 => arc-2016.09-rc2}/0300-ld-makefile.patch | 0 .../0301-check-ldrunpath-length.patch | 0 .../0500-add-sysroot-fix-from-bug-3049.patch | 0 .../0600-poison-system-directories.patch | 0 package/binutils/binutils.hash | 2 +- package/binutils/binutils.mk | 2 +- package/gcc/Config.in.host | 2 +- .../301-missing-execinfo_h.patch | 0 .../{arc-2016.09-rc1 => arc-2016.09-rc2}/860-cilk-wchar.patch | 0 .../940-uclinux-enable-threads.patch | 0 package/gcc/gcc.hash | 2 +- package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 14 files changed, 7 insertions(+), 7 deletions(-) rename package/binutils/{arc-2016.09-rc1 => arc-2016.09-rc2}/0300-ld-makefile.patch (100%) rename package/binutils/{arc-2016.09-rc1 => arc-2016.09-rc2}/0301-check-ldrunpath-length.patch (100%) rename package/binutils/{arc-2016.09-rc1 => arc-2016.09-rc2}/0500-add-sysroot-fix-from-bug-3049.patch (100%) rename package/binutils/{arc-2016.09-rc1 => arc-2016.09-rc2}/0600-poison-system-directories.patch (100%) rename package/gcc/{arc-2016.09-rc1 => arc-2016.09-rc2}/301-missing-execinfo_h.patch (100%) rename package/gcc/{arc-2016.09-rc1 => arc-2016.09-rc2}/860-cilk-wchar.patch (100%) rename package/gcc/{arc-2016.09-rc1 => arc-2016.09-rc2}/940-uclinux-enable-threads.patch (100%) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index af9339e11b..e67b346b00 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -22,7 +22,7 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2016.09-rc1" if BR2_arc + default "arc-2016.09-rc2" if BR2_arc default "2.25.1" if BR2_BINUTILS_VERSION_2_25_X default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X default "2.27" if BR2_BINUTILS_VERSION_2_27_X diff --git a/package/binutils/arc-2016.09-rc1/0300-ld-makefile.patch b/package/binutils/arc-2016.09-rc2/0300-ld-makefile.patch similarity index 100% rename from package/binutils/arc-2016.09-rc1/0300-ld-makefile.patch rename to package/binutils/arc-2016.09-rc2/0300-ld-makefile.patch diff --git a/package/binutils/arc-2016.09-rc1/0301-check-ldrunpath-length.patch b/package/binutils/arc-2016.09-rc2/0301-check-ldrunpath-length.patch similarity index 100% rename from package/binutils/arc-2016.09-rc1/0301-check-ldrunpath-length.patch rename to package/binutils/arc-2016.09-rc2/0301-check-ldrunpath-length.patch diff --git a/package/binutils/arc-2016.09-rc1/0500-add-sysroot-fix-from-bug-3049.patch b/package/binutils/arc-2016.09-rc2/0500-add-sysroot-fix-from-bug-3049.patch similarity index 100% rename from package/binutils/arc-2016.09-rc1/0500-add-sysroot-fix-from-bug-3049.patch rename to package/binutils/arc-2016.09-rc2/0500-add-sysroot-fix-from-bug-3049.patch diff --git a/package/binutils/arc-2016.09-rc1/0600-poison-system-directories.patch b/package/binutils/arc-2016.09-rc2/0600-poison-system-directories.patch similarity index 100% rename from package/binutils/arc-2016.09-rc1/0600-poison-system-directories.patch rename to package/binutils/arc-2016.09-rc2/0600-poison-system-directories.patch diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 80ac9ddf2f..7b3ec6bd22 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -5,4 +5,4 @@ sha512 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322 sha512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb binutils-2.27.tar.bz2 # Locally calculated (fetched from Github) -sha512 d0befdeb0a7b76efd1ad655fc062cde2aa67be7b26210c913ab2709e069d815c4ff2863ce7add1f6434da5a2f4faf1ce5a5bc3d0e64f3e04548a7479f24edcbc binutils-arc-2016.09-rc1.tar.gz +sha512 d2ae310dc1bdac8fcbeb7d1e5cd009a32d45d433ed1f0eaf4cddb3a86c803a89ef11df1db87b6fa45193a64c59197902ac84dd011f1b3dbac88edeb40b91833e binutils-arc-2016.09-rc2.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 61486a2f8f..bf345bb63f 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,7 +9,7 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2016.09-rc1 +BINUTILS_VERSION = arc-2016.09-rc2 else BINUTILS_VERSION = 2.25.1 endif diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index d10798b10d..0fc1ec42db 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -98,7 +98,7 @@ config BR2_GCC_VERSION default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.4.0" if BR2_GCC_VERSION_5_X default "6.2.0" if BR2_GCC_VERSION_6_X - default "arc-2016.09-rc1" if BR2_GCC_VERSION_ARC + default "arc-2016.09-rc2" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS string "Additional gcc options" diff --git a/package/gcc/arc-2016.09-rc1/301-missing-execinfo_h.patch b/package/gcc/arc-2016.09-rc2/301-missing-execinfo_h.patch similarity index 100% rename from package/gcc/arc-2016.09-rc1/301-missing-execinfo_h.patch rename to package/gcc/arc-2016.09-rc2/301-missing-execinfo_h.patch diff --git a/package/gcc/arc-2016.09-rc1/860-cilk-wchar.patch b/package/gcc/arc-2016.09-rc2/860-cilk-wchar.patch similarity index 100% rename from package/gcc/arc-2016.09-rc1/860-cilk-wchar.patch rename to package/gcc/arc-2016.09-rc2/860-cilk-wchar.patch diff --git a/package/gcc/arc-2016.09-rc1/940-uclinux-enable-threads.patch b/package/gcc/arc-2016.09-rc2/940-uclinux-enable-threads.patch similarity index 100% rename from package/gcc/arc-2016.09-rc1/940-uclinux-enable-threads.patch rename to package/gcc/arc-2016.09-rc2/940-uclinux-enable-threads.patch diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index e5d96f44ad..0d758b0bd4 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -12,4 +12,4 @@ sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d sha512 1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a83ce1cd4cdd2d1cb0b3e3c34e9b7ae1b2ab83dfc649ee817ab05247c76198 gcc-6.2.0.tar.bz2 # Locally calculated (fetched from Github) -sha512 7029d7ae1316b9385880f32283aa6c4979b1257500bb21e3fb234475ecb20082f46b114d8b7022c75a8dcf0c0c7b6b02e9384b49dd3189adc3d454502b8b0c26 gcc-arc-2016.09-rc1.tar.gz +sha512 fb4fdc00d3d2e4db52a83cb34f3e99399fd6b1d1d1e6dd378188a209467dca8975d6b2a4e16ccc27f53b897480ece4b496db21b0adc7c1bcddcdc775c2a3d2f9 gcc-arc-2016.09-rc2.tar.gz diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index da6b30ecf4..4c8d902d56 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -56,7 +56,7 @@ endif config BR2_GDB_VERSION string depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB - default "arc-2016.09-rc1-gdb" if BR2_arc + default "arc-2016.09-rc2-gdb" if BR2_arc default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze default "7.9.1" if BR2_GDB_VERSION_7_9 default "7.10.1" if BR2_GDB_VERSION_7_10 || !BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 8c0d51bc82..c91373b5b1 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -5,4 +5,4 @@ sha512 f80ec6c8a0f0b54c8b945666e875809174402b7e121efb378ebac931a91f9a1cc0048568 # Locally calculated (fetched from Github) sha512 0a467091d4b01fbecabb4b8da1cb743025c70e7f4874a0b5c8fa2ec623569a39bde6762b91806de0be6e63711aeb6909715cfbe43860de73d8aec6159a9f10a7 gdb-6be65fb56ea6694a9260733a536a023a1e2d4d57.tar.gz -sha512 e6019ac0d6b1354943d3c06c84f353ba49fef105b07c1a04ad90cc5b65f91e38fe6c671e0c34a9541ee282d0f42cf24579c011a0469d19faaa4d00d64a17afe2 gdb-arc-2016.09-rc1-gdb.tar.gz +sha512 f428e0e86179e8f0bf09e516884e575c00663de37a85f4ab3dbb2c384a839f3c06971a24690bdd7da0b31a00e629dd304578d2baa8c8a62baf040006c4b89728 gdb-arc-2016.09-rc2-gdb.tar.gz From c3dd221c6f829af4194c2b38d192bc82699c0d7d Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Thu, 1 Dec 2016 21:41:52 -0500 Subject: [PATCH 1637/3392] docs/manual: fix FOO_PKGDIR name and definition Change "foo" references to "libfoo" in section that defines variables explicitly stated to relate to a "libfoo" package. Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 51408e8694..0e111e1199 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -528,8 +528,8 @@ endef In the action definitions, you can use the following variables: -* +$(FOO_PKGDIR)+ contains the path to the directory containing the - +foo.mk+ and +Config.in+ files. This variable is useful when it is +* +$(LIBFOO_PKGDIR)+ contains the path to the directory containing the + +libfoo.mk+ and +Config.in+ files. This variable is useful when it is necessary to install a file bundled in Buildroot, like a runtime configuration file, a splashscreen image... From 0024465d8a7b51f7fc7c9e8581072695d869adca Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Thu, 1 Dec 2016 16:33:24 -0200 Subject: [PATCH 1638/3392] stella: fix bug when compiling with PPC altivec vectorization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PPC altivec vectorization triggers a bug when compiling with -std=c++11 because "bool" is redefined in altivec.h. src/emucore/Event.hxx:112:23: error: cannot convert ‘bool’ to ‘__vector(4) __bool int’ in assignment myKeyTable[i] = false; ^ Acording to a bug report in GCC [1], "You need to use -std=g++11 or undefine bool after the include of altivec.h as context sensitive keywords is not part of the C++11 standard". So let's compile with -std=gnu++11 by default. Tested on ARM, x86 and PPC. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58241#c3 Fixes: http://autobuild.buildroot.net/results/0970d2c8e1787ceffc46b589522e53d52675e03c http://autobuild.buildroot.net/results/ec1bc57675b6e53af0cd33d7b99cd2e3bf5d9d7e Signed-off-by: Sergio Prado Signed-off-by: Thomas Petazzoni --- ...11-standard-to-prevent-errors-on-PPC.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/stella/0004-Use-gnu-11-standard-to-prevent-errors-on-PPC.patch diff --git a/package/stella/0004-Use-gnu-11-standard-to-prevent-errors-on-PPC.patch b/package/stella/0004-Use-gnu-11-standard-to-prevent-errors-on-PPC.patch new file mode 100644 index 0000000000..76d12a2cdd --- /dev/null +++ b/package/stella/0004-Use-gnu-11-standard-to-prevent-errors-on-PPC.patch @@ -0,0 +1,35 @@ +From 6946a491cae42b971aad3bc5d822e0e549eca8bd Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Thu, 1 Dec 2016 15:20:33 -0200 +Subject: [PATCH] Use gnu++11 standard to prevent errors on PPC. + +PPC altivec vectorization triggers a bug when compiling with -std=c++11 +because "bool" is redefined in altivec.h. + +Acording to a bug report in GCC, "You need to use -std=g++11 or +undefine bool after the include of altivec.h as context sensitive +keywords is not part of the C++11 standard". + +So let's use gnu++11 standard. + +Signed-off-by: Sergio Prado +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 6dd0129587b3..6ed50ea4c335 100644 +--- a/Makefile ++++ b/Makefile +@@ -51,7 +51,7 @@ else + endif + CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers + ifdef HAVE_GCC +- CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++11 ++ CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=gnu++11 + endif + + ifdef PROFILE +-- +1.9.1 + From 879136d4c72bc41575877a12ea4b4eb4bf366b65 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Oct 2016 17:02:12 +0100 Subject: [PATCH 1639/3392] package/waf: new host package host-waf will be used by waf-based packages that do not include it in their release tarballs, like mpv. mpv is currently the only case we have, but with the upcoming waf-package infra, having host-waf available just makes the infra complete from the onset. Signed-off-by: "Yann E. MORIN" Cc: Romain Naour Reviewed-by: Romain Naour [Thomas: drop dependency on host-python, it's really a runtime dependency.] Signed-off-by: Thomas Petazzoni --- package/waf/waf.hash | 3 +++ package/waf/waf.mk | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 package/waf/waf.hash create mode 100644 package/waf/waf.mk diff --git a/package/waf/waf.hash b/package/waf/waf.hash new file mode 100644 index 0000000000..9d610b2c1e --- /dev/null +++ b/package/waf/waf.hash @@ -0,0 +1,3 @@ +# Locally computed +sha1 33d170c738ed8c92dda2945b445272972f558244 waf-1.9.5 +sha256 101f14e0f47a6410c00b8feda094948516cd3989491c56eb8268907fcd164909 waf-1.9.5 diff --git a/package/waf/waf.mk b/package/waf/waf.mk new file mode 100644 index 0000000000..3d61f267e6 --- /dev/null +++ b/package/waf/waf.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# waf +# +################################################################################ + +WAF_VERSION = 1.9.5 +WAF_SOURCE = waf-$(WAF_VERSION) +WAF_SITE = https://waf.io/ + +define HOST_WAF_EXTRACT_CMDS + $(INSTALL) -D -m 0755 $(DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf +endef + +define HOST_WAF_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/waf $(HOST_DIR)/usr/bin/waf +endef + +$(eval $(host-generic-package)) From 24d23bbce7e23e03c5071a335ce61e9064924645 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Oct 2016 17:02:13 +0100 Subject: [PATCH 1640/3392] core: add waf-package infra This new waf-package infrastructure simplifies writing waf-based packages. It can be used by our six current such packages, plus a later-incoming one by Romain. Signed-off-by: "Yann E. MORIN" Cc: Romain Naour Reviewed-by: Romain Naour Tested-by: Romain Naour [Thomas: - rename _BUNDLED_WAF to _NEEDS_EXTERNAL_WAF, which involves inverting the meaning of the boolean. - always add the host-python dependency - add a default value for _NEEDS_EXTERNAL_WAF (defaults to NO) - remove the unneeded _MAKE related definitions.] Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 1 + package/pkg-waf.mk | 113 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 package/pkg-waf.mk diff --git a/package/Makefile.in b/package/Makefile.in index bd73219bbf..4b3368f49b 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -398,3 +398,4 @@ include package/pkg-generic.mk include package/pkg-kconfig.mk include package/pkg-rebar.mk include package/pkg-kernel-module.mk +include package/pkg-waf.mk diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk new file mode 100644 index 0000000000..908ac0354e --- /dev/null +++ b/package/pkg-waf.mk @@ -0,0 +1,113 @@ +################################################################################ +# WAF package infrastructure +# +# This file implements an infrastructure that eases development of package +# .mk files for WAF packages. It should be used for all packages that use +# WAF as their build system. +# +# See the Buildroot documentation for details on the usage of this +# infrastructure +# +# In terms of implementation, this WAF infrastructure requires the .mk file +# to only specify metadata information about the package: name, version, +# download URL, etc. +# +# We still allow the package .mk file to override what the different steps +# are doing, if needed. For example, if _BUILD_CMDS is already defined, +# it is used as the list of commands to perform to build the package, +# instead of the default WAF behaviour. The package can also define some +# post operation hooks. +# +################################################################################ + +################################################################################ +# inner-waf-package -- defines how the configuration, compilation and +# installation of a waf package should be done, implements a few hooks +# to tune the build process for waf specifities and calls the generic +# package infrastructure to generate the necessary make targets +# +# argument 1 is the lowercase package name +# argument 2 is the uppercase package name, including a HOST_ prefix +# for host packages +# argument 3 is the uppercase package name, without the HOST_ prefix +# for host packages +# argument 4 is the type (target or host) +################################################################################ + +define inner-waf-package + +# We need host-python to run waf +$(2)_DEPENDENCIES += host-python + +$(2)_NEEDS_EXTERNAL_WAF ?= NO + +# If the package does not have its own waf, use our own. +ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) +$(2)_DEPENDENCIES += host-waf +$(2)_WAF = $(HOST_DIR)/usr/bin/waf +else +$(2)_WAF = ./waf +endif + +# +# Configure step. Only define it if not already defined by the package +# .mk file. +# +ifndef $(2)_CONFIGURE_CMDS +define $(2)_CONFIGURE_CMDS + cd $$(@D) && \ + $$(TARGET_CONFIGURE_OPTS) \ + $$($(2)_CONF_ENV) \ + $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + $$($(2)_CONF_OPTS) +endef +endif + +# +# Build step. Only define it if not already defined by the package .mk +# file. +# +ifndef $(2)_BUILD_CMDS +define $(2)_BUILD_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) build -j $$(PARALLEL_JOBS) +endef +endif + +# +# Staging installation step. Only define it if not already defined by +# the package .mk file. +# +ifndef $(2)_INSTALL_STAGING_CMDS +define $(2)_INSTALL_STAGING_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ + install --destdir=$$(STAGING_DIR) +endef +endif + +# +# Target installation step. Only define it if not already defined by +# the package .mk file. +# +ifndef $(2)_INSTALL_TARGET_CMDS +define $(2)_INSTALL_TARGET_CMDS + cd $$(@D) && \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ + install --destdir=$$(TARGET_DIR) +endef +endif + +# Call the generic package infrastructure to generate the necessary +# make targets +$(call inner-generic-package,$(1),$(2),$(3),$(4)) + +endef + +################################################################################ +# waf-package -- the target generator macro for WAF packages +################################################################################ + +waf-package = $(call inner-waf-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) From d64735fca0aef75d656892acdee4d0fcfb722750 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Oct 2016 17:02:14 +0100 Subject: [PATCH 1641/3392] docs/manual: document the waf-package infra Signed-off-by: "Yann E. MORIN" Cc: Romain Naour Reviewed-by: Romain Naour [Thomas: adjust to the changes in the infra, fix typos.] Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-waf.txt | 67 +++++++++++++++++++++++++++++ docs/manual/adding-packages.txt | 2 + 2 files changed, 69 insertions(+) create mode 100644 docs/manual/adding-packages-waf.txt diff --git a/docs/manual/adding-packages-waf.txt b/docs/manual/adding-packages-waf.txt new file mode 100644 index 0000000000..3c0dbe4aae --- /dev/null +++ b/docs/manual/adding-packages-waf.txt @@ -0,0 +1,67 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +=== Infrastructure for Waf-based packages + +[[waf-package-tutorial]] + +==== +waf-package+ tutorial + +First, let's see how to write a +.mk+ file for a Waf-based package, with +an example : + +------------------------ +01: ################################################################################ +02: # +03: # libfoo +04: # +05: ################################################################################ +06: +07: LIBFOO_VERSION = 1.0 +08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz +09: LIBFOO_SITE = http://www.foosoftware.org/download +10: LIBFOO_CONF_OPTS = --enable-bar --disable-baz +11: LIBFOO_DEPENDENCIES = bar +12: +13: $(eval $(waf-package)) +------------------------ + +On line 7, we declare the version of the package. + +On line 8 and 9, we declare the name of the tarball (xz-ed tarball +recommended) and the location of the tarball on the Web. Buildroot +will automatically download the tarball from this location. + +On line 10, we tell Buildroot what options to enable for libfoo. + +On line 11, we tell Buildroot the depednencies of libfoo. + +Finally, on line line 13, we invoke the +waf-package+ +macro that generates all the Makefile rules that actually allows the +package to be built. + +[[waf-package-reference]] + +==== +waf-package+ reference + +The main macro of the Waf package infrastructure is +waf-package+. +It is similar to the +generic-package+ macro. + +Just like the generic infrastructure, the Waf infrastructure works +by defining a number of variables before calling the +waf-package+ +macro. + +First, all the package metadata information variables that exist in +the generic infrastructure also exist in the Waf infrastructure: ++LIBFOO_VERSION+, +LIBFOO_SOURCE+, +LIBFOO_PATCH+, +LIBFOO_SITE+, ++LIBFOO_SUBDIR+, +LIBFOO_DEPENDENCIES+, +LIBFOO_INSTALL_STAGING+, ++LIBFOO_INSTALL_TARGET+. + +An additional variable, specific to the Waf infrastructure, can +also be defined. + +* +LIBFOO_NEEDS_EXTERNAL_WAF+ can be set to +YES+ or +NO+ to tell + Buildroot to use the bundled +waf+ executable. If set to +NO+, the + default, then Buildroot will use the waf executable provided in the + package source tree; if set to +YES+, then Buidlroot will download, + install waf as a host tool and use it to build the package. diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt index 76f90c9a84..4595991f0d 100644 --- a/docs/manual/adding-packages.txt +++ b/docs/manual/adding-packages.txt @@ -29,6 +29,8 @@ include::adding-packages-kconfig.txt[] include::adding-packages-rebar.txt[] +include::adding-packages-waf.txt[] + include::adding-packages-kernel-module.txt[] include::adding-packages-asciidoc.txt[] From 8d8cdf14926778445148e4ad9374feb9ebc78738 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Oct 2016 17:02:15 +0100 Subject: [PATCH 1642/3392] developpers: add myself as pkg-waf devel Signed-off-by: "Yann E. MORIN" Acked-by: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 684be4866c..12445d47f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1602,6 +1602,7 @@ F: package/nvidia-driver/ F: package/omxplayer/ F: package/python-pyparsing/ F: package/pkg-download.mk +F: package/pkg-waf.mk F: package/slirp/ F: package/snappy/ F: package/spice/ From 680d6177d0260ff937065a28b6e4ac398ad491a0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Oct 2016 17:02:16 +0100 Subject: [PATCH 1643/3392] package/glmark2: make it a waf-package Signed-off-by: "Yann E. MORIN" Cc: Bernd Kuhls Cc: Spenser Gilliland Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/glmark2/glmark2.mk | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index 2f662fee97..e35e36a4e6 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -8,7 +8,7 @@ GLMARK2_VERSION = fa71af2dfab711fac87b9504b6fc9862f44bf72a GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) GLMARK2_LICENSE = GPLv3+ SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI -GLMARK2_DEPENDENCIES = host-pkgconf host-python jpeg libpng \ +GLMARK2_DEPENDENCIES = host-pkgconf jpeg libpng \ $(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \ $(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \ $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) @@ -45,20 +45,4 @@ GLMARK2_CONF_OPTS += \ --prefix=/usr \ --with-flavors=$(subst $(space),$(comma),$(GLMARK2_FLAVORS)) -define GLMARK2_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(GLMARK2_CONF_ENV) \ - $(HOST_DIR)/usr/bin/python2 ./waf configure $(GLMARK2_CONF_OPTS) \ - ) -endef - -define GLMARK2_BUILD_CMDS - cd $(@D) && $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/python2 ./waf -endef - -define GLMARK2_INSTALL_TARGET_CMDS - cd $(@D) && $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/python2 ./waf install --destdir=$(TARGET_DIR) -endef - -$(eval $(generic-package)) +$(eval $(waf-package)) From 3bf46c647ba6f77c7394423fa77dde4c719d146f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Oct 2016 17:02:17 +0100 Subject: [PATCH 1644/3392] package/gst1-imx: make it a waf-package Signed-off-by: "Yann E. MORIN" Cc: Gary Bisson Cc: Gustavo Zacarias Reviewed-by: Romain Naour Tested-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-imx/gst1-imx.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk index 71b4e1e19e..b1d01bb785 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -14,7 +14,6 @@ GST1_IMX_INSTALL_STAGING = YES GST1_IMX_DEPENDENCIES += \ host-pkgconf \ - host-python \ gstreamer1 \ gst1-plugins-base @@ -53,21 +52,4 @@ endif endif endif -define GST1_IMX_CONFIGURE_CMDS - cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(HOST_DIR)/usr/bin/python2 ./waf configure $(GST1_IMX_CONF_OPTS) -endef - -define GST1_IMX_BUILD_CMDS - cd $(@D); \ - $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS) -endef - -define GST1_IMX_INSTALL_TARGET_CMDS - cd $(@D); \ - $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) \ - install -endef - -$(eval $(generic-package)) +$(eval $(waf-package)) From 32470605a976278946ab3134947bb0e35940a32f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Oct 2016 17:02:18 +0100 Subject: [PATCH 1645/3392] package/jack2: make it a waf-package Signed-off-by: "Yann E. MORIN" Cc: Wojciech M. Zabolotny Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/jack2/jack2.mk | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index fa9e451345..23c9723421 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -11,6 +11,8 @@ JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python JACK2_INSTALL_STAGING = YES JACK2_PATCH = https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch +JACK2_CONF_OPTS = --alsa + ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus endif @@ -42,34 +44,4 @@ endif # gtkiostream, which we do not have, so we don't need to depend on # eigen. -define JACK2_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(HOST_DIR)/usr/bin/python2 ./waf configure \ - --prefix=/usr \ - --alsa \ - $(JACK2_CONF_OPTS) \ - ) -endef - -define JACK2_BUILD_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS)) -endef - -define JACK2_INSTALL_TARGET_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) \ - install) -endef - -define JACK2_INSTALL_STAGING_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(STAGING_DIR) \ - install) -endef - -$(eval $(generic-package)) +$(eval $(waf-package)) From c1968da4b5e0bfc26fe8c8520aad940b6349b531 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Oct 2016 17:02:19 +0100 Subject: [PATCH 1646/3392] package/libimxvpuapi: make it a waf-package Signed-off-by: "Yann E. MORIN" Cc: Gary Bisson Reviewed-by: Romain Naour Tested-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/libimxvpuapi/libimxvpuapi.mk | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/package/libimxvpuapi/libimxvpuapi.mk b/package/libimxvpuapi/libimxvpuapi.mk index df84806234..fde4429375 100644 --- a/package/libimxvpuapi/libimxvpuapi.mk +++ b/package/libimxvpuapi/libimxvpuapi.mk @@ -11,25 +11,4 @@ LIBIMXVPUAPI_LICENSE_FILES = LICENSE LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu LIBIMXVPUAPI_INSTALL_STAGING = YES -define LIBIMXVPUAPI_CONFIGURE_CMDS - cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/python2 ./waf configure \ - --prefix=/usr --libdir=/usr/lib -endef - -define LIBIMXVPUAPI_BUILD_CMDS - cd $(@D); \ - $(HOST_DIR)/usr/bin/python2 ./waf build -j $(PARALLEL_JOBS) -endef - -define LIBIMXVPUAPI_INSTALL_STAGING_CMDS - cd $(@D); \ - $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(STAGING_DIR) install -endef - -define LIBIMXVPUAPI_INSTALL_TARGET_CMDS - cd $(@D); \ - $(HOST_DIR)/usr/bin/python2 ./waf --destdir=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) +$(eval $(waf-package)) From 4c06e102a64a11b15a8cdcc89d2c4a1a2368defd Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Oct 2016 17:02:20 +0100 Subject: [PATCH 1647/3392] package/mpv: make it a waf-package Signed-off-by: "Yann E. MORIN" Cc: Gustavo Zacarias Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/mpv/mpv.hash | 1 - package/mpv/mpv.mk | 30 +++--------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash index eea0db0176..fb287eff37 100644 --- a/package/mpv/mpv.hash +++ b/package/mpv/mpv.hash @@ -1,3 +1,2 @@ # Locally calculated sha256 fe6ec9d2ded5ce84b963f54b812d579d04f944f4a737f3ae639c4d5d9e842b56 v0.20.0.tar.gz -sha256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b waf-1.8.12 diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index 4f04fdfc47..0dd488d403 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -5,16 +5,16 @@ ################################################################################ MPV_VERSION = 0.20.0 -MPV_WAF_VERSION = 1.8.12 MPV_SITE = https://github.com/mpv-player/mpv/archive MPV_SOURCE = v$(MPV_VERSION).tar.gz -MPV_EXTRA_DOWNLOADS = https://waf.io/waf-$(MPV_WAF_VERSION) MPV_DEPENDENCIES = \ host-pkgconf ffmpeg zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) MPV_LICENSE = GPLv2+ MPV_LICENSE_FILES = LICENSE +MPV_NEEDS_EXTERNAL_WAF = YES + # Some of these options need testing and/or tweaks MPV_CONF_OPTS = \ --prefix=/usr \ @@ -235,28 +235,4 @@ else MPV_CONF_OPTS += --disable-x11 endif -define MPV_COPY_WAF - $(INSTALL) -m 0755 $(DL_DIR)/waf-$(MPV_WAF_VERSION) $(@D)/waf -endef -MPV_POST_EXTRACT_HOOKS += MPV_COPY_WAF - -define MPV_CONFIGURE_CMDS - cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - ./waf configure $(MPV_CONF_OPTS) -endef - -define MPV_BUILD_CMDS - cd $(@D); \ - $(TARGET_MAKE_ENV) \ - ./waf build -endef - -define MPV_INSTALL_TARGET_CMDS - cd $(@D); \ - $(TARGET_MAKE_ENV) \ - DESTDIR=$(TARGET_DIR) \ - ./waf install -endef - -$(eval $(generic-package)) +$(eval $(waf-package)) From c98a030bc976a01c82aab4f6a5ae63d4d85b6ac6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 30 Oct 2016 17:02:21 +0100 Subject: [PATCH 1648/3392] package/norm: make it a waf-package Signed-off-by: "Yann E. MORIN" Cc: Gustavo Zacarias Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/norm/norm.mk | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/package/norm/norm.mk b/package/norm/norm.mk index e1b3a5fcc2..8af76f8345 100644 --- a/package/norm/norm.mk +++ b/package/norm/norm.mk @@ -15,32 +15,10 @@ ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) NORM_DEPENDENCIES += libnetfilter_queue endif -define NORM_CONFIGURE_CMDS - cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - ./waf configure --prefix=/usr -endef - -define NORM_BUILD_CMDS - cd $(@D); \ - $(TARGET_MAKE_ENV) \ - ./waf build -endef - # install target doesn't install headers unfortunately... -define NORM_INSTALL_STAGING_CMDS - cd $(@D); \ - $(TARGET_MAKE_ENV) \ - DESTDIR=$(STAGING_DIR) \ - ./waf install +define NORM_INSTALL_HEADERS cp -f $(@D)/include/norm* $(STAGING_DIR)/usr/include endef +NORM_POST_INSTALL_STAGING_HOOKS += NORM_INSTALL_HEADERS -define NORM_INSTALL_TARGET_CMDS - cd $(@D); \ - $(TARGET_MAKE_ENV) \ - DESTDIR=$(TARGET_DIR) \ - ./waf install -endef - -$(eval $(generic-package)) +$(eval $(waf-package)) From 874f9aa3964c898353c805fa07e9dd18eaa740f4 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Fri, 2 Dec 2016 23:21:19 +0100 Subject: [PATCH 1649/3392] package/crudini: upgrade to 0.8 Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/crudini/crudini.hash | 6 +++--- package/crudini/crudini.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/crudini/crudini.hash b/package/crudini/crudini.hash index b9aaecf7b8..2796e7a8c6 100644 --- a/package/crudini/crudini.hash +++ b/package/crudini/crudini.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=7d1313f1bb9800db9cbceaa518bcf212, sha256 locally computed -md5 7d1313f1bb9800db9cbceaa518bcf212 crudini-0.7.tar.gz -sha256 5d493ae6600e54f9e0296b12d3adba99b88a439d8c4b2ebf9bc6f9c0613a03d7 crudini-0.7.tar.gz +# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=0664fa2f9d36e411e839b5394d8c2951, sha256 locally computed +md5 0664fa2f9d36e411e839b5394d8c2951 crudini-0.8.tar.gz +sha256 effdf8feb7efe252af87143c8756bbc69e2679afb6173083d38be02284385e5f crudini-0.8.tar.gz diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index d797efcdc0..9dfd174fbb 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -4,9 +4,9 @@ # ################################################################################ -CRUDINI_VERSION = 0.7 +CRUDINI_VERSION = 0.8 CRUDINI_SOURCE = crudini-$(CRUDINI_VERSION).tar.gz -CRUDINI_SITE = https://pypi.python.org/packages/source/c/crudini +CRUDINI_SITE = https://pypi.python.org/packages/23/4a/934b05bbe5af4fd390207c5e935efbae6439809aad65ab0702e236c1b5f5 CRUDINI_SETUP_TYPE = setuptools CRUDINI_LICENSE = GPLv2 CRUDINI_LICENSE_FILES = COPYING From 320baabb5587c018cc213ae1f856b3a2b4a80de8 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Fri, 2 Dec 2016 23:27:26 +0100 Subject: [PATCH 1650/3392] package/qjson: upgrade to upstream 0.9.0, update CMakeLists.txt patch to properly apply Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- ...-Qt4-package-error-in-CMakeLists.txt.patch | 25 ++++++++----------- package/qjson/qjson.hash | 2 +- package/qjson/qjson.mk | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch b/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch index 6f7a9ba237..a9e34e4c26 100644 --- a/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch +++ b/package/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch @@ -1,10 +1,7 @@ -From 45ec86156819c0872d023b05001682a8d2d2dc25 Mon Sep 17 00:00:00 2001 +From 254858bbf443bded2e80480e9f9032ce166b923e Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati -Date: Sat, 6 Apr 2013 16:54:25 +0200 -Subject: [PATCH] fix Qt4 package error in CMakeLists.txt - -Avoid checking for uic executable by cmake as it results configure -time error if QtGui isn't installed. +Date: Fri, 2 Dec 2016 23:00:58 +0100 +Subject: [PATCH] CMake, Qt4: check specifically for QtCore, fixes #96 Signed-off-by: Zoltan Gyarmati --- @@ -12,18 +9,18 @@ Signed-off-by: Zoltan Gyarmati 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index adb65e9..81854b1 100644 +index 31d9987..2fde79f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -52,7 +52,7 @@ IF (Qt5Core_FOUND) +@@ -62,7 +62,7 @@ IF (Qt5Core_FOUND) ELSE() MESSAGE ("Qt5 not found, searching for Qt4") # Find Qt4 -- FIND_PACKAGE( Qt4 REQUIRED ) -+ FIND_PACKAGE( Qt4 COMPONENTS QtCore REQUIRED ) - - # Include the cmake file needed to use qt4 - INCLUDE( ${QT_USE_FILE} ) +- FIND_PACKAGE( Qt4 4.5 REQUIRED ) ++ FIND_PACKAGE( Qt4 4.5 REQUIRED QtCore) + # QStringBuilder is supported since Qt 4.8 for both QString and QByteArray + IF (NOT (${QT_VERSION_MINOR} STRLESS "8")) + MESSAGE ("Enable QStringBuilder") -- -2.1.1 +2.7.4 diff --git a/package/qjson/qjson.hash b/package/qjson/qjson.hash index 6282227693..d794b48727 100644 --- a/package/qjson/qjson.hash +++ b/package/qjson/qjson.hash @@ -1,2 +1,2 @@ # locally computed -sha256 863f0dd6b7199f84acf1e2487735830fab316a9a3a5e1651130ad153a231f2ed qjson-ba273682a9d33a7b3090e74f4742b5f3bf6c9b02.tar.gz +sha256 e812617477f3c2bb990561767a4cd8b1d3803a52018d4878da302529552610d4 qjson-0.9.0.tar.gz diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk index 6a1661733d..dab2381bee 100644 --- a/package/qjson/qjson.mk +++ b/package/qjson/qjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -QJSON_VERSION = ba273682a9d33a7b3090e74f4742b5f3bf6c9b02 +QJSON_VERSION = 0.9.0 QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION)) QJSON_INSTALL_STAGING = YES QJSON_DEPENDENCIES = \ From a9f458e6a0dfcd5c9519384516a5a84381361ff7 Mon Sep 17 00:00:00 2001 From: Zoltan Gyarmati Date: Fri, 2 Dec 2016 23:34:00 +0100 Subject: [PATCH 1651/3392] package/tinc: upgrade to upstream version 1.0.30 Signed-off-by: Zoltan Gyarmati Signed-off-by: Thomas Petazzoni --- package/tinc/tinc.hash | 2 +- package/tinc/tinc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tinc/tinc.hash b/package/tinc/tinc.hash index 0cccbbffb2..135a4f3904 100644 --- a/package/tinc/tinc.hash +++ b/package/tinc/tinc.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 0b502699360f09ce2128a39cf02abca07bfc699fc02ce829b3a90cf5e1e8b344 tinc-1.0.28.tar.gz +sha256 abc17e25afc1b9e74423c78fef586b11d503cbbbe5e4a2ed323870f4a82faa73 tinc-1.0.30.tar.gz diff --git a/package/tinc/tinc.mk b/package/tinc/tinc.mk index fb15c34b74..6d87cbf102 100644 --- a/package/tinc/tinc.mk +++ b/package/tinc/tinc.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINC_VERSION = 1.0.28 +TINC_VERSION = 1.0.30 TINC_SITE = http://www.tinc-vpn.org/packages TINC_DEPENDENCIES = lzo openssl zlib TINC_LICENSE = GPLv2+ with OpenSSL exception From c21c005d53c4697e64a7284fa34b061ac198178b Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Fri, 2 Dec 2016 23:40:16 +0100 Subject: [PATCH 1652/3392] acpica: bump to version 20161117 Build- and run-tested on x86_64 and aarch64. Signed-off-by: Erico Nunes Signed-off-by: Thomas Petazzoni --- package/acpica/acpica.hash | 3 ++- package/acpica/acpica.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/acpica/acpica.hash b/package/acpica/acpica.hash index ca6dd929d5..8f1c08a677 100644 --- a/package/acpica/acpica.hash +++ b/package/acpica/acpica.hash @@ -1,2 +1,3 @@ # locally computed hash -sha256 fea808449aac29442c22419ad9e3eaa6b1a35f02e0db2b2f8802dc3af69e4965 acpica-unix2-20160831.tar.gz +sha256 dfb33db5599bd48134dbd6e50c8804099be0cf1c35d98975a6cb84dabca78b67 acpica-unix2-20161117.tar.gz + diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk index a42eb728eb..f76c948c3d 100644 --- a/package/acpica/acpica.mk +++ b/package/acpica/acpica.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACPICA_VERSION = 20160831 +ACPICA_VERSION = 20161117 ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz ACPICA_SITE = https://acpica.org/sites/acpica/files ACPICA_LICENSE = BSD-3c or GPLv2 From b04a707e7e36c9784d5a53a4087e8ad3f609c937 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Fri, 2 Dec 2016 23:40:17 +0100 Subject: [PATCH 1653/3392] fwts: bump to version V16.11.00 Build- and run-tested on x86_64 and aarch64. Signed-off-by: Erico Nunes Signed-off-by: Thomas Petazzoni --- package/fwts/fwts.hash | 2 +- package/fwts/fwts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index a3e57584f2..e23386e1fd 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,2 +1,2 @@ # Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 4bab7a9daa6def8951b160e9f2c14b203459881d0a1279cb19329bec727c9f2d fwts-V16.09.00.tar.gz +sha256 077b57864515ffdd6d655201da750829f9ccffb8f280eb86d01c2ef184cdcb16 fwts-V16.11.00.tar.gz diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index 7ec1d5ed31..984e368fd9 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWTS_VERSION = V16.09.00 +FWTS_VERSION = V16.11.00 FWTS_SITE = http://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 FWTS_LICENSE = GPLv2, LGPLv2.1, Custom From 7fe6b5d9dc88708ba5141ef5c8aa923a6ae54339 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Dec 2016 21:16:52 +0100 Subject: [PATCH 1654/3392] nodejs: security bump 0.10.x series to 0.10.48 c-ares: fix for single-byte buffer overwrite, CVE-2016-5180, more information at https://c-ares.haxx.se/adv_20160929.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- .../0001-remove-python-bz2-dependency.patch | 0 .../0002-gyp-force-link-command-to-use-CXX.patch | 0 .../0003-fix-musl-USE-MISC-build-issue.patch | 0 .../{0.10.47 => 0.10.48}/0004-Fix-support-for-uClibc-ng.patch | 0 package/nodejs/Config.in | 2 +- package/nodejs/nodejs.hash | 4 ++-- 6 files changed, 3 insertions(+), 3 deletions(-) rename package/nodejs/{0.10.47 => 0.10.48}/0001-remove-python-bz2-dependency.patch (100%) rename package/nodejs/{0.10.47 => 0.10.48}/0002-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{0.10.47 => 0.10.48}/0003-fix-musl-USE-MISC-build-issue.patch (100%) rename package/nodejs/{0.10.47 => 0.10.48}/0004-Fix-support-for-uClibc-ng.patch (100%) diff --git a/package/nodejs/0.10.47/0001-remove-python-bz2-dependency.patch b/package/nodejs/0.10.48/0001-remove-python-bz2-dependency.patch similarity index 100% rename from package/nodejs/0.10.47/0001-remove-python-bz2-dependency.patch rename to package/nodejs/0.10.48/0001-remove-python-bz2-dependency.patch diff --git a/package/nodejs/0.10.47/0002-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/0.10.48/0002-gyp-force-link-command-to-use-CXX.patch similarity index 100% rename from package/nodejs/0.10.47/0002-gyp-force-link-command-to-use-CXX.patch rename to package/nodejs/0.10.48/0002-gyp-force-link-command-to-use-CXX.patch diff --git a/package/nodejs/0.10.47/0003-fix-musl-USE-MISC-build-issue.patch b/package/nodejs/0.10.48/0003-fix-musl-USE-MISC-build-issue.patch similarity index 100% rename from package/nodejs/0.10.47/0003-fix-musl-USE-MISC-build-issue.patch rename to package/nodejs/0.10.48/0003-fix-musl-USE-MISC-build-issue.patch diff --git a/package/nodejs/0.10.47/0004-Fix-support-for-uClibc-ng.patch b/package/nodejs/0.10.48/0004-Fix-support-for-uClibc-ng.patch similarity index 100% rename from package/nodejs/0.10.47/0004-Fix-support-for-uClibc-ng.patch rename to package/nodejs/0.10.48/0004-Fix-support-for-uClibc-ng.patch diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index a47ba37a4a..832152b9f0 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -44,7 +44,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_PACKAGE_NODEJS_VERSION_STRING string default "6.9.1" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS - default "0.10.47" + default "0.10.48" config BR2_PACKAGE_NODEJS_NPM bool "NPM for the target" diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 5df79afee4..e55bb1696d 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From upstream URL: http://nodejs.org/dist/v0.10.47/SHASUMS256.txt -sha256 335bdf4db702885a8acaf2c9f241c70cabd62497361da81aca65c8e8a8e7ff09 node-v0.10.47.tar.xz +# From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt +sha256 365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e node-v0.10.48.tar.xz # From upstream URL: http://nodejs.org/dist/v6.9.1/SHASUMS256.txt sha256 0bdd8d1305777cc8cd206129ea494d6c6ce56001868dd80147aff531d6df0729 node-v6.9.1.tar.xz From 0904b80b47245cf85d414f78c381b9cf61c6ef4b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 3 Dec 2016 16:24:23 +0100 Subject: [PATCH 1655/3392] cmake: pass HOST_CONFIGURE_OPTS at configure time Since we bumped CMake from 3.5.2 to 3.6.3 in commit 99ed85d74081a8611a6f6d1f3d745a5c40aef975, CMake uses pkg-config during its configure step to find available libraries on the host. If host-pkgconf was not built before host-cmake, everything was working fine. However, if host-pkgconf was built before, the configure step of host-cmake was finding pkg-config and used it to find libraries. Unfortunately, since we were not passing PKG_CONFIG_PATH/PKG_CONFIG_SYSROOT_DIR, pkg-config was behaving in its "default" mode, i.e returning results valid when building things for the target, not for the host. This lead to header paths pointing to the staging directory being used when building native binary objects, causing all sort of build failures. This commit fixes that by passing $(HOST_CONFIGURE_OPTS) to the environment of host-cmake configure step. This variable contains HOST_MAKE_ENV, which itself contains the appropriate PKG_CONFIG_PATH/PKG_CONFIG_SYSROOT_DIR definitions. At the same time, we drop LDFLAGS="$(HOST_LDFLAGS)" because this definition is already in $(HOST_CONFIGURE_OPTS). Fixes: http://autobuild.buildroot.net/results/4e703ed8c2eb0f914794038b0ef7bd73a67f38ce/ (and 424 similar build failures) Signed-off-by: Thomas Petazzoni --- package/cmake/cmake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index f4c61aa69f..107715ce49 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -39,7 +39,7 @@ HOST_CMAKE_CXXFLAGS = $(shell echo $(HOST_CXXFLAGS) | sed -r "s%$(HOST_CPPFLAGS) define HOST_CMAKE_CONFIGURE_CMDS (cd $(@D); \ - LDFLAGS="$(HOST_LDFLAGS)" \ + $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CMAKE_CFLAGS)" \ ./bootstrap --prefix=$(HOST_DIR)/usr \ --parallel=$(PARALLEL_JOBS) -- \ From 7db6d46b165035a725911711e32f041fd1e6155c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Dec 2016 10:08:23 +0100 Subject: [PATCH 1656/3392] lttng-babeltrace: remove patch applied upstream In commit 5b0dac7ef5d8106ec77d128c53f480fd8721c05c, when bumping to lttng-babeltrace, one patch was kept while it had been applied in the upstream babeltrace project, causing a build failure. The patch 0003-fix-uuid-support-detection-on-static-build.patch has been applied upstream as 2741f55be80ae8af169ae795ea28d2a39c18fa60 in the master branch, and as d94e7873e9080e820e7742e468736b1317a88de1 in the maintenance branch that was used to tag 1.5.0. Fixes: http://autobuild.buildroot.net/results/585f960eb81b0e15858aadc4aca516af23012b61/ (and about a hundred of similar build failures) Signed-off-by: Thomas Petazzoni --- ...id-support-detection-on-static-build.patch | 86 ------------------- package/lttng-babeltrace/lttng-babeltrace.mk | 4 +- 2 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 package/lttng-babeltrace/0003-fix-uuid-support-detection-on-static-build.patch diff --git a/package/lttng-babeltrace/0003-fix-uuid-support-detection-on-static-build.patch b/package/lttng-babeltrace/0003-fix-uuid-support-detection-on-static-build.patch deleted file mode 100644 index 875aa88f6e..0000000000 --- a/package/lttng-babeltrace/0003-fix-uuid-support-detection-on-static-build.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 2741f55be80ae8af169ae795ea28d2a39c18fa60 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Wed, 1 Jun 2016 21:56:32 +0200 -Subject: [PATCH] configure: fix uuid support detection on static build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This change adds uuid detection using pkg-config helper before falling -back on the standard AC_CHECK_LIB detection for platforms missing -pkg-config. - -AC_CHECK_LIB function achieves its test by trying to link against the -requested library, without taking care of its dependency -requirements/flags that may differ between different targets. -Therefore, in case of static build, it can fail on the uuid detection -like [1], because the uuid's dependency flags (regarding gettext) are -missing. - -Instead, using pkg-config to do the check will take care of getting and -setting all required flags. - -This issue [1] has been triggered on Buildroot farms. - -[1] http://autobuild.buildroot.net/results/43b/43b98ddf9eb44152ed9ac4a98d887af14831d8da/build-end.log - -Signed-off-by: Samuel Martin -Signed-off-by: Jérémie Galarneau -[Philippe: grabbed from this upstream patch: - https://github.com/efficios/babeltrace/commit/2741f55be80ae8af169ae795ea28d2a39c18fa60.patch -] -Signed-off-by: Philippe Proulx ---- - configure.ac | 31 +++++++++++++++++++++---------- - 1 file changed, 21 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 84f9000..2f5e3f8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -163,24 +163,35 @@ AC_CHECK_FUNCS([uuid_generate], - link_with_libuuid=no - ], - [ -- # Check for libuuid -- AC_CHECK_LIB([uuid], [uuid_generate], -+ # First, check the pkg-config module is available, otherwise explicitly check -+ # for libuuid, or uuid support in the C-library. -+ PKG_CHECK_MODULES([UUID], [uuid], - [ -+ LIBS="${UUID_LIBS} ${LIBS}" -+ CFLAGS="${CFLAGS} ${UUID_CFLAGS}" - AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) - link_with_libuuid=yes - ], - [ -- # libuuid not found, check for uuid_create in libc. -- AC_CHECK_LIB([c], [uuid_create], -+ # Check for libuuid -+ AC_CHECK_LIB([uuid], [uuid_generate], - [ -- AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) -- link_with_libc_uuid=yes -+ AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) -+ link_with_libuuid=yes - ], - [ -- # for MinGW32 we have our own internal implemenation of uuid using Windows functions. -- if test "x$MINGW32" = xno; then -- AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) -- fi -+ # libuuid not found, check for uuid_create in libc. -+ AC_CHECK_LIB([c], [uuid_create], -+ [ -+ AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) -+ link_with_libc_uuid=yes -+ ], -+ [ -+ # for MinGW32 we have our own internal implemenation of uuid using Windows functions. -+ if test "x$MINGW32" = xno; then -+ AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) -+ fi -+ ]) - ]) - ]) - ]) diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk index 10f96ab2d6..26339914f5 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.mk +++ b/package/lttng-babeltrace/lttng-babeltrace.mk @@ -14,9 +14,7 @@ HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ host-popt host-util-linux host-libglib2 host-pkgconf HOST_LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info -# For: -# 0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch -# 0003-fix-uuid-support-detection-on-static-build.patch +# For: 0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch LTTNG_BABELTRACE_AUTORECONF = YES ifeq ($(BR2_PACKAGE_ELFUTILS),y) From 715498b1ee5072fda8a8f132bb80895d817f2bad Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Dec 2016 15:03:10 +0100 Subject: [PATCH 1657/3392] lttng-libust: needs autoreconf The recently introduced 0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch touches Makefile.am, so lttng-libust needs to be autoreconfed. Fixes: http://autobuild.buildroot.net/results/e917552ea1069da74c4e392556914d05c010a250/ Signed-off-by: Thomas Petazzoni --- package/lttng-libust/lttng-libust.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index 23cc745392..5667abb82d 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -12,6 +12,8 @@ LTTNG_LIBUST_LICENSE_FILES = COPYING LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux LTTNG_LIBUST_CONF_OPTS += --disable-man-pages +# 0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch +LTTNG_LIBUST_AUTORECONF = YES ifeq ($(BR2_PACKAGE_PYTHON),y) LTTNG_LIBUST_DEPENDENCIES += python From e723eaf564d61064d888b52c4283f6dd456bc765 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 4 Dec 2016 13:22:05 +0100 Subject: [PATCH 1658/3392] package/efl: use liblz4 from lz4 package Efl libraries bundle a copy of liblz4 which is also provided by lz4 Buildroot package. Switch to liblz4 from lz4 package. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/efl/Config.in | 1 + package/efl/efl.mk | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 69b0dcfb39..5d687e85bd 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_EFL select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency # https://phab.enlightenment.org/T2728 select BR2_PACKAGE_LUAJIT # Lua support broken + select BR2_PACKAGE_LZ4 select BR2_PACKAGE_UTIL_LINUX # libblkid is part of required tools, see EFL's README. select BR2_PACKAGE_UTIL_LINUX_LIBBLKID diff --git a/package/efl/efl.mk b/package/efl/efl.mk index bdf304d3c7..6ddd454e9b 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -20,7 +20,7 @@ EFL_LICENSE_FILES = \ EFL_INSTALL_STAGING = YES EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ - jpeg luajit udev util-linux zlib + jpeg luajit lz4 udev util-linux zlib # Configure options: # --disable-lua-old: build elua for the target. @@ -28,6 +28,7 @@ EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ # --disable-sdl: disable sdl2 support. # --disable-spectre: disable spectre image loader. # --disable-xinput22: disable X11 XInput v2.2+ support. +# --enable-liblz4: use liblz4 from lz4 package. # --with-doxygen: disable doxygen documentation EFL_CONF_OPTS = \ --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ @@ -43,6 +44,7 @@ EFL_CONF_OPTS = \ --disable-spectre \ --disable-xinput22 \ --disable-wayland \ + --enable-liblz4 \ --with-doxygen=no # Disable untested configuration warning. From 9b4218f4f4e3cd82f2c51c646557cd1143faaa0f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 4 Dec 2016 13:22:04 +0100 Subject: [PATCH 1659/3392] package/enlightenment: bump to version 0.21.4 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/enlightenment/enlightenment.hash | 4 ++-- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index 6c82bdc5f2..ba66918e76 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,2 +1,2 @@ -# From https://www.enlightenment.org/news/e-0.21.3-release -sha256 b90517d3de780023043b6e3ade30f686bd2cdcf5b66d24155b50da720e665fd2 enlightenment-0.21.3.tar.xz +# From https://www.enlightenment.org/news/e-0.21.4-release +sha256 0ed1a7c768017b2afa02cf94d9c532e9f960b6a4a7e79954770424dfb6b1bf20 enlightenment-0.21.4.tar.xz diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 98f537df1e..1cbf59845c 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.21.3 +ENLIGHTENMENT_VERSION = 0.21.4 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2c From a44d7f2dbb19a54a8f2beb5c0f0adb0680999319 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 4 Dec 2016 12:20:27 +0100 Subject: [PATCH 1660/3392] uclibc: update to 1.0.20 The test suite is removed from the package and is already a separate package in buildroot. All patches are upstream, so remove them. The UCLIBC_HAS_LFS option is removed upstream. Signed-off-by: Waldemar Brodkorb [Thomas: remove BR2_UCLIBC_INSTALL_TEST_SUITE option, add it to Config.in.legacy.] Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 8 +++ .../0001-linuxthreads-add-back-signal.h.patch | 28 -------- ...dvise-related-macros-for-noMMU-targe.patch | 66 ------------------- ...osix_madvise-not-available-for-noMMU.patch | 30 --------- package/uclibc/Config.in | 16 ----- package/uclibc/uclibc.hash | 2 +- package/uclibc/uclibc.mk | 30 +-------- 7 files changed, 10 insertions(+), 170 deletions(-) delete mode 100644 package/uclibc/0001-linuxthreads-add-back-signal.h.patch delete mode 100644 package/uclibc/0002-do-not-define-madvise-related-macros-for-noMMU-targe.patch delete mode 100644 package/uclibc/0003-posix_madvise-not-available-for-noMMU.patch diff --git a/Config.in.legacy b/Config.in.legacy index aeefb392c3..39a2d0092a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,14 @@ endif ############################################################################### comment "Legacy options removed in 2017.02" +config BR2_UCLIBC_INSTALL_TEST_SUITE + bool "uClibc tests now in uclibc-ng-test" + select BR2_LEGACY + select BR2_PACKAGE_UCLIBC_NG_TEST + help + The test suite of the uClibc C library has been moved into a + separate package, uclibc-ng-test. + config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX bool "Blackfin.uclinux.org 2014R1 toolchain removed" select BR2_LEGACY diff --git a/package/uclibc/0001-linuxthreads-add-back-signal.h.patch b/package/uclibc/0001-linuxthreads-add-back-signal.h.patch deleted file mode 100644 index 1a957c5bca..0000000000 --- a/package/uclibc/0001-linuxthreads-add-back-signal.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 543308f6c46cf2edf8a524bc9c631e472570fe72 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Mon, 24 Oct 2016 05:15:07 +0200 -Subject: [PATCH] linuxthreads: add back signal.h - -Somehow this got removed with f1d7505e40654a185843bdc8f1cf1fd00ab55c04. - -Reported-by: Thomas Petazzoni -Signed-off-by: Waldemar Brodkorb ---- - libpthread/linuxthreads/sysdeps/pthread/pthread.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libpthread/linuxthreads/sysdeps/pthread/pthread.h b/libpthread/linuxthreads/sysdeps/pthread/pthread.h -index cf043b5..cc13a52 100644 ---- a/libpthread/linuxthreads/sysdeps/pthread/pthread.h -+++ b/libpthread/linuxthreads/sysdeps/pthread/pthread.h -@@ -20,6 +20,7 @@ - #include - #include - -+#include - #include - #include - --- -2.1.4 - diff --git a/package/uclibc/0002-do-not-define-madvise-related-macros-for-noMMU-targe.patch b/package/uclibc/0002-do-not-define-madvise-related-macros-for-noMMU-targe.patch deleted file mode 100644 index 31e763a4d6..0000000000 --- a/package/uclibc/0002-do-not-define-madvise-related-macros-for-noMMU-targe.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 2ca4e8dcbd35e5c6da41a195550d741ccb2f7978 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Sat, 26 Nov 2016 19:47:41 +0100 -Subject: [PATCH] do not define madvise related macros for noMMU targets - -Signed-off-by: Waldemar Brodkorb ---- - libc/sysdeps/linux/common/bits/mman-common.h | 41 +++++++++++++++------------- - 1 file changed, 22 insertions(+), 19 deletions(-) - -diff --git a/libc/sysdeps/linux/common/bits/mman-common.h b/libc/sysdeps/linux/common/bits/mman-common.h -index 6cde5da..5b20da4 100644 ---- a/libc/sysdeps/linux/common/bits/mman-common.h -+++ b/libc/sysdeps/linux/common/bits/mman-common.h -@@ -83,26 +83,29 @@ - # define MREMAP_FIXED 2 - #endif - -+/* only define for MMU targets, no-MMU does not support madvise. */ -+#ifdef __ARCH_USE_MMU__ - /* Advice to `madvise'. */ --#ifdef __USE_BSD --# define MADV_NORMAL 0 /* No further special treatment. */ --# define MADV_RANDOM 1 /* Expect random page references. */ --# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */ --# define MADV_WILLNEED 3 /* Will need these pages. */ --# define MADV_DONTNEED 4 /* Don't need these pages. */ --# define MADV_REMOVE 9 /* Remove these pages and resources. */ --# define MADV_DONTFORK 10 /* Do not inherit across fork. */ --# define MADV_DOFORK 11 /* Do inherit across fork. */ --# define MADV_MERGEABLE 12 /* KSM may merge identical pages. */ --# define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages. */ --# define MADV_HWPOISON 100 /* Poison a page for testing. */ --#endif -+# ifdef __USE_BSD -+# define MADV_NORMAL 0 /* No further special treatment. */ -+# define MADV_RANDOM 1 /* Expect random page references. */ -+# define MADV_SEQUENTIAL 2 /* Expect sequential page references. */ -+# define MADV_WILLNEED 3 /* Will need these pages. */ -+# define MADV_DONTNEED 4 /* Don't need these pages. */ -+# define MADV_REMOVE 9 /* Remove these pages and resources. */ -+# define MADV_DONTFORK 10 /* Do not inherit across fork. */ -+# define MADV_DOFORK 11 /* Do inherit across fork. */ -+# define MADV_MERGEABLE 12 /* KSM may merge identical pages. */ -+# define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages. */ -+# define MADV_HWPOISON 100 /* Poison a page for testing. */ -+# endif - - /* The POSIX people had to invent similar names for the same things. */ --#ifdef __USE_XOPEN2K --# define POSIX_MADV_NORMAL 0 /* No further special treatment. */ --# define POSIX_MADV_RANDOM 1 /* Expect random page references. */ --# define POSIX_MADV_SEQUENTIAL 2 /* Expect sequential page references. */ --# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */ --# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */ -+# ifdef __USE_XOPEN2K -+# define POSIX_MADV_NORMAL 0 /* No further special treatment. */ -+# define POSIX_MADV_RANDOM 1 /* Expect random page references. */ -+# define POSIX_MADV_SEQUENTIAL 2 /* Expect sequential page references. */ -+# define POSIX_MADV_WILLNEED 3 /* Will need these pages. */ -+# define POSIX_MADV_DONTNEED 4 /* Don't need these pages. */ -+# endif - #endif --- -2.1.4 - diff --git a/package/uclibc/0003-posix_madvise-not-available-for-noMMU.patch b/package/uclibc/0003-posix_madvise-not-available-for-noMMU.patch deleted file mode 100644 index 008aac75e8..0000000000 --- a/package/uclibc/0003-posix_madvise-not-available-for-noMMU.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9945c6d21797553e78cbef8034f6dd16b3824df5 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Mon, 28 Nov 2016 07:31:00 +0100 -Subject: [PATCH] posix_madvise not available for noMMU - -Signed-off-by: Waldemar Brodkorb ---- - libc/sysdeps/linux/common/posix_madvise.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libc/sysdeps/linux/common/posix_madvise.c b/libc/sysdeps/linux/common/posix_madvise.c -index 2f95bcb..541dabe 100644 ---- a/libc/sysdeps/linux/common/posix_madvise.c -+++ b/libc/sysdeps/linux/common/posix_madvise.c -@@ -4,6 +4,7 @@ - #include - #include - -+#ifdef __ARCH_USE_MMU__ - #if defined __NR_madvise && defined __USE_XOPEN2K && defined __UCLIBC_HAS_ADVANCED_REALTIME__ - int posix_madvise(void *addr, size_t len, int advice) - { -@@ -23,3 +24,4 @@ int posix_madvise(void *addr, size_t len, int advice) - return INTERNAL_SYSCALL_ERRNO (result, err); - } - #endif -+#endif --- -2.1.4 - diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index fdf007e601..eb002c164a 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -95,22 +95,6 @@ config BR2_UCLIBC_INSTALL_UTILS You can save ~32 KiB in target space by disabling them since they're normally not needed. -config BR2_UCLIBC_INSTALL_TEST_SUITE - bool "Compile and install uClibc tests" - help - Enabling this option will compile and install the uClibc test suite. - This is useful if you want to check if the uClibc library is working - for your architecture and/or help developing uClibc. - - The test suite will be installed into /root/uClibc directory. To run - the test suite enter the /root/uClibc/test directory and type - "sh uclibcng-testrunner.sh". - - See the /root/uClibc/test/README for additional information. - - This is not needed at all for normal builds, so you can safely say no - if you do not plan to dig into your C library. - # Mapping from the Buildroot architecture configuration options to the # uClibc architecture names. config BR2_UCLIBC_TARGET_ARCH diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 227c78304c..9d2a5ec0f2 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,2 +1,2 @@ # From http://www.uclibc-ng.org/ -sha256 b3f94d67e9afcefb158a37011584e0d41ef3bd55ad72255a26abb25ad49b77a1 uClibc-ng-1.0.19.tar.xz +sha256 1c817672a65cf9132c98f84e1b8445650de1c18eca258f49c0050b420a25e946 uClibc-ng-1.0.20.tar.xz diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 3f383a8033..aa67a1e763 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.19 +UCLIBC_VERSION = 1.0.20 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPLv2.1+ @@ -247,14 +247,6 @@ define UCLIBC_ENDIAN_CONFIG endef endif -# -# Largefile -# - -define UCLIBC_LARGEFILE_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LFS,$(@D)/.config) -endef - # # MMU # @@ -445,16 +437,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(UCLIBC_SHARED_LIBS_CONFIG) endef -ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y) -define UCLIBC_BUILD_TEST_SUITE - $(MAKE) -C $(@D) \ - $(UCLIBC_MAKE_FLAGS) \ - TEST_INSTALLED_UCLIBC=1 \ - UCLIBC_ONLY=1 \ - test_compile test_gen -endef -endif - define UCLIBC_BUILD_CMDS $(MAKE) -C $(@D) $(UCLIBC_MAKE_FLAGS) headers $(MAKE) -C $(@D) $(UCLIBC_MAKE_FLAGS) @@ -463,14 +445,6 @@ define UCLIBC_BUILD_CMDS HOSTCC="$(HOSTCC)" hostutils endef -ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y) -define UCLIBC_INSTALL_TEST_SUITE - mkdir -p $(TARGET_DIR)/root/uClibc - cp -rdpf $(@D)/test $(TARGET_DIR)/root/uClibc - find $(TARGET_DIR)/root/uClibc -name \*.o -exec rm {} \; -endef -endif - ifeq ($(BR2_UCLIBC_INSTALL_UTILS),y) define UCLIBC_INSTALL_UTILS_TARGET $(MAKE1) -C $(@D) \ @@ -489,8 +463,6 @@ define UCLIBC_INSTALL_TARGET_CMDS RUNTIME_PREFIX=/ \ install_runtime $(UCLIBC_INSTALL_UTILS_TARGET) - $(UCLIBC_BUILD_TEST_SUITE) - $(UCLIBC_INSTALL_TEST_SUITE) $(UCLIBC_INSTALL_LDSO_SYMLINKS) endef From cbc75196db0eeee0ac01080bf2ad2cc66ad44473 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 4 Dec 2016 11:37:22 +0100 Subject: [PATCH 1661/3392] package/tor: add optional support for libcap - without libcap $ host/usr/bin/x86_64-linux-readelf -a target/usr/bin/tor | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libevent-2.0.so.5] 0x0000000000000001 (NEEDED) Shared library: [libssl.so.1.0.0] 0x0000000000000001 (NEEDED) Shared library: [libcrypto.so.1.0.0] 0x0000000000000001 (NEEDED) Shared library: [libz.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.0] - with libcap $ host/usr/bin/x86_64-linux-readelf -a target/usr/bin/tor | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libevent-2.0.so.5] 0x0000000000000001 (NEEDED) Shared library: [libssl.so.1.0.0] 0x0000000000000001 (NEEDED) Shared library: [libcrypto.so.1.0.0] 0x0000000000000001 (NEEDED) Shared library: [libz.so.1] 0x0000000000000001 (NEEDED) Shared library: [libcap.so.2] 0x0000000000000001 (NEEDED) Shared library: [libc.so.0] The tor configure script has no option to en-/disable libcap support. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tor/tor.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 6a622cf0ef..a3249092ca 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -26,6 +26,10 @@ TOR_CONF_OPTS += \ --enable-static-zlib endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +TOR_DEPENDENCIES += libcap +endif + ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_i386)$(BR2_x86_64)$(BR2_PACKAGE_LIBSECCOMP),yy) TOR_CONF_OPTS += --enable-seccomp TOR_DEPENDENCIES += libseccomp From de0df997068ee56c4f37fdfaefc92c6c2a6a4c6a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 4 Dec 2016 10:43:04 +0100 Subject: [PATCH 1662/3392] core: add a kconfig option to require an UTF8 locale on the host This can be selected when we need the host to have an UTF-8 locale (e.g. to build uClibc with support for locales). Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Config.in b/Config.in index 98096dff12..495b71ce03 100644 --- a/Config.in +++ b/Config.in @@ -84,6 +84,11 @@ config BR2_HOSTARCH_NEEDS_IA32_LIBS config BR2_HOSTARCH_NEEDS_IA32_COMPILER bool +# Hidden boolean selected by packages that need the host to have an +# UTF8 locale. +config BR2_NEEDS_HOST_UTF8_LOCALE + bool + source "arch/Config.in" menu "Build options" From 70da1d7c46415f4ed231af8598839fc779b130ec Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 4 Dec 2016 10:43:05 +0100 Subject: [PATCH 1663/3392] package/uclibc: needs a host with an UTF8 locale to build locales Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/uclibc/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index eb002c164a..a20015438e 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -41,6 +41,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LOCALE bool "Enable toolchain locale/i18n support" select BR2_TOOLCHAIN_BUILDROOT_WCHAR select BR2_ENABLE_LOCALE + select BR2_NEEDS_HOST_UTF8_LOCALE help Enable this option if you want your toolchain to support localization and internationalization. From 40685f6a51fcba41721e0b798393cb0b01dfe27b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 4 Dec 2016 10:43:06 +0100 Subject: [PATCH 1664/3392] support/dependencies: use the new kconfig option to check UTF8 locale Currently, we require a host with an UTF-8 locale as soone as we build a Buildroot toolchain with support for locales. This means that we do erquire such a locale when building a toolchain with either uClibc, glibc or musl. However, glibc and musl do not require such a locale to be present. Use the new option to check if an UTF8 locale is needed on the host, rather than deriving that from toolchain settings. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/dependencies/dependencies.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index e632a14326..bfd65960ce 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -178,8 +178,7 @@ if test "${missing_progs}" = "yes" ; then exit 1 fi -if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BR2_CONFIG > /dev/null && \ - grep ^BR2_ENABLE_LOCALE=y $BR2_CONFIG > /dev/null ; then +if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" From c8824a428b12c433e47e525978fe2ad216a074e3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 3 Dec 2016 20:47:45 +0100 Subject: [PATCH 1665/3392] cjson: bump to version v1.0.2 This is a major update in cjson: - project site moved from sourceforge to github - project recommends to use the new cmake buildsystem instead of the legacy make - BR2_STATIC_LIBS is now OK (README does not mention issue anymore) - As include path and library name have changed, tinycbor has to be updated - As cjson can now be built as a static library, fix a bug in json2cbor compilation from tinycbor package Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cjson/Config.in | 4 +- package/cjson/cjson.hash | 2 + package/cjson/cjson.mk | 22 +----- .../0001-Update-cjson-include-path.patch | 69 +++++++++++++++++++ ...-Fix-static-compilation-of-json2cbor.patch | 29 ++++++++ 5 files changed, 104 insertions(+), 22 deletions(-) create mode 100644 package/cjson/cjson.hash create mode 100644 package/tinycbor/0001-Update-cjson-include-path.patch create mode 100644 package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch diff --git a/package/cjson/Config.in b/package/cjson/Config.in index bbe4c4a968..04eff4ca88 100644 --- a/package/cjson/Config.in +++ b/package/cjson/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_CJSON bool "cJSON" - # For static build with cJSON.c directly see README - depends on !BR2_STATIC_LIBS help An ultra-lightweight, portable, single-file, simple-as-can-be ANSI-C compliant JSON parser, under MIT license. - http://cjson.sourceforge.net/ + https://github.com/DaveGamble/cJSON diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash new file mode 100644 index 0000000000..27f1d46983 --- /dev/null +++ b/package/cjson/cjson.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 5c3a4a77796b230efbd74369b0974d14ac0408f2677bd116d4a4b5894b9be372 cjson-v1.0.2.tar.gz diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 8f21ef8a10..c544a772c3 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,26 +4,10 @@ # ################################################################################ -CJSON_VERSION = 58 -CJSON_SITE_METHOD = svn -CJSON_SITE = http://svn.code.sf.net/p/cjson/code +CJSON_VERSION = v1.0.2 +CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE -define CJSON_BUILD_CMDS - cd $(@D) && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC -lm \ - cJSON.c -o libcJSON.so -endef - -define CJSON_INSTALL_STAGING_CMDS - $(INSTALL) -D $(@D)/cJSON.h $(STAGING_DIR)/usr/include/cJSON.h - $(INSTALL) -D $(@D)/libcJSON.so $(STAGING_DIR)/usr/lib/libcJSON.so -endef - -define CJSON_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/cJSON.h $(TARGET_DIR)/usr/include/cJSON.h - $(INSTALL) -D $(@D)/libcJSON.so $(TARGET_DIR)/usr/lib/libcJSON.so -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) diff --git a/package/tinycbor/0001-Update-cjson-include-path.patch b/package/tinycbor/0001-Update-cjson-include-path.patch new file mode 100644 index 0000000000..5eea937d91 --- /dev/null +++ b/package/tinycbor/0001-Update-cjson-include-path.patch @@ -0,0 +1,69 @@ +From 9aa79d8e9e38b31b34d9933a266c698e79808a79 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 13 Nov 2016 15:43:40 +0100 +Subject: [PATCH] Update cjson include path + +Since cjson-v1.0.0 (https://github.com/DaveGamble/cJSON/releases), +cJSON.h is installed into cjson/cJSON.h and library has been renamed +from cJSON to cjson + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 4 ++-- + Makefile.configure | 4 ++-- + tools/json2cbor/json2cbor.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index acd52eb..905fbdf 100644 +--- a/Makefile ++++ b/Makefile +@@ -82,12 +82,12 @@ ifeq ($(open_memstream-pass),) + endif + endif + +-# json2cbor depends on an external library (cJSON) ++# json2cbor depends on an external library (cjson) + ifneq ($(cjson-pass)$(system-cjson-pass),) + JSON2CBOR_SOURCES = tools/json2cbor/json2cbor.c + INSTALL_TARGETS += $(bindir)/json2cbor + ifeq ($(system-cjson-pass),1) +- LDFLAGS_CJSON = -lcJSON ++ LDFLAGS_CJSON = -lcjson + else + JSON2CBOR_SOURCES += src/cjson/cJSON.c + json2cbor_CCFLAGS = -I$(SRCDIR)src/cjson +diff --git a/Makefile.configure b/Makefile.configure +index 28f4c92..424efb3 100644 +--- a/Makefile.configure ++++ b/Makefile.configure +@@ -10,11 +10,11 @@ PROGRAM-gc_sections = int main() {} + CCFLAGS-gc_sections = -Wl,--gc-sections + + PROGRAM-cjson = \#include \n +-PROGRAM-cjson += \#include \n ++PROGRAM-cjson += \#include \n + PROGRAM-cjson += int main() { return cJSON_False; } + CCFLAGS-cjson = -I$(dir $(MAKEFILE))src/cjson + PROGRAM-system-cjson = $(PROGRAM-cjson) +-CCFLAGS-system-cjson = -lcJSON ++CCFLAGS-system-cjson = -lcjson + + sink: + @echo >&2 Please run from the top-level Makefile. +diff --git a/tools/json2cbor/json2cbor.c b/tools/json2cbor/json2cbor.c +index 96d3ed1..e194299 100644 +--- a/tools/json2cbor/json2cbor.c ++++ b/tools/json2cbor/json2cbor.c +@@ -27,7 +27,7 @@ + #include "cbor.h" + #include "compilersupport_p.h" + +-#include ++#include + + #include + #include +-- +2.5.0 + diff --git a/package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch b/package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch new file mode 100644 index 0000000000..dfea4ca68f --- /dev/null +++ b/package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch @@ -0,0 +1,29 @@ +From 1be7da8d81bbd52d722ec60250567ea876f6f4b5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 3 Dec 2016 20:15:41 +0100 +Subject: [PATCH] Fix static compilation of json2cbor + +json2cbor depends on cjson so tools/json2cbor/json2cbor.o must before +-lcjson + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 905fbdf..7b5fefc 100644 +--- a/Makefile ++++ b/Makefile +@@ -115,7 +115,7 @@ bin/cbordump: $(CBORDUMP_SOURCES:.c=.o) lib/libtinycbor.a | bin + $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) -lm + + bin/json2cbor: $(JSON2CBOR_SOURCES:.c=.o) lib/libtinycbor.a | bin +- $(CC) -o $@ $(LDFLAGS) $(LDFLAGS_CJSON) $^ $(LDLIBS) -lm ++ $(CC) -o $@ $(LDFLAGS) $^ $(LDFLAGS_CJSON) $(LDLIBS) -lm + + tinycbor.pc: tinycbor.pc.in + $(SED) > $@ < $< \ +-- +2.5.0 + From 9f1ebe817af8e5c7557fde628b481b3d92539b5c Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 4 Dec 2016 00:11:32 +0100 Subject: [PATCH 1666/3392] raspberrypi0_defconfig: bump kernel version to 4.4.36 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- configs/raspberrypi0_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig index 1ad56fe862..2e031921ad 100644 --- a/configs/raspberrypi0_defconfig +++ b/configs/raspberrypi0_defconfig @@ -10,7 +10,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9669a50a3a8e4f33b4fe138277bc4407e1eab9b2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c6d86f7aa554854b04614ebb4d394766081fb41f" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same From a114e5ffb6923aeb4120ba838132c5a35955f290 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 4 Dec 2016 00:11:33 +0100 Subject: [PATCH 1667/3392] raspberrypi_defconfig: bump kernel version to 4.4.36 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- configs/raspberrypi_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index fd2a546362..2629599899 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -12,7 +12,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9669a50a3a8e4f33b4fe138277bc4407e1eab9b2 " +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c6d86f7aa554854b04614ebb4d394766081fb41f" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources From ad0b6e1804d4e5213c18ff653f0c6dc96d60ccf0 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 4 Dec 2016 00:11:34 +0100 Subject: [PATCH 1668/3392] raspberrypi2_defconfig: bump kernel version to 4.4.36 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- configs/raspberrypi2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index dd2bf8b2a9..e94f350cea 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -13,7 +13,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9669a50a3a8e4f33b4fe138277bc4407e1eab9b2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c6d86f7aa554854b04614ebb4d394766081fb41f" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources From c8b842a784cde9c2242a4d9b7e063a3491643b78 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 4 Dec 2016 00:11:35 +0100 Subject: [PATCH 1669/3392] raspberrypi3_defconfig: bump kernel version to 4.4.36 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- configs/raspberrypi3_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 433c0d7731..4cd046d55d 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -13,7 +13,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9669a50a3a8e4f33b4fe138277bc4407e1eab9b2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c6d86f7aa554854b04614ebb4d394766081fb41f" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources From 905e31ec299119091eb000abbc27ac327780ffcc Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 4 Dec 2016 00:11:36 +0100 Subject: [PATCH 1670/3392] rpi-firmware: bump version Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index 6dd2163302..4d3b500af7 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 f7b649ac837a4a9c12a8f96962da310ca4efd6658621d89286b421b8784a4980 rpi-firmware-ad8608c08b122b2c228dba0ff5070d6e9519faf5.tar.gz +sha256 3e84b3f58e3b978c4a90bb74713c349e99f203ff40f982a9acd8ebfdc256f3af rpi-firmware-2d5dc978b5a1a25f1c68666747e7585fabbcde2f.tar.gz diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index bf5c9dd70c..2fd51d0187 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = ad8608c08b122b2c228dba0ff5070d6e9519faf5 +RPI_FIRMWARE_VERSION = 2d5dc978b5a1a25f1c68666747e7585fabbcde2f RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3c RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From 69a9d641a2c307748e5da4fddfbdcd293519fedf Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 4 Dec 2016 00:11:37 +0100 Subject: [PATCH 1671/3392] rpi-userland: bump version Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/rpi-userland/rpi-userland.hash | 2 +- package/rpi-userland/rpi-userland.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-userland/rpi-userland.hash b/package/rpi-userland/rpi-userland.hash index 389c1aeaa5..74b1cc94c3 100644 --- a/package/rpi-userland/rpi-userland.hash +++ b/package/rpi-userland/rpi-userland.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 bb79667d23743769dde120d35e6a4b69c633eb66e445b5bb2c06cd3e065750a2 rpi-userland-a1b89e91f393c7134b4cdc36431f863bb3333163.tar.gz +sha256 202f194754ddb28ff3a726477185e90a36b3b98fdbd9889c61cdb0b470166a02 rpi-userland-bb15afe33b313fe045d52277a78653d288e04f67.tar.gz diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 4a6eb41372..b3f949c3e3 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = a1b89e91f393c7134b4cdc36431f863bb3333163 +RPI_USERLAND_VERSION = bb15afe33b313fe045d52277a78653d288e04f67 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3c RPI_USERLAND_LICENSE_FILES = LICENCE From 24793ad2252264e2b891e76ca5ec720b222fe6c4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Dec 2016 13:05:47 +0100 Subject: [PATCH 1672/3392] package/tor: bump version to 0.2.8.10 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tor/0001-openssl-libz.patch | 12 ++++++------ package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/tor/0001-openssl-libz.patch b/package/tor/0001-openssl-libz.patch index 855b1c5dbf..c454b8a050 100644 --- a/package/tor/0001-openssl-libz.patch +++ b/package/tor/0001-openssl-libz.patch @@ -3,7 +3,7 @@ and remove host paths when looking for openssl. [Vincent: - Adapt the patch to make it apply on the new version.] -[Bernd: rebased for tor-0.2.7.6] +[Bernd: rebased for tor-0.2.7.6 & 0.2.8.10] Signed-off-by: Bernd Kuhls Signed-off-by: Vicente Olivert Riera @@ -19,7 +19,7 @@ diff -uNr tor-0.2.7.6.org/configure.ac tor-0.2.7.6/configure.ac +TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI], [#include ], [void RAND_add(const void *buf, int num, double entropy);], - [RAND_add((void*)0,0,0); exit(0);], [], + [RAND_add((void*)0,0,0);], [], - [/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl]) + []) @@ -41,9 +41,9 @@ diff -uNr tor-0.2.7.6.org/src/test/include.am tor-0.2.7.6/src/test/include.am --- tor-0.2.7.6.org/src/test/include.am 2015-12-08 18:35:17.000000000 +0100 +++ tor-0.2.7.6/src/test/include.am 2016-01-31 20:25:59.673127854 +0100 @@ -127,8 +127,8 @@ - src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ - src/common/libor-crypto-testing.a $(LIBDONNA) src/common/libor.a \ - src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ + src/common/libor-testing.a \ + src/common/libor-event-testing.a \ + src/trunnel/libor-trunnel-testing.a \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @@ -76,7 +76,7 @@ diff -uNr tor-0.2.7.6.org/src/test/include.am tor-0.2.7.6/src/test/include.am @@ -174,8 +174,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ - src/common/libor-crypto.a $(LIBDONNA) \ + src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ + @TOR_LIB_MATH@ \ diff --git a/package/tor/tor.hash b/package/tor/tor.hash index a836476f46..b13fc4a64c 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 493a8679f904503048114aca6467faef56861206bab8283d858f37141d95105d tor-0.2.7.6.tar.gz +sha256 c88b8c57b34ebf44b731df5d68f73eb6b6708bcf4e42cf7b4817fd4e304c9c4d tor-0.2.8.10.tar.gz diff --git a/package/tor/tor.mk b/package/tor/tor.mk index a3249092ca..4f335228d3 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.2.7.6 +TOR_VERSION = 0.2.8.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3c TOR_LICENSE_FILES = LICENSE From 7ecfd5db6f3593b4d6fefa75f28ebba34f3076c5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Dec 2016 12:58:05 +0100 Subject: [PATCH 1673/3392] package/nvidia-driver: bump version to 375.20 http://www.nvidia.com/download/driverResults.aspx/111596/en-us "Added support for X.Org xserver ABI 23 (xorg-server 1.19)" Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/nvidia-driver/nvidia-driver.hash | 4 ++-- package/nvidia-driver/nvidia-driver.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash index 9427ffba44..04a44b821a 100644 --- a/package/nvidia-driver/nvidia-driver.hash +++ b/package/nvidia-driver/nvidia-driver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 38cb22fa85ef74ea960d3e5d644838cd961984ffc32bb0d052414cc7fa32e315 NVIDIA-Linux-x86-367.35.run -sha256 d2df3fcb1a145984b9de4f2f38a90e353469e9d12279cf5e2c67c553b112d075 NVIDIA-Linux-x86_64-367.35.run +sha256 cc79d3ac2b688009ed2e47a1cf27557aea5dd745b3b6e9b83945c359ddab4335 NVIDIA-Linux-x86-375.20.run +sha256 d10e40a19dc57ac958567a2b247c2b113e5f1e4186ad48e9a58e70a46d07620b NVIDIA-Linux-x86_64-375.20.run diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index 36f6e133e4..cb9b7faeca 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -NVIDIA_DRIVER_VERSION = 367.35 +NVIDIA_DRIVER_VERSION = 375.20 NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) NVIDIA_DRIVER_SITE = ftp://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run From a0e86e51e16ceeb222368df16876b4a232e8453f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Dec 2016 12:58:06 +0100 Subject: [PATCH 1674/3392] package/x11r7/xlib_libXfont2: new package Needed for xserver_xorg-server 1.19+ https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7 We need to keep the xlib_libXfont package because xapp_bdftopcf and xapp_xfs were not ported yet to xlib_libXfont2: https://lists.x.org/archives/xorg-announce/2016-August/002702.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/Config.in | 1 + package/x11r7/xlib_libXfont2/Config.in | 10 ++++++ .../x11r7/xlib_libXfont2/xlib_libXfont2.hash | 2 ++ .../x11r7/xlib_libXfont2/xlib_libXfont2.mk | 33 +++++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 package/x11r7/xlib_libXfont2/Config.in create mode 100644 package/x11r7/xlib_libXfont2/xlib_libXfont2.hash create mode 100644 package/x11r7/xlib_libXfont2/xlib_libXfont2.mk diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 40aa80c934..c40a6438c5 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -35,6 +35,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xlib_libXext/Config.in source package/x11r7/xlib_libXfixes/Config.in source package/x11r7/xlib_libXfont/Config.in + source package/x11r7/xlib_libXfont2/Config.in source package/x11r7/xlib_libXft/Config.in source package/x11r7/xlib_libXi/Config.in source package/x11r7/xlib_libXinerama/Config.in diff --git a/package/x11r7/xlib_libXfont2/Config.in b/package/x11r7/xlib_libXfont2/Config.in new file mode 100644 index 0000000000..6cba46586b --- /dev/null +++ b/package/x11r7/xlib_libXfont2/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_XLIB_LIBXFONT2 + bool "libXfont2" + select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_XLIB_LIBFONTENC + select BR2_PACKAGE_XLIB_XTRANS + select BR2_PACKAGE_XPROTO_FONTSPROTO + select BR2_PACKAGE_XPROTO_XPROTO + select BR2_PACKAGE_XFONT_ENCODINGS + help + X.Org Xfont library diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash new file mode 100644 index 0000000000..81a3c9f1ea --- /dev/null +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash @@ -0,0 +1,2 @@ +# From https://lists.x.org/archives/xorg-announce/2015-December/002663.html +sha256 e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e libXfont2-2.0.1.tar.bz2 diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk new file mode 100644 index 0000000000..fef1e68323 --- /dev/null +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# xlib_libXfont2 +# +################################################################################ + +XLIB_LIBXFONT2_VERSION = 2.0.1 +XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 +XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXFONT2_LICENSE = MIT +XLIB_LIBXFONT2_LICENSE_FILES = COPYING +XLIB_LIBXFONT2_INSTALL_STAGING = YES +XLIB_LIBXFONT2_DEPENDENCIES = \ + freetype \ + xlib_libfontenc \ + xlib_xtrans \ + xproto_fontsproto \ + xproto_xproto \ + xfont_encodings + +HOST_XLIB_LIBXFONT2_DEPENDENCIES = \ + host-freetype \ + host-xlib_libfontenc \ + host-xlib_xtrans \ + host-xproto_fontsproto \ + host-xproto_xproto \ + host-xfont_encodings + +XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs +HOST_XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From ea09ec41e12880ab27bc6f33586ee32b9665d1e5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Dec 2016 12:58:07 +0100 Subject: [PATCH 1675/3392] package/x11r7/xdriver_xf86-video-qxl: add support for xlib_libXfont2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-qxl/0003-xfont2.patch | 69 +++++++++++++++++++ .../x11r7/xdriver_xf86-video-qxl/Config.in | 2 +- .../xdriver_xf86-video-qxl.mk | 7 +- 3 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch diff --git a/package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch b/package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch new file mode 100644 index 0000000000..e93b746f5a --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch @@ -0,0 +1,69 @@ +From e13d28ee5d8724fc4b22f26bce01a7d36355f272 Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" +Date: Fri, 26 Aug 2016 11:44:55 -0400 +Subject: Check for either xfont.pc or xfont2.pc + +More recent versions of Xfont have a different API (with namespacing +for libXfont functions.) Check for xfont2.pc and if found, use that, and +use the new API. The rational for preferring libXfont2 is that as a recent +change the xserver module looks for and requires libXfont2, and it's better +not to have both versions of the library in process. +--- +Downloaded from +https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=e13d28ee5d8724fc4b22f26bce01a7d36355f272 + +Signed-off-by: Bernd Kuhls + +diff --git a/configure.ac b/configure.ac +index 7e95b01..451d42a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -60,8 +60,14 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto) + XORG_DRIVER_CHECK_EXT(XV, videoproto) + XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) + ++# We can use either version 1 or version 2 of libXfont ++PKG_CHECK_EXISTS(xfont2, ++ [xfont_pc=xfont2 ++ AC_DEFINE(HAVE_XFONT2,1,[Version 2 of the libXfont library])], ++ [xfont_pc=xfont]) ++ + # Obtain compiler/linker options for the driver dependencies +-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto xfont $REQUIRED_MODULES) ++PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $xfont_pc $REQUIRED_MODULES) + + + save_CFLAGS="$CFLAGS" +diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c +index a6d1ee3..6afb346 100644 +--- a/src/uxa/uxa-damage.c ++++ b/src/uxa/uxa-damage.c +@@ -35,7 +35,11 @@ + #include + #include + #include ++#ifdef HAVE_XFONT2 ++#include ++#else + #include ++#endif + + #include "uxa-damage.h" + +@@ -947,8 +951,12 @@ uxa_damage_chars (RegionPtr region, + { + ExtentInfoRec extents; + BoxRec box; +- ++ ++#ifdef HAVE_XFONT2 ++ xfont2_query_glyph_extents(font, charinfo, n, &extents); ++#else + QueryGlyphExtents(font, charinfo, n, &extents); ++#endif + if (imageblt) + { + if (extents.overallWidth > extents.overallRight) +-- +cgit v0.10.2 + diff --git a/package/x11r7/xdriver_xf86-video-qxl/Config.in b/package/x11r7/xdriver_xf86-video-qxl/Config.in index 04bde0f824..967ecaf527 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/Config.in +++ b/package/x11r7/xdriver_xf86-video-qxl/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_QXL select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_UDEV # for KMS select BR2_PACKAGE_LIBPCIACCESS select BR2_PACKAGE_SPICE_PROTOCOL - select BR2_PACKAGE_XLIB_LIBXFONT + select BR2_PACKAGE_XLIB_LIBXFONT2 if !BR2_PACKAGE_XLIB_LIBXFONT select BR2_PACKAGE_XPROTO_FONTSPROTO select BR2_PACKAGE_XPROTO_XPROTO help diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk index 30cd7a20c2..ac43b9505e 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk @@ -18,7 +18,6 @@ XDRIVER_XF86_VIDEO_QXL_CONF_OPTS = \ XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES = \ libpciaccess \ spice-protocol \ - xlib_libXfont \ xproto_fontsproto \ xproto_xproto \ xserver_xorg-server @@ -32,4 +31,10 @@ else XDRIVER_XF86_VIDEO_QXL_CONF_OPTS += --disable-kms endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y) +XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES += xlib_libXfont2 +else +XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES += xlib_libXfont +endif + $(eval $(autotools-package)) From ad916feecbac191b22e9766875691d88e9d9100e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Dec 2016 12:58:08 +0100 Subject: [PATCH 1676/3392] package/x11r7/xdriver_xf86-video-intel: bump version to fix crash with xserver_xorg-server 1.19.x Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index bfe05270ef..29228bbf77 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 6988b873b041130d88dd0aae70c10f86550ee2b3 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 9ac7a3370ab265d4cbdbbf3dc588af88c37048e1 XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING From 0f31a0eeb224dd0dd77de5bbd15145d406f93be4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Dec 2016 12:58:09 +0100 Subject: [PATCH 1677/3392] package/x11r7/xserver_xorg-server: bump version to 1.19.0 This release bumped video ABI to version 23 https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Module.h?id=8d3f0e964e399dcfa8eb5e85d405217fdc5dbcd4 https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Module.h?id=c07b796b47ae7f5a616d5e8e02ab0f84dc438a93 https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Module.h?id=4af00242ef1e39499b932d12423fdf449296090a and depends on xlib_libXfont2 https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-modesettings-needs-dri2.patch | 0 package/x11r7/xserver_xorg-server/Config.in | 16 +++++++++------- .../xserver_xorg-server/xserver_xorg-server.hash | 4 ++-- .../xserver_xorg-server/xserver_xorg-server.mk | 9 ++++++++- 4 files changed, 19 insertions(+), 10 deletions(-) rename package/x11r7/xserver_xorg-server/{1.18.4 => 1.19.0}/0001-modesettings-needs-dri2.patch (100%) diff --git a/package/x11r7/xserver_xorg-server/1.18.4/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.19.0/0001-modesettings-needs-dri2.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.18.4/0001-modesettings-needs-dri2.patch rename to package/x11r7/xserver_xorg-server/1.19.0/0001-modesettings-needs-dri2.patch diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index df3801c5ae..1d4a1fb5ee 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -17,7 +17,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XLIB_LIBXFONT select BR2_PACKAGE_XLIB_LIBXFT select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXINERAMA @@ -61,37 +60,40 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 bool -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20 +config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23 bool config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI int default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - default 20 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20 + default 23 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23 choice bool "X Window System server version" -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18 - bool "1.18.4" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20 +config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 + bool "1.19.0" + select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23 + select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XPROTO_PRESENTPROTO config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 bool "1.17.4" select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 + select BR2_PACKAGE_XLIB_LIBXFONT select BR2_PACKAGE_XPROTO_PRESENTPROTO config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 bool "1.14.7" select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 + select BR2_PACKAGE_XLIB_LIBXFONT endchoice config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION string - default "1.18.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18 + default "1.19.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index ab7ba7eb29..54ae0ec37f 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -3,5 +3,5 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2016-July/002699.html -sha256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 xorg-server-1.18.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-November/002737.html +sha256 149a708b50befc2d5a40b98d45ddd2ebe0beec018e6d0c663c43bad6210e4da3 xorg-server-1.19.0.tar.bz2 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 51c3efccc8..48cd2a78df 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -15,7 +15,6 @@ XSERVER_XORG_SERVER_AUTORECONF = YES XSERVER_XORG_SERVER_DEPENDENCIES = \ xfont_font-util \ xutil_util-macros \ - xlib_libXfont \ xlib_libX11 \ xlib_libXau \ xlib_libXdmcp \ @@ -194,6 +193,14 @@ else XSERVER_XORG_SERVER_CONF_OPTS += --disable-record endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y) +XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2 +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y) +XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont +endif + ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc endif From 687ad7bf4a88bb979b6871868bd63f3f75d48a7e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 3 Dec 2016 10:25:13 +0100 Subject: [PATCH 1678/3392] lsqlite3: fix hash see http://autobuild.buildroot.net/results/9c8973271591dbcd4e7ba397961cd8209cf4d2f6 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lsqlite3/lsqlite3.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lsqlite3/lsqlite3.hash b/package/lsqlite3/lsqlite3.hash index e7d3ce024b..7cf0358d11 100644 --- a/package/lsqlite3/lsqlite3.hash +++ b/package/lsqlite3/lsqlite3.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 090282f9b8df614d70d07442ba82de3cc02a2f44cb1059fda648155d4d7e52ef lsqlite3-0.9.4-2.src.rock +sha256 e6eb64a7ca3727c3093f3c37341d8ecadf9eac913e468eae413828476b19c225 lsqlite3-0.9.4-2.src.rock From 2e094a66a72d18abd7129c5a5a3bd49b01a49311 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Dec 2016 11:42:08 +0100 Subject: [PATCH 1679/3392] package/libdrm: bump version to 2.4.74 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libdrm/libdrm.hash | 4 ++-- package/libdrm/libdrm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index 3131705228..96bd985e55 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2016-November/123704.html -sha256 96bfd39242fe168017d95f22e141645a35591f5902a7d98c2fa4ca8c31df5e4d libdrm-2.4.73.tar.bz2 +# From https://lists.freedesktop.org/archives/dri-devel/2016-November/125379.html +sha256 d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b libdrm-2.4.74.tar.bz2 diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index b4e1aada79..511f803a2c 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.73 +LIBDRM_VERSION = 2.4.74 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = http://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From 280bb6807619e2e858836435f44aad0cccd27a40 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 3 Dec 2016 13:17:34 +0100 Subject: [PATCH 1680/3392] package/aubio: new package Aubio attempt to build aubio.so shared library so disable it for static build only. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/aubio/0001-remove-unit-test.patch | 63 +++++++++++++++++++++++ package/aubio/Config.in | 21 ++++++++ package/aubio/aubio.hash | 2 + package/aubio/aubio.mk | 24 +++++++++ 5 files changed, 111 insertions(+) create mode 100644 package/aubio/0001-remove-unit-test.patch create mode 100644 package/aubio/Config.in create mode 100644 package/aubio/aubio.hash create mode 100644 package/aubio/aubio.mk diff --git a/package/Config.in b/package/Config.in index b076dfd8b1..f16e56d65e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -828,6 +828,7 @@ menu "Libraries" menu "Audio/Sound" source "package/alsa-lib/Config.in" + source "package/aubio/Config.in" source "package/audiofile/Config.in" source "package/celt051/Config.in" source "package/fdk-aac/Config.in" diff --git a/package/aubio/0001-remove-unit-test.patch b/package/aubio/0001-remove-unit-test.patch new file mode 100644 index 0000000000..947fc8ee1e --- /dev/null +++ b/package/aubio/0001-remove-unit-test.patch @@ -0,0 +1,63 @@ +From c71d72262568907ae8c3b988d42e575a8bd3a207 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 29 Oct 2016 20:14:02 +0200 +Subject: [PATCH] remove unit test + +Unit tests fail to build on some system. + +Waf: Entering directory `output/build/aubio-0.4.3/build' +[170/217] Processing build/tests/test-sink +[170/217] Processing build/tests/test-sink_apple_audio-multi +[172/217] Processing build/tests/test-sink_sndfile-multi +[172/217] Processing build/tests/test-source_apple_audio +[174/217] Processing build/tests/test-source_avcodec +[174/217] Processing build/tests/test-source_multi +[174/217] Processing build/tests/test-source_seek +[176/217] Processing build/tests/test-source_sndfile +Waf: Leaving directory `output/build/aubio-0.4.3/build' +Build failed +Traceback (most recent call last): + File "output/build/aubio-0.4.3/waflib/Task.py", line 110, in process + ret=self.run() + File "output/build/aubio-0.4.3/waflib/Tools/waf_unit_test.py", line 66, in run + proc=Utils.subprocess.Popen(self.ut_exec,cwd=cwd,env=self.get_test_env(),stderr=Utils.subprocess.PIPE,stdout=Utils.subprocess.PIPE) + File "/usr/lib64/python2.7/subprocess.py", line 710, in __init__ + errread, errwrite) + File "/usr/lib64/python2.7/subprocess.py", line 1335, in _execute_child + raise child_exception +OSError: [Errno 2] No such file or directory + +Signed-off-by: Romain Naour +--- + wscript | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/wscript b/wscript +index c665ff5..c8fae6c 100644 +--- a/wscript ++++ b/wscript +@@ -95,13 +95,11 @@ def options(ctx): + help='set target platform for cross-compilation', dest='target_platform') + + ctx.load('compiler_c') +- ctx.load('waf_unit_test') + ctx.load('gnu_dirs') + + def configure(ctx): + from waflib import Options + ctx.load('compiler_c') +- ctx.load('waf_unit_test') + ctx.load('gnu_dirs') + + # check for common headers +@@ -334,7 +332,6 @@ def build(bld): + bld.recurse('src') + if bld.env['DEST_OS'] not in ['ios', 'iosimulator', 'android']: + bld.recurse('examples') +- bld.recurse('tests') + + bld( source = 'aubio.pc.in' ) + +-- +2.5.5 + diff --git a/package/aubio/Config.in b/package/aubio/Config.in new file mode 100644 index 0000000000..c4c60db2f3 --- /dev/null +++ b/package/aubio/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_AUBIO + bool "aubio" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + help + aubio is a tool designed for the extraction of annotations from + audio signals. Its features include segmenting a sound file + before each of its attacks, performing pitch detection, tapping + the beat and producing midi streams from live audio. + + Because these tasks are difficult, we thought it was important + to gather them in a dedicated library. To increase the fun, we + have made these algorithms work in a causal way, so as to be + used in real time applications with as low delay as possible. + Functions can be used offline in sound editors and software + samplers, or online in audio effects and virtual instruments. + + https://aubio.org + +comment "aubio needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/aubio/aubio.hash b/package/aubio/aubio.hash new file mode 100644 index 0000000000..f4de92a743 --- /dev/null +++ b/package/aubio/aubio.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 b62cdb073c0c64ae301917fa162969d42cba45e478bdf1e74490bd87e9cceaab aubio-0.4.3.tar.bz2 diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk new file mode 100644 index 0000000000..aa4ddd0fce --- /dev/null +++ b/package/aubio/aubio.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# aubio +# +################################################################################ + +AUBIO_VERSION = 0.4.3 +AUBIO_SITE = https://aubio.org/pub +AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2 +AUBIO_LICENSE = GPLv3+ +AUBIO_LICENSE_FILES = COPYING +AUBIO_INSTALL_STAGING = YES + +AUBIO_CONF_OPTS = \ + --disable-docs \ + --disable-atlas \ + --disable-samplerate \ + --disable-avcodec \ + --disable-sndfile \ + --disable-jack \ + --disable-fftw3 \ + --disable-fftw3f + +$(eval $(waf-package)) From 06d8abd0908524d6623958612e5ba8093ab5d921 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 3 Dec 2016 13:17:35 +0100 Subject: [PATCH 1681/3392] package/aubio: add libsndfile optional dependency Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/aubio/aubio.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index aa4ddd0fce..e1694ab64d 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -16,9 +16,15 @@ AUBIO_CONF_OPTS = \ --disable-atlas \ --disable-samplerate \ --disable-avcodec \ - --disable-sndfile \ --disable-jack \ --disable-fftw3 \ --disable-fftw3f +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +AUBIO_DEPENDENCIES += libsndfile +AUBIO_CONF_OPTS += --enable-sndfile +else +AUBIO_CONF_OPTS += --disable-sndfile +endif + $(eval $(waf-package)) From ee586c356de65ffe10473fff471c1951208f6a64 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 3 Dec 2016 13:17:36 +0100 Subject: [PATCH 1682/3392] package/aubio: add libsamplerate optional dependency Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/aubio/aubio.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index e1694ab64d..ed00088a6a 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -14,7 +14,6 @@ AUBIO_INSTALL_STAGING = YES AUBIO_CONF_OPTS = \ --disable-docs \ --disable-atlas \ - --disable-samplerate \ --disable-avcodec \ --disable-jack \ --disable-fftw3 \ @@ -27,4 +26,11 @@ else AUBIO_CONF_OPTS += --disable-sndfile endif +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +AUBIO_DEPENDENCIES += libsamplerate +AUBIO_CONF_OPTS += --enable-samplerate +else +AUBIO_CONF_OPTS += --disable-samplerate +endif + $(eval $(waf-package)) From 3909197ace8db3f6e61c5e025fb43266968b3435 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 3 Dec 2016 13:17:37 +0100 Subject: [PATCH 1683/3392] package/aubio: add jack2 optional dependency Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/aubio/aubio.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index ed00088a6a..7aac6e547a 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -15,7 +15,6 @@ AUBIO_CONF_OPTS = \ --disable-docs \ --disable-atlas \ --disable-avcodec \ - --disable-jack \ --disable-fftw3 \ --disable-fftw3f @@ -33,4 +32,11 @@ else AUBIO_CONF_OPTS += --disable-samplerate endif +ifeq ($(BR2_PACKAGE_JACK2),y) +AUBIO_DEPENDENCIES += jack2 +AUBIO_CONF_OPTS += --enable-jack +else +AUBIO_CONF_OPTS += --disable-jack +endif + $(eval $(waf-package)) From 5812e3989336fb8fbfb114096e36da43730ccfcd Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 3 Dec 2016 13:17:38 +0100 Subject: [PATCH 1684/3392] package/aubio: add fftw optional dependency Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/aubio/aubio.mk | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index 7aac6e547a..9339f44957 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -14,9 +14,7 @@ AUBIO_INSTALL_STAGING = YES AUBIO_CONF_OPTS = \ --disable-docs \ --disable-atlas \ - --disable-avcodec \ - --disable-fftw3 \ - --disable-fftw3f + --disable-avcodec ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) AUBIO_DEPENDENCIES += libsndfile @@ -39,4 +37,16 @@ else AUBIO_CONF_OPTS += --disable-jack endif +ifeq ($(BR2_PACKAGE_FFTW),y) +AUBIO_DEPENDENCIES += fftw +# fftw3 require double otherwise it will look for fftw3f +ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y) +AUBIO_CONF_OPTS += --enable-fftw3 --enable-double +else ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y) +AUBIO_CONF_OPTS += --enable-fftw3f --disable-double +endif +else # !BR2_PACKAGE_FFTW +AUBIO_CONF_OPTS += --disable-fftw3 +endif + $(eval $(waf-package)) From 2d5bc8b0a711cb80ba5d9a8dd45c15f646932f84 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 3 Dec 2016 13:17:39 +0100 Subject: [PATCH 1685/3392] package/aubio: add ffmpeg libav optional dependency Aubio libav support require libavcodec, libavformat, libavutil and libavresample. Enable libav support only when BR2_PACKAGE_FFMPEG_AVRESAMPLE is set. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/aubio/aubio.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index 9339f44957..cfa233f989 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -13,8 +13,7 @@ AUBIO_INSTALL_STAGING = YES AUBIO_CONF_OPTS = \ --disable-docs \ - --disable-atlas \ - --disable-avcodec + --disable-atlas ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) AUBIO_DEPENDENCIES += libsndfile @@ -49,4 +48,11 @@ else # !BR2_PACKAGE_FFTW AUBIO_CONF_OPTS += --disable-fftw3 endif +ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y) +AUBIO_DEPENDENCIES += ffmpeg +AUBIO_CONF_OPTS += --enable-avcodec +else +AUBIO_CONF_OPTS += --disable-avcodec +endif + $(eval $(waf-package)) From f5bc472b8b78529f3a81a14c2596a0a448ee961f Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 3 Dec 2016 14:36:25 +0000 Subject: [PATCH 1686/3392] DEVELOPERS: add tzdata and zic to my list Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 12445d47f2..f84eb5dbad 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -967,6 +967,8 @@ F: package/libsecret/ N: Martin Bark F: package/ca-certificates/ +F: package/tzdata/ +F: package/zic/ N: Martin Hicks F: package/cryptsetup/ From 0327419bffecbebbb492d234932a0b099f165cca Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 3 Dec 2016 14:36:26 +0000 Subject: [PATCH 1687/3392] package/zic: bump version to 2016j Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- ...ove-dependency-check-on-version-file.patch | 32 +++++++++++++++++++ package/zic/zic.hash | 4 +-- package/zic/zic.mk | 2 +- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 package/zic/0001-remove-dependency-check-on-version-file.patch diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch new file mode 100644 index 0000000000..f4b2590525 --- /dev/null +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -0,0 +1,32 @@ +From 4ad8932f93c490d15586b1def3863e9580e6eceb Mon Sep 17 00:00:00 2001 +From: Martin Bark +Date: Sat, 3 Dec 2016 13:51:50 +0000 +Subject: [PATCH] remove dependency check on version file + +$(VERSION_DEPS) includes dependencies from tzdata meaning applications +such as zic can't build from tzcode on their own. Remove the dependency +to $(VERSION_DEPS) since it is not necessary to check for version updates +in released code. This solves building zic from tzcode without needing +tzdata. + +Signed-off-by: Martin Bark +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1b714a8..00d2c09 100644 +--- a/Makefile ++++ b/Makefile +@@ -437,7 +437,7 @@ INSTALL: ALL install date.1 + cp date $(DESTDIR)$(BINDIR)/. + cp -f date.1 $(DESTDIR)$(MANDIR)/man1/. + +-version: $(VERSION_DEPS) ++version: + { (type git) >/dev/null 2>&1 && \ + V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty` || \ +-- +2.7.4 + diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 360575ac2f..6fe27bd2fc 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,2 +1,2 @@ -# From http://mm.icann.org/pipermail/tz-announce/2016-July/000040.html -sha512 97d084f4b0a688fef097dca256083ca9948393848d77c8ee637bdd26f859150cce7d2b26fc1165a3b44b28cc1c9075e10192332261ed68990b4b21a85438b023 tzcode2016f.tar.gz +# From http://mm.icann.org/pipermail/tz-announce/2016-November/000044.html +sha512 cac19dded22ff80cd784641ac239358c28cce535ac1eb60b52b7e51c6e9e5fe5f795ea0252daf32c949dddb9c5b24d7e4456d7869aa2725d49c5af58b564822a tzcode2016j.tar.gz diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 8a0c8dccd5..ed7b04eb94 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2016f +ZIC_VERSION = 2016j ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = http://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 From de90d77dc1164a0f933cd5aac9f43ac9278b7172 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sat, 3 Dec 2016 14:36:27 +0000 Subject: [PATCH 1688/3392] package/tzdata: bump version to 2016j Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 1d7fbcd6d6..b98e579e3c 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,2 +1,2 @@ -# From http://mm.icann.org/pipermail/tz-announce/2016-July/000040.html -sha512 0472f9516b6c3d83c0a5d0953a5535f4c48d9b9171e125f528188dac512f3556bc1805b7029c4f467a122cbce1beb4e804dd4ae63b259952de3bb217f8e8941d tzdata2016f.tar.gz +# From http://mm.icann.org/pipermail/tz-announce/2016-November/000044.html +sha512 ce0b9958b764479fac7df6b5ba0933fc4c6d815ebccc2537c75c4be105691cd58054704eebfb50ca755d7d48504480d4925ce8836eb499ae4798e3d5503d7e0e tzdata2016j.tar.gz diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index de7d1be901..d6285145e8 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2016f +TZDATA_VERSION = 2016j TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = http://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 From 413605e036c332f25392e1a16aa007fbd0cbba11 Mon Sep 17 00:00:00 2001 From: Alvaro Gamez Machado Date: Sun, 4 Dec 2016 16:55:40 +0100 Subject: [PATCH 1689/3392] libxmlrpc: fix build without C++ compiler Conditionally disable compilation of optional C++ module. Fixes: http://autobuild.buildroot.net/results/cbff6c816606a515467d467677763533a41fc276/ Signed-off-by: Alvaro Gamez Machado Signed-off-by: Thomas Petazzoni --- .../0002-fix-non-cplusplus-build.patch | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/package/libxmlrpc/0002-fix-non-cplusplus-build.patch b/package/libxmlrpc/0002-fix-non-cplusplus-build.patch index efeb9cc83f..2d5bfcc0a0 100644 --- a/package/libxmlrpc/0002-fix-non-cplusplus-build.patch +++ b/package/libxmlrpc/0002-fix-non-cplusplus-build.patch @@ -1,9 +1,10 @@ Handle builds without C++ libxmlrpc nicely handles the fact of being built without C++ support, -except for one location, fixed by this patch. +except for two locations, fixed by this patch. Signed-off-by: Thomas Petazzoni +Signed-off-by: Alvaro Gamez Machado Index: b/lib/util/Makefile =================================================================== @@ -25,3 +26,19 @@ Index: b/lib/util/Makefile .PHONY: all all: $(LIBOBJS) +Index: b/lib/Makefile +=================================================================== +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -9,7 +9,10 @@ + + # Build up SUBDIRS: + SUBDIRS = +-SUBDIRS += util libutil libutil++ ++SUBDIRS += util libutil ++ifeq ($(ENABLE_CPLUSPLUS),yes) ++ SUBDIRS += libutil++ ++endif + ifeq ($(ENABLE_ABYSS_SERVER),yes) + SUBDIRS += abyss + ifeq ($(ENABLE_CPLUSPLUS),yes) From 67792251a841a3b0ff23422cc4f2e0cf7e61da43 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 4 Dec 2016 17:30:26 +0100 Subject: [PATCH 1690/3392] DEVELOPERS: add entry for aubio Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index f84eb5dbad..e9cfec0134 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1251,6 +1251,7 @@ F: package/irssi/ F: package/vnstat/ N: Romain Naour +F: package/aubio/ F: package/bullet/ F: package/efl/ F: package/enlightenment/ From 02028923b56fa4d33d98f1c8880eaf7b2b08d31c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Dec 2016 21:50:40 +0100 Subject: [PATCH 1691/3392] DEVELOPERS: add Waldemar as developer for uclibc-ng-test Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index e9cfec0134..ed62b699f3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1557,6 +1557,7 @@ F: arch/Config.in.bfin F: arch/Config.in.sparc F: arch/Config.in.m68k F: package/uclibc/ +F: package/uclibc-ng-test/ F: package/mksh/ N: Waldemar Rymarkiewicz From 9f57350329cd43a0121b039ac0bdc920ac9818e6 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 4 Dec 2016 17:30:25 +0100 Subject: [PATCH 1692/3392] configs/olimex_a20_olinuxino_lime_mali: bump kernel version Bump the kernel to the next commit which fix the build with gcc6. Signed-off-by: Romain Naour Cc: Francois Perrad Cc: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime_mali_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/olimex_a20_olinuxino_lime_mali_defconfig b/configs/olimex_a20_olinuxino_lime_mali_defconfig index 35af5f9ce1..4930660b55 100644 --- a/configs/olimex_a20_olinuxino_lime_mali_defconfig +++ b/configs/olimex_a20_olinuxino_lime_mali_defconfig @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/dan-and/linux-sunxi.git" # based on Linux version 3.4.113 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dbabbacbbf8984dea0a8c893b38b376a6ecbb3c1" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fc385cc6dfa350382ecc94a520a716b57e654410" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sun7i" BR2_LINUX_KERNEL_INSTALL_TARGET=y From a982b45ca6c4f8ae9722c9bd1ac3a99a9647f5a4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 4 Dec 2016 19:08:40 +0100 Subject: [PATCH 1693/3392] mksh: update to R54 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/mksh/mksh.hash | 4 ++-- package/mksh/mksh.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mksh/mksh.hash b/package/mksh/mksh.hash index d95001c7e2..e92acd93e5 100644 --- a/package/mksh/mksh.hash +++ b/package/mksh/mksh.hash @@ -1,4 +1,4 @@ # From http://www.mirbsd.org/mksh.htm#build -md5 43fc3e32963cc1795a299bcec531d770 mksh-R53a.tgz +md5 be0a6fb93b4a5f927bcc1893bb6692f8 mksh-R54.tgz # Calculated based on the hash above -sha256 3bb2453c8cb65abbda24f9bdd8b8371e30a6e1c2f7a0d5474a3efae438639635 mksh-R53a.tgz +sha256 8bce3837c386684aa7780f085f1a4dbd5e3e26fb5c528ee0d41ae29af7f39013 mksh-R54.tgz diff --git a/package/mksh/mksh.mk b/package/mksh/mksh.mk index 248b43f191..4d91bfcf44 100644 --- a/package/mksh/mksh.mk +++ b/package/mksh/mksh.mk @@ -4,7 +4,7 @@ # ################################################################################ -MKSH_VERSION = R53a +MKSH_VERSION = R54 MKSH_SOURCE = mksh-$(MKSH_VERSION).tgz MKSH_SITE = https://www.mirbsd.org/MirOS/dist/mir/mksh # For MirOS License see https://www.mirbsd.org/TaC-mksh.txt From c84a2cb9aae778d3e89b23268640fbe08b3bc2bc Mon Sep 17 00:00:00 2001 From: Ash Charles Date: Thu, 1 Dec 2016 23:22:40 -0500 Subject: [PATCH 1694/3392] ti-cgt-pru: add package for PRU Host toolchain TI provides a binary code generation toolchain to develop firmware for the programmable real-time unit/co-processor found in some SOCs such as some models in the AM335x line. This toolchain includes C/C++ support (clpru) rather than just assembler (pasm) supported by the pre-existing am335x-pru-package [1]. Following the lead of the Yocto meta-ti layer [2], this package provides a host toolchain suitable for an x86 (or x86_64) Linux targeting an ARM-based PRU core. [1] http://processors.wiki.ti.com/index.php/PRU_Assembly_Instructions#pasm_vs._clpru [2] http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-ti/devtools/ti-cgt-pru_2.1.1.bb Signed-off-by: Ash Charles [Thomas: add BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS boolean option, so that packages selecting host-ti-cgt-pru can easily inherit its architecture dependencies.] Signed-off-by: Thomas Petazzoni --- package/Config.in.host | 1 + package/ti-cgt-pru/Config.in.host | 17 +++++++++++++++ package/ti-cgt-pru/ti-cgt-pru.hash | 2 ++ package/ti-cgt-pru/ti-cgt-pru.mk | 34 ++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/ti-cgt-pru/Config.in.host create mode 100644 package/ti-cgt-pru/ti-cgt-pru.hash create mode 100644 package/ti-cgt-pru/ti-cgt-pru.mk diff --git a/package/Config.in.host b/package/Config.in.host index 3b115c5f69..e2446943fc 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -39,6 +39,7 @@ menu "Host utilities" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/tegrarcm/Config.in.host" + source "package/ti-cgt-pru/Config.in.host" source "package/uboot-tools/Config.in.host" source "package/util-linux/Config.in.host" source "package/vboot-utils/Config.in.host" diff --git a/package/ti-cgt-pru/Config.in.host b/package/ti-cgt-pru/Config.in.host new file mode 100644 index 0000000000..a36633705d --- /dev/null +++ b/package/ti-cgt-pru/Config.in.host @@ -0,0 +1,17 @@ +config BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS + bool + default y + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_arm + +config BR2_PACKAGE_HOST_TI_CGT_PRU + bool "host ti-cgt-pru" + depends on BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS + help + This package provides the Code Generation Tools for the PRU + unit found on some TI processors e.g. AM3358. + + Note: this is a binary cross toolchain that runs on x86 hosts + targeting PRU cores found alongside some ARM processors. + + http://processors.wiki.ti.com/index.php/Programmable_Realtime_Unit_Software_Development diff --git a/package/ti-cgt-pru/ti-cgt-pru.hash b/package/ti-cgt-pru/ti-cgt-pru.hash new file mode 100644 index 0000000000..1c19b33fd6 --- /dev/null +++ b/package/ti-cgt-pru/ti-cgt-pru.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 df85cd1ed3aea12d577854ece11bf5f2af6ace8c39959eea4cf2fa5973924e0e ti_cgt_pru_2.1.3_linux_installer_x86.bin diff --git a/package/ti-cgt-pru/ti-cgt-pru.mk b/package/ti-cgt-pru/ti-cgt-pru.mk new file mode 100644 index 0000000000..7c89444e01 --- /dev/null +++ b/package/ti-cgt-pru/ti-cgt-pru.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# ti-cgt-pru +# +################################################################################ + +TI_CGT_PRU_VERSION = 2.1.3 +TI_CGT_PRU_SOURCE = ti_cgt_pru_$(TI_CGT_PRU_VERSION)_linux_installer_x86.bin +TI_CGT_PRU_SITE = http://software-dl.ti.com/codegen/esd/cgt_public_sw/PRU/$(TI_CGT_PRU_VERSION) +TI_CGT_PRU_LICENSE = TI Technology and Software Publicly Available License (compiler + PRU library), \ + Boost Software License 1.0 (compiler), \ + BSD-2c, BSD-3c, MIT, Academic Free License 3.0, Hewlett-Packard (PRU library) +TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.1.x_manifest.html \ + PRU_CodeGen_Library_2.1_0222433C-30C1-442d-B5C6-2073BD97F80F.spdx.tag + +define HOST_TI_CGT_PRU_EXTRACT_CMDS + chmod +x $(DL_DIR)/$(TI_CGT_PRU_SOURCE) + $(DL_DIR)/$(TI_CGT_PRU_SOURCE) --prefix $(@D) --mode unattended + mv $(@D)/ti-cgt-pru_$(TI_CGT_PRU_VERSION)/* $(@D) + rmdir $(@D)/ti-cgt-pru_$(TI_CGT_PRU_VERSION)/ +endef + +# Since this is largely prebuilt toolchain and likes to live in its +# own directory, put is in $(HOST_DIR)/usr/share/ti-cgt-pru/. +# Packages wanting to use this toolchain need to use this path as TI's +# standard PRU_CGT path e.g. make PRU_CGT=$(TI_CGT_PRU_INSTALLDIR)... +TI_CGT_PRU_INSTALLDIR = $(HOST_DIR)/usr/share/ti-cgt-pru + +define HOST_TI_CGT_PRU_INSTALL_CMDS + mkdir -p $(TI_CGT_PRU_INSTALLDIR) + cp -dpfr $(@D)/* $(TI_CGT_PRU_INSTALLDIR) +endef + +$(eval $(host-generic-package)) From bd438fc06f3fc8b509994c02d100bc05c0ac13b7 Mon Sep 17 00:00:00 2001 From: Ash Charles Date: Thu, 1 Dec 2016 23:22:41 -0500 Subject: [PATCH 1695/3392] pru-software-support: add library for PRU firmware TI provides a set of headers files and libraries useful in developing firmware for real-time (PRU) cores embedded in some processors e.g. AM3358. This package stages these files for any packages creating PRU firmware. Note: As per [1], use commit v4.0.2 to sync with common TI Linux versions. [1] http://e2e.ti.com/support/arm/sitara_arm/f/791/p/552190/2018113#2018113 Signed-off-by: Ash Charles [Thomas: - rename BR2_PACKAGE_PRU_EXAMPLES to BR2_PACKAGE_PRU_SOFTWARE_SUPPORT, since the package directory name should match the Config.in option for this package - use select for BR2_PACKAGE_HOST_TI_CGT_PRU, and therefore add the appropriate "depends on BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS".] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/Config.in.host | 1 + package/pru-software-support/Config.in | 9 +++++ package/pru-software-support/Config.in.host | 11 ++++++ .../pru-software-support.hash | 2 + .../pru-software-support.mk | 37 +++++++++++++++++++ package/pru-software-support/readme.txt | 21 +++++++++++ 7 files changed, 82 insertions(+) create mode 100644 package/pru-software-support/Config.in create mode 100644 package/pru-software-support/Config.in.host create mode 100644 package/pru-software-support/pru-software-support.hash create mode 100644 package/pru-software-support/pru-software-support.mk create mode 100644 package/pru-software-support/readme.txt diff --git a/package/Config.in b/package/Config.in index f16e56d65e..ecb8afb60a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -437,6 +437,7 @@ endmenu source "package/pifmrds/Config.in" source "package/powertop/Config.in" source "package/pps-tools/Config.in" + source "package/pru-software-support/Config.in" source "package/pulseview/Config.in" source "package/read-edid/Config.in" source "package/rfkill/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index e2446943fc..840313af66 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -33,6 +33,7 @@ menu "Host utilities" source "package/openocd/Config.in.host" source "package/parted/Config.in.host" source "package/patchelf/Config.in.host" + source "package/pru-software-support/Config.in.host" source "package/pwgen/Config.in.host" source "package/qemu/Config.in.host" source "package/sam-ba/Config.in.host" diff --git a/package/pru-software-support/Config.in b/package/pru-software-support/Config.in new file mode 100644 index 0000000000..4e34806ee7 --- /dev/null +++ b/package/pru-software-support/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PRU_SOFTWARE_SUPPORT + bool "pru-software-support" + depends on BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_PRU_SOFTWARE_SUPPORT + help + PRU firmware examples extracted from TI's PRU software + support package. See readme.txt for installation details. + + https://git.ti.com/pru-software-support-package/pru-software-support-package diff --git a/package/pru-software-support/Config.in.host b/package/pru-software-support/Config.in.host new file mode 100644 index 0000000000..d362ac5afb --- /dev/null +++ b/package/pru-software-support/Config.in.host @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HOST_PRU_SOFTWARE_SUPPORT + bool "host pru-software-support" + depends on BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_TI_CGT_PRU + help + This package provides useful headers and libraries for the + PRU unit found on some TI processors e.g. AM3358. Note that + the included labs and examples aren't built, they can be + built using the corresponding target package. + + https://git.ti.com/pru-software-support-package/pru-software-support-package diff --git a/package/pru-software-support/pru-software-support.hash b/package/pru-software-support/pru-software-support.hash new file mode 100644 index 0000000000..8f624da764 --- /dev/null +++ b/package/pru-software-support/pru-software-support.hash @@ -0,0 +1,2 @@ +# Locally-calculated hash +sha256 b257535ca9b1641d1a238795f3c7004064c573a91cf4a1fa566e3f7c2360c38f pru-software-support-804b548e69ef9fdf44445f6d0968d81cb8a1e7b4.tar.gz diff --git a/package/pru-software-support/pru-software-support.mk b/package/pru-software-support/pru-software-support.mk new file mode 100644 index 0000000000..95d1e03d30 --- /dev/null +++ b/package/pru-software-support/pru-software-support.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# pru-software-support +# +################################################################################ + +PRU_SOFTWARE_SUPPORT_VERSION = 804b548e69ef9fdf44445f6d0968d81cb8a1e7b4 +PRU_SOFTWARE_SUPPORT_SITE = git://git.ti.com/pru-software-support-package/pru-software-support-package.git +PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3c +PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU_Package-v5.0-Manifest.html +PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support +HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru + +define HOST_PRU_SOFTWARE_SUPPORT_BUILD_CMDS + $(MAKE) PRU_CGT=$(TI_CGT_PRU_INSTALLDIR) -C $(@D)/lib/src +endef + +# install this library support alongside PRU toolchain i.e. +# everything in TI_CGT_PRU_INSTALLDIR as PRU_CGT +define HOST_PRU_SOFTWARE_SUPPORT_INSTALL_CMDS + mkdir -p $(TI_CGT_PRU_INSTALLDIR)/usr/include + cp -dpfr $(@D)/include/* $(TI_CGT_PRU_INSTALLDIR)/usr/include + mkdir -p $(TI_CGT_PRU_INSTALLDIR)/usr/lib + cp -dpfr $(@D)/lib/src/*/gen/*.lib $(TI_CGT_PRU_INSTALLDIR)/usr/lib/ +endef + +define PRU_SOFTWARE_SUPPORT_BUILD_CMDS + $(MAKE) PRU_CGT=$(TI_CGT_PRU_INSTALLDIR) -C $(@D)/examples +endef + +define PRU_SOFTWARE_SUPPORT_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/share/pru-software-support + cp -dpfr $(@D)/examples/* $(TARGET_DIR)/usr/share/pru-software-support/ +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/pru-software-support/readme.txt b/package/pru-software-support/readme.txt new file mode 100644 index 0000000000..85d7af828f --- /dev/null +++ b/package/pru-software-support/readme.txt @@ -0,0 +1,21 @@ +PRU Software Support +==================== + +Two different packages are provided from the TI PRU software support +code base. + +1. The include files and rpmsg static library for the PRU are + installed alongside the host package for the PRU code generation + tools package i.e. $(TI_CGT_PRU_INSTALLDIR). + +2. A target package for all the examples installed to + /usr/share/pru-software-support/. Users wanting to test a specific + example should copy or link it to a directory where the kernel + looks for firmware, e.g: + + # cp /usr/share/pru-software-support/am335x/PRU_gpioToggle/gen/PRU_gpioToggle.out \ + /lib/firmware/am335x-pru0-fw + +To get started with the PRU, have a look at the labs [1]. + +[1] http://processors.wiki.ti.com/index.php/PRU_Training:_Hands-on_Labs From 3e123c55d65db52b9cc2b46cd498c829d28f0457 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 4 Dec 2016 21:58:44 +0100 Subject: [PATCH 1696/3392] package/aubio: add upstream hash link Paul Brossier, the aubio maintainer, added a sha256 hash for the Buildroot package. Thanks ! https://github.com/aubio/aubio/issues/77 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/aubio/aubio.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/aubio/aubio.hash b/package/aubio/aubio.hash index f4de92a743..e4478477d7 100644 --- a/package/aubio/aubio.hash +++ b/package/aubio/aubio.hash @@ -1,2 +1,2 @@ -# Locally computed +# From https://aubio.org/pub/aubio-0.4.3.tar.bz2.sha256 sha256 b62cdb073c0c64ae301917fa162969d42cba45e478bdf1e74490bd87e9cceaab aubio-0.4.3.tar.bz2 From 1120fdc379440b23063b0d083b1d3592e6a086a3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Dec 2016 22:44:56 +0100 Subject: [PATCH 1697/3392] erlang: odbc support requires thread support Fixes: http://autobuild.buildroot.net/results/cba60679fa916128796a7b4131ed50403bc74798/ Signed-off-by: Thomas Petazzoni --- package/erlang/erlang.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index c9d7b22670..3200c388fd 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -55,8 +55,12 @@ else ERLANG_CONF_OPTS += --without-ssl endif -ifeq ($(BR2_PACKAGE_UNIXODBC),y) +# ODBC support in erlang requires threads +ifeq ($(BR2_PACKAGE_UNIXODBC)$(BR2_TOOLCHAIN_HAS_THREADS),yy) ERLANG_DEPENDENCIES += unixodbc +ERLANG_CONF_OPTS += --with-odbc +else +ERLANG_CONF_OPTS += --without-odbc endif ifeq ($(BR2_PACKAGE_ZLIB),y) From e58ae36520f0109bbc171e0cc3872d2b0d1be610 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Tue, 29 Nov 2016 17:47:51 +0100 Subject: [PATCH 1698/3392] nginx-dav-ext: new package Nginx built-in support for webdav is missing support for two commands: PROPFIND and OPTIONS. This commit adds a new package that provides an external nginx module with improved webdav support. Signed-off-by: Johan Oudinet [Thomas: - Remove the BR2_PACKAGE_NGINX_HTTP_DAV_EXT_MODULE sub-option of the nginx package. The BR2_PACKAGE_NGINX_DAV_EXT option is sufficient. - Move the nginx.mk code together with another external module being enabled, nginx-upload. - Add LICENSE and LICENSE_FILES variables.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/nginx-dav-ext/Config.in | 7 +++++++ package/nginx-dav-ext/nginx-dav-ext.hash | 2 ++ package/nginx-dav-ext/nginx-dav-ext.mk | 13 +++++++++++++ package/nginx/nginx.mk | 5 +++++ 5 files changed, 28 insertions(+) create mode 100644 package/nginx-dav-ext/Config.in create mode 100644 package/nginx-dav-ext/nginx-dav-ext.hash create mode 100644 package/nginx-dav-ext/nginx-dav-ext.mk diff --git a/package/Config.in b/package/Config.in index ecb8afb60a..664d0d96e1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1545,6 +1545,7 @@ menu "Networking applications" source "package/nginx/Config.in" if BR2_PACKAGE_NGINX menu "External nginx modules" + source "package/nginx-dav-ext/Config.in" source "package/nginx-naxsi/Config.in" source "package/nginx-upload/Config.in" endmenu diff --git a/package/nginx-dav-ext/Config.in b/package/nginx-dav-ext/Config.in new file mode 100644 index 0000000000..bf197dc7e9 --- /dev/null +++ b/package/nginx-dav-ext/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_NGINX_DAV_EXT + bool "nginx-dav-ext" + select BR2_PACKAGE_EXPAT + help + NGINX WebDAV missing commands support (PROPFIND & OPTIONS). + + https://github.com/arut/nginx-dav-ext-module diff --git a/package/nginx-dav-ext/nginx-dav-ext.hash b/package/nginx-dav-ext/nginx-dav-ext.hash new file mode 100644 index 0000000000..ea7eb8632e --- /dev/null +++ b/package/nginx-dav-ext/nginx-dav-ext.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d nginx-dav-ext-v0.0.3.tar.gz diff --git a/package/nginx-dav-ext/nginx-dav-ext.mk b/package/nginx-dav-ext/nginx-dav-ext.mk new file mode 100644 index 0000000000..61e5bd0f57 --- /dev/null +++ b/package/nginx-dav-ext/nginx-dav-ext.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# nginx-dav-ext +# +################################################################################ + +NGINX_DAV_EXT_VERSION = v0.0.3 +NGINX_DAV_EXT_SITE = $(call github,arut,nginx-dav-ext-module,$(NGINX_DAV_EXT_VERSION)) +NGINX_DAV_EXT_LICENSE = BSD-2c +NGINX_DAV_EXT_LICENSE_FILES = ngx_http_dav_ext_module.c +NGINX_DAV_EXT_DEPENDENCIES = expat + +$(eval $(generic-package)) diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 656362788f..79cc4ed3e3 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -245,6 +245,11 @@ NGINX_CONF_OPTS += $(addprefix --add-module=,$(NGINX_UPLOAD_DIR)) NGINX_DEPENDENCIES += nginx-upload endif +ifeq ($(BR2_PACKAGE_NGINX_DAV_EXT),y) +NGINX_CONF_OPTS += --add-module=$(NGINX_DAV_EXT_DIR) +NGINX_DEPENDENCIES += nginx-dav-ext +endif + # Debug logging NGINX_CONF_OPTS += $(if $(BR2_PACKAGE_NGINX_DEBUG),--with-debug) From 47bf7119d566ececc97cc74bdaa45596f965b7f6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Dec 2016 23:34:17 +0100 Subject: [PATCH 1699/3392] nginx: group the external modules enabling logic This commit moves the logic that allows to enable the naxsi external module below the "external modules" comment, which was already used for the upload and dav-ext modules. Signed-off-by: Thomas Petazzoni --- package/nginx/nginx.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 79cc4ed3e3..b7384a26e8 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -156,11 +156,6 @@ else NGINX_CONF_OPTS += --without-http_gzip_module endif -ifeq ($(BR2_PACKAGE_NGINX_NAXSI),y) -NGINX_DEPENDENCIES += nginx-naxsi -NGINX_CONF_OPTS += --add-module=$(NGINX_NAXSI_DIR)/naxsi_src -endif - ifeq ($(BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE),y) NGINX_DEPENDENCIES += pcre else @@ -250,6 +245,11 @@ NGINX_CONF_OPTS += --add-module=$(NGINX_DAV_EXT_DIR) NGINX_DEPENDENCIES += nginx-dav-ext endif +ifeq ($(BR2_PACKAGE_NGINX_NAXSI),y) +NGINX_DEPENDENCIES += nginx-naxsi +NGINX_CONF_OPTS += --add-module=$(NGINX_NAXSI_DIR)/naxsi_src +endif + # Debug logging NGINX_CONF_OPTS += $(if $(BR2_PACKAGE_NGINX_DEBUG),--with-debug) From 68a33b7f983b87c48b0e816bf4e6606a79f5eaa3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Dec 2016 23:35:31 +0100 Subject: [PATCH 1700/3392] DEVELOPERS: add developer for nginx-dav-ext Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index ed62b699f3..f61afbcc9a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -804,6 +804,7 @@ F: package/erlang-p1-utils/ F: package/erlang-p1-xml/ F: package/erlang-p1-yaml/ F: package/erlang-p1-zlib/ +F: package/nginx-dav-ext/ N: John Stile F: package/dhcpcd/ From 6d50a127127a2e93caab994d4f9ae2d884640e1f Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Thu, 24 Nov 2016 23:37:47 +0100 Subject: [PATCH 1701/3392] qextserialport: remove redundant patch 0001-gui The same thing was done in upstream commit 220d7a2f "QtGui module only needed by Windows", though it was done differently upstream. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- ...ate-a-main-include-file-QExtSerialPort.patch} | 0 package/qextserialport/0001-gui.patch | 16 ---------------- ...add-a-pkgconfig-file-to-ease-usage-wit.patch} | 0 3 files changed, 16 deletions(-) rename package/qextserialport/{0002-Create-a-main-include-file-QExtSerialPort.patch => 0001-Create-a-main-include-file-QExtSerialPort.patch} (100%) delete mode 100644 package/qextserialport/0001-gui.patch rename package/qextserialport/{0003-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch => 0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch} (100%) diff --git a/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch b/package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch similarity index 100% rename from package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch rename to package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch diff --git a/package/qextserialport/0001-gui.patch b/package/qextserialport/0001-gui.patch deleted file mode 100644 index d3dedae824..0000000000 --- a/package/qextserialport/0001-gui.patch +++ /dev/null @@ -1,16 +0,0 @@ -Don't require Qt GUI module - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -diff -Nrup qextserialport-f83b4e7ca922e53.orig/qextserialport.pro qextserialport-f83b4e7ca922e53/qextserialport.pro ---- qextserialport-f83b4e7ca922e53.orig/qextserialport.pro 2012-10-17 09:13:53.000000000 +0200 -+++ qextserialport-f83b4e7ca922e53/qextserialport.pro 2012-11-13 22:48:29.249431510 +0100 -@@ -41,6 +41,8 @@ macx:qesp_mac_framework { - - win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all - -+!win32*:!wince*:QT -= gui -+ - #generate proper library name - greaterThan(QT_MAJOR_VERSION, 4) { - QESP_LIB_BASENAME = QtExtSerialPort diff --git a/package/qextserialport/0003-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch b/package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch similarity index 100% rename from package/qextserialport/0003-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch rename to package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch From f1d3a65bd42fcb078569f5f615f22418d50ac095 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 3 Nov 2016 22:05:22 +0100 Subject: [PATCH 1702/3392] package/openpowerlink: bump to v2.5.0 - Rebase existing patches - Use a "menu" instead of "choice" to select Ethernet Powerlink Drivers since we can now build several kernel modules at once. - Select the Intel 82573 driver by default. - Disable library with simulation interface. - Disable zynq/FPGA (PCIe) interface otherwise the kernelpcp library is always build. Signed-off-by: Romain Naour [Thomas: minor Config.in tweaks.] Signed-off-by: Thomas Petazzoni --- ...-stack-libraries-to-lib-subdirectory.patch | 73 ++++++++++++------- ...002-cmake-install-oplk-headers-files.patch | 8 +- .../0003-Add-top-level-CMakeLists.txt.patch | 10 +-- package/openpowerlink/Config.in | 6 +- package/openpowerlink/openpowerlink.hash | 8 +- package/openpowerlink/openpowerlink.mk | 27 ++++--- 6 files changed, 77 insertions(+), 55 deletions(-) diff --git a/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch b/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch index 3c99409ad0..1f5eb89de5 100644 --- a/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch +++ b/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch @@ -1,4 +1,4 @@ -From ded9f83ef3bcb4c688da80354c179543e4862e52 Mon Sep 17 00:00:00 2001 +From 4e8aa3a9e1696e5e02ff0a3ae5a72f034ee60c2f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 25 May 2016 15:57:10 +0200 Subject: [PATCH] install the stack libraries to "lib" subdirectory @@ -36,109 +36,132 @@ refactoring is needed to fix this properly. [1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/#8f80/a50a/4649/f07c +[rebase on v2.5.0] Signed-off-by: Romain Naour --- + stack/proj/linux/liboplkcn-sim/CMakeLists.txt | 2 +- stack/proj/linux/liboplkcn/CMakeLists.txt | 2 +- stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt | 2 +- stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt | 2 +- stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt | 2 +- + stack/proj/linux/liboplkmn-sim/CMakeLists.txt | 2 +- stack/proj/linux/liboplkmn/CMakeLists.txt | 2 +- stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkmnapp-kernelpcie/CMakeLists.txt | 2 +- + stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt | 2 +- stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt | 2 +- stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) + 11 files changed, 11 insertions(+), 11 deletions(-) +diff --git a/stack/proj/linux/liboplkcn-sim/CMakeLists.txt b/stack/proj/linux/liboplkcn-sim/CMakeLists.txt +index 73b641d..b8b5c9d 100644 +--- a/stack/proj/linux/liboplkcn-sim/CMakeLists.txt ++++ b/stack/proj/linux/liboplkcn-sim/CMakeLists.txt +@@ -96,4 +96,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) + TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) + SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) + SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") +-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) ++INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/stack/proj/linux/liboplkcn/CMakeLists.txt b/stack/proj/linux/liboplkcn/CMakeLists.txt -index c700d9d..b891553 100644 +index 323eafc..459124a 100644 --- a/stack/proj/linux/liboplkcn/CMakeLists.txt +++ b/stack/proj/linux/liboplkcn/CMakeLists.txt -@@ -94,4 +94,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) +@@ -90,4 +90,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt -index 03752df..7b1050c 100644 +index f8b1850..c16194a 100644 --- a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt +++ b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt -@@ -87,4 +87,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) +@@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt -index bcc4273..8ca5b7e 100644 +index 0f07e63..0074616 100644 --- a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt +++ b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt -@@ -87,4 +87,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) +@@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt -index 440f02c..6ffcbe9 100644 +index d0dad78..ee0fdec 100644 --- a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt +++ b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt -@@ -77,4 +77,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) +@@ -76,4 +76,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) + TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) + SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) + SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") +-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) ++INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) +diff --git a/stack/proj/linux/liboplkmn-sim/CMakeLists.txt b/stack/proj/linux/liboplkmn-sim/CMakeLists.txt +index eb6396a..5beaa07 100644 +--- a/stack/proj/linux/liboplkmn-sim/CMakeLists.txt ++++ b/stack/proj/linux/liboplkmn-sim/CMakeLists.txt +@@ -91,4 +91,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/stack/proj/linux/liboplkmn/CMakeLists.txt b/stack/proj/linux/liboplkmn/CMakeLists.txt -index a8850b8..d762d4c 100644 +index cf7927f..6b19557 100644 --- a/stack/proj/linux/liboplkmn/CMakeLists.txt +++ b/stack/proj/linux/liboplkmn/CMakeLists.txt -@@ -93,4 +93,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) +@@ -89,4 +89,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt -index f2606a3..f71b182 100644 +index 9daa2df..bfccb25 100644 --- a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt +++ b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt -@@ -86,4 +86,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) +@@ -82,4 +82,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkmnapp-kernelpcie/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelpcie/CMakeLists.txt -index 9362ad8..1d5fb6d 100644 ---- a/stack/proj/linux/liboplkmnapp-kernelpcie/CMakeLists.txt -+++ b/stack/proj/linux/liboplkmnapp-kernelpcie/CMakeLists.txt -@@ -88,4 +88,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) +diff --git a/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt +index 0135f46..83128eb 100644 +--- a/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt ++++ b/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt +@@ -91,4 +91,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt -index 6741eef..042cbcf 100644 +index cd97882..aaaa526 100644 --- a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt +++ b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt -@@ -86,4 +86,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) +@@ -82,4 +82,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) diff --git a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt -index b4dd41b..cf875ca 100644 +index 7e1a820..82205c2 100644 --- a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt +++ b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt -@@ -80,4 +80,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) +@@ -79,4 +79,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -- -2.5.5 +2.8.1 diff --git a/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch b/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch index 4cfbb5111a..7d338a4593 100644 --- a/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch +++ b/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch @@ -1,4 +1,4 @@ -From 535f50e30afaa4fc6389273d1a5b6c20cb7cf5a4 Mon Sep 17 00:00:00 2001 +From 8cb39257e12d6b82190aec8ab9ad89a9ee13af71 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 25 May 2016 15:57:29 +0200 Subject: [PATCH] cmake: install oplk headers files @@ -15,10 +15,10 @@ Signed-off-by: Romain Naour 1 file changed, 5 insertions(+) diff --git a/stack/CMakeLists.txt b/stack/CMakeLists.txt -index c6cde8c..2652858 100644 +index 3b11c54..4eadf44 100644 --- a/stack/CMakeLists.txt +++ b/stack/CMakeLists.txt -@@ -104,3 +104,8 @@ ELSEIF((CMAKE_SYSTEM_NAME STREQUAL "Generic") AND (CMAKE_SYSTEM_PROCESSOR STREQU +@@ -105,3 +105,8 @@ ELSEIF((CMAKE_SYSTEM_NAME STREQUAL "Generic") AND (CMAKE_SYSTEM_PROCESSOR STREQU ELSE() MESSAGE(FATAL_ERROR "Unknown Platform and processor combination ${CMAKE_SYSTEM_NAME} and ${CMAKE_SYSTEM_PROCESSOR}!!") ENDIF() @@ -28,5 +28,5 @@ index c6cde8c..2652858 100644 +################################################################################ +INSTALL(DIRECTORY ${STACK_INCLUDE_DIR}/oplk DESTINATION "include") -- -2.5.5 +2.8.1 diff --git a/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch b/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch index 267c807be0..9cbf02d28b 100644 --- a/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch +++ b/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch @@ -1,4 +1,4 @@ -From 1b92df6f8283e15b6877f7cd70063648727fc88b Mon Sep 17 00:00:00 2001 +From 7f81c74726aec4aef6bd93ee644200ab34375437 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 25 May 2016 15:59:20 +0200 Subject: [PATCH] Add top level CMakeLists.txt @@ -83,10 +83,10 @@ index 0000000..28d4e7a + ADD_SUBDIRECTORY("apps/demo_mn_qt") +ENDIF (CFG_DEMO_MN_QT) diff --git a/apps/common/cmake/findoplklib.cmake b/apps/common/cmake/findoplklib.cmake -index aa427a6..e6a802e 100644 +index f7e710f..b8b04c5 100644 --- a/apps/common/cmake/findoplklib.cmake +++ b/apps/common/cmake/findoplklib.cmake -@@ -89,36 +89,42 @@ MACRO(FIND_OPLK_LIBRARY OPLK_NODE_TYPE) +@@ -85,36 +85,42 @@ MACRO(FIND_OPLK_LIBRARY OPLK_NODE_TYPE) # Set oplk library directory SET(OPLKLIB_DIR ${OPLK_BASE_DIR}/stack/lib/${SYSTEM_NAME_DIR}/${SYSTEM_PROCESSOR_DIR}) @@ -174,7 +174,7 @@ index 49aab66..d9fd418 100644 TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} optimized ${OPLKLIB}) ENDIF() diff --git a/drivers/linux/drv_daemon_pcap/CMakeLists.txt b/drivers/linux/drv_daemon_pcap/CMakeLists.txt -index 2702abd..81bb598 100644 +index 1ef9353..e720834 100644 --- a/drivers/linux/drv_daemon_pcap/CMakeLists.txt +++ b/drivers/linux/drv_daemon_pcap/CMakeLists.txt @@ -104,9 +104,15 @@ ENDIF() @@ -197,5 +197,5 @@ index 2702abd..81bb598 100644 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic -std=c99 -pthread -fno-strict-aliasing") -- -2.5.5 +2.8.1 diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in index 0b68ca8339..d5e976430f 100644 --- a/package/openpowerlink/Config.in +++ b/package/openpowerlink/Config.in @@ -87,11 +87,11 @@ endchoice if BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB -choice - prompt "select Ethernet Powerlink Driver" +menu "Ethernet drivers" config BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_82573 bool "Intel 82573" + default y config BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_8255x bool "Intel 8255x" @@ -105,7 +105,7 @@ config BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_RTL8111 config BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_RTL8139 bool "Realtek RTL-8139" -endchoice +endmenu endif # BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB diff --git a/package/openpowerlink/openpowerlink.hash b/package/openpowerlink/openpowerlink.hash index a6026cb3e7..f9c94f90d5 100644 --- a/package/openpowerlink/openpowerlink.hash +++ b/package/openpowerlink/openpowerlink.hash @@ -1,5 +1,5 @@ -# From http://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.4.1/ -md5 13389a419f3727b9c5f07b1b412eff30 openPOWERLINK_V2.4.1.tar.gz -sha1 eb3883f1771d665d1f948fc35e57bb97dd5c7ca5 openPOWERLINK_V2.4.1.tar.gz +# From http://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.5.0/ +md5 929b778a6a4d448d502da5a428322949 openPOWERLINK_V2.5.0.tar.gz +sha1 28e2e5621550421e74ba94738f6c12eb8c279fce openPOWERLINK_V2.5.0.tar.gz # sha256 locally computed -sha256 f627fb8efcb5d9b1b9d8e7701ad611d44d05ad046b1b62ea0f71bd8244d5bf49 openPOWERLINK_V2.4.1.tar.gz +sha256 1cb8c44626dbb7f224520667e437b4b430a32699560914f379679b6c58c1309c openPOWERLINK_V2.5.0.tar.gz diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk index 5b1b1750ae..dcb548cc91 100644 --- a/package/openpowerlink/openpowerlink.mk +++ b/package/openpowerlink/openpowerlink.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENPOWERLINK_VERSION = V2.4.1 +OPENPOWERLINK_VERSION = V2.5.0 OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/$(OPENPOWERLINK_VERSION) OPENPOWERLINK_SOURCE = openPOWERLINK_$(OPENPOWERLINK_VERSION).tar.gz OPENPOWERLINK_LICENSE = BSD-2c, GPLv2 @@ -21,7 +21,12 @@ OPENPOWERLINK_CN_ONOFF = $(if $(BR2_PACKAGE_OPENPOWERLINK_CN),ON,OFF) #### OPLK LIBRARY #### # Always build a oplk stack -OPENPOWERLINK_CONF_OPTS += -DCFG_OPLK_LIB=ON +# Disable library with simulation interface +# Disable zynq/FPGA (PCIe) interface +OPENPOWERLINK_CONF_OPTS += -DCFG_OPLK_LIB=ON \ + -DCFG_COMPILE_LIB_MN_SIM=OFF \ + -DCFG_COMPILE_LIB_CN_SIM=OFF \ + -DCFG_COMPILE_LIB_MNAPP_ZYNQINTF=OFF # All option are ON by default ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB),y) @@ -89,18 +94,12 @@ OPENPOWERLINK_CONF_OPTS += \ endif ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB),y) -OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_DRIVERS=ON -ifeq ($(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_82573),y) -OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_EDRV=82573 -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_8255x),y) -OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_EDRV=8255x -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_I210),y) -OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_EDRV=i210 -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_RTL8111),y) -OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_EDRV=8111 -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_RTL8139),y) -OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_EDRV=8139 -endif +OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_DRIVERS=ON \ + -DCFG_POWERLINK_EDRV_82573=$(if $(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_82573),ON,OFF) \ + -DCFG_POWERLINK_EDRV_8255X=$(if $(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_8255x),ON,OFF) \ + -DCFG_POWERLINK_EDRV_I210=$(if $(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_I210),ON,OFF) \ + -DCFG_POWERLINK_EDRV_8111=$(if $(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_RTL8111),ON,OFF) \ + -DCFG_POWERLINK_EDRV_8139=$(if $(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_RTL8139),ON,OFF) else OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_DRIVERS=OFF endif From 1db28a7ba0a230b5d22ef32a64b6844665afa755 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 3 Nov 2016 22:05:23 +0100 Subject: [PATCH 1703/3392] package/openpowerlink: fix build with Linux kernel 4.7+ dev->trans_start was replaced by netif_trans_update helper in kernel 4.7 by commit 860e9538a9482bb84589f7d0718a7e6d0a944d58. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...Fix-compilation-on-Linux-kernels-4.7.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/openpowerlink/0004-FIX-Veth-Fix-compilation-on-Linux-kernels-4.7.patch diff --git a/package/openpowerlink/0004-FIX-Veth-Fix-compilation-on-Linux-kernels-4.7.patch b/package/openpowerlink/0004-FIX-Veth-Fix-compilation-on-Linux-kernels-4.7.patch new file mode 100644 index 0000000000..d246f46681 --- /dev/null +++ b/package/openpowerlink/0004-FIX-Veth-Fix-compilation-on-Linux-kernels-4.7.patch @@ -0,0 +1,35 @@ +From 041799c4990d56b9822ee3ae3ffbb181e5c16c81 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 3 Nov 2016 21:09:57 +0100 +Subject: [PATCH] [FIX] Veth: Fix compilation on Linux kernels >= 4.7 + +dev->trans_start was replaced by netif_trans_update helper in kernel +4.7 by commit 860e9538a9482bb84589f7d0718a7e6d0a944d58. + +Upstream status: Pending +https://github.com/OpenAutomationTechnologies/openPOWERLINK_V2/pull/177 + +Signed-off-by: Romain Naour +--- + stack/src/kernel/veth/veth-linuxkernel.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/stack/src/kernel/veth/veth-linuxkernel.c b/stack/src/kernel/veth/veth-linuxkernel.c +index 8c68c47..ecdc000 100644 +--- a/stack/src/kernel/veth/veth-linuxkernel.c ++++ b/stack/src/kernel/veth/veth-linuxkernel.c +@@ -287,7 +287,11 @@ static int vethStartXmit(struct sk_buff* pSkb_p, struct net_device* pNetDevice_p + struct net_device_stats* pStats = netdev_priv(pNetDevice_p); + + //save time stamp ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)) + pNetDevice_p->trans_start = jiffies; ++#else ++ netif_trans_update(pNetDevice_p); ++#endif + + frameInfo.frame.pBuffer = (tPlkFrame*)pSkb_p->data; + frameInfo.frameSize = pSkb_p->len; +-- +2.5.5 + From 55fba24d346a0f937d84e8461a71730281be879c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 5 Dec 2016 08:07:49 +0100 Subject: [PATCH 1704/3392] ti-cgt-pru: fix typo in comment Signed-off-by: Peter Korsgaard --- package/ti-cgt-pru/ti-cgt-pru.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ti-cgt-pru/ti-cgt-pru.mk b/package/ti-cgt-pru/ti-cgt-pru.mk index 7c89444e01..d94f09197f 100644 --- a/package/ti-cgt-pru/ti-cgt-pru.mk +++ b/package/ti-cgt-pru/ti-cgt-pru.mk @@ -21,7 +21,7 @@ define HOST_TI_CGT_PRU_EXTRACT_CMDS endef # Since this is largely prebuilt toolchain and likes to live in its -# own directory, put is in $(HOST_DIR)/usr/share/ti-cgt-pru/. +# own directory, put it in $(HOST_DIR)/usr/share/ti-cgt-pru/. # Packages wanting to use this toolchain need to use this path as TI's # standard PRU_CGT path e.g. make PRU_CGT=$(TI_CGT_PRU_INSTALLDIR)... TI_CGT_PRU_INSTALLDIR = $(HOST_DIR)/usr/share/ti-cgt-pru From 43cf5677102e5d25f85a00692bfe23e2b749c4cd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 5 Dec 2016 21:07:02 +0100 Subject: [PATCH 1705/3392] chrony: bump version to 2.4.1 Fixes a crash issue with smoothtime directive. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/chrony/chrony.hash | 6 +++--- package/chrony/chrony.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index da35f6bf57..66ec0603f7 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,3 +1,3 @@ -# From http://thread.gmane.org/gmane.comp.time.chrony.announce/36 -md5 d0598aa8a9be8faccef9386f6fc0d5f2 chrony-2.4.tar.gz -sha1 8c243c545f242f869c9965e675828878970da5db chrony-2.4.tar.gz +# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2016/11/msg00000.html +md5 d08dd5a7d79a89891d119adcccb4397d chrony-2.4.1.tar.gz +sha1 b412375ca90dbef653ad00534f8b73b825e396d4 chrony-2.4.1.tar.gz diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 5f3160e199..0dca2eef55 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHRONY_VERSION = 2.4 +CHRONY_VERSION = 2.4.1 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPLv2 CHRONY_LICENSE_FILES = COPYING From 4dc988c682e3cece90e277ff12d07aebe6188771 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 5 Dec 2016 21:27:15 +0100 Subject: [PATCH 1706/3392] gstreamer1: fix compile for microblaze and xtensa architectures Fix unaligned access support detection introduced to gstreamer by commit 'gstconfig.h: Detect unaligned access support at compile-time' ([1]) by assuming no unaligned support for unknown architectures. Fixes [2], [3]: ../gst/gstconfig.h:112:4: error: #error "Could not detect architecture; don't know whether it supports unaligned access! Please file a bug." # error "Could not detect architecture; don't know whether it supports unaligned access! Please file a bug." [1] https://cgit.freedesktop.org/gstreamer/gstreamer/commit/?h=1.10&id=6ef601367e0f5adb7a8b02cec94dec04fccf701a [2] http://autobuild.buildroot.net/results/c1cd60d3f44f2938e5f42453d034ea070898f837 [3] http://autobuild.buildroot.net/results/c3a6662f0acfda179a58cdad9165f36826229826 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...cess-support-for-unknown-architectur.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/gstreamer1/gstreamer1/0001-Fix-unaligned-access-support-for-unknown-architectur.patch diff --git a/package/gstreamer1/gstreamer1/0001-Fix-unaligned-access-support-for-unknown-architectur.patch b/package/gstreamer1/gstreamer1/0001-Fix-unaligned-access-support-for-unknown-architectur.patch new file mode 100644 index 0000000000..06897fb1af --- /dev/null +++ b/package/gstreamer1/gstreamer1/0001-Fix-unaligned-access-support-for-unknown-architectur.patch @@ -0,0 +1,37 @@ +From 20bbce5758abf3493f3d7dc10edd335701c3a02c Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 5 Dec 2016 20:54:55 +0100 +Subject: [PATCH] Fix unaligned access support for unknown architectures. + +Better be safe (assume no unaligned access) than sorry (bail out +with error message at compile time). + +Fixes compile for xtensa and microblaze architectures. + +Signed-off-by: Peter Seiderer +--- + gst/gstconfig.h.in | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in +index c2e8361..3a17398 100644 +--- a/gst/gstconfig.h.in ++++ b/gst/gstconfig.h.in +@@ -104,12 +104,10 @@ + * http://docs.oracle.com/cd/E19205-01/820-4155/c++_faq.html#Vers6 + * https://software.intel.com/en-us/node/583402 + */ +-#if defined(__alpha__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__mips__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) +-# define GST_HAVE_UNALIGNED_ACCESS 0 +-#elif defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__m68k__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__zarch__) ++#if defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__m68k__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__zarch__) + # define GST_HAVE_UNALIGNED_ACCESS 1 + #else +-# error "Could not detect architecture; don't know whether it supports unaligned access! Please file a bug." ++# define GST_HAVE_UNALIGNED_ACCESS 0 + #endif + + /** +-- +2.11.0 + From fb0d4b557565c4742c0300a72fcb5baf2c26674d Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Mon, 5 Dec 2016 21:38:22 +0530 Subject: [PATCH 1707/3392] efivar: not available for static builds efivar uses dlfcn.h which is not available in static builds configuration. Also propagate dependency to efibootmgr. This commit also does s/requires/needs/ in comment while at it. Fixes: http://autobuild.buildroot.net/results/ab3/ab32ccacfac2e65e1fcb307058d06c3d0122979d/ Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- package/efibootmgr/Config.in | 6 ++++-- package/efivar/Config.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 8b29938d8a..cd4bda1d75 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_EFIBOOTMGR bool "efibootmgr" + depends on !BR2_STATIC_LIBS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar depends on !BR2_TOOLCHAIN_USES_MUSL # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar @@ -15,8 +16,9 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhinstaller/efibootmgr -comment "efibootmgr requires a glibc or uClibc toolchain w/ headers >= 3.12, gcc >= 4.9" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ +comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ BR2_TOOLCHAIN_USES_MUSL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \ diff --git a/package/efivar/Config.in b/package/efivar/Config.in index 1bdb6cad63..a97c766be4 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_EFIVAR bool "efivar" + depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h # linux/nvme.h has been renamed to linux/nvme_ioctl.h since 4.4, # and the efivar source handles that situation. However, some @@ -18,8 +19,9 @@ config BR2_PACKAGE_EFIVAR https://github.com/rhinstaller/efivar -comment "efivar requires a glibc or uClibc toolchain w/ headers >= 3.12, gcc >= 4.9" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ +comment "efivar needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ BR2_TOOLCHAIN_USES_MUSL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \ From 1dc77b605874a016afb219f0bdcf1578c2826d53 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Mon, 5 Dec 2016 15:28:24 +0100 Subject: [PATCH 1708/3392] nginx-naxsi: depends on BR2_PACKAGE_NGINX_HTTP This package adds XSS and SQLi protection to Nginx HTTP server. So, it makes sense iff the HTTP part of nginx is enabled. Fixes: http://autobuild.buildroot.net/results/1df67325f11a6f1c88d0c9cc5f4feab0b57bc2a6/ Signed-off-by: Johan Oudinet [Thomas: fix indentation, add autobuilder reference.] Signed-off-by: Thomas Petazzoni --- package/nginx-naxsi/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in index 5ae5497060..fc2ba9bfe3 100644 --- a/package/nginx-naxsi/Config.in +++ b/package/nginx-naxsi/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NGINX_NAXSI bool "nginx-naxsi" + depends on BR2_PACKAGE_NGINX_HTTP # uses pcre, so nginx needs to be built with pcre support select BR2_PACKAGE_PCRE help From 1547eea294058a6e5f2ed06df590b43ac601ff71 Mon Sep 17 00:00:00 2001 From: Johan Oudinet Date: Mon, 5 Dec 2016 15:28:25 +0100 Subject: [PATCH 1709/3392] nginx-dav-ext: depends on BR2_PACKAGE_NGINX_HTTP_DAV_MODULE This package adds missing WebDAB commands to NGINX. So, it makes sense iff Nginx is compiled with the WebDAV support. Fixes: http://autobuild.buildroot.net/results/6e997faf553dc70d0aa1ee811fd669650349cba2/ Signed-off-by: Johan Oudinet [Thomas: fix indentation, add autobuilder reference.] Signed-off-by: Thomas Petazzoni --- package/nginx-dav-ext/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nginx-dav-ext/Config.in b/package/nginx-dav-ext/Config.in index bf197dc7e9..1e60321fe3 100644 --- a/package/nginx-dav-ext/Config.in +++ b/package/nginx-dav-ext/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NGINX_DAV_EXT bool "nginx-dav-ext" + depends on BR2_PACKAGE_NGINX_HTTP_DAV_MODULE select BR2_PACKAGE_EXPAT help NGINX WebDAV missing commands support (PROPFIND & OPTIONS). From e9d1ea1027589aae82b6e6b789394b624a441d36 Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Mon, 5 Dec 2016 14:30:57 +1100 Subject: [PATCH 1710/3392] package/liquid-dsp: fix build failure on powerpc64le Commit 7d435d8510db69ed2f9108abaa52479bce127b72 fixed building on powerpc and powerpc64. This extends that fix to cover powerpc64le, which suffers from the same problem. Fixes: http://autobuild.buildroot.net/results/45c4651a833e4667d4ef68e619cf4b5749a288da Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- package/liquid-dsp/liquid-dsp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index b5fb44cf91..35994137e9 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -35,7 +35,7 @@ LIQUID_DSP_LDFLAGS += -lfftw3f endif # disable altivec, it has build issues -ifeq ($(BR2_powerpc)$(BR2_powerpc64),y) +ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) LIQUID_DSP_CONF_OPTS += --enable-simdoverride endif From 00810e0ea3976c5b26a7fd264870f15e17a2eaa2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Dec 2016 22:40:01 +0100 Subject: [PATCH 1711/3392] pru-software-support: fix licensing information Fix the path to the license file, and adjust the licensing information according to the contents of this file. Fixes: http://autobuild.buildroot.net/results/213cdda78b0a4762ee4fecc0f178df1225062c6f/ Signed-off-by: Thomas Petazzoni --- package/pru-software-support/pru-software-support.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pru-software-support/pru-software-support.mk b/package/pru-software-support/pru-software-support.mk index 95d1e03d30..16d0b9743c 100644 --- a/package/pru-software-support/pru-software-support.mk +++ b/package/pru-software-support/pru-software-support.mk @@ -6,8 +6,8 @@ PRU_SOFTWARE_SUPPORT_VERSION = 804b548e69ef9fdf44445f6d0968d81cb8a1e7b4 PRU_SOFTWARE_SUPPORT_SITE = git://git.ti.com/pru-software-support-package/pru-software-support-package.git -PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3c -PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU_Package-v5.0-Manifest.html +PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3c, GPLv2, Public Domain +PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU_Package-v4.0-Manifest.html PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru From 41444d7f892b44c87d3b08e7ba1824b9cb9ee9a8 Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Mon, 28 Nov 2016 16:11:39 +1100 Subject: [PATCH 1712/3392] pkg-autotools: generic configure fix for powerpc64 Many (100+) packages supported by buildroot contain old configure scripts (or build them from old versions of autotools) that are unable to determine how to link shared libraries on powerpc64 and powerpc64le. This causes that test to erroneously fail on toolchains that are not "bi-endian" (which is the case for toolchains built by buildroot), which causes configure to build static libraries instead of dynamic ones. Although these builds succeed, they tend to cause linker failures in binaries later linked against them. Because affected configure files can be discovered automatically, this patch introduces a hook (enabled only when building for powerpc64 and powerpc64le) that uses a script to scan and fix each package. Signed-off-by: Sam Bobroff Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/pkg-autotools.mk | 16 ++++++++ support/scripts/fix-configure-powerpc64.sh | 47 ++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100755 support/scripts/fix-configure-powerpc64.sh diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index d1cdb89fb5..00822e2a9d 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -78,6 +78,15 @@ define LIBTOOL_PATCH_HOOK done endef +# +# Hook to patch common issue with configure on powerpc64{,le} failing +# to detect shared library support: +# +define CONFIGURE_FIX_POWERPC64_HOOK + @$(call MESSAGE,"Checking configure (powerpc64/powerpc64le)") + support/scripts/fix-configure-powerpc64.sh $($(PKG)_DIR) +endef + # # Hook to gettextize the package if needed # @@ -255,6 +264,13 @@ endif endif +# Append a configure hook if building for a powerpc64 (or powerpc64le) arch. +# Must be added after other pre-configure hooks that might regenerate the +# configure script and overwrite the changes made here. +ifneq ($$(filter powerpc64%,$$(if $$(filter target,$(4)),$$(ARCH),$$(HOSTARCH))),) +$(2)_PRE_CONFIGURE_HOOKS += CONFIGURE_FIX_POWERPC64_HOOK +endif + # # Build step. Only define it if not already defined by the package .mk # file. diff --git a/support/scripts/fix-configure-powerpc64.sh b/support/scripts/fix-configure-powerpc64.sh new file mode 100755 index 0000000000..ad710422a5 --- /dev/null +++ b/support/scripts/fix-configure-powerpc64.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +# This is a script to find, and correct, a problem with old versions of +# configure that affect powerpc64 and powerpc64le. + +# The issue causes configure to incorrectly determine that shared library +# support is not present in the linker. This causes the package to build a +# static library rather than a dynamic one and although the build will succeed, +# it may cause packages that link with the static library it to fail due to +# undefined symbols. + +# This script searches for files named 'configure' that appear to have this +# issue (by searching for a known bad pattern) and patching them. + +set -e + +if [ $# -ne 1 ]; then + echo "Usage: $0 " + exit 2 +fi + +srcdir="$1" +files=$(cd "$srcdir" && find . -name configure \ +-exec grep -qF 'Generated by GNU Autoconf' {} \; \ +-exec grep -qF 'ppc*-*linux*|powerpc*-*linux*)' {} \; -print) + +# --ignore-whitespace is needed because some packages have included +# copies of configure scripts where tabs have been replaced with spaces. +for c in $files; do + patch --ignore-whitespace "$srcdir"/"$c" <<'EOF' +--- a/configure 2016-11-16 15:31:46.097447271 +1100 ++++ b/configure 2008-07-21 12:17:23.000000000 +1000 +@@ -4433,7 +4433,10 @@ + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; +- ppc*-*linux*|powerpc*-*linux*) ++ powerpcle-*linux*) ++ LD="${LD-ld} -m elf64lppc" ++ ;; ++ powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) +EOF +done + From f7a07f42f70a73806fd2f6bf3662fc6907845fe9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Dec 2016 21:36:32 +0100 Subject: [PATCH 1713/3392] vim: be more careful when removing the documentation The current VIM_REMOVE_DOCS hook removes all .txt files from /usr/share/vim. Unfortunately, this also removes the rgb.txt file, which is needed at runtime for vim, as reported in bug #9466. This commit changes VIM_REMOVE_DOCS to remove only /usr/share/vim/vim*/doc/. Size-wise, it's equivalent because: - We are no longer removing a few README.txt in other directories, taking more space. - We are now removing the /usr/share/vim/vim*/doc/ folder entirely, which contained a few files not named *.txt So overall, the size of /usr/share/vim/ before and after this patch is still 11MB. Fixes bug #9466. Reported-by: Mateusz Furdyna Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/vim/vim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vim/vim.mk b/package/vim/vim.mk index d4a1f82028..308855eaee 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -61,7 +61,7 @@ define VIM_INSTALL_RUNTIME_CMDS endef define VIM_REMOVE_DOCS - find $(TARGET_DIR)/usr/share/vim -type f -name "*.txt" -delete + $(RM) -rf $(TARGET_DIR)/usr/share/vim/vim*/doc/ endef # Avoid oopses with vipw/vigr, lack of $EDITOR and 'vi' command expectation From 8b7d8b4a4e41acadde27b12191ca6cb0ebd62b33 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 30 Nov 2016 22:12:04 +0100 Subject: [PATCH 1714/3392] arch: merge Config.in.aarch64 into Config.in.arm The 64 bits ARM processors are capable of running 32 bits ARM code, and some platforms are indeed using this capability. Due to this, if we were to keep the separation between Config.in.aarch64 and Config.in.arm, we would have to duplicate the definition of all 64-bits capable ARM cores into both files. Instead of going down this route, let's take the same route as the x86 one: a single Config.in.x86 file, used for both x86 32 bits and x86 64 bits, with the appropriate logic to only show the relevant cores depending on which architecture is selected. In order to do this, we: - Make the "ARM instruction set" choice only visible on ARM 32 bits, since we currently don't support ARM vs. Thumb on AArch64. - Add the relevant values for the BR2_ARCH option. - Add the relevant values for the BR2_ENDIAN option. - Make the "aapcs-linux" BR2_GCC_TARGET_ABI value only used on ARM 32 bits, since this ABI doesn't mean anything on AArch64. - Make the BR2_GCC_TARGET_FPU option depends on ARM 32 bits, since there is no -mfpu option on AArch64. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- arch/Config.in | 6 +----- arch/Config.in.aarch64 | 7 ------- arch/Config.in.arm | 14 +++++++++----- 3 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 arch/Config.in.aarch64 diff --git a/arch/Config.in b/arch/Config.in index df4db0b796..d59cbd7622 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -354,14 +354,10 @@ if BR2_arcle || BR2_arceb source "arch/Config.in.arc" endif -if BR2_arm || BR2_armeb +if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be source "arch/Config.in.arm" endif -if BR2_aarch64 || BR2_aarch64_be -source "arch/Config.in.aarch64" -endif - if BR2_bfin source "arch/Config.in.bfin" endif diff --git a/arch/Config.in.aarch64 b/arch/Config.in.aarch64 deleted file mode 100644 index 34cd409a59..0000000000 --- a/arch/Config.in.aarch64 +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_ARCH - default "aarch64" if BR2_aarch64 - default "aarch64_be" if BR2_aarch64_be - -config BR2_ENDIAN - default "LITTLE" if BR2_aarch64 - default "BIG" if BR2_aarch64_be diff --git a/arch/Config.in.arm b/arch/Config.in.arm index ee612f50c8..002ed04d7f 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -399,6 +399,7 @@ endchoice choice prompt "ARM instruction set" + depends on BR2_arm || BR2_armeb config BR2_ARM_INSTRUCTIONS_ARM bool "ARM" @@ -434,12 +435,14 @@ config BR2_ARM_INSTRUCTIONS_THUMB2 endchoice config BR2_ARCH - default "arm" if BR2_arm - default "armeb" if BR2_armeb + default "arm" if BR2_arm + default "armeb" if BR2_armeb + default "aarch64" if BR2_aarch64 + default "aarch64_be" if BR2_aarch64_be config BR2_ENDIAN - default "LITTLE" if BR2_arm - default "BIG" if BR2_armeb + default "LITTLE" if (BR2_arm || BR2_aarch64) + default "BIG" if (BR2_armeb || BR2_aarch64_be) config BR2_GCC_TARGET_CPU default "arm920t" if BR2_arm920t @@ -467,9 +470,10 @@ config BR2_GCC_TARGET_CPU default "iwmmxt" if BR2_iwmmxt config BR2_GCC_TARGET_ABI - default "aapcs-linux" + default "aapcs-linux" if BR2_arm || BR2_armeb config BR2_GCC_TARGET_FPU + depends on BR2_arm || BR2_armeb default "vfp" if BR2_ARM_FPU_VFPV2 default "vfpv3" if BR2_ARM_FPU_VFPV3 default "vfpv3-d16" if BR2_ARM_FPU_VFPV3D16 From 1b61cd38cd0c00b2c45dc2a3020e3e58960dc3fa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 30 Nov 2016 22:12:05 +0100 Subject: [PATCH 1715/3392] arch/Config.in.arm: prepare addition of 64 bits cores Until now the "Target Architecture Variant" choice was not visible on AArch64. In order to prepare the addition of the 64 bits core to this choice, this commit adds a "depends on !BR2_ARCH_IS_64" dependency to all currently supported cores (that are 32 bits only). Following this commit, the "Target Architecture Variant" choice appears on AArch64, but is for now empty. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 002ed04d7f..0ca6a1447c 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -57,7 +57,6 @@ config BR2_ARM_CPU_ARMV7M choice prompt "Target Architecture Variant" - depends on BR2_arm || BR2_armeb default BR2_arm926t help Specific CPU variant to use @@ -68,12 +67,14 @@ config BR2_arm920t select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV4 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_arm922t bool "arm922t" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV4 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_arm926t bool "arm926t" select BR2_ARM_CPU_HAS_ARM @@ -81,12 +82,14 @@ config BR2_arm926t select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV5 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_arm1136j_s bool "arm1136j-s" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_arm1136jf_s bool "arm1136jf-s" select BR2_ARM_CPU_HAS_ARM @@ -94,12 +97,14 @@ config BR2_arm1136jf_s select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_arm1176jz_s bool "arm1176jz-s" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_arm1176jzf_s bool "arm1176jzf-s" select BR2_ARM_CPU_HAS_ARM @@ -107,6 +112,7 @@ config BR2_arm1176jzf_s select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_arm11mpcore bool "mpcore" select BR2_ARM_CPU_HAS_ARM @@ -114,6 +120,7 @@ config BR2_arm11mpcore select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_cortex_a5 bool "cortex-A5" select BR2_ARM_CPU_HAS_ARM @@ -122,6 +129,7 @@ config BR2_cortex_a5 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_cortex_a7 bool "cortex-A7" select BR2_ARM_CPU_HAS_ARM @@ -130,6 +138,7 @@ config BR2_cortex_a7 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_cortex_a8 bool "cortex-A8" select BR2_ARM_CPU_HAS_ARM @@ -138,6 +147,7 @@ config BR2_cortex_a8 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_cortex_a9 bool "cortex-A9" select BR2_ARM_CPU_HAS_ARM @@ -146,6 +156,7 @@ config BR2_cortex_a9 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_cortex_a12 bool "cortex-A12" select BR2_ARM_CPU_HAS_ARM @@ -154,6 +165,7 @@ config BR2_cortex_a12 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_cortex_a15 bool "cortex-A15" select BR2_ARM_CPU_HAS_ARM @@ -162,6 +174,7 @@ config BR2_cortex_a15 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_cortex_a17 bool "cortex-A17" select BR2_ARM_CPU_HAS_ARM @@ -170,41 +183,49 @@ config BR2_cortex_a17 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_cortex_m3 bool "cortex-M3" select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7M + depends on !BR2_ARCH_IS_64 config BR2_cortex_m4 bool "cortex-M4" select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7M + depends on !BR2_ARCH_IS_64 config BR2_fa526 bool "fa526/626" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_ARMV4 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_pj4 bool "pj4" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_VFPV3 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_strongarm bool "strongarm sa110/sa1100" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_ARMV4 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_xscale bool "xscale" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV5 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 config BR2_iwmmxt bool "iwmmxt" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_ARMV5 select BR2_ARCH_HAS_MMU_OPTIONAL + depends on !BR2_ARCH_IS_64 endchoice config BR2_ARM_ENABLE_NEON From c37189b35ed09fc1f51debd2e51aac2520a4a213 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 30 Nov 2016 22:12:06 +0100 Subject: [PATCH 1716/3392] arch/Config.in.arm: add BR2_ARM_CPU_ARMV8 In order to prepare the addition of ARM64 cores, add the blind BR2_ARM_CPU_ARMV8 option. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 0ca6a1447c..9e5acccb15 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -55,6 +55,9 @@ config BR2_ARM_CPU_ARMV7A config BR2_ARM_CPU_ARMV7M bool +config BR2_ARM_CPU_ARMV8 + bool + choice prompt "Target Architecture Variant" default BR2_arm926t From 743e6639123890f6cbcecdc8d4b935e82a548aca Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 30 Nov 2016 22:12:07 +0100 Subject: [PATCH 1717/3392] arch/arm: drop legacy dependency for floating point strategy The floating point strategy currently depends on EABI || EABIHF. The reason was that, wayback when we also supported OABI, we only exposed FP for EABI or EABIHF, and hide it for OABI, which did not support FP. It's been a while now that we do not support OABI, but the dependency stuck all along. Remove it as it is no longer needed, and is always true. However, the choice is empty for AArch64, as we still have no entry for their floating point strategy yet. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 9e5acccb15..fa999d5ec4 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -308,7 +308,6 @@ endchoice choice prompt "Floating point strategy" - depends on BR2_ARM_EABI || BR2_ARM_EABIHF default BR2_ARM_FPU_VFPV4D16 if BR2_ARM_CPU_HAS_VFPV4 default BR2_ARM_FPU_VFPV3D16 if BR2_ARM_CPU_HAS_VFPV3 default BR2_ARM_FPU_VFPV2 if BR2_ARM_CPU_HAS_VFPV2 From d690b7444a819a53a756cd3b6047584802d55d92 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 30 Nov 2016 22:12:08 +0100 Subject: [PATCH 1718/3392] arch/Config.in.arm: add FPU related options for ARMv8 cores The ARMv8 cores have a mandatory FPU unit called FP-ARMv8, so we: - add a new hidden Config.in option for the availability of this unit (BR2_ARM_CPU_HAS_FP_ARMV8) - allow the selection of a possible choice in the "Floating point strategy", and add two new choices: BR2_ARM_FPU_FP_ARMV8 and BR2_ARM_FPU_NEON_FP_ARMV8. - specify the -mfpu values for BR2_ARM_FPU_FP_ARMV8 and BR2_ARM_FPU_NEON_FP_ARMV8 cases, when used on ARM 32 bits (-mfpu doesn't exist on ARM64, instead -mcpu modifiers are used, so they will be added on a per-core basis). Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: drop the FP strategy dependency] Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index fa999d5ec4..1a3c36d5c5 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -31,6 +31,10 @@ config BR2_ARM_CPU_HAS_VFPV4 bool select BR2_ARM_CPU_HAS_VFPV3 +config BR2_ARM_CPU_HAS_FP_ARMV8 + bool + select BR2_ARM_CPU_HAS_VFPV4 + config BR2_ARM_CPU_HAS_ARM bool @@ -308,6 +312,7 @@ endchoice choice prompt "Floating point strategy" + default BR2_ARM_FPU_FP_ARMV8 if BR2_ARM_CPU_HAS_FP_ARMV8 default BR2_ARM_FPU_VFPV4D16 if BR2_ARM_CPU_HAS_VFPV4 default BR2_ARM_FPU_VFPV3D16 if BR2_ARM_CPU_HAS_VFPV3 default BR2_ARM_FPU_VFPV2 if BR2_ARM_CPU_HAS_VFPV2 @@ -418,6 +423,20 @@ config BR2_ARM_FPU_NEON_VFPV4 example on Cortex-A5 and Cortex-A7, support for VFPv4 and NEON is optional. +config BR2_ARM_FPU_FP_ARMV8 + bool "FP-ARMv8" + depends on BR2_ARM_CPU_HAS_FP_ARMV8 + help + This option allows to use the ARMv8 floating point unit. + +config BR2_ARM_FPU_NEON_FP_ARMV8 + bool "NEON/FP-ARMv8" + depends on BR2_ARM_CPU_HAS_FP_ARMV8 + depends on BR2_ARM_CPU_HAS_NEON + help + This option allows to use both the ARMv8 floating point unit + and the NEON SIMD unit for floating point operations. + endchoice choice @@ -504,6 +523,8 @@ config BR2_GCC_TARGET_FPU default "vfpv4-d16" if BR2_ARM_FPU_VFPV4D16 default "neon" if BR2_ARM_FPU_NEON default "neon-vfpv4" if BR2_ARM_FPU_NEON_VFPV4 + default "fp-armv8" if BR2_ARM_FPU_FP_ARMV8 + default "neon-fp-armv8" if BR2_ARM_FPU_NEON_FP_ARMV8 config BR2_GCC_TARGET_FLOAT_ABI default "soft" if BR2_ARM_SOFT_FLOAT From 5e8cb2ee759780c38e06aa8e83d98bb1f2943cc2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 30 Nov 2016 22:12:09 +0100 Subject: [PATCH 1719/3392] arch/Config.in.arm: specify ABI for ARM64 There's currently only one widely supported ABI for ARM64, called lp64, so we define BR2_GCC_TARGET_ABI to the appropriate value. Note that there is another ABI for ARM64 being worked on, ilp32, but its support is not fully upstream in the kernel, so we're not adding support for it for the moment. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 1a3c36d5c5..c98efcd03f 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -513,6 +513,7 @@ config BR2_GCC_TARGET_CPU config BR2_GCC_TARGET_ABI default "aapcs-linux" if BR2_arm || BR2_armeb + default "lp64" if BR2_aarch64 || BR2_aarch64_be config BR2_GCC_TARGET_FPU depends on BR2_arm || BR2_armeb From 785a73fb8f64d14c68b0c035aa40b203a2a17378 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Wed, 30 Nov 2016 22:12:10 +0100 Subject: [PATCH 1720/3392] arch/Config.in.arm: Add Cortex-A53 CPU Adds the Cortex-A53 CPU to the target architecture variant choice. This sets the toolchain to use Cortex-A53 as the target. The effect is that various Cortex-A53 tunings are enabled for the compilation of packages. Signed-off-by: Matt Flax Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index c98efcd03f..592b0970ba 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -191,6 +191,13 @@ config BR2_cortex_a17 select BR2_ARM_CPU_ARMV7A select BR2_ARCH_HAS_MMU_OPTIONAL depends on !BR2_ARCH_IS_64 +config BR2_cortex_a53 + bool "cortex-A53" + select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_HAS_NEON + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8 + select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_m3 bool "cortex-M3" select BR2_ARM_CPU_HAS_THUMB2 @@ -510,6 +517,9 @@ config BR2_GCC_TARGET_CPU default "strongarm" if BR2_strongarm default "xscale" if BR2_xscale default "iwmmxt" if BR2_iwmmxt + default "cortex-a53" if (BR2_cortex_a53 && !BR2_ARCH_IS_64) + default "cortex-a53+fp" if (BR2_cortex_a53 && BR2_ARCH_IS_64 && BR2_ARM_FPU_FP_ARMV8) + default "cortex-a53+fp+simd" if (BR2_cortex_a53 && BR2_ARCH_IS_64 && BR2_ARM_FPU_NEON_FP_ARMV8) config BR2_GCC_TARGET_ABI default "aapcs-linux" if BR2_arm || BR2_armeb From 2131f1b3817d594ce24ac9ba263f104077cf7c49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 30 Nov 2016 22:12:11 +0100 Subject: [PATCH 1721/3392] arch/Config.in.arm: add Cortex-A57 and Cortex-A72 Add two popular ARM64 cores to the list of supported cores: Cortex-A57 and Cortex-A72. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 592b0970ba..743f6ca361 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -198,6 +198,20 @@ config BR2_cortex_a53 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL +config BR2_cortex_a57 + bool "cortex-A57" + select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_HAS_NEON + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8 + select BR2_ARCH_HAS_MMU_OPTIONAL +config BR2_cortex_a72 + bool "cortex-A72" + select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_HAS_NEON + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8 + select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_m3 bool "cortex-M3" select BR2_ARM_CPU_HAS_THUMB2 @@ -520,6 +534,12 @@ config BR2_GCC_TARGET_CPU default "cortex-a53" if (BR2_cortex_a53 && !BR2_ARCH_IS_64) default "cortex-a53+fp" if (BR2_cortex_a53 && BR2_ARCH_IS_64 && BR2_ARM_FPU_FP_ARMV8) default "cortex-a53+fp+simd" if (BR2_cortex_a53 && BR2_ARCH_IS_64 && BR2_ARM_FPU_NEON_FP_ARMV8) + default "cortex-a57" if (BR2_cortex_a57 && !BR2_ARCH_IS_64) + default "cortex-a57+fp" if (BR2_cortex_a57 && BR2_ARCH_IS_64 && BR2_ARM_FPU_FP_ARMV8) + default "cortex-a57+fp+simd" if (BR2_cortex_a57 && BR2_ARCH_IS_64 && BR2_ARM_FPU_NEON_FP_ARMV8) + default "cortex-a72" if (BR2_cortex_a72 && !BR2_ARCH_IS_64) + default "cortex-a72+fp" if (BR2_cortex_a72 && BR2_ARCH_IS_64 && BR2_ARM_FPU_FP_ARMV8) + default "cortex-a72+fp+simd" if (BR2_cortex_a72 && BR2_ARCH_IS_64 && BR2_ARM_FPU_NEON_FP_ARMV8) config BR2_GCC_TARGET_ABI default "aapcs-linux" if BR2_arm || BR2_armeb From 141358d83811f91b14fc33ecc524a4d843552f3e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Dec 2016 23:15:43 +0100 Subject: [PATCH 1722/3392] toolchain-external-linaro-{arm,armeb}: allow on ARMv8 The Linaro toolchains are currently only available on ARMv7-A, but can in fact also be used to generate 32 bits code for ARMv8 platforms. This commit therefore adjusts their architecture dependency. Example, a 32 bits ARM build produces a 32 bits busybox binary: $ file output/target/bin/busybox output/target/bin/busybox: setuid ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-armhf.so.3, for GNU/Linux 2.6.32, BuildID[sha1]=16a7a70eb9cac08759e52a260478b9c287f59238, stripped Which was built for Cortex-A72: $ ./output/host/usr/bin/arm-linux-gnueabihf-readelf -A output/target/bin/busybox Attribute Section: aeabi File Attributes Tag_CPU_name: "Cortex-A72" Tag_CPU_arch: v8 Tag_CPU_arch_profile: Application Tag_ARM_ISA_use: Yes Tag_THUMB_ISA_use: Thumb-2 Tag_FP_arch: FP for ARMv8 Tag_ABI_PCS_wchar_t: 4 Tag_ABI_FP_rounding: Needed Tag_ABI_FP_denormal: Needed Tag_ABI_FP_exceptions: Needed Tag_ABI_FP_number_model: IEEE 754 Tag_ABI_align_needed: 8-byte Tag_ABI_align_preserved: 8-byte, except leaf SP Tag_ABI_enum_size: int Tag_ABI_VFP_args: VFP registers Tag_CPU_unaligned_access: v6 Tag_MPextension_use: Allowed Tag_Virtualization_use: TrustZone and Virtualization Extensions Signed-off-by: Thomas Petazzoni --- .../toolchain-external/toolchain-external-linaro-arm/Config.in | 2 +- .../toolchain-external-linaro-armeb/Config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index cef42e7441..78aeb8ea41 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -6,7 +6,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM bool "Linaro ARM 2016.11" depends on BR2_arm - depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index b2fed7fb6c..c7f2f5f60c 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -6,7 +6,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB bool "Linaro armeb 2016.11" depends on BR2_armeb - depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF depends on !BR2_STATIC_LIBS From 404413ec0a73bd8294026a74bb67aadc782f489c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 6 Dec 2016 10:08:06 +0100 Subject: [PATCH 1723/3392] DEVELOPERS: remove Tom Sparks Tom privately notified that he is not able to support the packages he originally added in Buildroot, so this commit removes him from the DEVELOPERS file. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 6 ------ 1 file changed, 6 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index f61afbcc9a..e411b4255e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1512,12 +1512,6 @@ F: toolchain/ N: Tiago Brusamarello F: package/aer-inject/ -N: Tom Sparks -F: package/ibrcommon/ -F: package/ibrdtn/ -F: package/ibrdtn-tools/ -F: package/ibrdtnd/ - N: Tzu-Jung Lee F: package/dropwatch/ F: package/tstools/ From 4c4756be6b34ccb20c4b879efddda5c291da52ca Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 5 Dec 2016 21:59:06 +0100 Subject: [PATCH 1724/3392] raspberrypi-usbboot: new package This new package currently installs the "rpiboot" utility, which is needed to access via USB mass storage the built-in eMMC of Raspberry Pi compute modules. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in.host | 1 + ...akefile-allow-passing-CFLAGS-LDFLAGS.patch | 28 ++++ .../0002-Makefile-add-DESTDIR-support.patch | 49 +++++++ ...gic-to-find-def1-def2-and-def3-files.patch | 127 ++++++++++++++++++ package/raspberrypi-usbboot/Config.in.host | 12 ++ .../raspberrypi-usbboot.hash | 2 + .../raspberrypi-usbboot.mk | 21 +++ 7 files changed, 240 insertions(+) create mode 100644 package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch create mode 100644 package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch create mode 100644 package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch create mode 100644 package/raspberrypi-usbboot/Config.in.host create mode 100644 package/raspberrypi-usbboot/raspberrypi-usbboot.hash create mode 100644 package/raspberrypi-usbboot/raspberrypi-usbboot.mk diff --git a/package/Config.in.host b/package/Config.in.host index 840313af66..248264195f 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -36,6 +36,7 @@ menu "Host utilities" source "package/pru-software-support/Config.in.host" source "package/pwgen/Config.in.host" source "package/qemu/Config.in.host" + source "package/raspberrypi-usbboot/Config.in.host" source "package/sam-ba/Config.in.host" source "package/squashfs/Config.in.host" source "package/sunxi-tools/Config.in.host" diff --git a/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch new file mode 100644 index 0000000000..cdab6070c2 --- /dev/null +++ b/package/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch @@ -0,0 +1,28 @@ +From 5b015e67af27679f4ca8f7f5f2f71020ec054b0c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 2 Dec 2016 23:09:44 +0100 +Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS + +This might be needed to pass some custom CFLAGS/LDFLAGS when building +rpiboot. + +Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 +Signed-off-by: Thomas Petazzoni +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 3e7d1e4..d9a7220 100755 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + rpiboot: main.c +- $(CC) -g -o $@ $< -lusb-1.0 ++ $(CC) -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) + + install: rpiboot + cp rpiboot /usr/bin +-- +2.7.4 + diff --git a/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch b/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch new file mode 100644 index 0000000000..c37d5a1e0a --- /dev/null +++ b/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch @@ -0,0 +1,49 @@ +From 905bc741b189d67160b27551b8ad01459c2707a0 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 2 Dec 2016 23:10:37 +0100 +Subject: [PATCH] Makefile: add DESTDIR support + +This allows installing rpiboot outside of /usr if needed. + +Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 +Signed-off-by: Thomas Petazzoni +--- + Makefile | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index d9a7220..7835b7f 100755 +--- a/Makefile ++++ b/Makefile +@@ -2,18 +2,18 @@ rpiboot: main.c + $(CC) -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) + + install: rpiboot +- cp rpiboot /usr/bin +- mkdir -p /usr/share/rpiboot +- cp usbbootcode.bin /usr/share/rpiboot +- cp msd.elf /usr/share/rpiboot +- cp buildroot.elf /usr/share/rpiboot ++ cp rpiboot $(DESTDIR)/usr/bin ++ mkdir -p $(DESTDIR)//usr/share/rpiboot ++ cp usbbootcode.bin $(DESTDIR)/usr/share/rpiboot ++ cp msd.elf $(DESTDIR)/usr/share/rpiboot ++ cp buildroot.elf $(DESTDIR)/usr/share/rpiboot + + uninstall: +- rm -f /usr/bin/rpiboot +- rm -f /usr/share/rpiboot/usbbootcode.bin +- rm -f /usr/share/rpiboot/msd.elf +- rm -f /usr/share/rpiboot/buildroot.elf +- rmdir --ignore-fail-on-non-empty /usr/share/rpiboot/ ++ rm -f $(DESTDIR)/usr/bin/rpiboot ++ rm -f $(DESTDIR)/usr/share/rpiboot/usbbootcode.bin ++ rm -f $(DESTDIR)/usr/share/rpiboot/msd.elf ++ rm -f $(DESTDIR)/usr/share/rpiboot/buildroot.elf ++ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/rpiboot/ + + clean: + rm rpiboot +-- +2.7.4 + diff --git a/package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch b/package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch new file mode 100644 index 0000000000..30cde49f34 --- /dev/null +++ b/package/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch @@ -0,0 +1,127 @@ +From 935894908dc24acda0acea7d211a9d80e55ecadb Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 2 Dec 2016 23:43:23 +0100 +Subject: [PATCH] main.c: rework logic to find def1, def2 and def3 files + +The current logic to find def1, def2 and def3 first tries to find them +in the local directory, and if they are not available, find them in +/usr/share. + +However, this doesn't work if rpiboot and its related files are +installed, but not in /usr. In order to address this use-case, this +commit reworks the logic to find the file path. + +A new function, getfilepath() is created. If the requested file is +available in the current directory, it is used. If not, then the path to +the file is inferred from the location of the currently running +program. I.e if we run /home/foo/sys/bin/rpiboot, then we will search +def1 in usbbootcode.bin in +/home/foo/sys/bin/../share/rpiboot/usbbootcode.bin. + +This continues to address the case of an installation in /usr, while +allowing installation in other locations as well. + +Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 +Signed-off-by: Thomas Petazzoni +--- + main.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 48 insertions(+), 13 deletions(-) + +diff --git a/main.c b/main.c +index 1b4e042..7c571d6 100755 +--- a/main.c ++++ b/main.c +@@ -1,10 +1,12 @@ +-#include "libusb-1.0/libusb.h" ++#define _GNU_SOURCE + #include + #include + #include +- ++#include + #include + ++#include "libusb-1.0/libusb.h" ++ + int verbose = 0; + int out_ep = 1; + int in_ep = 2; +@@ -146,6 +148,37 @@ int ep_read(unsigned char *buf, int len, libusb_device_handle * usb_device) + return len; + } + ++char *getfilepath(char *filename) ++{ ++ char *progpath, *filepath, *progdir; ++ ssize_t len; ++ ++ /* If file is available locally, use it */ ++ if (access(filename, F_OK) != -1) ++ return filename; ++ ++ /* Otherwise, use the installed version */ ++ progpath = malloc(PATH_MAX); ++ len = readlink("/proc/self/exe", progpath, PATH_MAX - 1); ++ if (len == -1) ++ { ++ free(progpath); ++ return NULL; ++ } ++ ++ progpath[len] = '\0'; ++ progdir = dirname(progpath); ++ if (asprintf(&filepath, "%s/../share/rpiboot/%s", progdir, filename) < 0) ++ { ++ free(progpath); ++ return NULL; ++ } ++ ++ free(progpath); ++ ++ return filepath; ++} ++ + int main(int argc, char *argv[]) + { + int result; +@@ -157,13 +190,9 @@ int main(int argc, char *argv[]) + int last_serial = -1; + FILE *fp1, *fp2, *fp; + +- char def1_inst[] = "/usr/share/rpiboot/usbbootcode.bin"; +- char def2_inst[] = "/usr/share/rpiboot/msd.elf"; +- char def3_inst[] = "/usr/share/rpiboot/buildroot.elf"; +- +- char def1_loc[] = "./usbbootcode.bin"; +- char def2_loc[] = "./msd.elf"; +- char def3_loc[] = "./buildroot.elf"; ++ char def1_name[] = "usbbootcode.bin"; ++ char def2_name[] = "msd.elf"; ++ char def3_name[] = "buildroot.elf"; + + char *def1, *def2, *def3; + +@@ -171,10 +200,16 @@ int main(int argc, char *argv[]) + char *fatimage = NULL, *executable = NULL; + int loop = 0; + +-// if local file version exists use it else use installed +- if( access( def1_loc, F_OK ) != -1 ) { def1 = def1_loc; } else { def1 = def1_inst; } +- if( access( def2_loc, F_OK ) != -1 ) { def2 = def2_loc; } else { def2 = def2_inst; } +- if( access( def3_loc, F_OK ) != -1 ) { def3 = def3_loc; } else { def3 = def3_inst; } ++ def1 = getfilepath(def1_name); ++ def2 = getfilepath(def2_name); ++ def3 = getfilepath(def3_name); ++ ++ if (!def1 || !def2 || !def3) ++ { ++ fprintf(stderr, "One of %s, %s or %s cannot be found\n", ++ def1_name, def2_name, def3_name); ++ exit(1); ++ } + + stage1 = def1; + stage2 = def2; +-- +2.7.4 + diff --git a/package/raspberrypi-usbboot/Config.in.host b/package/raspberrypi-usbboot/Config.in.host new file mode 100644 index 0000000000..dce2fccd54 --- /dev/null +++ b/package/raspberrypi-usbboot/Config.in.host @@ -0,0 +1,12 @@ +config BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT + bool "host raspberrypi-usbboot" + depends on BR2_arm + help + This package builds and install the "rpiboot" tool for the + host machine. This tool allows to boot the Broadcom BCM + processor used in the RaspberryPi to boot over USB, and have + it expose a USB mass storage device in order to reflash the + built-in storage of the RaspberryPi (useful for the eMMC + built into the Compute module). + + https://github.com/raspberrypi/usbboot diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash new file mode 100644 index 0000000000..94860a9dab --- /dev/null +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 a8893f8a10522bd58866eb34e7f0d7731c43200d585f122681f428cdef76e676 raspberrypi-usbboot-f4e3f0f9a3c64d846ba53ec3367e33a4f9a7d051.tar.gz diff --git a/package/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk new file mode 100644 index 0000000000..7018617906 --- /dev/null +++ b/package/raspberrypi-usbboot/raspberrypi-usbboot.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# raspberrypi-usbboot +# +################################################################################ + +RASPBERRYPI_USBBOOT_VERSION = f4e3f0f9a3c64d846ba53ec3367e33a4f9a7d051 +RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) + +HOST_RASPBERRYPI_USBBOOT_DEPENDENCIES = host-libusb + +define HOST_RASPBERRYPI_USBBOOT_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) +endef + +define HOST_RASPBERRYPI_USBBOOT_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ + DESTDIR=$(HOST_DIR) install +endef + +$(eval $(host-generic-package)) From 55b1114f7202ff09a1d060a112760b1e2efa477c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 28 Nov 2016 23:20:58 +0100 Subject: [PATCH 1725/3392] sysklogd: fix build on musl This commit add a stack of small patches that make sysklogd build fine with the musl C library. Build with uClibc and glibc has been tested with those patches applied as well. The first patch is slightly rework (better description and capital letter to the title) in preparation for upstream submission. Fixes: http://autobuild.buildroot.net/results/8fa2bf73f983330884bce2e5ac31e01dee112ba9/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...place-deprecated-union-wait-with-int.patch | 28 +++++++ ...place-deprecated-union-wait-with-int.patch | 25 ------ .../0002-Fix-improper-header-includes.patch | 78 +++++++++++++++++++ .../0003-Remove-include-of-linux-time.h.patch | 50 ++++++++++++ ...d-written-klogctl-syscall-implementa.patch | 38 +++++++++ ...5-Add-missing-headers-for-open-flags.patch | 46 +++++++++++ ...yslogd.c-rename-dprintf-to-mydprintf.patch | 39 ++++++++++ 7 files changed, 279 insertions(+), 25 deletions(-) create mode 100644 package/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch delete mode 100644 package/sysklogd/0001-replace-deprecated-union-wait-with-int.patch create mode 100644 package/sysklogd/0002-Fix-improper-header-includes.patch create mode 100644 package/sysklogd/0003-Remove-include-of-linux-time.h.patch create mode 100644 package/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch create mode 100644 package/sysklogd/0005-Add-missing-headers-for-open-flags.patch create mode 100644 package/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch diff --git a/package/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch b/package/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch new file mode 100644 index 0000000000..d3fc0dc188 --- /dev/null +++ b/package/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch @@ -0,0 +1,28 @@ +From 76685540a7882926c54bc0d1a8945b7a6abffe40 Mon Sep 17 00:00:00 2001 +From: Ryan Coe +Date: Fri, 7 Oct 2016 19:42:40 -0700 +Subject: [PATCH] Replace deprecated union wait with int + +This is needed for compatibility with glibc >= 2.24. + +Signed-off-by: Ryan Coe +--- + syslogd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/syslogd.c b/syslogd.c +index ea73ea5..ace96c8 100644 +--- a/syslogd.c ++++ b/syslogd.c +@@ -2094,7 +2094,7 @@ void reapchild() + (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */ + wait ((int *)0); + #else +- union wait status; ++ int status; + + while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0) + ; +-- +2.7.4 + diff --git a/package/sysklogd/0001-replace-deprecated-union-wait-with-int.patch b/package/sysklogd/0001-replace-deprecated-union-wait-with-int.patch deleted file mode 100644 index c9a30e9924..0000000000 --- a/package/sysklogd/0001-replace-deprecated-union-wait-with-int.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 86fe87cdf097e6286e76eadcc9c11c79be6258f2 Mon Sep 17 00:00:00 2001 -From: Ryan Coe -Date: Fri, 7 Oct 2016 19:42:40 -0700 -Subject: [PATCH 1/1] replace deprecated union wait with int - -Signed-off-by: Ryan Coe ---- - syslogd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/syslogd.c b/syslogd.c -index ea73ea5da5e935bb8cab328559f950cd3afc2d20..ace96c8be40f50d123120c0586a384a298212245 100644 ---- a/syslogd.c -+++ b/syslogd.c -@@ -2094,7 +2094,7 @@ void reapchild() - (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */ - wait ((int *)0); - #else -- union wait status; -+ int status; - - while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0) - ; --- -2.9.3 diff --git a/package/sysklogd/0002-Fix-improper-header-includes.patch b/package/sysklogd/0002-Fix-improper-header-includes.patch new file mode 100644 index 0000000000..3518ef0270 --- /dev/null +++ b/package/sysklogd/0002-Fix-improper-header-includes.patch @@ -0,0 +1,78 @@ +From 7a043f619a91fbb998863c08e3e5e94a4747b11d Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 28 Nov 2016 23:07:36 +0100 +Subject: [PATCH] Fix improper header includes + +When building with the musl C library, a number of warnings indicate +that sysklogd is directly including headers that are considered internal +to the C library: + + - Instead of including , should be included. + + - Instead of including , should be included. + + - Instead of includeing , should be included. + +Signed-off-by: Thomas Petazzoni +--- + klogd.c | 2 +- + ksym_mod.c | 2 +- + syslog.c | 2 +- + syslogd.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/klogd.c b/klogd.c +index 6cc80ed..a173353 100644 +--- a/klogd.c ++++ b/klogd.c +@@ -260,7 +260,7 @@ + #include + #include + #include +-#include ++#include + #include + #if !defined(__GLIBC__) + #include +diff --git a/ksym_mod.c b/ksym_mod.c +index 68cd6b6..2e69d65 100644 +--- a/ksym_mod.c ++++ b/ksym_mod.c +@@ -113,7 +113,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "module.h" + #if !defined(__GLIBC__) +diff --git a/syslog.c b/syslog.c +index bdb3ff2..f96b43c 100644 +--- a/syslog.c ++++ b/syslog.c +@@ -55,7 +55,7 @@ static char sccsid[] = "@(#)syslog.c 5.28 (Berkeley) 6/27/90"; + #include + #include + #include +-#include ++#include + #include + #if 0 + #include "syslog.h" +diff --git a/syslogd.c b/syslogd.c +index ace96c8..b5e8054 100644 +--- a/syslogd.c ++++ b/syslogd.c +@@ -521,7 +521,7 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88"; + #define SYSLOG_NAMES + #include + #include +-#include ++#include + #include + #include + #include +-- +2.7.4 + diff --git a/package/sysklogd/0003-Remove-include-of-linux-time.h.patch b/package/sysklogd/0003-Remove-include-of-linux-time.h.patch new file mode 100644 index 0000000000..374d89bd05 --- /dev/null +++ b/package/sysklogd/0003-Remove-include-of-linux-time.h.patch @@ -0,0 +1,50 @@ +From f4926a61ba2d3766255dd996bf0315bc8fa0c528 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 28 Nov 2016 23:09:03 +0100 +Subject: [PATCH] Remove include of + +klogd.c and ksym_mod.c currently include if GLIBC is not +defined. Unfortunately, this breaks badly with the musl C library: this +C library is not glibc so it doesn't define GLIBC, but it does have a +definition of "struct timespec" in its header file, which conflict with +the one provided by the Linux kernel headers. + +So, this commit simply gets rid of this header inclusion. + +Signed-off-by: Thomas Petazzoni +--- + klogd.c | 3 --- + ksym_mod.c | 3 --- + 2 files changed, 6 deletions(-) + +diff --git a/klogd.c b/klogd.c +index a173353..6505d96 100644 +--- a/klogd.c ++++ b/klogd.c +@@ -262,9 +262,6 @@ + #include + #include + #include +-#if !defined(__GLIBC__) +-#include +-#endif /* __GLIBC__ */ + #include + #include + #include +diff --git a/ksym_mod.c b/ksym_mod.c +index 2e69d65..6e26da1 100644 +--- a/ksym_mod.c ++++ b/ksym_mod.c +@@ -116,9 +116,6 @@ + #include + #include + #include "module.h" +-#if !defined(__GLIBC__) +-#include +-#endif /* __GLIBC__ */ + #include + #include + #include +-- +2.7.4 + diff --git a/package/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch b/package/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch new file mode 100644 index 0000000000..548f160718 --- /dev/null +++ b/package/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch @@ -0,0 +1,38 @@ +From fe92a7a8197241f7d6b28ea3c8214bb6d2c7fda4 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 28 Nov 2016 23:10:55 +0100 +Subject: [PATCH] Remove bogus hand-written klogctl() syscall implementation + +The way the hand-written klogctl() syscall is written cannot compile, as +_syscall3() is just a function provided by the C library, so calling it +outside of a function doesn't build. + +Since the musl C library provides a klogctl() function, we don't need +this hand-written system call anyway. + +Signed-off-by: Thomas Petazzoni +--- + klogd.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/klogd.c b/klogd.c +index 6505d96..9219671 100644 +--- a/klogd.c ++++ b/klogd.c +@@ -274,13 +274,8 @@ + + #define __LIBRARY__ + #include +-#if !defined(__GLIBC__) +-# define __NR_ksyslog __NR_syslog +-_syscall3(int,ksyslog,int, type, char *, buf, int, len); +-#else + #include + #define ksyslog klogctl +-#endif + + #define LOG_BUFFER_SIZE 4096 + #define LOG_LINE_LENGTH 1000 +-- +2.7.4 + diff --git a/package/sysklogd/0005-Add-missing-headers-for-open-flags.patch b/package/sysklogd/0005-Add-missing-headers-for-open-flags.patch new file mode 100644 index 0000000000..1a7ad84868 --- /dev/null +++ b/package/sysklogd/0005-Add-missing-headers-for-open-flags.patch @@ -0,0 +1,46 @@ +From 0dff338a704f4ad11a2b78871e1f2a0b8030b4d2 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 28 Nov 2016 23:12:37 +0100 +Subject: [PATCH] Add missing headers for open() flags + +Both pidfile.c and syslog.c use open() and its flags, but forgets to +include all relevant headers, causing build failures with the musl C +library. + +Signed-off-by: Thomas Petazzoni +--- + pidfile.c | 2 ++ + syslog.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/pidfile.c b/pidfile.c +index e0959a0..14de56f 100644 +--- a/pidfile.c ++++ b/pidfile.c +@@ -26,8 +26,10 @@ + + #include + #include ++#include + #include + #include ++#include + #include + #include + #include +diff --git a/syslog.c b/syslog.c +index f96b43c..d09e7aa 100644 +--- a/syslog.c ++++ b/syslog.c +@@ -57,6 +57,8 @@ static char sccsid[] = "@(#)syslog.c 5.28 (Berkeley) 6/27/90"; + #include + #include + #include ++#include ++#include + #if 0 + #include "syslog.h" + #include "pathnames.h" +-- +2.7.4 + diff --git a/package/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch b/package/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch new file mode 100644 index 0000000000..a1fb5331e4 --- /dev/null +++ b/package/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch @@ -0,0 +1,39 @@ +From 68213f6902d291d2ba1626fd950fd7d4a1329d33 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 28 Nov 2016 23:13:08 +0100 +Subject: [PATCH] syslogd.c: rename dprintf() to mydprintf() + +There is an existing kludge in syslogd.c to rename all dprintf() +function calls and its definition to mydprintf(). This kludge is only +applied when the glibc C library is used (i.e when GLIBC is defined), +because glibc also provides a dprintf() function, with a different +signature and behavior. + +However, the musl C library also provides the dprintf() function (with +the same signature as the one in glibc, obviously), but does not define +the GLIBC macro, causing a conflicting definition of dprintf. + +This commit fixes that by having the rename kludge used unconditionally. + +Signed-off-by: Thomas Petazzoni +--- + syslogd.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/syslogd.c b/syslogd.c +index b5e8054..22a9ed5 100644 +--- a/syslogd.c ++++ b/syslogd.c +@@ -818,9 +818,7 @@ void doexit(int sig); + void init(); + void cfline(char *line, register struct filed *f); + int decode(char *name, struct code *codetab); +-#if defined(__GLIBC__) + #define dprintf mydprintf +-#endif /* __GLIBC__ */ + static void dprintf(char *, ...); + static void allocate_log(void); + void sighup_handler(); +-- +2.7.4 + From 9dd5b1aafbf1f52a3cfe7ecb7804c3280b61ad11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 6 Dec 2016 11:56:42 +0100 Subject: [PATCH 1726/3392] package/shairport-sync: bump version to 2.8.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/shairport-sync/shairport-sync.hash | 2 +- package/shairport-sync/shairport-sync.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash index dfe0d05ea6..45bce1016a 100644 --- a/package/shairport-sync/shairport-sync.hash +++ b/package/shairport-sync/shairport-sync.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d19f6cd3d53f5010abcf24cc20a301934372b41efc3ff2a2e4e7d8fa49200cdc shairport-sync-2.8.5.tar.gz +sha256 2e73416ac8fdda1657034afaa143f1710852ebed06e0aa43dafc2b7dc5eb653d shairport-sync-2.8.6.tar.gz diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 7af030bd58..00d6a695b8 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 2.8.5 +SHAIRPORT_SYNC_VERSION = 2.8.6 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c From d767ff85f2bf9b5e1fbcbad22f0cab6a6a606e6c Mon Sep 17 00:00:00 2001 From: Phil Eichinger Date: Tue, 6 Dec 2016 15:32:37 +0100 Subject: [PATCH 1727/3392] ffmpeg: fix build for ffplay Upstream has dropped SDL support for ffplay in favor of SDL2. This results in silently not building ffplay even if it is selected in Buildroot config. [Peter: propagate !static dependency from sdl2] Signed-off-by: Phil Eichinger Signed-off-by: Peter Korsgaard --- package/ffmpeg/Config.in | 6 +++++- package/ffmpeg/ffmpeg.mk | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index e8135953b2..b5850db722 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -41,12 +41,16 @@ config BR2_PACKAGE_FFMPEG_FFMPEG config BR2_PACKAGE_FFMPEG_FFPLAY bool "Build ffplay" select BR2_PACKAGE_FFMPEG_SWSCALE - select BR2_PACKAGE_SDL + select BR2_PACKAGE_SDL2 + depends on !BR2_STATIC_LIBS # sdl2 help FFplay is a very simple and portable media player using the FFmpeg libraries and the SDL library. It is mostly used as a testbed for the various FFmpeg APIs. +comment "ffplay needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_FFMPEG_FFSERVER bool "Build ffserver" depends on BR2_USE_MMU # fork() diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 699de2ac8f..a681192424 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -80,9 +80,9 @@ FFMPEG_CONF_OPTS += --disable-ffmpeg endif ifeq ($(BR2_PACKAGE_FFMPEG_FFPLAY),y) -FFMPEG_DEPENDENCIES += sdl +FFMPEG_DEPENDENCIES += sdl2 FFMPEG_CONF_OPTS += --enable-ffplay -FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config +FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl2-config else FFMPEG_CONF_OPTS += --disable-ffplay endif From 34d34e13058d75875e7a90ca1866133fbaeb0c6e Mon Sep 17 00:00:00 2001 From: Rahul Jain Date: Tue, 6 Dec 2016 16:12:28 +0530 Subject: [PATCH 1728/3392] mbedtls: bump to version 2.4.0 This change also fixes http://autobuild.buildroot.net/results/27b/27b35d03b576392955e21498ac1e62590ef5f5db/build-end.log Signed-off-by: Rahul Jain Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 2 +- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 2d0fa11a97..5f9786c292 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,2 +1,2 @@ # From https://tls.mbed.org/tech-updates/releases/mbedtls-2.3.0-2.1.5-and-1.3.17-released -sha256 590734c8bc8b3ac48e9123d44bf03562e91f8dce0d1ac2615c318c077f3215b2 mbedtls-2.3.0-apache.tgz +sha256 c1c3559ed39f7a1b1550c4cf4ccb918bf239301a3311d98dda92bed8a25b7f0d mbedtls-2.4.0-apache.tgz diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index d55e16b0b6..a8bd61f129 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -5,7 +5,7 @@ ################################################################################ MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.3.0 +MBEDTLS_VERSION = 2.4.0 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From 90605b8fe72e61ad8224b7f5c2dde7a5dedbf791 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Dec 2016 22:37:24 +0100 Subject: [PATCH 1729/3392] Makefile: move SED definition into the main Makefile Since commit f71a621d91ec27f175fc84012962f88b1107305f, we are using the SED variable in the main Makefile. However, this variable is only defined in package/Makefile.in, which gets included only when a configuration is defined. This means that, if you do: $ make menuconfig savedefconfig without a configuration defined, it fails with: /bin/bash: /BR2_DEFCONFIG=/d: No such file or directory Makefile:898: recipe for target 'savedefconfig' failed make[1]: *** [savedefconfig] Error 127 This issue affects users of the "buildroot-submodule" project, which does menuconfig+savedefconfig automatically. They worked around this issue in commit https://github.com/Openwide-Ingenierie/buildroot-submodule/commit/d12676b608a58529c6b551aa176464166a200428, but really "make menuconfig savedefconfig" should work out of the box. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- Makefile | 1 + package/Makefile.in | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 00bcd0f49f..b80b9e1dcb 100644 --- a/Makefile +++ b/Makefile @@ -322,6 +322,7 @@ HOSTLN := $(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln) HOSTNM := $(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm) HOSTOBJCOPY := $(shell which $(HOSTOBJCOPY) || type -p $(HOSTOBJCOPY) || echo objcopy) HOSTRANLIB := $(shell which $(HOSTRANLIB) || type -p $(HOSTRANLIB) || echo ranlib) +SED := $(shell which sed || type -p sed) -i -e export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTLD export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE diff --git a/package/Makefile.in b/package/Makefile.in index 4b3368f49b..688d5b1610 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -213,7 +213,6 @@ endif INSTALL := $(shell which install || type -p install) FLEX := $(shell which flex || type -p flex) BISON := $(shell which bison || type -p bison) -SED := $(shell which sed || type -p sed) -i -e UNZIP := $(shell which unzip || type -p unzip) -q APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(QUIET),-s) From df4044abfeed00ffb053ab65aff2e14b90887a18 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Dec 2016 17:36:17 +0100 Subject: [PATCH 1730/3392] gcc: disallow 4.8.x for ARMv8 cores Notice: A53/A57 were in fact supported in aarch64 mode in 4.8 (in aarch32 mode only from 4.9), but it doesn't handle --with-abi, and as there is unlikely to be any aarch64 based legacy projects unwilling to use a newer GCC version it is simpler to disallow it for all modes. Signed-off-by: Peter Korsgaard Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gcc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 0fc1ec42db..62da5b5324 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -13,7 +13,7 @@ choice depends on !BR2_microblaze && !BR2_arc \ && !BR2_powerpc64le && !BR2_nios2 && !BR2_bfin # Broken or unsupported ARM cores - depends on !BR2_cortex_a12 && !BR2_cortex_a17 + depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8 # Broken or unsupported PPC cores depends on !BR2_powerpc_power8 # Unsupported MIPS cores From 5310184e9f9730ca5cb8a2cfdd84527488109462 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Dec 2016 17:36:18 +0100 Subject: [PATCH 1731/3392] gcc: disallow 4.9.x for ARM cortex-a72 a72 support was only added in the 5.1 cycle. Signed-off-by: Peter Korsgaard Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gcc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 62da5b5324..0f6ced5b38 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -41,7 +41,7 @@ choice # Broken or unsupported architectures depends on !BR2_arc && !BR2_bfin # Broken or unsupported ARM cores - depends on !BR2_cortex_a17 + depends on !BR2_cortex_a17 && !BR2_cortex_a72 # Unsupported MIPS cores depends on !BR2_mips_interaptiv # Unsupported for MIPS R5 From 36e2a2c0009e0e7d978101fd66680ebb7d4fcea2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Dec 2016 17:42:18 +0100 Subject: [PATCH 1732/3392] toolchain-external: disallow sourcery codebench ARM toolchain for ARMv8 cores This toolchain uses GCC 4.8.x, which doesn't support the ARMv8 cores. Signed-off-by: Peter Korsgaard Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .../toolchain-external-codesourcery-arm/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in index 3cdfc860ab..6331873dbd 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in @@ -4,7 +4,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABI # Unsupported ARM cores - depends on !BR2_cortex_a12 && !BR2_cortex_a17 + depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8 depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP From f5389d52272e26207690cfb41f6118c8bc47fcf2 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Tue, 6 Dec 2016 00:07:16 +0100 Subject: [PATCH 1733/3392] gcc: fix powerpc64le arch config name Buildroot references powerpc64 little endian as BR2_powerpc64le and not BR2_powerpc64el. Signed-off-by: Erico Nunes Signed-off-by: Peter Korsgaard --- package/gcc/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 0f6ced5b38..4c3815b91e 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -25,7 +25,7 @@ choice # Unsupported for MIPS R6 depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 # musl ppc64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 @@ -51,7 +51,7 @@ choice # musl microblaze unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe)) # musl ppc64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) # musl mips64 unsupported depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102 @@ -62,7 +62,7 @@ choice # Broken or unsupported architectures depends on !BR2_arc && !BR2_bfin # musl ppc64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64el)) + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) # Unsupported MIPS cores depends on !BR2_mips_interaptiv && !BR2_mips_m5150 && \ !BR2_mips_m6250 && !BR2_mips_i6400 && !BR2_mips_p6600 From d64627ed4809b6d8677a3fcc0a2af727f2d20908 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Dec 2016 22:11:45 +0100 Subject: [PATCH 1734/3392] package/ffmpeg: bump version to 3.2.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 aa9f0f738b..b1ad2f7d69 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 1ecf93da5d601e6fb3096c65cbe33fdaf042d690a3c50c4efadb0a9b74f2badf ffmpeg-3.2.1.tar.xz +sha256 3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc ffmpeg-3.2.2.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index a681192424..7e98ef6754 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.2.1 +FFMPEG_VERSION = 3.2.2 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From b754237520a4795eadc0edec768b267dd598ab0e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Dec 2016 12:12:33 +0100 Subject: [PATCH 1735/3392] cmake: adjust dependencies added for libuv Commit 1ffcf364b6e9894a876dc581a090f87685945412 updated cmake to 3.7.0, which requires selecting the libuv package. At the time, the libuv package only depended on BR2_TOOLCHAIN_HAS_THREADS. However, later on, it was changed in master to depend on BR2_TOOLCHAIN_HAS_THREADS_NPTL, a change which was not taken into account in the cmake 3.7.0 bump that was merged in the next branch. Due to this, builds of cmake is attempted on architectures that don't provide NPTL thread support, causing a build failure. This commit fixes that by adjusting the dependency. Fixes: http://autobuild.buildroot.net/results/16a5e1cbb57c0124537c4f3dc0807ba1eaa975ec/ Signed-off-by: Thomas Petazzoni --- package/cmake/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 716d80ec55..2706db51fa 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -26,7 +26,7 @@ config BR2_PACKAGE_CMAKE_CTEST depends on BR2_USE_WCHAR # libarchive depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_USE_MMU # libuv help CTest is a testing tool distributed as a part of CMake. It @@ -37,9 +37,9 @@ config BR2_PACKAGE_CMAKE_CTEST http://www.cmake.org/ -comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, threads" +comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL From 04f3ec69319f02281ec0b379c9fae9f3ef3ea7e1 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Wed, 7 Dec 2016 15:49:05 +0100 Subject: [PATCH 1736/3392] package/easydbus: new package Signed-off-by: Marcin Niestroj Reviewed-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/easydbus/Config.in | 14 ++++++++++++++ package/easydbus/easydbus.hash | 2 ++ package/easydbus/easydbus.mk | 13 +++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 package/easydbus/Config.in create mode 100644 package/easydbus/easydbus.hash create mode 100644 package/easydbus/easydbus.mk diff --git a/package/Config.in b/package/Config.in index 664d0d96e1..c14575c4c4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -521,6 +521,7 @@ menu "Lua libraries/modules" source "package/cosmo/Config.in" source "package/coxpcall/Config.in" source "package/dado/Config.in" + source "package/easydbus/Config.in" source "package/lbase64/Config.in" source "package/ljlinenoise/Config.in" source "package/ljsyscall/Config.in" diff --git a/package/easydbus/Config.in b/package/easydbus/Config.in new file mode 100644 index 0000000000..51519d61d2 --- /dev/null +++ b/package/easydbus/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_EASYDBUS + bool "easydbus" + select BR2_PACKAGE_LIBGLIB2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + help + Easy to use DBus library for Lua. + + https://github.com/mniestroj/easydbus + +comment "easydbus needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/easydbus/easydbus.hash b/package/easydbus/easydbus.hash new file mode 100644 index 0000000000..0ef73f23f9 --- /dev/null +++ b/package/easydbus/easydbus.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 3e5907664f5dfebbc0e652faf87564fd58dbd639742f442c100ef2db8be46e52 easydbus-59c340f2cd2c92ded82f9d4436866847f295faab.tar.gz diff --git a/package/easydbus/easydbus.mk b/package/easydbus/easydbus.mk new file mode 100644 index 0000000000..376b09bfca --- /dev/null +++ b/package/easydbus/easydbus.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# easydbus +# +################################################################################ + +EASYDBUS_VERSION = 59c340f2cd2c92ded82f9d4436866847f295faab +EASYDBUS_SITE = $(call github,mniestroj,easydbus,$(EASYDBUS_VERSION)) +EASYDBUS_DEPENDENCIES = luainterpreter libglib2 +EASYDBUS_LICENSE = MIT +EASYDBUS_LICENSE_FILES = LICENSE + +$(eval $(cmake-package)) From 7485ff4607063faa825ede80d81452fa974ed873 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 7 Dec 2016 19:41:20 +0100 Subject: [PATCH 1737/3392] pkg-autotools: search in the entire source directory for ltmain.sh Fixes static linking of berkeleydb package, where ltmain.sh is not in the sub-directory that contains configure. Always search the complete source directory. Fixes: http://autobuild.buildroot.net/results/f0a96f671644d9f9efcf245b354affdc84f7d7da Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/pkg-autotools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 00822e2a9d..f7b848888b 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -59,7 +59,7 @@ endef # define LIBTOOL_PATCH_HOOK @$(call MESSAGE,"Patching libtool") - $(Q)for i in `find $($(PKG)_SRCDIR) -name ltmain.sh`; do \ + $(Q)for i in `find $($(PKG)_DIR) -name ltmain.sh`; do \ ltmain_version=`sed -n '/^[ \t]*VERSION=/{s/^[ \t]*VERSION=//;p;q;}' $$i | \ sed -e 's/\([0-9]*\.[0-9]*\).*/\1/' -e 's/\"//'`; \ ltmain_patchlevel=`sed -n '/^[ \t]*VERSION=/{s/^[ \t]*VERSION=//;p;q;}' $$i | \ From a5d23d4059cdc85956658ca6fca1dc86aa170029 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Dec 2016 22:08:09 +0100 Subject: [PATCH 1738/3392] php: disable FPM interface on Sparc Building fails with "Sparc v8 and predecessors are not and will not be supported (see bug report 53310)", so we disable FPM on Sparc. Fixes: http://autobuild.buildroot.net/results/6a86f6cf07f6b6dccd7bfaab6d7682f9faf3527b/ Signed-off-by: Thomas Petazzoni --- package/php/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/php/Config.in b/package/php/Config.in index 3020bccd8f..57dabc435f 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -29,6 +29,8 @@ config BR2_PACKAGE_PHP_SAPI_CLI config BR2_PACKAGE_PHP_SAPI_FPM bool "FPM interface" depends on BR2_USE_MMU + # "Sparc v8 and predecessors are not and will not be supported" + depends on !BR2_sparc help PHP-FPM (FastCGI Process Manager) From 8dbd27fe48fdcdfee4552c2fb58e422974152daa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Dec 2016 22:22:20 +0100 Subject: [PATCH 1739/3392] pru-software-support: fix legal info again Commit 00810e0ea3976c5b26a7fd264870f15e17a2eaa2 still didn't fix the license information properly, so this is a new commit (properly tested this time) fixing the license information. Fixes: http://autobuild.buildroot.net/results/ece1407b9f32472fb55823bb554dc026546cd26d/ Signed-off-by: Thomas Petazzoni --- package/pru-software-support/pru-software-support.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pru-software-support/pru-software-support.mk b/package/pru-software-support/pru-software-support.mk index 16d0b9743c..06983c275d 100644 --- a/package/pru-software-support/pru-software-support.mk +++ b/package/pru-software-support/pru-software-support.mk @@ -7,7 +7,7 @@ PRU_SOFTWARE_SUPPORT_VERSION = 804b548e69ef9fdf44445f6d0968d81cb8a1e7b4 PRU_SOFTWARE_SUPPORT_SITE = git://git.ti.com/pru-software-support-package/pru-software-support-package.git PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3c, GPLv2, Public Domain -PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU_Package-v4.0-Manifest.html +PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v4.0-Manifest.html PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru From 041c717ec8c251b7bca675086510840f02274967 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Dec 2016 22:37:19 +0100 Subject: [PATCH 1740/3392] lttng-tools: fix build on musl Add patch to add a missing include to fix the build on musl. Fixes: http://autobuild.buildroot.net/results/ce0b438ca4dcf7ccef95c7050305d8cd58fbb24a/ Signed-off-by: Thomas Petazzoni --- ...01-Fix-Add-missing-pthread.h-include.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/lttng-tools/0001-Fix-Add-missing-pthread.h-include.patch diff --git a/package/lttng-tools/0001-Fix-Add-missing-pthread.h-include.patch b/package/lttng-tools/0001-Fix-Add-missing-pthread.h-include.patch new file mode 100644 index 0000000000..29706afc61 --- /dev/null +++ b/package/lttng-tools/0001-Fix-Add-missing-pthread.h-include.patch @@ -0,0 +1,29 @@ +From c948391121f2eb411bc7d2049d96f267bfa643d8 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 5 Dec 2016 15:39:26 -0500 +Subject: [PATCH] Fix: Add missing pthread.h include + +Some libc like musl and uClibc requires explicit includes of pthread.h + +Signed-off-by: Michael Jeanson +[Thomas: taken from lttng mailing list.] +Signed-off-by: Thomas Petazzoni +--- + src/common/defaults.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common/defaults.h b/src/common/defaults.h +index 27f1ddc..37d222a 100644 +--- a/src/common/defaults.h ++++ b/src/common/defaults.h +@@ -20,6 +20,7 @@ + #ifndef _DEFAULTS_H + #define _DEFAULTS_H + ++#include + #include + + /* Default unix group name for tracing. */ +-- +2.7.4 + From 5382bac7c6e8dc94aa8cc42191815baeec1db911 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Dec 2016 22:50:14 +0100 Subject: [PATCH 1741/3392] uhttpd: add patch to remove -Werror Fixes: http://autobuild.buildroot.net/results/febbd094090e14fe7a79e6f691c290075da4fd59/ Signed-off-by: Thomas Petazzoni --- package/uhttpd/0001-Remove-Werror.patch | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/uhttpd/0001-Remove-Werror.patch diff --git a/package/uhttpd/0001-Remove-Werror.patch b/package/uhttpd/0001-Remove-Werror.patch new file mode 100644 index 0000000000..67028cfa2c --- /dev/null +++ b/package/uhttpd/0001-Remove-Werror.patch @@ -0,0 +1,33 @@ +From ac52380eeca27e1e2e7eb5fb9d39059dbe58b919 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 7 Dec 2016 22:48:27 +0100 +Subject: [PATCH] Remove -Werror + +-Werror might cause build failures with newer versions of gcc or C + libraries, not tested by upstream, for example: + + # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" + ^ +cc1: all warnings being treated as errors + +Signed-off-by: Thomas Petazzoni +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ae8ba4..825342f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,7 +5,7 @@ PROJECT(uhttpd C) + INCLUDE (CheckFunctionExists) + + SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") +-ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -Os -Wall -Werror -Wmissing-declarations --std=gnu99 -g3) ++ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -Os -Wall -Wmissing-declarations --std=gnu99 -g3) + + OPTION(TLS_SUPPORT "TLS support" ON) + OPTION(LUA_SUPPORT "Lua support" ON) +-- +2.7.4 + From cb4a41c62e45c1942a603ec176ba7d6d9ee18b95 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 7 Dec 2016 23:24:07 +0100 Subject: [PATCH 1742/3392] madplay: fix build on noMMU platforms A recent change in uClibc-ng removed the MADV_* definitions for madvise(), but kept the madvise() function itself. This defeats the logic used in madplay: it checks if madvise() is available, and if it is, uses it and assumes the MADV_* definitions exist. This inconsistency has been reported to upstream uClibc-ng, but in the mean time, we can simply tell madplay to not use madvise(), which is anyway useless on noMMU platforms. Fixes: http://autobuild.buildroot.net/results/3291554ea013e5f4a8f3447e10e664dffa8b131b/ Signed-off-by: Thomas Petazzoni --- package/madplay/madplay.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk index 2606ac8d66..6b13819754 100644 --- a/package/madplay/madplay.mk +++ b/package/madplay/madplay.mk @@ -11,6 +11,14 @@ MADPLAY_LICENSE_FILES = COPYING COPYRIGHT MADPLAY_LIBTOOL_PATCH = NO MADPLAY_DEPENDENCIES = libmad libid3tag $(if $(BR2_PACKAGE_GETTEXT),gettext) +# Workaround a bug in uClibc-ng, which exposes madvise() but doesn't +# provide the corresponding MADV_* definitions. Bug reported at +# http://mailman.uclibc-ng.org/pipermail/devel/2016-December/001306.html. madvise() +# is anyway useless on noMMU. +ifeq ($(BR2_USE_MMU),) +MADPLAY_CONF_ENV += ac_cv_func_madvise=no +endif + # Check if ALSA is built, then we should configure after alsa-lib so # ./configure can find alsa-lib. ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y) From 520d9975bda643d2cdea6007baf0411c2ea622a5 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Wed, 7 Dec 2016 07:11:30 -0800 Subject: [PATCH 1743/3392] qt5connectivity: install examples Signed-off-by: Matt Kraai Signed-off-by: Thomas Petazzoni --- package/qt5/qt5connectivity/qt5connectivity.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 0f7257d390..bcbdd2ed8b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -54,12 +54,22 @@ define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin endef +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/bluetooth $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif endif ifeq ($(BR2_PACKAGE_NEARD),y) define QT5CONNECTIVITY_INSTALL_TARGET_NFC cp -dpf $(STAGING_DIR)/usr/lib/libQt5Nfc.so.* $(TARGET_DIR)/usr/lib endef +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/nfc $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif endif define QT5CONNECTIVITY_INSTALL_TARGET_CMDS @@ -67,6 +77,8 @@ define QT5CONNECTIVITY_INSTALL_TARGET_CMDS $(QT5CONNECTIVITY_INSTALL_TARGET_NFC) $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS) $(QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS) + $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES) + $(QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES) endef $(eval $(generic-package)) From 10fc02b984f6f8c06291f94e6dbef0b289fd3880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Tr=C3=A9dez?= Date: Wed, 7 Dec 2016 16:20:42 +0100 Subject: [PATCH 1744/3392] linux: generate KBUILD_BUILD_TIMESTAMP date whith LC_ALL=C MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix kernel reproducible build if a non-C locale is used on the host system. When building the Linux kernel, scripts/gen_initramfs_list.sh does 'date -d"$KBUILD_BUILD_TIMESTAMP" +%s'. In linux.mk, Buildroot sets KBUILD_BUILD_TIMESTAMP to "$(shell date -d @$(SOURCE_DATE_EPOCH))". For example, if LANG=fr_FR.UTF-8 is defined in the host system, it does not work: - LC_ALL=C date -d"$(LC_ALL=C date)" : ok - LC_ALL=C date -d"$(LC_ALL=fr_FR.UTF-8 date)" : error LANG/LC_ALL variables exported in the main Makefiles are not passed in the $(shell ...) sub-shells. Signed-off-by: Jean-Baptiste Trédez Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 7e826ccdf0..e75dcaa60d 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -99,7 +99,7 @@ LINUX_MAKE_ENV += \ KBUILD_BUILD_VERSION=1 \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$(shell date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" endif # Get the real Linux version, which tells us where kernel modules are From 586a3093b92809c1bacde4f45157d4d3b96fbaea Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Dec 2016 22:25:35 +0100 Subject: [PATCH 1745/3392] package/freeswitch: bump version to 1.6.13 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/freeswitch/freeswitch.hash | 4 ++-- package/freeswitch/freeswitch.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 5b888f523e..76966cf294 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,2 +1,2 @@ -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.12.tar.xz.sha256 -sha256 ae072ca2d96fd9ef59ca6f589f932048b088c7b469d46e468bb917371de24ff9 freeswitch-1.6.12.tar.xz +# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.13.tar.xz.sha256 +sha256 64a8a14fc5df92893d956868f144042891cc3e2d096bbf56241fec706635a8b7 freeswitch-1.6.13.tar.xz diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 12b0913447..ee3ff4fa88 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.6.12 +FREESWITCH_VERSION = 1.6.13 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases FREESWITCH_LICENSE = MPLv1.1, \ From 3eb51f16d2d24abeda8d27d3f1458afdb48db6d8 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Tue, 6 Dec 2016 00:07:15 +0100 Subject: [PATCH 1746/3392] efivar: fix comment after uClibc compatibility patch uClibc support was recently added to efivar through a small compatibility patch. This commit updates a comment in the efivar recipe to reflect this, as we no longer have glibc as the only supported C library. Signed-off-by: Erico Nunes Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/efivar/efivar.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index 913322e2f6..84735b8fb0 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -12,8 +12,8 @@ EFIVAR_DEPENDENCIES = popt EFIVAR_INSTALL_STAGING = YES # BINTARGETS is set to skip efivar-static which requires static popt, -# and since we depend on glibc, we will never be built in a -# static-only environment. +# and since we depend on dynamic libraries, efivar will never be built +# in a static-only environment. # -fPIC is needed at least on MIPS, otherwise fails to build shared # -library. EFIVAR_MAKE_OPTS = \ From 0474d89de7298b22bb242ac627471069bb0eeb2d Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Tue, 6 Dec 2016 00:07:17 +0100 Subject: [PATCH 1747/3392] efivar: introduce BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS efivar only makes sense on platforms that support UEFI. UEFI is only supported by some architectures at the moment, being mostly employed on platforms such as x86, x86_64 and aarch64. Some other platforms such as MIPS and PowerPC may have some unofficial UEFI support. UEFI is also limited to little endian architectures. efivar was being supported in Buildroot without architecture restrictions so far, however this has led to the creation of a number of hacks in the recipes, mostly for architectures that are not supported by UEFI. In order to avoid spending more time to debug these failures and maintaining more hacks for unsupported architectures, efivar can be restricted to that platforms where it makes sense and where it is more likely to receive some testing and actual usage. The existing hacks for the now unsupported architectures are removed, and the dependency is propagated to efibootmgr as it depends on efivar. Signed-off-by: Erico Nunes Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/efibootmgr/Config.in | 8 ++++---- package/efivar/Config.in | 14 ++++++++++---- package/efivar/efivar.mk | 6 ------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index cd4bda1d75..a4011d6a1d 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_EFIBOOTMGR bool "efibootmgr" + depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS # efivar depends on !BR2_STATIC_LIBS # efivar depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar depends on !BR2_TOOLCHAIN_USES_MUSL # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \ - !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII # efivar + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_EFIVAR help @@ -17,9 +17,9 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhinstaller/efibootmgr comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" + depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ BR2_TOOLCHAIN_USES_MUSL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \ - !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/efivar/Config.in b/package/efivar/Config.in index a97c766be4..0ec836007b 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -1,5 +1,12 @@ +config BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS + bool + depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 \ + || BR2_powerpc64le || BR2_mipsel || BR2_mips64el + default y + config BR2_PACKAGE_EFIVAR bool "efivar" + depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h # linux/nvme.h has been renamed to linux/nvme_ioctl.h since 4.4, @@ -8,8 +15,7 @@ config BR2_PACKAGE_EFIVAR # don't have that header file renamed, and that is causing build # failures. So, prevent this package to be built using those # toolchains. - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \ - !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS # doesn't build with musl due to lack of __bswap_constant_16 depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 @@ -20,9 +26,9 @@ config BR2_PACKAGE_EFIVAR https://github.com/rhinstaller/efivar comment "efivar needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" + depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ BR2_TOOLCHAIN_USES_MUSL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS && \ - !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII + depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index 84735b8fb0..c31d87b840 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -21,12 +21,6 @@ EFIVAR_MAKE_OPTS = \ BINTARGETS=efivar \ LDFLAGS="$(TARGET_LDFLAGS) -fPIC" -# Explicitly linking with shared libgcc is required on MicroBlaze and -# Nios II, otherwise it fails due to FDE encoding in static libgcc. -ifeq ($(BR2_microblaze)$(BR2_nios2),y) -EFIVAR_MAKE_OPTS += SOFLAGS="-shared -shared-libgcc" -endif - define EFIVAR_BUILD_CMDS # makeguids is an internal host tool and must be built separately with # $(HOST_CC), otherwise it gets cross-built. From bde3fbe36114a72b511905070fe8213a0a61d8a4 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Tue, 6 Dec 2016 00:07:18 +0100 Subject: [PATCH 1748/3392] efibootmgr: depends on wchar After commit 3ae07b4746 recently, efibootmgr now selects BR2_PACKAGE_GETTEXT if the toolchain requires it. gettext depends on wchar, so this dependency should be propagated as well. menuconfig currently complains loudly if you select efibootmgr, with an error such as: warning: (... && BR2_PACKAGE_EFIBOOTMGR ... && ) selects BR2_PACKAGE_GETTEXT which has unmet direct dependencies (BR2_USE_WCHAR) Signed-off-by: Erico Nunes Signed-off-by: Thomas Petazzoni --- package/efibootmgr/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index a4011d6a1d..57874fc426 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_EFIBOOTMGR depends on !BR2_TOOLCHAIN_USES_MUSL # efivar depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS + depends on BR2_USE_WCHAR # gettext select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_EFIVAR help @@ -16,10 +17,11 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhinstaller/efibootmgr -comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efibootmgr needs a glibc or uClibc toolchain w/ wchar, dynamic library, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ BR2_TOOLCHAIN_USES_MUSL || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS From c021b1329155fd1ff085dcb2c7e8a36850a391e5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Dec 2016 19:40:42 +0100 Subject: [PATCH 1749/3392] package/openvpn: bump version to 2.3.14 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 0c5cb09e94..a21608a4b6 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9cde0c8000fd32d5275adb55f8bb1d8ba429ff3de35f60a36e81f3859b7537e0 openvpn-2.3.13.tar.xz +sha256 f3a0d0eaf8d544409f76a9f2a238a0cd3dde9e1a9c1f98ac732a8b572bcdee98 openvpn-2.3.14.tar.xz diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index cd0a2d13e6..1765fb4ecd 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.3.13 +OPENVPN_VERSION = 2.3.14 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl From d6965f35a7f4693fd6abcae99224b74c38beaeb6 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 8 Dec 2016 15:51:49 +0100 Subject: [PATCH 1750/3392] DEVELOPERS: update my entry list Signed-off-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index e411b4255e..33ab31cb4c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -952,7 +952,10 @@ F: package/cc-tool/ F: package/ecryptfs-utils/ N: Marcin Niestroj +F: board/grinn/liteboard/ +F: configs/grinn_liteboard_defconfig F: package/argparse/ +F: package/easydbus/ F: package/rs485conf/ F: package/turbolua/ From e9539143e93b4bfdc7c0c8ff01590a4b11feaa63 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Thu, 8 Dec 2016 06:38:50 -0800 Subject: [PATCH 1751/3392] qt5xmlpatterns: install examples Signed-off-by: Matt Kraai Signed-off-by: Thomas Petazzoni --- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 31477a7c0b..0b518b0529 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -32,9 +32,20 @@ define QT5XMLPATTERNS_INSTALL_STAGING_CMDS endef ifeq ($(BR2_STATIC_LIBS),) -define QT5XMLPATTERNS_INSTALL_TARGET_CMDS +define QT5XMLPATTERNS_INSTALL_TARGET_LIBS cp -dpf $(STAGING_DIR)/usr/lib/libQt5XmlPatterns*.so.* $(TARGET_DIR)/usr/lib endef endif +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/xmlpatterns $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + +define QT5XMLPATTERNS_INSTALL_TARGET_CMDS + $(QT5XMLPATTERNS_INSTALL_TARGET_LIBS) + $(QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES) +endef + $(eval $(generic-package)) From f10fdd57f04a2f015c6aeb15a4b5947e48b8d67a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 8 Dec 2016 03:34:17 +0100 Subject: [PATCH 1752/3392] uclibc-ng-test: disable some parts of test-suite The math tests are experimental at the moment and require more adaptions before they can be enabled again. The locale tests are not compatible with musl toolchains, so disable them. Use latest git version from upstream for other bugfixes. Fixes: http://autobuild.buildroot.net/results/74e/74e7add310797772bc51f9ea9847408a8b05d643/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/uclibc-ng-test/uclibc-ng-test.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/uclibc-ng-test/uclibc-ng-test.mk b/package/uclibc-ng-test/uclibc-ng-test.mk index f6700a91ea..bb8b9ed086 100644 --- a/package/uclibc-ng-test/uclibc-ng-test.mk +++ b/package/uclibc-ng-test/uclibc-ng-test.mk @@ -4,11 +4,19 @@ # ################################################################################ -UCLIBC_NG_TEST_VERSION = 4ad1c23ae2eb30888cda520c739cc26150512487 +UCLIBC_NG_TEST_VERSION = 189b47080068d431302beec0e627dcaa5358eae8 UCLIBC_NG_TEST_SITE = git://uclibc-ng.org/git/uclibc-ng-test UCLIBC_NG_TEST_LICENSE = LGPLv2.1+ UCLIBC_NG_TEST_LICENSE_FILES = COPYING.LIB +# the math tests are recently synced from glibc and need more adaption before +# regular testing is possible +UCLIBC_NG_TEST_MAKE_ENV += NO_MATH=1 + +# locale tests are not compatible with musl, yet +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +UCLIBC_NG_TEST_MAKE_ENV += NO_LOCALE=1 +endif ifeq ($(BR2_USE_WCHAR),) UCLIBC_NG_TEST_MAKE_ENV += NO_WCHAR=1 endif From 6d97af8763a10180ff935a3dff90b217d79246e6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 7 Dec 2016 10:25:20 +0100 Subject: [PATCH 1753/3392] arch/Config.in.arm: only enable BR2_ARM_CPU_HAS_ARM for ARMv8 in 32bit mode Fixes: http://autobuild.buildroot.net/results/5e6/5e67cc067a06f7364cde1a8393ea72608fe7fef1/ A number of packages use BR2_ARM_CPU_HAS_ARM to know if the target handles classic A32 instructions, which is only true for ARMv8 cores when they are running in 32bit mode. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 743f6ca361..3c47bd7063 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -193,21 +193,21 @@ config BR2_cortex_a17 depends on !BR2_ARCH_IS_64 config BR2_cortex_a53 bool "cortex-A53" - select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_NEON select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a57 bool "cortex-A57" - select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_NEON select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a72 bool "cortex-A72" - select BR2_ARM_CPU_HAS_ARM + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_NEON select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 From 0976cd6cd64a128a2ac921e4f35f0e7cbe306692 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 7 Dec 2016 10:25:21 +0100 Subject: [PATCH 1754/3392] arch/Config.in.arm: only enable BR2_ARM_CPU_HAS_NEON for ARMv8 in 32bit mode A number of packages use BR2_ARM_CPU_HAS_NEON to know if the target handles aarch32 neon instructions, which is only true for ARMv8 cores when they are running in 32bit mode. Notice: These cores do support neon-like instructions using a different encoding in 64bit mode (it is a required part of ARMv8, similar to the FPU). Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 3c47bd7063..6ec6029d3b 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -194,21 +194,21 @@ config BR2_cortex_a17 config BR2_cortex_a53 bool "cortex-A53" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_NEON + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a57 bool "cortex-A57" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_NEON + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a72 bool "cortex-A72" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 - select BR2_ARM_CPU_HAS_NEON + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL From 933732b82b148cbf7e79c77d85810528787ef1e7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 7 Dec 2016 10:25:22 +0100 Subject: [PATCH 1755/3392] arch/Config.in.arm: support thumb2 instructions for ARMv8 in 32bit mode The ARMv8 cores all support thumb2 instructions when running in aarch32 mode. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- arch/Config.in.arm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 6ec6029d3b..2617976f13 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -195,6 +195,7 @@ config BR2_cortex_a53 bool "cortex-A53" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL @@ -202,6 +203,7 @@ config BR2_cortex_a57 bool "cortex-A57" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL @@ -209,6 +211,7 @@ config BR2_cortex_a72 bool "cortex-A72" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8 select BR2_ARCH_HAS_MMU_OPTIONAL From 6bf74a11246ad70e8075db10c4d72ffa73ab62c7 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 8 Dec 2016 12:11:11 -0800 Subject: [PATCH 1756/3392] package/xen: Bump Xen to 4.7.1 Signed-off-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 602e6c7dcf..c3df2431e8 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623 xen-4.7.0.tar.gz +sha256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe xen-4.7.1.tar.gz diff --git a/package/xen/xen.mk b/package/xen/xen.mk index e2c797f311..7d32e52702 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.7.0 +XEN_VERSION = 4.7.1 XEN_SITE = http://bits.xensource.com/oss-xen/release/$(XEN_VERSION) XEN_LICENSE = GPLv2 XEN_LICENSE_FILES = COPYING From 447d364144cad9e02f01d8cfefe3e0bc43cbf2bc Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Wed, 26 Oct 2016 13:18:04 -0400 Subject: [PATCH 1757/3392] systemd: don't build systemd-firstboot by default systemd-firstboot is never invoked since systemd's first boot detection logic checks whether /etc/machine-id exists. Since the file is created automatically by systemd.mk, systemd will never detect first boot and therefore the systemd-firstboot.service unit file will never get run. Additionally, if /etc/machine-id is removed to allow systemd-firstboot to run, it interactively prompts for the system locale. This makes it seem unlikely that an embedded system would want to use it. Signed-off-by: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index ddaf3e23b0..1aedb7b4a4 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -106,7 +106,6 @@ config BR2_PACKAGE_SYSTEMD_COREDUMP config BR2_PACKAGE_SYSTEMD_FIRSTBOOT bool "enable firstboot support" - default y help systemd-firstboot initializes the most basic system settings interactively on the first boot. From a27f8c80462b3f28b741b5d3a57f3346a2321252 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 8 Dec 2016 22:55:24 +0100 Subject: [PATCH 1758/3392] package/efl: bump to version 1.18.4 Bug fix release: https://www.enlightenment.org/news/efl-1.18.4 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/efl/efl.hash | 4 ++-- package/efl/efl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/efl/efl.hash b/package/efl/efl.hash index 4077ddd436..5d7a90d680 100644 --- a/package/efl/efl.hash +++ b/package/efl/efl.hash @@ -1,2 +1,2 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.3.tar.xz.sha256 -sha256 0748ec0847f543d96b149cb3a84e6438724e827a38d530922ecb4bd59d3e64c0 efl-1.18.3.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.4.tar.xz.sha256 +sha256 39ebc07e37437d6ecdeb0f645783484e28a882b38f7e619ad12c2bf9b5548025 efl-1.18.4.tar.xz diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 6ddd454e9b..e08f252a60 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.18.3 +EFL_VERSION = 1.18.4 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+ From 0018d7d6ba436a59875328fb3f372aff1888bff8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 9 Dec 2016 00:00:38 +0100 Subject: [PATCH 1759/3392] rpm: add patches to fix bfd.h related build issues This commit adds two patches to the rpm package to fix two separate but related build issues: - The first patch fixes a build that occurs when rpm is built after elfutils, but without binutils. In this case, dwarf.h is present, so rpm enables the build of a number of additional tools. But one of them uses bfd.h, provided by binutils, without checking for its existence. So the first patch fixes that by checking for bfd.h existence before enabling the tool. Fixes: http://autobuild.buildroot.net/results/810/810e24cab65f67d143da29c78c0f89d37a851cd7/build-end.log - The second patch fixes a build issue that occurs when rpm is built after both dwarf and binutils. In this case, bfd.h complains because config.h is not included. That's a weird and silly issue in bfd.h that the binutils developers don't want to fix, and you have to define PACKAGE or PACKAGE_VERSION before including bfd.h to use it outside of binutils. Fixes: http://autobuild.buildroot.net/results/362/362502f89631c9ba1d71906527674657ccff01ed/build-end.log Thanks a lot to James Knight for the initial investigation about the first issue. Signed-off-by: Thomas Petazzoni --- ...enable-disable-sepdebugcrcfix-buildi.patch | 55 +++++++++++++++++++ ...cfix.c-fix-build-with-recent-binutil.patch | 43 +++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 package/rpm/0001-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch create mode 100644 package/rpm/0002-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch diff --git a/package/rpm/0001-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch b/package/rpm/0001-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch new file mode 100644 index 0000000000..e1fd0697e6 --- /dev/null +++ b/package/rpm/0001-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch @@ -0,0 +1,55 @@ +From edadcf67980764c104c25c7c1a0ba91257b89698 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 8 Dec 2016 23:33:30 +0100 +Subject: [PATCH 1/2] Detect bfd.h to enable/disable sepdebugcrcfix building + +tools/sepdebugcrcfix includes , but this header from binutils +is not checked in the configure script. Due to this, sepdebugcrcfix is +attempted to be built even when is not available. This commit +addresses that by adding the appropriate configure check. + +This fixes the following build error: + +tools/sepdebugcrcfix.c:31:17: fatal error: bfd.h: No such file or directory +compilation terminated. +make[3]: *** [tools/sepdebugcrcfix.o] Error 1 + +Signed-off-by: Thomas Petazzoni +--- + Makefile.am | 2 ++ + configure.ac | 3 +++ + 2 files changed, 5 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 863138c..d8a68f0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -168,9 +168,11 @@ elfdeps_SOURCES = tools/elfdeps.c + elfdeps_LDADD = rpmio/librpmio.la + elfdeps_LDADD += @WITH_LIBELF_LIB@ @WITH_POPT_LIB@ + ++if HAS_BFD_H + rpmlibexec_PROGRAMS += sepdebugcrcfix + sepdebugcrcfix_SOURCES = tools/sepdebugcrcfix.c + sepdebugcrcfix_LDADD = @WITH_LIBELF_LIB@ ++endif # HAS_BFD_H + endif + endif + +diff --git a/configure.ac b/configure.ac +index c5ae701..b99ecb8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -242,6 +242,9 @@ AC_CHECK_HEADERS([dwarf.h], [ + ]) + AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes]) + ++AC_CHECK_HEADERS([bfd.h]) ++AM_CONDITIONAL(HAS_BFD_H, [test "${ac_cv_header_bfd_h}" = "yes"]) ++ + #================= + # Check for beecrypt library if requested. + AC_ARG_WITH(beecrypt, [ --with-beecrypt build with beecrypt support ],,[with_beecrypt=no]) +-- +2.7.4 + diff --git a/package/rpm/0002-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch b/package/rpm/0002-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch new file mode 100644 index 0000000000..bebe94511d --- /dev/null +++ b/package/rpm/0002-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch @@ -0,0 +1,43 @@ +From 65afab91444d4996a8e61d1e2d27d52e18417ef5 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 8 Dec 2016 23:45:55 +0100 +Subject: [PATCH 2/2] tools/sepdebugcrcfix.c: fix build with recent binutils + +Moderately recent binutils versions install a header that +checks if config.h is included. While this makes sense in binutils +itself, it does not outside. So the binutils developers have added a +check: if PACKAGE or PACKAGE_VERSION are defined, they assume you're +re-using bfd.h outside of binutils, and therefore including it without +including config.h is legit. + +So we take the same approch as numerous users of bfd.h: fake a PACKAGE +definition. See for example tools/perf/util/srcline.c in the Linux +kernel source tree. + +This fixes the following build error: + +In file included from tools/sepdebugcrcfix.c:31:0: +/home/test/autobuild/run/instance-0/output/host/usr/arc-buildroot-linux-uclibc/sysroot/usr/include/bfd.h:35:2: error: #error config.h must be included before this header + #error config.h must be included before this header + +Signed-off-by: Thomas Petazzoni +--- + tools/sepdebugcrcfix.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tools/sepdebugcrcfix.c b/tools/sepdebugcrcfix.c +index cd7fa02..e7b480f 100644 +--- a/tools/sepdebugcrcfix.c ++++ b/tools/sepdebugcrcfix.c +@@ -28,6 +28,8 @@ + #include + #include + #include ++/* Needed to please */ ++#define PACKAGE "rpm" + #include + + #define _(x) x +-- +2.7.4 + From 9b9fcd7062a5d39603fffb61b3e8e2c0b1932321 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 9 Dec 2016 00:04:05 +0100 Subject: [PATCH 1760/3392] rpm: add optional dependencies on elfutils and binutils Since these are detected by the configure script, we should explicit their dependencies in rpm.mk. Signed-off-by: Thomas Petazzoni --- package/rpm/rpm.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index accb625eb9..2e829d751a 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -65,6 +65,16 @@ else RPM_CONF_OPTS += --without-selinux endif +# For the elfutils and binutils dependencies, there are no +# configuration options to explicitly enable/disable them. +ifeq ($(BR2_PACKAGE_ELFUTILS),y) +RPM_DEPENDENCIES += elfutils +endif + +ifeq ($(BR2_PACKAGE_BINUTILS),y) +RPM_DEPENDENCIES += binutils +endif + # RPM, when using NLS, requires GNU gettext's _nl_msg_cat_cntr, which is not # provided in musl. ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) From 397fba1c05f3d44db624e7a2793efe1d94530af3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:45:12 -0300 Subject: [PATCH 1761/3392] linux-headers: bump 4.{8, 4, 1}.x and 3.{18, 12}.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9cdd5faa41..da1706815b 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -226,15 +226,15 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.84" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.104" if BR2_KERNEL_HEADERS_3_10 - default "3.12.67" if BR2_KERNEL_HEADERS_3_12 + default "3.12.68" if BR2_KERNEL_HEADERS_3_12 default "3.14.79" if BR2_KERNEL_HEADERS_3_14 - default "3.18.44" if BR2_KERNEL_HEADERS_3_18 + default "3.18.45" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.35" if BR2_KERNEL_HEADERS_4_1 - default "4.4.36" if BR2_KERNEL_HEADERS_4_4 + default "4.1.36" if BR2_KERNEL_HEADERS_4_1 + default "4.4.37" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.10" if BR2_KERNEL_HEADERS_4_7 - default "4.8.12" if BR2_KERNEL_HEADERS_4_8 + default "4.8.13" if BR2_KERNEL_HEADERS_4_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 5e21606599c2b53e66b003c334d0388a686390aa Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:45:13 -0300 Subject: [PATCH 1762/3392] linux: bump default to version 4.8.13 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 9ca9939d14..e432873ed9 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.12)" + bool "Latest version (4.8.13)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.8.13" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 309126dd607a1e024ab2831cffa8902f9365c5e1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 12:00:49 -0300 Subject: [PATCH 1763/3392] libinput: bump to version 1.5.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libinput/libinput.hash | 4 ++-- package/libinput/libinput.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index ea7bdf7b10..0345c136e8 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-November/031926.html -sha256 ba26e2bc64ed551eaef193178ed06b07b97a09ac6f4e442f5f15bbc3f3174682 libinput-1.5.2.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2016-December/032110.html +sha256 91206c523b4e7aeecf296d0b94276c61bea90b9260d198c8ee3a91eced10a6e3 libinput-1.5.3.tar.xz diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 765a3cb550..b07930534f 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.5.2 +LIBINPUT_VERSION = 1.5.3 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From 52f4942e7e5f4a1c9597db853fd2830b958c5f8f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 10:51:40 -0300 Subject: [PATCH 1764/3392] gtksourceview: bump to version 3.22.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gtksourceview/gtksourceview.hash | 4 ++-- package/gtksourceview/gtksourceview.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gtksourceview/gtksourceview.hash b/package/gtksourceview/gtksourceview.hash index 7a00cd1aba..f57fadc4e9 100644 --- a/package/gtksourceview/gtksourceview.hash +++ b/package/gtksourceview/gtksourceview.hash @@ -1,2 +1,2 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.22/gtksourceview-3.22.0.sha256sum: -sha256 70657f48732427984dce6cc812bdd3f2b701c0a49e0a0a08889705b3dadcf8e5 gtksourceview-3.22.0.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.22/gtksourceview-3.22.2.sha256sum: +sha256 6ce84231dd0931cc747708434ca2f344c65a092dd6e1a800283fe0748773af5e gtksourceview-3.22.2.tar.xz diff --git a/package/gtksourceview/gtksourceview.mk b/package/gtksourceview/gtksourceview.mk index 9ddce5a844..5e4ca0d22f 100644 --- a/package/gtksourceview/gtksourceview.mk +++ b/package/gtksourceview/gtksourceview.mk @@ -5,7 +5,7 @@ ################################################################################ GTKSOURCEVIEW_VERSION_MAJOR = 3.22 -GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).0 +GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).2 GTKSOURCEVIEW_SOURCE = gtksourceview-$(GTKSOURCEVIEW_VERSION).tar.xz GTKSOURCEVIEW_SITE = \ http://ftp.gnome.org/pub/gnome/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR) From 0a2ef1086f0a54de708087526286a43455577542 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 10:51:24 -0300 Subject: [PATCH 1765/3392] libunistring: bump to version 0.9.7 Add new GPLv2 license option. Unfortunately COPYING is GPLv3, so avoid it. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libunistring/libunistring.hash | 2 +- package/libunistring/libunistring.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libunistring/libunistring.hash b/package/libunistring/libunistring.hash index ba4b642dcb..15e35cb81c 100644 --- a/package/libunistring/libunistring.hash +++ b/package/libunistring/libunistring.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 2df42eae46743e3f91201bf5c100041540a7704e8b9abfd57c972b2d544de41b libunistring-0.9.6.tar.xz +sha256 2e3764512aaf2ce598af5a38818c0ea23dedf1ff5460070d1b6cee5c3336e797 libunistring-0.9.7.tar.xz diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index bb1641e04f..ce58b471f6 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBUNISTRING_VERSION = 0.9.6 +LIBUNISTRING_VERSION = 0.9.7 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES -LIBUNISTRING_LICENSE = LGPLv3+ +LIBUNISTRING_LICENSE = LGPLv3+ or GPLv2 LIBUNISTRING_LICENSE_FILES = COPYING.LIB ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) From ccbc1e10223a640d222a9a567023967af1efdf56 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 10:43:09 -0300 Subject: [PATCH 1766/3392] coreutils: bump to version 8.26 Pass on INSTALL_PROGRAM to configure since starting with version 8.26 when building natively it tries to use the self-built install to install, and when cross-compiling it expects INSTALL_PROGRAM to point to a real install, or otherwise fails when recursively trying to expand it. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/coreutils/coreutils.hash | 2 +- package/coreutils/coreutils.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/coreutils/coreutils.hash b/package/coreutils/coreutils.hash index 38d3bb1eeb..37d630bba9 100644 --- a/package/coreutils/coreutils.hash +++ b/package/coreutils/coreutils.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87 coreutils-8.25.tar.xz +sha256 155e94d748f8e2bc327c66e0cbebdb8d6ab265d2f37c3c928f7bf6c3beba9a8e coreutils-8.26.tar.xz diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 0d7b7821a2..409089c332 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -COREUTILS_VERSION = 8.25 +COREUTILS_VERSION = 8.26 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPLv3+ @@ -52,7 +52,8 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ gl_cv_have_proc_uptime=yes \ utils_cv_localtime_cache=no \ PERL=missing \ - MAKEINFO=true + MAKEINFO=true \ + INSTALL_PROGRAM=$(INSTALL) COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \ ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \ From 1f4a5da2fe8d16115cf828ea7e3508bd6243f9dc Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 10:40:49 -0300 Subject: [PATCH 1767/3392] cairo: bump to version 1.14.8 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/cairo/cairo.hash | 6 +++--- package/cairo/cairo.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index 225850f359..dd5365ba7e 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,4 +1,4 @@ -# From http://cairographics.org/releases/cairo-1.14.6.tar.xz.sha1 -sha1 0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5 cairo-1.14.6.tar.xz +# From http://cairographics.org/releases/cairo-1.14.8.tar.xz.sha1 +sha1 c6f7b99986f93c9df78653c3e6a3b5043f65145e cairo-1.14.8.tar.xz # Calculated based on the hash above -sha256 613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252 cairo-1.14.6.tar.xz +sha256 d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20 cairo-1.14.8.tar.xz diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index d7e370ae70..761c6f4df2 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAIRO_VERSION = 1.14.6 +CAIRO_VERSION = 1.14.8 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPLv2.1+ CAIRO_LICENSE_FILES = COPYING From 64fd5763894872a53cf1b0298d89d32c751a1d38 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:56:46 -0300 Subject: [PATCH 1768/3392] mpv: bump to version 0.22.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/mpv/mpv.hash | 2 +- package/mpv/mpv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash index fb287eff37..be6b559c54 100644 --- a/package/mpv/mpv.hash +++ b/package/mpv/mpv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 fe6ec9d2ded5ce84b963f54b812d579d04f944f4a737f3ae639c4d5d9e842b56 v0.20.0.tar.gz +sha256 c0f9ac8f0e37a391d19007b333ef8787c2f45d75a0d4401c0098cde52c5082f6 v0.22.0.tar.gz diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index 0dd488d403..1eb83e950e 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPV_VERSION = 0.20.0 +MPV_VERSION = 0.22.0 MPV_SITE = https://github.com/mpv-player/mpv/archive MPV_SOURCE = v$(MPV_VERSION).tar.gz MPV_DEPENDENCIES = \ From 5327e8d66aae759aec892abefb9edee8afabe31b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:55:17 -0300 Subject: [PATCH 1769/3392] poppler: bump to version 0.49.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/poppler/poppler.hash | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index 533178f1f3..6c695897bd 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 85a003968074c85d8e13bf320ec47cef647b496b56dcff4c790b34e5482fef93 poppler-0.48.0.tar.xz +sha256 14485f0e1e43dcddf49cfc02c2ccb92910ba3e0e91e06f4bd2642ec00cb3a79f poppler-0.49.0.tar.xz diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 202eac29d1..d2f8c2eac0 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,7 +4,7 @@ # ################################################################################ -POPPLER_VERSION = 0.48.0 +POPPLER_VERSION = 0.49.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = http://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf From 4f329c399c1846f55352c2fd762338efba2f6c79 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:52:00 -0300 Subject: [PATCH 1770/3392] harfbuzz: bump to version 1.3.4 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 aa864c637f..b38b049071 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.3.3.tar.bz2.sha256 -sha256 2620987115a4122b47321610dccbcc18f7f121115fd7b88dc8a695c8b66cb3c9 harfbuzz-1.3.3.tar.bz2 +# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.3.4.tar.bz2.sha256 +sha256 718aa6fcadef1a6548315b8cfe42cc27e926256302c337f42df3a443843f6a2b harfbuzz-1.3.4.tar.bz2 diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 2290eebc21..eafe9395aa 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.3.3 +HARFBUZZ_VERSION = 1.3.4 HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 455487dbd1e6d616c1d82bafd4c6be6191d0c7b2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:51:36 -0300 Subject: [PATCH 1771/3392] gnutls: bump to version 3.4.17 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- 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 f9725df371..897562b770 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 d99abb1b320771b58c949bab85e4b654dd1e3e9d92e2572204b7dc479d923927 gnutls-3.4.16.tar.xz +sha256 9b50e8a670d5e950425d96935c7ddd415eb6f8079615a36df425f09a3143172e gnutls-3.4.17.tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index d359a61e9e..af7621c724 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.4 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).16 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).17 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) # README says that the core library is under LGPLv2.1+, but a few From 68e5afb1e1c9f3e77cad437d94e2cb6e8f41c4eb Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:50:34 -0300 Subject: [PATCH 1772/3392] vala: bump to version 0.34.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index b5abcc3b01..ca5873c5d3 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,2 +1,2 @@ -# From https://download.gnome.org/sources/vala/0.34/vala-0.34.3.sha256sum -sha256 f0fad71aca03cdeadf749ca47f56296a4ddd1a25f4e2f09f0ff9e1e3afbcac3f vala-0.34.3.tar.xz +# From https://download.gnome.org/sources/vala/0.34/vala-0.34.4.sha256sum +sha256 6b17bd339414563ebc51f64b0b837919ea7552d8a8ffa71cdc837d25c9696b83 vala-0.34.4.tar.xz diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 6eaa7c40f0..dadfdfc1a9 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ################################################################################ VALA_VERSION_MAJOR = 0.34 -VALA_VERSION = $(VALA_VERSION_MAJOR).3 +VALA_VERSION = $(VALA_VERSION_MAJOR).4 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPLv2.1+ From dac1d5a5ad440eb32dee72fc00900e3d59e88978 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:49:57 -0300 Subject: [PATCH 1773/3392] libglib2: bump to version 2.50.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- 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 02c38ad066..94bf8700b3 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,2 +1,2 @@ -# https://download.gnome.org/sources/glib/2.50/glib-2.50.1.sha256sum -sha256 2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd glib-2.50.1.tar.xz +# https://download.gnome.org/sources/glib/2.50/glib-2.50.2.sha256sum +sha256 be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5 glib-2.50.2.tar.xz diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index a9b93c69d9..ddd1f39652 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.50 -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 eaf99d7de2ba62dd0edb43ec34d9b5407b0abe6a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:48:56 -0300 Subject: [PATCH 1774/3392] grep: bump to version 2.27 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/grep/grep.hash | 2 +- package/grep/grep.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/grep/grep.hash b/package/grep/grep.hash index 789ceeabf1..326737a2fd 100644 --- a/package/grep/grep.hash +++ b/package/grep/grep.hash @@ -1,2 +1,2 @@ # Locally calculated after checking signature -sha256 246a8fb37e82aa33d495b07c22fdab994c039ab0f818538eac81b01e78636870 grep-2.26.tar.xz +sha256 ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb grep-2.27.tar.xz diff --git a/package/grep/grep.mk b/package/grep/grep.mk index a8e124e416..7615f30bac 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,7 +4,7 @@ # ################################################################################ -GREP_VERSION = 2.26 +GREP_VERSION = 2.27 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPLv3+ From c35dfdb0379215f2d1d9deacc78ba154ef137a37 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:48:37 -0300 Subject: [PATCH 1775/3392] gvfs: bump to version 1.30.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gvfs/gvfs.hash | 4 ++-- package/gvfs/gvfs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index f54d23902c..82e29b9d7a 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.30/gvfs-1.30.1.1.sha256sum -sha256 585b5de66eb99a09c020f34955db31e4764c8260a8afbb761ae264a958152ecc gvfs-1.30.1.1.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.30/gvfs-1.30.2.sha256sum +sha256 dd897a13af0728765baead44426e2cf968cd2c9caad3bee4d589970f7612c5d7 gvfs-1.30.2.tar.xz diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 60bfb59b92..ae2709cfb7 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -5,7 +5,7 @@ ################################################################################ GVFS_VERSION_MAJOR = 1.30 -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 2483170d3258ee3e805ead6f0ebafe9fc6765c19 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 09:47:30 -0300 Subject: [PATCH 1776/3392] php: security bump to version 7.0.14 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- 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 f1cd34654e..0424e467f7 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 357ba7f93975d7d836abed0852dc3ed96a988af539e87750613294cbee82f1bf php-7.0.13.tar.xz +sha256 0f1dff6392a1cc2ed126b9695f580a2ed77eb09d2c23b41cabfb41e6f27a8c89 php-7.0.14.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index c8abe660ad..8c1ccef68c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.0.13 +PHP_VERSION = 7.0.14 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From f4b9e87fdb6d06c07428650e6d414538dc3878c7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 12:44:01 -0300 Subject: [PATCH 1777/3392] links: security bump to version 2.14 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/links/links.hash | 2 +- package/links/links.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/links/links.hash b/package/links/links.hash index 2d9a7b3236..a63af4c808 100644 --- a/package/links/links.hash +++ b/package/links/links.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 98411811ded1e8028f5aed708dd7d8ec0ae63ce24c2991a0241a989b7d09d84e links-2.12.tar.bz2 +sha256 f70d0678ef1c5550953bdc27b12e72d5de86e53b05dd59b0fc7f07c507f244b8 links-2.14.tar.bz2 diff --git a/package/links/links.mk b/package/links/links.mk index ab2b583599..ce0e638f95 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINKS_VERSION = 2.12 +LINKS_VERSION = 2.14 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 LINKS_SITE = http://links.twibright.com/download LINKS_DEPENDENCIES = host-pkgconf From e244d79cd826b22fe628e4026d12baa8a1842c4d Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 9 Dec 2016 15:10:02 +0000 Subject: [PATCH 1778/3392] dovecot: bump version to 2.2.27 (security) Fixes CVE-2016-8652 : http://www.securityfocus.com/bid/94639/ Release notes: http://www.dovecot.org/list/dovecot-news/2016-December/000333.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/dovecot/dovecot.hash | 4 ++-- package/dovecot/dovecot.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 0f67f0e3a8..e7b9c3375e 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,2 +1,2 @@ -# Locally computed -sha256 d8d9f32c846397f7c22749a84c5cf6f59c55ff7ded3dc9f07749a255182f9667 dovecot-2.2.25.tar.gz +# Locally computed after checking signature +sha256 897f92a87cda4b27b243f8149ce0ba7b7e71a2be8fb7994eb0a025e54cde18e9 dovecot-2.2.27.tar.gz diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 31c62d3189..3dd231a1d0 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.2 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).25 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).27 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPLv2.1 From 850092692ede78df68eb67edea9b928ab482d26c Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 9 Dec 2016 15:10:03 +0000 Subject: [PATCH 1779/3392] dovecot-pigeonhole: bump version to 0.4.16 Release notes: http://www.dovecot.org/list/dovecot-news/2016-October/000330.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 4 ++-- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index f5988251d7..95325a95de 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,2 +1,2 @@ -# Locally computed -sha256 c99ace6ead310c6c3b639922da618f90d846307da4fe252d994e5e51bf8a3de3 dovecot-2.2-pigeonhole-0.4.15.tar.gz +# Locally computed after checking signature +sha256 8f0b98f18062d6e241eef74ebe16cc167cd246361cbe6657d94f0ecc5d7d3234 dovecot-2.2-pigeonhole-0.4.16.tar.gz diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 7c0a14c35a..846e7f97dd 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.4.15 +DOVECOT_PIGEONHOLE_VERSION = 0.4.16 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2 DOVECOT_PIGEONHOLE_LICENSE = LGPLv2.1 From dd9d6cd0586ed51f5145478b1cf7a8b63f5671c4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 9 Dec 2016 11:52:29 -0300 Subject: [PATCH 1780/3392] sysstat: bump to version 11.4.2 [Peter: add local sha256 hash as suggested by Vicente] Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/sysstat/sysstat.hash | 4 +++- package/sysstat/sysstat.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index 3170fc9812..5de5ec7342 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,2 +1,4 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 59769deddef02acd60db3a42d772e57bd0978efb sysstat-11.4.0.tar.xz +sha1 84ac7feba76049f201e203c7ce0cc750479a9d43 sysstat-11.4.2.tar.xz +# Locally calculated +sha256 1fd407f8971f5854bc853d931dd85bcbea08658130f3f8510a730d5561980f39 sysstat-11.4.2.tar.xz diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index de6cd9f9e8..1a86fa0d4b 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 11.4.0 +SYSSTAT_VERSION = 11.4.2 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard SYSSTAT_CONF_OPTS = --disable-man-group --disable-sensors From 97c02f65cb1866a590159c699081173decd6bed3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 9 Dec 2016 11:26:03 +0100 Subject: [PATCH 1781/3392] ezxml: disable mmap code for nommu Fixes: http://autobuild.buildroot.net/results/8e1/8e10052a0d0ad4f47622925349ec5fddb7b672f0/ http://autobuild.buildroot.net/results/2f1/2f15b81beadd2d902c73d6d8bd7fb06b03f62ef5/ The mmap support uses madvise which isn't available on nommu uClibc, so disable it. Signed-off-by: Peter Korsgaard --- package/ezxml/ezxml.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk index a806e566ed..f1e18aa680 100644 --- a/package/ezxml/ezxml.mk +++ b/package/ezxml/ezxml.mk @@ -10,9 +10,16 @@ EZXML_INSTALL_STAGING = YES EZXML_LICENSE = MIT EZXML_LICENSE_FILES = license.txt +EZXML_CFLAGS = $(TARGET_CFLAGS) + +# mmap code uses madvise which isn't available on nommu uClibc +ifeq ($(BR2_USE_MMU),) +EZXML_CFLAGS += -D EZXML_NOMMAP +endif + define EZXML_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f GNUmakefile \ - CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" AR=$(TARGET_AR) + CC="$(TARGET_CC)" CFLAGS="$(EZXML_CFLAGS)" AR=$(TARGET_AR) endef define EZXML_INSTALL_STAGING_CMDS From c7bfb682081bfaf90dfc451baa1e9a4bb129cd4f Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 8 Dec 2016 14:46:59 -0800 Subject: [PATCH 1782/3392] package/xen: Disable Werror checking The strict unused-const-variable checking was causing autobuilder errors when trying to build Xen tools/libxl as the migrate_*[] arrays are not always accessed. To avoid the error edit the Makefile to stop all general warnings being treated as errors, by removing the -Werror flag. Fixes: http://autobuild.buildroot.net/results/0e0/0e0d4aa4a05da5804821951289c0a4049b009c61/ Signed-off-by: Alistair Francis Signed-off-by: Peter Korsgaard --- ...libxl-Disable-strict-Werror-checking.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/xen/0003-tools-libxl-Disable-strict-Werror-checking.patch diff --git a/package/xen/0003-tools-libxl-Disable-strict-Werror-checking.patch b/package/xen/0003-tools-libxl-Disable-strict-Werror-checking.patch new file mode 100644 index 0000000000..80c0b3225e --- /dev/null +++ b/package/xen/0003-tools-libxl-Disable-strict-Werror-checking.patch @@ -0,0 +1,26 @@ +From 19f1e70041044fde1542109a0525424cc6d5d053 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 7 Dec 2016 11:35:10 -0800 +Subject: [PATCH] tools/libxl: Disable strict Werror checking + +Signed-off-by: Alistair Francis +--- + tools/libxl/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile +index defeb40..239faf3 100644 +--- a/tools/libxl/Makefile ++++ b/tools/libxl/Makefile +@@ -11,7 +11,7 @@ MINOR = 0 + XLUMAJOR = 4.7 + XLUMINOR = 0 + +-CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ ++CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ + -Wno-declaration-after-statement -Wformat-nonliteral + CFLAGS += -I. -fPIC + +-- +2.7.4 + From d654c3979145c26fddd3f51475b8fe0e4c16bb95 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 8 Dec 2016 23:24:16 +0100 Subject: [PATCH 1783/3392] package/efl: enable libdrm support drm can be used without compositor, just like it was with the framebuffer for standalone applications As stated in configure.ac, libdrm support needs libdrm, elput, libxkbcommon and libgbm. libgbm is only provided by mesa3d package when OpenGL EGL support is enabled, so add a direct dependency on mesa3d. Rework the libxkbcommon dependency since it's now required for elput and libdrm support. [1] https://www.enlightenment.org/about-wayland Signed-off-by: Romain Naour Signed-off-by: Pierre Floury Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 13 +++++++++++++ package/efl/efl.mk | 11 ++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 5d687e85bd..0692d80b23 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -193,6 +193,19 @@ config BR2_PACKAGE_EFL_ELPUT ecore_drm, etc) to handle interfacing with libinput without having to duplicate the code in each subsystem. +config BR2_PACKAGE_EFL_DRM + bool "Evas DRM Engine" + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d + select BR2_PACKAGE_EFL_ELPUT + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBXKBCOMMON + help + This option enable building support for the Evas DRM Engine. + +comment "Evas DRM Engine needs mesa3d w/ EGL support, threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL + comment "libevas loaders" config BR2_PACKAGE_EFL_PNG diff --git a/package/efl/efl.mk b/package/efl/efl.mk index e08f252a60..d823af2d1a 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -150,7 +150,7 @@ endif # BR2_PACKAGE_OPENSSL ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) EFL_CONF_OPTS += --enable-elput -EFL_DEPENDENCIES += libinput libxkbcommon +EFL_DEPENDENCIES += libinput else EFL_CONF_OPTS += --disable-elput endif @@ -194,6 +194,15 @@ else ifeq ($(BR2_PACKAGE_EFL_OPENGL_NONE),y) EFL_CONF_OPTS += --with-opengl=none endif +ifeq ($(BR2_PACKAGE_EFL_DRM),y) +EFL_CONF_OPTS += --enable-drm +EFL_DEPENDENCIES += libdrm libegl mesa3d +else +EFL_CONF_OPTS += --disable-drm +endif + +EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) + # Loaders that need external dependencies needs to be --enable-XXX=yes # otherwise the default is '=static'. # All other loaders are statically built-in From f30eec41f95ed99909eb2c7590d83c12b9142df2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 8 Dec 2016 23:24:17 +0100 Subject: [PATCH 1784/3392] package/efl: add Wayland support The EFL Wayland support was removed with commit [1] since the dependecy on libdrm was missing. Also it requires OpenGL ES with EGL, Evas DRM and Evas GLES DRM support [2]. As stated in configure, Evas GLES DRM engine support (gl_drm) depends on wayland-client to build (wayland-client >= 1.8.0). So, enable gl_drm only when wayland support is selected. [1] 4f04be1659f186765f506c68f5bfbf6845fc40dc [2] https://www.enlightenment.org/about-wayland Signed-off-by: Romain Naour Cc: Pierre Floury Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 12 ++++++++++++ package/efl/efl.mk | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/package/efl/Config.in b/package/efl/Config.in index 0692d80b23..c51fc564d4 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -155,6 +155,18 @@ config BR2_PACKAGE_EFL_X_XLIB select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XPROTO_GLPROTO +config BR2_PACKAGE_EFL_WAYLAND + bool "Wayland support" + depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine + depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only + select BR2_PACKAGE_EFL_DRM + select BR2_PACKAGE_WAYLAND + +comment "Wayland support needs OpenGL ES w/ EGL, threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ + || !BR2_PACKAGE_EFL_OPENGLES + choice bool "OpenGL support" help diff --git a/package/efl/efl.mk b/package/efl/efl.mk index d823af2d1a..7a8e47f4c1 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -201,6 +201,16 @@ else EFL_CONF_OPTS += --disable-drm endif +# The EFL Wayland support requires Evas GLES DRM engine support +# which depends on wayland-client to build. +# So enable gl_drm only when wayland support is selected. +ifeq ($(BR2_PACKAGE_EFL_WAYLAND),y) +EFL_DEPENDENCIES += wayland +EFL_CONF_OPTS += --enable-wayland --enable-gl-drm +else +EFL_CONF_OPTS += --disable-wayland --disable-gl-drm +endif + EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) # Loaders that need external dependencies needs to be --enable-XXX=yes From 6969e97e7803519d4f6b8266fc395d8a94c0a76b Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Fri, 9 Dec 2016 21:23:00 -0500 Subject: [PATCH 1785/3392] swupdate: replace BR2_PREFER_STATIC_LIB with BR2_STATIC_LIBS The symbol to control static compilation was renamed in 2015.02, but missed when swupdate was added. Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- package/swupdate/swupdate.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index c905c1d746..688f4eef86 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -83,7 +83,7 @@ SWUPDATE_BUILD_CONFIG = $(@D)/.config SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig -ifeq ($(BR2_PREFER_STATIC_LIB),y) +ifeq ($(BR2_STATIC_LIBS),y) define SWUPDATE_PREFER_STATIC $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(SWUPDATE_BUILD_CONFIG)) endef From 190c5117c0bd04cdeec28bbb456debbeea8a2919 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 9 Dec 2016 21:26:04 +0100 Subject: [PATCH 1786/3392] cjson: bump to version 1.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cjson/cjson.hash | 2 +- package/cjson/cjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index 27f1d46983..4f0723a510 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 5c3a4a77796b230efbd74369b0974d14ac0408f2677bd116d4a4b5894b9be372 cjson-v1.0.2.tar.gz +sha256 3487795d54440bdbd41b4b8e7688889526f2f9a652639f6036b9965016c800e7 cjson-v1.1.0.tar.gz diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index c544a772c3..3dd6ebc77a 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = v1.0.2 +CJSON_VERSION = v1.1.0 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT From 486219ff2352658a7720600c753e831e06d71e07 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Sat, 10 Dec 2016 09:21:54 -0300 Subject: [PATCH 1787/3392] mimic: new package Signed-off-by: Ezequiel Garcia [Thomas: - Rewrap Config.in help text - Use "depends on" rather than "select" for the audio backend options - Slightly simplify some of the prompts for the audio backend selection - Remove MIMIC_INSTALL_STAGING = NO, that's the default - Use += when assigning MIMIC_DEPENDENCIES - Remove double quotes when setting --with-audio=.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/mimic/Config.in | 37 +++++++++++++++++++++++++++++++++++++ package/mimic/mimic.hash | 2 ++ package/mimic/mimic.mk | 29 +++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 package/mimic/Config.in create mode 100644 package/mimic/mimic.hash create mode 100644 package/mimic/mimic.mk diff --git a/package/Config.in b/package/Config.in index c14575c4c4..26fa01b007 100644 --- a/package/Config.in +++ b/package/Config.in @@ -22,6 +22,7 @@ menu "Audio and video applications" source "package/kodi/Config.in" source "package/lame/Config.in" source "package/madplay/Config.in" + source "package/mimic/Config.in" source "package/miraclecast/Config.in" source "package/mjpegtools/Config.in" source "package/modplugtools/Config.in" diff --git a/package/mimic/Config.in b/package/mimic/Config.in new file mode 100644 index 0000000000..6cd4c2096a --- /dev/null +++ b/package/mimic/Config.in @@ -0,0 +1,37 @@ +config BR2_PACKAGE_MIMIC + bool "mimic" + help + Mimic is a fast, lightweight Text-to-speech engine developed + by Mycroft A.I. and VocaliD, based on Carnegie Mellon + University's Flite (Festival-Lite) software. Mimic takes in + text and reads it out loud to create a high quality voice. + + https://github.com/MycroftAI/mimic + +if BR2_PACKAGE_MIMIC + +choice + prompt "audio backend" + default BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE + +config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE + bool "none" + help + With no backend, mimic will only be able to produce .wav + files. + +config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA + bool "alsa" + depends on BR2_PACKAGE_ALSA_LIB + +config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PORTAUDIO + bool "alsa via portaudio" + depends on BR2_PACKAGE_PORTAUDIO + +config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO + bool "pulseaudio" + depends on BR2_PACKAGE_PULSEAUDIO + +endchoice + +endif # BR2_PACKAGE_MIMIC diff --git a/package/mimic/mimic.hash b/package/mimic/mimic.hash new file mode 100644 index 0000000000..39d016548a --- /dev/null +++ b/package/mimic/mimic.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz diff --git a/package/mimic/mimic.mk b/package/mimic/mimic.mk new file mode 100644 index 0000000000..66fe9a9ab2 --- /dev/null +++ b/package/mimic/mimic.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# mimic +# +################################################################################ + +MIMIC_VERSION = 1.1.0 +MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION)) +MIMIC_LICENSE = MIT +MIMIC_LICENSE_FILES = LICENSE + +MIMIC_DEPENDENCIES = host-pkgconf + +ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA),y) +MIMIC_AUDIO_BACKEND = alsa +MIMIC_DEPENDENCIES += alsa-lib +else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PORTAUDIO),y) +MIMIC_AUDIO_BACKEND = portaudio +MIMIC_DEPENDENCIES += portaudio +else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO),y) +MIMIC_AUDIO_BACKEND = pulseaudio +MIMIC_DEPENDENCIES += pulseaudio +else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y) +MIMIC_AUDIO_BACKEND = none +endif + +MIMIC_CONF_OPTS += --with-audio=$(MIMIC_AUDIO_BACKEND) + +$(eval $(autotools-package)) From c6aecd42d926d9d933c2e500c63d0fe093421242 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 10 Dec 2016 14:59:29 +0100 Subject: [PATCH 1788/3392] DEVELOPERS: add Ezequiel Garcia as developer for mimic package Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 33ab31cb4c..ba40842849 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -454,6 +454,7 @@ F: arch/Config.in.nios2 F: package/fio/ F: package/iptraf-ng/ F: package/jimtcl/ +F: package/mimic/ F: package/nodm/ F: package/openbox/ F: package/supertuxkart/ From aaf709cab4dfb4369515eded520ff856be591b04 Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Fri, 9 Dec 2016 14:33:15 +1100 Subject: [PATCH 1789/3392] package/qemu: separate user and system arch on powerpc64le QEMU provides a single system emulator that supports both powerpc64 and powerpc64le with a target called 'ppc64-softmmu', but it provides a different usermode emulator for each one (with targets 'ppc64le-linux-user' and 'ppc64-linux-user'). Due to this asymmetry it is not possible to support both cases with the single arch value used in the package file. This patch introduces an additional value into the package configuration, HOST_QEMU_SYS_ARCH, so that both cases can be supported. Fixes commit d2ff457e88ff4106f97e29516d467978827d30c2 and autobuilder failture http://autobuild.buildroot.net/results/a2d63e21c3e82c36f4a975e90ed56faba18e97a5 Signed-off-by: Sam Bobroff Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index bc707cf7e6..66efcba345 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -35,7 +35,7 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p # mips64el mips64el # powerpc ppc # powerpc64 ppc64 -# powerpc64le ppc64le +# powerpc64le ppc64 (system) / ppc64le (usermode) # sh2a not supported # sh4 sh4 # sh4eb sh4eb @@ -62,6 +62,7 @@ HOST_QEMU_ARCH = ppc64 endif ifeq ($(HOST_QEMU_ARCH),powerpc64le) HOST_QEMU_ARCH = ppc64le +HOST_QEMU_SYS_ARCH = ppc64 endif ifeq ($(HOST_QEMU_ARCH),sh4a) HOST_QEMU_ARCH = sh4 @@ -69,9 +70,10 @@ endif ifeq ($(HOST_QEMU_ARCH),sh4aeb) HOST_QEMU_ARCH = sh4eb endif +HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH) ifeq ($(BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE),y) -HOST_QEMU_TARGETS += $(HOST_QEMU_ARCH)-softmmu +HOST_QEMU_TARGETS += $(HOST_QEMU_SYS_ARCH)-softmmu HOST_QEMU_OPTS += --enable-system --enable-fdt HOST_QEMU_DEPENDENCIES += host-dtc else From efd63573bce1039989afd81a78472aa073b26d5f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 10 Dec 2016 15:12:46 +0100 Subject: [PATCH 1790/3392] uclibc-ng-test: fix compile errors with glibc toolchains We need to link with -lrt for some tests. Update to latest upstream version. Fixes: http://autobuild.buildroot.net/results/7388ffcc51a6686b8b708d7373427368d3755870 http://autobuild.buildroot.net/results/926716ed127dea879c5b26c4d04dc7f0615c8f34 http://autobuild.buildroot.net/results/737f1651a8bba7d3d815f46ec796955d09ba96bd http://autobuild.buildroot.net/results/56a8d67a45469d2a478da8d7d1ad7c5fb5e6c0c5 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/uclibc-ng-test/uclibc-ng-test.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/uclibc-ng-test/uclibc-ng-test.mk b/package/uclibc-ng-test/uclibc-ng-test.mk index bb8b9ed086..9a0240c431 100644 --- a/package/uclibc-ng-test/uclibc-ng-test.mk +++ b/package/uclibc-ng-test/uclibc-ng-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_NG_TEST_VERSION = 189b47080068d431302beec0e627dcaa5358eae8 +UCLIBC_NG_TEST_VERSION = c9b9876cefc142a23aa622b821290ed16af80058 UCLIBC_NG_TEST_SITE = git://uclibc-ng.org/git/uclibc-ng-test UCLIBC_NG_TEST_LICENSE = LGPLv2.1+ UCLIBC_NG_TEST_LICENSE_FILES = COPYING.LIB From 8879424b4940771f9072f97eb3b340dc6248c8fe Mon Sep 17 00:00:00 2001 From: Ash Charles Date: Thu, 8 Dec 2016 21:23:21 -0500 Subject: [PATCH 1791/3392] DEVELOPERS: add Ash as developer for PRU packages Signed-off-by: Ash Charles Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ba40842849..23d4329720 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -109,6 +109,10 @@ F: package/python-bottle/ F: package/sqlcipher/ F: package/stress/ +N: Ash Charles +F: package/pru-software-support/ +F: package/ti-cgt-pru/ + N: Assaf Inbal F: package/lbase64/ F: package/luabitop/ From cb328f77f8f07bfd89d6b69385c941a7b281732b Mon Sep 17 00:00:00 2001 From: Clayton Shotwell Date: Tue, 25 Oct 2016 14:26:03 -0500 Subject: [PATCH 1792/3392] policycoreutils: new package This package contains the core policy utilities that are required for basic operation of an SELinux system. Signed-off-by: Clayton Shotwell Signed-off-by: Matt Weber Signed-off-by: Niranjan Reddy Tested-by: Bryce Ferguson Signed-off-by: Bryce Ferguson [Thomas: - Move the Config.in comment at the top of the Config.in file rather than between the main option and its sub-options, as this breaks menuconfig indentation. - Fix the propagation of the libsemanage dependencies. libsemanage depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS and BR2_TOOLCHAIN_USES_GLIBC which were not accounted for. Since it depends on BR2_TOOLCHAIN_USES_GLIBC, then all the gettext related handling becomes useless and has been removed. - Rename the prompt of the restorecond sub-option to just "restorecond". - Use TARGET_CONFIGURE_OPTS and HOST_CONFIGURE_OPTS instead of passing LDFLAGS, CC, etc. manually. - Use make "foreach" function for loops instead of shell "for" loops. - Rework the explanation of why we're passing DESTDIR at build time. - Minor formatting tweaks here and there.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...-all-paths-that-use-an-absolute-path.patch | 131 +++++++++++ .../0002-Add-PREFIX-to-host-paths.patch | 211 ++++++++++++++++++ .../0003-Remove-hardcoded-arch-variable.patch | 43 ++++ ...python-install-arguments-to-be-a-var.patch | 42 ++++ ...0005-Check-to-see-if-DBUS-is-enabled.patch | 56 +++++ package/policycoreutils/Config.in | 61 +++++ package/policycoreutils/policycoreutils.hash | 2 + package/policycoreutils/policycoreutils.mk | 119 ++++++++++ 9 files changed, 666 insertions(+) create mode 100644 package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch create mode 100644 package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch create mode 100644 package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch create mode 100644 package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch create mode 100644 package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch create mode 100644 package/policycoreutils/Config.in create mode 100644 package/policycoreutils/policycoreutils.hash create mode 100644 package/policycoreutils/policycoreutils.mk diff --git a/package/Config.in b/package/Config.in index 26fa01b007..a58147ab64 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1667,6 +1667,7 @@ menu "Real-Time" endmenu menu "Security" + source "package/policycoreutils/Config.in" source "package/setools/Config.in" endmenu diff --git a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch new file mode 100644 index 0000000000..bbd6895e7f --- /dev/null +++ b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch @@ -0,0 +1,131 @@ +The addition of this patch makes the use of DESTDIR +mandatory as there are conditional checks which would fail if it's not +defined. + +This patch was updated from the patch provided by Niranjan Reddy to +accomodate version 2.5 + +Signed-off-by: Clayton Shotwell +Signed-off-by: Niranjan Reddy +Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett +--- + policycoreutils/Makefile | 2 +- + policycoreutils/newrole/Makefile | 4 ++-- + policycoreutils/restorecond/Makefile | 5 +++-- + policycoreutils/run_init/Makefile | 4 ++-- + policycoreutils/sepolicy/Makefile | 2 +- + policycoreutils/sestatus/Makefile | 2 +- + policycoreutils/setfiles/Makefile | 4 ++-- + 7 files changed, 12 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 962ac12..0634a2a 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll + +-INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) ++INOTIFYH = $(shell ls $(DESTDIR)/usr/include/sys/inotify.h 2>/dev/null) + + ifeq (${INOTIFYH}, /usr/include/sys/inotify.h) + SUBDIRS += restorecond +diff --git a/newrole/Makefile b/newrole/Makefile +index 646cd4d..f124a6a 100644 +--- a/newrole/Makefile ++++ b/newrole/Makefile +@@ -4,8 +4,8 @@ BINDIR ?= $(PREFIX)/bin + MANDIR ?= $(PREFIX)/share/man + ETCDIR ?= $(DESTDIR)/etc + LOCALEDIR = /usr/share/locale +-PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null) +-AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) ++PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) ++AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) + # Enable capabilities to permit newrole to generate audit records. + # This will make newrole a setuid root program. + # The capabilities used are: CAP_AUDIT_WRITE. +diff --git a/restorecond/Makefile b/restorecond/Makefile +index f99e1e7..92a4a4d 100644 +--- a/restorecond/Makefile ++++ b/restorecond/Makefile +@@ -11,11 +11,12 @@ autostart_DATA = sealertauto.desktop + INITDIR ?= $(DESTDIR)/etc/rc.d/init.d + SELINUXDIR = $(DESTDIR)/etc/selinux + +-DBUSFLAGS = -DHAVE_DBUS -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/dbus-1.0/include ++DBUSFLAGS = -DHAVE_DBUS -I$(DESTDIR)/usr/include/dbus-1.0 -I$(DESTDIR)/usr/lib64/dbus-1.0/include -I$(DESTDIR)/usr/lib/dbus-1.0/include + DBUSLIB = -ldbus-glib-1 -ldbus-1 + + CFLAGS ?= -g -Werror -Wall -W +-override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS) -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/lib/glib-2.0/include ++override CFLAGS += -I$(DESTDIR)/usr/include $(DBUSFLAGS) -I$(DESTDIR)/usr/include/glib-2.0 \ ++-I$(DESTDIR)/usr/lib64/glib-2.0/include -I$(DESTDIR)/usr/lib/glib-2.0/include + + LDLIBS += -lselinux $(DBUSLIB) -lglib-2.0 -L$(LIBDIR) + +diff --git a/run_init/Makefile b/run_init/Makefile +index 5815a08..c81179b 100644 +--- a/run_init/Makefile ++++ b/run_init/Makefile +@@ -5,8 +5,8 @@ SBINDIR ?= $(PREFIX)/sbin + MANDIR ?= $(PREFIX)/share/man + ETCDIR ?= $(DESTDIR)/etc + LOCALEDIR ?= /usr/share/locale +-PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null) +-AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) ++PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) ++AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) + + CFLAGS ?= -Werror -Wall -W + override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" +diff --git a/sepolicy/Makefile b/sepolicy/Makefile +index 39d46e8..6624373 100644 +--- a/sepolicy/Makefile ++++ b/sepolicy/Makefile +@@ -12,7 +12,7 @@ LOCALEDIR ?= /usr/share/locale + BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions + SHAREDIR ?= $(PREFIX)/share/sandbox + CFLAGS ?= -Wall -Werror -Wextra -W +-override CFLAGS += -I$(PREFIX)/include -DPACKAGE="policycoreutils" -DSHARED -shared ++override CFLAGS = $(LDFLAGS) -I$(DESTDIR)/usr/include -DPACKAGE="policycoreutils" -Wall -Werror -Wextra -W -DSHARED -shared + + BASHCOMPLETIONS=sepolicy-bash-completion.sh + +diff --git a/sestatus/Makefile b/sestatus/Makefile +index c04ff00..e10c32c 100644 +--- a/sestatus/Makefile ++++ b/sestatus/Makefile +@@ -6,7 +6,7 @@ ETCDIR ?= $(DESTDIR)/etc + LIBDIR ?= $(PREFIX)/lib + + CFLAGS ?= -Werror -Wall -W +-override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64 ++override CFLAGS += -I$(DESTDIR)/usr/include -D_FILE_OFFSET_BITS=64 + LDLIBS = -lselinux -L$(LIBDIR) + + all: sestatus +diff --git a/setfiles/Makefile b/setfiles/Makefile +index 98f4f7d..eb26ed0 100644 +--- a/setfiles/Makefile ++++ b/setfiles/Makefile +@@ -3,13 +3,13 @@ PREFIX ?= $(DESTDIR)/usr + SBINDIR ?= $(DESTDIR)/sbin + MANDIR = $(PREFIX)/share/man + LIBDIR ?= $(PREFIX)/lib +-AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) ++AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) + + PROGRESS_STEP=$(shell grep "^\#define STAR_COUNT" restore.h | awk -S '{ print $$3 }') + ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }') + + CFLAGS ?= -g -Werror -Wall -W +-override CFLAGS += -I$(PREFIX)/include ++override CFLAGS += -I$(DESTDIR)/usr/include + LDLIBS = -lselinux -lsepol -L$(LIBDIR) + + ifeq ($(AUDITH), /usr/include/libaudit.h) +-- +2.7.4 + diff --git a/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch b/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch new file mode 100644 index 0000000000..56aae74ba0 --- /dev/null +++ b/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch @@ -0,0 +1,211 @@ +From 7f99a727cdb8160d49bb0d0554fc88787980c971 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Thu, 14 Jul 2016 13:16:03 -0400 +Subject: [PATCH] Add PREFIX to host paths + +Updates the remaining hardcoded host paths used in the build to be +prefixed with a PREFIX path to allow cross compilation. + +Updated to work with version 2.5 + +Signed-off-by: Clayton Shotwell +Signed-off-by: Niranjan Reddy +Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett +--- + policycoreutils/Makefile | 4 +++- + policycoreutils/audit2allow/Makefile | 2 +- + policycoreutils/load_policy/Makefile | 2 +- + policycoreutils/mcstrans/src/Makefile | 17 +++++++++-------- + policycoreutils/newrole/Makefile | 8 ++++---- + policycoreutils/run_init/Makefile | 8 ++++---- + policycoreutils/sepolicy/Makefile | 2 +- + policycoreutils/setfiles/Makefile | 4 ++-- + 8 files changed, 25 insertions(+), 22 deletions(-) + +diff --git a/Makefile b/Makefile +index 0634a2a..bd99b1c 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,10 @@ ++PREFIX ?= $(DESTDIR)/usr ++ + SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll + + INOTIFYH = $(shell ls $(DESTDIR)/usr/include/sys/inotify.h 2>/dev/null) + +-ifeq (${INOTIFYH}, /usr/include/sys/inotify.h) ++ifeq (${INOTIFYH}, $(PREFIX)/include/sys/inotify.h) + SUBDIRS += restorecond + endif + +diff --git a/audit2allow/Makefile b/audit2allow/Makefile +index 87d2502..d4108fe 100644 +--- a/audit2allow/Makefile ++++ b/audit2allow/Makefile +@@ -5,7 +5,7 @@ PREFIX ?= $(DESTDIR)/usr + BINDIR ?= $(PREFIX)/bin + LIBDIR ?= $(PREFIX)/lib + MANDIR ?= $(PREFIX)/share/man +-LOCALEDIR ?= /usr/share/locale ++LOCALEDIR ?= $(PREFIX)/share/locale + + all: audit2why + +diff --git a/load_policy/Makefile b/load_policy/Makefile +index 7c5bab0..5cd0bbb 100644 +--- a/load_policy/Makefile ++++ b/load_policy/Makefile +@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr + SBINDIR ?= $(DESTDIR)/sbin + USRSBINDIR ?= $(PREFIX)/sbin + MANDIR ?= $(PREFIX)/share/man +-LOCALEDIR ?= /usr/share/locale ++LOCALEDIR ?= $(PREFIX)/share/locale + + CFLAGS ?= -Werror -Wall -W + override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" +diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile +index 907a1f1..6fda57e 100644 +--- a/mcstrans/src/Makefile ++++ b/mcstrans/src/Makefile +@@ -1,23 +1,24 @@ + ARCH = $(shell uname -i) ++# Installation directories. ++PREFIX ?= $(DESTDIR)/usr ++SBINDIR ?= $(DESTDIR)/sbin ++INITDIR ?= $(DESTDIR)/etc/rc.d/init.d ++SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd ++ + ifeq "$(ARCH)" "x86_64" + # In case of 64 bit system, use these lines +- LIBDIR=/usr/lib64 ++ LIBDIR=$(PREFIX)/lib64 + else + ifeq "$(ARCH)" "i686" + # In case of 32 bit system, use these lines +- LIBDIR=/usr/lib ++ LIBDIR=$(PREFIX)/lib + else + ifeq "$(ARCH)" "i386" + # In case of 32 bit system, use these lines +- LIBDIR=/usr/lib ++ LIBDIR=$(PREFIX)/lib + endif + endif + endif +-# Installation directories. +-PREFIX ?= $(DESTDIR)/usr +-SBINDIR ?= $(DESTDIR)/sbin +-INITDIR ?= $(DESTDIR)/etc/rc.d/init.d +-SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd + + PROG_SRC=mcstrans.c mcscolor.c mcstransd.c mls_level.c + PROG_OBJS= $(patsubst %.c,%.o,$(PROG_SRC)) +diff --git a/newrole/Makefile b/newrole/Makefile +index f124a6a..b687a09 100644 +--- a/newrole/Makefile ++++ b/newrole/Makefile +@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr + BINDIR ?= $(PREFIX)/bin + MANDIR ?= $(PREFIX)/share/man + ETCDIR ?= $(DESTDIR)/etc +-LOCALEDIR = /usr/share/locale ++LOCALEDIR = $(PREFIX)/share/locale + PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) + AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) + # Enable capabilities to permit newrole to generate audit records. +@@ -24,7 +24,7 @@ CFLAGS ?= -Werror -Wall -W + EXTRA_OBJS = + override CFLAGS += -DVERSION=\"$(VERSION)\" $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" + LDLIBS += -lselinux -L$(PREFIX)/lib +-ifeq ($(PAMH), /usr/include/security/pam_appl.h) ++ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) + override CFLAGS += -DUSE_PAM + EXTRA_OBJS += hashtab.o + LDLIBS += -lpam -lpam_misc +@@ -32,7 +32,7 @@ else + override CFLAGS += -D_XOPEN_SOURCE=500 + LDLIBS += -lcrypt + endif +-ifeq ($(AUDITH), /usr/include/libaudit.h) ++ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h) + override CFLAGS += -DUSE_AUDIT + LDLIBS += -laudit + endif +@@ -66,7 +66,7 @@ install: all + test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1 + install -m $(MODE) newrole $(BINDIR) + install -m 644 newrole.1 $(MANDIR)/man1/ +-ifeq ($(PAMH), /usr/include/security/pam_appl.h) ++ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) + test -d $(ETCDIR)/pam.d || install -m 755 -d $(ETCDIR)/pam.d + ifeq ($(LSPP_PRIV),y) + install -m 644 newrole-lspp.pamd $(ETCDIR)/pam.d/newrole +diff --git a/run_init/Makefile b/run_init/Makefile +index c81179b..ce0df9f 100644 +--- a/run_init/Makefile ++++ b/run_init/Makefile +@@ -4,21 +4,21 @@ PREFIX ?= $(DESTDIR)/usr + SBINDIR ?= $(PREFIX)/sbin + MANDIR ?= $(PREFIX)/share/man + ETCDIR ?= $(DESTDIR)/etc +-LOCALEDIR ?= /usr/share/locale ++LOCALEDIR ?= $(PREFIX)/share/locale + PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) + AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) + + CFLAGS ?= -Werror -Wall -W + override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" + LDLIBS += -lselinux -L$(PREFIX)/lib +-ifeq ($(PAMH), /usr/include/security/pam_appl.h) ++ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) + override CFLAGS += -DUSE_PAM + LDLIBS += -lpam -lpam_misc + else + override CFLAGS += -D_XOPEN_SOURCE=500 + LDLIBS += -lcrypt + endif +-ifeq ($(AUDITH), /usr/include/libaudit.h) ++ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h) + override CFLAGS += -DUSE_AUDIT + LDLIBS += -laudit + endif +@@ -38,7 +38,7 @@ install: all + install -m 755 open_init_pty $(SBINDIR) + install -m 644 run_init.8 $(MANDIR)/man8/ + install -m 644 open_init_pty.8 $(MANDIR)/man8/ +-ifeq ($(PAMH), /usr/include/security/pam_appl.h) ++ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) + install -m 644 run_init.pamd $(ETCDIR)/pam.d/run_init + endif + +diff --git a/sepolicy/Makefile b/sepolicy/Makefile +index 6624373..a16f8de 100644 +--- a/sepolicy/Makefile ++++ b/sepolicy/Makefile +@@ -8,7 +8,7 @@ BINDIR ?= $(PREFIX)/bin + SBINDIR ?= $(PREFIX)/sbin + DATADIR ?= $(PREFIX)/share + MANDIR ?= $(PREFIX)/share/man +-LOCALEDIR ?= /usr/share/locale ++LOCALEDIR ?= $(PREFIX)/share/locale + BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions + SHAREDIR ?= $(PREFIX)/share/sandbox + CFLAGS ?= -Wall -Werror -Wextra -W +diff --git a/setfiles/Makefile b/setfiles/Makefile +index eb26ed0..3c6b80d 100644 +--- a/setfiles/Makefile ++++ b/setfiles/Makefile +@@ -12,7 +12,7 @@ CFLAGS ?= -g -Werror -Wall -W + override CFLAGS += -I$(DESTDIR)/usr/include + LDLIBS = -lselinux -lsepol -L$(LIBDIR) + +-ifeq ($(AUDITH), /usr/include/libaudit.h) ++ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h) + override CFLAGS += -DUSE_AUDIT + LDLIBS += -laudit + endif +-- +2.7.4 + diff --git a/package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch b/package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch new file mode 100644 index 0000000000..375fb577f7 --- /dev/null +++ b/package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch @@ -0,0 +1,43 @@ +From 7424f2bea0cb412e96202f596ad8077131589f40 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Thu, 14 Jul 2016 13:18:24 -0400 +Subject: [PATCH] Remove hardcoded arch variable. + +Allow the ARCH value to be passed in as original configuration was +solely based on host architecture. + +This patch was updated to work with version 2.5 + +Signed-off-by: Clayton Shotwell +Signed-off-by: Niranjan Reddy +Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett +--- + policycoreutils/mcstrans/src/Makefile | 1 - + policycoreutils/mcstrans/utils/Makefile | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile +index 6fda57e..7b4489f 100644 +--- a/mcstrans/src/Makefile ++++ b/mcstrans/src/Makefile +@@ -1,4 +1,3 @@ +-ARCH = $(shell uname -i) + # Installation directories. + PREFIX ?= $(DESTDIR)/usr + SBINDIR ?= $(DESTDIR)/sbin +diff --git a/mcstrans/utils/Makefile b/mcstrans/utils/Makefile +index 1ffb027..912fe12 100644 +--- a/mcstrans/utils/Makefile ++++ b/mcstrans/utils/Makefile +@@ -2,7 +2,6 @@ + PREFIX ?= $(DESTDIR)/usr + BINDIR ?= $(PREFIX)/sbin + +-ARCH = $(shell uname -i) + ifeq "$(ARCH)" "x86_64" + # In case of 64 bit system, use these lines + LIBDIR=/usr/lib64 +-- +2.7.4 + diff --git a/package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch b/package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch new file mode 100644 index 0000000000..636b722b70 --- /dev/null +++ b/package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch @@ -0,0 +1,42 @@ +From 27fd1c85ca95b5d66ab0241a08242a75b60b375c Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Thu, 14 Jul 2016 13:22:57 -0400 +Subject: [PATCH] Change sepolicy python install arguments to be a variable + +To allow the python install arguments to be overwritten, change the +arguments to be a variable. This also cleans up the DESTDIR detection a +little bit. + +Updated to work with version 2.5 + +Signed-off-by: Clayton Shotwell +Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett +--- + policycoreutils/sepolicy/Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/sepolicy/Makefile b/sepolicy/Makefile +index a16f8de..2013301 100644 +--- a/sepolicy/Makefile ++++ b/sepolicy/Makefile +@@ -1,4 +1,7 @@ + PYTHON ?= python ++ifneq ($(DESTDIR),) ++PYTHON_INSTALL_ARGS ?= --root $(DESTDIR) ++endif + + # Installation directories. + PREFIX ?= $(DESTDIR)/usr +@@ -32,7 +35,7 @@ test: + @$(PYTHON) test_sepolicy.py -v + + install: +- $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` ++ $(PYTHON) setup.py install $(PYTHON_INSTALL_ARGS) + [ -d $(BINDIR) ] || mkdir -p $(BINDIR) + install -m 755 sepolicy.py $(BINDIR)/sepolicy + (cd $(BINDIR); ln -sf sepolicy sepolgen) +-- +2.7.4 + diff --git a/package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch b/package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch new file mode 100644 index 0000000000..37ffac8de8 --- /dev/null +++ b/package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch @@ -0,0 +1,56 @@ +From d1bc28c5b2efe60a0ee04d9c171928d0f3475654 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Thu, 14 Jul 2016 13:26:23 -0400 +Subject: [PATCH] Check to see if DBUS is enabled. + +Adds a condition to prevent linking against dbus when at build time +dbus has not been enabled. + +Updated for 2.5. + +Signed-off-by: Matthew Weber +Signed-off-by: Adam Duskett +Signed-off-by: Adam Duskett +--- + policycoreutils/restorecond/Makefile | 2 ++ + policycoreutils/restorecond/user.c | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/restorecond/Makefile b/restorecond/Makefile +index 92a4a4d..95f38a6 100644 +--- a/restorecond/Makefile ++++ b/restorecond/Makefile +@@ -11,8 +11,10 @@ autostart_DATA = sealertauto.desktop + INITDIR ?= $(DESTDIR)/etc/rc.d/init.d + SELINUXDIR = $(DESTDIR)/etc/selinux + ++ifdef ENABLE_DBUS + DBUSFLAGS = -DHAVE_DBUS -I$(DESTDIR)/usr/include/dbus-1.0 -I$(DESTDIR)/usr/lib64/dbus-1.0/include -I$(DESTDIR)/usr/lib/dbus-1.0/include + DBUSLIB = -ldbus-glib-1 -ldbus-1 ++endif + + CFLAGS ?= -g -Werror -Wall -W + override CFLAGS += -I$(DESTDIR)/usr/include $(DBUSFLAGS) -I$(DESTDIR)/usr/include/glib-2.0 \ +diff --git a/restorecond/user.c b/restorecond/user.c +index 714aae7..a04cddb 100644 +--- a/restorecond/user.c ++++ b/restorecond/user.c +@@ -54,7 +54,6 @@ static const char *PATH="/org/selinux/Restorecond"; + static const char *INTERFACE="org.selinux.RestorecondIface"; + static const char *RULE="type='signal',interface='org.selinux.RestorecondIface'"; + +-static int local_lock_fd = -1; + + static DBusHandlerResult + signal_filter (DBusConnection *connection __attribute__ ((__unused__)), DBusMessage *message, void *user_data) +@@ -101,6 +100,7 @@ static int dbus_server(GMainLoop *loop) { + #include + #include + ++static int local_lock_fd = -1; + /* size of the event structure, not counting name */ + #define EVENT_SIZE (sizeof (struct inotify_event)) + /* reasonable guess as to size of 1024 events */ +-- +2.7.4 + diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in new file mode 100644 index 0000000000..53238b4eac --- /dev/null +++ b/package/policycoreutils/Config.in @@ -0,0 +1,61 @@ +comment "policycoreutils needs a glibc toolchain w/ threads, dynamic library" + depends on !BR2_arc + depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +config BR2_PACKAGE_POLICYCOREUTILS + bool "policycoreutils" + select BR2_PACKAGE_LIBSEMANAGE + select BR2_PACKAGE_LIBCAP_NG + depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage + depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage + depends on !BR2_STATIC_LIBS #libsemanage + depends on !BR2_arc # libsemanage + depends on BR2_TOOLCHAIN_USES_GLIBC # libsemanage + help + Policycoreutils is a collection of policy utilities (originally + the "core" set of utilities needed to use SELinux, although it + has grown a bit over time), which have different dependencies. + sestatus, secon, run_init, and newrole only use libselinux. + load_policy and setfiles only use libselinux and libsepol. + semodule and semanage use libsemanage (and thus bring in + dependencies on libsepol and libselinux as well). setsebool + uses libselinux to make non-persistent boolean changes (via + the kernel interface) and uses libsemanage to make persistent + boolean changes. + + The base package will install the following utilities: + load_policy + newrole + restorecond + run_init + secon + semodule + semodule_deps + semodule_expand + semodule_link + semodule_package + sepolgen-ifgen + sestatus + setfiles + setsebool + + http://selinuxproject.org/page/Main_Page + +if BR2_PACKAGE_POLICYCOREUTILS + +config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND + bool "restorecond" + select BR2_PACKAGE_LIBGLIB2 + depends on BR2_USE_WCHAR # glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 + help + Enable restorecond to be built + +comment "restorecond needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +endif diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash new file mode 100644 index 0000000000..44cb0c362c --- /dev/null +++ b/package/policycoreutils/policycoreutils.hash @@ -0,0 +1,2 @@ +# https://github.com/SELinuxProject/selinux/wiki/Releases +sha256 329382cfe9fa977678abf541dcd8fe3847cf0c83b24654c8f7322343907078a1 policycoreutils-2.5.tar.gz diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk new file mode 100644 index 0000000000..b43569fc99 --- /dev/null +++ b/package/policycoreutils/policycoreutils.mk @@ -0,0 +1,119 @@ +################################################################################ +# +# policycoreutils +# +################################################################################ + +POLICYCOREUTILS_VERSION = 2.5 +POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223 +POLICYCOREUTILS_LICENSE = GPLv2 +POLICYCOREUTILS_LICENSE_FILES = COPYING + +POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +POLICYCOREUTILS_DEPENDENCIES += linux-pam +POLICYCOREUTILS_MAKE_OPTS += NAMESPACE_PRIV=y +define POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS + $(INSTALL) -D -m 0644 $(@D)/newrole/newrole-lspp.pamd $(TARGET_DIR)/etc/pam.d/newrole + $(INSTALL) -D -m 0644 $(@D)/run_init/run_init.pamd $(TARGET_DIR)/etc/pam.d/run_init +endef +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +POLICYCOREUTILS_DEPENDENCIES += audit +POLICYCOREUTILS_MAKE_OPTS += AUDIT_LOG_PRIV=y +endif + +# Enable LSPP_PRIV if both audit and linux pam are enabled +ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_PACKAGE_AUDIT),yy) +POLICYCOREUTILS_MAKE_OPTS += LSPP_PRIV=y +endif + +# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h +# large file support. +# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information +POLICYCOREUTILS_MAKE_OPTS += \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ + ARCH="$(BR2_ARCH)" + +POLICYCOREUTILS_MAKE_DIRS = \ + load_policy newrole run_init \ + secon semodule semodule_deps \ + semodule_expand semodule_link \ + semodule_package sepolgen-ifgen \ + sestatus setfiles setsebool + +ifeq ($(BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND),y) +POLICYCOREUTILS_MAKE_DIRS += restorecond +endif +# We need to pass DESTDIR at build time because it's used by +# policycoreutils build system to find headers and libraries. +define POLICYCOREUTILS_BUILD_CMDS + $(foreach d,$(POLICYCOREUTILS_MAKE_DIRS), + $(MAKE) -C $(@D)/$(d) $(POLICYCOREUTILS_MAKE_OPTS) \ + DESTDIR=$(STAGING_DIR) all + ) +endef + +define POLICYCOREUTILS_INSTALL_TARGET_CMDS + $(foreach d,$(POLICYCOREUTILS_MAKE_DIRS), + $(MAKE) -C $(@D)/$(d) $(POLICYCOREUTILS_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) install + ) +endef + +HOST_POLICYCOREUTILS_DEPENDENCIES = \ + host-libsemanage host-dbus-glib \ + host-sepolgen host-setools + +# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h +# large file support. +# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information +HOST_POLICYCOREUTILS_MAKE_OPTS = \ + $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS) -U_FILE_OFFSET_BITS" \ + PYTHON="$(HOST_DIR)/usr/bin/python" \ + PYTHON_INSTALL_ARGS="$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)" \ + ARCH="$(HOSTARCH)" + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +HOST_POLICYCOREUTILS_DEPENDENCIES += host-python3 +HOST_POLICYCOREUTILS_MAKE_OPTS += \ + PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" +else +HOST_POLICYCOREUTILS_DEPENDENCIES += host-python +HOST_POLICYCOREUTILS_MAKE_OPTS += \ + PYLIBVER="python$(PYTHON_VERSION_MAJOR)" +endif + +# Note: We are only building the programs required by the refpolicy build +HOST_POLICYCOREUTILS_MAKE_DIRS = \ + load_policy semodule semodule_deps \ + semodule_expand semodule_link \ + semodule_package setfiles restorecond \ + audit2allow scripts semanage sepolicy + +# We need to pass DESTDIR at build time because it's used by +# policycoreutils build system to find headers and libraries. +define HOST_POLICYCOREUTILS_BUILD_CMDS + $(foreach d,$(HOST_POLICYCOREUTILS_MAKE_DIRS), + $(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) \ + DESTDIR=$(HOST_DIR) all + ) +endef + +define HOST_POLICYCOREUTILS_INSTALL_CMDS + $(foreach d,$(HOST_POLICYCOREUTILS_MAKE_DIRS), + $(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) \ + DESTDIR=$(HOST_DIR) install + ) + # Fix python paths + $(SED) 's%/usr/bin/%$(HOST_DIR)/usr/bin/%g' $(HOST_DIR)/usr/bin/audit2allow + $(SED) 's%/usr/bin/%$(HOST_DIR)/usr/bin/%g' $(HOST_DIR)/usr/bin/sepolgen-ifgen + $(SED) 's%/usr/bin/%$(HOST_DIR)/usr/bin/%g' $(HOST_DIR)/usr/bin/sepolicy +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) From 5a3e1a129bc7f3be5ad946a25faecafc3755a25a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 10 Dec 2016 15:49:44 +0100 Subject: [PATCH 1793/3392] DEVELOPERS: regroup the two entries for Clayton Shotwell Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 23d4329720..de630403f1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -324,10 +324,8 @@ F: package/targetcli-fb/ N: Clayton Shotwell F: package/audit/ -F: package/cpio/ - -N: Clayton Shotwell F: package/checkpolicy/ +F: package/cpio/ F: package/libcgroup/ F: package/libee/ F: package/libestr/ From 0c99704adf7e6990d10aa4df72f23d97cff78caf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 10 Dec 2016 15:50:16 +0100 Subject: [PATCH 1794/3392] DEVELOPERS: add Clayton Shotwell for policycoreutils Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index de630403f1..94cfe6c2f9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -333,6 +333,7 @@ F: package/liblogging/ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ +F: package/policycoreutils/ F: package/sepolgen/ F: package/ustr/ From 41e5c94c5661afcff45d222551f317a3b84b17d7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 10 Dec 2016 15:44:42 +0100 Subject: [PATCH 1795/3392] uclibc: add various upstream patches Fix some static linking issues for Xtensa/Blackfin. Optimize the size for non-threaded static binaries and fix static C/C++ applications when running on the target. Fix noMMU madvise declarations. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...ux-common-madvise.c-disable-on-noMMU.patch | 31 +++++++ ....h-remove-madvise-posix_madvise-prot.patch | 36 ++++++++ .../uclibc/0003-bfin-fix-a-gcc-warning.patch | 25 ++++++ ...-static-linking-for-FDPIC-toolchains.patch | 49 +++++++++++ .../0005-xtensa-fix-static-linking.patch | 60 ++++++++++++++ ...ptimize-single-threaded-applications.patch | 83 +++++++++++++++++++ 6 files changed, 284 insertions(+) create mode 100644 package/uclibc/0001-libc-sysdeps-linux-common-madvise.c-disable-on-noMMU.patch create mode 100644 package/uclibc/0002-include-sys-mman.h-remove-madvise-posix_madvise-prot.patch create mode 100644 package/uclibc/0003-bfin-fix-a-gcc-warning.patch create mode 100644 package/uclibc/0004-fix-static-linking-for-FDPIC-toolchains.patch create mode 100644 package/uclibc/0005-xtensa-fix-static-linking.patch create mode 100644 package/uclibc/0006-threads-optimize-single-threaded-applications.patch diff --git a/package/uclibc/0001-libc-sysdeps-linux-common-madvise.c-disable-on-noMMU.patch b/package/uclibc/0001-libc-sysdeps-linux-common-madvise.c-disable-on-noMMU.patch new file mode 100644 index 0000000000..bc971536b9 --- /dev/null +++ b/package/uclibc/0001-libc-sysdeps-linux-common-madvise.c-disable-on-noMMU.patch @@ -0,0 +1,31 @@ +From bf7a84dc1fd8c9c340222260cb3e53019715088c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 7 Dec 2016 23:18:49 +0100 +Subject: [PATCH] libc/sysdeps/linux/common/madvise.c: disable on noMMU + architectures + +Similar to what was done in commit +9945c6d21797553e78cbef8034f6dd16b3824df5 for posix_madvise(). + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Waldemar Brodkorb +--- + libc/sysdeps/linux/common/madvise.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libc/sysdeps/linux/common/madvise.c b/libc/sysdeps/linux/common/madvise.c +index e953d7b..bb486d2 100644 +--- a/libc/sysdeps/linux/common/madvise.c ++++ b/libc/sysdeps/linux/common/madvise.c +@@ -9,6 +9,8 @@ + + #include + #include ++#ifdef __ARCH_USE_MMU__ + #if defined __NR_madvise && defined __USE_BSD + _syscall3(int, madvise, void *, __addr, size_t, __len, int, __advice) ++#endif /* __ARCH_USE_MMU__ */ + #endif +-- +2.1.4 + diff --git a/package/uclibc/0002-include-sys-mman.h-remove-madvise-posix_madvise-prot.patch b/package/uclibc/0002-include-sys-mman.h-remove-madvise-posix_madvise-prot.patch new file mode 100644 index 0000000000..1d0d8a63c6 --- /dev/null +++ b/package/uclibc/0002-include-sys-mman.h-remove-madvise-posix_madvise-prot.patch @@ -0,0 +1,36 @@ +From 25a60624713990c637f125e094e968ff4655307c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 7 Dec 2016 23:20:18 +0100 +Subject: [PATCH] include/sys/mman.h: remove madvise/posix_madvise + prototypes on noMMU + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Waldemar Brodkorb +--- + include/sys/mman.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/sys/mman.h b/include/sys/mman.h +index 71d553a..fc8fce5 100644 +--- a/include/sys/mman.h ++++ b/include/sys/mman.h +@@ -99,6 +99,7 @@ static __inline__ int msync (void *__addr, size_t __len, int __flags) { return 0 + + #endif + ++#ifdef __ARCH_USE_MMU__ + #if defined __USE_BSD && (defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__) + /* Advise the system about particular usage patterns the program follows + for the region starting at ADDR and extending LEN bytes. */ +@@ -108,6 +109,8 @@ extern int madvise (void *__addr, size_t __len, int __advice) __THROW; + /* This is the POSIX name for this function. */ + extern int posix_madvise (void *__addr, size_t __len, int __advice) __THROW; + #endif ++#endif /* __ARCH_USE_MMU__ */ ++ + + #if defined __UCLIBC_HAS_REALTIME__ + # ifdef __ARCH_USE_MMU__ +-- +2.1.4 + diff --git a/package/uclibc/0003-bfin-fix-a-gcc-warning.patch b/package/uclibc/0003-bfin-fix-a-gcc-warning.patch new file mode 100644 index 0000000000..2463e6ca55 --- /dev/null +++ b/package/uclibc/0003-bfin-fix-a-gcc-warning.patch @@ -0,0 +1,25 @@ +From 1f79f41508d0f9c30be812bea9b84fd7900a273e Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Thu, 8 Dec 2016 04:07:47 +0100 +Subject: [PATCH] bfin: fix a gcc warning + +Signed-off-by: Waldemar Brodkorb +--- + ldso/ldso/bfin/dl-sysdep.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h +index 5758117..4262a26 100644 +--- a/ldso/ldso/bfin/dl-sysdep.h ++++ b/ldso/ldso/bfin/dl-sysdep.h +@@ -93,6 +93,6 @@ static __always_inline void + elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr, + Elf32_Word relative_count) + { +- return 0; ++ return; + } + #endif +-- +2.1.4 + diff --git a/package/uclibc/0004-fix-static-linking-for-FDPIC-toolchains.patch b/package/uclibc/0004-fix-static-linking-for-FDPIC-toolchains.patch new file mode 100644 index 0000000000..3dc778f881 --- /dev/null +++ b/package/uclibc/0004-fix-static-linking-for-FDPIC-toolchains.patch @@ -0,0 +1,49 @@ +From 569914be2e968a1bda8b4982ca97c1524635174e Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Thu, 8 Dec 2016 04:36:10 +0100 +Subject: [PATCH] fix static linking for FDPIC toolchains + +Fixes following problem, when trying to compile a simple +C application statically with a FDPIC toolchain (for example +with Blackfin architecture): +lib/libc.a(libdl.os): In function `do_dlclose': +(.text+0x6be): undefined reference to `_dl_free' +.. + +Signed-off-by: Waldemar Brodkorb +--- + ldso/libdl/libdl.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c +index 0cf3b70..04d7c43 100644 +--- a/ldso/libdl/libdl.c ++++ b/ldso/libdl/libdl.c +@@ -30,6 +30,14 @@ + */ + + ++/* When libdl is linked in statically into libc.a, we need to replace ++ * these symbols that otherwise would have been loaded in from ldso. ++ * This must be before including ldso.h */ ++#ifndef SHARED ++#define _dl_malloc malloc ++#define _dl_free free ++#endif ++ + #include + #include + #include +@@ -86,9 +94,6 @@ extern char *_dl_debug; + + #else /* !SHARED */ + +-#define _dl_malloc malloc +-#define _dl_free free +- + /* When libdl is linked as a static library, we need to replace all + * the symbols that otherwise would have been loaded in from ldso... */ + +-- +2.1.4 + diff --git a/package/uclibc/0005-xtensa-fix-static-linking.patch b/package/uclibc/0005-xtensa-fix-static-linking.patch new file mode 100644 index 0000000000..7a96bf7fa3 --- /dev/null +++ b/package/uclibc/0005-xtensa-fix-static-linking.patch @@ -0,0 +1,60 @@ +From 6579597083e608f5a66fe8a898d113c2588e2c8f Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 7 Dec 2016 07:59:34 +0100 +Subject: [PATCH] xtensa: fix static linking + +uClibc-ng 1.0.20 fixed static linking with "libdl" by adding all libdl functions +into the libc. On xtensa, though, libdl contains an unresolved reference that is +satisfied by the ld.so - which is not a part of the linking in a static case. + +Signed-off-by: Alexey Neyman +Acked-by: Max Filippov +Signed-off-by: Waldemar Brodkorb +--- + libpthread/nptl/sysdeps/Makefile.commonarch | 5 +++-- + libpthread/nptl/sysdeps/xtensa/Makefile.arch | 2 +- + libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S | 1 + + 3 files changed, 5 insertions(+), 3 deletions(-) + create mode 100644 libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S + +diff --git a/libpthread/nptl/sysdeps/Makefile.commonarch b/libpthread/nptl/sysdeps/Makefile.commonarch +index c206ac9..134eade 100644 +--- a/libpthread/nptl/sysdeps/Makefile.commonarch ++++ b/libpthread/nptl/sysdeps/Makefile.commonarch +@@ -32,10 +32,11 @@ libpthread_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libpthread_ar + libpthread_arch_OBJS = $(libpthread_subarch_OBJS) $(libpthread_arch_COBJ) $(libpthread_arch_SOBJ) + + libc_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_CSRC)) +-libc_arch_SOBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC)) ++libc_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC)) + libc_arch_OBJS = $(libc_arch_COBJ) $(libc_arch_SOBJ) + libc_arch_a_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_a_CSRC)) +-libc_arch_a_OBJS = $(libc_arch_a_COBJ) ++libc_arch_a_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_a_SSRC)) ++libc_arch_a_OBJS = $(libc_arch_a_COBJ) $(libc_arch_a_SOBJ) + + librt_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(librt_arch_CSRC)) + librt_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(librt_arch_SSRC)) +diff --git a/libpthread/nptl/sysdeps/xtensa/Makefile.arch b/libpthread/nptl/sysdeps/xtensa/Makefile.arch +index 9e63b19..642e4ba 100644 +--- a/libpthread/nptl/sysdeps/xtensa/Makefile.arch ++++ b/libpthread/nptl/sysdeps/xtensa/Makefile.arch +@@ -20,7 +20,7 @@ ASFLAGS-pthread_spin_lock.S = -DNOT_IN_libc -DIS_IN_libpthread + ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread + + libc_arch_a_CSRC = libc-tls.c +-librt_arch_a_SSRC = dl-tlsdesc.S ++libc_arch_a_SSRC = libc-dl-tlsdesc.S + + CFLAGS-gen_tlsdesc.c = -S + $(libpthread_arch_OUT)/gen_tlsdesc.c: $(libpthread_arch_DIR)/tlsdesc.sym | $(libpthread_arch_OUT) +diff --git a/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S b/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S +new file mode 100644 +index 0000000..39da7c2 +--- /dev/null ++++ b/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S +@@ -0,0 +1 @@ ++#include +-- +2.1.4 + diff --git a/package/uclibc/0006-threads-optimize-single-threaded-applications.patch b/package/uclibc/0006-threads-optimize-single-threaded-applications.patch new file mode 100644 index 0000000000..2983820b0f --- /dev/null +++ b/package/uclibc/0006-threads-optimize-single-threaded-applications.patch @@ -0,0 +1,83 @@ +From 5ca03df6978345c297225212cc0ca33d476b0272 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 7 Dec 2016 07:56:44 +0100 +Subject: [PATCH] threads: optimize single threaded applications + +Revert the removal of the weak pthread functions and +guarantee a link order so that single threaded applications +doesn't link in all the pthread functions they don't use. + +Signed-off-by: Max Filippov +Tested-by: Waldemar Brodkorb +Signed-off-by: Waldemar Brodkorb +--- + libc/misc/internals/Makefile.in | 4 +++- + libc/misc/internals/__uClibc_main.c | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 40 insertions(+), 1 deletion(-) + +diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in +index ae094ee..ce7f75a 100644 +--- a/libc/misc/internals/Makefile.in ++++ b/libc/misc/internals/Makefile.in +@@ -25,7 +25,9 @@ libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.oS + else + libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.os + endif +-libc-static-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o ++# link order is important to not pull in pthread functions, when ++# a single threaded application is statically linked ++libc-static-y := $(MISC_INTERNALS_OUT)/__uClibc_main.o $(libc-static-y) + libc-static-$(UCLIBC_FORMAT_FLAT_SEP_DATA) += \ + $(MISC_INTERNALS_OUT)/shared_flat_initfini.o \ + $(MISC_INTERNALS_OUT)/shared_flat_add_library.o +diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c +index 46e24d8..d80565e 100644 +--- a/libc/misc/internals/__uClibc_main.c ++++ b/libc/misc/internals/__uClibc_main.c +@@ -68,6 +68,43 @@ uintptr_t __stack_chk_guard attribute_relro; + + void internal_function _dl_aux_init (ElfW(auxv_t) *av); + ++#ifdef __UCLIBC_HAS_THREADS__ ++/* ++ * uClibc internal locking requires that we have weak aliases ++ * for dummy functions in case a single threaded application is linked. ++ * This needs to be in compilation unit that is pulled always ++ * in or linker will disregard these weaks. ++ */ ++ ++static int __pthread_return_0 (pthread_mutex_t *unused) { return 0; } ++weak_alias (__pthread_return_0, __pthread_mutex_lock) ++weak_alias (__pthread_return_0, __pthread_mutex_trylock) ++weak_alias (__pthread_return_0, __pthread_mutex_unlock) ++ ++int weak_function ++__pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr) ++{ ++ return 0; ++} ++ ++void weak_function ++_pthread_cleanup_push_defer(struct _pthread_cleanup_buffer *__buffer, ++ void (*__routine) (void *), void *__arg) ++{ ++ __buffer->__routine = __routine; ++ __buffer->__arg = __arg; ++} ++ ++void weak_function ++_pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer, ++ int __execute) ++{ ++ if (__execute) ++ __buffer->__routine(__buffer->__arg); ++} ++ ++#endif /* __UCLIBC_HAS_THREADS__ */ ++ + #endif /* !SHARED */ + + /* Defeat compiler optimization which assumes function addresses are never NULL */ +-- +2.1.4 + From 69c365a9d1c820ba64482e06e0907471372f790d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 8 Dec 2016 18:23:31 +0100 Subject: [PATCH 1796/3392] sdl_mixer: fix static linking issue LDFLAGS must be passed when creating binaries. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../0002-add-LDFLAGS-while-linking.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch diff --git a/package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch b/package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch new file mode 100644 index 0000000000..4144660741 --- /dev/null +++ b/package/sdl_mixer/0002-add-LDFLAGS-while-linking.patch @@ -0,0 +1,29 @@ +Pass LDFLAGS while creating binaries. + +Fixes following linking error with uClibc-ng: +br/output/host/usr/lib/gcc/powerpc-buildroot-linux-uclibc/5.4.0/libgcc.a(unwind-dw2-fde-dip.o): In function `_Unwind_Find_FDE': +br/output/build/host-gcc-final-5.4.0/build/powerpc-buildroot-linux-uclibc/libgcc/../../../libgcc/unwind-dw2-fde-dip.c:465: undefined reference to `dl_iterate_phdr' +collect2: error: ld returned 1 exit status + +Since uClibc-ng 1.0.18 a circular dependency between libc and libgcc +exist, when static linking is used. It can be resolved by the compiler +when -static is correctly passed in the linking step. + +Signed-off-by: Waldemar Brodkorb + +diff -Nur SDL_mixer-1.2.12.orig/Makefile.in SDL_mixer-1.2.12/Makefile.in +--- SDL_mixer-1.2.12.orig/Makefile.in 2012-01-15 23:01:04.000000000 +0100 ++++ SDL_mixer-1.2.12/Makefile.in 2016-12-07 08:29:22.479786596 +0100 +@@ -66,10 +66,10 @@ + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + + $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) +- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) ++ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET) + + $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) +- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) ++ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET) + + install: all install-hdrs install-lib #install-bin + install-hdrs: From 9de6da214fe32d7c8ad114ddf37d28a5ac342778 Mon Sep 17 00:00:00 2001 From: Bimal Jacob Date: Wed, 7 Dec 2016 12:34:44 -0600 Subject: [PATCH 1797/3392] angular-websocket: new package Signed-off-by: Bimal Jacob Signed-off-by: Matt Weber [Thomas: - Move to a submenu "External AngularJS plugins", much like we have an "External JQuery plugins" menu. Therefore, remove the "select BR2_PACKAGE_ANGULARJS" from the package, since angular-websocket/Config.in is now included only if BR2_PACKAGE_ANGULARJS is defined. - Add hash file.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 5 +++++ package/angular-websocket/Config.in | 7 +++++++ .../angular-websocket/angular-websocket.hash | 2 ++ package/angular-websocket/angular-websocket.mk | 18 ++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 package/angular-websocket/Config.in create mode 100644 package/angular-websocket/angular-websocket.hash create mode 100644 package/angular-websocket/angular-websocket.mk diff --git a/package/Config.in b/package/Config.in index a58147ab64..5574d01f25 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1074,6 +1074,11 @@ endmenu menu "Javascript" source "package/angularjs/Config.in" +if BR2_PACKAGE_ANGULARJS +menu "External AngularJS plugins" + source "package/angular-websocket/Config.in" +endmenu +endif source "package/bootstrap/Config.in" source "package/explorercanvas/Config.in" source "package/flot/Config.in" diff --git a/package/angular-websocket/Config.in b/package/angular-websocket/Config.in new file mode 100644 index 0000000000..0981bd0d52 --- /dev/null +++ b/package/angular-websocket/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_ANGULAR_WEBSOCKET + bool "angular-websocket" + help + An AngularJS WebSocket service for connecting client + applications to servers. + + https://github.com/AngularClass/angular-websocket diff --git a/package/angular-websocket/angular-websocket.hash b/package/angular-websocket/angular-websocket.hash new file mode 100644 index 0000000000..36700684b9 --- /dev/null +++ b/package/angular-websocket/angular-websocket.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-v2.0.0.tar.gz diff --git a/package/angular-websocket/angular-websocket.mk b/package/angular-websocket/angular-websocket.mk new file mode 100644 index 0000000000..b422847e2d --- /dev/null +++ b/package/angular-websocket/angular-websocket.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# angular-websocket +# +################################################################################ + +ANGULAR_WEBSOCKET_VERSION = v2.0.0 +ANGULAR_WEBSOCKET_SITE = $(call github,AngularClass,angular-websocket,$(ANGULAR_WEBSOCKET_VERSION)) +ANGULAR_WEBSOCKET_LICENSE = MIT +ANGULAR_WEBSOCKET_LICENSE_FILES = LICENSE + +# install .min.js as .js +define ANGULAR_WEBSOCKET_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(@D)/dist/angular-websocket.min.js \ + $(TARGET_DIR)/var/www/angular-websocket.js +endef + +$(eval $(generic-package)) From 954f21ac48a895c9c5da8da10c8ca2c336204a00 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 10 Dec 2016 21:04:16 +0100 Subject: [PATCH 1798/3392] gupnp-tools: bump to version 0.8.13 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...compiling-when-using-recent-GUPnP-AV.patch | 27 ------------------- package/gupnp-tools/gupnp-tools.hash | 4 +-- package/gupnp-tools/gupnp-tools.mk | 2 +- 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 package/gupnp-tools/0001-Fix-compiling-when-using-recent-GUPnP-AV.patch diff --git a/package/gupnp-tools/0001-Fix-compiling-when-using-recent-GUPnP-AV.patch b/package/gupnp-tools/0001-Fix-compiling-when-using-recent-GUPnP-AV.patch deleted file mode 100644 index 6d3769fbe4..0000000000 --- a/package/gupnp-tools/0001-Fix-compiling-when-using-recent-GUPnP-AV.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e9ec9634207e4c2eea6d268ee29b57e687c1f178 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sun, 16 Oct 2016 21:51:39 +0200 -Subject: av-cp: Fix compiling when using recent GUPnP-AV - -Include gupnp.h ourselves, gupnp-av.h doesn't drag it in anymore - -Signed-off-by: Jens Georg ---- - src/av-cp/playlist-treeview.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/av-cp/playlist-treeview.h b/src/av-cp/playlist-treeview.h -index 8637ae8..16b131e 100644 ---- a/src/av-cp/playlist-treeview.h -+++ b/src/av-cp/playlist-treeview.h -@@ -23,6 +23,8 @@ - - #include - #include -+ -+#include - #include - - typedef void (* MetadataFunc) (const char *metadata, --- -cgit v0.12 diff --git a/package/gupnp-tools/gupnp-tools.hash b/package/gupnp-tools/gupnp-tools.hash index 0d37a87722..f08b4f5e01 100644 --- a/package/gupnp-tools/gupnp-tools.hash +++ b/package/gupnp-tools/gupnp-tools.hash @@ -1,2 +1,2 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.12.sha256sum: -sha256 658de96953608c4b1f47578ae563a7066d1f1983565daf22ad52b7b328ef97b1 gupnp-tools-0.8.12.tar.xz +# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.13.sha256sum: +sha256 aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed gupnp-tools-0.8.13.tar.xz diff --git a/package/gupnp-tools/gupnp-tools.mk b/package/gupnp-tools/gupnp-tools.mk index 75920db09a..07b5d3c1c5 100644 --- a/package/gupnp-tools/gupnp-tools.mk +++ b/package/gupnp-tools/gupnp-tools.mk @@ -5,7 +5,7 @@ ################################################################################ GUPNP_TOOLS_VERSION_MAJOR = 0.8 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).12 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).13 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) From dac3cdd0cf4157348b6a2e8e926a152a03d9aec5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Dec 2016 20:21:44 +0100 Subject: [PATCH 1799/3392] package/jpeg-turbo: bump version to 1.5.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/jpeg-turbo/jpeg-turbo.hash | 8 ++++---- package/jpeg-turbo/jpeg-turbo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index a38a5afae7..93b245ebdb 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,5 +1,5 @@ -# From http://sourceforge.net/projects/libjpeg-turbo/files/1.4.2/ -sha1 2666158ccd5318513f875867bbc4af52f6eb9f0b libjpeg-turbo-1.4.2.tar.gz -md5 86b0d5f7507c2e6c21c00219162c3c44 libjpeg-turbo-1.4.2.tar.gz +# From http://sourceforge.net/projects/libjpeg-turbo/files/1.5.1/ +sha1 ebb3f9e94044c77831a3e8c809c7ea7506944622 libjpeg-turbo-1.5.1.tar.gz +md5 55deb139b0cac3c8200b75d485fc13f3 libjpeg-turbo-1.5.1.tar.gz # Locally computed -sha256 521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e libjpeg-turbo-1.4.2.tar.gz +sha256 41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c libjpeg-turbo-1.5.1.tar.gz diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index 454b648c73..c0a430c7d3 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 1.4.2 +JPEG_TURBO_VERSION = 1.5.1 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like) From a10af5177901f03a6c851cb3c48a7920398af0d8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Dec 2016 20:22:35 +0100 Subject: [PATCH 1800/3392] package/libpng: bump version to 1.6.26 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libpng/libpng.hash | 6 +++--- package/libpng/libpng.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index cc4bde2887..d2c377da58 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,4 +1,4 @@ -# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.25/ -sha1 fb471b7732d886b5adf10b4d689a90c88f005aa5 libpng-1.6.25.tar.xz +# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.26/ +sha1 7a50569b26d57db9810409a59f1b87f8a8e387a3 libpng-1.6.26.tar.xz # Locally computed: -sha256 09fe8d8341e8bfcfb3263100d9ac7ea2155b28dd8535f179111c1672ac8d8811 libpng-1.6.25.tar.xz +sha256 266743a326986c3dbcee9d89b640595f6b16a293fd02b37d8c91348d317b73f9 libpng-1.6.26.tar.xz diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index c577cd5477..abb49288a6 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.25 +LIBPNG_VERSION = 1.6.26 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION) From bc90a56c70d7dce1f61fb1d03ecf64417adee7b0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Dec 2016 20:24:19 +0100 Subject: [PATCH 1801/3392] package/libass: bump version to 0.13.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libass/libass.hash | 2 +- package/libass/libass.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index cb5016d93d..d1e9022c82 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a641b653d7c9f2f3b9d6a5e5a906a004ac3e110487ad485d9dd029e944bb3f6d libass-0.13.3.tar.xz +sha256 d84a2fc89011b99d87fc47af91906622707c165d1860e9f774825ebbbc9c9fb6 libass-0.13.4.tar.xz diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 0e296ca266..9fe967fdc0 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.13.3 +LIBASS_VERSION = 0.13.4 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. From f93c10ca87f4452209a4c2adc49924b0c6ffdb59 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Dec 2016 20:30:29 +0100 Subject: [PATCH 1802/3392] package/taglib: bump version to 1.11.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/taglib/taglib.hash | 2 +- package/taglib/taglib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/taglib/taglib.hash b/package/taglib/taglib.hash index a3cfc79f24..7a5c5cf98c 100644 --- a/package/taglib/taglib.hash +++ b/package/taglib/taglib.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ed4cabb3d970ff9a30b2620071c2b054c4347f44fc63546dbe06f97980ece288 taglib-1.11.tar.gz +sha256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b taglib-1.11.1.tar.gz diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk index 0a2ca4dcd4..f47c4ba43f 100644 --- a/package/taglib/taglib.mk +++ b/package/taglib/taglib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TAGLIB_VERSION = 1.11 +TAGLIB_VERSION = 1.11.1 TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES TAGLIB_LICENSE = LGPLv2.1, MPL From 9365007e19f1cdd272b6d4b74c1f4fee81bda777 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 10 Dec 2016 16:57:13 +0100 Subject: [PATCH 1803/3392] package/matchbox-lib: fix xlib libcomposite and libxpm symbols Signed-off-by: Romain Naour Cc: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/matchbox-lib/matchbox-lib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk index d43e2b8c3b..451279e6d4 100644 --- a/package/matchbox-lib/matchbox-lib.mk +++ b/package/matchbox-lib/matchbox-lib.mk @@ -21,8 +21,8 @@ endef MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES -ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) -ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) MATCHBOX_LIB_DEPENDENCIES += xlib_libXpm endif endif From d5479be52cd3362aa886a0bb100fb978462deb46 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sun, 11 Dec 2016 13:30:28 +0530 Subject: [PATCH 1804/3392] mimic: fix legal info Name of license file is 'COPYING'. Fixes: http://autobuild.buildroot.net/results/846/846b42d484e8d3e261eb3699a485d589f6bbab62 Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/mimic/mimic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mimic/mimic.mk b/package/mimic/mimic.mk index 66fe9a9ab2..2d246561c9 100644 --- a/package/mimic/mimic.mk +++ b/package/mimic/mimic.mk @@ -7,7 +7,7 @@ MIMIC_VERSION = 1.1.0 MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION)) MIMIC_LICENSE = MIT -MIMIC_LICENSE_FILES = LICENSE +MIMIC_LICENSE_FILES = COPYING MIMIC_DEPENDENCIES = host-pkgconf From 2063014ff2ee845e00d600fbd699df05c2efa72f Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sun, 11 Dec 2016 13:30:29 +0530 Subject: [PATCH 1805/3392] jpeg-turbo: fix legal info Update name of license file Fixes: http://autobuild.buildroot.net/results/e97/e97edb7dc573912fd140ac681952634584e9ab32 Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/jpeg-turbo/jpeg-turbo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index c0a430c7d3..91d6b4ea2a 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -8,7 +8,7 @@ JPEG_TURBO_VERSION = 1.5.1 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like) -JPEG_TURBO_LICENSE_FILES = README README-turbo.txt +JPEG_TURBO_LICENSE_FILES = LICENSE.md JPEG_TURBO_INSTALL_STAGING = YES JPEG_TURBO_PROVIDES = jpeg From cf294289683f0b0d524247f8402a13bfbe3d65c7 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 10 Dec 2016 22:29:08 +0100 Subject: [PATCH 1806/3392] package/enlightenment: remove uClibc 0.9.33 workaround This workaround was added for uClibc <= 0.9.33.2 by commit [1]. This issue has been fixed long time ago in uClibc-ng for powerpc [2], sparc and xtensa [3]. Nowadays, enlightenment can't be selected for xtensa ans sparc due to luajit dependency from the efl stack and uClibc 0.9.33 was removed from Buildroot since 2016.02 release. [1] https://git.buildroot.net/buildroot/commit/?id=37acd25ee1376de5734415ac60be16991ee6d150 [2] http://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=90298bc4fb1303151d6213d13beefcf9b378c5e1 [3] https://git.buildroot.net/buildroot/commit/?id=0b056944f5878304f51af3e9edb6d596f24fc370 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/enlightenment/enlightenment.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index 1cbf59845c..c9361406f9 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -30,11 +30,6 @@ else ENLIGHTENMENT_CONF_OPTS += --disable-systemd endif -# uClibc has an old incomplete sys/ptrace.h for powerpc & sparc -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_powerpc)$(BR2_sparc),yy) -ENLIGHTENMENT_CONF_ENV += ac_cv_header_sys_ptrace_h=no -endif - # alsa backend needs mixer support ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) ENLIGHTENMENT_DEPENDENCIES += alsa-lib From 9c9de1e2b5d29e171ec98d2fab778f1806ea3ebb Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Sat, 10 Dec 2016 20:37:59 +0100 Subject: [PATCH 1807/3392] darkhttpd: new package This new package provides darkhttpd, a simple, fast HTTP 1.1 web server for static content. Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/darkhttpd/Config.in | 14 +++++++++ package/darkhttpd/S50darkhttpd | 45 +++++++++++++++++++++++++++++ package/darkhttpd/darkhttpd.hash | 2 ++ package/darkhttpd/darkhttpd.mk | 34 ++++++++++++++++++++++ package/darkhttpd/darkhttpd.service | 11 +++++++ 6 files changed, 107 insertions(+) create mode 100644 package/darkhttpd/Config.in create mode 100755 package/darkhttpd/S50darkhttpd create mode 100644 package/darkhttpd/darkhttpd.hash create mode 100644 package/darkhttpd/darkhttpd.mk create mode 100644 package/darkhttpd/darkhttpd.service diff --git a/package/Config.in b/package/Config.in index 5574d01f25..f7e8c0ab9b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1466,6 +1466,7 @@ menu "Networking applications" source "package/ctorrent/Config.in" source "package/cups/Config.in" source "package/dante/Config.in" + source "package/darkhttpd/Config.in" source "package/dhcp/Config.in" source "package/dhcpcd/Config.in" source "package/dhcpdump/Config.in" diff --git a/package/darkhttpd/Config.in b/package/darkhttpd/Config.in new file mode 100644 index 0000000000..a5ab41ae22 --- /dev/null +++ b/package/darkhttpd/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_DARKHTTPD + bool "darkhttpd" + depends on BR2_USE_MMU # fork() + help + Darkhttpd is a simple, fast HTTP 1.1 web server which only + serves static content. It does not support PHP or CGI. + + The behavior of darkhttpd can be altered by setting some + variables in /etc/default/darkhttpd: + + - DARKHTTPD_ROOT: path to the server document root. + - DARKHTTPD_FLAGS: options to pass to darkhttpd. + + https://unix4lyfe.org/darkhttpd/ diff --git a/package/darkhttpd/S50darkhttpd b/package/darkhttpd/S50darkhttpd new file mode 100755 index 0000000000..913439f5a5 --- /dev/null +++ b/package/darkhttpd/S50darkhttpd @@ -0,0 +1,45 @@ +#!/bin/sh +# +# Starts darkhttpd. +# + +# Allow a few customizations from a config file +test -r /etc/default/darkhttpd && . /etc/default/darkhttpd + +DARKHTTPD_PROG=/usr/sbin/darkhttpd +DARKHTTPD_PIDFILE=/var/run/darkhttpd.pid +DARKHTTPD_ARGS="${DARKHTTPD_ROOT:-/var/www} --log /var/log/darkhttpd.log $DARKHTTPD_FLAGS --chroot --uid nobody --gid www-data" + +start() { + printf "Starting darkhttpd: " + start-stop-daemon -S -q -b -p $DARKHTTPD_PIDFILE -m --exec $DARKHTTPD_PROG -- $DARKHTTPD_ARGS + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +stop() { + printf "Stopping darkhttpd: " + start-stop-daemon -K -q -p $DARKHTTPD_PIDFILE + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/package/darkhttpd/darkhttpd.hash b/package/darkhttpd/darkhttpd.hash new file mode 100644 index 0000000000..39152e3cb9 --- /dev/null +++ b/package/darkhttpd/darkhttpd.hash @@ -0,0 +1,2 @@ +# Locally generated +sha256 a50417b622b32b5f421b3132cb94ebeff04f02c5fb87fba2e31147d23de50505 darkhttpd-1.12.tar.bz2 diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk new file mode 100644 index 0000000000..df80899371 --- /dev/null +++ b/package/darkhttpd/darkhttpd.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# darkhttpd +# +################################################################################ + +DARKHTTPD_VERSION = 1.12 +DARKHTTPD_SITE = https://unix4lyfe.org/darkhttpd +DARKHTTPD_SOURCE = darkhttpd-$(DARKHTTPD_VERSION).tar.bz2 +DARKHTTPD_LICENSE = MIT + +define DARKHTTPD_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define DARKHTTPD_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/darkhttpd \ + $(TARGET_DIR)/usr/sbin/darkhttpd +endef + +define DARKHTTPD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 package/darkhttpd/darkhttpd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/darkhttpd.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -fs ../../../../usr/lib/systemd/system/darkhttpd.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/darkhttpd.service +endef + +define DARKHTTPD_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/darkhttpd/S50darkhttpd \ + $(TARGET_DIR)/etc/init.d/S50darkhttpd +endef + +$(eval $(generic-package)) diff --git a/package/darkhttpd/darkhttpd.service b/package/darkhttpd/darkhttpd.service new file mode 100644 index 0000000000..17abd98ce7 --- /dev/null +++ b/package/darkhttpd/darkhttpd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Darkhttpd Web Server +After=syslog.target network.target auditd.service + +[Service] +Environment="DARKHTTPD_ROOT=/var/www" +EnvironmentFile=-/etc/default/darkhttpd +ExecStart=/usr/sbin/darkhttpd $DARKHTTPD_ROOT $DARKHTTPD_FLAGS --chroot --uid nobody --gid www-data + +[Install] +WantedBy=multi-user.target From 468f01e5790b476d9de784a8f5f65f52c14338b9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 11 Dec 2016 15:10:44 +0100 Subject: [PATCH 1808/3392] DEVELOPERS: add darkhttpd package to Eric Le Bihan Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 94cfe6c2f9..903e9a9d66 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -423,6 +423,7 @@ F: package/xxhash/ N: Eric Le Bihan F: package/adwaita-icon-theme/ +F: package/darkhttpd/ F: package/eudev/ F: package/hicolor-icon-theme/ F: package/jemalloc/ From 693031b39c6a7b40bd560172d51ae9f1c0e2f1d2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 6 Dec 2016 20:49:06 +0100 Subject: [PATCH 1809/3392] pkg-waf: add additional variables for each install step Some waf packages may want to pass additional variables to waf script in install step. Add the possibility to do so by defining the following variables: _INSTALL_STAGING_OPTS for the install to staging directory _INSTALL_TARGET_OPTS for the install to target directory Signed-off-by: Romain Naour Cc: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pkg-waf.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index 908ac0354e..a82f45ce49 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -49,6 +49,9 @@ else $(2)_WAF = ./waf endif +$(2)_INSTALL_STAGING_OPTS ?= +$(2)_INSTALL_TARGET_OPTS ?= + # # Configure step. Only define it if not already defined by the package # .mk file. @@ -84,7 +87,8 @@ ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS cd $$(@D) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ - install --destdir=$$(STAGING_DIR) + install --destdir=$$(STAGING_DIR) \ + $$($(2)_INSTALL_STAGING_OPTS) endef endif @@ -96,7 +100,8 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS cd $$(@D) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ - install --destdir=$$(TARGET_DIR) + install --destdir=$$(TARGET_DIR) \ + $$($(2)_INSTALL_TARGET_OPTS) endef endif From 611d6e1a882f478b84a53b4dcb10a3a2c6741517 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 6 Dec 2016 20:49:07 +0100 Subject: [PATCH 1810/3392] pkg-waf: add additional variables for build step Some waf packages may want to pass additional variables to waf script in build step. Add the possibility to do so by defining _BUILD_OPTS. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/pkg-waf.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index a82f45ce49..f9d435e879 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -49,6 +49,7 @@ else $(2)_WAF = ./waf endif +$(2)_BUILD_OPTS ?= $(2)_INSTALL_STAGING_OPTS ?= $(2)_INSTALL_TARGET_OPTS ?= @@ -75,7 +76,8 @@ endif ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$(@D) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) build -j $$(PARALLEL_JOBS) + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ + build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) endef endif From 2618115c20fc871d8e77f1c43c1c67fb94b09a44 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 6 Dec 2016 20:49:08 +0100 Subject: [PATCH 1811/3392] pkg-waf: add a common variable for each step Some waf packages may want to pass additional variables to waf script for each build step. Add the possibility to do so by defining _WAF_OPTS. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/pkg-waf.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index f9d435e879..2cdd654b1b 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -52,6 +52,7 @@ endif $(2)_BUILD_OPTS ?= $(2)_INSTALL_STAGING_OPTS ?= $(2)_INSTALL_TARGET_OPTS ?= +$(2)_WAF_OPTS ?= # # Configure step. Only define it if not already defined by the package @@ -65,7 +66,8 @@ define $(2)_CONFIGURE_CMDS $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) configure \ --prefix=/usr \ --libdir=/usr/lib \ - $$($(2)_CONF_OPTS) + $$($(2)_CONF_OPTS) \ + $$($(2)_WAF_OPTS) endef endif @@ -77,7 +79,8 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$(@D) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ - build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) + build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ + $$($(2)_WAF_OPTS) endef endif @@ -90,7 +93,8 @@ define $(2)_INSTALL_STAGING_CMDS cd $$(@D) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ install --destdir=$$(STAGING_DIR) \ - $$($(2)_INSTALL_STAGING_OPTS) + $$($(2)_INSTALL_STAGING_OPTS) \ + $$($(2)_WAF_OPTS) endef endif @@ -103,7 +107,8 @@ define $(2)_INSTALL_TARGET_CMDS cd $$(@D) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ install --destdir=$$(TARGET_DIR) \ - $$($(2)_INSTALL_TARGET_OPTS) + $$($(2)_INSTALL_TARGET_OPTS) \ + $$($(2)_WAF_OPTS) endef endif From 3f16f40dfe8163e486dffc7a268f82bf0b8e09c8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 6 Dec 2016 20:49:09 +0100 Subject: [PATCH 1812/3392] package/aubio: disable unit tests with --notests For each build step, --notests needs to be passed to waf script to avoid runing the unit tests. This allow to remove the patch removing the unit tests from wscript. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/aubio/0001-remove-unit-test.patch | 63 ----------------------- package/aubio/aubio.mk | 4 ++ 2 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 package/aubio/0001-remove-unit-test.patch diff --git a/package/aubio/0001-remove-unit-test.patch b/package/aubio/0001-remove-unit-test.patch deleted file mode 100644 index 947fc8ee1e..0000000000 --- a/package/aubio/0001-remove-unit-test.patch +++ /dev/null @@ -1,63 +0,0 @@ -From c71d72262568907ae8c3b988d42e575a8bd3a207 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 29 Oct 2016 20:14:02 +0200 -Subject: [PATCH] remove unit test - -Unit tests fail to build on some system. - -Waf: Entering directory `output/build/aubio-0.4.3/build' -[170/217] Processing build/tests/test-sink -[170/217] Processing build/tests/test-sink_apple_audio-multi -[172/217] Processing build/tests/test-sink_sndfile-multi -[172/217] Processing build/tests/test-source_apple_audio -[174/217] Processing build/tests/test-source_avcodec -[174/217] Processing build/tests/test-source_multi -[174/217] Processing build/tests/test-source_seek -[176/217] Processing build/tests/test-source_sndfile -Waf: Leaving directory `output/build/aubio-0.4.3/build' -Build failed -Traceback (most recent call last): - File "output/build/aubio-0.4.3/waflib/Task.py", line 110, in process - ret=self.run() - File "output/build/aubio-0.4.3/waflib/Tools/waf_unit_test.py", line 66, in run - proc=Utils.subprocess.Popen(self.ut_exec,cwd=cwd,env=self.get_test_env(),stderr=Utils.subprocess.PIPE,stdout=Utils.subprocess.PIPE) - File "/usr/lib64/python2.7/subprocess.py", line 710, in __init__ - errread, errwrite) - File "/usr/lib64/python2.7/subprocess.py", line 1335, in _execute_child - raise child_exception -OSError: [Errno 2] No such file or directory - -Signed-off-by: Romain Naour ---- - wscript | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/wscript b/wscript -index c665ff5..c8fae6c 100644 ---- a/wscript -+++ b/wscript -@@ -95,13 +95,11 @@ def options(ctx): - help='set target platform for cross-compilation', dest='target_platform') - - ctx.load('compiler_c') -- ctx.load('waf_unit_test') - ctx.load('gnu_dirs') - - def configure(ctx): - from waflib import Options - ctx.load('compiler_c') -- ctx.load('waf_unit_test') - ctx.load('gnu_dirs') - - # check for common headers -@@ -334,7 +332,6 @@ def build(bld): - bld.recurse('src') - if bld.env['DEST_OS'] not in ['ios', 'iosimulator', 'android']: - bld.recurse('examples') -- bld.recurse('tests') - - bld( source = 'aubio.pc.in' ) - --- -2.5.5 - diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index cfa233f989..f3330c2b89 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -15,6 +15,10 @@ AUBIO_CONF_OPTS = \ --disable-docs \ --disable-atlas +# Add --notests for each build step to avoid running unit tests on the +# build machine. +AUBIO_WAF_OPTS = --notests + ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) AUBIO_DEPENDENCIES += libsndfile AUBIO_CONF_OPTS += --enable-sndfile From 860020f300fd6bc567a76c48abd412729cccb90e Mon Sep 17 00:00:00 2001 From: Phil Eichinger Date: Thu, 1 Dec 2016 15:45:33 +0100 Subject: [PATCH 1813/3392] Config.in.legacy: findfs is available in BR2_PACKAGE_UTIL_LINUX_BINARIES 031659024b3cf27bb68dc58d07519b563ef472a1 removed the option BR2_PACKAGE_UTIL_LINUX_FINDFS as it is always built by default. Signed-off-by: Phil Eichinger Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 39a2d0092a..b42eb418e3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -667,7 +667,7 @@ config BR2_PACKAGE_E2FSPROGS_FINDFS This option attempted to enable findfs capabilities from e2fsprogs but has not worked since July 2015 (due to packaging changes). One can use BusyBox's findfs support or - enable the BR2_PACKAGE_UTIL_LINUX_FINDFS option. + enable the BR2_PACKAGE_UTIL_LINUX_BINARIES option. config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL bool "openpowerlink debug option has been removed" From 31c093e6d094194ca61ed476016ed1649c972382 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 4 Dec 2016 10:21:55 +0100 Subject: [PATCH 1814/3392] toolchain/wrapper: make the {str, len} tuple more generic, add comments In 61cb120 (toolchain/wrapper: extend paranoid check to -isystem), we introduced a {str,len} tuple to check the various arguments passed to gcc, to avoid hard-coding an ever-growing, long list of those args directly in the condition check. It was made specific to the arguments (the structure member is named 'arg'), but can also be used to store the unsafe paths as well. Also, that piece is almost un-documented. Rename the structure member so that it is more generic, and add a bit of comments to explain the whole of it. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-wrapper.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index d59629b048..8bc0007821 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -83,23 +83,30 @@ static char *predef_args[] = { #endif }; -struct unsafe_opt_s { - const char *arg; +/* A {string,length} tuple, to avoid computing strlen() on constants. + * - str must be a \0-terminated string + * - len does not account for the terminating '\0' + */ +struct str_len_s { + const char *str; size_t len; }; +/* Define a {string,length} tuple. Takes an unquoted constant string as + * parameter. sizeof() on a string literal includes the terminating \0, + * but we don't want to count it. + */ +#define STR_LEN(s) { #s, sizeof(#s)-1 } + /* Unsafe options are options that specify a potentialy unsafe path, * that will be checked by check_unsafe_path(), below. - * - * sizeof() on a string literal includes the terminating \0. */ -#define UNSAFE_OPT(o) { #o, sizeof(#o)-1 } -static const struct unsafe_opt_s unsafe_opts[] = { - UNSAFE_OPT(-I), - UNSAFE_OPT(-idirafter), - UNSAFE_OPT(-iquote), - UNSAFE_OPT(-isystem), - UNSAFE_OPT(-L), +static const struct str_len_s unsafe_opts[] = { + STR_LEN(-I), + STR_LEN(-idirafter), + STR_LEN(-iquote), + STR_LEN(-isystem), + STR_LEN(-L), { NULL, 0 }, }; @@ -262,10 +269,10 @@ int main(int argc, char **argv) /* Check for unsafe library and header paths */ for (i = 1; i < argc; i++) { - const struct unsafe_opt_s *opt; - for (opt=unsafe_opts; opt->arg; opt++ ) { + const struct str_len_s *opt; + for (opt=unsafe_opts; opt->str; opt++ ) { /* Skip any non-unsafe option. */ - if (strncmp(argv[i], opt->arg, opt->len)) + if (strncmp(argv[i], opt->str, opt->len)) continue; /* Handle both cases: From 3eccf762016d2e75911a20bf319e7f15776ae159 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 4 Dec 2016 10:21:56 +0100 Subject: [PATCH 1815/3392] toolchain/wrapper: use the {str, len} tuples for the unsafe paths In 61cb120 (toolchain/wrapper: extend paranoid check to -isystem), we introduced a {str,len} tuple to check the various arguments pased to gcc, to avoid hard-coding an ever-growing, long list of those args directly in the condition check. Now, we're left with a long list of unsafe paths, somehow hidden within the code, which can use the same mechanism we use for arguments. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-wrapper.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 8bc0007821..100aa181c6 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -98,6 +98,20 @@ struct str_len_s { */ #define STR_LEN(s) { #s, sizeof(#s)-1 } +/* List of paths considered unsafe for cross-compilation. + * + * An unsafe path is one that points to a directory with libraries or + * headers for the build machine, which are not suitable for the target. + */ +static const struct str_len_s unsafe_paths[] = { + STR_LEN(/lib), + STR_LEN(/usr/include), + STR_LEN(/usr/lib), + STR_LEN(/usr/local/include), + STR_LEN(/usr/local/lib), + { NULL, 0 }, +}; + /* Unsafe options are options that specify a potentialy unsafe path, * that will be checked by check_unsafe_path(), below. */ @@ -126,13 +140,10 @@ static void check_unsafe_path(const char *arg, int paranoid, int arg_has_path) { - char **c; - static char *unsafe_paths[] = { - "/lib", "/usr/include", "/usr/lib", "/usr/local/include", "/usr/local/lib", NULL, - }; + const struct str_len_s *p; - for (c = unsafe_paths; *c != NULL; c++) { - if (strncmp(path, *c, strlen(*c))) + for (p=unsafe_paths; p->str; p++) { + if (strncmp(path, p->str, p->len)) continue; fprintf(stderr, "%s: %s: unsafe header/library path used in cross-compilation: '%s%s%s'\n", From 64544178f180f03cedd8fe403d3718406d909c88 Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Fri, 18 Nov 2016 16:24:26 +0100 Subject: [PATCH 1816/3392] e2fsprogs: pass LDCONFIG=true also at install time We correctly set LDCONFIG=true for MAKE_OPTS, but not for the other steps which don't inherit it, and therefore e2fsprogs tries to use the host ldconfig during staging and target installation, which causes some weird error messages at build time (even if they don't abort the build). Fix that by passing LDCONFIG=true at install time. Signed-off-by: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni --- package/e2fsprogs/e2fsprogs.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index b6e79d246b..48bb9ec38f 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -63,8 +63,9 @@ ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) E2FSPROGS_CONF_ENV += LIBS=-lintl endif -E2FSPROGS_MAKE_OPTS = \ - LDCONFIG=true +E2FSPROGS_MAKE_OPTS = LDCONFIG=true +E2FSPROGS_INSTALL_STAGING_OPTS = LDCONFIG=true +E2FSPROGS_INSTALL_TARGET_OPTS = LDCONFIG=true define HOST_E2FSPROGS_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs From 65395920b51a5c2c9775f6b23212b765ca9a991c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 11 Dec 2016 16:10:15 +0100 Subject: [PATCH 1817/3392] doc/manual: document the new waf-package infra variables Document LIBFOO_WAF_OPTS, LIBFOO_BUILD_OPTS, LIBFOO_INSTALL_STAGING_OPTS and LIBFOO_INSTALL_TARGET_OPTS. Also document LIBFOO_CONF_OPTS which was missing in waf-package reference. Signed-off-by: Romain Naour Cc: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-waf.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/manual/adding-packages-waf.txt b/docs/manual/adding-packages-waf.txt index 3c0dbe4aae..43b557c070 100644 --- a/docs/manual/adding-packages-waf.txt +++ b/docs/manual/adding-packages-waf.txt @@ -65,3 +65,21 @@ also be defined. default, then Buildroot will use the waf executable provided in the package source tree; if set to +YES+, then Buidlroot will download, install waf as a host tool and use it to build the package. + +* +LIBFOO_WAF_OPTS+, to specify additional options to pass to the + +waf+ script at every step of the package build process: configure, + build and installation. By default, empty. + +* +LIBFOO_CONF_OPTS+, to specify additional options to pass to the + +waf+ script for the configuration step. By default, empty. + +* +LIBFOO_BUILD_OPTS+, to specify additional options to pass to the + +waf+ script during the build step. By default, empty. + +* +LIBFOO_INSTALL_STAGING_OPTS+, to specify additional options to pass + to the +waf+ script during the staging installation step. By default, + empty. + +* +LIBFOO_INSTALL_TARGET_OPTS+, to specify additional options to pass + to the +waf+ script during the target installation step. By default, + empty. From 250b301ceb2992346e28ef1c4afafc6ad1d768d0 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sun, 11 Dec 2016 21:00:43 +0530 Subject: [PATCH 1818/3392] acl: backport upstream patch to fix static build When building tar package with acl in static build configuration, we get definition clash error for 'quote' function. ../gnu/libgnu.a(quotearg.o): In function 'quote': quotearg.c:(.text+0x12fc): multiple definition of 'quote' ../sysroot/usr/lib/libacl.a(quote.o):/home/test/autobuild/run/instance-1/output/build/acl-2.2.52/libmisc/quote.c:27: first defined here In acl upstream, this is already fixed by renaming quote and unquote internal functions. This commit backports upstream patch. Fixes: http://autobuild.buildroot.net/results/d64/d64d13745c980d322d3b80c3b324d03eb7f17262 Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- ...-__acl_-prefixes-to-internal-symbols.patch | 292 ++++++++++++++++++ 1 file changed, 292 insertions(+) create mode 100644 package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch diff --git a/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch b/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch new file mode 100644 index 0000000000..f9a5d9bd1e --- /dev/null +++ b/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch @@ -0,0 +1,292 @@ +From debbe4f7b591b3f35d0ed65c17fa81b196b2eb2d Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 12 Aug 2014 08:37:25 -0400 +Subject: [PATCH] add __acl_ prefixes to internal symbols + +When static linking libacl, people sometimes run into symbol collisions +because their own code defines symbols like "quote". So for acl internal +symbols, use an __acl_ prefix. + +[Rahul Bedarkar: backported from upstream + http://git.savannah.gnu.org/cgit/acl.git/commit/?id=a2c4d71c2e84419a49db503ed59de4d3d1dca7dd ] +Signed-off-by: Rahul Bedarkar +--- + exports | 12 ++---------- + getfacl/getfacl.c | 4 ++-- + include/misc.h | 8 ++++---- + libacl/__acl_to_any_text.c | 4 ++-- + libacl/acl_from_text.c | 4 ++-- + libmisc/high_water_alloc.c | 2 +- + libmisc/next_line.c | 6 +++--- + libmisc/quote.c | 4 ++-- + libmisc/unquote.c | 2 +- + setfacl/parse.c | 10 +++++----- + setfacl/setfacl.c | 4 ++-- + 11 files changed, 26 insertions(+), 34 deletions(-) + +diff --git a/exports b/exports +index 7d8e69e..bf15d84 100644 +--- a/exports ++++ b/exports +@@ -59,22 +59,14 @@ ACL_1.0 { + acl_to_any_text; + + local: +- # Library internal stuff ++ # Library internal stuff + __new_var_obj_p; + __new_obj_p_here; + __free_obj_p; + __check_obj_p; + __ext2int_and_check; +- __acl_reorder_entry_obj_p; +- __acl_reorder_obj_p; +- __acl_init_obj; +- __acl_create_entry_obj; +- __acl_free_acl_obj; +- __acl_to_any_text; ++ __acl_*; + __apply_mask_to_mode; +- +- quote; +- unquote; + }; + + ACL_1.1 { +diff --git a/getfacl/getfacl.c b/getfacl/getfacl.c +index f8eaf25..af9e225 100644 +--- a/getfacl/getfacl.c ++++ b/getfacl/getfacl.c +@@ -90,7 +90,7 @@ int opt_numeric; /* don't convert id's to symbolic names */ + + static const char *xquote(const char *str, const char *quote_chars) + { +- const char *q = quote(str, quote_chars); ++ const char *q = __acl_quote(str, quote_chars); + if (q == NULL) { + fprintf(stderr, "%s: %s\n", progname, strerror(errno)); + exit(1); +@@ -718,7 +718,7 @@ int main(int argc, char *argv[]) + do { + if (optind == argc || + strcmp(argv[optind], "-") == 0) { +- while ((line = next_line(stdin)) != NULL) { ++ while ((line = __acl_next_line(stdin)) != NULL) { + if (*line == '\0') + continue; + +diff --git a/include/misc.h b/include/misc.h +index 0c5fdcc..c25accf 100644 +--- a/include/misc.h ++++ b/include/misc.h +@@ -15,9 +15,9 @@ + along with this program. If not, see . + */ + +-extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize); ++extern int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize); + +-extern const char *quote(const char *str, const char *quote_chars); +-extern char *unquote(char *str); ++extern const char *__acl_quote(const char *str, const char *quote_chars); ++extern char *__acl_unquote(char *str); + +-extern char *next_line(FILE *file); ++extern char *__acl_next_line(FILE *file); +diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c +index a4f9c34..19f1ccc 100644 +--- a/libacl/__acl_to_any_text.c ++++ b/libacl/__acl_to_any_text.c +@@ -159,7 +159,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size, + if (options & TEXT_NUMERIC_IDS) + str = NULL; + else +- str = quote(user_name( ++ str = __acl_quote(user_name( + entry_obj_p->eid.qid), ":, \t\n\r"); + if (str != NULL) { + strncpy(text_p, str, size); +@@ -182,7 +182,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size, + if (options & TEXT_NUMERIC_IDS) + str = NULL; + else +- str = quote(group_name( ++ str = __acl_quote(group_name( + entry_obj_p->eid.qid), ":, \t\n\r"); + if (str != NULL) { + strncpy(text_p, str, size); +diff --git a/libacl/acl_from_text.c b/libacl/acl_from_text.c +index 1e05322..f6165be 100644 +--- a/libacl/acl_from_text.c ++++ b/libacl/acl_from_text.c +@@ -206,7 +206,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p) + str = get_token(text_p); + if (str) { + entry_obj.etag = ACL_USER; +- error = get_uid(unquote(str), ++ error = get_uid(__acl_unquote(str), + &entry_obj.eid.qid); + free(str); + if (error) { +@@ -225,7 +225,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p) + str = get_token(text_p); + if (str) { + entry_obj.etag = ACL_GROUP; +- error = get_gid(unquote(str), ++ error = get_gid(__acl_unquote(str), + &entry_obj.eid.qid); + free(str); + if (error) { +diff --git a/libmisc/high_water_alloc.c b/libmisc/high_water_alloc.c +index c127dc1..951f4bb 100644 +--- a/libmisc/high_water_alloc.c ++++ b/libmisc/high_water_alloc.c +@@ -21,7 +21,7 @@ + #include + #include "misc.h" + +-int high_water_alloc(void **buf, size_t *bufsize, size_t newsize) ++int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize) + { + #define CHUNK_SIZE 256 + /* +diff --git a/libmisc/next_line.c b/libmisc/next_line.c +index 0566d7a..126a364 100644 +--- a/libmisc/next_line.c ++++ b/libmisc/next_line.c +@@ -23,7 +23,7 @@ + + #define LINE_SIZE getpagesize() + +-char *next_line(FILE *file) ++char *__acl_next_line(FILE *file) + { + static char *line; + static size_t line_size; +@@ -31,7 +31,7 @@ char *next_line(FILE *file) + int eol = 0; + + if (!line) { +- if (high_water_alloc((void **)&line, &line_size, LINE_SIZE)) ++ if (__acl_high_water_alloc((void **)&line, &line_size, LINE_SIZE)) + return NULL; + } + c = line; +@@ -47,7 +47,7 @@ char *next_line(FILE *file) + if (feof(file)) + break; + if (!eol) { +- if (high_water_alloc((void **)&line, &line_size, ++ if (__acl_high_water_alloc((void **)&line, &line_size, + 2 * line_size)) + return NULL; + c = strrchr(line, '\0'); +diff --git a/libmisc/quote.c b/libmisc/quote.c +index bf8f9eb..a28800c 100644 +--- a/libmisc/quote.c ++++ b/libmisc/quote.c +@@ -23,7 +23,7 @@ + #include + #include "misc.h" + +-const char *quote(const char *str, const char *quote_chars) ++const char *__acl_quote(const char *str, const char *quote_chars) + { + static char *quoted_str; + static size_t quoted_str_len; +@@ -40,7 +40,7 @@ const char *quote(const char *str, const char *quote_chars) + if (nonpr == 0) + return str; + +- if (high_water_alloc((void **)"ed_str, "ed_str_len, ++ if (__acl_high_water_alloc((void **)"ed_str, "ed_str_len, + (s - (unsigned char *)str) + nonpr * 3 + 1)) + return NULL; + for (s = (unsigned char *)str, q = quoted_str; *s != '\0'; s++) { +diff --git a/libmisc/unquote.c b/libmisc/unquote.c +index bffebf9..4f4ce7c 100644 +--- a/libmisc/unquote.c ++++ b/libmisc/unquote.c +@@ -22,7 +22,7 @@ + #include + #include "misc.h" + +-char *unquote(char *str) ++char *__acl_unquote(char *str) + { + unsigned char *s, *t; + +diff --git a/setfacl/parse.c b/setfacl/parse.c +index e7e6add..7433459 100644 +--- a/setfacl/parse.c ++++ b/setfacl/parse.c +@@ -226,7 +226,7 @@ user_entry: + str = get_token(text_p); + if (str) { + cmd->c_tag = ACL_USER; +- error = get_uid(unquote(str), &cmd->c_id); ++ error = get_uid(__acl_unquote(str), &cmd->c_id); + free(str); + if (error) { + *text_p = backup; +@@ -245,7 +245,7 @@ user_entry: + str = get_token(text_p); + if (str) { + cmd->c_tag = ACL_GROUP; +- error = get_gid(unquote(str), &cmd->c_id); ++ error = get_gid(__acl_unquote(str), &cmd->c_id); + free(str); + if (error) { + *text_p = backup; +@@ -466,7 +466,7 @@ read_acl_comments( + if (strncmp(cp, "file:", 5) == 0) { + cp += 5; + SKIP_WS(cp); +- cp = unquote(cp); ++ cp = __acl_unquote(cp); + + if (path_p) { + if (*path_p) +@@ -483,7 +483,7 @@ read_acl_comments( + if (uid_p) { + if (*uid_p != ACL_UNDEFINED_ID) + goto fail; +- if (get_uid(unquote(cp), uid_p) != 0) ++ if (get_uid(__acl_unquote(cp), uid_p) != 0) + continue; + } + } else if (strncmp(cp, "group:", 6) == 0) { +@@ -493,7 +493,7 @@ read_acl_comments( + if (gid_p) { + if (*gid_p != ACL_UNDEFINED_ID) + goto fail; +- if (get_gid(unquote(cp), gid_p) != 0) ++ if (get_gid(__acl_unquote(cp), gid_p) != 0) + continue; + } + } else if (strncmp(cp, "flags:", 6) == 0) { +diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c +index 81062a6..fb2d172 100644 +--- a/setfacl/setfacl.c ++++ b/setfacl/setfacl.c +@@ -92,7 +92,7 @@ int promote_warning; + + static const char *xquote(const char *str, const char *quote_chars) + { +- const char *q = quote(str, quote_chars); ++ const char *q = __acl_quote(str, quote_chars); + if (q == NULL) { + fprintf(stderr, "%s: %s\n", progname, strerror(errno)); + exit(1); +@@ -311,7 +311,7 @@ int next_file(const char *arg, seq_t seq) + args.seq = seq; + + if (strcmp(arg, "-") == 0) { +- while ((line = next_line(stdin))) ++ while ((line = __acl_next_line(stdin))) + errors = walk_tree(line, walk_flags, 0, do_set, &args); + if (!feof(stdin)) { + fprintf(stderr, _("%s: Standard input: %s\n"), +-- +2.6.2 + From b965cfc9f4f8474bf35976e458916a85fb972b5e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 11 Dec 2016 16:52:16 +0100 Subject: [PATCH 1819/3392] jpeg-turbo: now checks for pkg-config The jpeg-turbo configure script now contains PKG_PROG_PKG_CONFIG, even though it doesn't so far use pkg-config to detect any dependencies (it does install a .pc file now though): checking pkg-config is at least version 0.9.0... ./configure: line 13540: \ /home/peko/source/buildroot/output/host/usr/bin/pkg-config: No such file or directory Depend on host-pkgconf for consistency. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/jpeg-turbo/jpeg-turbo.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index 91d6b4ea2a..c3de04af7e 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -11,6 +11,7 @@ JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like) JPEG_TURBO_LICENSE_FILES = LICENSE.md JPEG_TURBO_INSTALL_STAGING = YES JPEG_TURBO_PROVIDES = jpeg +JPEG_TURBO_DEPENDENCIES = host-pkgconf JPEG_TURBO_CONF_OPTS = --with-jpeg8 From 6c5ff61a6aa1b81ee1ca4e54f16fe97a8f56aeac Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 11 Dec 2016 16:52:17 +0100 Subject: [PATCH 1820/3392] jpeg: rework jpeg-turbo simd support handling In preperation for adding more architectures to the jpeg-turbo simd handling, introduce a hidden BR2_PACKAGE_JPEG_SIMDS_SUPPORT symbol and use that to enable simd support and default to jpeg-turbo, instead of open coding it in both places. While we are at it, reword the help text to be more useful. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/jpeg-turbo/jpeg-turbo.mk | 2 +- package/jpeg/Config.in | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index c3de04af7e..e2b7e63b9a 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -15,7 +15,7 @@ JPEG_TURBO_DEPENDENCIES = host-pkgconf JPEG_TURBO_CONF_OPTS = --with-jpeg8 -ifeq ($(BR2_X86_CPU_HAS_MMX)$(BR2_ARM_CPU_HAS_NEON),y) +ifeq ($(BR2_PACKAGE_JPEG_SIMD_SUPPORT),y) JPEG_TURBO_CONF_OPTS += --with-simd # x86 simd support needs nasm JPEG_TURBO_DEPENDENCIES += $(if $(BR2_X86_CPU_HAS_MMX),host-nasm) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index f337aeb956..170e58c5d9 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -3,13 +3,18 @@ config BR2_PACKAGE_JPEG help Select the desired JPEG library provider. +# jpeg-turbo has simd support for some architectures +config BR2_PACKAGE_JPEG_SIMD_SUPPORT + bool + default y if BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON + if BR2_PACKAGE_JPEG choice prompt "jpeg variant" - default BR2_PACKAGE_JPEG_TURBO if (BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON) + default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT help - Select the older stable version, or the newer developer version + Select the normal libjpeg or libjpeg-turbo. config BR2_PACKAGE_LIBJPEG bool "jpeg" From 3031af7ea7f5730bb1d4d60b0ee3c854622fef9b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 11 Dec 2016 16:52:18 +0100 Subject: [PATCH 1821/3392] jpeg-turbo: add simd support for powerpc cores with altivec >From the 1.5-b1 release notes: Added full SIMD acceleration for PowerPC platforms using AltiVec VMX (128-bit SIMD) instructions. Although the performance of libjpeg-turbo on PowerPC was already good, due to the increased number of registers available to the compiler vs. x86, it was still possible to speed up compression by about 3-4x and decompression by about 2-2.5x (relative to libjpeg v6b) through the use of AltiVec instructions. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/jpeg/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index 170e58c5d9..e2a3fd0e35 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -6,7 +6,8 @@ config BR2_PACKAGE_JPEG # jpeg-turbo has simd support for some architectures config BR2_PACKAGE_JPEG_SIMD_SUPPORT bool - default y if BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON + default y if BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON || \ + BR2_POWERPC_CPU_HAS_ALTIVEC if BR2_PACKAGE_JPEG From 643a21b326ed9b562560d8629501725ea53f86d8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 11 Dec 2016 16:52:19 +0100 Subject: [PATCH 1822/3392] jpeg-turbo: add simd support for aarch64 >From the 1.5-b1 release notes: Added ARM 64-bit (ARMv8) NEON SIMD implementations of the commonly-used compression algorithms (including the slow integer forward DCT and h2v2 & h2v1 downsampling algorithms, which are not accelerated in the 32-bit NEON implementation.) This speeds up the compression of full-color JPEGs by about 75% on average on a Cavium ThunderX processor and by about 2-2.5x on average on Cortex-A53 and Cortex-A57 cores. Add it unconditionally for all aarch64 cores, as neon support is required for all "standard" ARMv8 implementations. If an ARMv8 implementation w/o NEON ever shows up, then we will need to add a BR2_AARCH64_CPU_HAS_NEON and handle it like ARM. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/jpeg/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index e2a3fd0e35..2bcf40591b 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_JPEG_SIMD_SUPPORT bool default y if BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON || \ BR2_POWERPC_CPU_HAS_ALTIVEC + BR2_aarch64 || BR2_aarch64_be if BR2_PACKAGE_JPEG From 09d48dce0a75e93d560d129ca5f3883650ee63bf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 11 Dec 2016 18:36:03 +0100 Subject: [PATCH 1823/3392] jpeg: fix typo introduced when fixing the indentation Signed-off-by: Thomas Petazzoni --- package/jpeg/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index 2bcf40591b..8de45a365d 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_JPEG config BR2_PACKAGE_JPEG_SIMD_SUPPORT bool default y if BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON || \ - BR2_POWERPC_CPU_HAS_ALTIVEC + BR2_POWERPC_CPU_HAS_ALTIVEC || \ BR2_aarch64 || BR2_aarch64_be if BR2_PACKAGE_JPEG From 4ab4df632a4f258cdd249527c324652c558cbdcd Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 11 Dec 2016 19:14:23 +0100 Subject: [PATCH 1824/3392] package/jpeg: better indentation Use easier-to-read layout; fix leading spaces. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Signed-off-by: Peter Korsgaard --- package/jpeg/Config.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index 8de45a365d..a4a63cc7dc 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -5,10 +5,11 @@ config BR2_PACKAGE_JPEG # jpeg-turbo has simd support for some architectures config BR2_PACKAGE_JPEG_SIMD_SUPPORT - bool - default y if BR2_X86_CPU_HAS_MMX || BR2_ARM_CPU_HAS_NEON || \ - BR2_POWERPC_CPU_HAS_ALTIVEC || \ - BR2_aarch64 || BR2_aarch64_be + bool + default y if BR2_X86_CPU_HAS_MMX + default y if BR2_ARM_CPU_HAS_NEON + default y if BR2_POWERPC_CPU_HAS_ALTIVEC + default y if BR2_aarch64 || BR2_aarch64_be if BR2_PACKAGE_JPEG From 1a01233e1fe4cd2b7791afda3daf9d04eba32e02 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Dec 2016 19:43:35 -0200 Subject: [PATCH 1825/3392] linux-headers: bump to 4.9 kernel version Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index da1706815b..18d7cd0dc5 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_4_8 + default BR2_KERNEL_HEADERS_4_9 help Select the kernel version to get headers from. @@ -80,6 +80,10 @@ choice bool "Linux 4.8.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + config BR2_KERNEL_HEADERS_4_9 + bool "Linux 4.9.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" endchoice @@ -100,6 +104,10 @@ choice This is used to hide/show some packages that have strict requirements on the version of kernel headers. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9 + bool "4.9.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8 bool "4.8.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 @@ -237,4 +245,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.10" if BR2_KERNEL_HEADERS_4_7 default "4.8.13" if BR2_KERNEL_HEADERS_4_8 + default "4.9" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 09ebe44c811432509a4a8a608f59b8bb2978be1d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Dec 2016 19:43:36 -0200 Subject: [PATCH 1826/3392] linux: bump default to version 4.9 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index e432873ed9..e43b88d9f8 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.8.13)" + bool "Latest version (4.9)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.8.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.9" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From bfc797568e2ad5799c4402f7c3a654c317be542b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Dec 2016 19:43:37 -0200 Subject: [PATCH 1827/3392] linux-headers: bump 4.{8, 4}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 18d7cd0dc5..7c71a6cf7e 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -240,10 +240,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.36" if BR2_KERNEL_HEADERS_4_1 - default "4.4.37" if BR2_KERNEL_HEADERS_4_4 + default "4.4.38" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.10" if BR2_KERNEL_HEADERS_4_7 - default "4.8.13" if BR2_KERNEL_HEADERS_4_8 + default "4.8.14" if BR2_KERNEL_HEADERS_4_8 default "4.9" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 94025035e4897de3b56f1e9a6f31f7836d6114e5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 11 Dec 2016 20:01:49 -0200 Subject: [PATCH 1828/3392] toolchain: add 4.9.x choice for headers Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- toolchain/toolchain-common.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index bf9dc7b93f..7a217b65c4 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -228,10 +228,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "4.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 default "4.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 default "4.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 default "4.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 5ff2491e19..ed2b082d7b 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -89,6 +89,10 @@ choice m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9 + bool "4.9.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_8 bool "4.8.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 From ab7787b7b9e77692c5e0f9bf4404f1573ea6859d Mon Sep 17 00:00:00 2001 From: Maxime Hadjinlian Date: Mon, 12 Dec 2016 10:19:38 +0100 Subject: [PATCH 1829/3392] e2fsprogs: fix missing OPTS With the commit 64544178f180f03cedd8fe403d3718406d909c88 many packages broke because they could not find the ext2fs.pc file. This is perfectly normal, as the DESTDIR and the install target were not passed anymore to make. [Peter: remove redundant E2FSPROGS_INSTALL_STAGING_OPTS] Signed-off-by: Maxime Hadjinlian Signed-off-by: Peter Korsgaard --- package/e2fsprogs/e2fsprogs.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 48bb9ec38f..0253510bf7 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -10,7 +10,6 @@ E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2F E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h E2FSPROGS_INSTALL_STAGING = YES -E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux # we don't have a host-util-linux HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf @@ -64,8 +63,14 @@ E2FSPROGS_CONF_ENV += LIBS=-lintl endif E2FSPROGS_MAKE_OPTS = LDCONFIG=true -E2FSPROGS_INSTALL_STAGING_OPTS = LDCONFIG=true -E2FSPROGS_INSTALL_TARGET_OPTS = LDCONFIG=true +E2FSPROGS_INSTALL_STAGING_OPTS = \ + DESTDIR=$(STAGING_DIR) \ + LDCONFIG=true \ + install-libs +E2FSPROGS_INSTALL_TARGET_OPTS = \ + DESTDIR=$(TARGET_DIR) \ + LDCONFIG=true \ + install define HOST_E2FSPROGS_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs From 92f3719ac6f5977b6ef6981bc6816970d58300b6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2016 06:39:24 +0100 Subject: [PATCH 1830/3392] package/eudev: bump version to 3.2.1 Remove patch 0002 applied upstream: https://github.com/gentoo/eudev/commit/4f3b8298fb55a7a591831cf71067bc160cd60599 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...ng.h-fix-getrandom-system-call-numbe.patch | 64 ------------------- package/eudev/eudev.hash | 4 +- package/eudev/eudev.mk | 2 +- 3 files changed, 3 insertions(+), 67 deletions(-) delete mode 100644 package/eudev/0002-src-shared-missing.h-fix-getrandom-system-call-numbe.patch diff --git a/package/eudev/0002-src-shared-missing.h-fix-getrandom-system-call-numbe.patch b/package/eudev/0002-src-shared-missing.h-fix-getrandom-system-call-numbe.patch deleted file mode 100644 index 56379335f2..0000000000 --- a/package/eudev/0002-src-shared-missing.h-fix-getrandom-system-call-numbe.patch +++ /dev/null @@ -1,64 +0,0 @@ -From f80fe0e68686060e861338cf7b3b32e0637b3e0b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 4 Aug 2016 10:13:09 +0200 -Subject: [PATCH] src/shared/missing.h: fix getrandom system call number on - ARM64 - -The getrandom() system call number is indeed 384 on ARM, but it is not -the same on ARM64. ARM64 uses the asm-generic headers, including for -system call numbers, so the getrandom() system call number on ARM64 is -278. This fixes runtime issues of eudev on ARM64, such as: - -Populating /dev using udev: [ 6.186817] udevd[1204]: starting version 3.1.5 -[ 6.191662] udevd[1204]: syscall 384 -[ 6.195217] Code: aa0503e4 aa0603e5 aa0703e6 d4000001 (b13ffc1f) -[ 6.201291] CPU: 4 PID: 1204 Comm: udevd Not tainted 4.7.0+ #1 -[ 6.207079] Hardware name: ARM Juno development board (r2) (DT) -[ 6.212954] task: ffff800976421900 task.stack: ffff800975610000 -[ 6.218825] PC is at 0xffff97f12234 -[ 6.222281] LR is at 0x41b15c -[ 6.225214] pc : [<0000ffff97f12234>] lr : [<000000000041b15c>] pstate: 80000000 -[ 6.232544] sp : 0000ffffcf9b3870 -[ 6.235828] x29: 0000ffffcf9b3870 x28: 0000000000428218 -[ 6.241110] x27: 0000000000000000 x26: 000000000042a7e3 -[ 6.246395] x25: 0000ffffcf9b39c8 x24: 0000000000428000 -[ 6.251670] x23: 0000000000449000 x22: 0000000000449678 -[ 6.256946] x21: 0000000000000010 x20: 0000000000449000 -[ 6.262233] x19: 0000000000449678 x18: 0000000000000000 -[ 6.267507] x17: 0000ffff97f12210 x16: 0000000000449440 -[ 6.272779] x15: 0000ffff97e4f730 x14: 0000ffff98050cb8 -[ 6.278060] x13: 000000000000033c x12: 00000000000004b4 -[ 6.283331] x11: 0000000000000000 x10: 0101010101010101 -[ 6.288604] x9 : 0000000000001010 x8 : 0000000000000180 -[ 6.293882] x7 : ffffffffffffffff x6 : ffffffffffffffff -[ 6.299154] x5 : 00000000271e36c0 x4 : 0007061c00190d07 -[ 6.304426] x3 : 00000000271e36d0 x2 : 0000000000000001 -[ 6.309705] x1 : 0000000000000010 x0 : 0000000000449678 -[ 6.314976] -[ 6.398734] sky2 0000:08:00.0 enp8s0: renamed from eth0 - -Reported-by: Kevin Hilman -Signed-off-by: Thomas Petazzoni ---- - src/shared/missing.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/shared/missing.h b/src/shared/missing.h -index 9031119..5ad5997 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -47,8 +47,10 @@ - # define __NR_getrandom 318 - # elif defined(__i386__) - # define __NR_getrandom 355 --# elif defined(__arm__) || defined(__aarch64__) -+# elif defined(__arm__) - # define __NR_getrandom 384 -+# elif defined(__aarch64__) -+# define __NR_getrandom 278 - # elif defined(__ia64__) - # define __NR_getrandom 1339 - # elif defined(__m68k__) --- -2.7.4 - diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index 44ed169fb6..108b0c6e50 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,4 +1,4 @@ # From http://dev.gentoo.org/~blueness/eudev/ -md5 7e42d9b9ed8162021665139520676367 eudev-3.2.tar.gz +md5 49f71f6c271ffa95b3c20d757d45c2e5 eudev-3.2.1.tar.gz # Locally calculated -sha256 d84a5f7942393a009afc6af0bf31e98841147a0521b91ffbed161dccac303c25 eudev-3.2.tar.gz +sha256 57e3d9e51cfefbdad431848ea0ad8ae1cde04928da42474f44bd200b12f5fe19 eudev-3.2.1.tar.gz diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 6c616608c3..d803947439 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,7 +4,7 @@ # ################################################################################ -EUDEV_VERSION = 3.2 +EUDEV_VERSION = 3.2.1 EUDEV_SOURCE = eudev-$(EUDEV_VERSION).tar.gz EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries) From f93cd820d15e96ffc29c92d1ede99d10fd4099d3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Dec 2016 07:15:43 +0100 Subject: [PATCH 1831/3392] package/dovecot: needs OpenSSL The latest version bump to 2.27 introduced a bug in the configure script which occurs when OpenSSL support is missing: http://lists.busybox.net/pipermail/buildroot/2016-December/179397.html This patch makes OpenSSL mandatory following the upstream advice: http://www.dovecot.org/list/dovecot/2016-December/106346.html "Nobody really should be building without OpenSSL nowadays anyway" Fixes http://autobuild.buildroot.net/results/85f/85f2f176c108ab36520f02d975f27c27cddce84b/ [Peter: drop legacy handling] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/dovecot/Config.in | 9 ++------- package/dovecot/dovecot.mk | 14 +++++--------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index 194efb6bc3..d1ff7bce91 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_DOVECOT bool "dovecot" depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_ZLIB help Dovecot is an open source IMAP and POP3 email server for Linux/UNIX- like systems, written with security primarily in mind. Dovecot is an @@ -24,13 +26,6 @@ config BR2_PACKAGE_DOVECOT_MYSQL comment "mysql support needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS -config BR2_PACKAGE_DOVECOT_OPENSSL - bool "openssl support" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - Enable OpenSSL support. - config BR2_PACKAGE_DOVECOT_SQLITE bool "sqlite support" select BR2_PACKAGE_SQLITE diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 3dd231a1d0..fe0afa5064 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -10,7 +10,10 @@ DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPLv2.1 DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT -DOVECOT_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_LIBICONV),libiconv) +DOVECOT_DEPENDENCIES = \ + host-pkgconf \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ + openssl DOVECOT_CONF_ENV = \ RPCGEN=__disable_RPCGEN_rquota \ @@ -27,7 +30,7 @@ DOVECOT_CONF_ENV = \ lib_cv___va_copy=yes \ lib_cv_va_val_copy=yes -DOVECOT_CONF_OPTS = --without-docs +DOVECOT_CONF_OPTS = --without-docs --with-ssl=openssl ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL)$(BR2_PACKAGE_DOVECOT_SQLITE),) DOVECOT_CONF_OPTS += --without-sql @@ -62,13 +65,6 @@ else DOVECOT_CONF_OPTS += --without-mysql endif -ifeq ($(BR2_PACKAGE_DOVECOT_OPENSSL),y) -DOVECOT_CONF_OPTS += --with-ssl=openssl -DOVECOT_DEPENDENCIES += openssl -else -DOVECOT_CONF_OPTS += --with-ssl=no -endif - ifeq ($(BR2_PACKAGE_DOVECOT_SQLITE),y) DOVECOT_CONF_OPTS += --with-sqlite DOVECOT_DEPENDENCIES += sqlite From 7575ab2ffee2e113697643b737464364ba28c537 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 12 Dec 2016 15:35:06 +0100 Subject: [PATCH 1832/3392] olimex_a20_olinuxino_lime: bump kernel to 4.9 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 5941550112..45a2117b57 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 4.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y +# Linux headers same as kernel, a 4.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/b # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y From 7e8858f723be39581394c6f7c6299413227bd0cd Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 12 Dec 2016 12:23:33 -0300 Subject: [PATCH 1833/3392] libgtk3: bump to version 3.22.5 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index e1d93b3304..d589b40238 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,2 +1,2 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.4.sha256sum -sha256 7094a6fcfe133d01c578358bd5d3e499715f1a0206e87bd5cf6c834e301f387f gtk+-3.22.4.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.5.sha256sum +sha256 693fa0ac643c59ccd51db99cabe476b4e0a41fd4f0c3c8b3e3ef38f94b2e7334 gtk+-3.22.5.tar.xz diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 4a686e0130..5380111b05 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.22 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).4 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).5 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPLv2+ From 3ed2ff972e6c9b674d6f56849d2cdbcc32db624b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 12 Dec 2016 12:25:18 -0300 Subject: [PATCH 1834/3392] icu: bump to version 58.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/icu/icu.hash | 6 +++--- package/icu/icu.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/icu/icu.hash b/package/icu/icu.hash index 4233ba3996..d578bfbf54 100644 --- a/package/icu/icu.hash +++ b/package/icu/icu.hash @@ -1,4 +1,4 @@ -# From https://ssl.icu-project.org/files/icu4c/57.1/icu4c-src-57_1.md5 -md5 976734806026a4ef8bdd17937c8898b9 icu4c-57_1-src.tgz +# From https://ssl.icu-project.org/files/icu4c/57.1/icu4c-src-58_2.md5 +md5 fac212b32b7ec7ab007a12dff1f3aea1 icu4c-58_2-src.tgz # Calculated based on the hash above -sha256 ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581 icu4c-57_1-src.tgz +sha256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c icu4c-58_2-src.tgz diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 3b40dfbd86..12406d7524 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ICU_VERSION = 57.1 +ICU_VERSION = 58.2 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION) ICU_LICENSE = ICU License From 0e7e76ac201184a65210b5d6e013d745fa51889c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 12 Dec 2016 12:58:40 -0300 Subject: [PATCH 1835/3392] zsh: bump to version 5.3 And drop upstream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...1-configure-use-user-set-pcre-config.patch | 33 ------------------- package/zsh/zsh.hash | 4 +-- package/zsh/zsh.mk | 4 +-- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 package/zsh/0001-configure-use-user-set-pcre-config.patch diff --git a/package/zsh/0001-configure-use-user-set-pcre-config.patch b/package/zsh/0001-configure-use-user-set-pcre-config.patch deleted file mode 100644 index d4cf59bddd..0000000000 --- a/package/zsh/0001-configure-use-user-set-pcre-config.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Baruch Siach -Date: Thu, 3 Mar 2016 23:14:39 +0200 -Subject: [PATCH] configure: use user set pcre-config - -Setting a non default configuration script location is common practice when -cross compiling, since the target library might need different flags. zsh -configure scripts allows the user to set pcre-config location but doesn't -actually use it. Fix this. - -Signed-off-by: Baruch Siach ---- -Patch status: sent upstream -(http://www.zsh.org/mla/workers/2016/msg00619.html) - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c3bd713c126a..9947b16066b6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -925,7 +925,7 @@ fi - if test x$enable_pcre = xyes; then - dnl pcre-config should probably be employed here - dnl AC_SEARCH_LIBS(pcre_compile, pcre) -- LIBS="`pcre-config --libs` $LIBS" -+ LIBS="`$ac_cv_prog_PCRECONF --libs` $LIBS" - fi - - dnl --------------------- --- -2.7.0 - diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 6793162652..0eeebd43f4 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,4 +1,4 @@ # From http://www.zsh.org/pub/MD5SUM -md5 afe96fde08b70e23c1cab1ca7a68fb34 zsh-5.2.tar.xz +md5 c5ba34e68fcf62a2e78adc56bf3d328a zsh-5.3.tar.xz # Calculated based on the hash above -sha256 f17916320ffaa844bbd7ce48ceeb5945fc5f3eff64b149b4229bbfbdf3795a9d zsh-5.2.tar.xz +sha256 76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a zsh-5.3.tar.xz diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index aa4029f1a2..9d11b9713d 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,13 +4,11 @@ # ################################################################################ -ZSH_VERSION = 5.2 +ZSH_VERSION = 5.3 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses ZSH_CONF_OPTS = --bindir=/bin -# Patching configure.ac -ZSH_AUTORECONF = YES ZSH_LICENSE = MIT-like ZSH_LICENSE_FILES = LICENCE From a39b269ea20f48ad6536ab969a9889907cd8ce43 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 12 Dec 2016 17:05:00 -0300 Subject: [PATCH 1836/3392] nano: bump to version 2.7.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/nano/nano.hash | 2 +- package/nano/nano.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index cb411b7e6a..d1814aed93 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 df5cbe69831d7394c0a32fb27373ab313335ea4dc586d6f4be4081eb1de857cd nano-2.7.1.tar.xz +sha256 77016f73c686857ce8a3ec217832febb6e636122762d47ce3c6cbef6f7e390c2 nano-2.7.2.tar.xz diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 88e3cdb952..7f80554b27 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -5,7 +5,7 @@ ################################################################################ NANO_VERSION_MAJOR = 2.7 -NANO_VERSION = $(NANO_VERSION_MAJOR).1 +NANO_VERSION = $(NANO_VERSION_MAJOR).2 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPLv3+ From 808183a5016dcf8fcacfc7ae2a88609bda4fd895 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Mon, 12 Dec 2016 23:31:56 +0530 Subject: [PATCH 1837/3392] usb_modeswitch: bump to version 2.4.0 Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/usb_modeswitch/usb_modeswitch.hash | 2 +- package/usb_modeswitch/usb_modeswitch.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/usb_modeswitch/usb_modeswitch.hash b/package/usb_modeswitch/usb_modeswitch.hash index 075ef63bab..807b63f023 100644 --- a/package/usb_modeswitch/usb_modeswitch.hash +++ b/package/usb_modeswitch/usb_modeswitch.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f93e940c2eb0c585a5d2210177338e68a9b24f409e351e4a854132453246b894 usb-modeswitch-2.3.0.tar.bz2 +sha256 17dc32bf10df8e370f2369b5137d34dfd8f2347faaa51524c5f21c922f42e212 usb-modeswitch-2.4.0.tar.bz2 diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index ac41a80c70..e196db582d 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 2.3.0 +USB_MODESWITCH_VERSION = 2.4.0 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb From 93aaf48d29f315caf6ba9254559ad119ca0d5cb9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 12 Dec 2016 17:54:25 -0300 Subject: [PATCH 1838/3392] icu: fix build failure for musl musl doesn't have xlocale.h, and stdtod_l is crippled, so disable it. See thread from OE: http://lists.openembedded.org/pipermail/openembedded-core/2016-November/128527.html Fixes: http://autobuild.buildroot.net/results/6ca/6caebf0f6c4adf66e67bedd0f04155413a9aa7bd/ Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/icu/icu.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 12406d7524..b9e42de94b 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -25,6 +25,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ICU_CONF_ENV += LIBS="-latomic" endif +# strtod_l() is not supported by musl; also xlocale.h is missing +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +ICU_CONF_ENV += ac_cv_func_strtod_l=no +endif + HOST_ICU_CONF_OPTS = \ --disable-samples \ --disable-tests \ From 51cc2c4c88e7870486c40f36da0f13e50d994525 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 12 Dec 2016 22:00:16 +0100 Subject: [PATCH 1839/3392] package/enlightenment: bump to version 0.21.5 Bug fix release: https://www.enlightenment.org/news/e-0.21.5-release Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/enlightenment/enlightenment.hash | 4 ++-- package/enlightenment/enlightenment.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/enlightenment/enlightenment.hash b/package/enlightenment/enlightenment.hash index ba66918e76..1548f200b2 100644 --- a/package/enlightenment/enlightenment.hash +++ b/package/enlightenment/enlightenment.hash @@ -1,2 +1,2 @@ -# From https://www.enlightenment.org/news/e-0.21.4-release -sha256 0ed1a7c768017b2afa02cf94d9c532e9f960b6a4a7e79954770424dfb6b1bf20 enlightenment-0.21.4.tar.xz +# From https://www.enlightenment.org/news/e-0.21.5-release +sha256 f0745a660f70851c4ada9866b2a525185bfc5cd1685aa86e4cdb68f2c1c154bb enlightenment-0.21.5.tar.xz diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index c9361406f9..7037afe11c 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.21.4 +ENLIGHTENMENT_VERSION = 0.21.5 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_LICENSE = BSD-2c From d871352b3353881de510a06dd7f4895eced56469 Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Mon, 12 Dec 2016 13:51:13 +0900 Subject: [PATCH 1840/3392] php: fix build for AArch64 Add a patch from a PHP Github pull request that fixes the build at -O0 on AArch64. Signed-off-by: Tatsuyuki Ishi [Thomas: improved patch commit log.] Signed-off-by: Thomas Petazzoni --- ...onstraints-in-aarch64-multiply-macro.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch diff --git a/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch b/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch new file mode 100644 index 0000000000..f4812daaa5 --- /dev/null +++ b/package/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch @@ -0,0 +1,28 @@ +From 1622f24fde4220967bd907bf8f0325d444bf9339 Mon Sep 17 00:00:00 2001 +From: Andy Postnikov +Date: Sat, 10 Dec 2016 23:51:17 +0300 +Subject: [PATCH] Fix bug #70015 - Compilation failure on aarch64 + +Fixes build at -O0. + +[From pull request https://github.com/php/php-src/pull/2236.] +Signed-off-by: Tatsuyuki Ishi +--- + Zend/zend_multiply.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h +index 75769db..fbd69ab 100644 +--- a/Zend/zend_multiply.h ++++ b/Zend/zend_multiply.h +@@ -75,8 +75,8 @@ + __asm__("mul %0, %2, %3\n" \ + "smulh %1, %2, %3\n" \ + "sub %1, %1, %0, asr #63\n" \ +- : "=X"(__tmpvar), "=X"(usedval) \ +- : "X"(a), "X"(b)); \ ++ : "=&r"(__tmpvar), "=&r"(usedval) \ ++ : "r"(a), "r"(b)); \ + if (usedval) (dval) = (double) (a) * (double) (b); \ + else (lval) = __tmpvar; \ + } while (0) From f65e462da2b1100fb407b1409278bf42d6cc5ee3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 11 Dec 2016 23:29:16 +0100 Subject: [PATCH 1841/3392] php: add apache support Continue work started by Bernd Kuhls in https://patchwork.ozlabs.org/patch/437544/ Signed-off-by: Bernd Kuhls Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0009-Call-apxs-with-correct-prefix.patch | 49 +++++++++++++++++++ package/php/Config.in | 7 +++ package/php/php.mk | 10 ++++ 3 files changed, 66 insertions(+) create mode 100644 package/php/0009-Call-apxs-with-correct-prefix.patch diff --git a/package/php/0009-Call-apxs-with-correct-prefix.patch b/package/php/0009-Call-apxs-with-correct-prefix.patch new file mode 100644 index 0000000000..b850ab7755 --- /dev/null +++ b/package/php/0009-Call-apxs-with-correct-prefix.patch @@ -0,0 +1,49 @@ +From 4342bdea7a1a21430ce0d051fa4387441166c473 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 11 Dec 2016 23:12:46 +0100 +Subject: [PATCH] Call apxs with correct prefix + +php uses apache's apxs script from staging directory to install libphp +dynamic library and update /etc/apache2/httpd.conf in the staging and target +directories. Here is the full command line: +"apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules' + -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7" +This does not work for target directory as apxs sets the full path of the +library and not the relative one. Indeed, apxs is smart enough to substitute +away the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so +httpd.conf will only be correct in the staging directory. +To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure + +Signed-off-by: Fabrice Fontaine +--- + sapi/apache2handler/config.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 +index 2e64b21..f5bf002 100644 +--- a/sapi/apache2handler/config.m4 ++++ b/sapi/apache2handler/config.m4 +@@ -66,10 +66,12 @@ if test "$PHP_APXS2" != "no"; then + AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) + fi + ++ APXS_PREFIX='$(INSTALL_ROOT)'/usr + APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` + if test -z `$APXS -q SYSCONFDIR`; then + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ ++ -S PREFIX='$APXS_PREFIX' \ + -i -n php7" + else + APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` +@@ -77,6 +79,7 @@ if test "$PHP_APXS2" != "no"; then + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ ++ -S PREFIX='$APXS_PREFIX' \ + -i -a -n php7" + fi + +-- +2.5.0 + diff --git a/package/php/Config.in b/package/php/Config.in index 57dabc435f..0fb80063af 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PHP bool "php" select BR2_PACKAGE_PHP_SAPI_CGI if \ + !BR2_PACKAGE_PHP_SAPI_APACHE && \ !BR2_PACKAGE_PHP_SAPI_CLI && \ !BR2_PACKAGE_PHP_SAPI_FPM && \ BR2_USE_MMU @@ -14,6 +15,12 @@ config BR2_PACKAGE_PHP if BR2_PACKAGE_PHP +config BR2_PACKAGE_PHP_SAPI_APACHE + bool "Apache interface" + depends on BR2_PACKAGE_APACHE + help + Apache module + config BR2_PACKAGE_PHP_SAPI_CGI bool "CGI interface" # CGI uses fork() diff --git a/package/php/php.mk b/package/php/php.mk index 8c1ccef68c..e8c8f4b779 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -81,6 +81,16 @@ PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CLI),--enable-cli,--disable-cli) PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CGI),--enable-cgi,--disable-cgi) PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_FPM),--enable-fpm,--disable-fpm) +ifeq ($(BR2_PACKAGE_PHP_SAPI_APACHE),y) +PHP_DEPENDENCIES += apache +PHP_CONF_OPTS += --with-apxs2=$(STAGING_DIR)/usr/bin/apxs + +# Enable thread safety option if Apache MPM is event or worker +ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT)$(BR2_PACKAGE_APACHE_MPM_WORKER),y) +PHP_CONF_OPTS += --enable-maintainer-zts +endif +endif + ### Extensions PHP_CONF_OPTS += \ $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \ From a08b08e8c90d5e46ef99acb936a840d7eab5b42c Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 12 Dec 2016 22:21:07 -0600 Subject: [PATCH 1842/3392] policycoreutils: CPPFLAGS undefine _FILE_OFFSET_BITS Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h large file support. Similar action was taken previously for CFLAGS. Resolves: http://autobuild.buildroot.net/results/4cb/4cb70d776bee01f1284e0c0be5b3fb5f1011353a/ http://autobuild.buildroot.net/results/f43/f438149e7d83475d425e1c1f17550f3cf5f69340/ Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- package/policycoreutils/policycoreutils.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index b43569fc99..c9f9ebc89c 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -36,6 +36,7 @@ endif POLICYCOREUTILS_MAKE_OPTS += \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ + CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" \ ARCH="$(BR2_ARCH)" POLICYCOREUTILS_MAKE_DIRS = \ @@ -74,6 +75,7 @@ HOST_POLICYCOREUTILS_DEPENDENCIES = \ HOST_POLICYCOREUTILS_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS) -U_FILE_OFFSET_BITS" \ + CPPFLAGS="$(HOST_CPPFLAGS) -U_FILE_OFFSET_BITS" \ PYTHON="$(HOST_DIR)/usr/bin/python" \ PYTHON_INSTALL_ARGS="$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)" \ ARCH="$(HOSTARCH)" From 08af46e39081bea4cf73ac8bd2031b3996e31b90 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 12 Dec 2016 22:21:08 -0600 Subject: [PATCH 1843/3392] policycoreutils: restorecon libglib2 dependency Updated to match Config.in select of libglib2 package as dependency if restorecon is enabled. Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- package/policycoreutils/policycoreutils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index c9f9ebc89c..86639ccc6d 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -48,6 +48,7 @@ POLICYCOREUTILS_MAKE_DIRS = \ ifeq ($(BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND),y) POLICYCOREUTILS_MAKE_DIRS += restorecond +POLICYCOREUTILS_DEPENDENCIES += libglib2 endif # We need to pass DESTDIR at build time because it's used by # policycoreutils build system to find headers and libraries. From 9441f92bdd9a6b67989384193920a495492b7c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 13 Dec 2016 10:38:10 +0100 Subject: [PATCH 1844/3392] package/mpd: bump version to 0.19.20 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/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 8f620e7648..4ded85d68a 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 bc856cda4136403446d53d11576f86990b61d1fe4668f6008e9eae47450d4e1d mpd-0.19.19.tar.xz +sha256 ecf74993085509c82e2bfadce88434b62b7727d844add9c548eb63532a5e3b8a mpd-0.19.20.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 0bf8ece08b..bee71829d0 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.19 -MPD_VERSION = $(MPD_VERSION_MAJOR).19 +MPD_VERSION = $(MPD_VERSION_MAJOR).20 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost libglib2 From 64745304fcc143c3aab3f9420b6b18847579c63b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 13 Dec 2016 11:50:44 -0300 Subject: [PATCH 1845/3392] zlib: use $(TARGET_MAKE_ENV) when calling $(MAKE1) Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/zlib/zlib.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index aec9daf6fe..d00ca75c03 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -44,7 +44,7 @@ define HOST_ZLIB_CONFIGURE_CMDS endef define ZLIB_BUILD_CMDS - $(MAKE1) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) endef define HOST_ZLIB_BUILD_CMDS @@ -52,11 +52,11 @@ define HOST_ZLIB_BUILD_CMDS endef define ZLIB_INSTALL_STAGING_CMDS - $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) LDCONFIG=true install + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) LDCONFIG=true install endef define ZLIB_INSTALL_TARGET_CMDS - $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) LDCONFIG=true install + $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) LDCONFIG=true install endef # We don't care removing the .a from target, since it not used at link From aa9a838364c7d60fd32eb265a88dea17a2be8324 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 13 Dec 2016 11:50:45 -0300 Subject: [PATCH 1846/3392] zlib: use $(HOST_MAKE_ENV) when calling $(MAKE1) Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/zlib/zlib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index d00ca75c03..53eb84e150 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -48,7 +48,7 @@ define ZLIB_BUILD_CMDS endef define HOST_ZLIB_BUILD_CMDS - $(MAKE1) -C $(@D) + $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) endef define ZLIB_INSTALL_STAGING_CMDS @@ -70,7 +70,7 @@ ZLIB_POST_INSTALL_STAGING_HOOKS += ZLIB_RM_STATIC_STAGING endif define HOST_ZLIB_INSTALL_CMDS - $(MAKE1) -C $(@D) LDCONFIG=true install + $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) LDCONFIG=true install endef $(eval $(generic-package)) From a32ad113db1011bacc6dca3725117a66bbd7a465 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 13 Dec 2016 12:47:40 -0300 Subject: [PATCH 1847/3392] python-pyicu: bump to version 1.9.5 Fixes: http://autobuild.buildroot.net/results/48c/48cfb0fe00fdd52af502f9570d291125fb57b9f0/ Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/python-pyicu/python-pyicu.hash | 4 ++-- package/python-pyicu/python-pyicu.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyicu/python-pyicu.hash b/package/python-pyicu/python-pyicu.hash index a05a30ee96..69edba83b1 100644 --- a/package/python-pyicu/python-pyicu.hash +++ b/package/python-pyicu/python-pyicu.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/PyICU/json, sha256 locally computed -md5 fadaf9f85830632f915cb85875ae9a39 PyICU-1.9.3.tar.gz -sha256 1a7a96212cb3e42e8df85b9062f1f1d6e207474d44f087218fad1d4ec210fa42 PyICU-1.9.3.tar.gz +md5 30f85b7272f15b26c110c9f3e3a9e7a0 PyICU-1.9.5.tar.gz +sha256 73b052b800861fae3281dbaf9c92d12a81cabf3d31912d94c51862e093ef359b PyICU-1.9.5.tar.gz diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk index fa3a7f4195..5c01421376 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYICU_VERSION = 1.9.3 +PYTHON_PYICU_VERSION = 1.9.5 PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz -PYTHON_PYICU_SITE = https://pypi.python.org/packages/bf/1f/cea237f542e3bb592980008a734850e8cbbc25c19c72c98767c71c1bd9c2 +PYTHON_PYICU_SITE = https://pypi.python.org/packages/a2/9f/1947f288143191b903e58633ee597cb98bc284de28dafb1231b6f8b67b99 PYTHON_PYICU_LICENSE = MIT PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu From 660b3308cf01fafd789989359bd15362d7e038c1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 13 Dec 2016 14:44:53 -0300 Subject: [PATCH 1848/3392] gdk-pixbuf: security bump to version 2.36.1 Fixes an integer buffer overflow in the jpeg loader (details still embargoed). 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 e5a8958d92..5508fd2d97 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.36/gdk-pixbuf-2.36.0.sha256sum -sha256 85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c gdk-pixbuf-2.36.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.1.sha256sum +sha256 9d5ba72070460c1b5b74115d395a3e33daeb7b7b67fb256cdccc9d7187c42a38 gdk-pixbuf-2.36.1.tar.xz diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 6d1a84d181..4f1fe59c8f 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,7 +5,7 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.36 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).0 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).1 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 f2b8dad0d0883338783314b276f912deaff3c882 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 13 Dec 2016 15:50:17 -0200 Subject: [PATCH 1849/3392] configs/imx6ulpico: Bump to kernel 4.9 Bump to kernel 4.9 and remove the wifi dts patch as it is already part of 4.9. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- .../patches/linux/0001-picowifi.patch | 66 ------------------- configs/imx6ulpico_defconfig | 9 +-- 2 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 board/technexion/imx6ulpico/patches/linux/0001-picowifi.patch diff --git a/board/technexion/imx6ulpico/patches/linux/0001-picowifi.patch b/board/technexion/imx6ulpico/patches/linux/0001-picowifi.patch deleted file mode 100644 index c657491584..0000000000 --- a/board/technexion/imx6ulpico/patches/linux/0001-picowifi.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 5a9a0986ab0041b53f55e2f4eaedabecb2ea1760 Mon Sep 17 00:00:00 2001 -From: Vanessa Maegima -Date: Mon, 1 Aug 2016 09:33:00 -0300 -Subject: [PATCH v2] ARM: dts: imx6ul-pico-hobbit: Add Wifi support - -imx6ul-pico-hobbit has a bcm4339 wifi chip connected to usdhc2 port. - -Add support for the WL_REG_ON regulator, so that Wifi can be -functional on this board. - -Signed-off-by: Vanessa Maegima -Signed-off-by: Fabio Estevam ---- -Changes since v1: -- Improve commit log -- Remove WL_HOST_WAKE - - arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts -index 8ce1fec..af2e06b 100644 ---- a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts -+++ b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts -@@ -100,6 +100,18 @@ - gpio = <&gpio1 6 0>; - }; - -+ reg_brcm: brcm-reg { -+ compatible = "regulator-fixed"; -+ enable-active-high; -+ gpio = <&gpio4 8 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_brcm_reg>; -+ regulator-name = "brcm_reg"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ startup-delay-us = <200000>; -+ }; -+ - sound { - compatible = "fsl,imx-audio-sgtl5000"; - model = "imx6ul-sgtl5000"; -@@ -325,12 +337,20 @@ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc2>; - no-1-8-v; -+ non-removable; - keep-power-in-suspend; - wakeup-source; -+ vmmc-supply = <®_brcm>; - status = "okay"; - }; - - &iomuxc { -+ pinctrl_brcm_reg: brcmreggrp { -+ fsl,pins = < -+ MX6UL_PAD_NAND_DATA06__GPIO4_IO08 0x10b0 /* WL_REG_ON */ -+ >; -+ }; -+ - pinctrl_enet2: enet2grp { - fsl,pins = < - MX6UL_PAD_ENET1_TX_DATA1__ENET2_MDIO 0x1b0b0 --- -1.9.1 diff --git a/configs/imx6ulpico_defconfig b/configs/imx6ulpico_defconfig index 7b9965497f..662b9ab043 100644 --- a/configs/imx6ulpico_defconfig +++ b/configs/imx6ulpico_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 4.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y +# Linux headers same as kernel, a 4.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc5" @@ -11,13 +11,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc5" # rootfs overlay BR2_ROOTFS_OVERLAY="board/technexion/imx6ulpico/rootfs_overlay" -# patches -BR2_GLOBAL_PATCH_DIR="board/technexion/imx6ulpico/patches" - # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/technexion/imx6ulpico/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y From c5255422538103afa1acba50c54f81bcf07d7a0d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 13 Dec 2016 15:13:13 -0200 Subject: [PATCH 1850/3392] mx6sx: Add support for mx6sx udoo neo boards Add support for mx6sx udoo neo boards. For more information about these boards, please check: http://www.udoo.org/udoo-neo The U-Boot and kernel dts patches will be removed when we bump U-Boot to 2017.01 and kernel to 4.10 version as they have already been sent upstream. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- board/udoo/neo/boot.scr.txt | 7 + board/udoo/neo/genimage.cfg | 31 + .../patches/linux/0001-udoo_neo_support.patch | 560 ++++++++++++++ board/udoo/neo/patches/uboot/0001-udoo.patch | 691 ++++++++++++++++++ board/udoo/neo/post-build.sh | 8 + board/udoo/neo/post-image.sh | 15 + board/udoo/neo/readme.txt | 16 + configs/mx6sx_udoo_neo_defconfig | 29 + 8 files changed, 1357 insertions(+) create mode 100644 board/udoo/neo/boot.scr.txt create mode 100644 board/udoo/neo/genimage.cfg create mode 100644 board/udoo/neo/patches/linux/0001-udoo_neo_support.patch create mode 100644 board/udoo/neo/patches/uboot/0001-udoo.patch create mode 100755 board/udoo/neo/post-build.sh create mode 100755 board/udoo/neo/post-image.sh create mode 100644 board/udoo/neo/readme.txt create mode 100644 configs/mx6sx_udoo_neo_defconfig diff --git a/board/udoo/neo/boot.scr.txt b/board/udoo/neo/boot.scr.txt new file mode 100644 index 0000000000..f647db3719 --- /dev/null +++ b/board/udoo/neo/boot.scr.txt @@ -0,0 +1,7 @@ +setenv finduuid "part uuid mmc 0:1 uuid" +run finduuid +run findfdt +setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4" +load mmc 0:1 ${fdt_addr} boot/${fdt_file} +load mmc 0:1 ${loadaddr} boot/zImage +bootz ${loadaddr} - ${fdt_addr} diff --git a/board/udoo/neo/genimage.cfg b/board/udoo/neo/genimage.cfg new file mode 100644 index 0000000000..1f7edf4aa3 --- /dev/null +++ b/board/udoo/neo/genimage.cfg @@ -0,0 +1,31 @@ +# Minimal SD card image for the MX6SX Udoo Neo board +# +# The SD card must have at least 1 MB free at the beginning. +# U-Boot and its environment are dumped as is. +# A single root filesystem partition is required (Ext4 in this case). +# +# For details about the layout, see: +# http://wiki.wandboard.org/index.php/Boot-process + +image sdcard.img { + hdimage { + } + + partition spl { + in-partition-table = "no" + image = "SPL" + offset = 1K + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot.img" + offset = 69K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/udoo/neo/patches/linux/0001-udoo_neo_support.patch b/board/udoo/neo/patches/linux/0001-udoo_neo_support.patch new file mode 100644 index 0000000000..2e8cea5d12 --- /dev/null +++ b/board/udoo/neo/patches/linux/0001-udoo_neo_support.patch @@ -0,0 +1,560 @@ +From 76e691fc7653b85d390e58710e5c7db73ca49367 Mon Sep 17 00:00:00 2001 +From: Andreas Färber +Date: Sun, 16 Oct 2016 16:44:23 +0200 +Subject: ARM: dts: imx6sx: Add UDOO Neo support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add initial device trees for UDOO Neo Basic, Extended and Full boards: +* Serial console is enabled, other serial ports are prepared. +* I2C based PMIC is enabled. +* Ethernet is enabled for Basic and Full. +* SDHC is enabled, with the SDIO_PWR GPIO modeled as a regulator. +* Both user LEDs are enabled, with the orange one reserved for the M4 + and with the SD card as default trigger for the red LED. + +The decision on a board compatible string is deferred to later. + +Cc: Ettore Chimenti +Signed-off-by: Andreas Färber +Signed-off-by: Shawn Guo +--- + arch/arm/boot/dts/Makefile | 5 +- + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 69 ++++++ + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 54 +++++ + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 69 ++++++ + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 293 +++++++++++++++++++++++++ + 5 files changed, 489 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-full.dts + create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo.dtsi + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index 019976b..da0197d 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -417,7 +417,10 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ + imx6sx-sabreauto.dtb \ + imx6sx-sdb-reva.dtb \ + imx6sx-sdb-sai.dtb \ +- imx6sx-sdb.dtb ++ imx6sx-sdb.dtb \ ++ imx6sx-udoo-neo-basic.dtb \ ++ imx6sx-udoo-neo-extended.dtb \ ++ imx6sx-udoo-neo-full.dtb + dtb-$(CONFIG_SOC_IMX6UL) += \ + imx6ul-14x14-evk.dtb \ + imx6ul-geam-kit.dtb \ +diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts +new file mode 100644 +index 0000000..0b88878 +--- /dev/null ++++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts +@@ -0,0 +1,69 @@ ++/* ++ * Copyright (c) 2016 Andreas Färber ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively, ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/dts-v1/; ++ ++#include "imx6sx-udoo-neo.dtsi" ++ ++/ { ++ model = "UDOO Neo Basic"; ++ compatible = "fsl,imx6sx"; ++ ++ memory { ++ reg = <0x80000000 0x20000000>; ++ }; ++}; ++ ++&fec1 { ++ phy-handle = <ðphy1>; ++ status = "okay"; ++ ++ mdio { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ ethphy1: ethernet-phy@0 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <0>; ++ }; ++ }; ++}; +diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts +new file mode 100644 +index 0000000..d6fdd17 +--- /dev/null ++++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts +@@ -0,0 +1,54 @@ ++/* ++ * Copyright (c) 2016 Andreas Färber ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively, ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/dts-v1/; ++ ++#include "imx6sx-udoo-neo.dtsi" ++ ++/ { ++ model = "UDOO Neo Extended"; ++ compatible = "fsl,imx6sx"; ++ ++ memory { ++ reg = <0x80000000 0x40000000>; ++ }; ++}; +diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts +new file mode 100644 +index 0000000..d8c3577 +--- /dev/null ++++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts +@@ -0,0 +1,69 @@ ++/* ++ * Copyright (c) 2016 Andreas Färber ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively, ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/dts-v1/; ++ ++#include "imx6sx-udoo-neo.dtsi" ++ ++/ { ++ model = "UDOO Neo Full"; ++ compatible = "fsl,imx6sx"; ++ ++ memory { ++ reg = <0x80000000 0x40000000>; ++ }; ++}; ++ ++&fec1 { ++ phy-handle = <ðphy1>; ++ status = "okay"; ++ ++ mdio { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ ethphy1: ethernet-phy@0 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <0>; ++ }; ++ }; ++}; +diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi +new file mode 100644 +index 0000000..2b65d26 +--- /dev/null ++++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi +@@ -0,0 +1,293 @@ ++/* ++ * Copyright (c) 2016 Andreas Färber ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively, ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++#include "imx6sx.dtsi" ++ ++/ { ++ compatible = "fsl,imx6sx"; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ red { ++ label = "udoo-neo:red:mmc"; ++ gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>; ++ default-state = "off"; ++ linux,default-trigger = "mmc0"; ++ }; ++ ++ orange { ++ label = "udoo-neo:orange:user"; ++ gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; ++ default-state = "keep"; ++ }; ++ }; ++ ++ reg_sdio_pwr: regulator-sdio-pwr { ++ compatible = "regulator-fixed"; ++ gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ regulator-name = "SDIO_PWR"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-boot-on; ++ }; ++}; ++ ++&cpu0 { ++ arm-supply = <&sw1a_reg>; ++ soc-supply = <&sw1c_reg>; ++}; ++ ++&fec1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_enet1>; ++ phy-mode = "rmii"; ++ phy-reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; ++}; ++ ++&i2c1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_i2c1>; ++ clock-frequency = <100000>; ++ status = "okay"; ++ ++ pmic: pmic@08 { ++ compatible = "fsl,pfuze3000"; ++ reg = <0x08>; ++ ++ regulators { ++ sw1a_reg: sw1a { ++ regulator-min-microvolt = <700000>; ++ regulator-max-microvolt = <1475000>; ++ regulator-boot-on; ++ regulator-always-on; ++ regulator-ramp-delay = <6250>; ++ }; ++ ++ sw1c_reg: sw1b { ++ regulator-min-microvolt = <700000>; ++ regulator-max-microvolt = <1475000>; ++ regulator-boot-on; ++ regulator-always-on; ++ regulator-ramp-delay = <6250>; ++ }; ++ ++ sw2_reg: sw2 { ++ regulator-min-microvolt = <1500000>; ++ regulator-max-microvolt = <1850000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ sw3a_reg: sw3 { ++ regulator-min-microvolt = <900000>; ++ regulator-max-microvolt = <1650000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ swbst_reg: swbst { ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5150000>; ++ }; ++ ++ snvs_reg: vsnvs { ++ regulator-min-microvolt = <1000000>; ++ regulator-max-microvolt = <3000000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vref_reg: vrefddr { ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vgen1_reg: vldo1 { ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ }; ++ ++ vgen2_reg: vldo2 { ++ regulator-min-microvolt = <800000>; ++ regulator-max-microvolt = <1550000>; ++ }; ++ ++ vgen3_reg: vccsd { ++ regulator-min-microvolt = <2850000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ }; ++ ++ vgen4_reg: v33 { ++ regulator-min-microvolt = <2850000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ }; ++ ++ vgen5_reg: vldo3 { ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ }; ++ ++ vgen6_reg: vldo4 { ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ }; ++ }; ++ }; ++}; ++ ++&iomuxc { ++ pinctrl_enet1: enet1grp { ++ fsl,pins = ++ , ++ , ++ , ++ , ++ , ++ , ++ ++ , ++ , ++ , ++ , ++ , ++ , ++ ++ ; ++ }; ++ ++ pinctrl_i2c1: i2c1grp { ++ fsl,pins = ++ , ++ ; ++ }; ++ ++ pinctrl_uart1: uart1grp { ++ fsl,pins = ++ , ++ ; ++ }; ++ ++ pinctrl_uart2: uart2grp { ++ fsl,pins = ++ , ++ ; ++ }; ++ ++ pinctrl_uart5: uart5grp { ++ fsl,pins = ++ , ++ ; ++ }; ++ ++ pinctrl_uart6: uart6grp { ++ fsl,pins = ++ , ++ , ++ , ++ , ++ , ++ , ++ , ++ ; ++ }; ++ ++ pinctrl_usdhc2: usdhc2grp { ++ fsl,pins = ++ , ++ , ++ , ++ , ++ , ++ , ++ ; /* CD */ ++ }; ++}; ++ ++&uart1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_uart1>; ++ status = "okay"; ++}; ++ ++/* Cortex-M4 serial */ ++&uart2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_uart2>; ++ status = "disabled"; ++}; ++ ++/* Arduino serial */ ++&uart5 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_uart5>; ++ status = "disabled"; ++}; ++ ++&uart6 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_uart6>; ++ uart-has-rtscts; ++ status = "disabled"; ++}; ++ ++&usdhc2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usdhc2>; ++ vmmc-supply = <®_sdio_pwr>; ++ bus-width = <4>; ++ cd-gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; ++ no-1-8-v; ++ keep-power-in-suspend; ++ wakeup-source; ++ status = "okay"; ++}; +-- +cgit v0.12 diff --git a/board/udoo/neo/patches/uboot/0001-udoo.patch b/board/udoo/neo/patches/uboot/0001-udoo.patch new file mode 100644 index 0000000000..ec1e00d8ff --- /dev/null +++ b/board/udoo/neo/patches/uboot/0001-udoo.patch @@ -0,0 +1,691 @@ +From 792f186846672140deca7dfbf2f20aece26b5348 Mon Sep 17 00:00:00 2001 +From: Breno Lima +Date: Fri, 25 Nov 2016 16:56:57 -0200 +Subject: [PATCH] mx6sx: Add initial support for UDOO Neo Board + +UDOO Neo Board is a development board from Seco that has three models: + - UDOO Neo Basic + - UDOO Neo Basic Kick Starter + - UDOO Neo Extended + - UDOO Neo Full + +All versions are based on the i.MX6 SoloX processor. + +For more details about the UDOO Neo board, please refer to: +http://www.udoo.org/udoo-neo/ + +This work is based on a previous commit of Francesco Montefoschi +: +https://github.com/fmntf/u-boot/commit/877b71184a5105e708024f232d36aed574961844 + +Only tested on the UDOO Neo Full board. + +Signed-off-by: Breno Lima +Reviewed-by: Fabio Estevam +--- + arch/arm/cpu/armv7/mx6/Kconfig | 5 + + board/udoo/neo/Kconfig | 12 ++ + board/udoo/neo/MAINTAINERS | 7 + + board/udoo/neo/Makefile | 6 + + board/udoo/neo/neo.c | 441 ++++++++++++++++++++++++++++++++++++++++ + configs/udoo_neo_defconfig | 30 +++ + include/configs/udoo_neo.h | 94 +++++++++ + 7 files changed, 595 insertions(+) + create mode 100644 board/udoo/neo/Kconfig + create mode 100644 board/udoo/neo/MAINTAINERS + create mode 100644 board/udoo/neo/Makefile + create mode 100644 board/udoo/neo/neo.c + create mode 100644 configs/udoo_neo_defconfig + create mode 100644 include/configs/udoo_neo.h + +diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig +index 8b2217e..a81d944 100644 +--- a/arch/arm/cpu/armv7/mx6/Kconfig ++++ b/arch/arm/cpu/armv7/mx6/Kconfig +@@ -200,6 +200,10 @@ config TARGET_UDOO + bool "udoo" + select SUPPORT_SPL + ++config TARGET_UDOO_NEO ++ bool "UDOO Neo" ++ select SUPPORT_SPL ++ + config TARGET_WANDBOARD + bool "wandboard" + select SUPPORT_SPL +@@ -261,6 +265,7 @@ source "board/technexion/pico-imx6ul/Kconfig" + source "board/tbs/tbs2910/Kconfig" + source "board/tqc/tqma6/Kconfig" + source "board/udoo/Kconfig" ++source "board/udoo/neo/Kconfig" + source "board/wandboard/Kconfig" + source "board/warp/Kconfig" + +diff --git a/board/udoo/neo/Kconfig b/board/udoo/neo/Kconfig +new file mode 100644 +index 0000000..8f474df +--- /dev/null ++++ b/board/udoo/neo/Kconfig +@@ -0,0 +1,12 @@ ++if TARGET_UDOO_NEO ++ ++config SYS_VENDOR ++ default "udoo" ++ ++config SYS_BOARD ++ default "neo" ++ ++config SYS_CONFIG_NAME ++ default "udoo_neo" ++ ++endif +diff --git a/board/udoo/neo/MAINTAINERS b/board/udoo/neo/MAINTAINERS +new file mode 100644 +index 0000000..743fe33 +--- /dev/null ++++ b/board/udoo/neo/MAINTAINERS +@@ -0,0 +1,7 @@ ++UDOO NEO BOARD ++M: Breno Lima ++M: Francesco Montefoschi ++S: Maintained ++F: board/udoo/neo/ ++F: include/configs/udoo_neo.h ++F: configs/udoo_neo_defconfig +diff --git a/board/udoo/neo/Makefile b/board/udoo/neo/Makefile +new file mode 100644 +index 0000000..150cbc1 +--- /dev/null ++++ b/board/udoo/neo/Makefile +@@ -0,0 +1,6 @@ ++# (C) Copyright 2015 UDOO Team ++# ++# SPDX-License-Identifier: GPL-2.0+ ++# ++ ++obj-y := neo.o +diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c +new file mode 100644 +index 0000000..7f17469 +--- /dev/null ++++ b/board/udoo/neo/neo.c +@@ -0,0 +1,441 @@ ++/* ++ * Copyright (C) 2014-2015 Freescale Semiconductor, Inc. ++ * Copyright (C) Jasbir Matharu ++ * Copyright (C) UDOO Team ++ * ++ * Author: Breno Lima ++ * Author: Francesco Montefoschi ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++DECLARE_GLOBAL_DATA_PTR; ++ ++enum { ++ UDOO_NEO_TYPE_BASIC, ++ UDOO_NEO_TYPE_BASIC_KS, ++ UDOO_NEO_TYPE_FULL, ++ UDOO_NEO_TYPE_EXTENDED, ++}; ++ ++#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ ++ PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ ++ PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) ++ ++#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ ++ PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ ++ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) ++ ++#define WDOG_PAD_CTRL (PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED | \ ++ PAD_CTL_DSE_40ohm) ++ ++#define BOARD_DETECT_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ ++ PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ ++ PAD_CTL_DSE_34ohm | PAD_CTL_HYS | PAD_CTL_SRE_FAST) ++#define BOARD_DETECT_PAD_CFG (MUX_PAD_CTRL(BOARD_DETECT_PAD_CTRL) | \ ++ MUX_MODE_SION) ++ ++int dram_init(void) ++{ ++ gd->ram_size = imx_ddr_size(); ++ return 0; ++} ++ ++static iomux_v3_cfg_t const uart1_pads[] = { ++ MX6_PAD_GPIO1_IO04__UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL), ++ MX6_PAD_GPIO1_IO05__UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL), ++}; ++ ++static iomux_v3_cfg_t const usdhc2_pads[] = { ++ MX6_PAD_SD2_CLK__USDHC2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD2_CMD__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD2_DATA0__USDHC2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD2_DATA1__USDHC2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD2_DATA2__USDHC2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD2_DATA3__USDHC2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ /* CD pin */ ++ MX6_PAD_SD1_DATA0__GPIO6_IO_2 | MUX_PAD_CTRL(NO_PAD_CTRL), ++ /* Power */ ++ MX6_PAD_SD1_CMD__GPIO6_IO_1 | MUX_PAD_CTRL(NO_PAD_CTRL), ++}; ++ ++static iomux_v3_cfg_t const board_recognition_pads[] = { ++ /*Connected to R184*/ ++ MX6_PAD_NAND_READY_B__GPIO4_IO_13 | BOARD_DETECT_PAD_CFG, ++ /*Connected to R185*/ ++ MX6_PAD_NAND_ALE__GPIO4_IO_0 | BOARD_DETECT_PAD_CFG, ++}; ++ ++static iomux_v3_cfg_t const usdhc3_pads[] = { ++ /* Configured for WLAN */ ++ MX6_PAD_SD3_CLK__USDHC3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD3_CMD__USDHC3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD3_DATA0__USDHC3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD3_DATA1__USDHC3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD3_DATA2__USDHC3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD3_DATA3__USDHC3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++}; ++ ++static iomux_v3_cfg_t const wdog_b_pad = { ++ MX6_PAD_GPIO1_IO13__GPIO1_IO_13 | MUX_PAD_CTRL(WDOG_PAD_CTRL), ++}; ++ ++static iomux_v3_cfg_t const peri_3v3_pads[] = { ++ MX6_PAD_QSPI1A_DATA0__GPIO4_IO_16 | MUX_PAD_CTRL(NO_PAD_CTRL), ++}; ++ ++static void setup_iomux_uart(void) ++{ ++ imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); ++} ++ ++int board_init(void) ++{ ++ /* Address of boot parameters */ ++ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; ++ ++ /* ++ * Because kernel set WDOG_B mux before pad with the commone pinctrl ++ * framwork now and wdog reset will be triggered once set WDOG_B mux ++ * with default pad setting, we set pad setting here to workaround this. ++ * Since imx_iomux_v3_setup_pad also set mux before pad setting, we set ++ * as GPIO mux firstly here to workaround it. ++ */ ++ imx_iomux_v3_setup_pad(wdog_b_pad); ++ ++ /* Enable PERI_3V3, which is used by SD2, ENET, LVDS, BT */ ++ imx_iomux_v3_setup_multiple_pads(peri_3v3_pads, ++ ARRAY_SIZE(peri_3v3_pads)); ++ ++ /* Active high for ncp692 */ ++ gpio_direction_output(IMX_GPIO_NR(4, 16) , 1); ++ ++ return 0; ++} ++ ++static int get_board_value(void) ++{ ++ int r184, r185; ++ ++ imx_iomux_v3_setup_multiple_pads(board_recognition_pads, ++ ARRAY_SIZE(board_recognition_pads)); ++ ++ gpio_direction_input(IMX_GPIO_NR(4, 13)); ++ gpio_direction_input(IMX_GPIO_NR(4, 0)); ++ ++ r184 = gpio_get_value(IMX_GPIO_NR(4, 13)); ++ r185 = gpio_get_value(IMX_GPIO_NR(4, 0)); ++ ++ /* ++ * Machine selection - ++ * Machine r184, r185 ++ * --------------------------------- ++ * Basic 0 0 ++ * Basic Ks 0 1 ++ * Full 1 0 ++ * Extended 1 1 ++ */ ++ ++ return (r184 << 1) + r185; ++} ++ ++int board_early_init_f(void) ++{ ++ setup_iomux_uart(); ++ ++ return 0; ++} ++ ++static struct fsl_esdhc_cfg usdhc_cfg[2] = { ++ {USDHC2_BASE_ADDR, 0, 4}, ++ {USDHC3_BASE_ADDR, 0, 4}, ++}; ++ ++#define USDHC2_PWR_GPIO IMX_GPIO_NR(6, 1) ++#define USDHC2_CD_GPIO IMX_GPIO_NR(6, 2) ++ ++int board_mmc_getcd(struct mmc *mmc) ++{ ++ struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; ++ int ret = 0; ++ ++ switch (cfg->esdhc_base) { ++ case USDHC2_BASE_ADDR: ++ ret = !gpio_get_value(USDHC2_CD_GPIO); ++ break; ++ } ++ ++ return ret; ++} ++ ++int board_mmc_init(bd_t *bis) ++{ ++#ifndef CONFIG_SPL_BUILD ++ int i, ret; ++ ++ /* ++ * According to the board_mmc_init() the following map is done: ++ * (U-boot device node) (Physical Port) ++ * mmc0 USDHC2 ++ */ ++ for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { ++ switch (i) { ++ case 0: ++ imx_iomux_v3_setup_multiple_pads( ++ usdhc2_pads, ARRAY_SIZE(usdhc2_pads)); ++ usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); ++ gpio_direction_input(USDHC2_CD_GPIO); ++ gpio_direction_output(USDHC2_PWR_GPIO, 1); ++ break; ++ case 1: ++ imx_iomux_v3_setup_multiple_pads( ++ usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); ++ usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); ++ break; ++ default: ++ printf("Warning: you configured more USDHC controllers\ ++ (%d) than supported by the board\n", i + 1); ++ return -EINVAL; ++ } ++ ++ ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); ++ if (ret) { ++ printf("Warning:\ ++ failed to initialize mmc dev %d\n", i); ++ return ret; ++ } ++ } ++ ++ return 0; ++#else ++ struct src *src_regs = (struct src *)SRC_BASE_ADDR; ++ u32 val; ++ u32 port; ++ ++ val = readl(&src_regs->sbmr1); ++ ++ if ((val & 0xc0) != 0x40) { ++ printf("Not boot from USDHC!\n"); ++ return -EINVAL; ++ } ++ ++ port = (val >> 11) & 0x3; ++ printf("port %d\n", port); ++ switch (port) { ++ case 1: ++ imx_iomux_v3_setup_multiple_pads( ++ usdhc2_pads, ARRAY_SIZE(usdhc2_pads)); ++ usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); ++ usdhc_cfg[0].esdhc_base = USDHC2_BASE_ADDR; ++ gpio_direction_input(USDHC2_CD_GPIO); ++ gpio_direction_output(USDHC2_PWR_GPIO, 1); ++ break; ++ case 2: ++ imx_iomux_v3_setup_multiple_pads( ++ usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); ++ usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); ++ usdhc_cfg[1].esdhc_base = USDHC3_BASE_ADDR; ++ break; ++ } ++ ++ gd->arch.sdhc_clk = usdhc_cfg[0].sdhc_clk; ++ return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); ++#endif ++} ++ ++char *board_string(void) ++{ ++ switch (get_board_value()) { ++ case UDOO_NEO_TYPE_BASIC: ++ return "BASIC"; ++ case UDOO_NEO_TYPE_BASIC_KS: ++ return "BASICKS"; ++ case UDOO_NEO_TYPE_FULL: ++ return "FULL"; ++ case UDOO_NEO_TYPE_EXTENDED: ++ return "EXTENDED"; ++ } ++ return "UNDEFINED"; ++} ++ ++int checkboard(void) ++{ ++ printf("Board: UDOO Neo %s\n", board_string()); ++ return 0; ++} ++ ++int board_late_init(void) ++{ ++#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG ++ setenv("board_name", board_string()); ++#endif ++ ++ return 0; ++} ++ ++#ifdef CONFIG_SPL_BUILD ++ ++#include ++#include ++ ++static const struct mx6sx_iomux_ddr_regs mx6_ddr_ioregs = { ++ .dram_dqm0 = 0x00000028, ++ .dram_dqm1 = 0x00000028, ++ .dram_dqm2 = 0x00000028, ++ .dram_dqm3 = 0x00000028, ++ .dram_ras = 0x00000020, ++ .dram_cas = 0x00000020, ++ .dram_odt0 = 0x00000020, ++ .dram_odt1 = 0x00000020, ++ .dram_sdba2 = 0x00000000, ++ .dram_sdcke0 = 0x00003000, ++ .dram_sdcke1 = 0x00003000, ++ .dram_sdclk_0 = 0x00000030, ++ .dram_sdqs0 = 0x00000028, ++ .dram_sdqs1 = 0x00000028, ++ .dram_sdqs2 = 0x00000028, ++ .dram_sdqs3 = 0x00000028, ++ .dram_reset = 0x00000020, ++}; ++ ++static const struct mx6sx_iomux_grp_regs mx6_grp_ioregs = { ++ .grp_addds = 0x00000020, ++ .grp_ddrmode_ctl = 0x00020000, ++ .grp_ddrpke = 0x00000000, ++ .grp_ddrmode = 0x00020000, ++ .grp_b0ds = 0x00000028, ++ .grp_b1ds = 0x00000028, ++ .grp_ctlds = 0x00000020, ++ .grp_ddr_type = 0x000c0000, ++ .grp_b2ds = 0x00000028, ++ .grp_b3ds = 0x00000028, ++}; ++ ++static const struct mx6_mmdc_calibration neo_mmcd_calib = { ++ .p0_mpwldectrl0 = 0x000E000B, ++ .p0_mpwldectrl1 = 0x000E0010, ++ .p0_mpdgctrl0 = 0x41600158, ++ .p0_mpdgctrl1 = 0x01500140, ++ .p0_mprddlctl = 0x3A383E3E, ++ .p0_mpwrdlctl = 0x3A383C38, ++}; ++ ++static const struct mx6_mmdc_calibration neo_basic_mmcd_calib = { ++ .p0_mpwldectrl0 = 0x001E0022, ++ .p0_mpwldectrl1 = 0x001C0019, ++ .p0_mpdgctrl0 = 0x41540150, ++ .p0_mpdgctrl1 = 0x01440138, ++ .p0_mprddlctl = 0x403E4644, ++ .p0_mpwrdlctl = 0x3C3A4038, ++}; ++ ++/* MT41K256M16 */ ++static struct mx6_ddr3_cfg neo_mem_ddr = { ++ .mem_speed = 1600, ++ .density = 4, ++ .width = 16, ++ .banks = 8, ++ .rowaddr = 15, ++ .coladdr = 10, ++ .pagesz = 2, ++ .trcd = 1375, ++ .trcmin = 4875, ++ .trasmin = 3500, ++}; ++ ++/* MT41K128M16 */ ++static struct mx6_ddr3_cfg neo_basic_mem_ddr = { ++ .mem_speed = 1600, ++ .density = 2, ++ .width = 16, ++ .banks = 8, ++ .rowaddr = 14, ++ .coladdr = 10, ++ .pagesz = 2, ++ .trcd = 1375, ++ .trcmin = 4875, ++ .trasmin = 3500, ++}; ++ ++static void ccgr_init(void) ++{ ++ struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; ++ ++ writel(0xFFFFFFFF, &ccm->CCGR0); ++ writel(0xFFFFFFFF, &ccm->CCGR1); ++ writel(0xFFFFFFFF, &ccm->CCGR2); ++ writel(0xFFFFFFFF, &ccm->CCGR3); ++ writel(0xFFFFFFFF, &ccm->CCGR4); ++ writel(0xFFFFFFFF, &ccm->CCGR5); ++ writel(0xFFFFFFFF, &ccm->CCGR6); ++ writel(0xFFFFFFFF, &ccm->CCGR7); ++} ++ ++static void spl_dram_init(void) ++{ ++ int board = get_board_value(); ++ ++ struct mx6_ddr_sysinfo sysinfo = { ++ .dsize = 1, /* width of data bus: 1 = 32 bits */ ++ .cs_density = 24, ++ .ncs = 1, ++ .cs1_mirror = 0, ++ .rtt_wr = 2, ++ .rtt_nom = 2, /* RTT_Nom = RZQ/2 */ ++ .walat = 1, /* Write additional latency */ ++ .ralat = 5, /* Read additional latency */ ++ .mif3_mode = 3, /* Command prediction working mode */ ++ .bi_on = 1, /* Bank interleaving enabled */ ++ .sde_to_rst = 0x10, /* 14 cycles, 200us (JEDEC default) */ ++ .rst_to_cke = 0x23, /* 33 cycles, 500us (JEDEC default) */ ++ }; ++ ++ mx6sx_dram_iocfg(32, &mx6_ddr_ioregs, &mx6_grp_ioregs); ++ if (board == UDOO_NEO_TYPE_BASIC || board == UDOO_NEO_TYPE_BASIC_KS) ++ mx6_dram_cfg(&sysinfo, &neo_basic_mmcd_calib, ++ &neo_basic_mem_ddr); ++ else ++ mx6_dram_cfg(&sysinfo, &neo_mmcd_calib, &neo_mem_ddr); ++} ++ ++void board_init_f(ulong dummy) ++{ ++ ccgr_init(); ++ ++ /* setup AIPS and disable watchdog */ ++ arch_cpu_init(); ++ ++ board_early_init_f(); ++ ++ /* setup GP timer */ ++ timer_init(); ++ ++ /* UART clocks enabled and gd valid - init serial console */ ++ preloader_console_init(); ++ ++ /* DDR initialization */ ++ spl_dram_init(); ++ ++ /* Clear the BSS. */ ++ memset(__bss_start, 0, __bss_end - __bss_start); ++ ++ /* load/boot image from boot device */ ++ board_init_r(NULL, 0); ++} ++ ++#endif +diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig +new file mode 100644 +index 0000000..3304afb +--- /dev/null ++++ b/configs/udoo_neo_defconfig +@@ -0,0 +1,30 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_MX6=y ++CONFIG_SPL_GPIO_SUPPORT=y ++CONFIG_SPL_LIBCOMMON_SUPPORT=y ++CONFIG_SPL_LIBGENERIC_SUPPORT=y ++CONFIG_TARGET_UDOO_NEO=y ++CONFIG_SPL_EXT_SUPPORT=y ++CONFIG_SPL_LIBDISK_SUPPORT=y ++CONFIG_SPL_MMC_SUPPORT=y ++CONFIG_SPL_SERIAL_SUPPORT=y ++CONFIG_SPL_ENV_SUPPORT=y ++CONFIG_SPL_WATCHDOG_SUPPORT=y ++CONFIG_SPL=y ++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX" ++CONFIG_HUSH_PARSER=y ++CONFIG_CMD_BOOTZ=y ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++CONFIG_CMD_MMC=y ++CONFIG_CMD_GPIO=y ++# CONFIG_CMD_SETEXPR is not set ++# CONFIG_CMD_DHCP=y ++CONFIG_CMD_CACHE=y ++CONFIG_CMD_TIME=y ++CONFIG_CMD_EXT2=y ++CONFIG_CMD_EXT4=y ++CONFIG_CMD_EXT4_WRITE=y ++CONFIG_CMD_FAT=y ++CONFIG_CMD_FS_GENERIC=y ++CONFIG_OF_LIBFDT=y +diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h +new file mode 100644 +index 0000000..81e0481 +--- /dev/null ++++ b/include/configs/udoo_neo.h +@@ -0,0 +1,94 @@ ++/* ++ * Copyright 2014-2015 Freescale Semiconductor, Inc. ++ * Copyright Jasbir Matharu ++ * Copyright 2015 UDOO Team ++ * ++ * Configuration settings for the UDOO NEO board. ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#ifndef __CONFIG_H ++#define __CONFIG_H ++ ++#include ++#include "mx6_common.h" ++ ++#include "imx6_spl.h" ++ ++/* Size of malloc() pool */ ++#define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) ++#define CONFIG_BOARD_EARLY_INIT_F ++#define CONFIG_BOARD_LATE_INIT ++#define CONFIG_MXC_UART ++ ++/* MMC Configuration */ ++#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR ++ ++/* Command definition */ ++#define CONFIG_MXC_UART_BASE UART1_BASE ++#define CONFIG_SYS_FSL_USDHC_NUM 2 ++#define CONFIG_SYS_MMC_ENV_DEV 0 /*USDHC2*/ ++ ++/* Linux only */ ++#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG ++#define CONFIG_EXTRA_ENV_SETTINGS \ ++ "console=ttymxc0,115200\0" \ ++ "fdt_high=0xffffffff\0" \ ++ "initrd_high=0xffffffff\0" \ ++ "fdt_file=undefined\0" \ ++ "fdt_addr=0x83000000\0" \ ++ "ip_dyn=yes\0" \ ++ "mmcdev=0\0" \ ++ "mmcrootfstype=ext4\0" \ ++ "mmcautodetect=no\0" \ ++ "findfdt="\ ++ "if test $board_name = BASIC; then " \ ++ "setenv fdt_file imx6sx-udoo-neo-basic.dtb; fi; " \ ++ "if test $board_name = BASICKS; then " \ ++ "setenv fdt_file imx6sx-udoo-neo-basic.dtb; fi; " \ ++ "if test $board_name = FULL; then " \ ++ "setenv fdt_file imx6sx-udoo-neo-full.dtb; fi; " \ ++ "if test $board_name = EXTENDED; then " \ ++ "setenv fdt_file imx6sx-udoo-neo-extended.dtb; fi; " \ ++ "if test $fdt_file = UNDEFINED; then " \ ++ "echo WARNING: Could not determine dtb to use; fi; \0" \ ++ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ ++ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ ++ "ramdisk_addr_r=0x83000000\0" \ ++ "ramdiskaddr=0x83000000\0" \ ++ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ ++ BOOTENV ++ ++#define BOOT_TARGET_DEVICES(func) \ ++ func(MMC, mmc, 0) ++ ++#define CONFIG_BOOTCOMMAND \ ++ "run findfdt; " \ ++ "run distro_bootcmd" ++ ++#include ++ ++/* Miscellaneous configurable options */ ++#define CONFIG_SYS_MEMTEST_START 0x80000000 ++#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000) ++#define CONFIG_STACKSIZE SZ_128K ++ ++/* Physical Memory Map */ ++#define CONFIG_NR_DRAM_BANKS 1 ++#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR ++#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM ++#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR ++#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE ++ ++#define CONFIG_SYS_INIT_SP_OFFSET \ ++ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) ++#define CONFIG_SYS_INIT_SP_ADDR \ ++ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) ++ ++/* Environment organization */ ++#define CONFIG_ENV_OFFSET (8 * SZ_64K) ++#define CONFIG_ENV_SIZE SZ_8K ++#define CONFIG_ENV_IS_IN_MMC ++ ++#endif /* __CONFIG_H */ +-- +1.7.10.4 diff --git a/board/udoo/neo/post-build.sh b/board/udoo/neo/post-build.sh new file mode 100755 index 0000000000..07c480e616 --- /dev/null +++ b/board/udoo/neo/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none \ +-n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr + +install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr diff --git a/board/udoo/neo/post-image.sh b/board/udoo/neo/post-image.sh new file mode 100755 index 0000000000..18e76aa40d --- /dev/null +++ b/board/udoo/neo/post-image.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + diff --git a/board/udoo/neo/readme.txt b/board/udoo/neo/readme.txt new file mode 100644 index 0000000000..f037ad484a --- /dev/null +++ b/board/udoo/neo/readme.txt @@ -0,0 +1,16 @@ +MX6X Udoo Neo board + +http://www.udoo.org/udoo-neo/ + +To build a minimal support for these boards: + + $ make mx6sx_udoo_neo_defconfig + $ make + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on an SD card: + +dd if=output/images/sdcard.img of=/dev/ + +For details about the medium image layout, see the definition in +board/udoo/neo/genimage.cfg. diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig new file mode 100644 index 0000000000..cbea577344 --- /dev/null +++ b/configs/mx6sx_udoo_neo_defconfig @@ -0,0 +1,29 @@ +BR2_arm=y +BR2_cortex_a9=y +# Linux headers same as kernel, a 4.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/neo/post-image.sh" +BR2_GLOBAL_PATCH_DIR="board/udoo/neo/patches" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="SPL" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +# required tools to create the SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From edcbc2d032d84e5549b90854dc022672ef876a8b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 31 Oct 2016 13:48:56 +0100 Subject: [PATCH 1851/3392] package/elfutils: add host variant elfutils (libelf and libdw) can be used by host-lttng-babeltrace. Enable all library dependencies, but don't build the programs. Signed-off-by: "Yann E. MORIN" Cc: Philippe Proulx Signed-off-by: Thomas Petazzoni --- package/elfutils/elfutils.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 9485d3b292..566e0bf840 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -11,9 +11,11 @@ ELFUTILS_INSTALL_STAGING = YES ELFUTILS_LICENSE = GPLv2+ or LGPLv3+ (library) ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3 ELFUTILS_DEPENDENCIES = zlib +HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz # We patch configure.ac ELFUTILS_AUTORECONF = YES +HOST_ELFUTILS_AUTORECONF = YES # Pass a custom program prefix to avoid a naming conflict between # elfutils binaries and binutils binaries. @@ -21,6 +23,12 @@ ELFUTILS_CONF_OPTS += \ --disable-werror \ --program-prefix="eu-" +HOST_ELFUTILS_CONF_OPTS = \ + --disable-werror \ + --with-bzlib \ + --with-lzma \ + --disable-progs + # elfutils gets confused when lfs mode is forced, so don't ELFUTILS_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) ELFUTILS_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) @@ -73,3 +81,4 @@ ELFUTILS_CONF_OPTS += --disable-progs endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 1df0a05b89ccccee8ba08640426d2bea2c188e65 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 31 Oct 2016 13:48:57 +0100 Subject: [PATCH 1852/3392] package/lttng-babeltrace: enable debug info support for the host variant Signed-off-by: "Yann E. MORIN" Cc: Philippe Proulx [Thomas: fix typo, adjust on top of master.] Signed-off-by: Thomas Petazzoni --- package/lttng-babeltrace/lttng-babeltrace.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk index 26339914f5..fb5cb65a7f 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.mk +++ b/package/lttng-babeltrace/lttng-babeltrace.mk @@ -10,9 +10,12 @@ LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code) LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf +# The host-elfutils dependency is optional, but since we don't have +# options for host packages, just build support for it +# unconditionally. HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ - host-popt host-util-linux host-libglib2 host-pkgconf -HOST_LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info + host-popt host-util-linux host-libglib2 host-pkgconf host-elfutils +HOST_LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info # For: 0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch LTTNG_BABELTRACE_AUTORECONF = YES From 91b8d74c023157b1755f9fa208df3463744c9751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 14 Dec 2016 09:47:57 +0100 Subject: [PATCH 1853/3392] package/ipmitool: bump version to 1.8.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some patches are not necessary anymore as upstream fixed the issues. As we are not patching configure.ac anymore, there is no need to autoreconf the package. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- ...> 0001-Fix-missing-stddef.h-include.patch} | 23 +++---- ...-Make-the-package-autoreconfigurable.patch | 38 ------------ .../0002-Avoid-wchar_t-redefinition.patch | 60 ------------------- ...missing-linux-param.h-header-include.patch | 39 ------------ package/ipmitool/ipmitool.hash | 2 +- package/ipmitool/ipmitool.mk | 5 +- 6 files changed, 14 insertions(+), 153 deletions(-) rename package/ipmitool/{0004-Fix-missing-stddef.h-include.patch => 0001-Fix-missing-stddef.h-include.patch} (57%) delete mode 100644 package/ipmitool/0001-Make-the-package-autoreconfigurable.patch delete mode 100644 package/ipmitool/0002-Avoid-wchar_t-redefinition.patch delete mode 100644 package/ipmitool/0003-Add-missing-linux-param.h-header-include.patch diff --git a/package/ipmitool/0004-Fix-missing-stddef.h-include.patch b/package/ipmitool/0001-Fix-missing-stddef.h-include.patch similarity index 57% rename from package/ipmitool/0004-Fix-missing-stddef.h-include.patch rename to package/ipmitool/0001-Fix-missing-stddef.h-include.patch index e58c8b09ea..dc3f92e482 100644 --- a/package/ipmitool/0004-Fix-missing-stddef.h-include.patch +++ b/package/ipmitool/0001-Fix-missing-stddef.h-include.patch @@ -1,4 +1,4 @@ -From 2b149f7723fbd6153e6605ea8efb2c9f2940c8e5 Mon Sep 17 00:00:00 2001 +From 04d489936191e685123978a1ca370f9cc30e6a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Mon, 18 Apr 2016 21:17:26 +0200 Subject: [PATCH] Fix missing stddef.h include @@ -16,22 +16,23 @@ https://sourceforge.net/p/ipmitool/mailman/message/35022779/ Signed-off-by: Jörg Krause --- - src/plugins/imb/imbapi.h | 2 ++ - 1 file changed, 2 insertions(+) + src/plugins/imb/imbapi.h | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/src/plugins/imb/imbapi.h b/src/plugins/imb/imbapi.h -index ead8956..8d0c7ae 100644 +index 6ba4121..6b39b47 100644 --- a/src/plugins/imb/imbapi.h +++ b/src/plugins/imb/imbapi.h -@@ -40,6 +40,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # include - #endif - +@@ -33,6 +33,9 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *----------------------------------------------------------------------*/ ++ +#include + + #ifndef _WINDEFS_H + #define _WINDEFS_H #ifndef FALSE - #define FALSE 0 - #endif -- -2.8.0 +2.10.2 diff --git a/package/ipmitool/0001-Make-the-package-autoreconfigurable.patch b/package/ipmitool/0001-Make-the-package-autoreconfigurable.patch deleted file mode 100644 index 17b4076269..0000000000 --- a/package/ipmitool/0001-Make-the-package-autoreconfigurable.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0d4b9d5d547b4a6e79108ac8c455e01f72a9aefa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sun, 10 Apr 2016 11:47:14 +0200 -Subject: [PATCH 1/3] Make the package autoreconfigurable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -ipmitool is not a compliant GNU package as it does not provide some necessary -files, like NEWS, AUTHORS, etc. - -Therefor set the Automake strictness to foreign to make the package -autoreconfigurable. - -Upstream status: Pending -https://sourceforge.net/p/ipmitool/mailman/message/35004711/ - -Signed-off-by: Jörg Krause ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 94e267a..9f3f7e1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -33,7 +33,7 @@ DOCLIST = $(top_srcdir)/README $(top_srcdir)/COPYING $(top_srcdir)/AUTHORS $(top - - EXTRA_DIST = $(DOCLIST) - --AUTOMAKE_OPTIONS = dist-bzip2 -+AUTOMAKE_OPTIONS = dist-bzip2 foreign - - MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \ - config.guess config.sub depcomp install-sh ltmain.sh missing \ --- -2.8.0 - diff --git a/package/ipmitool/0002-Avoid-wchar_t-redefinition.patch b/package/ipmitool/0002-Avoid-wchar_t-redefinition.patch deleted file mode 100644 index 99598e0a7d..0000000000 --- a/package/ipmitool/0002-Avoid-wchar_t-redefinition.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 7d1863b47877129376f37613d29d3a5ba084af66 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sat, 2 Apr 2016 19:45:14 +0200 -Subject: [PATCH 2/3] Avoid wchar_t redefinition -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The musl C library does not define _WCHAR_T. Use autoconf to check for wchar_t. - -Upstream status: Pending -https://sourceforge.net/p/ipmitool/mailman/message/35007331/ - -Signed-off-by: Jörg Krause ---- - configure.ac | 2 ++ - src/plugins/imb/imbapi.h | 7 ++++++- - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1d74fcf..c2ba1eb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,6 +22,8 @@ AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h paths.h]) - AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/socket.h]) - AC_CHECK_HEADERS([sys/byteorder.h byteswap.h]) - -+AC_CHECK_TYPES([wchar_t]) -+ - AC_C_CONST - AC_C_INLINE - AC_C_BIGENDIAN -diff --git a/src/plugins/imb/imbapi.h b/src/plugins/imb/imbapi.h -index 74975c6..ead8956 100644 ---- a/src/plugins/imb/imbapi.h -+++ b/src/plugins/imb/imbapi.h -@@ -35,6 +35,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *----------------------------------------------------------------------*/ - #ifndef _WINDEFS_H - #define _WINDEFS_H -+ -+#if HAVE_CONFIG_H -+# include -+#endif -+ - #ifndef FALSE - #define FALSE 0 - #endif -@@ -46,7 +51,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #endif - #ifndef WIN32 - /* WIN32 defines this in stdio.h */ --#ifndef _WCHAR_T -+#if !defined(HAVE_WCHAR_T) - #define _WCHAR_T - typedef long wchar_t; - #endif --- -2.8.0 - diff --git a/package/ipmitool/0003-Add-missing-linux-param.h-header-include.patch b/package/ipmitool/0003-Add-missing-linux-param.h-header-include.patch deleted file mode 100644 index a3bd7257fb..0000000000 --- a/package/ipmitool/0003-Add-missing-linux-param.h-header-include.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 661095378b74df564bc621ced4db72b688d87399 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sat, 2 Apr 2016 19:47:21 +0200 -Subject: [PATCH 3/3] Add missing linux/param.h header include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes the following build failure under musl: - -imbapi.c: In function 'MapPhysicalMemory': -imbapi.c:109:19: error: 'EXEC_PAGESIZE' undeclared (first use in this function) - # define PAGESIZE EXEC_PAGESIZE - -Upstream status: Pending -https://sourceforge.net/p/ipmitool/mailman/message/35007330/ - -Signed-off-by: Jörg Krause ---- - src/plugins/imb/imbapi.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/plugins/imb/imbapi.c b/src/plugins/imb/imbapi.c -index 899c47a..8a6421d 100644 ---- a/src/plugins/imb/imbapi.c -+++ b/src/plugins/imb/imbapi.c -@@ -95,6 +95,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#ifdef __linux__ -+#include -+#endif - #endif - #include "imbapi.h" - #include --- -2.8.0 - diff --git a/package/ipmitool/ipmitool.hash b/package/ipmitool/ipmitool.hash index 9bb852c397..9b16414801 100644 --- a/package/ipmitool/ipmitool.hash +++ b/package/ipmitool/ipmitool.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 3c5da6b067abf475bc24685120ec79f6e4ef6b3ea606aaa267e462023861223e ipmitool-1.8.16.tar.bz2 +sha256 0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 ipmitool-1.8.18.tar.bz2 diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index a24658437b..f4dca736cb 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -4,15 +4,12 @@ # ################################################################################ -IPMITOOL_VERSION = 1.8.16 +IPMITOOL_VERSION = 1.8.18 IPMITOOL_SOURCE = ipmitool-$(IPMITOOL_VERSION).tar.bz2 IPMITOOL_SITE = http://downloads.sourceforge.net/project/ipmitool/ipmitool/$(IPMITOOL_VERSION) IPMITOOL_LICENSE = BSD-3c IPMITOOL_LICENSE_FILES = COPYING -# Patching configure.ac -IPMITOOL_AUTORECONF = YES - ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y) IPMITOOL_DEPENDENCIES += openssl IPMITOOL_CONF_OPTS += --enable-intf-lanplus From 2c410189bfd843be62b35dd3f5796726cdf5db2a Mon Sep 17 00:00:00 2001 From: Julien Floret Date: Wed, 14 Dec 2016 09:26:48 +0100 Subject: [PATCH 1854/3392] netsnmp: handle libnl dependency properly libnl3 include path was hardcoded in the configure script, causing the following gcc warning: WARNING: unsafe header/library path used in cross-compilation: '/usr/include/libnl3' Let's apply an upstream patch that addresses the issue: now pkg-config is used to detect libnl include path. Also: - add optional libnl build dependency; - enable libnl support only when libnl package is selected. Signed-off-by: Julien Floret Signed-off-by: Peter Korsgaard --- ...ate-the-hard-coded-libnl-3-include-p.patch | 300 ++++++++++++++++++ package/netsnmp/netsnmp.mk | 8 + 2 files changed, 308 insertions(+) create mode 100644 package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch diff --git a/package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch b/package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch new file mode 100644 index 0000000000..cf0592233e --- /dev/null +++ b/package/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch @@ -0,0 +1,300 @@ +From 57d6c3d36045aab8957ffeb7324728bf17faf8bd Mon Sep 17 00:00:00 2001 +From: Bart Van Assche +Date: Mon, 2 Feb 2015 20:31:29 +0100 +Subject: [PATCH] configure: Eliminate the hard-coded libnl-3 include path + +See also commit 3dde41998625fe0e24119a2e1f4509ba3ba2fd9a. + +(cherry picked from commit 852dcd644cfe4cfc7177649eaec163d6221f2be1) + +Original commit included modifications to configure script. +Do not keep these modifications, since they caused lots of conflicts, and +configure script is meant to be automatically generated. + +Signed-off-by: Julien Floret + +Conflicts: + configure +--- + aclocal.m4 | 1 + + configure.d/config_os_libs2 | 30 ++++++- + m4/pkg.m4 | 214 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 243 insertions(+), 2 deletions(-) + create mode 100644 m4/pkg.m4 + +diff --git a/aclocal.m4 b/aclocal.m4 +index cd80c7486f2f..45e3608ed480 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -22,3 +22,4 @@ m4_include([m4/ltversion.m4]) + m4_include([m4/lt~obsolete.m4]) + m4_include([m4/netsnmp_arg.m4]) + m4_include([m4/netsnmp_search_libs.m4]) ++m4_include([m4/pkg.m4]) +diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 +index 47491e24ce0a..10bd414b879e 100644 +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -225,11 +225,37 @@ fi + if test "x$with_nl" != "xno"; then + case $target_os in + linux*) # Check for libnl (linux) ++ # The test below verifies whether the libnl-3 package been installed. ++ # This test works as follows: ++ # - If pkg-config was not installed at the time autogen.sh was run, ++ # the definition of the PKG_CHECK_EXISTS() macro will not be found by ++ # autogen.sh. Augogen.sh will generate a configure script that prints ++ # a warning about pkg-config and proceeds as if libnl-3 has not been ++ # installed. ++ # - If pkg-config was installed at the time autogen.sh was run, ++ # the generated configure script will try to detect the presence of ++ # the libnl-3 library by looking up compile and linker flags in the ++ # file called libnl-3.pc. ++ # - pkg-config settings can be overridden via the configure variables ++ # LIBNL3_CFLAGS and LIBNL3_LIBS (added by the pkg-config m4 macro's to ++ # the configure script -- see also ./configure --help). ++ # - The LIBNL3_CFLAGS and LIBNL3_LIBS configure variables can be used ++ # even if the pkg-config executable is not present on the system on ++ # which the configure script is run. ++ ifdef( ++ [PKG_CHECK_EXISTS], ++ [PKG_CHECK_EXISTS([libnl-3.0], ++ [PKG_CHECK_MODULES([LIBNL3], [libnl-3.0])]) ++ ], ++ AC_MSG_WARN([pkg-config has not been installed or is too old.]) ++ AC_MSG_WARN([Detection of libnl-3.0 will be skipped.]) ++ ) ++ + netsnmp_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS" ++ CPPFLAGS="${LIBNL3_CFLAGS} $CPPFLAGS" + NETSNMP_SEARCH_LIBS(nl_connect, nl-3, + [AC_CHECK_HEADERS(netlink/netlink.h) +- EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"], ++ EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES ${LIBNL3_CFLAGS}"], + [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS]) + if test "x$ac_cv_header_netlink_netlink_h" != xyes; then + NETSNMP_SEARCH_LIBS(nl_connect, nl, [ +diff --git a/m4/pkg.m4 b/m4/pkg.m4 +new file mode 100644 +index 000000000000..c5b26b52e6cd +--- /dev/null ++++ b/m4/pkg.m4 +@@ -0,0 +1,214 @@ ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# serial 1 (pkg-config-0.24) ++# ++# Copyright © 2004 Scott James Remnant . ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) ++m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) ++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) ++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) ++ ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG ++ ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++# only at the first occurence in configure.ac, so if the first place ++# it's called might be skipped (such as if it is within an "if", you ++# have to call PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_default([$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) ++ ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ elif test -n "$PKG_CONFIG"; then ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ], ++ [pkg_failed=yes]) ++ else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG ++ ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED ++ ++ ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) ++ ++if test $pkg_failed = yes; then ++ AC_MSG_RESULT([no]) ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ ++ m4_default([$4], [AC_MSG_ERROR( ++[Package requirements ($2) were not met: ++ ++$$1_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++_PKG_TEXT])[]dnl ++ ]) ++elif test $pkg_failed = untried; then ++ AC_MSG_RESULT([no]) ++ m4_default([$4], [AC_MSG_FAILURE( ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++_PKG_TEXT ++ ++To get pkg-config, see .])[]dnl ++ ]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ $3 ++fi[]dnl ++])# PKG_CHECK_MODULES ++ ++ ++# PKG_INSTALLDIR(DIRECTORY) ++# ------------------------- ++# Substitutes the variable pkgconfigdir as the location where a module ++# should install pkg-config .pc files. By default the directory is ++# $libdir/pkgconfig, but the default can be changed by passing ++# DIRECTORY. The user can override through the --with-pkgconfigdir ++# parameter. ++AC_DEFUN([PKG_INSTALLDIR], ++[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) ++m4_pushdef([pkg_description], ++ [pkg-config installation directory @<:@]pkg_default[@:>@]) ++AC_ARG_WITH([pkgconfigdir], ++ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, ++ [with_pkgconfigdir=]pkg_default) ++AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) ++m4_popdef([pkg_default]) ++m4_popdef([pkg_description]) ++]) dnl PKG_INSTALLDIR ++ ++ ++# PKG_NOARCH_INSTALLDIR(DIRECTORY) ++# ------------------------- ++# Substitutes the variable noarch_pkgconfigdir as the location where a ++# module should install arch-independent pkg-config .pc files. By ++# default the directory is $datadir/pkgconfig, but the default can be ++# changed by passing DIRECTORY. The user can override through the ++# --with-noarch-pkgconfigdir parameter. ++AC_DEFUN([PKG_NOARCH_INSTALLDIR], ++[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) ++m4_pushdef([pkg_description], ++ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) ++AC_ARG_WITH([noarch-pkgconfigdir], ++ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, ++ [with_noarch_pkgconfigdir=]pkg_default) ++AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) ++m4_popdef([pkg_default]) ++m4_popdef([pkg_description]) ++]) dnl PKG_NOARCH_INSTALLDIR ++ ++ ++# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, ++# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ------------------------------------------- ++# Retrieves the value of the pkg-config variable for the given module. ++AC_DEFUN([PKG_CHECK_VAR], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl ++ ++_PKG_CONFIG([$1], [variable="][$3]["], [$2]) ++AS_VAR_COPY([$1], [pkg_cv_][$1]) ++ ++AS_VAR_IF([$1], [""], [$5], [$4])dnl ++])# PKG_CHECK_VAR +-- +2.1.0 + diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 48273b51bc..0f4b7d80bc 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -36,6 +36,7 @@ NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true inst NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install NETSNMP_MAKE = $(MAKE1) NETSNMP_CONFIG_SCRIPTS = net-snmp-config +NETSNMP_AUTORECONF = YES NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX @@ -45,6 +46,13 @@ else NETSNMP_CONF_OPTS += --with-endianness=little endif +ifeq ($(BR2_PACKAGE_LIBNL),y) +NETSNMP_DEPENDENCIES += host-pkgconf libnl +NETSNMP_CONF_OPTS += --with-nl +else +NETSNMP_CONF_OPTS += --without-nl +endif + # OpenSSL ifeq ($(BR2_PACKAGE_OPENSSL),y) NETSNMP_DEPENDENCIES += openssl From 95b8bbcae6e90a48c263e68d0c3384d8f091952b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 14 Dec 2016 12:22:52 -0200 Subject: [PATCH 1855/3392] configs/mx6sx_udoo_neo: Remove BR2_TARGET_GENERIC_GETTY_PORT As console=ttymxc0 is passed in U-Boot we can use /dev/console to access the serial console and then BR2_TARGET_GENERIC_GETTY_PORT can be removed. Suggested-by: Peter Korsgaard Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/mx6sx_udoo_neo_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index cbea577344..aecb5204e4 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -2,7 +2,6 @@ BR2_arm=y BR2_cortex_a9=y # Linux headers same as kernel, a 4.9 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/neo/post-image.sh" BR2_GLOBAL_PATCH_DIR="board/udoo/neo/patches" From 3bf0c368bbf57514448cdc7136891e273116882d Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Wed, 14 Dec 2016 08:24:04 +0300 Subject: [PATCH 1856/3392] configs/linksprite_pcduino: bump kernel and u-boot versions Update kernel to 4.9 and U-Boot to 2016.09.01. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/linksprite_pcduino_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index 45de3c1bb1..a440d8a539 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -17,13 +17,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -# Linux headers same as kernel, a 4.6 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y +# Linux headers same as kernel, a 4.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" @@ -37,7 +37,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y From 219d0b5db2b9f36c34d750e5c3567f9002eed9db Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 13 Dec 2016 09:18:27 +0100 Subject: [PATCH 1857/3392] fs/ext2: default to ext2 rev1 Rev0 is very old (E.G. from before Linux was maintained in git), the kernel prints a scary warning when used: EXT4-fs warning (device sda): ext4_update_dynamic_rev:746: updating to rev 1 because of new feature flag, running e2fsck is recommended And rev0 support is broken in u-boot 2016.11: http://lists.denx.de/pipermail/u-boot/2016-December/275916.html So default to rev1 instead. Signed-off-by: Peter Korsgaard --- fs/ext2/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in index 1e7f719a8d..b8eeed25d4 100644 --- a/fs/ext2/Config.in +++ b/fs/ext2/Config.in @@ -11,7 +11,7 @@ config BR2_TARGET_ROOTFS_EXT2_2 choice bool "ext2/3/4 variant" - default BR2_TARGET_ROOTFS_EXT2_2r0 + default BR2_TARGET_ROOTFS_EXT2_2r1 config BR2_TARGET_ROOTFS_EXT2_2r0 bool "ext2 (rev0)" From ba4fabb1ce351f05918cbfcb44eb969e7e741061 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 14 Dec 2016 13:03:21 -0200 Subject: [PATCH 1858/3392] mx6: udoo: Create a mx6qdl directory for consistency The udoo neo files are currently placed inside udoo/neo directory. Place the mx6qdl udoo related files inside udoo/mx6dl for consistency. [Peter also update path in readme.txt] Suggested-by: Peter Korsgaard Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- board/udoo/{ => mx6qdl}/genimage.cfg | 0 board/udoo/{ => mx6qdl}/linux.fragment | 0 board/udoo/{ => mx6qdl}/post-image.sh | 0 board/udoo/{ => mx6qdl}/readme.txt | 2 +- configs/mx6udoo_defconfig | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename board/udoo/{ => mx6qdl}/genimage.cfg (100%) rename board/udoo/{ => mx6qdl}/linux.fragment (100%) rename board/udoo/{ => mx6qdl}/post-image.sh (100%) rename board/udoo/{ => mx6qdl}/readme.txt (92%) diff --git a/board/udoo/genimage.cfg b/board/udoo/mx6qdl/genimage.cfg similarity index 100% rename from board/udoo/genimage.cfg rename to board/udoo/mx6qdl/genimage.cfg diff --git a/board/udoo/linux.fragment b/board/udoo/mx6qdl/linux.fragment similarity index 100% rename from board/udoo/linux.fragment rename to board/udoo/mx6qdl/linux.fragment diff --git a/board/udoo/post-image.sh b/board/udoo/mx6qdl/post-image.sh similarity index 100% rename from board/udoo/post-image.sh rename to board/udoo/mx6qdl/post-image.sh diff --git a/board/udoo/readme.txt b/board/udoo/mx6qdl/readme.txt similarity index 92% rename from board/udoo/readme.txt rename to board/udoo/mx6qdl/readme.txt index acd05f6775..cf1a610421 100644 --- a/board/udoo/readme.txt +++ b/board/udoo/mx6qdl/readme.txt @@ -14,4 +14,4 @@ directory, ready to be dumped on a micro SD card: dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in -board/udoo/genimage.cfg. +board/udoo/mx6qdl/genimage.cfg. diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 8c1b28ab5e..394580b820 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a9=y # Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/mx6qdl/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y @@ -17,7 +17,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.11" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/linux.fragment" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/mx6qdl/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-udoo imx6dl-udoo" # required tools to create the SD card image From c9df2b3e5bc73f9587602b119d325b88c4498112 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 14 Dec 2016 13:40:35 -0200 Subject: [PATCH 1859/3392] configs/mx6: Select NEON and VFP related options MX6 has a Cortex-A9 core, which supports NEON and VFP. Add support for them. Suggested-by: Peter Korsgaard Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/freescale_imx6dlsabreauto_defconfig | 3 +++ configs/freescale_imx6dlsabresd_defconfig | 3 +++ configs/freescale_imx6qsabreauto_defconfig | 3 +++ configs/freescale_imx6qsabresd_defconfig | 3 +++ configs/freescale_imx6sololiteevk_defconfig | 3 +++ configs/freescale_imx6sxsabresd_defconfig | 3 +++ configs/mx6cubox_defconfig | 3 +++ configs/mx6sx_udoo_neo_defconfig | 3 +++ configs/mx6udoo_defconfig | 3 +++ configs/riotboard_defconfig | 2 ++ configs/wandboard_defconfig | 3 +++ configs/warpboard_defconfig | 3 +++ 12 files changed, 35 insertions(+) diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 1cf5fee0fd..c946988f25 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -1,6 +1,9 @@ # architecture BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 904f0a2442..18cef00dd6 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -1,6 +1,9 @@ # architecture BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 64efd42195..9e8e007651 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -1,6 +1,9 @@ # architecture BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index 962c274d60..824e12888d 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -1,6 +1,9 @@ # architecture BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" diff --git a/configs/freescale_imx6sololiteevk_defconfig b/configs/freescale_imx6sololiteevk_defconfig index bf0b9e5f2d..0e81b2bd68 100644 --- a/configs/freescale_imx6sololiteevk_defconfig +++ b/configs/freescale_imx6sololiteevk_defconfig @@ -1,6 +1,9 @@ # architecture BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 4.1 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 9b5cdb85e4..4a40c26340 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -1,6 +1,9 @@ # architecture BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # patches BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches" diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index b288ed7d29..9ce496d913 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -1,5 +1,8 @@ BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 4.7 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index aecb5204e4..1de19c0abb 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -1,5 +1,8 @@ BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 4.9 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh" diff --git a/configs/mx6udoo_defconfig b/configs/mx6udoo_defconfig index 394580b820..bf2a596686 100644 --- a/configs/mx6udoo_defconfig +++ b/configs/mx6udoo_defconfig @@ -1,5 +1,8 @@ BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 4.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig index d486e1e21b..c2281058f5 100644 --- a/configs/riotboard_defconfig +++ b/configs/riotboard_defconfig @@ -1,7 +1,9 @@ # architecture BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # system BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 7b075e4505..caa4c51095 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -1,5 +1,8 @@ BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 4.7 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" diff --git a/configs/warpboard_defconfig b/configs/warpboard_defconfig index 531a8783b1..71d777fb5b 100644 --- a/configs/warpboard_defconfig +++ b/configs/warpboard_defconfig @@ -1,6 +1,9 @@ # architecture BR2_arm=y BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y # Linux headers same as kernel, a 4.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y From c583c421c4a76706f9956be01b7f5775999d61d6 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Wed, 14 Dec 2016 22:45:26 +0300 Subject: [PATCH 1860/3392] configs/linksprite_pcduino: bump u-boot version Update U-Boot to 2016.11. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/linksprite_pcduino_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index a440d8a539..fb82714e9b 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -37,7 +37,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" BR2_TARGET_UBOOT_USE_DEFCONFIG=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y From 5b272e3e551e723bae78140f7de4029b9026d961 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 14 Dec 2016 23:28:10 +0100 Subject: [PATCH 1861/3392] fs: set packages permissions even with no system device tables Currently, when there is no syztem device table (permissions or static devices) defined, then package permissions are not applied, because they are guarded by the check on the system device tables being non empty. Fix that by narrowing the guarding condition. Note that the dependency on host-makedevs was not conditional; we always build it even if we don't need it. Making it conditional is not possible, because we don't know all the packages permissions by the time the fs infra is parsed (packages from br2-external are parsed after it). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard Signed-off-by: Peter Korsgaard --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 7515fdc770..396b1c2bdf 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -88,10 +88,10 @@ ifneq ($$(ROOTFS_DEVICE_TABLES),) cat $$(ROOTFS_DEVICE_TABLES) > $$(FULL_DEVICE_TABLE) ifeq ($$(BR2_ROOTFS_DEVICE_CREATION_STATIC),y) $$(call PRINTF,$$(PACKAGES_DEVICES_TABLE)) >> $$(FULL_DEVICE_TABLE) +endif endif $$(call PRINTF,$$(PACKAGES_PERMISSIONS_TABLE)) >> $$(FULL_DEVICE_TABLE) echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) -endif $$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \ echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) From 906c6665ed6453533560f47d27ba9e4c5cbc63d1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 15 Dec 2016 13:49:04 +0200 Subject: [PATCH 1862/3392] tcpreplay: bump to version 4.1.2 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/tcpreplay/tcpreplay.hash | 2 +- package/tcpreplay/tcpreplay.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index 95d6d5d818..e7ba4400ec 100644 --- a/package/tcpreplay/tcpreplay.hash +++ b/package/tcpreplay/tcpreplay.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 61b916ef91049cad2a9ddc8de6f5e3e3cc5d9998dbb644dc91cf3a798497ffe4 tcpreplay-4.1.1.tar.gz +sha256 da483347e83a9b5df0e0dbb0f822a2d37236e79dda35f4bc4e6684fa827f25ea tcpreplay-4.1.2.tar.gz diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index 0723c02d28..a8bcf1c5dd 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.1.1 +TCPREPLAY_VERSION = 4.1.2 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) TCPREPLAY_LICENSE = GPLv3 TCPREPLAY_LICENSE_FILES = docs/LICENSE From 0dbe92b0d037bdcf40edeb29534e64bfd9a8a98b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 15 Dec 2016 13:44:52 +0100 Subject: [PATCH 1863/3392] package/wavpack: bump version to 5.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/wavpack/wavpack.hash | 2 +- package/wavpack/wavpack.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wavpack/wavpack.hash b/package/wavpack/wavpack.hash index f15afc2524..0ec287da99 100644 --- a/package/wavpack/wavpack.hash +++ b/package/wavpack/wavpack.hash @@ -1,2 +1,2 @@ # locally computed hash -sha256 7d31b34166c33c3109b45c6e4579b472fd05e3ee8ec6d728352961c5cdd1d6b0 wavpack-4.75.2.tar.bz2 +sha256 918d7e32a19598df543b17fff840b10a0880f87296f9e32af454d256b6a64049 wavpack-5.0.0.tar.bz2 diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index ae16454806..8fef548e1d 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAVPACK_VERSION = 4.75.2 +WAVPACK_VERSION = 5.0.0 WAVPACK_SITE = http://www.wavpack.com WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.bz2 WAVPACK_INSTALL_STAGING = YES From a911bf8d14e919711a61e1c16772c12841800569 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 15 Dec 2016 17:10:40 +0530 Subject: [PATCH 1864/3392] tinyalsa: bump version to 1.1.0 Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/tinyalsa/tinyalsa.hash | 2 +- package/tinyalsa/tinyalsa.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tinyalsa/tinyalsa.hash b/package/tinyalsa/tinyalsa.hash index e07b4195eb..b6bea47eba 100644 --- a/package/tinyalsa/tinyalsa.hash +++ b/package/tinyalsa/tinyalsa.hash @@ -1,2 +1,2 @@ # locally computed -sha256 b3f22f762cca8edc692d239a9793a66b11aa5447dcee009e53987f5850f405e3 tinyalsa-v1.0.2.tar.gz +sha256 93f4ca1e6345974167dc5577e8151a31fa2e6a628727a72d59e18db2289e7a1c tinyalsa-1.1.0.tar.gz diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index 87753d6f4e..0edb0bcdfa 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYALSA_VERSION = v1.0.2 +TINYALSA_VERSION = 1.1.0 TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3c TINYALSA_INSTALL_STAGING = YES From 6d1dddd501f1c38c950b15d9a8eabd354767fe61 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 15 Dec 2016 17:10:41 +0530 Subject: [PATCH 1865/3392] tinyalsa: add license files Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard --- package/tinyalsa/tinyalsa.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index 0edb0bcdfa..d44155f94d 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -7,6 +7,7 @@ TINYALSA_VERSION = 1.1.0 TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3c +TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES define TINYALSA_BUILD_CMDS From 326a9559dc8d4fa816d58c6434d8a21bc7307fb8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 15 Dec 2016 08:24:34 -0300 Subject: [PATCH 1866/3392] wireshark: bump to version 2.2.3 The only security bug fixed concerns windows so it's not a security bump for buildroot. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index c90f5bbe0c..c6d398ae23 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,2 +1,2 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.2.txt -sha256 f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 wireshark-2.2.2.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.3.txt +sha256 97bac89e88892054a5848a9f7e0c36aa399a2008900829b078e29cab0ddd593b wireshark-2.2.3.tar.bz2 diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 6a40b8e640..07a3044bfb 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.2 +WIRESHARK_VERSION = 2.2.3 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 1475768616210a5817b70c61f36c9c860346e836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 15 Dec 2016 13:56:42 +0100 Subject: [PATCH 1867/3392] package/mpd: bump version to 0.19.21 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 4ded85d68a..daa185efed 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 ecf74993085509c82e2bfadce88434b62b7727d844add9c548eb63532a5e3b8a mpd-0.19.20.tar.xz +sha256 8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730 mpd-0.19.21.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index bee71829d0..eb74f4f524 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.19 -MPD_VERSION = $(MPD_VERSION_MAJOR).20 +MPD_VERSION = $(MPD_VERSION_MAJOR).21 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost libglib2 From 4ef7a0b76dc62aeae71180af2d58bceac750e80b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 14 Dec 2016 14:40:56 +0100 Subject: [PATCH 1868/3392] package/gdb: add support for gdb 7.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gdb 7.12 was released on October 2016, it's time to include it in Buildroot, which this commit does. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/gdb/Config.in.host | 4 ++++ package/gdb/gdb.hash | 1 + 2 files changed, 5 insertions(+) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 4c8d902d56..2d4631e0f4 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -48,6 +48,9 @@ choice config BR2_GDB_VERSION_7_11 bool "gdb 7.11.x" + config BR2_GDB_VERSION_7_12 + bool "gdb 7.12.x" + endchoice endif @@ -61,3 +64,4 @@ config BR2_GDB_VERSION default "7.9.1" if BR2_GDB_VERSION_7_9 default "7.10.1" if BR2_GDB_VERSION_7_10 || !BR2_PACKAGE_HOST_GDB default "7.11.1" if BR2_GDB_VERSION_7_11 + default "7.12" if BR2_GDB_VERSION_7_12 diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index c91373b5b1..a44aaa3961 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -2,6 +2,7 @@ sha512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414 gdb-7.9.1.tar.xz sha512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010 gdb-7.10.1.tar.xz sha512 f80ec6c8a0f0b54c8b945666e875809174402b7e121efb378ebac931a91f9a1cc0048568f8e2f42ae8ae2392ff8d144c2e51d41c7398935017450aaf29838360 gdb-7.11.1.tar.xz +sha512 f610338b3a24dfb387c295431d806a0c1375e8ce51b8dd8bbfd2efc4612d0c0ed40ad4393508afca0071eca70688f62bc4f199da5e75ad16f64d91c3bc046033 gdb-7.12.tar.xz # Locally calculated (fetched from Github) sha512 0a467091d4b01fbecabb4b8da1cb743025c70e7f4874a0b5c8fa2ec623569a39bde6762b91806de0be6e63711aeb6909715cfbe43860de73d8aec6159a9f10a7 gdb-6be65fb56ea6694a9260733a536a023a1e2d4d57.tar.gz From d2a80cbf827affb001bb148953edf253c2f6bc1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 14 Dec 2016 14:40:57 +0100 Subject: [PATCH 1869/3392] package/gdb: switch to 7.11 as the default version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7.12 is around, 7.11 has already seen a point release, so it's time to make 7.11 the default version for gdb. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/gdb/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 2d4631e0f4..3b2e279d13 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -35,7 +35,7 @@ choice prompt "GDB debugger Version" depends on !BR2_arc depends on !BR2_microblaze - default BR2_GDB_VERSION_7_10 + default BR2_GDB_VERSION_7_11 help Select the version of gdb you wish to use. @@ -62,6 +62,6 @@ config BR2_GDB_VERSION default "arc-2016.09-rc2-gdb" if BR2_arc default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze default "7.9.1" if BR2_GDB_VERSION_7_9 - default "7.10.1" if BR2_GDB_VERSION_7_10 || !BR2_PACKAGE_HOST_GDB - default "7.11.1" if BR2_GDB_VERSION_7_11 + default "7.10.1" if BR2_GDB_VERSION_7_10 + default "7.11.1" if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB default "7.12" if BR2_GDB_VERSION_7_12 From 69aa0574d1fd95da7aef4a6e2c52d1193be110a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 14 Dec 2016 14:40:58 +0100 Subject: [PATCH 1870/3392] package/gdb: remove version 7.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that 7.12 has been added and 7.11 is the default version, let's remove the old 7.9 release. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 + ...01-gdbserver-fix-uClibc-whithout-MMU.patch | 34 --- ...rver-xtensa-drop-xtensa_usrregs_info.patch | 47 --- ...-xtensa-fix-typo-in-XCHAL_HAVE_LOOPS.patch | 46 --- .../0004-xtensa-implement-NPTL-helpers.patch | 267 ------------------ ...-Add-some-casts-for-building-on-musl.patch | 70 ----- ...Move-W_STOPCODE-to-common-gdb_wait-h.patch | 63 ----- package/gdb/7.9.1/0007-move-__SIGRTMIN.patch | 58 ---- package/gdb/Config.in.host | 4 - package/gdb/gdb.hash | 1 - 10 files changed, 7 insertions(+), 590 deletions(-) delete mode 100644 package/gdb/7.9.1/0001-gdbserver-fix-uClibc-whithout-MMU.patch delete mode 100644 package/gdb/7.9.1/0002-gdbserver-xtensa-drop-xtensa_usrregs_info.patch delete mode 100644 package/gdb/7.9.1/0003-gdbserver-xtensa-fix-typo-in-XCHAL_HAVE_LOOPS.patch delete mode 100644 package/gdb/7.9.1/0004-xtensa-implement-NPTL-helpers.patch delete mode 100644 package/gdb/7.9.1/0005-Add-some-casts-for-building-on-musl.patch delete mode 100644 package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch delete mode 100644 package/gdb/7.9.1/0007-move-__SIGRTMIN.patch diff --git a/Config.in.legacy b/Config.in.legacy index b42eb418e3..3c672eea38 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -194,6 +194,13 @@ config BR2_PACKAGE_SNOWBALL_INIT We no longer have support for the Snowball platform in Buildroot, so this package was no longer useful. +config BR2_GDB_VERSION_7_9 + bool "gdb 7.9 has been removed" + select BR2_LEGACY + help + The 7.9 version of gdb has been removed. Use a newer version + instead. + ############################################################################### comment "Legacy options removed in 2016.11" diff --git a/package/gdb/7.9.1/0001-gdbserver-fix-uClibc-whithout-MMU.patch b/package/gdb/7.9.1/0001-gdbserver-fix-uClibc-whithout-MMU.patch deleted file mode 100644 index 340db671f8..0000000000 --- a/package/gdb/7.9.1/0001-gdbserver-fix-uClibc-whithout-MMU.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 570805e96bb8c458795b04f4745700795997ef40 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 10 Apr 2015 22:58:07 +0200 -Subject: [PATCH] gdbserver: fix uClibc whithout MMU. - -Since commit d86d4aafd4fa22fa4cccb83253fb187b03f97f48, the pid -must be retrieved from current_thread. - -The change has not been made in the function linux_read_offsets(). - -Fixes: -http://autobuild.buildroot.net/results/9e4/9e4df085319e346803c26c65478accb27eb950ae/build-end.log - -Signed-off-by: Romain Naour ---- - gdb/gdbserver/linux-low.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c -index 4d19c87..7585b80 100644 ---- a/gdb/gdbserver/linux-low.c -+++ b/gdb/gdbserver/linux-low.c -@@ -4933,7 +4933,7 @@ static int - linux_read_offsets (CORE_ADDR *text_p, CORE_ADDR *data_p) - { - unsigned long text, text_end, data; -- int pid = lwpid_of (get_thread_lwp (current_thread)); -+ int pid = lwpid_of (current_thread); - - errno = 0; - --- -1.9.3 - diff --git a/package/gdb/7.9.1/0002-gdbserver-xtensa-drop-xtensa_usrregs_info.patch b/package/gdb/7.9.1/0002-gdbserver-xtensa-drop-xtensa_usrregs_info.patch deleted file mode 100644 index 93fe749ef0..0000000000 --- a/package/gdb/7.9.1/0002-gdbserver-xtensa-drop-xtensa_usrregs_info.patch +++ /dev/null @@ -1,47 +0,0 @@ -From deb44829ecc1dd38275af0fcf91acd319e227a89 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 17 Apr 2015 03:07:41 +0300 -Subject: [PATCH 1/2] gdbserver/xtensa: drop xtensa_usrregs_info - -xtensa_usrregs_info refers to undefined variables xtensa_num_regs and -xtensa_regmap. Drop xtensa_usrregs_info and replace pointer to usrregs -in regs_info with NULL since all registers are read/set through regsets. - -2015-04-17 Max Filippov -gdb/gdbserver/ - * linux-xtensa-low.c (xtensa_usrregs_info): Remove. - (regs_info): Replace usrregs pointer with NULL. - -Signed-off-by: Max Filippov ---- -Backported from: deb44829ecc1dd38275af0fcf91acd319e227a89 -Changes to ChangeLog are dropped. - - gdb/gdbserver/linux-xtensa-low.c | 8 +------- - 2 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c -index f7fafaf..e786da5 100644 ---- a/gdb/gdbserver/linux-xtensa-low.c -+++ b/gdb/gdbserver/linux-xtensa-low.c -@@ -186,16 +186,10 @@ static struct regsets_info xtensa_regsets_info = - NULL, /* disabled_regsets */ - }; - --static struct usrregs_info xtensa_usrregs_info = -- { -- xtensa_num_regs, -- xtensa_regmap, -- }; -- - static struct regs_info regs_info = - { - NULL, /* regset_bitmap */ -- &xtensa_usrregs_info, -+ NULL, /* usrregs */ - &xtensa_regsets_info - }; - --- -1.8.1.4 - diff --git a/package/gdb/7.9.1/0003-gdbserver-xtensa-fix-typo-in-XCHAL_HAVE_LOOPS.patch b/package/gdb/7.9.1/0003-gdbserver-xtensa-fix-typo-in-XCHAL_HAVE_LOOPS.patch deleted file mode 100644 index 027f700b09..0000000000 --- a/package/gdb/7.9.1/0003-gdbserver-xtensa-fix-typo-in-XCHAL_HAVE_LOOPS.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a2d5a9d76f2366ed93095fc5a63eafa06b22f808 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 17 Apr 2015 02:52:50 +0300 -Subject: [PATCH 2/2] gdbserver/xtensa: fix typo in XCHAL_HAVE_LOOPS - -This fixes lbeg/lend/lcount registers handling through gdbserver. - -2015-04-17 Max Filippov -gdb/gdbserver/ - * linux-xtensa-low.c (xtensa_fill_gregset) - (xtensa_store_gregset): Check XCHAL_HAVE_LOOPS instead of - XCHAL_HAVE_LOOP. - -Signed-off-by: Max Filippov ---- -Backported from: a2d5a9d76f2366ed93095fc5a63eafa06b22f808 -Changes to ChangeLog are dropped. - - gdb/gdbserver/linux-xtensa-low.c | 4 ++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c -index e786da5..4daccee 100644 ---- a/gdb/gdbserver/linux-xtensa-low.c -+++ b/gdb/gdbserver/linux-xtensa-low.c -@@ -59,7 +59,7 @@ xtensa_fill_gregset (struct regcache *regcache, void *buf) - - /* Loop registers, if hardware has it. */ - --#if XCHAL_HAVE_LOOP -+#if XCHAL_HAVE_LOOPS - collect_register_by_name (regcache, "lbeg", (char*)&rset[R_LBEG]); - collect_register_by_name (regcache, "lend", (char*)&rset[R_LEND]); - collect_register_by_name (regcache, "lcount", (char*)&rset[R_LCOUNT]); -@@ -94,7 +94,7 @@ xtensa_store_gregset (struct regcache *regcache, const void *buf) - - /* Loop registers, if hardware has it. */ - --#if XCHAL_HAVE_LOOP -+#if XCHAL_HAVE_LOOPS - supply_register_by_name (regcache, "lbeg", (char*)&rset[R_LBEG]); - supply_register_by_name (regcache, "lend", (char*)&rset[R_LEND]); - supply_register_by_name (regcache, "lcount", (char*)&rset[R_LCOUNT]); --- -1.8.1.4 - diff --git a/package/gdb/7.9.1/0004-xtensa-implement-NPTL-helpers.patch b/package/gdb/7.9.1/0004-xtensa-implement-NPTL-helpers.patch deleted file mode 100644 index e7bc74ea53..0000000000 --- a/package/gdb/7.9.1/0004-xtensa-implement-NPTL-helpers.patch +++ /dev/null @@ -1,267 +0,0 @@ -From d4eb69fc4b50f9a0babd70b28d0601b40f31bd0f Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 2 Jul 2015 15:10:58 +0300 -Subject: [PATCH] xtensa: implement NPTL helpers - -These changes allow debugging multithreaded NPTL xtensa applications. - -2015-08-20 Max Filippov -gdb/gdbserver/ - * configure.srv (xtensa*-*-linux*): Add srv_linux_thread_db=yes. - * linux-xtensa-low.c (arch/xtensa.h gdb_proc_service.h): New - #includes. - (ps_get_thread_area): New function. - -2015-08-20 Max Filippov -gdb/ - * arch/xtensa.h: New file. - * xtensa-linux-nat.c (gdb_proc_service.h): New #include. - (ps_get_thread_area): New function. - * xtensa-linux-tdep.c (xtensa_linux_init_abi): Add call to - set_gdbarch_fetch_tls_load_module_address to enable TLS support. - * xtensa-tdep.c (osabi.h): New #include. - (xtensa_gdbarch_init): Call gdbarch_init_osabi to register - xtensa-specific hooks. - * xtensa-tdep.h (struct xtensa_elf_gregset_t): Add threadptr - member and move the structure to arch/xtensa.h. - -Signed-off-by: Max Filippov ---- -Backported from: 40045d91812b25c88c8275b8c08d27c234b68ba8 -Changes to ChangeLog files are dropped. - - gdb/arch/xtensa.h | 46 ++++++++++++++++++++++++++++++++++++++++ - gdb/gdbserver/configure.srv | 1 + - gdb/gdbserver/linux-xtensa-low.c | 21 ++++++++++++++++++ - gdb/xtensa-linux-nat.c | 22 ++++++++++++++++++ - gdb/xtensa-linux-tdep.c | 4 ++++ - gdb/xtensa-tdep.c | 4 ++++ - gdb/xtensa-tdep.h | 24 ++------------------ - 7 files changed, 100 insertions(+), 22 deletions(-) - create mode 100644 gdb/arch/xtensa.h - -diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h -new file mode 100644 -index 0000000..fe96584 ---- /dev/null -+++ b/gdb/arch/xtensa.h -@@ -0,0 +1,46 @@ -+/* Common Target-dependent code for the Xtensa port of GDB, the GNU debugger. -+ -+ Copyright (C) 2003-2015 Free Software Foundation, Inc. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#ifndef XTENSA_H -+#define XTENSA_H -+ -+/* Xtensa ELF core file register set representation ('.reg' section). -+ Copied from target-side ELF header . */ -+ -+typedef uint32_t xtensa_elf_greg_t; -+ -+typedef struct -+{ -+ xtensa_elf_greg_t pc; -+ xtensa_elf_greg_t ps; -+ xtensa_elf_greg_t lbeg; -+ xtensa_elf_greg_t lend; -+ xtensa_elf_greg_t lcount; -+ xtensa_elf_greg_t sar; -+ xtensa_elf_greg_t windowstart; -+ xtensa_elf_greg_t windowbase; -+ xtensa_elf_greg_t threadptr; -+ xtensa_elf_greg_t reserved[7+48]; -+ xtensa_elf_greg_t ar[64]; -+} xtensa_elf_gregset_t; -+ -+#define XTENSA_ELF_NGREG (sizeof (xtensa_elf_gregset_t) \ -+ / sizeof (xtensa_elf_greg_t)) -+ -+#endif -diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv -index 0b18d1d..320c26a 100644 ---- a/gdb/gdbserver/configure.srv -+++ b/gdb/gdbserver/configure.srv -@@ -352,6 +352,7 @@ case "${target}" in - xtensa*-*-linux*) srv_regobj=reg-xtensa.o - srv_tgtobj="$srv_linux_obj linux-xtensa-low.o" - srv_linux_regsets=yes -+ srv_linux_thread_db=yes - ;; - tilegx-*-linux*) srv_regobj=reg-tilegx.o - srv_regobj="${srv_regobj} reg-tilegx32.o" -diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c -index 4daccee..debe467 100644 ---- a/gdb/gdbserver/linux-xtensa-low.c -+++ b/gdb/gdbserver/linux-xtensa-low.c -@@ -26,6 +26,8 @@ extern const struct target_desc *tdesc_xtensa; - - #include - #include -+#include "arch/xtensa.h" -+#include "gdb_proc_service.h" - - #include "xtensa-xtregs.c" - -@@ -179,6 +181,25 @@ xtensa_breakpoint_at (CORE_ADDR where) - xtensa_breakpoint, xtensa_breakpoint_len) == 0; - } - -+/* Called by libthread_db. */ -+ -+ps_err_e -+ps_get_thread_area (const struct ps_prochandle *ph, -+ lwpid_t lwpid, int idx, void **base) -+{ -+ xtensa_elf_gregset_t regs; -+ -+ if (ptrace (PTRACE_GETREGS, lwpid, NULL, ®s) != 0) -+ return PS_ERR; -+ -+ /* IDX is the bias from the thread pointer to the beginning of the -+ thread descriptor. It has to be subtracted due to implementation -+ quirks in libthread_db. */ -+ *base = (void *) ((char *) regs.threadptr - idx); -+ -+ return PS_OK; -+} -+ - static struct regsets_info xtensa_regsets_info = - { - xtensa_regsets, /* regsets */ -diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c -index 77ad3e0..5538d5b 100644 ---- a/gdb/xtensa-linux-nat.c -+++ b/gdb/xtensa-linux-nat.c -@@ -37,6 +37,9 @@ - #include "gregset.h" - #include "xtensa-tdep.h" - -+/* Defines ps_err_e, struct ps_prochandle. */ -+#include "gdb_proc_service.h" -+ - /* Extended register set depends on hardware configs. - Keeping these definitions separately allows to introduce - hardware-specific overlays. */ -@@ -280,6 +283,25 @@ xtensa_linux_store_inferior_registers (struct target_ops *ops, - store_xtregs (regcache, regnum); - } - -+/* Called by libthread_db. */ -+ -+ps_err_e -+ps_get_thread_area (const struct ps_prochandle *ph, -+ lwpid_t lwpid, int idx, void **base) -+{ -+ xtensa_elf_gregset_t regs; -+ -+ if (ptrace (PTRACE_GETREGS, lwpid, NULL, ®s) != 0) -+ return PS_ERR; -+ -+ /* IDX is the bias from the thread pointer to the beginning of the -+ thread descriptor. It has to be subtracted due to implementation -+ quirks in libthread_db. */ -+ *base = (void *) ((char *) regs.threadptr - idx); -+ -+ return PS_OK; -+} -+ - void _initialize_xtensa_linux_nat (void); - - void -diff --git a/gdb/xtensa-linux-tdep.c b/gdb/xtensa-linux-tdep.c -index 61ea9b0..99e0d3e 100644 ---- a/gdb/xtensa-linux-tdep.c -+++ b/gdb/xtensa-linux-tdep.c -@@ -106,6 +106,10 @@ xtensa_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) - xtensa_linux_gdb_signal_from_target); - set_gdbarch_gdb_signal_to_target (gdbarch, - xtensa_linux_gdb_signal_to_target); -+ -+ /* Enable TLS support. */ -+ set_gdbarch_fetch_tls_load_module_address (gdbarch, -+ svr4_fetch_objfile_link_map); - } - - /* Provide a prototype to silence -Wmissing-prototypes. */ -diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c -index 55e7d98..4b693ed 100644 ---- a/gdb/xtensa-tdep.c -+++ b/gdb/xtensa-tdep.c -@@ -28,6 +28,7 @@ - #include "value.h" - #include "dis-asm.h" - #include "inferior.h" -+#include "osabi.h" - #include "floatformat.h" - #include "regcache.h" - #include "reggroups.h" -@@ -3273,6 +3274,9 @@ xtensa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) - set_solib_svr4_fetch_link_map_offsets - (gdbarch, svr4_ilp32_fetch_link_map_offsets); - -+ /* Hook in the ABI-specific overrides, if they have been registered. */ -+ gdbarch_init_osabi (info, gdbarch); -+ - return gdbarch; - } - -diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h -index caa2988..5b28cab 100644 ---- a/gdb/xtensa-tdep.h -+++ b/gdb/xtensa-tdep.h -@@ -18,6 +18,8 @@ - along with this program. If not, see . */ - - -+#include "arch/xtensa.h" -+ - /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION - whenever the "tdep" structure changes in an incompatible way. */ - -@@ -81,28 +83,6 @@ typedef enum - } xtensa_target_flags_t; - - --/* Xtensa ELF core file register set representation ('.reg' section). -- Copied from target-side ELF header . */ -- --typedef uint32_t xtensa_elf_greg_t; -- --typedef struct --{ -- xtensa_elf_greg_t pc; -- xtensa_elf_greg_t ps; -- xtensa_elf_greg_t lbeg; -- xtensa_elf_greg_t lend; -- xtensa_elf_greg_t lcount; -- xtensa_elf_greg_t sar; -- xtensa_elf_greg_t windowstart; -- xtensa_elf_greg_t windowbase; -- xtensa_elf_greg_t reserved[8+48]; -- xtensa_elf_greg_t ar[64]; --} xtensa_elf_gregset_t; -- --#define XTENSA_ELF_NGREG (sizeof (xtensa_elf_gregset_t) \ -- / sizeof (xtensa_elf_greg_t)) -- - /* Mask. */ - - typedef struct --- -1.8.1.4 - diff --git a/package/gdb/7.9.1/0005-Add-some-casts-for-building-on-musl.patch b/package/gdb/7.9.1/0005-Add-some-casts-for-building-on-musl.patch deleted file mode 100644 index 2469eb79a4..0000000000 --- a/package/gdb/7.9.1/0005-Add-some-casts-for-building-on-musl.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d41401ace01c234f42697e190a2ac95991780626 Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Mon, 26 Oct 2015 13:20:12 -0700 -Subject: [PATCH] Add some casts for building on musl. - -gdb/ChangeLog: - - * linux-thread-db.c (find_new_threads_callback): Cast ti.ti_tid to - unsigned long for debug_printf. - (thread_db_pid_to_str): Ditto. - -gdb/gdbserver/ChangeLog: - - * thread-db.c (find_one_thread): Cast ti.ti_tid to unsigned long - for debug_printf. - (attach_thread, find_new_threads_callback): Ditto. - -[Arnout: removed the parts that don't apply, including ChangeLog] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/ChangeLog | 5 +++++ - gdb/gdbserver/ChangeLog | 6 ++++++ - gdb/gdbserver/thread-db.c | 9 +++++---- - gdb/linux-thread-db.c | 5 +++-- - 4 files changed, 19 insertions(+), 6 deletions(-) - -diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c -index ffe722d..3df10ff 100644 ---- a/gdb/gdbserver/thread-db.c -+++ b/gdb/gdbserver/thread-db.c -@@ -278,7 +278,7 @@ find_one_thread (ptid_t ptid) - - if (debug_threads) - debug_printf ("Found thread %ld (LWP %d)\n", -- ti.ti_tid, ti.ti_lid); -+ (unsigned long) ti.ti_tid, ti.ti_lid); - - if (lwpid != ti.ti_lid) - { -@@ -319,12 +319,12 @@ attach_thread (const td_thrhandle_t *th_p, td_thrinfo_t *ti_p) - - if (debug_threads) - debug_printf ("Attaching to thread %ld (LWP %d)\n", -- ti_p->ti_tid, ti_p->ti_lid); -+ (unsigned long) ti_p->ti_tid, ti_p->ti_lid); - err = linux_attach_lwp (ptid); - if (err != 0) - { - warning ("Could not attach to thread %ld (LWP %d): %s\n", -- ti_p->ti_tid, ti_p->ti_lid, -+ (unsigned long) ti_p->ti_tid, ti_p->ti_lid, - linux_ptrace_attach_fail_reason_string (ptid, err)); - return 0; - } -diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c -index 66e9595..41db29a 100644 ---- a/gdb/linux-thread-db.c -+++ b/gdb/linux-thread-db.c -@@ -1816,7 +1817,7 @@ thread_db_pid_to_str (struct target_ops *ops, ptid_t ptid) - - tid = thread_info->priv->tid; - snprintf (buf, sizeof (buf), "Thread 0x%lx (LWP %ld)", -- tid, ptid_get_lwp (ptid)); -+ (unsigned long) tid, ptid_get_lwp (ptid)); - - return buf; - } --- -1.9.4 - diff --git a/package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch b/package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch deleted file mode 100644 index 60c357cd80..0000000000 --- a/package/gdb/7.9.1/0006-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 963843d4d07aef6caa296dacf191f8adc9518596 Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Mon, 26 Oct 2015 13:24:01 -0700 -Subject: [PATCH] musl: Move W_STOPCODE to common/gdb_wait.h. - -gdb/ChangeLog: - - * common/gdb_wait.h (W_STOPCODE): Define, moved here from - gdbserver/linux-low.c. - (WSETSTOP): Simplify. - -gdb/gdbserver/ChangeLog: - - * linux-low.c (W_STOPCODE): Moved to common/gdb_wait.h. - -[Arnout: removed the parts that don't apply, including ChangeLog] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/ChangeLog | 6 ++++++ - gdb/common/gdb_wait.h | 8 ++++---- - gdb/gdbserver/ChangeLog | 4 ++++ - gdb/gdbserver/linux-low.c | 4 ---- - 4 files changed, 14 insertions(+), 8 deletions(-) - -diff --git a/gdb/common/gdb_wait.h b/gdb/common/gdb_wait.h -index 9b250d2..412f813 100644 ---- a/gdb/common/gdb_wait.h -+++ b/gdb/common/gdb_wait.h -@@ -85,12 +85,12 @@ - # endif - #endif - -+#ifndef W_STOPCODE -+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) -+#endif -+ - #ifndef WSETSTOP --# ifdef W_STOPCODE - #define WSETSTOP(w,sig) ((w) = W_STOPCODE(sig)) --# else --#define WSETSTOP(w,sig) ((w) = (0177 | ((sig) << 8))) --# endif - #endif - - /* For native GNU/Linux we may use waitpid and the __WCLONE option. -diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c -index 0c552b8..7ed67c7 100644 ---- a/gdb/gdbserver/linux-low.c -+++ b/gdb/gdbserver/linux-low.c -@@ -70,10 +70,6 @@ - #define O_LARGEFILE 0 - #endif - --#ifndef W_STOPCODE --#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) --#endif -- - /* This is the kernel's hard limit. Not to be confused with - SIGRTMIN. */ - #ifndef __SIGRTMIN --- -1.9.4 - diff --git a/package/gdb/7.9.1/0007-move-__SIGRTMIN.patch b/package/gdb/7.9.1/0007-move-__SIGRTMIN.patch deleted file mode 100644 index 38ba1f028a..0000000000 --- a/package/gdb/7.9.1/0007-move-__SIGRTMIN.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 682b25469e66ea45b214e95962671373983c118f Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Mon, 26 Oct 2015 13:30:57 -0700 -Subject: [PATCH] Move __SIGRTMIN. - -gdb/ChangeLog: - - * nat/linux-nat.h (__SIGRTMIN): Move here from gdbserver/linux-low.c. - -gdb/gdbserver/ChangeLog: - - * linux-low.c (__SIGRTMIN): Move to nat/linux-nat.h. - -[Arnout: removed the parts that don't apply, including ChangeLog] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/ChangeLog | 4 ++++ - gdb/gdbserver/ChangeLog | 4 ++++ - gdb/gdbserver/linux-low.c | 6 ------ - gdb/nat/linux-nat.h | 5 +++++ - 4 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c -index 7ed67c7..e778c4c 100644 ---- a/gdb/gdbserver/linux-low.c -+++ b/gdb/gdbserver/linux-low.c -@@ -70,12 +70,6 @@ - #define O_LARGEFILE 0 - #endif - --/* This is the kernel's hard limit. Not to be confused with -- SIGRTMIN. */ --#ifndef __SIGRTMIN --#define __SIGRTMIN 32 --#endif -- - /* Some targets did not define these ptrace constants from the start, - so gdbserver defines them locally here. In the future, these may - be removed after they are added to asm/ptrace.h. */ -diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 0633fa9..70e6274 100644 ---- a/gdb/nat/linux-nat.h -+++ b/gdb/nat/linux-nat.h -@@ -25,6 +25,11 @@ - struct lwp_info; - struct arch_lwp_info; - -+/* This is the kernel's hard limit. Not to be confused with SIGRTMIN. */ -+#ifndef __SIGRTMIN -+#define __SIGRTMIN 32 -+#endif -+ - /* Unlike other extended result codes, WSTOPSIG (status) on - PTRACE_O_TRACESYSGOOD syscall events doesn't return SIGTRAP, but - instead SIGTRAP with bit 7 set. */ --- -1.9.4 - diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 3b2e279d13..3a187f09b8 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -39,9 +39,6 @@ choice help Select the version of gdb you wish to use. - config BR2_GDB_VERSION_7_9 - bool "gdb 7.9.x" - config BR2_GDB_VERSION_7_10 bool "gdb 7.10.x" @@ -61,7 +58,6 @@ config BR2_GDB_VERSION depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB default "arc-2016.09-rc2-gdb" if BR2_arc default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze - default "7.9.1" if BR2_GDB_VERSION_7_9 default "7.10.1" if BR2_GDB_VERSION_7_10 default "7.11.1" if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB default "7.12" if BR2_GDB_VERSION_7_12 diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index a44aaa3961..c63d5e2c98 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,5 +1,4 @@ # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414 gdb-7.9.1.tar.xz sha512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010 gdb-7.10.1.tar.xz sha512 f80ec6c8a0f0b54c8b945666e875809174402b7e121efb378ebac931a91f9a1cc0048568f8e2f42ae8ae2392ff8d144c2e51d41c7398935017450aaf29838360 gdb-7.11.1.tar.xz sha512 f610338b3a24dfb387c295431d806a0c1375e8ce51b8dd8bbfd2efc4612d0c0ed40ad4393508afca0071eca70688f62bc4f199da5e75ad16f64d91c3bc046033 gdb-7.12.tar.xz From c4a7d95e1925b1fc68dc1776444944ca906a7fc5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Dec 2016 23:39:43 +0100 Subject: [PATCH 1871/3392] docker-engine: needs pkg-config Fixes: http://autobuild.buildroot.org/results/fcc/fcc32f6cdc46f354a016a9b137d4f51d4054cdb6/ http://autobuild.buildroot.org/results/083/0832b7be86c525522e2caed66246d5aeb365afb2/ http://autobuild.buildroot.org/results/ede/ede0ddf0c5685ece8443a9b1bbd5c63b4d98af33/ pkg-config is used for some of the docker-engine dependencies (at least libseccomp and libsystemd), so make sure it is available. The make.sh script used to configure docker-engine uses the PKG_CONFIG variable, but the libseccomp-golang go module simply uses whatever pkg-config binary it finds in the path at build time, so also pass TARGET_MAKE_ENV to ensure our cross-pkg-config is used. For consistency and robustness against future changes, use both approaches for the configure and build steps. Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index f895dcc7a0..7b5a8a4418 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -10,14 +10,16 @@ DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE -DOCKER_ENGINE_DEPENDENCIES = host-go +DOCKER_ENGINE_DEPENDENCIES = host-go host-pkgconf DOCKER_ENGINE_GOPATH = "$(@D)/vendor" DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ CGO_ENABLED=1 \ CGO_NO_EMULATION=1 \ GOBIN="$(@D)/bin" \ - GOPATH="$(DOCKER_ENGINE_GOPATH)" + GOPATH="$(DOCKER_ENGINE_GOPATH)" \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + $(TARGET_MAKE_ENV) DOCKER_ENGINE_GLDFLAGS = \ -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ @@ -66,6 +68,7 @@ define DOCKER_ENGINE_CONFIGURE_CMDS ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker cd $(@D) && \ GITCOMMIT="unknown" BUILDTIME="$$(date)" VERSION="$(DOCKER_ENGINE_VERSION)" \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \ bash ./hack/make/.go-autogen endef From 35e5e7d49956b00ac940b6d336f1ea68f6aebbbb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 15 Dec 2016 00:03:59 +0100 Subject: [PATCH 1872/3392] docker-engine: security bump to 1.12.3 Fixes CVE-2016-8867: https://forums.docker.com/t/docker-1-12-2-security-advisory/23975 Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 13e28bda2f..ecc5c6698b 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 29bc203e483c81c9a337b4a4186e6b0a23984c518b09478d8718c616b5923e88 docker-engine-v1.12.2.tar.gz +sha256 cf4f876593abde06b4c19f971163a853a21b1992d75bd2fe5d8bea9015b09f87 docker-engine-v1.12.3.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 7b5a8a4418..fdb3c074f6 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = v1.12.2 +DOCKER_ENGINE_VERSION = v1.12.3 DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From d63e26e5277f3de9bfb729557a29987776064336 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Tue, 13 Dec 2016 23:52:36 +0300 Subject: [PATCH 1873/3392] orangepipc: rename to orangepi-pc Rename orangepipc files, configs, and directories: - oragepipc_defconfig -> orangepi_pc_defconfig - board/orangepi/orangepipc -> board/orangepi/orangepi-pc The purpose of the patch is to improve readability before adding other boards of orangepi family. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- board/orangepi/{orangepipc => orangepi-pc}/boot.cmd | 0 board/orangepi/{orangepipc => orangepi-pc}/genimage.cfg | 0 board/orangepi/{orangepipc => orangepi-pc}/post-build.sh | 0 board/orangepi/{orangepipc => orangepi-pc}/post-image.sh | 0 board/orangepi/{orangepipc => orangepi-pc}/readme.txt | 2 +- configs/{orangepipc_defconfig => orangepi_pc_defconfig} | 4 ++-- 7 files changed, 4 insertions(+), 4 deletions(-) rename board/orangepi/{orangepipc => orangepi-pc}/boot.cmd (100%) rename board/orangepi/{orangepipc => orangepi-pc}/genimage.cfg (100%) rename board/orangepi/{orangepipc => orangepi-pc}/post-build.sh (100%) rename board/orangepi/{orangepipc => orangepi-pc}/post-image.sh (100%) rename board/orangepi/{orangepipc => orangepi-pc}/readme.txt (95%) rename configs/{orangepipc_defconfig => orangepi_pc_defconfig} (86%) diff --git a/DEVELOPERS b/DEVELOPERS index 903e9a9d66..d855d11819 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1151,7 +1151,7 @@ F: package/libunistring/ N: Peter Korsgaard F: board/orangepi/ -F: configs/orangepipc_defconfig +F: configs/orangepi_pc_defconfig F: package/flickcurl/ F: package/libfastjson/ F: package/lzop/ diff --git a/board/orangepi/orangepipc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd similarity index 100% rename from board/orangepi/orangepipc/boot.cmd rename to board/orangepi/orangepi-pc/boot.cmd diff --git a/board/orangepi/orangepipc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg similarity index 100% rename from board/orangepi/orangepipc/genimage.cfg rename to board/orangepi/orangepi-pc/genimage.cfg diff --git a/board/orangepi/orangepipc/post-build.sh b/board/orangepi/orangepi-pc/post-build.sh similarity index 100% rename from board/orangepi/orangepipc/post-build.sh rename to board/orangepi/orangepi-pc/post-build.sh diff --git a/board/orangepi/orangepipc/post-image.sh b/board/orangepi/orangepi-pc/post-image.sh similarity index 100% rename from board/orangepi/orangepipc/post-image.sh rename to board/orangepi/orangepi-pc/post-image.sh diff --git a/board/orangepi/orangepipc/readme.txt b/board/orangepi/orangepi-pc/readme.txt similarity index 95% rename from board/orangepi/orangepipc/readme.txt rename to board/orangepi/orangepi-pc/readme.txt index f12c867963..d316b6fc1f 100644 --- a/board/orangepi/orangepipc/readme.txt +++ b/board/orangepi/orangepi-pc/readme.txt @@ -12,7 +12,7 @@ How to build it Configure Buildroot: - $ make orangepipc_defconfig + $ make orangepi_pc_defconfig Compile everything and build the SD card image: diff --git a/configs/orangepipc_defconfig b/configs/orangepi_pc_defconfig similarity index 86% rename from configs/orangepipc_defconfig rename to configs/orangepi_pc_defconfig index 6d3a84264e..dd21d5f9db 100644 --- a/configs/orangepipc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -4,8 +4,8 @@ BR2_ARM_FPU_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepipc/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepipc/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-pc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-pc/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3" From a1f33e0591354bbe631267ce619678f84b06cab8 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Tue, 13 Dec 2016 23:52:37 +0300 Subject: [PATCH 1874/3392] orangepi: add basic support for orangepi-one board Board support package includes the following components: - mainline u-boot 2016.09.01 - mainline kernel 4.9 Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-one/boot.cmd | 8 +++++ board/orangepi/orangepi-one/genimage.cfg | 36 +++++++++++++++++++++++ board/orangepi/orangepi-one/post-build.sh | 11 +++++++ board/orangepi/orangepi-one/post-image.sh | 14 +++++++++ board/orangepi/orangepi-one/readme.txt | 29 ++++++++++++++++++ configs/orangepi_one_defconfig | 29 ++++++++++++++++++ 6 files changed, 127 insertions(+) create mode 100644 board/orangepi/orangepi-one/boot.cmd create mode 100644 board/orangepi/orangepi-one/genimage.cfg create mode 100755 board/orangepi/orangepi-one/post-build.sh create mode 100755 board/orangepi/orangepi-one/post-image.sh create mode 100644 board/orangepi/orangepi-one/readme.txt create mode 100644 configs/orangepi_one_defconfig diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd new file mode 100644 index 0000000000..ab616e6ac9 --- /dev/null +++ b/board/orangepi/orangepi-one/boot.cmd @@ -0,0 +1,8 @@ +setenv fdt_high ffffffff + +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + +fatload mmc 0 $kernel_addr_r zImage +fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb + +bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg new file mode 100644 index 0000000000..4640ff2b13 --- /dev/null +++ b/board/orangepi/orangepi-one/genimage.cfg @@ -0,0 +1,36 @@ +# Minimal SD card image for the OrangePi PC +# +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-h3-orangepi-one.dtb", + "boot.scr" + } + } + size = 10M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 1040384 # 1MB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/orangepi/orangepi-one/post-build.sh b/board/orangepi/orangepi-one/post-build.sh new file mode 100755 index 0000000000..46e8905273 --- /dev/null +++ b/board/orangepi/orangepi-one/post-build.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# post-build.sh for OrangePi One taken from CubieBoard's post-build.sh +# 2013, Carlo Caione + +BOARD_DIR="$(dirname $0)" +MKIMAGE=$HOST_DIR/usr/bin/mkimage +BOOT_CMD=$BOARD_DIR/boot.cmd +BOOT_CMD_H=$BINARIES_DIR/boot.scr + +# U-Boot script +$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/orangepi/orangepi-one/post-image.sh b/board/orangepi/orangepi-one/post-image.sh new file mode 100755 index 0000000000..359b4c9e7c --- /dev/null +++ b/board/orangepi/orangepi-one/post-image.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/orangepi/orangepi-one/readme.txt b/board/orangepi/orangepi-one/readme.txt new file mode 100644 index 0000000000..e650f82d11 --- /dev/null +++ b/board/orangepi/orangepi-one/readme.txt @@ -0,0 +1,29 @@ +OrangePi One + +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the OrangePi One. With the current configuration +it will bring-up the board, and allow access through the serial console. + +How to build it +=============== + +Configure Buildroot: + + $ make orangepi_one_defconfig + +Compile everything and build the SD card image: + + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig new file mode 100644 index 0000000000..a486d0ee63 --- /dev/null +++ b/configs/orangepi_one_defconfig @@ -0,0 +1,29 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One" +BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-one/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-one/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From c1a9fb9ddbc4e6520b9eeee43d45817f9e4a62aa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 15 Dec 2016 17:24:45 +0100 Subject: [PATCH 1875/3392] board/orangepi: drop redundant files The orangepi board variants use identical post-build and post-image scripts, so move them up to board/orangepi and add symlinks in the variant subdirectories, similary to how we handle it for the raspberry pi variants. Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-one/post-build.sh | 12 +----------- board/orangepi/orangepi-one/post-image.sh | 15 +-------------- board/orangepi/orangepi-pc/post-build.sh | 12 +----------- board/orangepi/orangepi-pc/post-image.sh | 15 +-------------- board/orangepi/post-build.sh | 11 +++++++++++ board/orangepi/post-image.sh | 14 ++++++++++++++ 6 files changed, 29 insertions(+), 50 deletions(-) mode change 100755 => 120000 board/orangepi/orangepi-one/post-build.sh mode change 100755 => 120000 board/orangepi/orangepi-one/post-image.sh mode change 100755 => 120000 board/orangepi/orangepi-pc/post-build.sh mode change 100755 => 120000 board/orangepi/orangepi-pc/post-image.sh create mode 100755 board/orangepi/post-build.sh create mode 100755 board/orangepi/post-image.sh diff --git a/board/orangepi/orangepi-one/post-build.sh b/board/orangepi/orangepi-one/post-build.sh deleted file mode 100755 index 46e8905273..0000000000 --- a/board/orangepi/orangepi-one/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# post-build.sh for OrangePi One taken from CubieBoard's post-build.sh -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/usr/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/orangepi/orangepi-one/post-build.sh b/board/orangepi/orangepi-one/post-build.sh new file mode 120000 index 0000000000..cd7f11645b --- /dev/null +++ b/board/orangepi/orangepi-one/post-build.sh @@ -0,0 +1 @@ +../post-build.sh \ No newline at end of file diff --git a/board/orangepi/orangepi-one/post-image.sh b/board/orangepi/orangepi-one/post-image.sh deleted file mode 100755 index 359b4c9e7c..0000000000 --- a/board/orangepi/orangepi-one/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/orangepi/orangepi-one/post-image.sh b/board/orangepi/orangepi-one/post-image.sh new file mode 120000 index 0000000000..ae6294fa38 --- /dev/null +++ b/board/orangepi/orangepi-one/post-image.sh @@ -0,0 +1 @@ +../post-image.sh \ No newline at end of file diff --git a/board/orangepi/orangepi-pc/post-build.sh b/board/orangepi/orangepi-pc/post-build.sh deleted file mode 100755 index ca7a99f220..0000000000 --- a/board/orangepi/orangepi-pc/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# post-build.sh for OrangePi PC taken from CubieBoard's post-build.sh -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/usr/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/orangepi/orangepi-pc/post-build.sh b/board/orangepi/orangepi-pc/post-build.sh new file mode 120000 index 0000000000..cd7f11645b --- /dev/null +++ b/board/orangepi/orangepi-pc/post-build.sh @@ -0,0 +1 @@ +../post-build.sh \ No newline at end of file diff --git a/board/orangepi/orangepi-pc/post-image.sh b/board/orangepi/orangepi-pc/post-image.sh deleted file mode 100755 index 359b4c9e7c..0000000000 --- a/board/orangepi/orangepi-pc/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/board/orangepi/orangepi-pc/post-image.sh b/board/orangepi/orangepi-pc/post-image.sh new file mode 120000 index 0000000000..ae6294fa38 --- /dev/null +++ b/board/orangepi/orangepi-pc/post-image.sh @@ -0,0 +1 @@ +../post-image.sh \ No newline at end of file diff --git a/board/orangepi/post-build.sh b/board/orangepi/post-build.sh new file mode 100755 index 0000000000..a544a19560 --- /dev/null +++ b/board/orangepi/post-build.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# post-build.sh for OrangePi taken from CubieBoard's post-build.sh +# 2013, Carlo Caione + +BOARD_DIR="$(dirname $0)" +MKIMAGE=$HOST_DIR/usr/bin/mkimage +BOOT_CMD=$BOARD_DIR/boot.cmd +BOOT_CMD_H=$BINARIES_DIR/boot.scr + +# U-Boot script +$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/orangepi/post-image.sh b/board/orangepi/post-image.sh new file mode 100755 index 0000000000..359b4c9e7c --- /dev/null +++ b/board/orangepi/post-image.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" From bed1ea1c38f3159ffda74042c929813f4859ca18 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Thu, 15 Dec 2016 23:49:56 +0300 Subject: [PATCH 1876/3392] configs/orangepi: bump kernel and u-boot versions Update kernel to 4.9 and U-Boot to 2016.09.01. Signed-off-by: Sergey Matyukevich Signed-off-by: Peter Korsgaard --- configs/orangepi_one_defconfig | 2 +- configs/orangepi_pc_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index a486d0ee63..925ba9c451 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index dd21d5f9db..a3a5700f46 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -1,14 +1,14 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-pc/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" @@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From 4f11de1a60064c91245411c06771141c90ca67c6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 15 Dec 2016 19:08:59 +0100 Subject: [PATCH 1877/3392] cjson: fix error with sh4a and powerpc Fixes: - http://autobuild.buildroot.net/results/3d899790acdc5c21733ff6f7f5a1b500e862ea0a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cjson/cjson.hash | 1 + package/cjson/cjson.mk | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index 4f0723a510..fc0ed28df6 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 3487795d54440bdbd41b4b8e7688889526f2f9a652639f6036b9965016c800e7 cjson-v1.1.0.tar.gz +sha256 8eea780ee5729275a5076002d92a4c7854ecb89968b26a81efeb5bd9828268a0 fcc89c4bb264d665929b00eeebc479a643a90896.patch diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index 3dd6ebc77a..7ac7a71dcc 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -10,4 +10,10 @@ CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE +# This patch fixes -Werror=strict-overflow compile errors on sh4a and powerpc +# toolchains: +# http://autobuild.buildroot.net/results/3d899790acdc5c21733ff6f7f5a1b500e862ea0a +CJSON_PATCH = \ + https://github.com/DaveGamble/cjson/commit/fcc89c4bb264d665929b00eeebc479a643a90896.patch + $(eval $(cmake-package)) From e47b26e3c0703ee91719201f2dc3ec1e8b48b589 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 16 Dec 2016 16:48:29 -0300 Subject: [PATCH 1878/3392] gvfs: bump to version 1.30.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gvfs/gvfs.hash | 4 ++-- package/gvfs/gvfs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index 82e29b9d7a..63ad77de83 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.30/gvfs-1.30.2.sha256sum -sha256 dd897a13af0728765baead44426e2cf968cd2c9caad3bee4d589970f7612c5d7 gvfs-1.30.2.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.30/gvfs-1.30.3.sha256sum +sha256 b824a29489cae7f39e1a0fc0d154ac7b7bf43d8edd98ba83ffcad2f766d0f175 gvfs-1.30.3.tar.xz diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index ae2709cfb7..f3b5fc4218 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -5,7 +5,7 @@ ################################################################################ GVFS_VERSION_MAJOR = 1.30 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).2 +GVFS_VERSION = $(GVFS_VERSION_MAJOR).3 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES From 1791a7659b67d3529ea28474169088dd15f79863 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 16 Dec 2016 15:35:27 -0300 Subject: [PATCH 1879/3392] linux-headers: bump 4.{4, 8}.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7c71a6cf7e..c7a6a61bb7 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -240,10 +240,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.36" if BR2_KERNEL_HEADERS_4_1 - default "4.4.38" if BR2_KERNEL_HEADERS_4_4 + default "4.4.39" if BR2_KERNEL_HEADERS_4_4 default "4.5.7" if BR2_KERNEL_HEADERS_4_5 default "4.6.7" if BR2_KERNEL_HEADERS_4_6 default "4.7.10" if BR2_KERNEL_HEADERS_4_7 - default "4.8.14" if BR2_KERNEL_HEADERS_4_8 + default "4.8.15" if BR2_KERNEL_HEADERS_4_8 default "4.9" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From c2c31fbeebc53611bf9a975cd9a18659d1236aa2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 17 Dec 2016 08:16:58 +0100 Subject: [PATCH 1880/3392] package/aespipe: bump version to 2.4d Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/aespipe/aespipe.hash | 2 +- package/aespipe/aespipe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/aespipe/aespipe.hash b/package/aespipe/aespipe.hash index fa66b97d55..cc7640a0d0 100644 --- a/package/aespipe/aespipe.hash +++ b/package/aespipe/aespipe.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 260190beea911190a839e711f610ec3454a9b13985d35479775b7e26ad4c845e aespipe-v2.4c.tar.bz2 +sha256 c5ce656e0ade49b93e1163ec7b35450721d5743d8d804ad3a9e39add0389e50f aespipe-v2.4d.tar.bz2 diff --git a/package/aespipe/aespipe.mk b/package/aespipe/aespipe.mk index c567092ae8..6a38556ef1 100644 --- a/package/aespipe/aespipe.mk +++ b/package/aespipe/aespipe.mk @@ -4,7 +4,7 @@ # ################################################################################ -AESPIPE_VERSION = 2.4c +AESPIPE_VERSION = 2.4d AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2 AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe AESPIPE_LICENSE = GPL From cb33a7d6bd89306635749b497cd004e986bcd7e5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 17 Dec 2016 08:16:59 +0100 Subject: [PATCH 1881/3392] package/aespipe: fix host compile Building host-aespipe fails on $ cat /etc/debian_version stretch/sid at linking stage: /usr/bin/gcc -L/home/buildroot/br6/output/host/lib -L/home/buildroot/br6/output/host/usr/lib -Wl,-rpath,/home/buildroot/br6/output/host/usr/lib -o aespipe aespipe.o aes-amd64.o md5-amd64.o md5-2x-amd64.o aes-intel64.o sha512.o rmd160.o /usr/bin/ld: aes-amd64.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC Fix is also used in Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837393 [Peter: add comment explaining why] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/aespipe/aespipe.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/aespipe/aespipe.mk b/package/aespipe/aespipe.mk index 6a38556ef1..8c7cd21850 100644 --- a/package/aespipe/aespipe.mk +++ b/package/aespipe/aespipe.mk @@ -9,5 +9,12 @@ AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2 AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe AESPIPE_LICENSE = GPL +# Debian enables -fPIE by default, breaking the build: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837393 +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835148 +HOST_AESPIPE_CONF_ENV = \ + CFLAGS="$(HOST_CFLAGS) -no-pie" \ + LDFLAGS="$(HOST_LDFLAGS) -no-pie" + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 3f1c48afa52bc1bedd575a220a6ddc00259d6907 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 17 Dec 2016 07:34:48 +0100 Subject: [PATCH 1882/3392] package/x11r7/xserver_xorg-server: Explicitly disable glamor support when dependencies are not met Fixes http://autobuild.buildroot.net/results/b48/b48074089da770463f7ffcc27e385ac59456edc5/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 48cd2a78df..30fb05bedb 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -224,6 +224,8 @@ XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3 ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yy) XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy XSERVER_XORG_SERVER_CONF_OPTS += --enable-glamor +else +XSERVER_XORG_SERVER_CONF_OPTS += --disable-glamor endif else XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri3 --disable-glamor From c14e749957d49adf2c30975a0678003419592844 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 17 Dec 2016 05:29:42 +0000 Subject: [PATCH 1883/3392] systemd: enable selinux if libselinux is enabled systemd currently has selinux disabled unconditionally. This prevents /sys/fs/selinux from being mounted automatically at boot which causes audit to no longer function. This patch fixes the problem by checking if libselinux is enabled and enabling support for selinux in systemd if so. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index fa07bd0572..278c8e93cc 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -30,7 +30,6 @@ SYSTEMD_CONF_OPTS += \ --enable-blkid \ --enable-static=no \ --disable-manpages \ - --disable-selinux \ --disable-pam \ --disable-ima \ --disable-libcryptsetup \ @@ -153,6 +152,13 @@ else SYSTEMD_CONF_OPTS += --disable-microhttpd --disable-qrencode endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +SYSTEMD_DEPENDENCIES += libselinux +SYSTEMD_CONF_OPTS += --enable-selinux +else +SYSTEMD_CONF_OPTS += --disable-selinux +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += --enable-hwdb else From 5b9450996caad1a567f807a7403b6201ea033981 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 16 Dec 2016 23:30:22 +0100 Subject: [PATCH 1884/3392] tinycbor: disable parallel build Maybe fixes ([1]): make[1]: Entering directory `/home/peko/autobuild/instance-1/output/build/tinycbor-v0.4' .config:8: *** missing separator. Stop. [1] http://autobuild.buildroot.net/results/8e8fd1e19d6d07212f29e19a305712e715fe781b Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/tinycbor/tinycbor.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk index 2691e5b8d3..65deacd22b 100644 --- a/package/tinycbor/tinycbor.mk +++ b/package/tinycbor/tinycbor.mk @@ -18,8 +18,10 @@ endif TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) V=1 +# disabled parallel build because of build failures while +# producing the .config file define TINYCBOR_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TINYCBOR_MAKE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE1) $(TINYCBOR_MAKE_OPTS) -C $(@D) endef define TINYCBOR_INSTALL_STAGING_CMDS From 63abbcce3708647c1efb1b17f6a1144ac0075009 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 16 Dec 2016 16:29:45 +0100 Subject: [PATCH 1885/3392] toolchain-external: remove musl-cross prebuilt toolchain The upstream link to download musl-cross prebuilt toolchain is dead [1] and there no new download location. Also the last prebuilt toolchain use musl 1.1.12 version which is not uptodate (currently 1.1.15). Remove this support and recommend to use Buildroot toolchain instead. [1] https://googledrive.com/host/0BwnS5DMB0YQ6bDhPZkpOYVFhbk0 Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 9 ++++++ toolchain/toolchain-external/Config.in | 6 ---- .../toolchain-external-musl-cross/Config.in | 30 ------------------- .../Config.in.options | 19 ------------ .../toolchain-external-musl-cross.hash | 12 -------- .../toolchain-external-musl-cross.mk | 12 -------- 6 files changed, 9 insertions(+), 79 deletions(-) delete mode 100644 toolchain/toolchain-external/toolchain-external-musl-cross/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.mk diff --git a/Config.in.legacy b/Config.in.legacy index 3c672eea38..71faa8d84d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,15 @@ endif ############################################################################### comment "Legacy options removed in 2017.02" +config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS + bool "musl-cross 1.1.12 toolchain removed" + select BR2_LEGACY + help + The support for the prebuilt toolchain based on the Musl C + library provided by the musl-cross project has been removed. + Upstream doesn't provide any prebuilt toolchain anymore, use the + Buildroot toolchain instead. + config BR2_UCLIBC_INSTALL_TEST_SUITE bool "uClibc tests now in uclibc-ng-test" select BR2_LEGACY diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index c007e623fd..35db582498 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -40,9 +40,6 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.i source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in" source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in" -# Musl based toolchains (after all the others) -source "toolchain/toolchain-external/toolchain-external-musl-cross/Config.in" - # Kept last, so it remains the non-default choice, unless there isn't # any available toolchain profile for the currently selected # architecture. @@ -137,9 +134,6 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.i source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options" -# Musl based toolchains -source "toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options" - # Custom toolchains source "toolchain/toolchain-external/toolchain-external-custom/Config.in.options" diff --git a/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in b/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in deleted file mode 100644 index c72f9d73ca..0000000000 --- a/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS - bool "Musl 1.1.12 toolchain" - depends on (BR2_arm && BR2_ARM_EABI && BR2_USE_MMU) || \ - (BR2_arm && BR2_ARM_EABIHF && !BR2_ARM_CPU_ARMV4 && BR2_USE_MMU) || \ - (BR2_armeb && BR2_ARM_EABI && !BR2_ARM_CPU_ARMV7A && BR2_USE_MMU) || \ - BR2_i386 || (BR2_mips && !BR2_SOFT_FLOAT) || \ - BR2_mipsel || (BR2_powerpc && BR2_powerpc_CLASSIC) || \ - BR2_sh4 || BR2_sh4eb || \ - BR2_x86_64 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5150 - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - select BR2_TOOLCHAIN_EXTERNAL_MUSL - select BR2_TOOLCHAIN_HAS_SSP - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - help - Toolchain based on the Musl C library, provided by the - musl-cross project. It uses gcc 5.3, binutils 2.25.1 and - musl 1.1.12. It does not have a cross debugger included. - - The ARM soft-float toolchain is built for ARMv4t, while the - ARM hard-float toolchain is built for ARMv5t. - The x86 toolchain is built for i486. - - http://musl.codu.org/ diff --git a/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options b/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options deleted file mode 100644 index cd12355e3e..0000000000 --- a/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in.options +++ /dev/null @@ -1,19 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "arm-linux-musleabi" if BR2_arm && BR2_ARM_EABI - default "arm-linux-musleabihf" if BR2_arm && BR2_ARM_EABIHF - default "armeb-linux-musleabi" if BR2_armeb - default "i486-linux-musl" if BR2_i386 - default "mips-linux-musl" if (BR2_mips && !BR2_SOFT_FLOAT) - default "mipsel-linux-musl" if (BR2_mipsel && !BR2_SOFT_FLOAT) - default "mipsel-sf-linux-musl" if (BR2_mipsel && BR2_SOFT_FLOAT) - default "powerpc-linux-musl" if BR2_powerpc - default "sh4-linux-musl" if BR2_sh4 - default "sh4eb-linux-musl" if BR2_sh4eb - default "x86_64-linux-musl" if BR2_x86_64 - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-musl-cross" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.hash b/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.hash deleted file mode 100644 index beef8fdc75..0000000000 --- a/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.hash +++ /dev/null @@ -1,12 +0,0 @@ -# Locally calculated -sha256 e32c23d0b83639fc10ad06666ec086b66453b9be44415fe1a818c3c3b526dfb1 crossx86-armeb-linux-musleabi-1.1.12.tar.xz -sha256 eb81bd5d6ada454c6e854b18bfa8dc801333782152166f6cab9fb7cd11692987 crossx86-arm-linux-musleabi-1.1.12.tar.xz -sha256 a050da284ff22d291ae71dfc249ebdedb18334b8d626804760ce7d5963e392e6 crossx86-arm-linux-musleabihf-1.1.12.tar.xz -sha256 18d07f5c8f4cfe373461cf21cf7b1bfefa820a37e96a69b68e0f315d528b4286 crossx86-i486-linux-musl-1.1.12.tar.xz -sha256 1c1480c2618097e402fe804c1431fbd49b0d43520af81d4c1a695a2fa13a3922 crossx86-mipsel-linux-musl-1.1.12.tar.xz -sha256 f0a8b3eb0566138ab3cc77bc09648be15bc325da974ec98b9e67f2fb82be3295 crossx86-mipsel-sf-linux-musl-1.1.12.tar.xz -sha256 6a99989c3dff56776981f6760b2c54dcb9e4032be1d649968bb06c04f2e64177 crossx86-mips-linux-musl-1.1.12.tar.xz -sha256 c082adc3e8b0750bb22ca82628524fd525fd77f534517ac5a66e7ac5a297ee6e crossx86-powerpc-linux-musl-1.1.12.tar.xz -sha256 8c6c9ebb54040e47947b4d3af6823d01fef2bb6ee81b18903c801030c066092b crossx86-sh4eb-linux-musl-1.1.12.tar.xz -sha256 ae9a0a5a60226aa086a56628cfd5c1d283c9dffdca37891d7e6adc2bd21ac2e0 crossx86-sh4-linux-musl-1.1.12.tar.xz -sha256 27e0ea1043a58aebeadf1dacd67e47fd0b5c19fc36f42c9374e5fa3308df09c6 crossx86-x86_64-linux-musl-1.1.12.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.mk b/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.mk deleted file mode 100644 index 966505b771..0000000000 --- a/toolchain/toolchain-external/toolchain-external-musl-cross/toolchain-external-musl-cross.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# toolchain-external-musl-cross -# -################################################################################ - -TOOLCHAIN_EXTERNAL_MUSL_CROSS_VERSION = 1.1.12 -TOOLCHAIN_EXTERNAL_MUSL_CROSS_SITE = https://googledrive.com/host/0BwnS5DMB0YQ6bDhPZkpOYVFhbk0/musl-$(TOOLCHAIN_EXTERNAL_MUSL_CROSS_VERSION) - -TOOLCHAIN_EXTERNAL_MUSL_CROSS_SOURCE = crossx86-$(TOOLCHAIN_EXTERNAL_PREFIX)-$(TOOLCHAIN_EXTERNAL_MUSL_CROSS_VERSION).tar.xz - -$(eval $(toolchain-external-package)) From 2cd86cdbfcde859dfe6c98cf036ae277b38561c6 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Fri, 16 Dec 2016 14:26:52 -0800 Subject: [PATCH 1886/3392] mariadb: new package Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + .../0001-add-extra-check-for-librt.patch | 27 +++++ package/mariadb/Config.in | 32 +++++ package/mariadb/S97mysqld | 77 ++++++++++++ package/mariadb/mariadb.hash | 2 + package/mariadb/mariadb.mk | 113 ++++++++++++++++++ package/mariadb/mysqld.service | 13 ++ package/mysql/Config.in | 1 + 8 files changed, 266 insertions(+) create mode 100644 package/mariadb/0001-add-extra-check-for-librt.patch create mode 100644 package/mariadb/Config.in create mode 100644 package/mariadb/S97mysqld create mode 100644 package/mariadb/mariadb.hash create mode 100644 package/mariadb/mariadb.mk create mode 100644 package/mariadb/mysqld.service diff --git a/package/Config.in b/package/Config.in index f7e8c0ab9b..8ed3622356 100644 --- a/package/Config.in +++ b/package/Config.in @@ -925,6 +925,7 @@ menu "Database" source "package/kompexsqlite/Config.in" source "package/leveldb/Config.in" source "package/libpqxx/Config.in" + source "package/mariadb/Config.in" source "package/mongodb/Config.in" source "package/mysql/Config.in" source "package/postgresql/Config.in" diff --git a/package/mariadb/0001-add-extra-check-for-librt.patch b/package/mariadb/0001-add-extra-check-for-librt.patch new file mode 100644 index 0000000000..26bff7546c --- /dev/null +++ b/package/mariadb/0001-add-extra-check-for-librt.patch @@ -0,0 +1,27 @@ +From e6244400dfd3547531a3a3289fadbbe19873f096 Mon Sep 17 00:00:00 2001 +From: Ryan Coe +Date: Thu, 27 Oct 2016 20:33:21 -0700 +Subject: [PATCH] add extra check for librt + +Signed-off-by: Ryan Coe +--- + configure.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.cmake b/configure.cmake +index 896226de954f4642a238ca6a72e0930590dc1681..77ca485fb05e6b63bb69f9561b4eabfaa208a419 100644 +--- a/configure.cmake ++++ b/configure.cmake +@@ -126,6 +126,9 @@ IF(UNIX) + IF(NOT LIBRT) + MY_SEARCH_LIBS(clock_gettime rt LIBRT) + ENDIF() ++ IF(NOT LIBRT) ++ MY_SEARCH_LIBS(posix_spawn_file_actions_addclose rt LIBRT) ++ ENDIF() + FIND_PACKAGE(Threads) + + SET(CMAKE_REQUIRED_LIBRARIES +-- +2.9.3 + diff --git a/package/mariadb/Config.in b/package/mariadb/Config.in new file mode 100644 index 0000000000..86de194cca --- /dev/null +++ b/package/mariadb/Config.in @@ -0,0 +1,32 @@ +config BR2_PACKAGE_MARIADB + bool "mariadb" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS + depends on !BR2_PACKAGE_MYSQL + select BR2_PACKAGE_LIBAIO + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_READLINE + help + MariaDB is one of the most popular database servers in the world. + It's made by the original developers of MySQL and guaranteed to + stay open source. + + http://www.mariadb.org/ + +if BR2_PACKAGE_MARIADB + +config BR2_PACKAGE_MARIADB_SERVER + bool "mariadb server" + help + Install the mariadb server on the target. + +endif + +comment "mariadb needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mariadb/S97mysqld b/package/mariadb/S97mysqld new file mode 100644 index 0000000000..62357fa8c4 --- /dev/null +++ b/package/mariadb/S97mysqld @@ -0,0 +1,77 @@ +#!/bin/sh +# +# mysql +# + +MYSQL_LIB="/var/lib/mysql" +MYSQL_RUN="/run/mysql" +MYSQL_PID="$MYSQL_RUN/mysqld.pid" +MYSQL_BIN="/usr/bin" + +wait_for_ready() { + WAIT_DELAY=5 + while [ $WAIT_DELAY -gt 0 ]; do + if $MYSQL_BIN/mysqladmin ping > /dev/null 2>&1; then + return 0 + fi + sleep 1 + : $((WAIT_DELAY -= 1)) + done + return 1 +} + +start() { + if [ `ls -1 $MYSQL_LIB | wc -l` = 0 ] ; then + printf "Creating mysql system tables ... " + $MYSQL_BIN/mysql_install_db --basedir=/usr --user=mysql \ + --datadir=$MYSQL_LIB > /dev/null 2>&1 + if [ $? != 0 ]; then + echo "FAIL" + exit 1 + fi + echo "OK" + fi + + # mysqld runs as user mysql, but /run is only writable by root + # so create a subdirectory for mysql. + install -d -o mysql -g root -m 0755 $MYSQL_RUN + + # We don't use start-stop-daemon because mysqld has its own + # wrapper script. + printf "Starting mysql ... " + $MYSQL_BIN/mysqld_safe --pid-file=$MYSQL_PID --user=mysql \ + > /dev/null 2>&1 & + wait_for_ready + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +stop() { + printf "Stopping mysql ... " + if [ -f $MYSQL_PID ]; then + kill `cat $MYSQL_PID` > /dev/null 2>&1 + [ $? = 0 ] && echo "OK" || echo "FAIL" + else + echo "FAIL" + fi +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + ;; +esac diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash new file mode 100644 index 0000000000..c86eb44181 --- /dev/null +++ b/package/mariadb/mariadb.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 c24e83f24d674d9912319f9e9422f093c8ca6be1721a4380cbd74792b89ba0b9 mariadb-10.1.20.tar.gz diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk new file mode 100644 index 0000000000..7b47557bdd --- /dev/null +++ b/package/mariadb/mariadb.mk @@ -0,0 +1,113 @@ +################################################################################ +# +# mariadb +# +################################################################################ + +MARIADB_VERSION = 10.1.20 +MARIADB_SOURCE = mariadb-$(MARIADB_VERSION).tar.gz +MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source +MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library) +MARIADB_LICENSE_FILES = README COPYING COPYING.LESSER +MARIADB_INSTALL_STAGING = YES + +MARIADB_DEPENDENCIES = \ + host-mariadb \ + ncurses \ + openssl \ + zlib \ + libaio \ + libxml2 \ + readline + +# We won't need unit tests +MARIADB_CONF_OPTS += -DWITH_UNIT_TESTS=0 + +# Mroonga needs libstemmer. Some work still needs to be done before it can be +# included in buildroot. Disable it for now. +MARIADB_CONF_OPTS += -DWITHOUT_MROONGA=1 + +# This value is determined automatically during straight compile by compiling +# and running a test code. You cannot do that during cross-compile. However the +# stack grows downward in most if not all modern systems. The only exception I +# am aware of is PA-RISC which is not supported by buildroot. Therefore it makes +# sense to hardcode the value. If an arch is added the stack of which grows up +# one should expect unpredictable behavior at run time. +MARIADB_CONF_OPTS += -DSTACK_DIRECTION=-1 + +# Jemalloc was added for TokuDB. Since its configure script seems somewhat broken +# when it comes to cross-compilation we shall disable it and also disable TokuDB. +MARIADB_CONF_OPTS += -DWITH_JEMALLOC=no -DWITHOUT_TOKUDB=1 + +# Make it explicit that we are cross-compiling +MARIADB_CONF_OPTS += -DCMAKE_CROSSCOMPILING=1 + +ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y) +MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON +else +MARIADB_CONF_OPTS += -DWITHOUT_SERVER=ON +endif + +MARIADB_CONF_OPTS += \ + -DINSTALL_DOCDIR=share/doc/mariadb-$(MARIADB_VERSION) \ + -DINSTALL_DOCREADMEDIR=share/doc/mariadb-$(MARIADB_VERSION) \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_MYSQLTESTDIR=share/mysql/test \ + -DINSTALL_PLUGINDIR=lib/mysql/plugin \ + -DINSTALL_SBINDIR=sbin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_SQLBENCHDIR=share/mysql/bench \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET) + +# Some helpers must be compiled for host in order to crosscompile mariadb for +# the target. They are then included by import_executables.cmake which is +# generated during the build of the host helpers. It is not necessary to build +# the whole host package, only the "import_executables" target. +# -DIMPORT_EXECUTABLES=$(HOST_MARIADB_BUILDDIR)/import_executables.cmake +# must then be passed to cmake during target build. +# see also https://mariadb.com/kb/en/mariadb/cross-compiling-mariadb/ +HOST_MARIADB_MAKE_OPTS = import_executables + +MARIADB_CONF_OPTS += \ + -DIMPORT_EXECUTABLES=$(HOST_MARIADB_BUILDDIR)/import_executables.cmake + +# Don't install host-mariadb. We just need to build import_executable +# Therefore only run 'true' and do nothing, not even the default action. +HOST_MARIADB_INSTALL_CMDS = true + +ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y) +define MARIADB_USERS + mysql -1 mysql -1 * /var/lib/mysql - - MySQL Server +endef + +define MARIADB_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/mariadb/S97mysqld \ + $(TARGET_DIR)/etc/init.d/S97mysqld +endef + +define MARIADB_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/mariadb/mysqld.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service +endef +endif + +define MARIADB_POST_INSTALL + mkdir -p $(TARGET_DIR)/var/lib/mysql + $(INSTALL) -D -m 644 $(TARGET_DIR)/usr/share/mysql/my-small.cnf \ + $(TARGET_DIR)/etc/mysql/my.cnf + # We don't need this on the target as it's only useful in staging + $(RM) $(TARGET_DIR)/usr/bin/mysql_config + # Remove test suite + $(RM) -r $(TARGET_DIR)/usr/share/mysql/test +endef + +MARIADB_POST_INSTALL_TARGET_HOOKS += MARIADB_POST_INSTALL + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service new file mode 100644 index 0000000000..cd308310c6 --- /dev/null +++ b/package/mariadb/mysqld.service @@ -0,0 +1,13 @@ +[Unit] +Description=MySQL database server + +[Service] +ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' +ExecStart=/usr/bin/mysqld_safe +Restart=always +User=mysql +RuntimeDirectory=mysql +RuntimeDirectoryMode=0755 + +[Install] +WantedBy=multi-user.target diff --git a/package/mysql/Config.in b/package/mysql/Config.in index 7133892bb7..7e7d22450d 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MYSQL depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PACKAGE_MARIADB select BR2_PACKAGE_NCURSES select BR2_PACKAGE_READLINE help From ae2a9ca980d4b3c7e00739e03ebdb265f23ed900 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Fri, 16 Dec 2016 14:26:53 -0800 Subject: [PATCH 1887/3392] DEVELOPERS: add entry for mariadb Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index d855d11819..1b8955c02a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1289,6 +1289,7 @@ F: package/python-tornado/ N: Ryan Coe F: package/inadyn/ F: package/libite/ +F: package/mariadb/ N: Ryan Wilkins F: package/biosdevname/ From 3d707d2b4fa6362cb37754f6c5fbb06240f5faf5 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Fri, 16 Dec 2016 14:26:51 -0800 Subject: [PATCH 1888/3392] mysql: rename package to oracle-mysql, make a virtual package This commit turns mysql into a virtual package, after renaming the original mysql package to oracle-mysql. This way, all existing packages that "depends on" or "select" BR2_PACKAGE_MYSQL continue to work with no modification. Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 - package/mariadb/Config.in | 32 ----- package/mariadb/mariadb.mk | 1 + package/mysql/Config.in | 74 ++++++++-- package/mysql/mysql.mk | 130 +---------------- .../0000-ac_cache_check.patch | 0 .../0001-configure-ps-cache-check.patch | 0 .../0002-use-new-readline-iface.patch | 0 .../0003-ac_stack_direction-is-unset.patch | 0 .../0004-Fix-gen_lex_hash-execution.patch | 0 ...05-bison_3_breaks_mysql_server_build.patch | 0 .../0006-no-force-static-build.patch | 0 ...0007-dont-install-in-mysql-directory.patch | 0 package/{mysql => oracle-mysql}/S97mysqld | 0 .../{mysql => oracle-mysql}/mysqld.service | 0 .../oracle-mysql.hash} | 0 package/oracle-mysql/oracle-mysql.mk | 136 ++++++++++++++++++ 17 files changed, 204 insertions(+), 170 deletions(-) delete mode 100644 package/mariadb/Config.in rename package/{mysql => oracle-mysql}/0000-ac_cache_check.patch (100%) rename package/{mysql => oracle-mysql}/0001-configure-ps-cache-check.patch (100%) rename package/{mysql => oracle-mysql}/0002-use-new-readline-iface.patch (100%) rename package/{mysql => oracle-mysql}/0003-ac_stack_direction-is-unset.patch (100%) rename package/{mysql => oracle-mysql}/0004-Fix-gen_lex_hash-execution.patch (100%) rename package/{mysql => oracle-mysql}/0005-bison_3_breaks_mysql_server_build.patch (100%) rename package/{mysql => oracle-mysql}/0006-no-force-static-build.patch (100%) rename package/{mysql => oracle-mysql}/0007-dont-install-in-mysql-directory.patch (100%) rename package/{mysql => oracle-mysql}/S97mysqld (100%) rename package/{mysql => oracle-mysql}/mysqld.service (100%) rename package/{mysql/mysql.hash => oracle-mysql/oracle-mysql.hash} (100%) create mode 100644 package/oracle-mysql/oracle-mysql.mk diff --git a/package/Config.in b/package/Config.in index 8ed3622356..f7e8c0ab9b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -925,7 +925,6 @@ menu "Database" source "package/kompexsqlite/Config.in" source "package/leveldb/Config.in" source "package/libpqxx/Config.in" - source "package/mariadb/Config.in" source "package/mongodb/Config.in" source "package/mysql/Config.in" source "package/postgresql/Config.in" diff --git a/package/mariadb/Config.in b/package/mariadb/Config.in deleted file mode 100644 index 86de194cca..0000000000 --- a/package/mariadb/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -config BR2_PACKAGE_MARIADB - bool "mariadb" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - depends on !BR2_PACKAGE_MYSQL - select BR2_PACKAGE_LIBAIO - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_READLINE - help - MariaDB is one of the most popular database servers in the world. - It's made by the original developers of MySQL and guaranteed to - stay open source. - - http://www.mariadb.org/ - -if BR2_PACKAGE_MARIADB - -config BR2_PACKAGE_MARIADB_SERVER - bool "mariadb server" - help - Install the mariadb server on the target. - -endif - -comment "mariadb needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 7b47557bdd..6c609da60f 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -10,6 +10,7 @@ MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERS MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library) MARIADB_LICENSE_FILES = README COPYING COPYING.LESSER MARIADB_INSTALL_STAGING = YES +MARIADB_PROVIDES = mysql MARIADB_DEPENDENCIES = \ host-mariadb \ diff --git a/package/mysql/Config.in b/package/mysql/Config.in index 7e7d22450d..e485d6b99f 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -1,25 +1,83 @@ config BR2_PACKAGE_MYSQL - bool "MySQL" + bool "mysql support" + help + Select the desired mysql provider. + +if BR2_PACKAGE_MYSQL + +choice + prompt "mysql variant" + default BR2_PACKAGE_ORACLE_MYSQL + help + Select either the oracle mysql server or the mariadb server + +config BR2_PACKAGE_MARIADB + bool "mariadb" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS + select BR2_PACKAGE_LIBAIO + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_READLINE + select BR2_PACKAGE_HAS_MYSQL + help + MariaDB is one of the most popular database servers in the world. + It's made by the original developers of MySQL and guaranteed to + stay open source. + + http://www.mariadb.org/ + +config BR2_PACKAGE_ORACLE_MYSQL + bool "oracle mysql" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_PACKAGE_MARIADB select BR2_PACKAGE_NCURSES select BR2_PACKAGE_READLINE + select BR2_PACKAGE_HAS_MYSQL help The MySQL Open Source Database System http://www.mysql.com/ -if BR2_PACKAGE_MYSQL +endchoice + +comment "mariadb needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + +comment "oracle mysql needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + +if BR2_PACKAGE_MARIADB + +config BR2_PACKAGE_MARIADB_SERVER + bool "mariadb server" + help + Install the mariadb server on the target. -config BR2_PACKAGE_MYSQL_SERVER - bool "MySQL server" +endif + +if BR2_PACKAGE_ORACLE_MYSQL + +config BR2_PACKAGE_ORACLE_MYSQL_SERVER + bool "oracle mysql server" help Install the MySQL server on the target. endif -comment "MySQL needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_HAS_MYSQL + bool + +config BR2_PACKAGE_PROVIDES_MYSQL + string + default "mariadb" if BR2_PACKAGE_MARIADB + default "oracle-mysql" if BR2_PACKAGE_ORACLE_MYSQL + +endif diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk index ea330f2515..d65562563d 100644 --- a/package/mysql/mysql.mk +++ b/package/mysql/mysql.mk @@ -4,132 +4,4 @@ # ################################################################################ -MYSQL_VERSION_MAJOR = 5.1 -MYSQL_VERSION = $(MYSQL_VERSION_MAJOR).73 -MYSQL_SOURCE = mysql-$(MYSQL_VERSION).tar.gz -MYSQL_SITE = http://dev.mysql.com/get/Downloads/MySQL-$(MYSQL_VERSION_MAJOR) -MYSQL_INSTALL_STAGING = YES -MYSQL_DEPENDENCIES = readline ncurses -MYSQL_AUTORECONF = YES -MYSQL_LICENSE = GPLv2 -MYSQL_LICENSE_FILES = README COPYING - -# Unix socket. This variable can also be consulted by other buildroot packages -MYSQL_SOCKET = /run/mysql/mysql.sock - -MYSQL_CONF_ENV = \ - ac_cv_sys_restartable_syscalls=yes \ - ac_cv_path_PS=/bin/ps \ - ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \ - ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes \ - ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no \ - ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \ - mysql_cv_new_rl_interface=yes - -MYSQL_CONF_OPTS = \ - --without-ndb-binlog \ - --without-docs \ - --without-man \ - --without-libedit \ - --without-readline \ - --with-low-memory \ - --enable-thread-safe-client \ - --with-unix-socket-path=$(MYSQL_SOCKET) \ - --disable-mysql-maintainer-mode - -# host-mysql only installs what is needed to build mysql, i.e. the -# gen_lex_hash tool, and it only builds the parts that are needed to -# create this tool -HOST_MYSQL_DEPENDENCIES = host-zlib host-ncurses - -HOST_MYSQL_CONF_OPTS = \ - --with-embedded-server \ - --disable-mysql-maintainer-mode - -define HOST_MYSQL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/include my_config.h - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/mysys libmysys.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/strings libmystrings.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/vio libvio.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/dbug libdbug.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/regex libregex.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sql gen_lex_hash -endef - -define HOST_MYSQL_INSTALL_CMDS - $(INSTALL) -m 0755 $(@D)/sql/gen_lex_hash $(HOST_DIR)/usr/bin/ -endef - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MYSQL_DEPENDENCIES += openssl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -MYSQL_DEPENDENCIES += zlib -endif - -ifeq ($(BR2_PACKAGE_MYSQL_SERVER),y) -MYSQL_DEPENDENCIES += host-mysql host-bison - -MYSQL_CONF_OPTS += \ - --localstatedir=/var/mysql \ - --with-atomic-ops=up \ - --with-embedded-server \ - --without-query-cache \ - --without-plugin-partition \ - --without-plugin-daemon_example \ - --without-plugin-ftexample \ - --without-plugin-archive \ - --without-plugin-blackhole \ - --without-plugin-example \ - --without-plugin-federated \ - --without-plugin-ibmdb2i \ - --without-plugin-innobase \ - --without-plugin-innodb_plugin \ - --without-plugin-ndbcluster - -# Debugging is only available for the server, so no need for -# this if-block outside of the server if-block -ifeq ($(BR2_ENABLE_DEBUG),y) -MYSQL_CONF_OPTS += --with-debug=full -else -MYSQL_CONF_OPTS += --without-debug -endif - -define MYSQL_USERS - mysql -1 nogroup -1 * /var/mysql - - MySQL daemon -endef - -define MYSQL_ADD_FOLDER - $(INSTALL) -d $(TARGET_DIR)/var/mysql -endef - -MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_ADD_FOLDER - -define MYSQL_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/mysql/S97mysqld \ - $(TARGET_DIR)/etc/init.d/S97mysqld -endef - -define MYSQL_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/mysql/mysqld.service \ - $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service -endef - -else -MYSQL_CONF_OPTS += \ - --without-server -endif - - -define MYSQL_REMOVE_TEST_PROGS - rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench -endef - -MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_REMOVE_TEST_PROGS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(virtual-package)) diff --git a/package/mysql/0000-ac_cache_check.patch b/package/oracle-mysql/0000-ac_cache_check.patch similarity index 100% rename from package/mysql/0000-ac_cache_check.patch rename to package/oracle-mysql/0000-ac_cache_check.patch diff --git a/package/mysql/0001-configure-ps-cache-check.patch b/package/oracle-mysql/0001-configure-ps-cache-check.patch similarity index 100% rename from package/mysql/0001-configure-ps-cache-check.patch rename to package/oracle-mysql/0001-configure-ps-cache-check.patch diff --git a/package/mysql/0002-use-new-readline-iface.patch b/package/oracle-mysql/0002-use-new-readline-iface.patch similarity index 100% rename from package/mysql/0002-use-new-readline-iface.patch rename to package/oracle-mysql/0002-use-new-readline-iface.patch diff --git a/package/mysql/0003-ac_stack_direction-is-unset.patch b/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch similarity index 100% rename from package/mysql/0003-ac_stack_direction-is-unset.patch rename to package/oracle-mysql/0003-ac_stack_direction-is-unset.patch diff --git a/package/mysql/0004-Fix-gen_lex_hash-execution.patch b/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch similarity index 100% rename from package/mysql/0004-Fix-gen_lex_hash-execution.patch rename to package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch diff --git a/package/mysql/0005-bison_3_breaks_mysql_server_build.patch b/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch similarity index 100% rename from package/mysql/0005-bison_3_breaks_mysql_server_build.patch rename to package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch diff --git a/package/mysql/0006-no-force-static-build.patch b/package/oracle-mysql/0006-no-force-static-build.patch similarity index 100% rename from package/mysql/0006-no-force-static-build.patch rename to package/oracle-mysql/0006-no-force-static-build.patch diff --git a/package/mysql/0007-dont-install-in-mysql-directory.patch b/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch similarity index 100% rename from package/mysql/0007-dont-install-in-mysql-directory.patch rename to package/oracle-mysql/0007-dont-install-in-mysql-directory.patch diff --git a/package/mysql/S97mysqld b/package/oracle-mysql/S97mysqld similarity index 100% rename from package/mysql/S97mysqld rename to package/oracle-mysql/S97mysqld diff --git a/package/mysql/mysqld.service b/package/oracle-mysql/mysqld.service similarity index 100% rename from package/mysql/mysqld.service rename to package/oracle-mysql/mysqld.service diff --git a/package/mysql/mysql.hash b/package/oracle-mysql/oracle-mysql.hash similarity index 100% rename from package/mysql/mysql.hash rename to package/oracle-mysql/oracle-mysql.hash diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk new file mode 100644 index 0000000000..ed3c0ea983 --- /dev/null +++ b/package/oracle-mysql/oracle-mysql.mk @@ -0,0 +1,136 @@ +################################################################################ +# +# oracle-mysql +# +################################################################################ + +ORACLE_MYSQL_VERSION_MAJOR = 5.1 +ORACLE_MYSQL_VERSION = $(ORACLE_MYSQL_VERSION_MAJOR).73 +ORACLE_MYSQL_SOURCE = mysql-$(ORACLE_MYSQL_VERSION).tar.gz +ORACLE_MYSQL_SITE = http://dev.mysql.com/get/Downloads/MySQL-$(ORACLE_MYSQL_VERSION_MAJOR) +ORACLE_MYSQL_INSTALL_STAGING = YES +ORACLE_MYSQL_DEPENDENCIES = readline ncurses +ORACLE_MYSQL_AUTORECONF = YES +ORACLE_MYSQL_LICENSE = GPLv2 +ORACLE_MYSQL_LICENSE_FILES = README COPYING +ORACLE_MYSQL_PROVIDES = mysql + +# Unix socket. This variable can also be consulted by other buildroot packages +MYSQL_SOCKET = /run/mysql/mysql.sock + +ORACLE_MYSQL_CONF_ENV = \ + ac_cv_sys_restartable_syscalls=yes \ + ac_cv_path_PS=/bin/ps \ + ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \ + ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes \ + ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no \ + ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \ + mysql_cv_new_rl_interface=yes + +ORACLE_MYSQL_CONF_OPTS = \ + --without-ndb-binlog \ + --without-docs \ + --without-man \ + --without-libedit \ + --without-readline \ + --with-low-memory \ + --enable-thread-safe-client \ + --with-unix-socket-path=$(MYSQL_SOCKET) \ + --disable-mysql-maintainer-mode + +# host-oracle-mysql only installs what is needed to build mysql, i.e. the +# gen_lex_hash tool, and it only builds the parts that are needed to +# create this tool +HOST_ORACLE_MYSQL_DEPENDENCIES = host-zlib host-ncurses + +HOST_ORACLE_MYSQL_CONF_OPTS = \ + --with-embedded-server \ + --disable-mysql-maintainer-mode + +define HOST_ORACLE_MYSQL_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/include my_config.h + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/mysys libmysys.a + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/strings libmystrings.a + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/vio libvio.a + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/dbug libdbug.a + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/regex libregex.a + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sql gen_lex_hash +endef + +define HOST_ORACLE_MYSQL_INSTALL_CMDS + $(INSTALL) -m 0755 $(@D)/sql/gen_lex_hash $(HOST_DIR)/usr/bin/ +endef + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +ORACLE_MYSQL_DEPENDENCIES += openssl +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +ORACLE_MYSQL_DEPENDENCIES += zlib +endif + +ifeq ($(BR2_PACKAGE_ORACLE_MYSQL_SERVER),y) +ORACLE_MYSQL_DEPENDENCIES += host-oracle-mysql host-bison + +ORACLE_MYSQL_CONF_OPTS += \ + --localstatedir=/var/mysql \ + --with-atomic-ops=up \ + --with-embedded-server \ + --without-query-cache \ + --without-plugin-partition \ + --without-plugin-daemon_example \ + --without-plugin-ftexample \ + --without-plugin-archive \ + --without-plugin-blackhole \ + --without-plugin-example \ + --without-plugin-federated \ + --without-plugin-ibmdb2i \ + --without-plugin-innobase \ + --without-plugin-innodb_plugin \ + --without-plugin-ndbcluster + +# Debugging is only available for the server, so no need for +# this if-block outside of the server if-block +ifeq ($(BR2_ENABLE_DEBUG),y) +ORACLE_MYSQL_CONF_OPTS += --with-debug=full +else +ORACLE_MYSQL_CONF_OPTS += --without-debug +endif + +define ORACLE_MYSQL_USERS + mysql -1 nogroup -1 * /var/mysql - - MySQL daemon +endef + +define ORACLE_MYSQL_ADD_FOLDER + $(INSTALL) -d $(TARGET_DIR)/var/mysql +endef + +ORACLE_MYSQL_POST_INSTALL_TARGET_HOOKS += ORACLE_MYSQL_ADD_FOLDER + +define ORACLE_MYSQL_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/oracle-mysql/S97mysqld \ + $(TARGET_DIR)/etc/init.d/S97mysqld +endef + +define ORACLE_MYSQL_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/mysql/mysqld.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service +endef + +else +ORACLE_MYSQL_CONF_OPTS += \ + --without-server +endif + + +define ORACLE_MYSQL_REMOVE_TEST_PROGS + rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench +endef + +ORACLE_MYSQL_POST_INSTALL_TARGET_HOOKS += ORACLE_MYSQL_REMOVE_TEST_PROGS + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 7a26ab2404a0eca68e86c4600e93ab6bfdfcbf1c Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 16 Dec 2016 16:02:47 +0100 Subject: [PATCH 1889/3392] python-mbstrdecoder: new package Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-mbstrdecoder/Config.in | 6 ++++++ .../python-mbstrdecoder/python-mbstrdecoder.hash | 3 +++ package/python-mbstrdecoder/python-mbstrdecoder.mk | 14 ++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/python-mbstrdecoder/Config.in create mode 100644 package/python-mbstrdecoder/python-mbstrdecoder.hash create mode 100644 package/python-mbstrdecoder/python-mbstrdecoder.mk diff --git a/package/Config.in b/package/Config.in index f7e8c0ab9b..066759cf49 100644 --- a/package/Config.in +++ b/package/Config.in @@ -710,6 +710,7 @@ menu "External python modules" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markupsafe/Config.in" + source "package/python-mbstrdecoder/Config.in" source "package/python-meld3/Config.in" source "package/python-mistune/Config.in" source "package/python-msgpack/Config.in" diff --git a/package/python-mbstrdecoder/Config.in b/package/python-mbstrdecoder/Config.in new file mode 100644 index 0000000000..017002c97a --- /dev/null +++ b/package/python-mbstrdecoder/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_MBSTRDECODER + bool "python-mbstrdecoder" + help + multi-byte character string decoder. + + https://github.com/thombashi/mbstrdecoder diff --git a/package/python-mbstrdecoder/python-mbstrdecoder.hash b/package/python-mbstrdecoder/python-mbstrdecoder.hash new file mode 100644 index 0000000000..1389ac3a86 --- /dev/null +++ b/package/python-mbstrdecoder/python-mbstrdecoder.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/mbstrdecoder/json, sha256 locally computed +md5 5548c4748cf0bc16befcf7ef848f95ff mbstrdecoder-0.1.0.tar.gz +sha256 7c65c4ea6681729ddfdb7612ac39f5accb10abb4e838ca810d810931ec023aad mbstrdecoder-0.1.0.tar.gz diff --git a/package/python-mbstrdecoder/python-mbstrdecoder.mk b/package/python-mbstrdecoder/python-mbstrdecoder.mk new file mode 100644 index 0000000000..f64bde95f2 --- /dev/null +++ b/package/python-mbstrdecoder/python-mbstrdecoder.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-mbstrdecoder +# +################################################################################ + +PYTHON_MBSTRDECODER_VERSION = 0.1.0 +PYTHON_MBSTRDECODER_SOURCE = mbstrdecoder-$(PYTHON_MBSTRDECODER_VERSION).tar.gz +PYTHON_MBSTRDECODER_SITE = https://pypi.python.org/packages/e4/10/fa3d8716b28e2b37eba1edab1c6831a56b805032328279c14fc99d37c391 +PYTHON_MBSTRDECODER_SETUP_TYPE = setuptools +PYTHON_MBSTRDECODER_LICENSE = MIT +PYTHON_MBSTRDECODER_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 3a8aef3652342ce30f8f4af9d1d62d7db1032669 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 16 Dec 2016 16:02:48 +0100 Subject: [PATCH 1890/3392] python-pytz: bump to version 2016.10 Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-pytz/python-pytz.hash | 4 ++-- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index db362ec02a..fbccc52bce 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/pytz/json, sha256 locally computed -md5 8d8121d619a43cf0b38a4195de1cb8a5 pytz-2016.7.tar.bz2 -sha256 6eab31709e3a4aea748457707da45e805b650cbb352583805d2417de2a1dd71e pytz-2016.7.tar.bz2 +md5 88b1d6c50c764579292edce3493c8a3a pytz-2016.10.tar.bz2 +sha256 7016b2c4fa075c564b81c37a252a5fccf60d8964aa31b7f5eae59aeb594ae02b pytz-2016.10.tar.bz2 diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index ffcab32910..9a8bd07e0f 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2016.7 +PYTHON_PYTZ_VERSION = 2016.10 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.bz2 -PYTHON_PYTZ_SITE = https://pypi.python.org/packages/53/35/6376f58fb82ce69e2c113ca0ebe5c0f69b20f006e184bcc238a6007f4bdb +PYTHON_PYTZ_SITE = https://pypi.python.org/packages/d0/e1/aca6ef73a7bd322a7fc73fd99631ee3454d4fc67dc2bee463e2adf6bb3d3 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From 9f9d804d9eb393faa012417d5e5960c8cd128c48 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 16 Dec 2016 16:02:49 +0100 Subject: [PATCH 1891/3392] python-dateutil: bump to version 2.6.0 Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-dateutil/python-dateutil.hash | 7 +++---- package/python-dateutil/python-dateutil.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-dateutil/python-dateutil.hash b/package/python-dateutil/python-dateutil.hash index 9eff0160c3..adc24bdd16 100644 --- a/package/python-dateutil/python-dateutil.hash +++ b/package/python-dateutil/python-dateutil.hash @@ -1,4 +1,3 @@ -# md5 from https://pypi.python.org/pypi/python-dateutil/json -md5 05ffc6d2cc85a7fd93bb245807f715ef python-dateutil-2.5.3.tar.gz -# sha256 calculated by scanpypi -sha256 1408fdb07c6a1fa9997567ce3fcee6a337b39a503d80699e0f213de4aa4b32ed python-dateutil-2.5.3.tar.gz +# md5 from https://pypi.python.org/pypi/python-dateutil/json, sha256 locally computed +md5 6e38f91e8c94c15a79ce22768dfeca87 python-dateutil-2.6.0.tar.gz +sha256 62a2f8df3d66f878373fd0072eacf4ee52194ba302e00082828e0d263b0418d2 python-dateutil-2.6.0.tar.gz diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk index 371788cfa5..8d73d160c9 100644 --- a/package/python-dateutil/python-dateutil.mk +++ b/package/python-dateutil/python-dateutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATEUTIL_VERSION = 2.5.3 +PYTHON_DATEUTIL_VERSION = 2.6.0 PYTHON_DATEUTIL_SOURCE = python-dateutil-$(PYTHON_DATEUTIL_VERSION).tar.gz -PYTHON_DATEUTIL_SITE = https://pypi.python.org/packages/3e/f5/aad82824b369332a676a90a8c0d1e608b17e740bbb6aeeebca726f17b902 +PYTHON_DATEUTIL_SITE = https://pypi.python.org/packages/51/fc/39a3fbde6864942e8bb24c93663734b74e281b984d1b8c4f95d64b0c21f6 PYTHON_DATEUTIL_SETUP_TYPE = setuptools PYTHON_DATEUTIL_LICENSE = BSD-3c PYTHON_DATEUTIL_LICENSE_FILES = LICENSE From 05ebe206c6d0a9cb54b7a6e5cb52790cf0644915 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 16 Dec 2016 16:02:50 +0100 Subject: [PATCH 1892/3392] python-dataproperty: bump to version 0.13.5 Add new dependency: python-mbstrdecoder. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-dataproperty/Config.in | 1 + package/python-dataproperty/python-dataproperty.hash | 4 ++-- package/python-dataproperty/python-dataproperty.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-dataproperty/Config.in b/package/python-dataproperty/Config.in index a490b9870c..7ef7f085be 100644 --- a/package/python-dataproperty/Config.in +++ b/package/python-dataproperty/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_DATAPROPERTY bool "python-dataproperty" + select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime select BR2_PACKAGE_PYTHON_SIX # runtime diff --git a/package/python-dataproperty/python-dataproperty.hash b/package/python-dataproperty/python-dataproperty.hash index dc075b9b76..3015042851 100644 --- a/package/python-dataproperty/python-dataproperty.hash +++ b/package/python-dataproperty/python-dataproperty.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/dataproperty/json, sha256 locally computed -md5 9d910f0994b892df260977146f9a2bd1 DataProperty-0.9.0.tar.gz -sha256 02ab30a4873eeb1c538cc54552c9f9ef226b3243b7546e8317c583550960319d DataProperty-0.9.0.tar.gz +md5 65be4db859ad25bf2c1af25486710f00 DataProperty-0.13.5.tar.gz +sha256 470e510d9636af446401d9f0bd79172b1f03c5b903819f2ccd4a06ac32ed64d9 DataProperty-0.13.5.tar.gz diff --git a/package/python-dataproperty/python-dataproperty.mk b/package/python-dataproperty/python-dataproperty.mk index 727b8c7cb9..13ddf5f64e 100644 --- a/package/python-dataproperty/python-dataproperty.mk +++ b/package/python-dataproperty/python-dataproperty.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 0.9.0 +PYTHON_DATAPROPERTY_VERSION = 0.13.5 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://pypi.python.org/packages/d4/7a/8a214fc3c6eb2aeb42282a25355296f391cdcfd6c6b51c80bd644ce6b229 +PYTHON_DATAPROPERTY_SITE = https://pypi.python.org/packages/e0/30/71065e642a985366fc3900316592ff6b88891f96e42107936613cd7a020b PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE From c817ee6053e927a301e3604936fc9b22033bccaa Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 16 Dec 2016 16:02:51 +0100 Subject: [PATCH 1893/3392] python-dominate: bump to version 2.3.1 Use PyPI as download location. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-dominate/python-dominate.hash | 5 +++-- package/python-dominate/python-dominate.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/python-dominate/python-dominate.hash b/package/python-dominate/python-dominate.hash index 1d763ac39f..2480b004be 100644 --- a/package/python-dominate/python-dominate.hash +++ b/package/python-dominate/python-dominate.hash @@ -1,2 +1,3 @@ -# sha256 locally computed -sha256 318063a9b600cdc13f84592ad515db0fd3a2816a2433e2a2fad55a5398ae05da python-dominate-acb02c7c71e353e5dfbc905d506b54908533027e.tar.gz +# md5 from https://pypi.python.org/pypi/dominate/json, sha256 locally computed +md5 45bd97e6f7888aac24ae86013c57638e dominate-2.3.1.tar.gz +sha256 4b8ce6f33633c9dd9175b228d21c00c801b6bd0327747cd5e17fc2da934c3a69 dominate-2.3.1.tar.gz diff --git a/package/python-dominate/python-dominate.mk b/package/python-dominate/python-dominate.mk index 170553f7cb..3e264caa7d 100644 --- a/package/python-dominate/python-dominate.mk +++ b/package/python-dominate/python-dominate.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_DOMINATE_VERSION = acb02c7c71e353e5dfbc905d506b54908533027e -PYTHON_DOMINATE_SITE = $(call github,Knio,dominate,$(PYTHON_DOMINATE_VERSION)) +PYTHON_DOMINATE_VERSION = 2.3.1 +PYTHON_DOMINATE_SOURCE = dominate-$(PYTHON_DOMINATE_VERSION).tar.gz +PYTHON_DOMINATE_SITE = https://pypi.python.org/packages/43/b2/3b7d67dd59dab93ae08569384b254323516e8868b453eea5614a53835baf PYTHON_DOMINATE_SETUP_TYPE = setuptools PYTHON_DOMINATE_LICENSE = LGPLv3+ PYTHON_DOMINATE_LICENSE_FILES = LICENSE.txt From ff5623057456280b7998c275a814e3558b1ef34a Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 16 Dec 2016 16:02:52 +0100 Subject: [PATCH 1894/3392] python-pytablewriter: bump to version 0.14.1 Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-pytablewriter/python-pytablewriter.hash | 4 ++-- package/python-pytablewriter/python-pytablewriter.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytablewriter/python-pytablewriter.hash b/package/python-pytablewriter/python-pytablewriter.hash index 09fb8ffb91..097d0edbf3 100644 --- a/package/python-pytablewriter/python-pytablewriter.hash +++ b/package/python-pytablewriter/python-pytablewriter.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/pytablewriter/json, sha256 locally computed -md5 1f63f9652c61c0d68f17dac054d2c923 pytablewriter-0.10.2.tar.gz -sha256 9a45c632ffd94878153cb989ada412b7291100005ce40baaf33a3d4bd51708cf pytablewriter-0.10.2.tar.gz +md5 0c45bc31cec49d462fcae16ac3a494d2 pytablewriter-0.14.1.tar.gz +sha256 7147f12b58ab6506488fc7cd5719dc73f4c03aafaecd5fe7d378297ea5758eaa pytablewriter-0.14.1.tar.gz diff --git a/package/python-pytablewriter/python-pytablewriter.mk b/package/python-pytablewriter/python-pytablewriter.mk index bf89d0a947..f86c51e8fd 100644 --- a/package/python-pytablewriter/python-pytablewriter.mk +++ b/package/python-pytablewriter/python-pytablewriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEWRITER_VERSION = 0.10.2 +PYTHON_PYTABLEWRITER_VERSION = 0.14.1 PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz -PYTHON_PYTABLEWRITER_SITE = https://pypi.python.org/packages/eb/4f/ca66fd21db4d9ef81f8bb2012dece42a1f5239295df149a04d955e492fc5 +PYTHON_PYTABLEWRITER_SITE = https://pypi.python.org/packages/cb/f7/5000d900ddc927300cc4d8492e06f87a79f830a463bea459b3e03ad6742b PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools PYTHON_PYTABLEWRITER_LICENSE = MIT PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE From 01aa66eb83a3df65e0369d6778249fba15bfdd38 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 16 Dec 2016 12:40:03 +0100 Subject: [PATCH 1895/3392] python-sh: new package Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-sh/Config.in | 7 +++++++ package/python-sh/python-sh.hash | 3 +++ package/python-sh/python-sh.mk | 14 ++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/python-sh/Config.in create mode 100644 package/python-sh/python-sh.hash create mode 100644 package/python-sh/python-sh.mk diff --git a/package/Config.in b/package/Config.in index 066759cf49..6fb1565c03 100644 --- a/package/Config.in +++ b/package/Config.in @@ -782,6 +782,7 @@ menu "External python modules" source "package/python-service-identity/Config.in" source "package/python-setproctitle/Config.in" source "package/python-setuptools/Config.in" + source "package/python-sh/Config.in" source "package/python-shutilwhich/Config.in" source "package/python-simpleaudio/Config.in" source "package/python-simplejson/Config.in" diff --git a/package/python-sh/Config.in b/package/python-sh/Config.in new file mode 100644 index 0000000000..b55ea4a311 --- /dev/null +++ b/package/python-sh/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_SH + bool "python-sh" + help + Python subprocess replacement that allows you to call any + program as if it were a function. + + https://github.com/amoffat/sh diff --git a/package/python-sh/python-sh.hash b/package/python-sh/python-sh.hash new file mode 100644 index 0000000000..0445fa62fd --- /dev/null +++ b/package/python-sh/python-sh.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/sh/json, sha256 locally computed +md5 89d46b1dba32713b7df74b1bc59d74a1 sh-1.12.7.tar.gz +sha256 5a07373657a1a704a34ea1bf73b2e55c42388c5d449634d6d7c96147f5660086 sh-1.12.7.tar.gz diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk new file mode 100644 index 0000000000..1aa6bb9b11 --- /dev/null +++ b/package/python-sh/python-sh.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-sh +# +################################################################################ + +PYTHON_SH_VERSION = 1.12.7 +PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz +PYTHON_SH_SITE = https://pypi.python.org/packages/c2/98/565d9b566b3153607336ae9e91c1c467896f7f786c2d5d8e50fef7d75b08 +PYTHON_SH_SETUP_TYPE = setuptools +PYTHON_SH_LICENSE = MIT +PYTHON_SH_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From c02278a426dff5076dcf420c4d699b31a88a30b0 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 16 Dec 2016 12:19:16 +0100 Subject: [PATCH 1896/3392] can-utils: bump version Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/can-utils/can-utils.hash | 2 +- package/can-utils/can-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/can-utils/can-utils.hash b/package/can-utils/can-utils.hash index 09e3c4d6c7..5e0bcccf58 100644 --- a/package/can-utils/can-utils.hash +++ b/package/can-utils/can-utils.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 8db112e69fceef16617895fa9d4222221fdf44c19eef64912480336c59904765 can-utils-b70a76670dbe8925c2a7c75f90d36a28a8878d7a.tar.gz +sha256 9899f8838d52459769b61ba3cb2d1e079a5d28fbef1a23859489753da91fce82 can-utils-64edc021d22441002028bc451548b9e7f1874b91.tar.gz diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk index e95cf229e8..46caf62a19 100644 --- a/package/can-utils/can-utils.mk +++ b/package/can-utils/can-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAN_UTILS_VERSION = b70a76670dbe8925c2a7c75f90d36a28a8878d7a +CAN_UTILS_VERSION = 64edc021d22441002028bc451548b9e7f1874b91 CAN_UTILS_SITE = $(call github,linux-can,can-utils,$(CAN_UTILS_VERSION)) CAN_UTILS_AUTORECONF = YES From 58444e8f8b480086dc1685c98e9731f5a98b2887 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 16 Dec 2016 16:54:29 +0100 Subject: [PATCH 1897/3392] python-incremental: new package Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-incremental/Config.in | 6 ++++++ package/python-incremental/python-incremental.hash | 3 +++ package/python-incremental/python-incremental.mk | 14 ++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 package/python-incremental/Config.in create mode 100644 package/python-incremental/python-incremental.hash create mode 100644 package/python-incremental/python-incremental.mk diff --git a/package/Config.in b/package/Config.in index 6fb1565c03..17a7e1a106 100644 --- a/package/Config.in +++ b/package/Config.in @@ -693,6 +693,7 @@ menu "External python modules" source "package/python-humanize/Config.in" source "package/python-id3/Config.in" source "package/python-idna/Config.in" + source "package/python-incremental/Config.in" source "package/python-iniparse/Config.in" source "package/python-iowait/Config.in" source "package/python-ipaddr/Config.in" diff --git a/package/python-incremental/Config.in b/package/python-incremental/Config.in new file mode 100644 index 0000000000..64f8623354 --- /dev/null +++ b/package/python-incremental/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_INCREMENTAL + bool "python-incremental" + help + A library for versioning your Python projects. + + https://github.com/hawkowl/incremental diff --git a/package/python-incremental/python-incremental.hash b/package/python-incremental/python-incremental.hash new file mode 100644 index 0000000000..580e76c7c2 --- /dev/null +++ b/package/python-incremental/python-incremental.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/incremental/json, sha256 locally computed +md5 3fe6b3b1da1d26a48187fb27e969f072 incremental-16.10.1.tar.gz +sha256 14ad6b720ec47aad6c9caa83e47db1843e2b9b98742da5dda08e16a99f400342 incremental-16.10.1.tar.gz diff --git a/package/python-incremental/python-incremental.mk b/package/python-incremental/python-incremental.mk new file mode 100644 index 0000000000..64eda68e85 --- /dev/null +++ b/package/python-incremental/python-incremental.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-incremental +# +################################################################################ + +PYTHON_INCREMENTAL_VERSION = 16.10.1 +PYTHON_INCREMENTAL_SOURCE = incremental-$(PYTHON_INCREMENTAL_VERSION).tar.gz +PYTHON_INCREMENTAL_SITE = https://pypi.python.org/packages/da/b0/32233c9e84b0d44b39015fba8fec03e88053723c1b455925081dc6ccd9e7 +PYTHON_INCREMENTAL_SETUP_TYPE = setuptools +PYTHON_INCREMENTAL_LICENSE = MIT +PYTHON_INCREMENTAL_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 4470dd9b1bdbb9b39e9fb13f27bcaa044719de6d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 15 Dec 2016 21:48:20 +0200 Subject: [PATCH 1898/3392] toolchain: extend musl workaround for recent kernels Kernels v4.7 and newer[1] require the __USE_MISC macro for libc-compat.h suppressions to be effective. musl does not define this macros, so add an unconditional definition of __USE_MISC to libc-compat.h. In addition, since musl define IFF_LOWER_UP and friends as macros (instead of enums), define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO to suppress the kernel corresponding definitions to avoid conflict. Fixes (xl2tp): http://autobuild.buildroot.net/results/0b9/0b9384c4beaac85f3a17c3245c8a7418c2e2e296/ http://autobuild.buildroot.net/results/657/657bc5687cf01aee38d32d45ba57fb62b2bd56d0/ http://autobuild.buildroot.net/results/bcd/bcd81618de2f745a19c923c66d787b5182bb54aa/ [1] Since commit f0a3fdca79 (uapi glibc compat: fix compilation when !__USE_MISC in glibc) Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- toolchain/toolchain/toolchain.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index d317e917d0..b16db01501 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -16,11 +16,20 @@ TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO # headers and kernel headers. This is a temporary measure until musl finds a # better solution. # +# Augment the original suggestion with __USE_MISC since recent kernels +# require this glibc internal macro. Also, as musl defines IFF_LOWER_UP, +# IFF_DORMANT and IFF_ECHO, add another macro to suppress them in the +# kernel header, and avoid macro/enum conflict. +# # [1] http://www.openwall.com/lists/musl/2015/10/08/2 ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) define TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK $(SED) 's/^#if defined(__GLIBC__)$$/#if 1/' \ $(STAGING_DIR)/usr/include/linux/libc-compat.h + $(SED) '1s/^/#define __USE_MISC\n/' \ + $(STAGING_DIR)/usr/include/linux/libc-compat.h + $(SED) '1s/^/#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0\n/' \ + $(STAGING_DIR)/usr/include/linux/libc-compat.h endef TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK TOOLCHAIN_INSTALL_STAGING = YES From 69ced963555b82f847d03ff3a832e4748ed0e721 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 16 Dec 2016 06:52:17 +0200 Subject: [PATCH 1899/3392] musl: workaround kernel if_ether.h header conflict Add a patch that defines _LINUX_IF_ETHER_H in netinet/if_ether.h to avoid the conflicting kernel if_ether.h. Other musl distros (Alpine, Sabotage, Gentoo) patch[1] the kernel headers instead. This is not practical in Buildroot, since we allow the user to choose the kernel version. This only fixes the normal case of including linux/if_ether.h (directly or indirectly) after netinet/if_ether.h. Fixes (tcpreplay): http://autobuild.buildroot.net/results/a65/a65b27f9e288f94f041ced64313dbf55af47bf36/ [1] https://cgit.gentoo.org/proj/musl.git/diff/sys-kernel/linux-headers/files/libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch?id=8eddda8072add075ebf56cf6d288bc1450d6b5f8 Cc: Rich Felker Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- .../musl/0002-avoid-kernel-if_ether.h.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/musl/0002-avoid-kernel-if_ether.h.patch diff --git a/package/musl/0002-avoid-kernel-if_ether.h.patch b/package/musl/0002-avoid-kernel-if_ether.h.patch new file mode 100644 index 0000000000..8efbcc8450 --- /dev/null +++ b/package/musl/0002-avoid-kernel-if_ether.h.patch @@ -0,0 +1,30 @@ +From 3984adc4976de7553f51e0cf4de1e18c373b332b Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 15 Dec 2016 15:10:19 +0200 +Subject: [PATCH] Avoid redefinition of struct ethhdr + +This is a workaround to the if_ether.h conflict between musl and the kernel. +Both define struct ethhdr. + +Signed-off-by: Baruch Siach +--- + include/netinet/if_ether.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h +index 11ee65823f93..cfe1949d3371 100644 +--- a/include/netinet/if_ether.h ++++ b/include/netinet/if_ether.h +@@ -1,6 +1,9 @@ + #ifndef _NETINET_IF_ETHER_H + #define _NETINET_IF_ETHER_H + ++/* Suppress kernel if_ether.h header inclusion */ ++#define _LINUX_IF_ETHER_H ++ + #include + #include + +-- +2.10.2 + From ddd108f39f1b369ad20d897f2340f7a50e5658b7 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Thu, 15 Dec 2016 23:35:09 +0100 Subject: [PATCH 1900/3392] rapidjson: bump to 1.1.0 Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- package/rapidjson/rapidjson.hash | 2 +- package/rapidjson/rapidjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rapidjson/rapidjson.hash b/package/rapidjson/rapidjson.hash index baaced9a41..bde8319cd8 100644 --- a/package/rapidjson/rapidjson.hash +++ b/package/rapidjson/rapidjson.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c3711ed2b3c76a5565ee9f0128bb4ec6753dbcc23450b713842df8f236d08666 rapidjson-v1.0.2.tar.gz +sha256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e rapidjson-v1.1.0.tar.gz diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk index 5da407b79f..d06f52962e 100644 --- a/package/rapidjson/rapidjson.mk +++ b/package/rapidjson/rapidjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAPIDJSON_VERSION = v1.0.2 +RAPIDJSON_VERSION = v1.1.0 RAPIDJSON_SITE = $(call github,miloyip,rapidjson,$(RAPIDJSON_VERSION)) RAPIDJSON_LICENSE = MIT RAPIDJSON_LICENSE_FILES = license.txt From 93f31b20da05a9d7a99c47a8a3dfe1a6f4ffe203 Mon Sep 17 00:00:00 2001 From: Christian Kellermann Date: Mon, 12 Dec 2016 12:27:37 +0100 Subject: [PATCH 1901/3392] linux: check that a repo and version is defined when using a custom repo If not set the system will use an empty string which will result in download errors for 'linux-.tar.gz' packages. This patch makes it obvious to the user that the variable needs to be set. Signed-off-by: Christian Kellermann Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index e75dcaa60d..7f4432e7b1 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -428,6 +428,17 @@ LINUX_PRE_PATCH_HOOKS += $(foreach ext,$(LINUX_EXTENSIONS),\ $(call UPPERCASE,$(ext))_PREPARE_KERNEL)) # Checks to give errors that the user can understand + +# When a custom repository has been set, check for the repository version +ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN)$(BR2_LINUX_KERNEL_CUSTOM_GIT)$(BR2_LINUX_KERNEL_CUSTOM_HG),y) +ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION)),) +$(error No custom repository version set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION setting) +endif +ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)),) +$(error No custom repo URL set. Check your BR2_LINUX_KERNEL_CUSTOM_REPO_URL setting) +endif +endif + ifeq ($(BR_BUILDING),y) ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y) From 57b628a932b9b4a3c4bf80f4c82a81da5adcb173 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 17 Dec 2016 15:56:21 +0100 Subject: [PATCH 1902/3392] Revert "package/aespipe: fix host compile" This reverts commit cb33a7d6bd89306635749b497cd004e986bcd7e5, as it causes build failures on platforms where gcc does not understand the "-no-pie" option. Fixes: http://autobuild.buildroot.net/results/51be9526300b3d03e2e304dec9cae953f2f59de4/ Signed-off-by: Thomas Petazzoni --- package/aespipe/aespipe.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/aespipe/aespipe.mk b/package/aespipe/aespipe.mk index 8c7cd21850..6a38556ef1 100644 --- a/package/aespipe/aespipe.mk +++ b/package/aespipe/aespipe.mk @@ -9,12 +9,5 @@ AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2 AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe AESPIPE_LICENSE = GPL -# Debian enables -fPIE by default, breaking the build: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837393 -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835148 -HOST_AESPIPE_CONF_ENV = \ - CFLAGS="$(HOST_CFLAGS) -no-pie" \ - LDFLAGS="$(HOST_LDFLAGS) -no-pie" - $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 06a3e83b9a28d35ac6172854bebf20edb958da09 Mon Sep 17 00:00:00 2001 From: Tal Shorer Date: Sun, 11 Dec 2016 20:12:45 +0200 Subject: [PATCH 1903/3392] pkg-generic: run $(PKG)_PRE_RSYNC_HOOKS before checking for the existence of $(SRCDIR) This will allow packages to define their pre-rsync hooks which will be guaranteed to run even if the source is missing. Signed-off-by: Tal Shorer Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 827de627e8..3ca71b03b9 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -161,8 +161,8 @@ $(BUILD_DIR)/%/.stamp_extracted: # used. $(BUILD_DIR)/%/.stamp_rsynced: @$(call MESSAGE,"Syncing from source dir $(SRCDIR)") - @test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1) $(foreach hook,$($(PKG)_PRE_RSYNC_HOOKS),$(call $(hook))$(sep)) + @test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1) rsync -au --chmod=u=rwX,go=rX $(RSYNC_VCS_EXCLUSIONS) $(call qstrip,$(SRCDIR))/ $(@D) $(foreach hook,$($(PKG)_POST_RSYNC_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ From ecd5e7ca72bde586caa4bee4b18807454c81b44d Mon Sep 17 00:00:00 2001 From: Jordan Yelloz Date: Mon, 12 Dec 2016 10:13:54 -0800 Subject: [PATCH 1904/3392] lvm2: ensured TARGET_AR is used during build The same way TARGET_CC was not being used during the build, TARGET_AR was not used either. Now TARGET_CONFIGURE_OPTS is injected into LVM2_MAKE_ENV which should include all the toolchain substitutions. Signed-off-by: Jordan Yelloz Signed-off-by: Thomas Petazzoni --- package/lvm2/lvm2.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index ae9581caae..a2d484bc25 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -20,8 +20,8 @@ LVM2_CONF_OPTS += \ --enable-dmeventd # LVM2 uses autoconf, but not automake, and the build system does not -# take into account the CC passed at configure time. -LVM2_MAKE_ENV = CC="$(TARGET_CC)" +# take into account the toolchain passed at configure time. +LVM2_MAKE_ENV = $(TARGET_CONFIGURE_OPTS) ifeq ($(BR2_PACKAGE_READLINE),y) LVM2_DEPENDENCIES += readline From a069c16526316e01e786958c13f66a74555c6e5e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 27 Nov 2016 17:16:38 +0100 Subject: [PATCH 1905/3392] package/linux-syscall-support: new package This package provide a header file which will be used by Google-breakpad package. This avoid using depot-tools script to fetch all third parties used by Google-breakpad. Use the version corresponding to the Google-breakpad svn revision 1373: http://linux-syscall-support.googlecode.com/svn/trunk/lss@24 829466d3-f3f5-3ae4-62ad-de35cf9bba21 Signed-off-by: Romain Naour Cc: Pascal Huerst Cc: Frank Hunleth [Thomas: directly implement installation in the install commands, rather than using post-install hooks.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/linux-syscall-support/Config.in | 8 +++++ .../linux-syscall-support.hash | 2 ++ .../linux-syscall-support.mk | 29 +++++++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 package/linux-syscall-support/Config.in create mode 100644 package/linux-syscall-support/linux-syscall-support.hash create mode 100644 package/linux-syscall-support/linux-syscall-support.mk diff --git a/package/Config.in b/package/Config.in index 17a7e1a106..be0d1506f2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1425,6 +1425,7 @@ menu "Miscellaneous" source "package/gr-osmosdr/Config.in" source "package/gsettings-desktop-schemas/Config.in" source "package/haveged/Config.in" + source "package/linux-syscall-support/Config.in" source "package/mcrypt/Config.in" source "package/mobile-broadband-provider-info/Config.in" source "package/qemu/Config.in" diff --git a/package/linux-syscall-support/Config.in b/package/linux-syscall-support/Config.in new file mode 100644 index 0000000000..323dfbd35d --- /dev/null +++ b/package/linux-syscall-support/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LINUX_SYSCALL_SUPPORT + bool "linux-syscall-support (lss)" + help + This project provides a header file that can be included into + your application whenever you need to make direct system + calls. + + https://chromium.googlesource.com/linux-syscall-support/ diff --git a/package/linux-syscall-support/linux-syscall-support.hash b/package/linux-syscall-support/linux-syscall-support.hash new file mode 100644 index 0000000000..e800e8a3cb --- /dev/null +++ b/package/linux-syscall-support/linux-syscall-support.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 3ac36d3f3cef7a3a111ea61b04b470282ec15ccc27d03a117e13ac0ab9973ba8 linux-syscall-support-e6c7682c40c27527894fbb8bcba38f77edbbb6b7.tar.gz diff --git a/package/linux-syscall-support/linux-syscall-support.mk b/package/linux-syscall-support/linux-syscall-support.mk new file mode 100644 index 0000000000..6ff4508bc4 --- /dev/null +++ b/package/linux-syscall-support/linux-syscall-support.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# linux-syscall-support +# +################################################################################ + +# Use the same version that the one used by Google-breakpad 1373 +LINUX_SYSCALL_SUPPORT_VERSION = e6c7682c40c27527894fbb8bcba38f77edbbb6b7 +LINUX_SYSCALL_SUPPORT_SITE = https://chromium.googlesource.com/linux-syscall-support +LINUX_SYSCALL_SUPPORT_SITE_METHOD = git +LINUX_SYSCALL_SUPPORT_LICENSE = BSD-3c +LINUX_SYSCALL_SUPPORT_LICENSE_FILES = linux_syscall_support.h + +# Provide only one header file. +LINUX_SYSCALL_SUPPORT_INSTALL_TARGET = NO +LINUX_SYSCALL_SUPPORT_INSTALL_STAGING = YES + +define LINUX_SYSCALL_SUPPORT_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0644 $(@D)/linux_syscall_support.h \ + $(STAGING_DIR)/usr/include/linux_syscall_support.h +endef + +define HOST_LINUX_SYSCALL_SUPPORT_INSTALL_CMDS + $(INSTALL) -D -m 0644 $(@D)/linux_syscall_support.h \ + $(HOST_DIR)/usr/include/linux_syscall_support.h +endef + +$(eval $(host-generic-package)) +$(eval $(generic-package)) From 783c132084a85d97488e0ab40943c56cb44c1451 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 17 Dec 2016 16:13:38 +0100 Subject: [PATCH 1906/3392] DEVELOPERS: add Romain Naour for linux-syscall-support Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1b8955c02a..49fb352e01 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1267,6 +1267,7 @@ F: package/enlightenment/ F: package/expedite/ F: package/iqvlinux/ F: package/liblinear/ +F: package/linux-syscall-support/ F: package/mcelog/ F: package/openpowerlink/ F: package/stress-ng/ From c4c4f43d490ef77a2df7db472c551837e8818ac5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 27 Nov 2016 17:16:39 +0100 Subject: [PATCH 1907/3392] package/google-breakpad: switch to the new git repository Google-breakpad moved to a new git repository last year and the old svn repository has been deleted. So, the Buildroot archive mirror is used. svn: E160013: Unable to connect to a repository at URL 'http://google-breakpad.googlecode.com/svn/trunk' svn: E160013: '/svn/trunk' path not found --2016-11-27 10:42:34-- http://sources.buildroot.net/google-breakpad-1373.tar.gz Swith to the git repository using the git hash corresponding to the 1373 svn revision. But there is an issue with the third parties... Some of them are not bundled with Google-breakpad or as git submodule. Even worst, the google-breakpad source code use #include "third_party/lss" directly, so we can't provide missing third parties with an external package. That's why the linux-syscall-support package was added to Buildroot, it provide the missing linux_syscall_support.h file which is must be copied to src/third_party/lss/ in the Google-breakpad sources. Signed-off-by: Romain Naour Cc: Pascal Huerst Cc: Frank Hunleth Signed-off-by: Thomas Petazzoni --- package/google-breakpad/Config.in | 3 ++- package/google-breakpad/google-breakpad.hash | 2 ++ package/google-breakpad/google-breakpad.mk | 25 ++++++++++++++++---- 3 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 package/google-breakpad/google-breakpad.hash diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index c800974dbc..5c3f2e8a68 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_TOOLCHAIN_HAS_THREADS depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + select BR2_PACKAGE_LINUX_SYSCALL_SUPPORT help Google-Breakpad is a library and tool suite that allows you to distribute an application to users with compiler-provided @@ -29,7 +30,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD needed to extract the debugging symbols from target binaries. - http://code.google.com/p/google-breakpad/ + https://chromium.googlesource.com/breakpad/breakpad comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++ enabled" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS diff --git a/package/google-breakpad/google-breakpad.hash b/package/google-breakpad/google-breakpad.hash new file mode 100644 index 0000000000..b66f43dd95 --- /dev/null +++ b/package/google-breakpad/google-breakpad.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 25466aac60b83b231ce03d1540b1f8528c02ddaa76b08aed779084b145f07516 google-breakpad-7883a8308274cc37847e4ff3b995a327588fe034.tar.gz diff --git a/package/google-breakpad/google-breakpad.mk b/package/google-breakpad/google-breakpad.mk index 7a88c76500..0805c25e3e 100644 --- a/package/google-breakpad/google-breakpad.mk +++ b/package/google-breakpad/google-breakpad.mk @@ -4,16 +4,33 @@ # ################################################################################ -GOOGLE_BREAKPAD_VERSION = 1373 -GOOGLE_BREAKPAD_SITE = http://google-breakpad.googlecode.com/svn/trunk -GOOGLE_BREAKPAD_SITE_METHOD = svn +GOOGLE_BREAKPAD_VERSION = 7883a8308274cc37847e4ff3b995a327588fe034 +GOOGLE_BREAKPAD_SITE = https://chromium.googlesource.com/breakpad/breakpad +GOOGLE_BREAKPAD_SITE_METHOD = git GOOGLE_BREAKPAD_CONF_OPTS = --disable-processor --disable-tools # Only a static library is installed GOOGLE_BREAKPAD_INSTALL_TARGET = NO GOOGLE_BREAKPAD_INSTALL_STAGING = YES GOOGLE_BREAKPAD_LICENSE = BSD-3c GOOGLE_BREAKPAD_LICENSE_FILES = LICENSE -GOOGLE_BREAKPAD_DEPENDENCIES = host-google-breakpad +GOOGLE_BREAKPAD_DEPENDENCIES = host-google-breakpad linux-syscall-support + +HOST_GOOGLE_BREAKPAD_DEPENDENCIES = host-linux-syscall-support + +# Avoid using depot-tools to download this file. +define HOST_GOOGLE_BREAKPAD_LSS + $(INSTALL) -D -m 0644 \ + $(HOST_DIR)/usr/include/linux_syscall_support.h \ + $(@D)/src/third_party/lss/linux_syscall_support.h +endef +HOST_GOOGLE_BREAKPAD_POST_EXTRACT_HOOKS += HOST_GOOGLE_BREAKPAD_LSS + +define GOOGLE_BREAKPAD_LSS + $(INSTALL) -D -m 0644 \ + $(STAGING_DIR)/usr/include/linux_syscall_support.h \ + $(@D)/src/third_party/lss/linux_syscall_support.h +endef +GOOGLE_BREAKPAD_POST_EXTRACT_HOOKS += GOOGLE_BREAKPAD_LSS define GOOGLE_BREAKPAD_EXTRACT_SYMBOLS $(EXTRA_ENV) package/google-breakpad/gen-syms.sh $(STAGING_DIR) \ From 30128ef4d017add8e8300df43a983001a67455d8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 27 Nov 2016 17:16:40 +0100 Subject: [PATCH 1908/3392] package/google-breakpad: bump to the latest version This version add the C++11 support and microdump. Add the C++11 dependency since it's now mendatory. Use the same linux-syscall-support version as the one defined by DEPS file in the Google-breakpad sources. Signed-off-by: Romain Naour Cc: Pascal Huerst Cc: Frank Hunleth [Thomas: propagate the C++11 related dependency to BR2_GOOGLE_BREAKPAD_ENABLE.] Signed-off-by: Thomas Petazzoni --- Config.in | 1 + package/google-breakpad/Config.in | 6 ++++-- package/google-breakpad/google-breakpad.hash | 2 +- package/google-breakpad/google-breakpad.mk | 2 +- package/linux-syscall-support/linux-syscall-support.hash | 2 +- package/linux-syscall-support/linux-syscall-support.mk | 4 ++-- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Config.in b/Config.in index 495b71ce03..7ea1e60692 100644 --- a/Config.in +++ b/Config.in @@ -529,6 +529,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE bool "Enable google-breakpad support" select BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 5c3f2e8a68..31ca422024 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS config BR2_PACKAGE_GOOGLE_BREAKPAD bool "google-breakpad" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) @@ -32,8 +33,9 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD https://chromium.googlesource.com/breakpad/breakpad -comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++ enabled" +comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.7" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/google-breakpad/google-breakpad.hash b/package/google-breakpad/google-breakpad.hash index b66f43dd95..79e8d08b28 100644 --- a/package/google-breakpad/google-breakpad.hash +++ b/package/google-breakpad/google-breakpad.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 25466aac60b83b231ce03d1540b1f8528c02ddaa76b08aed779084b145f07516 google-breakpad-7883a8308274cc37847e4ff3b995a327588fe034.tar.gz +sha256 6f444233e88957c30cc2d5497ee9d72d104122ce2c25a7ef7f6be3af1b3f7353 google-breakpad-7515ab13768c7edc09f0f2ec2354dc6c928239a6.tar.gz diff --git a/package/google-breakpad/google-breakpad.mk b/package/google-breakpad/google-breakpad.mk index 0805c25e3e..7a11c72cf5 100644 --- a/package/google-breakpad/google-breakpad.mk +++ b/package/google-breakpad/google-breakpad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOOGLE_BREAKPAD_VERSION = 7883a8308274cc37847e4ff3b995a327588fe034 +GOOGLE_BREAKPAD_VERSION = 7515ab13768c7edc09f0f2ec2354dc6c928239a6 GOOGLE_BREAKPAD_SITE = https://chromium.googlesource.com/breakpad/breakpad GOOGLE_BREAKPAD_SITE_METHOD = git GOOGLE_BREAKPAD_CONF_OPTS = --disable-processor --disable-tools diff --git a/package/linux-syscall-support/linux-syscall-support.hash b/package/linux-syscall-support/linux-syscall-support.hash index e800e8a3cb..30925522ff 100644 --- a/package/linux-syscall-support/linux-syscall-support.hash +++ b/package/linux-syscall-support/linux-syscall-support.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3ac36d3f3cef7a3a111ea61b04b470282ec15ccc27d03a117e13ac0ab9973ba8 linux-syscall-support-e6c7682c40c27527894fbb8bcba38f77edbbb6b7.tar.gz +sha256 e5088b81011e30b567b6bde6bb7c22ad529c4ee8890cc5e93d58b21f2c4df56a linux-syscall-support-3f6478ac95edf86cd3da300c2c0d34a438f5dbeb.tar.gz diff --git a/package/linux-syscall-support/linux-syscall-support.mk b/package/linux-syscall-support/linux-syscall-support.mk index 6ff4508bc4..6833a62f13 100644 --- a/package/linux-syscall-support/linux-syscall-support.mk +++ b/package/linux-syscall-support/linux-syscall-support.mk @@ -4,8 +4,8 @@ # ################################################################################ -# Use the same version that the one used by Google-breakpad 1373 -LINUX_SYSCALL_SUPPORT_VERSION = e6c7682c40c27527894fbb8bcba38f77edbbb6b7 +# Use the same version that the one used by Google-breakpad (see DEPS file) +LINUX_SYSCALL_SUPPORT_VERSION = 3f6478ac95edf86cd3da300c2c0d34a438f5dbeb LINUX_SYSCALL_SUPPORT_SITE = https://chromium.googlesource.com/linux-syscall-support LINUX_SYSCALL_SUPPORT_SITE_METHOD = git LINUX_SYSCALL_SUPPORT_LICENSE = BSD-3c From c01efc5ab92f1c5652f4876c09b169db3a741455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Mon, 14 Nov 2016 14:22:38 +0100 Subject: [PATCH 1909/3392] xserver_xorg-server: fix dependency with dbus MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If dbus and udev are enabled. Xorg link with both: $ arm-linux-readelf -d usr/bin/X | grep NEEDED 0x00000001 (NEEDED) Shared library: [libdbus-1.so.3] 0x00000001 (NEEDED) Shared library: [libpthread.so.0] 0x00000001 (NEEDED) Shared library: [libudev.so.1] [...] Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 30fb05bedb..6519af3d73 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -168,12 +168,12 @@ XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms else XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms endif -else +endif + ifeq ($(BR2_PACKAGE_DBUS),y) XSERVER_XORG_SERVER_DEPENDENCIES += dbus XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-dbus endif -endif ifeq ($(BR2_PACKAGE_FREETYPE),y) XSERVER_XORG_SERVER_DEPENDENCIES += freetype From be2adc1ab28a9b255068c3786b63406b482ed286 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 17 Dec 2016 22:20:47 +0100 Subject: [PATCH 1910/3392] lxc: bump to version 2.0.6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-configure-add-disable-werror.patch | 49 ------------------- package/lxc/lxc.hash | 2 +- package/lxc/lxc.mk | 4 +- 3 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 package/lxc/0001-configure-add-disable-werror.patch diff --git a/package/lxc/0001-configure-add-disable-werror.patch b/package/lxc/0001-configure-add-disable-werror.patch deleted file mode 100644 index 7bd9729703..0000000000 --- a/package/lxc/0001-configure-add-disable-werror.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e9f34eb4e25fc18411121c4e55557530ddc1f49c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= -Date: Sun, 4 Sep 2016 09:35:44 +0200 -Subject: [PATCH] configure: add --disable-werror -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - --Werror may break builds on some scenarios with trivialities -(especially during developments). - -Upstream status: accepted (https://github.com/lxc/lxc/pull/1168) - -Signed-off-by: Jérôme Pouiller ---- - configure.ac | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 39e313a..0103579 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -152,6 +152,11 @@ if test "x$with_systemdsystemunitdir" != "xno"; then - AC_SUBST([SYSTEMD_UNIT_DIR], [$with_systemdsystemunitdir]) - fi - -+AC_ARG_ENABLE([werror], -+ [AC_HELP_STRING([--disable-werror], -+ [do not treat warnings as errors])], -+ [], [enable_werror=yes]) -+ - # Allow enabling deprecated executables - AC_ARG_ENABLE([deprecated], - [AC_HELP_STRING([--enable-deprecated], -@@ -630,7 +635,10 @@ AC_PROG_SED - LXC_CHECK_TLS - - if test "x$GCC" = "xyes"; then -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall" -+ if test "x$enable_werror" = "xyes"; then -+ CFLAGS="$CFLAGS -Werror" -+ fi - fi - - # Files requiring some variable expansion --- -2.8.1 - diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 3dee7fc6c9..7b34e88339 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 82df40a0cdd44639ee677d560be95348de48afa93a10a20e959dadb4431ee8d6 lxc-2.0.3.tar.gz +sha256 7c292cd0055dac1a0e6fbb6a7740fd12b6ffb204603c198faf37c11c9d6dcd7a lxc-2.0.6.tar.gz diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 9e21fc0234..589930f1a1 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,13 +4,11 @@ # ################################################################################ -LXC_VERSION = 2.0.3 +LXC_VERSION = 2.0.6 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = LGPLv2.1+ LXC_LICENSE_FILES = COPYING LXC_DEPENDENCIES = libcap host-pkgconf -# we're patching configure.ac -LXC_AUTORECONF = YES LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ --disable-lua --disable-python --disable-werror \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) From c383856268b2088d476932f11cfcacab3b085d58 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Dec 2016 12:04:52 +0100 Subject: [PATCH 1911/3392] lxc: enable lua if package is selected lua and python bindings were removed with the same patch: https://patchwork.ozlabs.org/patch/367361. There is a real issue with python but not with lua so enable it if lua is selected Signed-off-by: Fabrice Fontaine [Thomas: simplify value passed to --with-lua-pc.] Signed-off-by: Thomas Petazzoni --- package/lxc/lxc.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 589930f1a1..e9e925f440 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -10,7 +10,7 @@ LXC_LICENSE = LGPLv2.1+ LXC_LICENSE_FILES = COPYING LXC_DEPENDENCIES = libcap host-pkgconf LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ - --disable-lua --disable-python --disable-werror \ + --disable-python --disable-werror \ $(if $(BR2_PACKAGE_BASH),,--disable-bash) ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) @@ -20,4 +20,15 @@ else LXC_CONF_OPTS += --disable-seccomp endif +ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y) +LXC_CONF_OPTS += --enable-lua +LXC_DEPENDENCIES += luainterpreter +ifeq ($(BR2_PACKAGE_LUAJIT),y) +# By default, lxc will only search for lua.pc +LXC_CONF_OPTS += --with-lua-pc=luajit +endif +else +LXC_CONF_OPTS += --disable-lua +endif + $(eval $(autotools-package)) From af198a2830f73e6b0c549b911568204731a93cd0 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Sun, 18 Dec 2016 13:00:26 +0100 Subject: [PATCH 1912/3392] DEVELOPERS: add Yegor Yefremov for the can-utils package Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 49fb352e01..4f142963e0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1634,6 +1634,7 @@ F: package/bluez_utils/ F: package/boost/ F: package/bootstrap/ F: package/cannelloni/ +F: package/can-utils/ F: package/circus/ F: package/feh/ F: package/giblib/ From 613f650d3411bb6ab34db62496c06999ce21cc48 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 18 Dec 2016 09:32:18 -0300 Subject: [PATCH 1913/3392] linux-headers: bump 3.12.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index c7a6a61bb7..a95b41d0a6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -234,7 +234,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.84" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.104" if BR2_KERNEL_HEADERS_3_10 - default "3.12.68" if BR2_KERNEL_HEADERS_3_12 + default "3.12.69" if BR2_KERNEL_HEADERS_3_12 default "3.14.79" if BR2_KERNEL_HEADERS_3_14 default "3.18.45" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 From c9a112705fcd9ae915f6ea7fdf6d215950603f36 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2016 13:39:41 +0100 Subject: [PATCH 1914/3392] package/x11r7/xapp_sessreg: fix musl build Fixes http://autobuild.buildroot.net/results/717/717bd4a2ee4ba62ed9245ec22166a3c63ce1a56d/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0002-missing_path_wtmpx.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 package/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch diff --git a/package/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch b/package/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch new file mode 100644 index 0000000000..0be242c0b2 --- /dev/null +++ b/package/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch @@ -0,0 +1,24 @@ +Fix missing defines _PATH_WTMPX/_PATH_UTMPX in musl + +Downloaded from +https://cgit.gentoo.org/proj/musl.git/tree/x11-apps/sessreg/files/sessreg-1.1.0-missing_path_wtmpx.patch + +Signed-off-by: Bernd Kuhls + +diff -Naur sessreg-1.1.0.orig/sessreg.h sessreg-1.1.0/sessreg.h +--- sessreg-1.1.0.orig/sessreg.h 2015-01-20 05:00:27.000000000 +0000 ++++ sessreg-1.1.0/sessreg.h 2016-02-23 11:54:42.057000000 +0000 +@@ -103,6 +103,13 @@ + # define TTYS_FILE "/etc/ttys" + #endif + ++#ifndef _PATH_WTMPX ++# define _PATH_WTMPX "/var/log/wtmp" ++#endif ++#ifndef _PATH_UTMPX ++# define _PATH_UTMPX "/var/log/utmp" ++#endif ++ + #ifndef WTMPX_FILE + # define WTMPX_FILE _PATH_WTMPX + #endif From 0a79331f7da443ca725a65fcbe4a6b779904dbbc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2016 14:04:17 +0100 Subject: [PATCH 1915/3392] package/x11r7/xdriver_xf86-input-libinput: bump version to 0.23.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../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 6edc391146..abc066427f 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 https://lists.x.org/archives/xorg-announce/2016-October/002732.html -sha256 c762b4072ed448e2ae9f35cebd7fec8df7fd42b3ae61462cc3b2f720a873eae2 xf86-input-libinput-0.22.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-December/002749.html +sha256 0b53ebdfe8f8fc7554dd92af1b1c3088a6d3ec4ae1a33fc76f57d635c736a9dc xf86-input-libinput-0.23.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 517e5d27ef..696a8575c4 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.22.0 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.23.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 3574df46b8c6f7f1e7aec6f2b9608d0e5a268f7e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2016 14:04:18 +0100 Subject: [PATCH 1916/3392] package/x11r7/xdriver_xf86-video-dummy: bump version to 0.3.8 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash | 4 ++-- .../xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash index 31cba2cb45..f26ddd4b5f 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002318.html -sha256 56f84fcbc515685529ad8e10bca1072731d9c096b97c5d35ddc95cd589b98680 xf86-video-dummy-0.3.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-December/002751.html +sha256 3712bb869307233491e4c570732d6073c0dc3d99adfdb9977396a3fdf84e95b9 xf86-video-dummy-0.3.8.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk index 58d9925f3e..fff1495ef5 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.7 +XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.8 XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_DUMMY_LICENSE = MIT From 67e0424f18aac5bb26db35563487d7cab46fde23 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2016 14:04:19 +0100 Subject: [PATCH 1917/3392] package/x11r7/xdriver_xf86-video-geode: bump version to 2.11.19 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash | 4 ++-- .../xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash index b05983fd0c..8c567cbb3d 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2016-February/002673.html -sha256 d6ece9a862a68be3cdf86a87e0e1ba5e199168b8d075129646638f53649ba9e8 xf86-video-geode-2.11.18.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-December/002750.html +sha256 c6694c21ee3d9560f6e925925ef1d3818b1988e899b6a0592dbae597c87ac97e xf86-video-geode-2.11.19.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk index b882f1f857..9138abdbee 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.18 +XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.19 XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT From e9f66e194a43e9dac4a8c88bcb5b3253845cd805 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2016 14:04:20 +0100 Subject: [PATCH 1918/3392] package/x11r7/xlib_libXpm: bump version to 3.5.12 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 4 ++-- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 22c9fc62fa..d94a902682 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,2 +1,2 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-September/056010.html -sha256 c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c libXpm-3.5.11.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-December/002752.html +sha256 fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec libXpm-3.5.12.tar.bz2 diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 997ef958e9..c8c5496514 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.11 +XLIB_LIBXPM_VERSION = 3.5.12 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXPM_LICENSE = MIT From cd4af31dd86c475482770f9ce9ccb583485c6449 Mon Sep 17 00:00:00 2001 From: Fabien Parent Date: Tue, 29 Nov 2016 15:36:58 +0100 Subject: [PATCH 1919/3392] xorg-server: add dependency on dri2proto when systemd is built When systemd is selected, xorg-server must have config-udev-kms enabled in order to build correctly, but it won't be the case if BR2_PACKAGE_XPROTO_DRI2PROTO is not part of the build. Add BR2_PACKAGE_XPROTO_DRI2PROTO as a dependency of xorg-xserver only when systemd is part of the build. Fixes bug #9486. Signed-off-by: Fabien Parent Tested-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xserver_xorg-server/Config.in | 1 + package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 1d4a1fb5ee..b7f2b3eb4a 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -47,6 +47,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XUTIL_UTIL_MACROS select BR2_PACKAGE_XKEYBOARD_CONFIG + select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_SYSTEMD help X.Org X server diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 6519af3d73..6444a206bc 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -72,7 +72,9 @@ ifeq ($(BR2_PACKAGE_SYSTEMD),y) XSERVER_XORG_SERVER_CONF_OPTS += \ --with-systemd-daemon \ --enable-systemd-logind -XSERVER_XORG_SERVER_DEPENDENCIES += systemd +XSERVER_XORG_SERVER_DEPENDENCIES += \ + systemd \ + xproto_dri2proto else XSERVER_XORG_SERVER_CONF_OPTS += \ --without-systemd-daemon \ From e1bf130ca8a52ea4d1ee39fa06abba6fa970b889 Mon Sep 17 00:00:00 2001 From: Dagg Stompler Date: Tue, 25 Oct 2016 20:54:17 +0300 Subject: [PATCH 1920/3392] odroid-mali: add support for x11 egl implementation Allow installation of the x11 egl support required for the X11 ddx driver. The BR2_PACKAGE_ODROID_MALI_X11 hidden option will be selected by the X11 DDX driver. Signed-off-by: Dagg Stompler [Thomas: - select BR2_PACKAGE_LIBDRM, BR2_PACKAGE_XLIB_{LIBX11,LIBXFIXES,LIBXEXT,LIBXDAMAGE} from BR2_PACKAGE_ODROID_MALI_X11 in order to avoid numerous "if" in Config.in - Use a single assignment to ODROID_MALI_DEPENDENCIES to add the dependencies for libdrm and the X11 libraries. - Introduce ODROID_MALI_HEADERS_SUBDIR and ODROID_MALI_LIBS_SUBDIR to clarify the location of the headers and libraries for the selected architecture/display backend in the Mali tree.] Signed-off-by: Thomas Petazzoni --- package/odroid-mali/Config.in | 9 +++++++++ package/odroid-mali/odroid-mali.mk | 19 +++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/package/odroid-mali/Config.in b/package/odroid-mali/Config.in index 2cd8e0d3e6..e5c07f2378 100644 --- a/package/odroid-mali/Config.in +++ b/package/odroid-mali/Config.in @@ -20,6 +20,15 @@ config BR2_PACKAGE_PROVIDES_LIBGLES endif +config BR2_PACKAGE_ODROID_MALI_X11 + bool + depends on BR2_aarch64 # No 32 bit version available + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXDAMAGE + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXFIXES + comment "odroid-mali needs a glibc toolchain" depends on BR2_aarch64 || BR2_ARM_EABIHF depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/odroid-mali/odroid-mali.mk b/package/odroid-mali/odroid-mali.mk index 7b8e5110df..142fd97c67 100644 --- a/package/odroid-mali/odroid-mali.mk +++ b/package/odroid-mali/odroid-mali.mk @@ -12,21 +12,32 @@ ODROID_MALI_LICENSE_FILES = README.md ODROID_MALI_INSTALL_STAGING = YES ODROID_MALI_PROVIDES = libegl libgles +ifeq ($(BR2_PACKAGE_ODROID_MALI_X11),y) +ODROID_MALI_HEADERS_SUBDIR = x11/mali_headers/ +ODROID_MALI_LIBS_SUBDIR = x11/mali_libs/ +# The X11 blobs are linked against those libraries, and the headers +# include headers from those libraries +ODROID_MALI_DEPENDENCIES += \ + libdrm xlib_libX11 xlib_libXdamage \ + xlib_libXext xlib_libXfixes +else +ODROID_MALI_HEADERS_SUBDIR = fbdev/mali_headers/ ifeq ($(BR2_aarch64),y) -ODROID_MALI_INSTALL_ARCH = mali_libs +ODROID_MALI_LIBS_SUBDIR = fbdev/mali_libs/ else -ODROID_MALI_INSTALL_ARCH = 32bit_libs +ODROID_MALI_LIBS_SUBDIR = fbdev/32bit_libs/ +endif endif define ODROID_MALI_INSTALL_LIBS - cp -dpfr $(@D)/fbdev/$(ODROID_MALI_INSTALL_ARCH)/lib* $(1)/usr/lib/ + cp -dpfr $(@D)/$(ODROID_MALI_LIBS_SUBDIR)/lib* $(1)/usr/lib/ endef define ODROID_MALI_INSTALL_STAGING_CMDS $(call ODROID_MALI_INSTALL_LIBS,$(STAGING_DIR)) mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig cp -dpfr $(@D)/pkgconfig/*.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - cp -dpfr $(@D)/fbdev/mali_headers/* $(STAGING_DIR)/usr/include + cp -dpfr $(@D)/$(ODROID_MALI_HEADERS_SUBDIR)/* $(STAGING_DIR)/usr/include endef define ODROID_MALI_INSTALL_TARGET_CMDS From cec7adea4f02425943e3544ddd67c685875189c2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Dec 2016 15:26:59 +0100 Subject: [PATCH 1921/3392] oprofile: needs libpfm4 on powerpc64(le) oprofile already needed libpfm4 for PowerPC, but in fact it also needs it for PowerPC64 and PowerPC64le, so this commit adds a BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 hidden option and uses it to decide if libpfm4 is needed or not. Fixes: http://autobuild.buildroot.net/results/d19caeb445b7040cbd2e4ff62b7db9986e84b6ab/ (powerpc64le) http://autobuild.buildroot.net/results/66dd4f7ff635915a506f96d1d8115ac48cca0c6c/ (powerpc64) Signed-off-by: Thomas Petazzoni --- package/oprofile/Config.in | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in index c75ccd90f4..e2adde5802 100644 --- a/package/oprofile/Config.in +++ b/package/oprofile/Config.in @@ -8,17 +8,21 @@ config BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ BR2_sparc || BR2_sparc64 || BR2_x86_64 +config BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 + bool + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + config BR2_PACKAGE_OPROFILE bool "oprofile" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_POPT select BR2_PACKAGE_BINUTILS - select BR2_PACKAGE_LIBPFM4 if BR2_powerpc + select BR2_PACKAGE_LIBPFM4 if BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # binutils depends on BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS # libpfm4 is needed on PowerPC, and requires thread support - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_powerpc + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 help OProfile is a system-wide profiler for Linux systems, capable of profiling all running code at low overhead. @@ -40,6 +44,6 @@ comment "oprofile needs a toolchain w/ C++, wchar" depends on BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR -comment "oprofile needs a toolchain w/ NPTL on PPC" - depends on BR2_USE_MMU && BR2_powerpc +comment "oprofile needs a toolchain w/ NPTL on PowerPC(64)" + depends on BR2_USE_MMU && BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL From 5f51f053930bdd693e63b30b8c9a81dbe85a79eb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Dec 2016 15:39:47 +0100 Subject: [PATCH 1922/3392] xfsprogs: turn patches into proper Git patches The first patch was Git formatted, but additional information at the top made it unapplicable by Git, fix this. The second patch was not Git formatted at all. Since upstream uses Git, it makes sense to have Git formatted patches. Signed-off-by: Thomas Petazzoni --- ...-do-dynamic-linking-of-libtool-libra.patch | 13 +++--------- ...do-not-try-to-run-the-crc32selftest.patch} | 20 ++++++++++++++----- ...progs-don-t-use-CFLAGS-with-BUILD_CC.patch | 12 +++++------ 3 files changed, 23 insertions(+), 22 deletions(-) rename package/xfsprogs/{0002-no-crc32-checks.patch => 0002-libxfs-do-not-try-to-run-the-crc32selftest.patch} (66%) 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 index 3f79dbbe99..7243654495 100644 --- 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 @@ -1,12 +1,4 @@ -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 0031d25e858ef6336d6b14713edf1695d74cd97a 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 @@ -18,6 +10,7 @@ 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 +[Sent upstream: http://oss.sgi.com/pipermail/xfs/2015-November/045136.html] --- mdrestore/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -36,5 +29,5 @@ index 5171306..1b34a0e 100644 default: depend $(LTCOMMAND) -- -2.4.10 +2.7.4 diff --git a/package/xfsprogs/0002-no-crc32-checks.patch b/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch similarity index 66% rename from package/xfsprogs/0002-no-crc32-checks.patch rename to package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch index 6f97092475..3839713237 100644 --- a/package/xfsprogs/0002-no-crc32-checks.patch +++ b/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch @@ -1,4 +1,7 @@ -libxfs: do not try to run the crc32selftest +From e10089b31afab3ba86904e89c740cd7051dd5066 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 18 Dec 2016 15:37:27 +0100 +Subject: [PATCH] libxfs: do not try to run the crc32selftest Even though the crc32selftest is natively compiled (because it is to be executed), it fails in cross-compilation as the host may lack the @@ -14,11 +17,15 @@ Note that there's a remaining bug-in-hiding, because the crc32 table generator is natively built, but with the target CFLAGS. Signed-off-by: "Yann E. MORIN" +--- + libxfs/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -diff -durN xfsprogs-4.3.0.orig/libxfs/Makefile xfsprogs-4.3.0/libxfs/Makefile ---- xfsprogs-4.3.0.orig/libxfs/Makefile 2015-09-22 03:42:41.000000000 +0200 -+++ xfsprogs-4.3.0/libxfs/Makefile 2015-12-07 18:45:27.190082913 +0100 -@@ -105,9 +105,9 @@ +diff --git a/libxfs/Makefile b/libxfs/Makefile +index 6499731..5a07723 100644 +--- a/libxfs/Makefile ++++ b/libxfs/Makefile +@@ -118,9 +118,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT) # don't try linking xfs_repair with a debug libxfs. DEBUG = -DNDEBUG @@ -30,3 +37,6 @@ diff -durN xfsprogs-4.3.0.orig/libxfs/Makefile xfsprogs-4.3.0/libxfs/Makefile crc32table.h: gen_crc32table.c @echo " [CC] gen_crc32table" +-- +2.7.4 + diff --git a/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch b/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch index 6617935bf7..4f485a041b 100644 --- a/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch +++ b/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch @@ -1,4 +1,4 @@ -From 5b3dd8eb1f7720c68dab032c3d89d4e3102d6347 Mon Sep 17 00:00:00 2001 +From 626f51bf3f12fe294f622900615c72e25ee144c6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 15 Dec 2015 20:51:35 -0300 Subject: [PATCH] xfsprogs: don't use CFLAGS with BUILD_CC @@ -8,16 +8,14 @@ When cross-compiling CFLAGS might not be suitable for the host Signed-off-by: Gustavo Zacarias --- -Status: reported http://oss.sgi.com/bugzilla/show_bug.cgi?id=1132 - libxfs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libxfs/Makefile b/libxfs/Makefile -index ecf1921..3979077 100644 +index 5a07723..0c37d3e 100644 --- a/libxfs/Makefile +++ b/libxfs/Makefile -@@ -111,7 +111,7 @@ default: crc32selftest ltdepend $(LTLIBRARY) +@@ -124,7 +124,7 @@ default: ltdepend $(LTLIBRARY) crc32table.h: gen_crc32table.c @echo " [CC] gen_crc32table" @@ -26,7 +24,7 @@ index ecf1921..3979077 100644 @echo " [GENERATE] $@" $(Q) ./gen_crc32table > crc32table.h -@@ -122,7 +122,7 @@ crc32table.h: gen_crc32table.c +@@ -135,7 +135,7 @@ crc32table.h: gen_crc32table.c # disk. crc32selftest: gen_crc32table.c crc32table.h crc32.c @echo " [TEST] CRC32" @@ -36,5 +34,5 @@ index ecf1921..3979077 100644 # set up include/xfs header directory -- -2.4.10 +2.7.4 From 4b36d50b997d0c93a1fcaeae8b121c79de91e6ae Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Dec 2016 15:56:47 +0100 Subject: [PATCH 1923/3392] xfsprogs: bump to version 4.8.0 Switch to the new upstream site on kernel.org, and to a .tar.xz tarball. The patches are simply refreshed. Signed-off-by: Thomas Petazzoni --- ...store-do-not-do-dynamic-linking-of-libtool-libra.patch | 2 +- .../0002-libxfs-do-not-try-to-run-the-crc32selftest.patch | 6 +++--- .../0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch | 8 ++++---- package/xfsprogs/xfsprogs.hash | 4 ++-- package/xfsprogs/xfsprogs.mk | 5 +++-- 5 files changed, 13 insertions(+), 12 deletions(-) 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 index 7243654495..4e4160fb40 100644 --- 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 @@ -1,4 +1,4 @@ -From 0031d25e858ef6336d6b14713edf1695d74cd97a Mon Sep 17 00:00:00 2001 +From 770902a0a29fb4ac62358f7eacb3a83d0d9af1c7 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 diff --git a/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch b/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch index 3839713237..372a5301bd 100644 --- a/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch +++ b/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch @@ -1,4 +1,4 @@ -From e10089b31afab3ba86904e89c740cd7051dd5066 Mon Sep 17 00:00:00 2001 +From 3a77dfc54271059dcac305384bf6ace34fe1f3d3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 18 Dec 2016 15:37:27 +0100 Subject: [PATCH] libxfs: do not try to run the crc32selftest @@ -22,10 +22,10 @@ Signed-off-by: "Yann E. MORIN" 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libxfs/Makefile b/libxfs/Makefile -index 6499731..5a07723 100644 +index 62608bd..e021625 100644 --- a/libxfs/Makefile +++ b/libxfs/Makefile -@@ -118,9 +118,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT) +@@ -112,9 +112,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT) # don't try linking xfs_repair with a debug libxfs. DEBUG = -DNDEBUG diff --git a/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch b/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch index 4f485a041b..36896b5b95 100644 --- a/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch +++ b/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch @@ -1,4 +1,4 @@ -From 626f51bf3f12fe294f622900615c72e25ee144c6 Mon Sep 17 00:00:00 2001 +From b981adb6769f6b7d80f6c98627391398a007a25b Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 15 Dec 2015 20:51:35 -0300 Subject: [PATCH] xfsprogs: don't use CFLAGS with BUILD_CC @@ -12,10 +12,10 @@ Signed-off-by: Gustavo Zacarias 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libxfs/Makefile b/libxfs/Makefile -index 5a07723..0c37d3e 100644 +index e021625..ad76a04 100644 --- a/libxfs/Makefile +++ b/libxfs/Makefile -@@ -124,7 +124,7 @@ default: ltdepend $(LTLIBRARY) +@@ -118,7 +118,7 @@ default: ltdepend $(LTLIBRARY) crc32table.h: gen_crc32table.c @echo " [CC] gen_crc32table" @@ -24,7 +24,7 @@ index 5a07723..0c37d3e 100644 @echo " [GENERATE] $@" $(Q) ./gen_crc32table > crc32table.h -@@ -135,7 +135,7 @@ crc32table.h: gen_crc32table.c +@@ -129,7 +129,7 @@ crc32table.h: gen_crc32table.c # disk. crc32selftest: gen_crc32table.c crc32table.h crc32.c @echo " [TEST] CRC32" diff --git a/package/xfsprogs/xfsprogs.hash b/package/xfsprogs/xfsprogs.hash index 1f338b05d4..e990b78d77 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-4.7.0.tar.gz.sig -sha256 88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7 xfsprogs-4.7.0.tar.gz +# https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.8.0.tar.sign +sha256 82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 xfsprogs-4.8.0.tar.xz diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index b0875d104a..e59f1f6905 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -4,8 +4,9 @@ # ################################################################################ -XFSPROGS_VERSION = 4.7.0 -XFSPROGS_SITE = ftp://oss.sgi.com/projects/xfs/cmd_tars +XFSPROGS_VERSION = 4.8.0 +XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs +XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz XFSPROGS_DEPENDENCIES = util-linux From 4ddd7c9fbcd31059b387aa47c39e239e5d32b6bd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 18 Dec 2016 15:58:30 +0100 Subject: [PATCH 1924/3392] xfsprogs: remove comment about uClibc specific options xfsprogs now builds fine with Buildroot default uClibc configuration, so there is no point in having a specific comment: we don't have this for any other package, and it's basically impossible to maintain. UCLIBC_SV4_DEPRECATED is still disabled in the Buildroot default uClibc configuration, but xfsprogs builds fine without it. UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is now enabled in the Buildroot default uClibc configuration. Signed-off-by: Thomas Petazzoni --- package/xfsprogs/Config.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index 2c24cbbc1c..6e1a935bbc 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -1,7 +1,3 @@ - -comment "Note that xfsprogs needs a toolchain with UCLIBC_SV4_DEPRECATED and UCLIBC_HAS_OBSOLETE_BSD_SIGNAL enabled" - depends on BR2_PACKAGE_XFSPROGS - comment "xfsprogs needs a toolchain w/ wchar" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR From d174d2ee3744ad73e6458cf1fa7b21fafb1cac19 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 18 Dec 2016 10:42:38 -0300 Subject: [PATCH 1925/3392] bmon: bump to version 4.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/bmon/bmon.hash | 2 +- package/bmon/bmon.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bmon/bmon.hash b/package/bmon/bmon.hash index 7f28b74675..dec0c7d81a 100644 --- a/package/bmon/bmon.hash +++ b/package/bmon/bmon.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9c08332520497ef1d51a733ca531ffedbb5a30c7c3f55579efe86c36138f93e1 bmon-3.9.tar.gz +sha256 02fdc312b8ceeb5786b28bf905f54328f414040ff42f45c83007f24b76cc9f7a bmon-4.0.tar.gz diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk index 91993b650f..32889a69f3 100644 --- a/package/bmon/bmon.mk +++ b/package/bmon/bmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -BMON_VERSION = 3.9 +BMON_VERSION = 4.0 BMON_SITE = https://github.com/tgraf/bmon/releases/download/v$(BMON_VERSION) BMON_DEPENDENCIES = host-pkgconf libconfuse libnl ncurses BMON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From d9ef4c1f794978928d32304198765026737d810d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 18 Dec 2016 10:42:53 -0300 Subject: [PATCH 1926/3392] squid: security bump to version 3.5.23 Fixes: CVE-2016-10002: http://www.squid-cache.org/Advisories/SQUID-2016_11.txt CVE-2016-10003: http://www.squid-cache.org/Advisories/SQUID-2016_10.txt [Peter: add CVE references] 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 3b2f2debbe..c5251fd3cd 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.22.tar.xz.asc -md5 afb82d2748c06c95815c171463b4aa14 squid-3.5.22.tar.xz -sha1 73e9199dd9d2a7f107f78d03454830713a4a571d squid-3.5.22.tar.xz +# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.23.tar.xz.asc +md5 9b68f689e3d9578932b9c6a4041037c2 squid-3.5.23.tar.xz +sha1 33e43869d5eeb0fdfd1d625e6d6edee0617b2b22 squid-3.5.23.tar.xz diff --git a/package/squid/squid.mk b/package/squid/squid.mk index ddd0b83b04..e664122bec 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).22 +SQUID_VERSION = $(SQUID_VERSION_MAJOR).23 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR) SQUID_LICENSE = GPLv2+ From 32ba7b7b15677829d705947302253de114f17620 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 18 Dec 2016 10:43:05 -0300 Subject: [PATCH 1927/3392] strace: bump to version 4.15 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/strace/strace.hash | 5 +++-- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 383a266148..c7695ff391 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,2 +1,3 @@ -# Locally computed -sha256 5bed5110b243dce6864bedba269446c18c8c63f553cdd7fd4f808d89a764712f strace-4.14.tar.xz +# From https://sourceforge.net/projects/strace/files/strace/4.15/ +md5 1ff96209fec19914c920608ed0791864 strace-4.15.tar.xz +sha1 18fbaeb07d089023764f618f179091b663a0d21e strace-4.15.tar.xz diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 59418af855..b8de81afd2 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 4.14 +STRACE_VERSION = 4.15 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION) STRACE_LICENSE = BSD-3c From eaff70b8b65d8d06de9905f2499eff0a937b003e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 18 Dec 2016 10:43:31 -0300 Subject: [PATCH 1928/3392] poppler: bump to version 0.50.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/poppler/poppler.hash | 2 +- package/poppler/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index 6c695897bd..21decf61fe 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 14485f0e1e43dcddf49cfc02c2ccb92910ba3e0e91e06f4bd2642ec00cb3a79f poppler-0.49.0.tar.xz +sha256 c9c93318b789d3933f6e0bad3bc65110280c28eac3f0666284bb9c9a0ab4bc36 poppler-0.50.0.tar.xz diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index d2f8c2eac0..478da40788 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,7 +4,7 @@ # ################################################################################ -POPPLER_VERSION = 0.49.0 +POPPLER_VERSION = 0.50.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = http://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf From ad446bb3774b2474ce215f823308bfa1c16ccaa9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 18 Dec 2016 10:43:42 -0300 Subject: [PATCH 1929/3392] debianutils: bump to version 4.8.1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/debianutils/debianutils.hash | 4 ++-- package/debianutils/debianutils.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/debianutils/debianutils.hash b/package/debianutils/debianutils.hash index 212d321802..cd54e0b8b7 100644 --- a/package/debianutils/debianutils.hash +++ b/package/debianutils/debianutils.hash @@ -1,2 +1,2 @@ -# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.8.dsc -sha256 afa95bbe6b6fd3ef3c0c838b2d7232f09fabeff593ca4b5583cffa6748567ee2 debianutils_4.8.tar.xz +# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.8.1.dsc +sha256 2c395c0bdcfe89de30828b1d25cc5549ded5225a6d3625fbcb2cc0881ef5f026 debianutils_4.8.1.tar.xz diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk index 566d0ad48c..83cf744413 100644 --- a/package/debianutils/debianutils.mk +++ b/package/debianutils/debianutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -DEBIANUTILS_VERSION = 4.8 +DEBIANUTILS_VERSION = 4.8.1 DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.xz -DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20160629T224408Z/pool/main/d/debianutils +DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20161118T033019Z/pool/main/d/debianutils DEBIANUTILS_CONF_OPTS = --exec-prefix=/ # Make sure we override the busybox tools, such as which DEBIANUTILS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) From 4be266220ad766ef43c811b61344eb7d135af241 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 18 Dec 2016 10:43:51 -0300 Subject: [PATCH 1930/3392] redis: bump to version 3.2.6 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 4 ++-- package/redis/redis.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 7e09db5dab..b6e8eac695 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,4 +1,4 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha1 6f6333db6111badaa74519d743589ac4635eba7a redis-3.2.5.tar.gz +sha1 0c7bc5c751bdbc6fabed178db9cdbdd948915d1b redis-3.2.6.tar.gz # Calculated based on the hash above -sha256 8509ceb1efd849d6b2346a72a8e926b5a4f6ed3cc7c3cd8d9f36b2e9ba085315 redis-3.2.5.tar.gz +sha256 2e1831c5a315e400d72bda4beaa98c0cfbe3f4eb8b20c269371634390cf729fa redis-3.2.6.tar.gz diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 3b70991b48..0b07d18bd3 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 3.2.5 +REDIS_VERSION = 3.2.6 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From 8b21bdea1748748bf9c7398775b856613bbab957 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 18 Dec 2016 22:06:53 +0200 Subject: [PATCH 1931/3392] xl2tp: bump to version 1.3.8 Drop obsolete patch. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/xl2tp/0002-musl.patch | 19 ------------------- package/xl2tp/xl2tp.hash | 2 +- package/xl2tp/xl2tp.mk | 2 +- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 package/xl2tp/0002-musl.patch diff --git a/package/xl2tp/0002-musl.patch b/package/xl2tp/0002-musl.patch deleted file mode 100644 index 44238e87d0..0000000000 --- a/package/xl2tp/0002-musl.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix musl build - -Downloaded from -http://git.alpinelinux.org/cgit/aports/tree/main/xl2tpd/xl2tpd-compile.patch - -Signed-off-by: Bernd Kuhls - -diff -u --recursive src.orig/xl2tpd-1.3.6/xl2tpd.c src/xl2tpd-1.3.6/xl2tpd.c ---- xl2tpd-1.3.6.orig/xl2tpd.c 2014-01-15 21:58:37.000000000 -0100 -+++ xl2tpd-1.3.6/xl2tpd.c 2014-06-21 07:22:21.195278618 -0200 -@@ -33,8 +33,6 @@ - #if (__GLIBC__ < 2) - # if defined(FREEBSD) || defined(OPENBSD) - # include --# elif defined(LINUX) --# include - # elif defined(SOLARIS) - # include - # endif diff --git a/package/xl2tp/xl2tp.hash b/package/xl2tp/xl2tp.hash index 4b524247de..152d615a2e 100644 --- a/package/xl2tp/xl2tp.hash +++ b/package/xl2tp/xl2tp.hash @@ -1,2 +1,2 @@ # locally computed -sha256 49b069aa8d873e1d8f615ccc4212351e427bf681ba453fdd211256a8345bb7fb xl2tp-v1.3.6.tar.gz +sha256 1164b574e93a44c2a2e76c0c68d8d60437bd884a6c964d9c68be1556278e3d2d xl2tp-v1.3.8.tar.gz diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk index 29e2f281e0..ff802a4e97 100644 --- a/package/xl2tp/xl2tp.mk +++ b/package/xl2tp/xl2tp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XL2TP_VERSION = v1.3.6 +XL2TP_VERSION = v1.3.8 XL2TP_SITE = $(call github,xelerance,xl2tpd,$(XL2TP_VERSION)) XL2TP_DEPENDENCIES = libpcap openssl XL2TP_LICENSE = GPLv2 From a0ccec38973f825f18c3600900cc771f7d79ecec Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 18 Dec 2016 22:15:58 +0200 Subject: [PATCH 1932/3392] zlib: update homepage link Avoid redirect. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/zlib/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zlib/Config.in b/package/zlib/Config.in index f62330486b..6201aba142 100644 --- a/package/zlib/Config.in +++ b/package/zlib/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_ZLIB Standard (de)compression library. Used by things like gzip and libpng. - http://www.gzip.org/zlib/ + http://www.zlib.net From e1a0a8858e59c3ed73637521cc77e3937e9da2d4 Mon Sep 17 00:00:00 2001 From: Theo Debrouwere Date: Sun, 18 Dec 2016 22:35:26 +0100 Subject: [PATCH 1933/3392] BeagleBoard X15: new board This configuration provides a basic setup for using Buildroot to create a sd-card image a BeagleBoard X15 board. [Peter: use 512M ext4 partition, linux 4.9 and u-boot 2016.11] Signed-off-by: Theo Debrouwere Signed-off-by: Peter Korsgaard --- board/beagleboardx15/genimage.cfg | 26 ++++++++++++++++ board/beagleboardx15/post-image.sh | 15 +++++++++ board/beagleboardx15/readme.txt | 49 ++++++++++++++++++++++++++++++ configs/beagleboardx15_defconfig | 27 ++++++++++++++++ 4 files changed, 117 insertions(+) create mode 100644 board/beagleboardx15/genimage.cfg create mode 100755 board/beagleboardx15/post-image.sh create mode 100644 board/beagleboardx15/readme.txt create mode 100644 configs/beagleboardx15_defconfig diff --git a/board/beagleboardx15/genimage.cfg b/board/beagleboardx15/genimage.cfg new file mode 100644 index 0000000000..d27eff609f --- /dev/null +++ b/board/beagleboardx15/genimage.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "MLO", + "u-boot.img" + } + } + size = 4M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/beagleboardx15/post-image.sh b/board/beagleboardx15/post-image.sh new file mode 100755 index 0000000000..f52682f5d5 --- /dev/null +++ b/board/beagleboardx15/post-image.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" diff --git a/board/beagleboardx15/readme.txt b/board/beagleboardx15/readme.txt new file mode 100644 index 0000000000..56ebca8c5f --- /dev/null +++ b/board/beagleboardx15/readme.txt @@ -0,0 +1,49 @@ +BeagleBoard X15 + +Intro +===== +This config currently supports the beagleboard x15, +and generates a barebone image. + +The image must be flashed to a SD card to be used. + +How to build it +=============== + + $ make beagleboardx15_defconfig + +Then you can edit the build options using + + $ make menuconfig + +Compile all and build a sdcard image: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + + output/images/ + ├── am57xx-beagle-x15.dtb + ├── am57xx-beagle-x15-revb1.dtb + ├── boot.vfat + ├── MLO + ├── rootfs.ext2 + ├── rootfs.ext4 + ├── rootfs.tar + ├── sdcard.img + ├── u-boot.img + ├── u-boot-spl.bin + └── zImage + +How to write the microSD card +============================= + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/beagleboardx15_defconfig b/configs/beagleboardx15_defconfig new file mode 100644 index 0000000000..25ee21b8f6 --- /dev/null +++ b/configs/beagleboardx15_defconfig @@ -0,0 +1,27 @@ +BR2_arm=y +BR2_cortex_a15=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboardx15/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" +BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am57xx-beagle-x15 am57xx-beagle-x15-revb1" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="MLO" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From 584885c8d4ba8e2f824436386d005f1ff75ca1a1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 18 Dec 2016 19:28:30 -0300 Subject: [PATCH 1934/3392] gmp: bump to version 6.1.2 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gmp/gmp.hash | 2 +- package/gmp/gmp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gmp/gmp.hash b/package/gmp/gmp.hash index 9ea42e5395..f4793cd93c 100644 --- a/package/gmp/gmp.hash +++ b/package/gmp/gmp.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 d36e9c05df488ad630fff17edb50051d6432357f9ce04e34a09b3d818825e831 gmp-6.1.1.tar.xz +sha256 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 gmp-6.1.2.tar.xz diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 843a7a1781..33b5d542b4 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -GMP_VERSION = 6.1.1 +GMP_VERSION = 6.1.2 GMP_SITE = $(BR2_GNU_MIRROR)/gmp GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz GMP_INSTALL_STAGING = YES From dbfca7963049cd2140bff00c6841360d74c20fea Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 19 Dec 2016 09:52:47 +0100 Subject: [PATCH 1935/3392] can-utils: add dependency on NPTL canfdtest.c assumes that clock_nanosleep() is always available. But it is only available with NPTL. Since it unconditionally uses it, we add dependency on NPTL. Fixes: http://autobuild.buildroot.net/results/fd97aa57747a546c799caf094aafe0d1d1225863 http://autobuild.buildroot.net/results/1313f91df134035159e677c6b4a63838c75d074c http://autobuild.buildroot.net/results/a1ac495c5e38e5d0777c431fc6a2e4b5bff7c2ad http://autobuild.buildroot.net/results/978bee40049896bd6e093fa31c5eb7673e05a6b8 http://autobuild.buildroot.net/results/c692e96de1b4fdadf720ead8249a44c21fe945f1 Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/can-utils/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/can-utils/Config.in b/package/can-utils/Config.in index 307f069ddf..bfa522d989 100644 --- a/package/can-utils/Config.in +++ b/package/can-utils/Config.in @@ -1,9 +1,14 @@ config BR2_PACKAGE_CAN_UTILS bool "can-utils" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep() help SocketCAN is a set of open source CAN drivers and a networking stack. This package provides various tools for this stack. http://elinux.org/Can-utils + +comment "can-utils needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU From e4491b47b0940eab3e1404d2b5482aded7b1ce8c Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Mon, 19 Dec 2016 15:11:57 +0300 Subject: [PATCH 1936/3392] toolchain: Bump ARC tools to arc-2016.09 release As described at: 4520524ba055706236db9f00dd79f1b2e2e87fde this commit continues a series of updates of ARC tools. This time we're updating tools to arc-2016.09 release version. Signed-off-by: Vlad Zakharov Signed-off-by: Peter Korsgaard --- package/binutils/Config.in.host | 2 +- .../0300-ld-makefile.patch | 0 .../0301-check-ldrunpath-length.patch | 0 .../0500-add-sysroot-fix-from-bug-3049.patch | 0 .../0600-poison-system-directories.patch | 0 package/binutils/binutils.hash | 2 +- package/binutils/binutils.mk | 2 +- package/gcc/Config.in.host | 2 +- .../301-missing-execinfo_h.patch | 0 .../860-cilk-wchar.patch | 0 .../940-uclinux-enable-threads.patch | 0 package/gcc/gcc.hash | 2 +- package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- 14 files changed, 7 insertions(+), 7 deletions(-) rename package/binutils/{arc-2016.09-rc2 => arc-2016.09-release}/0300-ld-makefile.patch (100%) rename package/binutils/{arc-2016.09-rc2 => arc-2016.09-release}/0301-check-ldrunpath-length.patch (100%) rename package/binutils/{arc-2016.09-rc2 => arc-2016.09-release}/0500-add-sysroot-fix-from-bug-3049.patch (100%) rename package/binutils/{arc-2016.09-rc2 => arc-2016.09-release}/0600-poison-system-directories.patch (100%) rename package/gcc/{arc-2016.09-rc2 => arc-2016.09-release}/301-missing-execinfo_h.patch (100%) rename package/gcc/{arc-2016.09-rc2 => arc-2016.09-release}/860-cilk-wchar.patch (100%) rename package/gcc/{arc-2016.09-rc2 => arc-2016.09-release}/940-uclinux-enable-threads.patch (100%) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index e67b346b00..99a4a9650b 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -22,7 +22,7 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2016.09-rc2" if BR2_arc + default "arc-2016.09-release" if BR2_arc default "2.25.1" if BR2_BINUTILS_VERSION_2_25_X default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X default "2.27" if BR2_BINUTILS_VERSION_2_27_X diff --git a/package/binutils/arc-2016.09-rc2/0300-ld-makefile.patch b/package/binutils/arc-2016.09-release/0300-ld-makefile.patch similarity index 100% rename from package/binutils/arc-2016.09-rc2/0300-ld-makefile.patch rename to package/binutils/arc-2016.09-release/0300-ld-makefile.patch diff --git a/package/binutils/arc-2016.09-rc2/0301-check-ldrunpath-length.patch b/package/binutils/arc-2016.09-release/0301-check-ldrunpath-length.patch similarity index 100% rename from package/binutils/arc-2016.09-rc2/0301-check-ldrunpath-length.patch rename to package/binutils/arc-2016.09-release/0301-check-ldrunpath-length.patch diff --git a/package/binutils/arc-2016.09-rc2/0500-add-sysroot-fix-from-bug-3049.patch b/package/binutils/arc-2016.09-release/0500-add-sysroot-fix-from-bug-3049.patch similarity index 100% rename from package/binutils/arc-2016.09-rc2/0500-add-sysroot-fix-from-bug-3049.patch rename to package/binutils/arc-2016.09-release/0500-add-sysroot-fix-from-bug-3049.patch diff --git a/package/binutils/arc-2016.09-rc2/0600-poison-system-directories.patch b/package/binutils/arc-2016.09-release/0600-poison-system-directories.patch similarity index 100% rename from package/binutils/arc-2016.09-rc2/0600-poison-system-directories.patch rename to package/binutils/arc-2016.09-release/0600-poison-system-directories.patch diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 7b3ec6bd22..cf56b1ab59 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -5,4 +5,4 @@ sha512 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322 sha512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb binutils-2.27.tar.bz2 # Locally calculated (fetched from Github) -sha512 d2ae310dc1bdac8fcbeb7d1e5cd009a32d45d433ed1f0eaf4cddb3a86c803a89ef11df1db87b6fa45193a64c59197902ac84dd011f1b3dbac88edeb40b91833e binutils-arc-2016.09-rc2.tar.gz +sha512 b94f43bd084aef1cbe75da947775c7d9ad1873fb27f7b0b99244813c97bb44cd7fd4c11855418d74b731aa889bff615694777f41f4cd68429d8136d9bac2a239 binutils-arc-2016.09-release.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index bf345bb63f..d8ca5d6660 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,7 +9,7 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2016.09-rc2 +BINUTILS_VERSION = arc-2016.09-release else BINUTILS_VERSION = 2.25.1 endif diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 4c3815b91e..64d1a470cf 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -98,7 +98,7 @@ config BR2_GCC_VERSION default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.4.0" if BR2_GCC_VERSION_5_X default "6.2.0" if BR2_GCC_VERSION_6_X - default "arc-2016.09-rc2" if BR2_GCC_VERSION_ARC + default "arc-2016.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS string "Additional gcc options" diff --git a/package/gcc/arc-2016.09-rc2/301-missing-execinfo_h.patch b/package/gcc/arc-2016.09-release/301-missing-execinfo_h.patch similarity index 100% rename from package/gcc/arc-2016.09-rc2/301-missing-execinfo_h.patch rename to package/gcc/arc-2016.09-release/301-missing-execinfo_h.patch diff --git a/package/gcc/arc-2016.09-rc2/860-cilk-wchar.patch b/package/gcc/arc-2016.09-release/860-cilk-wchar.patch similarity index 100% rename from package/gcc/arc-2016.09-rc2/860-cilk-wchar.patch rename to package/gcc/arc-2016.09-release/860-cilk-wchar.patch diff --git a/package/gcc/arc-2016.09-rc2/940-uclinux-enable-threads.patch b/package/gcc/arc-2016.09-release/940-uclinux-enable-threads.patch similarity index 100% rename from package/gcc/arc-2016.09-rc2/940-uclinux-enable-threads.patch rename to package/gcc/arc-2016.09-release/940-uclinux-enable-threads.patch diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 0d758b0bd4..a4e60851fe 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -12,4 +12,4 @@ sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d sha512 1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a83ce1cd4cdd2d1cb0b3e3c34e9b7ae1b2ab83dfc649ee817ab05247c76198 gcc-6.2.0.tar.bz2 # Locally calculated (fetched from Github) -sha512 fb4fdc00d3d2e4db52a83cb34f3e99399fd6b1d1d1e6dd378188a209467dca8975d6b2a4e16ccc27f53b897480ece4b496db21b0adc7c1bcddcdc775c2a3d2f9 gcc-arc-2016.09-rc2.tar.gz +sha512 faae6dc3f7843412068a52de5919797cd23e6ed1b8d140c230d0381f13fd38af67baaa4a09e581c03602127da3dd2fab6f9f5d7ac5d4270585bd079c673dda9a gcc-arc-2016.09-release.tar.gz diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 3a187f09b8..b8b7779cf1 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -56,7 +56,7 @@ endif config BR2_GDB_VERSION string depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB - default "arc-2016.09-rc2-gdb" if BR2_arc + default "arc-2016.09-release-gdb" if BR2_arc default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze default "7.10.1" if BR2_GDB_VERSION_7_10 default "7.11.1" if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index c63d5e2c98..d6813ed6d1 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -5,4 +5,4 @@ sha512 f610338b3a24dfb387c295431d806a0c1375e8ce51b8dd8bbfd2efc4612d0c0ed40ad439 # Locally calculated (fetched from Github) sha512 0a467091d4b01fbecabb4b8da1cb743025c70e7f4874a0b5c8fa2ec623569a39bde6762b91806de0be6e63711aeb6909715cfbe43860de73d8aec6159a9f10a7 gdb-6be65fb56ea6694a9260733a536a023a1e2d4d57.tar.gz -sha512 f428e0e86179e8f0bf09e516884e575c00663de37a85f4ab3dbb2c384a839f3c06971a24690bdd7da0b31a00e629dd304578d2baa8c8a62baf040006c4b89728 gdb-arc-2016.09-rc2-gdb.tar.gz +sha512 3b204108821ba687974e61bb47f0ab91621ac233503cec6c82913bcb665a8c0cea0c8b992177b2fb6befade774c2491d94c72a1bf859f9b79d44755be05dcd64 gdb-arc-2016.09-release-gdb.tar.gz From 0a27910ea733746505eb339e4909d48d1f93a875 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 19 Dec 2016 13:22:48 +0100 Subject: [PATCH 1937/3392] python-xlsxwriter: bump to version 0.9.4 Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-xlsxwriter/python-xlsxwriter.hash | 4 ++-- package/python-xlsxwriter/python-xlsxwriter.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-xlsxwriter/python-xlsxwriter.hash b/package/python-xlsxwriter/python-xlsxwriter.hash index 5f1a942beb..5d9a5ac2b5 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.hash +++ b/package/python-xlsxwriter/python-xlsxwriter.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/xlsxwriter/json, sha256 locally computed -md5 9035b1e37a579c554e703404ffcebdd4 XlsxWriter-0.9.3.tar.gz -sha256 19d2b5c0dd4d5fc00e8d7f164795f50e885b20d1cc27a3d04d5c7fec3c4d57f6 XlsxWriter-0.9.3.tar.gz +md5 17f48e222aa091b053fa2a14986b21c5 XlsxWriter-0.9.4.tar.gz +sha256 1642cf0adc6486dd3b17db9aba72a47fd41b947da6081e97acd6ab9872a22386 XlsxWriter-0.9.4.tar.gz diff --git a/package/python-xlsxwriter/python-xlsxwriter.mk b/package/python-xlsxwriter/python-xlsxwriter.mk index a44a99b3ac..bd2ca086b8 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.mk +++ b/package/python-xlsxwriter/python-xlsxwriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLSXWRITER_VERSION = 0.9.3 +PYTHON_XLSXWRITER_VERSION = 0.9.4 PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://pypi.python.org/packages/75/46/f1552b4a4d6faa6ec39dc2ddcb56e6b9a2865f07b9e126b2144d9090f056 +PYTHON_XLSXWRITER_SITE = https://pypi.python.org/packages/52/66/670322b9999b8e47659c8b172a11aa3c0e629a5fc86b5a8fd497b85941c0 PYTHON_XLSXWRITER_SETUP_TYPE = setuptools PYTHON_XLSXWRITER_LICENSE = BSD-2c PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt From 42081de819611eeee889eb0c974556c6e5e25322 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 19 Dec 2016 13:22:49 +0100 Subject: [PATCH 1938/3392] python-pathvalidate: bump to version 0.9.4 Add new runtime dependency: BR2_PACKAGE_PYTHON_MBSTRDECODER. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-pathvalidate/Config.in | 1 + package/python-pathvalidate/python-pathvalidate.hash | 4 ++-- package/python-pathvalidate/python-pathvalidate.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-pathvalidate/Config.in b/package/python-pathvalidate/Config.in index d70e34a0b4..cc15fff7c6 100644 --- a/package/python-pathvalidate/Config.in +++ b/package/python-pathvalidate/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_PATHVALIDATE bool "python-pathvalidate" + select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime help pathvalidate is a python library to validate/sanitize a string diff --git a/package/python-pathvalidate/python-pathvalidate.hash b/package/python-pathvalidate/python-pathvalidate.hash index 3a1bc1d54d..e999c73251 100644 --- a/package/python-pathvalidate/python-pathvalidate.hash +++ b/package/python-pathvalidate/python-pathvalidate.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/pathvalidate/json, sha256 locally computed -md5 1ea321c363fb5f55451473071db30d28 pathvalidate-0.7.1.tar.gz -sha256 4d701cfc8b380ed39252e29ce972a54dd18ce1dbe5cd8758162480d8bd673e5d pathvalidate-0.7.1.tar.gz +md5 c9f517f6caba5eee56731425b5a75427 pathvalidate-0.9.4.tar.gz +sha256 289a849464cced59314e6a0827f2d2232bb9891f8f4812574a6875a7c7e554b9 pathvalidate-0.9.4.tar.gz diff --git a/package/python-pathvalidate/python-pathvalidate.mk b/package/python-pathvalidate/python-pathvalidate.mk index 843b207ce2..25f2548768 100644 --- a/package/python-pathvalidate/python-pathvalidate.mk +++ b/package/python-pathvalidate/python-pathvalidate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHVALIDATE_VERSION = 0.7.1 +PYTHON_PATHVALIDATE_VERSION = 0.9.4 PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz -PYTHON_PATHVALIDATE_SITE = https://pypi.python.org/packages/85/39/94b634c076dc3192455b1c0a8d15061eeeffd65a9d267d2b9de237b159a2 +PYTHON_PATHVALIDATE_SITE = https://pypi.python.org/packages/9a/4a/49d219ca919753017bacea87e161614ed66204246ee1e150091910cb57c7 PYTHON_PATHVALIDATE_SETUP_TYPE = setuptools PYTHON_PATHVALIDATE_LICENSE = MIT PYTHON_PATHVALIDATE_LICENSE_FILES = LICENSE From ae58da71111c9a9825fa8dab1338831ff38dc320 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 19 Dec 2016 13:27:51 -0300 Subject: [PATCH 1939/3392] openssh: security bump to version 7.4p1 Fixes: CVE-2016-10009 - ssh-agent(1): Will now refuse to load PKCS#11 modules from paths outside a trusted whitelist CVE-2016-10010 - sshd(8): When privilege separation is disabled, forwarded Unix-domain sockets would be created by sshd(8) with the privileges of 'root' CVE-2016-10011 - sshd(8): Avoid theoretical leak of host private key material to privilege-separated child processes via realloc() CVE-2016-10012 - sshd(8): The shared memory manager used by pre-authentication compression support had a bounds checks that could be elided by some optimising compilers http://seclists.org/oss-sec/2016/q4/708 Drop upstream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/openssh/0003-fix-CVE-2016-8858.patch | 31 -------------------- package/openssh/openssh.hash | 4 +-- package/openssh/openssh.mk | 2 +- 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 package/openssh/0003-fix-CVE-2016-8858.patch diff --git a/package/openssh/0003-fix-CVE-2016-8858.patch b/package/openssh/0003-fix-CVE-2016-8858.patch deleted file mode 100644 index 4ba1cfdc01..0000000000 --- a/package/openssh/0003-fix-CVE-2016-8858.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ec165c392ca54317dbe3064a8c200de6531e89ad Mon Sep 17 00:00:00 2001 -From: "markus@openbsd.org" -Date: Mon, 10 Oct 2016 19:28:48 +0000 -Subject: [PATCH] upstream commit - -Unregister the KEXINIT handler after message has been -received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause -allocation of up to 128MB -- until the connection is closed. Reported by -shilei-c at 360.cn - -Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05 - -Signed-off-by: Baruch Siach ---- -Patch status: upstream - - kex.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kex.c b/kex.c -index 3f97f8c..6a94bc5 100644 ---- a/kex.c -+++ b/kex.c -@@ -481,6 +481,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt) - if (kex == NULL) - return SSH_ERR_INVALID_ARGUMENT; - -+ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL); - ptr = sshpkt_ptr(ssh, &dlen); - if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0) - return r; diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 9a5ffd609f..09010d3b29 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -# Also from http://www.openssh.com/txt/release-7.3 -sha256 3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc openssh-7.3p1.tar.gz +# Also from http://www.openssh.com/txt/release-7.4 +sha256 1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1 openssh-7.4p1.tar.gz diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ce85513614..dd8350b19d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION = 7.3p1 +OPENSSH_VERSION = 7.4p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3c BSD-2c Public Domain OPENSSH_LICENSE_FILES = LICENCE From 80e0583a7046aa2178928d5481b6a22148a2d5e2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 19 Dec 2016 16:50:38 -0300 Subject: [PATCH 1940/3392] samba4: security bump to version 4.4.8 Fixes: CVE-2016-2123 - Samba NDR Parsing ndr_pull_dnsp_name Heap-based Buffer Overflow Remote Code Execution Vulnerability. CVE-2016-2125 - Unconditional privilege delegation to Kerberos servers in trusted realms. CVE-2016-2126 - Flaws in Kerberos PAC validation can trigger privilege elevation. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 2 +- package/samba4/samba4.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index d6433f74f0..1e36d73fb4 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 a69d6612e4a421640242ca66c4dbb0e4c20281e77dc24970a332770814d45c7c samba-4.4.7.tar.gz +sha256 0e54de8a22b77f9712578029639331b51f818b70e194766c98475a5b99470fbf samba-4.4.8.tar.gz diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 71cb4261e3..778902fd5f 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.4.7 +SAMBA4_VERSION = 4.4.8 SAMBA4_SITE = http://ftp.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 0cf7d259a725bf3164716c0d78f7f89c8330e7a1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 19 Dec 2016 18:22:00 +0100 Subject: [PATCH 1941/3392] package/weston: fix build on ancient glibc Fix build with ancient glibces. Fixes: http://autobuild.buildroot.net/results/bce/bcecdbbce4a99eb1e9bfbf519857bf94d8952037/ [Peter: patches configure.ac, so add WESTON_AUTORECONF = YES] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...ure-search-for-lib-with-clock_getres.patch | 47 +++++++++++++++++++ package/weston/weston.mk | 2 + 2 files changed, 49 insertions(+) create mode 100644 package/weston/0003-configure-search-for-lib-with-clock_getres.patch diff --git a/package/weston/0003-configure-search-for-lib-with-clock_getres.patch b/package/weston/0003-configure-search-for-lib-with-clock_getres.patch new file mode 100644 index 0000000000..a8ad9eaa0b --- /dev/null +++ b/package/weston/0003-configure-search-for-lib-with-clock_getres.patch @@ -0,0 +1,47 @@ +From e269012c4b919624ca92d80afd1d6a6f5399e041 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Mon, 19 Dec 2016 18:07:07 +0100 +Subject: [PATCH] configure: search for lib with clock_getres() + +Like clock_gettime(), clock_getres() is in -lrt for glibc < 2.17. +Add a check for it, like is done for clock_gettime(). + +Signed-off-by: "Yann E. MORIN" +--- +Upstream status: submitted +https://lists.freedesktop.org/archives/wayland-devel/2016-December/032354.html +--- + Makefile.am | 1 + + configure.ac | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 2219e3d..53f8f51 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -190,6 +190,7 @@ weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) + weston_LDADD = libshared.la libweston-@LIBWESTON_MAJOR@.la \ + $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ + $(DLOPEN_LIBS) $(LIBINPUT_BACKEND_LIBS) \ ++ $(CLOCK_GETRES_LIBS) \ + -lm + + weston_SOURCES = \ +diff --git a/configure.ac b/configure.ac +index 1e251bf..604f51b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -88,8 +88,9 @@ PKG_PROG_PKG_CONFIG() + + WESTON_SEARCH_LIBS([DLOPEN], [dl], [dlopen]) + +-# In old glibc versions (< 2.17) clock_gettime() is in librt ++# In old glibc versions (< 2.17) clock_gettime() and clock_getres() are in librt + WESTON_SEARCH_LIBS([CLOCK_GETTIME], [rt], [clock_gettime]) ++WESTON_SEARCH_LIBS([CLOCK_GETRES], [rt], [clock_getres]) + + AC_CHECK_DECL(SFD_CLOEXEC,[], + [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile weston")], +-- +2.7.4 + diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 7d348dc10e..89e16f1f5c 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -9,6 +9,8 @@ WESTON_SITE = http://wayland.freedesktop.org/releases WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING +# configure.ac patched by 0003-configure-search-for-lib-with-clock_getres.patch +WESTON_AUTORECONF = YES WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ libxkbcommon pixman libpng jpeg mtdev udev cairo libinput \ From 4f08ad87df646ad1df93d749ec32617f1ecf60ea Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 19 Dec 2016 21:25:25 +0100 Subject: [PATCH 1942/3392] package/google-breakpad: add C++11 dependency on the host variant When google-breakpad has been updated to the latest version, the C++11 dependency has been added for the target variant only. The C++11 dependency is also required for the host variant. Fixes: http://autobuild.buildroot.org/results/dce/dcecb17116c0cf400c98f0052c9bf71f15d0d398 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- Config.in | 1 + package/google-breakpad/Config.in | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Config.in b/Config.in index 7ea1e60692..d3bb7b8377 100644 --- a/Config.in +++ b/Config.in @@ -529,6 +529,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE bool "Enable google-breakpad support" select BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_HOST_GCC_AT_LEAST_4_7 # C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 31ca422024..c6171afefd 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS config BR2_PACKAGE_GOOGLE_BREAKPAD bool "google-breakpad" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_HOST_GCC_AT_LEAST_4_7 # C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS @@ -38,4 +39,4 @@ comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_HOST_GCC_AT_LEAST_4_7 From 4f37e027df0887d7153e16f286b317850044d3d1 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 19 Dec 2016 09:22:34 +0100 Subject: [PATCH 1943/3392] python-constantly: new package Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-constantly/Config.in | 8 ++++++++ package/python-constantly/python-constantly.hash | 3 +++ package/python-constantly/python-constantly.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-constantly/Config.in create mode 100644 package/python-constantly/python-constantly.hash create mode 100644 package/python-constantly/python-constantly.mk diff --git a/package/Config.in b/package/Config.in index be0d1506f2..3a49167fbd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -660,6 +660,7 @@ menu "External python modules" source "package/python-coherence/Config.in" source "package/python-configobj/Config.in" source "package/python-configshell-fb/Config.in" + source "package/python-constantly/Config.in" source "package/python-couchdb/Config.in" source "package/python-crc16/Config.in" source "package/python-crcmod/Config.in" diff --git a/package/python-constantly/Config.in b/package/python-constantly/Config.in new file mode 100644 index 0000000000..13bb2e86d0 --- /dev/null +++ b/package/python-constantly/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_CONSTANTLY + bool "python-constantly" + help + A library that provides symbolic constant support. It + includes collections and constants with text, numeric, + and bit flag values. + + https://github.com/twisted/constantly diff --git a/package/python-constantly/python-constantly.hash b/package/python-constantly/python-constantly.hash new file mode 100644 index 0000000000..fb7787709c --- /dev/null +++ b/package/python-constantly/python-constantly.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/constantly/json, sha256 locally computed +md5 f0762f083d83039758e53f8cf0086eef constantly-15.1.0.tar.gz +sha256 586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 constantly-15.1.0.tar.gz diff --git a/package/python-constantly/python-constantly.mk b/package/python-constantly/python-constantly.mk new file mode 100644 index 0000000000..783d198d06 --- /dev/null +++ b/package/python-constantly/python-constantly.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-constantly +# +################################################################################ + +PYTHON_CONSTANTLY_VERSION = 15.1.0 +PYTHON_CONSTANTLY_SOURCE = constantly-$(PYTHON_CONSTANTLY_VERSION).tar.gz +PYTHON_CONSTANTLY_SITE = https://pypi.python.org/packages/95/f1/207a0a478c4bb34b1b49d5915e2db574cadc415c9ac3a7ef17e29b2e8951 +PYTHON_CONSTANTLY_SETUP_TYPE = setuptools +PYTHON_CONSTANTLY_LICENSE = MIT +PYTHON_CONSTANTLY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 20fb68f71a841438d28759cce6b1bd0d6f7103b2 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 19 Dec 2016 09:22:35 +0100 Subject: [PATCH 1944/3392] python-zope-interface: bump to version 4.3.3 Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-zope-interface/python-zope-interface.hash | 4 ++-- package/python-zope-interface/python-zope-interface.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-zope-interface/python-zope-interface.hash b/package/python-zope-interface/python-zope-interface.hash index 8558c9a0a7..7a46cd348f 100644 --- a/package/python-zope-interface/python-zope-interface.hash +++ b/package/python-zope-interface/python-zope-interface.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/zope-interface/json, sha256 locally computed -md5 5f7e15a5bcdfa3c6c0e93ffe45caf87c zope.interface-4.3.2.tar.gz -sha256 6a0e224a052e3ce27b3a7b1300a24747513f7a507217fcc2a4cb02eb92945cee zope.interface-4.3.2.tar.gz +md5 ba3f32eacaea66094b7e2ae2788cec89 zope.interface-4.3.3.tar.gz +sha256 8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88 zope.interface-4.3.3.tar.gz diff --git a/package/python-zope-interface/python-zope-interface.mk b/package/python-zope-interface/python-zope-interface.mk index 7daf5aa092..3e3b464b28 100644 --- a/package/python-zope-interface/python-zope-interface.mk +++ b/package/python-zope-interface/python-zope-interface.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZOPE_INTERFACE_VERSION = 4.3.2 +PYTHON_ZOPE_INTERFACE_VERSION = 4.3.3 PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz -PYTHON_ZOPE_INTERFACE_SITE = https://pypi.python.org/packages/38/1b/d55c39f2cf442bd9fb2c59760ed058c84b57d25c680819c25f3aff741e1f +PYTHON_ZOPE_INTERFACE_SITE = https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916 PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools PYTHON_ZOPE_INTERFACE_LICENSE = ZPLv2.1 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt From c07ad416b41eab898fc8899f46aed35d5ad923ef Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 19 Dec 2016 09:22:36 +0100 Subject: [PATCH 1945/3392] python-twisted: bump to version 16.6.0 Add two new dependencies: python-contstantly: runtime only python-incremental: both runtime and build-time dependency Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/python-twisted/Config.in | 2 ++ package/python-twisted/python-twisted.hash | 4 ++-- package/python-twisted/python-twisted.mk | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 1221fc25bd..7fe4289d46 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_TWISTED bool "python-twisted" + select BR2_PACKAGE_PYTHON_INCREMENTAL + select BR2_PACKAGE_PYTHON_CONSTANTLY # runtime select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime help Twisted is an event-driven networking engine written in Python. diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index c3a6e956dd..cc78a4cb53 100644 --- a/package/python-twisted/python-twisted.hash +++ b/package/python-twisted/python-twisted.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/twisted/json, sha256 locally computed -md5 c6d09bdd681f538369659111f079c29d Twisted-16.4.1.tar.bz2 -sha256 1d8d73f006c990744effb35588359fd44d43608649ac0b6b7edc71176e88e816 Twisted-16.4.1.tar.bz2 +md5 54a88ffe773d5a83c91fcfe86044b094 Twisted-16.6.0.tar.bz2 +sha256 d0fe115ea7ef8cf632d05103de60356c6e992b2153d6830bdc4476f8accb1fca Twisted-16.6.0.tar.bz2 diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 7e9e496c5f..29fe735895 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 16.4.1 +PYTHON_TWISTED_VERSION = 16.6.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://pypi.python.org/packages/6b/23/8dbe86fc83215015e221fbd861a545c6ec5c9e9cd7514af114d1f64084ab +PYTHON_TWISTED_SITE = https://pypi.python.org/packages/dc/c0/a0114a6d7fa211c0904b0de931e8cafb5210ad824996cc6a9d67f3bae22c PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE +PYTHON_TWISTED_DEPENDENCIES = python-incremental $(eval $(python-package)) From 9d1dab1b80ae5b0851e29b9273e248d966ad8637 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Dec 2016 14:13:23 +0100 Subject: [PATCH 1946/3392] libupnp: add upstream security fix for CVE-2016-6255 If there's no registered handler for a POST request, the default behaviour is to write it to the filesystem. Several million deployed devices appear to have this behaviour, making it possible to (at least) store arbitrary data on them. Add a configure option that enables this behaviour, and change the default to just drop POSTs that aren't directly handled. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...ndled-POSTs-to-write-to-the-filesyst.patch | 73 +++++++++++++++++++ package/libupnp/libupnp.mk | 2 + 2 files changed, 75 insertions(+) create mode 100644 package/libupnp/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch diff --git a/package/libupnp/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch b/package/libupnp/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch new file mode 100644 index 0000000000..4bf14732c1 --- /dev/null +++ b/package/libupnp/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch @@ -0,0 +1,73 @@ +From c91a8a3903367e1163765b73eb4d43be7d7927fa Mon Sep 17 00:00:00 2001 +From: Matthew Garrett +Date: Tue, 23 Feb 2016 13:53:20 -0800 +Subject: [PATCH] Don't allow unhandled POSTs to write to the filesystem by + default + +Fixes CVE-2016-6255: write files via POST + +If there's no registered handler for a POST request, the default behaviour +is to write it to the filesystem. Several million deployed devices appear +to have this behaviour, making it possible to (at least) store arbitrary +data on them. Add a configure option that enables this behaviour, and change +the default to just drop POSTs that aren't directly handled. + +Signed-off-by: Marcelo Roberto Jimenez +Signed-off-by: Peter Korsgaard +--- + configure.ac | 4 ++++ + upnp/inc/upnpconfig.h.in | 5 +++++ + upnp/src/genlib/net/http/webserver.c | 4 ++++ + 3 files changed, 13 insertions(+) + +diff --git a/configure.ac b/configure.ac +index dd88734..ea2bc09 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -482,6 +482,10 @@ if test "x$enable_scriptsupport" = xyes ; then + AC_DEFINE(IXML_HAVE_SCRIPTSUPPORT, 1, [see upnpconfig.h]) + fi + ++RT_BOOL_ARG_ENABLE([postwrite], [no], [write to the filesystem on otherwise unhandled POST requests]) ++if test "x$enable_postwrite" = xyes ; then ++ AC_DEFINE(UPNP_ENABLE_POST_WRITE, 1, [see upnpconfig.h]) ++fi + + RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code]) + +diff --git a/upnp/inc/upnpconfig.h.in b/upnp/inc/upnpconfig.h.in +index 46ddc6e..5df8c5a 100644 +--- a/upnp/inc/upnpconfig.h.in ++++ b/upnp/inc/upnpconfig.h.in +@@ -135,5 +135,10 @@ + * (i.e. configure --enable-open_ssl) */ + #undef UPNP_ENABLE_OPEN_SSL + ++/** Defined to 1 if the library has been compiled to support filesystem writes on POST ++ * (i.e. configure --enable-postwrite) */ ++#undef UPNP_ENABLE_POST_WRITE ++ ++ + #endif /* UPNP_CONFIG_H */ + +diff --git a/upnp/src/genlib/net/http/webserver.c b/upnp/src/genlib/net/http/webserver.c +index 8991c16..8b2ecf2 100644 +--- a/upnp/src/genlib/net/http/webserver.c ++++ b/upnp/src/genlib/net/http/webserver.c +@@ -1369,9 +1369,13 @@ static int http_RecvPostMessage( + if (Fp == NULL) + return HTTP_INTERNAL_SERVER_ERROR; + } else { ++#ifdef UPNP_ENABLE_POST_WRITE + Fp = fopen(filename, "wb"); + if (Fp == NULL) + return HTTP_UNAUTHORIZED; ++#else ++ return HTTP_NOT_FOUND; ++#endif + } + parser->position = POS_ENTITY; + do { +-- +2.10.2 + diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index e12f410509..2a4e078f9c 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -11,5 +11,7 @@ LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no LIBUPNP_INSTALL_STAGING = YES LIBUPNP_LICENSE = BSD-3c LIBUPNP_LICENSE_FILES = LICENSE +# configure.ac patched by 0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch +LIBUPNP_AUTORECONF = YES $(eval $(autotools-package)) From c489cbad775380b4c7586574e3dae8dc67ee9087 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Dec 2016 14:13:24 +0100 Subject: [PATCH 1947/3392] libupnp: add upstream security fix for CVE-2016-8863 Fix out-of-bound access in create_url_list() If there is an invalid URL in URLS->buf after a valid one, uri_parse is called with out pointing after the allocated memory. As uri_parse writes to *out before returning an error the loop in create_url_list must be stopped early to prevent an out-of-bound access. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ...-access-in-create_url_list-CVE-2016-.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 package/libupnp/0002-Fix-out-of-bound-access-in-create_url_list-CVE-2016-.patch diff --git a/package/libupnp/0002-Fix-out-of-bound-access-in-create_url_list-CVE-2016-.patch b/package/libupnp/0002-Fix-out-of-bound-access-in-create_url_list-CVE-2016-.patch new file mode 100644 index 0000000000..1b74d3ef2e --- /dev/null +++ b/package/libupnp/0002-Fix-out-of-bound-access-in-create_url_list-CVE-2016-.patch @@ -0,0 +1,64 @@ +From 9c099c2923ab4d98530ab5204af1738be5bddba7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Thu, 8 Dec 2016 17:11:53 +0100 +Subject: [PATCH] Fix out-of-bound access in create_url_list() (CVE-2016-8863) + +If there is an invalid URL in URLS->buf after a valid one, uri_parse is +called with out pointing after the allocated memory. As uri_parse writes +to *out before returning an error the loop in create_url_list must be +stopped early to prevent an out-of-bound access + +Bug: https://sourceforge.net/p/pupnp/bugs/133/ +Bug-CVE: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-8863 +Bug-Debian: https://bugs.debian.org/842093 +Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1388771 +(cherry picked from commit a0f6e719bc03c4d2fe6a4a42ef6b8761446f520b) +Signed-off-by: Peter Korsgaard +--- + upnp/src/gena/gena_device.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/upnp/src/gena/gena_device.c b/upnp/src/gena/gena_device.c +index fb04a29..245c56b 100644 +--- a/upnp/src/gena/gena_device.c ++++ b/upnp/src/gena/gena_device.c +@@ -1113,7 +1113,7 @@ static int create_url_list( + /*! [out] . */ + URL_list *out) + { +- size_t URLcount = 0; ++ size_t URLcount = 0, URLcount2 = 0; + size_t i; + int return_code = 0; + uri_type temp; +@@ -1155,16 +1155,23 @@ static int create_url_list( + } + memcpy( out->URLs, URLS->buff, URLS->size ); + out->URLs[URLS->size] = 0; +- URLcount = 0; + for( i = 0; i < URLS->size; i++ ) { + if( ( URLS->buff[i] == '<' ) && ( i + 1 < URLS->size ) ) { + if( ( ( return_code = + parse_uri( &out->URLs[i + 1], URLS->size - i + 1, +- &out->parsedURLs[URLcount] ) ) == ++ &out->parsedURLs[URLcount2] ) ) == + HTTP_SUCCESS ) +- && ( out->parsedURLs[URLcount].hostport.text.size != ++ && ( out->parsedURLs[URLcount2].hostport.text.size != + 0 ) ) { +- URLcount++; ++ URLcount2++; ++ if (URLcount2 >= URLcount) ++ /* ++ * break early here in case there is a bogus URL that ++ * was skipped above. This prevents to access ++ * out->parsedURLs[URLcount] which is beyond the ++ * allocation. ++ */ ++ break; + } else { + if( return_code == UPNP_E_OUTOF_MEMORY ) { + free( out->URLs ); +-- +2.10.2 + From 7f0f83296fe3e2434aaba8665a44730d2f0540ab Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Dec 2016 23:48:12 +0100 Subject: [PATCH 1948/3392] docs/website/news.html: add 2016.11 announcement link Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index f12dfc6393..1e789ff858 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

          2016.11 released

          The stable 2016.11 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2016.11 release.

          From 1ac9d83f55f9ec30bd67767fab3c8e09249ae372 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Mon, 19 Dec 2016 22:13:16 -0500 Subject: [PATCH 1949/3392] mkusers: fix spelling in intro comment Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- support/scripts/mkusers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index e2c24c7237..d834578761 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -35,7 +35,7 @@ PASSWD="${TARGET_DIR}/etc/passwd" SHADOW="${TARGET_DIR}/etc/shadow" GROUP="${TARGET_DIR}/etc/group" # /etc/gshadow is not part of the standard skeleton, so not everybody -# will have it, but some may hav it, and its content must be in sync +# will have it, but some may have it, and its content must be in sync # with /etc/group, so any use of gshadow must be conditional. GSHADOW="${TARGET_DIR}/etc/gshadow" @@ -43,7 +43,7 @@ GSHADOW="${TARGET_DIR}/etc/gshadow" # such as: # BR2_DEFCONFIG="$(CONFIG_DIR)/defconfig" # which when sourced from a shell script will eventually try to execute -# a command name 'CONFIG_DIR', which is plain wrong for virtually every +# a command named 'CONFIG_DIR', which is plain wrong for virtually every # systems out there. # So, we have to scan that file instead. Sigh... :-( PASSWD_METHOD="$( sed -r -e '/^BR2_TARGET_GENERIC_PASSWD_METHOD="(.*)"$/!d;' \ From 62da71c980fe2e44059e4d6a7e00cbe279905a26 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Mon, 19 Dec 2016 22:12:32 -0500 Subject: [PATCH 1950/3392] legacy/sqlite: add "sqlite" to legacy option name The "command-line editing support was updated" does not indicate the package name, unlike the other legacy options. This commit adds "sqlite", to be nicer. Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- Config.in.legacy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in.legacy b/Config.in.legacy index 71faa8d84d..2811c7b76c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -649,7 +649,7 @@ config BR2_GCC_VERSION_4_5_X version instead. config BR2_PACKAGE_SQLITE_READLINE - bool "command-line editing support was updated" + bool "sqlite command-line editing support was updated" select BR2_PACKAGE_NCURSES select BR2_PACKAGE_READLINE select BR2_LEGACY From f61583fc2eb0ebf1d712581c2dae60e8fb692973 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Mon, 19 Dec 2016 22:10:12 -0500 Subject: [PATCH 1951/3392] uboot: fix custom patch dir legacy handling Commit 3e3fef39e71ed0426130b36aa00e4630ebb537ae added new and improved patch handling, with BR2_TARGET_UBOOT_PATCH. This was in addition to the existing BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR option, that only handled directories. Later, commit 21b25d28fc7af3bb1b2c55e4a46e0d067ebc0081 moved the old BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR to legacy options. But on the way, bad things happened: * The original option was a string, while the one added to Config.in.legacy is a bool. This results in a warning from defconfigs that actually define the old BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR (because a string is not a valid value for a bool), but it does not result in the legacy option being selected. Consequently, BR2_LEGACY is not selected either. * The advice at the top of Config.in.legacy to add a hidden WRAP option to select BR2_LEGACY was not heeded. * The advice at the top of Config.in.legacy to use the old string option as the default for the new string option was not heeded. In this case, the variable was not just renamed, as the old option supported directories only, while the new one supports files too. But since the old option is a subset of the new option, it can still be used to set a useful default. So, this mod turns the legacy option back to a string, adds a hidden bool WRAP option to set BR2_LEGACY when the string is non emoty, and uses the legacy option to set the default for the new option. Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- Config.in.legacy | 11 +++++++++-- boot/uboot/Config.in | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 2811c7b76c..c8039ba9b9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -567,12 +567,19 @@ config BR2_PACKAGE_QT5QUICK1 from upstream starting from Qt 5.6. config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR - bool "uboot custom patch dir removed" - select BR2_LEGACY + string "uboot custom patch dir has been removed" help The uboot custom patch directory option has been removed. Use the improved BR2_TARGET_UBOOT_PATCH option instead. +config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR_WRAP + bool + default y if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR != "" + select BR2_LEGACY + +# Note: BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR is still referenced from +# boot/uboot/Config.in + config BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID bool "xf86-input-void removed" select BR2_LEGACY diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 3b4bfac070..2a9f14a121 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -95,6 +95,7 @@ config BR2_TARGET_UBOOT_VERSION config BR2_TARGET_UBOOT_PATCH string "Custom U-Boot patches" + default BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR != "" # legacy help A space-separated list of patches to apply to U-Boot. Each patch can be described as an URL, a local file path, From aacc224cf81a7638e91ef5835cb1c033de4e1c23 Mon Sep 17 00:00:00 2001 From: James Knight Date: Mon, 19 Dec 2016 19:09:17 -0500 Subject: [PATCH 1952/3392] DEVELOPERS: add entry for rpm Signed-off-by: James Knight Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4f142963e0..a1d8e57f36 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -764,6 +764,7 @@ F: package/glibmm/ F: package/gtkmm3/ F: package/libpqxx/ F: package/pangomm/ +F: package/rpm/ F: package/yad/ N: Jan Pedersen From 9d505b87f6858e3adb61adaa2ed757d94e8664ee Mon Sep 17 00:00:00 2001 From: James Knight Date: Mon, 19 Dec 2016 19:05:14 -0500 Subject: [PATCH 1953/3392] rsyslog: remove non-existent enable/disable systemd options The configuration flags `--enable-systemd` and `--disable-systemd` do not exist in rsyslog (and may have never existed; most likely copy-paste from other packages which have said options); removing the options. Signed-off-by: James Knight Signed-off-by: Peter Korsgaard --- package/rsyslog/rsyslog.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index a0875b7447..9e74e49dc8 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -66,11 +66,8 @@ endif ifeq ($(BR2_INIT_SYSTEMD),y) RSYSLOG_CONF_OPTS += \ - --enable-systemd \ --with-systemdsystemunitdir=/usr/lib/systemd/system RSYSLOG_DEPENDENCIES += systemd -else -RSYSLOG_CONF_OPTS += --disable-systemd endif define RSYSLOG_INSTALL_INIT_SYSV From a5ba775ec5c92bd0ac1c2c25e0afad983951cc49 Mon Sep 17 00:00:00 2001 From: James Knight Date: Mon, 19 Dec 2016 19:05:15 -0500 Subject: [PATCH 1954/3392] rsyslog: enable journal plugins when using systemd The rsyslog package provides input and output plugins for journald which are disabled by default. The following adds the option to include `imjournal` and `omjournal` modules when building for a systemd target. Signed-off-by: James Knight Signed-off-by: Peter Korsgaard --- package/rsyslog/rsyslog.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 9e74e49dc8..3254d99933 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -66,8 +66,14 @@ endif ifeq ($(BR2_INIT_SYSTEMD),y) RSYSLOG_CONF_OPTS += \ + --enable-imjournal \ + --enable-omjournal \ --with-systemdsystemunitdir=/usr/lib/systemd/system RSYSLOG_DEPENDENCIES += systemd +else +RSYSLOG_CONF_OPTS += \ + --disable-imjournal \ + --disable-omjournal endif define RSYSLOG_INSTALL_INIT_SYSV From 3a65d8678486a4510b07daf18286fe347daf6d76 Mon Sep 17 00:00:00 2001 From: James Knight Date: Mon, 19 Dec 2016 19:03:50 -0500 Subject: [PATCH 1955/3392] linux: cleanup dead custom-local option The option `BR2_LINUX_KERNEL_CUSTOM_LOCAL` no longer exists (see commit e782cd5b1bc231dda527d5d0a04e6a338669b92c [1]); removing the option. Note that this legacy option has already been handled (Config.in.legacy) in the mentioned commit. Signed-off-by: James Knight Signed-off-by: Peter Korsgaard --- linux/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index e43b88d9f8..f64a8dc5d9 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -110,7 +110,6 @@ config BR2_LINUX_KERNEL_VERSION config BR2_LINUX_KERNEL_PATCH string "Custom kernel patches" - depends on !BR2_LINUX_KERNEL_CUSTOM_LOCAL help A space-separated list of patches to apply to the kernel. Each patch can be described as an URL, a local file From 05125810b5d21d92ee12c386b5fcb41a5383f6b2 Mon Sep 17 00:00:00 2001 From: James Knight Date: Mon, 19 Dec 2016 19:03:51 -0500 Subject: [PATCH 1956/3392] linux-headers: cleanup dead custom-local option The option `BR2_LINUX_KERNEL_CUSTOM_LOCAL` no longer exists (see commit e782cd5b1bc231dda527d5d0a04e6a338669b92c [1]); removing the option. Note that this legacy option has already been handled (Config.in.legacy) in the mentioned commit. Signed-off-by: James Knight Signed-off-by: Peter Korsgaard --- package/linux-headers/linux-headers.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk index 0900778314..8f339cfec5 100644 --- a/package/linux-headers/linux-headers.mk +++ b/package/linux-headers/linux-headers.mk @@ -17,9 +17,6 @@ LINUX_HEADERS_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_TARBALL))) LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_TARBALL)) BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_SOURCE) -else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_LOCAL),y) -LINUX_HEADERS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH)) -LINUX_HEADERS_SITE_METHOD = local else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y) LINUX_HEADERS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL)) LINUX_HEADERS_SITE_METHOD = git From 44a563dbc04ec8e51c5262201cd1745617055b78 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Dec 2016 10:02:52 -0300 Subject: [PATCH 1957/3392] busybox: bump to version 1.26.0 Drop upstream patch. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...ve-free-prev_hist-out-of-signal-path.patch | 48 ------------------- package/busybox/busybox.hash | 6 +-- package/busybox/busybox.mk | 2 +- 3 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 package/busybox/0003-top-move-free-prev_hist-out-of-signal-path.patch diff --git a/package/busybox/0003-top-move-free-prev_hist-out-of-signal-path.patch b/package/busybox/0003-top-move-free-prev_hist-out-of-signal-path.patch deleted file mode 100644 index f5e2942013..0000000000 --- a/package/busybox/0003-top-move-free-prev_hist-out-of-signal-path.patch +++ /dev/null @@ -1,48 +0,0 @@ -From aedc3fe19fac368dc363050e0387d263b7e01cc6 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Fri, 19 Aug 2016 11:07:31 +0200 -Subject: [PATCH] top: move free(prev_hist) out of signal path - -It was seen being called recursively on repeated signals, -leading to double free - -Signed-off-by: Denys Vlasenko -Backported-from: https://git.busybox.net/busybox/commit/?id=aedc3fe19fac368dc363050e0387d263b7e01cc6 -Signed-off-by: Luca Ceresoli - ---- - procps/top.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/procps/top.c b/procps/top.c -index 73cd285..6f7f7d3 100644 ---- a/procps/top.c -+++ b/procps/top.c -@@ -728,12 +728,6 @@ static void reset_term(void) - { - if (!OPT_BATCH_MODE) - tcsetattr_stdin_TCSANOW(&initial_settings); -- if (ENABLE_FEATURE_CLEAN_UP) { -- clearmems(); --# if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE -- free(prev_hist); --# endif -- } - } - - static void sig_catcher(int sig) -@@ -1258,5 +1252,11 @@ int top_main(int argc UNUSED_PARAM, char **argv) - #if ENABLE_FEATURE_USE_TERMIOS - reset_term(); - #endif -+ if (ENABLE_FEATURE_CLEAN_UP) { -+ clearmems(); -+#if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE -+ free(prev_hist); -+#endif -+ } - return EXIT_SUCCESS; - } --- -2.7.4 - diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 8306de979d..b6f9fedd71 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,3 +1,3 @@ -# From http://busybox.net/downloads/busybox-1.25.1.tar.bz2.sign -md5 4f4c5de50b479b11ff636d7d8eb902a2 busybox-1.25.1.tar.bz2 -sha1 8b227b3efdb4c4aa94750f80cc63429aec6daa0b busybox-1.25.1.tar.bz2 +# From http://busybox.net/downloads/busybox-1.26.0.tar.bz2.sign +md5 362acc60bd94343aa36d98beb1f0831f busybox-1.26.0.tar.bz2 +sha1 7e3a85b698c4d74f5fa374d3f3774b064053ae17 busybox-1.26.0.tar.bz2 diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f4a241d38b..d7751b53e9 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.25.1 +BUSYBOX_VERSION = 1.26.0 BUSYBOX_SITE = http://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPLv2 From e4aa7f84ec4d12bfc507aa2d80c430406cc27abe Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Dec 2016 10:39:14 -0300 Subject: [PATCH 1958/3392] sudo: bump to version 1.8.19 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/sudo/sudo.hash | 2 +- package/sudo/sudo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index c6f5be3ab4..5db547f7c4 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,2 +1,2 @@ # From: http://www.sudo.ws/download.html -sha256 e5a0471c721281a693025bbde33ebd9d3db43245d83ab8516bbfc23980379434 sudo-1.8.18p1.tar.gz +sha256 1130923534b62c18b40b529c6877d1a020db93f876617b56a569d0a1133d0228 sudo-1.8.19.tar.gz diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 3643d55dbc..ee245a1418 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUDO_VERSION = 1.8.18p1 +SUDO_VERSION = 1.8.19 SUDO_SITE = http://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC BSD-3c SUDO_LICENSE_FILES = doc/LICENSE From 41b16d2aed5c51276db7e6292b3f7ffbe9816f9f Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 20 Dec 2016 15:28:51 +0100 Subject: [PATCH 1959/3392] python-cryptography: bump to version 1.7.1 Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-cryptography/python-cryptography.hash | 4 ++-- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 60fe3eb8fa..7738d23490 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/cryptography/json, sha256 locally computed -md5 f977a6ddb38b071213c0157fc77c62ab cryptography-1.5.2.tar.gz -sha256 eb8875736734e8e870b09be43b17f40472dc189b1c422a952fa8580768204832 cryptography-1.5.2.tar.gz +md5 2f63dee6ace602d1d20d1995f8538015 cryptography-1.7.1.tar.gz +sha256 953fef7d40a49a795f4d955c5ce4338abcec5dea822ed0414ed30348303fdb4c cryptography-1.7.1.tar.gz diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 75e6bb364b..d4e18ec152 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 1.5.2 +PYTHON_CRYPTOGRAPHY_VERSION = 1.7.1 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://pypi.python.org/packages/03/1a/60984cb85cc38c4ebdfca27b32a6df6f1914959d8790f5a349608c78be61 +PYTHON_CRYPTOGRAPHY_SITE = https://pypi.python.org/packages/82/f7/d6dfd7595910a20a563a83a762bf79a253c4df71759c3b228accb3d7e5e4 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3c PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From 2d7b73cf75daedd4a198a75546308fedae7c9467 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 20 Dec 2016 15:28:52 +0100 Subject: [PATCH 1960/3392] python-paramiko: bump to version 2.1.1 Replace wrong runtime dependencies with python-pyasn and python-cryptography. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-paramiko/Config.in | 8 ++++++-- package/python-paramiko/python-paramiko.hash | 4 ++-- package/python-paramiko/python-paramiko.mk | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index 4c16a9a696..aad85cb134 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,10 +1,14 @@ config BR2_PACKAGE_PYTHON_PARAMIKO bool "python-paramiko" + depends on BR2_INSTALL_LIBSTDCPP # python-pyasn select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYCRYPTO # runtime - select BR2_PACKAGE_PYTHON_ECDSA # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_PYASN # runtime help SSH2 protocol library. https://github.com/paramiko/paramiko/ + +comment "python-paramiko needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index f2aedc7a21..fca8fd754b 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/paramiko/json, sha256 locally computed -md5 6312aee79892801cf5a624eb4f8fd864 paramiko-2.0.2.tar.gz -sha256 411bf90fa22b078a923ff19ef9772c1115a0953702db93549a2848acefd141dc paramiko-2.0.2.tar.gz +md5 9e8abe635baa6bb75a4cd55dcb56a264 paramiko-2.1.1.tar.gz +sha256 d51dada7ad0736c116f8bfe3263627925947e4a50e61436a83d58bfe7055b575 paramiko-2.1.1.tar.gz diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index e616049e14..6c0df4d9fb 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.0.2 +PYTHON_PARAMIKO_VERSION = 2.1.1 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://pypi.python.org/packages/6b/4e/971b8c917456a2ec9666311f7e695493002a64022397cd668150b5efd2a8 +PYTHON_PARAMIKO_SITE = https://pypi.python.org/packages/d1/5a/ebd00d884f30baf208359a027eb7b38372d81d0c004724bb1aa71ae43b37 PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPLv2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE From 8812cffe996c8d0cbd48bf7e565921ba68d5d293 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Tue, 20 Dec 2016 22:40:48 +0530 Subject: [PATCH 1961/3392] can-utils: bump version This version bump also fixes: http://autobuild.buildroot.net/results/0e5/0e5242376ff6aa82e89ed1172350e05009d48156 Signed-off-by: Rahul Bedarkar Cc: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/can-utils/can-utils.hash | 2 +- package/can-utils/can-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/can-utils/can-utils.hash b/package/can-utils/can-utils.hash index 5e0bcccf58..64c4cf6692 100644 --- a/package/can-utils/can-utils.hash +++ b/package/can-utils/can-utils.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 9899f8838d52459769b61ba3cb2d1e079a5d28fbef1a23859489753da91fce82 can-utils-64edc021d22441002028bc451548b9e7f1874b91.tar.gz +sha256 c4b6b347c1c165a64c1156bb8816bce557945dd770f61b8bdc8fdb7c0744af27 can-utils-c3305fdd515464153d20199db232b6124bc962c0.tar.gz diff --git a/package/can-utils/can-utils.mk b/package/can-utils/can-utils.mk index 46caf62a19..6be41a62b0 100644 --- a/package/can-utils/can-utils.mk +++ b/package/can-utils/can-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAN_UTILS_VERSION = 64edc021d22441002028bc451548b9e7f1874b91 +CAN_UTILS_VERSION = c3305fdd515464153d20199db232b6124bc962c0 CAN_UTILS_SITE = $(call github,linux-can,can-utils,$(CAN_UTILS_VERSION)) CAN_UTILS_AUTORECONF = YES From 6be22624c883cb036be461e2135c1dcef4086bdd Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Dec 2016 11:48:26 -0300 Subject: [PATCH 1962/3392] linux-headers: kill 3.14.x and 4.{5, 6, 7}.x series These aren't supported upstream any more so remove the options and add them to legacy. Also switch the older deprecations that used 3.14.x to 3.12.x Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- Config.in.legacy | 52 ++++++++++++++++++++++++---- package/linux-headers/Config.in.host | 21 ----------- 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index c8039ba9b9..cdadbd8f59 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,46 @@ endif ############################################################################### comment "Legacy options removed in 2017.02" +config BR2_KERNEL_HEADERS_4_7 + bool "kernel headers version 4.7.x are no longer supported" + select BR2_KERNEL_HEADERS_4_4 + select BR2_LEGACY + help + Version 4.7.x of the Linux kernel headers are no longer + maintained upstream and are now removed. As an alternative, + version 4.4.x of the headers have been automatically + selected in your configuration. + +config BR2_KERNEL_HEADERS_4_6 + bool "kernel headers version 4.6.x are no longer supported" + select BR2_KERNEL_HEADERS_4_4 + select BR2_LEGACY + help + Version 4.6.x of the Linux kernel headers are no longer + maintained upstream and are now removed. As an alternative, + version 4.4.x of the headers have been automatically + selected in your configuration. + +config BR2_KERNEL_HEADERS_4_5 + bool "kernel headers version 4.5.x are no longer supported" + select BR2_KERNEL_HEADERS_4_4 + select BR2_LEGACY + help + Version 4.5.x of the Linux kernel headers are no longer + maintained upstream and are now removed. As an alternative, + version 4.4.x of the headers have been automatically + selected in your configuration. + +config BR2_KERNEL_HEADERS_3_14 + bool "kernel headers version 3.14.x are no longer supported" + select BR2_KERNEL_HEADERS_3_12 + select BR2_LEGACY + help + Version 3.14.x of the Linux kernel headers are no longer + maintained upstream and are now removed. As an alternative, + version 3.12.x of the headers have been automatically + selected in your configuration. + config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS bool "musl-cross 1.1.12 toolchain removed" select BR2_LEGACY @@ -589,12 +629,12 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID config BR2_KERNEL_HEADERS_3_17 bool "kernel headers version 3.17.x are no longer supported" - select BR2_KERNEL_HEADERS_3_14 + select BR2_KERNEL_HEADERS_3_12 select BR2_LEGACY help Version 3.17.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.14.x of the headers have been + As an alternative, version 3.12.x of the headers have been automatically selected in your configuration. config BR2_GDB_VERSION_7_7 @@ -735,12 +775,12 @@ config BR2_PACKAGE_CUPS_PDFTOPS config BR2_KERNEL_HEADERS_3_16 bool "kernel headers version 3.16.x are no longer supported" - select BR2_KERNEL_HEADERS_3_14 + select BR2_KERNEL_HEADERS_3_12 select BR2_LEGACY help Version 3.16.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.14.x of the headers have been + As an alternative, version 3.12.x of the headers have been automatically selected in your configuration. config BR2_PACKAGE_PYTHON_PYXML @@ -971,12 +1011,12 @@ config BR2_KERNEL_HEADERS_3_13 config BR2_KERNEL_HEADERS_3_15 bool "kernel headers version 3.15.x are no longer supported" - select BR2_KERNEL_HEADERS_3_14 + select BR2_KERNEL_HEADERS_3_12 select BR2_LEGACY help Version 3.15.x of the Linux kernel headers have been deprecated for more than four buildroot releases and are now removed. - As an alternative, version 3.14.x of the headers have been + As an alternative, version 3.12.x of the headers have been automatically selected in your configuration. config BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a95b41d0a6..4ab562ce88 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -46,11 +46,6 @@ choice depends on !BR2_nios2 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - config BR2_KERNEL_HEADERS_3_14 - bool "Linux 3.14.x kernel headers" - depends on !BR2_nios2 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 - config BR2_KERNEL_HEADERS_3_18 bool "Linux 3.18.x kernel headers" depends on !BR2_nios2 @@ -64,18 +59,6 @@ choice bool "Linux 4.4.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 - config BR2_KERNEL_HEADERS_4_5 - bool "Linux 4.5.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 - - config BR2_KERNEL_HEADERS_4_6 - bool "Linux 4.6.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 - - config BR2_KERNEL_HEADERS_4_7 - bool "Linux 4.7.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - config BR2_KERNEL_HEADERS_4_8 bool "Linux 4.8.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 @@ -235,15 +218,11 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.104" if BR2_KERNEL_HEADERS_3_10 default "3.12.69" if BR2_KERNEL_HEADERS_3_12 - default "3.14.79" if BR2_KERNEL_HEADERS_3_14 default "3.18.45" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.36" if BR2_KERNEL_HEADERS_4_1 default "4.4.39" if BR2_KERNEL_HEADERS_4_4 - default "4.5.7" if BR2_KERNEL_HEADERS_4_5 - default "4.6.7" if BR2_KERNEL_HEADERS_4_6 - default "4.7.10" if BR2_KERNEL_HEADERS_4_7 default "4.8.15" if BR2_KERNEL_HEADERS_4_8 default "4.9" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 75c3c94de92b3c8840306aefbfe8daeb3cb65c2c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 20 Dec 2016 16:45:48 -0300 Subject: [PATCH 1963/3392] gdk-pixbuf: security bump to version 2.36.2 Fixes: * Fix a NULL pointer dereference (#776026) * Fix a memory leak (#776020) * Avoid a buffer overrun in the qtif loader ($#775648) * Fix a crash in the bmp loader (#775242) * Fix crash opening pnm images with large dimensions (#775232) * Prevent buffer overflow in the pixdata loader (#775693) 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 5508fd2d97..fc46b66b06 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.36/gdk-pixbuf-2.36.1.sha256sum -sha256 9d5ba72070460c1b5b74115d395a3e33daeb7b7b67fb256cdccc9d7187c42a38 gdk-pixbuf-2.36.1.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.2.sha256sum +sha256 3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d gdk-pixbuf-2.36.2.tar.xz diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 4f1fe59c8f..39546024d8 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,7 +5,7 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.36 -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 d204d962897961faa12abce2569b77d7f076ed10 Mon Sep 17 00:00:00 2001 From: Bryce Ferguson Date: Mon, 19 Dec 2016 15:17:29 -0600 Subject: [PATCH 1964/3392] pure-ftpd: Added pure-ftpwho config option Added the pure-ftpwho config option. When selected, the --with-ftpwho compiler option is passed which enabled the pure-ftpwho command. Signed-off-by: Bryce Ferguson Signed-off-by: Peter Korsgaard --- package/pure-ftpd/Config.in | 11 +++++++++++ package/pure-ftpd/pure-ftpd.mk | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/package/pure-ftpd/Config.in b/package/pure-ftpd/Config.in index c1b2529db9..85fdef30eb 100644 --- a/package/pure-ftpd/Config.in +++ b/package/pure-ftpd/Config.in @@ -10,3 +10,14 @@ config BR2_PACKAGE_PURE_FTPD well as hosting providers. http://www.pureftpd.org + +if BR2_PACKAGE_PURE_FTPD + +config BR2_PACKAGE_PURE_FTPD_FTPWHO + bool "ftpwho" + help + Enable the pure-ftpd command. Pure-ftpwho shows current Pure-ftpd + client sessions. Only the system administrator may run this. Output + can be text (default), HTML, XML data and parser-optimized. + +endif diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index ba4096c281..80e432af56 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -45,4 +45,8 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) PURE_FTPD_CONF_ENV += ax_cv_check_cflags___fPIE=no ax_cv_check_ldflags___fPIE=no endif +ifeq ($(BR2_PACKAGE_PURE_FTPD_FTPWHO),y) +PURE_FTPD_CONF_OPTS += --with-ftpwho +endif + $(eval $(autotools-package)) From 325f79bb033e305d371d675e70ecfee2e1fb0eb4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 20 Dec 2016 22:53:47 +0100 Subject: [PATCH 1965/3392] busybox: adjust nommu swaponoff handling for busybox 1.26.0+ Fixes: http://autobuild.buildroot.net/results/dfe/dfec2c0626ab087325fd869bcbe0b9dc354d788c/ Busybox 1.26.0 gained separate config options for swapon / swapoff: commit f417ffd88f194bbfd18605882ee242190c1bab34 Author: Denys Vlasenko Date: Mon Nov 14 17:30:50 2016 +0100 Make swapon and swapoff individually selectable. For example, without swapoff, code shrinks by 277 bytes. Signed-off-by: Denys Vlasenko So adjust busybox.config and the logic to disable these applets for nommu builds for the new names. Signed-off-by: Peter Korsgaard Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.config | 3 ++- package/busybox/busybox.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 02b1ee1b62..3e3b5d4ae1 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -633,9 +633,10 @@ CONFIG_READPROFILE=y # CONFIG_RTCWAKE is not set # CONFIG_SCRIPT is not set # CONFIG_SCRIPTREPLAY is not set -CONFIG_SWAPONOFF=y +CONFIG_SWAPON=y # CONFIG_FEATURE_SWAPON_DISCARD is not set # CONFIG_FEATURE_SWAPON_PRI is not set +CONFIG_SWAPOFF=y CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index d7751b53e9..40fb4d96a3 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -96,7 +96,8 @@ endef else define BUSYBOX_SET_MMU $(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPONOFF,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPOFF,$(BUSYBOX_BUILD_CONFIG)) $(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG)) $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG)) $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BASH_COMPAT,$(BUSYBOX_BUILD_CONFIG)) From d2a349c911ecfa380014e90f390b921a4c3dedb0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 20 Dec 2016 14:02:37 +0100 Subject: [PATCH 1966/3392] tor: security bump to 0.2.8.12 Fixes CVE-2016-1254 - One byte past an allocated buffer read while parsing hidden service descriptors: https://blog.torproject.org/blog/tor-02812-released Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index b13fc4a64c..4fdb82c67f 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 c88b8c57b34ebf44b731df5d68f73eb6b6708bcf4e42cf7b4817fd4e304c9c4d tor-0.2.8.10.tar.gz +sha256 b35748f2839cf8ce9910b677ea873463495ac88689244c007ed038f6887f4aaf tor-0.2.8.12.tar.gz diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 4f335228d3..5606cc2bf6 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.2.8.10 +TOR_VERSION = 0.2.8.12 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3c TOR_LICENSE_FILES = LICENSE From 8436db1a80d97c2a134bafd19742d48070da266c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 20 Dec 2016 23:02:07 +0100 Subject: [PATCH 1967/3392] mimic: needs wchar support Fixes: http://autobuild.buildroot.net/results/9f7/9f7c1af4b9fd8331672c9096821db91d5f7f3aa1/ http://autobuild.buildroot.net/results/47f/47f5ec3fabefd85e62b675142bd6728904acd5d8/ At the same time fixup space/tabs for 'help' option. Signed-off-by: Peter Korsgaard --- package/mimic/Config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/mimic/Config.in b/package/mimic/Config.in index 6cd4c2096a..757ac9ed58 100644 --- a/package/mimic/Config.in +++ b/package/mimic/Config.in @@ -1,6 +1,10 @@ +comment "mimic needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_MIMIC bool "mimic" - help + depends on BR2_USE_WCHAR + help Mimic is a fast, lightweight Text-to-speech engine developed by Mycroft A.I. and VocaliD, based on Carnegie Mellon University's Flite (Festival-Lite) software. Mimic takes in From eed5ce47c72e8e8e31bf85b645f87536dfaf6808 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Wed, 21 Dec 2016 10:50:13 +0100 Subject: [PATCH 1968/3392] package/mimic: indentation cleanup Signed-off-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- package/mimic/Config.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mimic/Config.in b/package/mimic/Config.in index 757ac9ed58..79641d3790 100644 --- a/package/mimic/Config.in +++ b/package/mimic/Config.in @@ -5,12 +5,12 @@ config BR2_PACKAGE_MIMIC bool "mimic" depends on BR2_USE_WCHAR help - Mimic is a fast, lightweight Text-to-speech engine developed - by Mycroft A.I. and VocaliD, based on Carnegie Mellon - University's Flite (Festival-Lite) software. Mimic takes in - text and reads it out loud to create a high quality voice. + Mimic is a fast, lightweight Text-to-speech engine developed + by Mycroft A.I. and VocaliD, based on Carnegie Mellon + University's Flite (Festival-Lite) software. Mimic takes in + text and reads it out loud to create a high quality voice. - https://github.com/MycroftAI/mimic + https://github.com/MycroftAI/mimic if BR2_PACKAGE_MIMIC From aa64e33c5176f89ddd1d505b8237e9f4718c2f71 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 20 Dec 2016 22:02:24 +0100 Subject: [PATCH 1969/3392] python-bottle: security bump to 0.12.11 "\r\n" sequences were not properly filtered when handling redirections. This allowed an attacker to perform CRLF attacks such as HTTP header injection: https://github.com/bottlepy/bottle/issues/913 Python-bottle now uses setuptools instead of distutils. Signed-off-by: Peter Korsgaard --- package/python-bottle/python-bottle.hash | 4 ++-- package/python-bottle/python-bottle.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-bottle/python-bottle.hash b/package/python-bottle/python-bottle.hash index 5a589f1e6b..357391d051 100644 --- a/package/python-bottle/python-bottle.hash +++ b/package/python-bottle/python-bottle.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/bottle/json, sha256 locally computed -md5 f5850258a86224a791171e8ecbb66d99 bottle-0.12.9.tar.gz -sha256 fe0a24b59385596d02df7ae7845fe7d7135eea73799d03348aeb9f3771500051 bottle-0.12.9.tar.gz +md5 6c38912f4755ba71d852fbe320bdd61c bottle-0.12.11.tar.gz +sha256 a1958f9725042a9809ebe33d7eadf90d1d563a8bdd6ce5f01849bff7e941a731 bottle-0.12.11.tar.gz diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk index ec0939890d..4757062146 100644 --- a/package/python-bottle/python-bottle.mk +++ b/package/python-bottle/python-bottle.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_BOTTLE_VERSION = 0.12.9 +PYTHON_BOTTLE_VERSION = 0.12.11 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz -PYTHON_BOTTLE_SITE = http://pypi.python.org/packages/source/b/bottle +PYTHON_BOTTLE_SITE = https://pypi.python.org/packages/a1/f6/0db23aeeb40c9a7c5d226b1f70ce63822c567178eee5b623bca3e0cc3bef PYTHON_BOTTLE_LICENSE = MIT # README.rst refers to the file "LICENSE" but it's not included -PYTHON_BOTTLE_SETUP_TYPE = distutils +PYTHON_BOTTLE_SETUP_TYPE = setuptools $(eval $(python-package)) From cafa98b797d92e466f7fbccd6268efcda75f5bb0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 19 Dec 2016 23:26:31 +0100 Subject: [PATCH 1970/3392] uclibc: add patch to fix This commit adds a patch to , to fix a bug introduced in uClibc-ng 1.0.20, and which was causing build failures for at least one package in Buildroot: freeswitch. Fixes: http://autobuild.buildroot.net/results/12c246b058224f68494b84355a29dc4efb85df6d/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...definition-of-__attribute_alloc_size.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/uclibc/0007-sys-cdefs.h-add-definition-of-__attribute_alloc_size.patch diff --git a/package/uclibc/0007-sys-cdefs.h-add-definition-of-__attribute_alloc_size.patch b/package/uclibc/0007-sys-cdefs.h-add-definition-of-__attribute_alloc_size.patch new file mode 100644 index 0000000000..c9421ef938 --- /dev/null +++ b/package/uclibc/0007-sys-cdefs.h-add-definition-of-__attribute_alloc_size.patch @@ -0,0 +1,42 @@ +From dfcc950af1af003ee9e6fc985b5d6b3eb7d408af Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 19 Dec 2016 22:56:30 +0100 +Subject: [PATCH] sys/cdefs.h: add definition of __attribute_alloc_size__ + +Commit cee0b058fa0b4501b289a2da365182d60314d746 ("add aligned_alloc +required for latest gcc libstdc++") added the prototype of +aligned_alloc() to . This prototype contains +'__attribute_alloc_size__ ((2))', but this is not defined anywhere in +uClibc-ng. + +This commit addresses that by adding the relevant definition in +, borrowed from glibc. + +Signed-off-by: Thomas Petazzoni +--- + include/sys/cdefs.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h +index f725ce9..6cd3811 100644 +--- a/include/sys/cdefs.h ++++ b/include/sys/cdefs.h +@@ -222,6 +222,15 @@ + # define __attribute_malloc__ /* Ignore */ + #endif + ++/* Tell the compiler which arguments to an allocation function ++ indicate the size of the allocation. */ ++#if __GNUC_PREREQ (4, 3) ++# define __attribute_alloc_size__(params) \ ++ __attribute__ ((__alloc_size__ params)) ++#else ++# define __attribute_alloc_size__(params) /* Ignore. */ ++#endif ++ + /* At some point during the gcc 2.96 development the `pure' attribute + for functions was introduced. We don't want to use it unconditionally + (although this would be possible) since it generates warnings. */ +-- +2.7.4 + From 942dad3a531e1a594c4d63fbb714f237d06803ed Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 10:10:25 -0300 Subject: [PATCH 1971/3392] sudo: bump to version 1.8.19p1 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/sudo/sudo.hash | 2 +- package/sudo/sudo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index 5db547f7c4..ef673924e1 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,2 +1,2 @@ # From: http://www.sudo.ws/download.html -sha256 1130923534b62c18b40b529c6877d1a020db93f876617b56a569d0a1133d0228 sudo-1.8.19.tar.gz +sha256 b8afb1cf8736b6c61f171f2bf4b174818d9e00e92ef73da55fabcd01286ffc92 sudo-1.8.19p1.tar.gz diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index ee245a1418..bc2a47b765 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUDO_VERSION = 1.8.19 +SUDO_VERSION = 1.8.19p1 SUDO_SITE = http://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC BSD-3c SUDO_LICENSE_FILES = doc/LICENSE From 961132a393dd6feb8820dc08ef6223808b39a780 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 10:25:27 -0300 Subject: [PATCH 1972/3392] nmap: bump to version 7.40 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/nmap/nmap.hash | 4 ++-- package/nmap/nmap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nmap/nmap.hash b/package/nmap/nmap.hash index 2a26557b73..239ca13816 100644 --- a/package/nmap/nmap.hash +++ b/package/nmap/nmap.hash @@ -1,2 +1,2 @@ -# From https://nmap.org/dist/sigs/nmap-7.31.tar.bz2.digest.txt -sha256 cb9f4e03c0771c709cd47dc8fc6ac3421eadbdd313f0aae52276829290583842 nmap-7.31.tar.bz2 +# From https://nmap.org/dist/sigs/nmap-7.40.tar.bz2.digest.txt +sha256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 nmap-7.40.tar.bz2 diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk index 3087903a92..6e178b1f1f 100644 --- a/package/nmap/nmap.mk +++ b/package/nmap/nmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -NMAP_VERSION = 7.31 +NMAP_VERSION = 7.40 NMAP_SITE = http://nmap.org/dist NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 NMAP_DEPENDENCIES = libpcap pcre From 47943a71446158056459a7e10195c89d222e7824 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 11:47:10 -0300 Subject: [PATCH 1973/3392] libnftnl: bump to version 1.0.7 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...libnftnl_xfree-to-avoid-symbol-namin.patch | 563 +++++++++++------- package/libnftnl/libnftnl.hash | 4 +- package/libnftnl/libnftnl.mk | 2 +- 3 files changed, 339 insertions(+), 230 deletions(-) diff --git a/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch b/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch index fc96a126a2..6f5be4e7ef 100644 --- a/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch +++ b/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch @@ -20,15 +20,14 @@ To solve this, this patch renames the libnftnl xfree() function to libnftnl_xfree(). Signed-off-by: Thomas Petazzoni -[Gustavo: update for version 1.0.5] - +[Gustavo: update for version 1.0.7] Signed-off-by: Gustavo Zacarias --- include/utils.h | 2 +- - src/chain.c | 28 ++++++++++++++-------------- + src/chain.c | 36 ++++++++++++++++++------------------ src/common.c | 2 +- src/expr.c | 4 ++-- - src/expr/data_reg.c | 4 ++-- + src/expr/data_reg.c | 2 +- src/expr/dynset.c | 2 +- src/expr/immediate.c | 2 +- src/expr/log.c | 6 +++--- @@ -36,19 +35,19 @@ Signed-off-by: Gustavo Zacarias src/expr/match.c | 6 +++--- src/expr/target.c | 6 +++--- src/gen.c | 2 +- - src/mxml.c | 2 +- - src/rule.c | 30 +++++++++++++++--------------- + src/object.c | 14 +++++++------- + src/rule.c | 32 ++++++++++++++++---------------- src/ruleset.c | 2 +- - src/set.c | 22 +++++++++++----------- - src/set_elem.c | 20 ++++++++++---------- + src/set.c | 26 +++++++++++++------------- + src/set_elem.c | 28 ++++++++++++++-------------- src/table.c | 14 +++++++------- src/trace.c | 14 +++++++------- src/udata.c | 2 +- src/utils.c | 2 +- - 21 files changed, 87 insertions(+), 87 deletions(-) + 21 files changed, 103 insertions(+), 103 deletions(-) diff --git a/include/utils.h b/include/utils.h -index 46ff18a..0320c96 100644 +index 924df32..f02fce7 100644 --- a/include/utils.h +++ b/include/utils.h @@ -19,7 +19,7 @@ @@ -61,98 +60,121 @@ index 46ff18a..0320c96 100644 #define div_round_up(n, d) (((n) + (d) - 1) / (d)) diff --git a/src/chain.c b/src/chain.c -index 990c576..b8f1e1f 100644 +index 49cd094..444cb79 100644 --- a/src/chain.c +++ b/src/chain.c -@@ -96,13 +96,13 @@ EXPORT_SYMBOL_ALIAS(nftnl_chain_alloc, nft_chain_alloc); +@@ -96,14 +96,14 @@ EXPORT_SYMBOL_ALIAS(nftnl_chain_alloc, nft_chain_alloc); void nftnl_chain_free(const struct nftnl_chain *c) { - if (c->table != NULL) + if (c->flags & (1 << NFTNL_CHAIN_NAME)) +- xfree(c->name); ++ nftnl_xfree(c->name); + if (c->flags & (1 << NFTNL_CHAIN_TABLE)) - xfree(c->table); + nftnl_xfree(c->table); - if (c->type != NULL) + if (c->flags & (1 << NFTNL_CHAIN_TYPE)) - xfree(c->type); + nftnl_xfree(c->type); - if (c->dev != NULL) + if (c->flags & (1 << NFTNL_CHAIN_DEV)) - xfree(c->dev); -+ nftnl_xfree(c->dev); - - xfree(c); ++ nftnl_xfree(c->dev); + nftnl_xfree(c); } EXPORT_SYMBOL_ALIAS(nftnl_chain_free, nft_chain_free); -@@ -120,7 +120,7 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) +@@ -120,15 +120,15 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) + switch (attr) { + case NFTNL_CHAIN_NAME: +- xfree(c->name); ++ nftnl_xfree(c->name); + break; case NFTNL_CHAIN_TABLE: - if (c->table) { -- xfree(c->table); -+ nftnl_xfree(c->table); - c->table = NULL; - } +- xfree(c->table); ++ nftnl_xfree(c->table); break; -@@ -128,7 +128,7 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) + case NFTNL_CHAIN_USE: break; case NFTNL_CHAIN_TYPE: - if (c->type) { -- xfree(c->type); -+ nftnl_xfree(c->type); - c->type = NULL; - } +- xfree(c->type); ++ nftnl_xfree(c->type); break; -@@ -143,7 +143,7 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) + case NFTNL_CHAIN_HOOKNUM: + case NFTNL_CHAIN_PRIO: +@@ -139,7 +139,7 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) + case NFTNL_CHAIN_FAMILY: break; case NFTNL_CHAIN_DEV: - if (c->dev) { -- xfree(c->dev); -+ nftnl_xfree(c->dev); - c->dev = NULL; - } +- xfree(c->dev); ++ nftnl_xfree(c->dev); break; -@@ -179,7 +179,7 @@ void nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, + default: + return; +@@ -168,7 +168,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, + switch(attr) { + case NFTNL_CHAIN_NAME: + if (c->flags & (1 << NFTNL_CHAIN_NAME)) +- xfree(c->name); ++ nftnl_xfree(c->name); + + c->name = strdup(data); + if (!c->name) +@@ -176,7 +176,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, break; case NFTNL_CHAIN_TABLE: - if (c->table) + if (c->flags & (1 << NFTNL_CHAIN_TABLE)) - xfree(c->table); + nftnl_xfree(c->table); c->table = strdup(data); - break; -@@ -209,13 +209,13 @@ void nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, + if (!c->table) +@@ -208,7 +208,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, break; case NFTNL_CHAIN_TYPE: - if (c->type) + if (c->flags & (1 << NFTNL_CHAIN_TYPE)) - xfree(c->type); + nftnl_xfree(c->type); c->type = strdup(data); + if (!c->type) +@@ -216,7 +216,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, break; case NFTNL_CHAIN_DEV: - if (c->dev) + if (c->flags & (1 << NFTNL_CHAIN_DEV)) - xfree(c->dev); + nftnl_xfree(c->dev); c->dev = strdup(data); - break; -@@ -535,7 +535,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) - c->flags |= (1 << NFTNL_CHAIN_NAME); + if (!c->dev) +@@ -540,7 +540,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) + + if (tb[NFTA_CHAIN_NAME]) { + if (c->flags & (1 << NFTNL_CHAIN_NAME)) +- xfree(c->name); ++ nftnl_xfree(c->name); + c->name = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_NAME])); + if (!c->name) + return -1; +@@ -548,7 +548,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) } if (tb[NFTA_CHAIN_TABLE]) { -- xfree(c->table); -+ nftnl_xfree(c->table); + if (c->flags & (1 << NFTNL_CHAIN_TABLE)) +- xfree(c->table); ++ nftnl_xfree(c->table); c->table = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_TABLE])); - c->flags |= (1 << NFTNL_CHAIN_TABLE); - } -@@ -562,7 +562,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) - c->flags |= (1 << NFTNL_CHAIN_HANDLE); + if (!c->table) + return -1; +@@ -578,7 +578,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) } if (tb[NFTA_CHAIN_TYPE]) { -- xfree(c->type); -+ nftnl_xfree(c->type); + if (c->flags & (1 << NFTNL_CHAIN_TYPE)) +- xfree(c->type); ++ nftnl_xfree(c->type); c->type = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_TYPE])); - c->flags |= (1 << NFTNL_CHAIN_TYPE); - } -@@ -976,7 +976,7 @@ void nftnl_chain_list_free(struct nftnl_chain_list *list) + if (!c->type) + return -1; +@@ -889,7 +889,7 @@ void nftnl_chain_list_free(struct nftnl_chain_list *list) list_del(&r->head); nftnl_chain_free(r); } @@ -161,7 +183,7 @@ index 990c576..b8f1e1f 100644 } EXPORT_SYMBOL_ALIAS(nftnl_chain_list_free, nft_chain_list_free); -@@ -1061,6 +1061,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_chain_list_iter_next, nft_chain_list_iter_next); +@@ -975,6 +975,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_chain_list_iter_next, nft_chain_list_iter_next); void nftnl_chain_list_iter_destroy(struct nftnl_chain_list_iter *iter) { @@ -183,7 +205,7 @@ index bf4176c..98f8012 100644 EXPORT_SYMBOL_ALIAS(nftnl_parse_err_free, nft_parse_err_free); diff --git a/src/expr.c b/src/expr.c -index ed07dc4..6c08bd0 100644 +index 8d5c562..47ecd3d 100644 --- a/src/expr.c +++ b/src/expr.c @@ -50,7 +50,7 @@ void nftnl_expr_free(const struct nftnl_expr *expr) @@ -195,7 +217,7 @@ index ed07dc4..6c08bd0 100644 } EXPORT_SYMBOL_ALIAS(nftnl_expr_free, nft_rule_expr_free); -@@ -257,7 +257,7 @@ struct nftnl_expr *nftnl_expr_parse(struct nlattr *attr) +@@ -270,7 +270,7 @@ struct nftnl_expr *nftnl_expr_parse(struct nlattr *attr) return expr; err2: @@ -205,19 +227,10 @@ index ed07dc4..6c08bd0 100644 return NULL; } diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c -index 2a23285..2b1a87e 100644 +index 0249258..994b388 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c -@@ -123,7 +123,7 @@ static int nftnl_data_reg_verdict_xml_parse(union nftnl_data_reg *reg, - NFTNL_XML_OPT, err); - if (chain != NULL) { - if (reg->chain) -- xfree(reg->chain); -+ nftnl_xfree(reg->chain); - - reg->chain = strdup(chain); - } -@@ -511,7 +511,7 @@ void nftnl_free_verdict(const union nftnl_data_reg *data) +@@ -376,7 +376,7 @@ void nftnl_free_verdict(const union nftnl_data_reg *data) switch(data->verdict) { case NFT_JUMP: case NFT_GOTO: @@ -227,10 +240,10 @@ index 2a23285..2b1a87e 100644 default: break; diff --git a/src/expr/dynset.c b/src/expr/dynset.c -index c8d97a5..604600a 100644 +index 20a5004..f3d46a7 100644 --- a/src/expr/dynset.c +++ b/src/expr/dynset.c -@@ -361,7 +361,7 @@ static void nftnl_expr_dynset_free(const struct nftnl_expr *e) +@@ -330,7 +330,7 @@ static void nftnl_expr_dynset_free(const struct nftnl_expr *e) { struct nftnl_expr_dynset *dynset = nftnl_expr_data(e); @@ -238,34 +251,34 @@ index c8d97a5..604600a 100644 + nftnl_xfree(dynset->set_name); } - struct expr_ops expr_ops_dynset = { + static bool nftnl_expr_dynset_cmp(const struct nftnl_expr *e1, diff --git a/src/expr/immediate.c b/src/expr/immediate.c -index eb2ca0f..237f944 100644 +index 0b188cc..6c17f68 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -44,7 +44,7 @@ nftnl_expr_immediate_set(struct nftnl_expr *e, uint16_t type, break; case NFTNL_EXPR_IMM_CHAIN: - if (imm->data.chain) + if (e->flags & (1 << NFTNL_EXPR_IMM_CHAIN)) - xfree(imm->data.chain); + nftnl_xfree(imm->data.chain); imm->data.chain = strdup(data); - break; + if (!imm->data.chain) diff --git a/src/expr/log.c b/src/expr/log.c -index c3dc0a6..ab24686 100644 +index b642255..2b24b6d 100644 --- a/src/expr/log.c +++ b/src/expr/log.c -@@ -38,7 +38,7 @@ static int nftnl_expr_log_set(struct nftnl_expr *e, uint16_t type, +@@ -39,7 +39,7 @@ static int nftnl_expr_log_set(struct nftnl_expr *e, uint16_t type, switch(type) { case NFTNL_EXPR_LOG_PREFIX: - if (log->prefix) + if (log->flags & (1 << NFTNL_EXPR_LOG_PREFIX)) - xfree(log->prefix); + nftnl_xfree(log->prefix); log->prefix = strdup(data); - break; -@@ -152,7 +152,7 @@ nftnl_expr_log_parse(struct nftnl_expr *e, struct nlattr *attr) + if (!log->prefix) +@@ -155,7 +155,7 @@ nftnl_expr_log_parse(struct nftnl_expr *e, struct nlattr *attr) if (tb[NFTA_LOG_PREFIX]) { if (log->prefix) @@ -273,8 +286,8 @@ index c3dc0a6..ab24686 100644 + nftnl_xfree(log->prefix); log->prefix = strdup(mnl_attr_get_str(tb[NFTA_LOG_PREFIX])); - e->flags |= (1 << NFTNL_EXPR_LOG_PREFIX); -@@ -329,7 +329,7 @@ static void nftnl_expr_log_free(const struct nftnl_expr *e) + if (!log->prefix) +@@ -316,7 +316,7 @@ static void nftnl_expr_log_free(const struct nftnl_expr *e) { struct nftnl_expr_log *log = nftnl_expr_data(e); @@ -282,12 +295,12 @@ index c3dc0a6..ab24686 100644 + nftnl_xfree(log->prefix); } - struct expr_ops expr_ops_log = { + static bool nftnl_expr_log_cmp(const struct nftnl_expr *e1, diff --git a/src/expr/lookup.c b/src/expr/lookup.c -index ed32ba6..6e9b0e6 100644 +index 861815f..1955ed3 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c -@@ -258,7 +258,7 @@ static void nftnl_expr_lookup_free(const struct nftnl_expr *e) +@@ -259,7 +259,7 @@ static void nftnl_expr_lookup_free(const struct nftnl_expr *e) { struct nftnl_expr_lookup *lookup = nftnl_expr_data(e); @@ -295,15 +308,15 @@ index ed32ba6..6e9b0e6 100644 + nftnl_xfree(lookup->set_name); } - struct expr_ops expr_ops_lookup = { + static bool nftnl_expr_lookup_cmp(const struct nftnl_expr *e1, diff --git a/src/expr/match.c b/src/expr/match.c -index 2929b43..ec46394 100644 +index dd09e1e..09e35c5 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -50,7 +50,7 @@ nftnl_expr_match_set(struct nftnl_expr *e, uint16_t type, break; case NFTNL_EXPR_MT_INFO: - if (mt->data) + if (e->flags & (1 << NFTNL_EXPR_MT_INFO)) - xfree(mt->data); + nftnl_xfree(mt->data); @@ -312,13 +325,13 @@ index 2929b43..ec46394 100644 @@ -147,7 +147,7 @@ static int nftnl_expr_match_parse(struct nftnl_expr *e, struct nlattr *attr) void *match_data; - if (match->data) + if (e->flags & (1 << NFTNL_EXPR_MT_INFO)) - xfree(match->data); + nftnl_xfree(match->data); match_data = calloc(1, len); if (match_data == NULL) -@@ -237,7 +237,7 @@ static void nftnl_expr_match_free(const struct nftnl_expr *e) +@@ -217,7 +217,7 @@ static void nftnl_expr_match_free(const struct nftnl_expr *e) { struct nftnl_expr_match *match = nftnl_expr_data(e); @@ -326,15 +339,15 @@ index 2929b43..ec46394 100644 + nftnl_xfree(match->data); } - struct expr_ops expr_ops_match = { + static bool nftnl_expr_match_cmp(const struct nftnl_expr *e1, diff --git a/src/expr/target.c b/src/expr/target.c -index 68a7d8a..05f9e5a 100644 +index ed4bf7d..5e28925 100644 --- a/src/expr/target.c +++ b/src/expr/target.c @@ -50,7 +50,7 @@ nftnl_expr_target_set(struct nftnl_expr *e, uint16_t type, break; case NFTNL_EXPR_TG_INFO: - if (tg->data) + if (e->flags & (1 << NFTNL_EXPR_TG_INFO)) - xfree(tg->data); + nftnl_xfree(tg->data); @@ -349,7 +362,7 @@ index 68a7d8a..05f9e5a 100644 target_data = calloc(1, len); if (target_data == NULL) -@@ -238,7 +238,7 @@ static void nftnl_expr_target_free(const struct nftnl_expr *e) +@@ -217,7 +217,7 @@ static void nftnl_expr_target_free(const struct nftnl_expr *e) { struct nftnl_expr_target *target = nftnl_expr_data(e); @@ -357,9 +370,9 @@ index 68a7d8a..05f9e5a 100644 + nftnl_xfree(target->data); } - struct expr_ops expr_ops_target = { + static bool nftnl_expr_target_cmp(const struct nftnl_expr *e1, diff --git a/src/gen.c b/src/gen.c -index 115a105..576771a 100644 +index c69d2f8..0143ea0 100644 --- a/src/gen.c +++ b/src/gen.c @@ -37,7 +37,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_gen_alloc, nft_gen_alloc); @@ -371,33 +384,70 @@ index 115a105..576771a 100644 } EXPORT_SYMBOL_ALIAS(nftnl_gen_free, nft_gen_free); -diff --git a/src/mxml.c b/src/mxml.c -index 51dbf1b..5b2aa57 100644 ---- a/src/mxml.c -+++ b/src/mxml.c -@@ -85,7 +85,7 @@ struct nftnl_expr *nftnl_mxml_expr_parse(mxml_node_t *node, - goto err_expr; +diff --git a/src/object.c b/src/object.c +index 0d3dc2b..542211c 100644 +--- a/src/object.c ++++ b/src/object.c +@@ -47,11 +47,11 @@ EXPORT_SYMBOL(nftnl_obj_alloc); + void nftnl_obj_free(const struct nftnl_obj *obj) + { + if (obj->flags & (1 << NFTNL_OBJ_TABLE)) +- xfree(obj->table); ++ nftnl_xfree(obj->table); + if (obj->flags & (1 << NFTNL_OBJ_NAME)) +- xfree(obj->name); ++ nftnl_xfree(obj->name); + +- xfree(obj); ++ nftnl_xfree(obj); + } + EXPORT_SYMBOL(nftnl_obj_free); + +@@ -74,11 +74,11 @@ void nftnl_obj_set_data(struct nftnl_obj *obj, uint16_t attr, - tree = mxmlLoadString(NULL, xml_text, MXML_OPAQUE_CALLBACK); -- xfree(xml_text); -+ nftnl_xfree(xml_text); + switch (attr) { + case NFTNL_OBJ_TABLE: +- xfree(obj->table); ++ nftnl_xfree(obj->table); + obj->table = strdup(data); + break; + case NFTNL_OBJ_NAME: +- xfree(obj->name); ++ nftnl_xfree(obj->name); + obj->name = strdup(data); + break; + case NFTNL_OBJ_TYPE: +@@ -486,7 +486,7 @@ void nftnl_obj_list_free(struct nftnl_obj_list *list) + list_del(&r->head); + nftnl_obj_free(r); + } +- xfree(list); ++ nftnl_xfree(list); + } + EXPORT_SYMBOL(nftnl_obj_list_free); - if (tree == NULL) - goto err_expr; +@@ -573,6 +573,6 @@ EXPORT_SYMBOL(nftnl_obj_list_iter_next); + + void nftnl_obj_list_iter_destroy(struct nftnl_obj_list_iter *iter) + { +- xfree(iter); ++ nftnl_xfree(iter); + } + EXPORT_SYMBOL(nftnl_obj_list_iter_destroy); diff --git a/src/rule.c b/src/rule.c -index 8ee8648..8158c26 100644 +index 22026a4..256b699 100644 --- a/src/rule.c +++ b/src/rule.c @@ -72,13 +72,13 @@ void nftnl_rule_free(const struct nftnl_rule *r) nftnl_expr_free(e); - if (r->table != NULL) + if (r->flags & (1 << (NFTNL_RULE_TABLE))) - xfree(r->table); + nftnl_xfree(r->table); - if (r->chain != NULL) + if (r->flags & (1 << (NFTNL_RULE_CHAIN))) - xfree(r->chain); + nftnl_xfree(r->chain); - if (r->user.data != NULL) + if (r->flags & (1 << (NFTNL_RULE_USERDATA))) - xfree(r->user.data); + nftnl_xfree(r->user.data); @@ -406,72 +456,83 @@ index 8ee8648..8158c26 100644 } EXPORT_SYMBOL_ALIAS(nftnl_rule_free, nft_rule_free); -@@ -96,13 +96,13 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) +@@ -95,10 +95,10 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) + switch (attr) { case NFTNL_RULE_TABLE: - if (r->table) { -- xfree(r->table); -+ nftnl_xfree(r->table); - r->table = NULL; - } +- xfree(r->table); ++ nftnl_xfree(r->table); break; case NFTNL_RULE_CHAIN: - if (r->chain) { -- xfree(r->chain); -+ nftnl_xfree(r->chain); - r->chain = NULL; - } +- xfree(r->chain); ++ nftnl_xfree(r->chain); + break; + case NFTNL_RULE_HANDLE: + case NFTNL_RULE_COMPAT_PROTO: +@@ -107,7 +107,7 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) + case NFTNL_RULE_FAMILY: + break; + case NFTNL_RULE_USERDATA: +- xfree(r->user.data); ++ nftnl_xfree(r->user.data); break; -@@ -138,13 +138,13 @@ void nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, + } + +@@ -132,7 +132,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, switch(attr) { case NFTNL_RULE_TABLE: - if (r->table) + if (r->flags & (1 << NFTNL_RULE_TABLE)) - xfree(r->table); + nftnl_xfree(r->table); r->table = strdup(data); + if (!r->table) +@@ -140,7 +140,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, break; case NFTNL_RULE_CHAIN: - if (r->chain) + if (r->flags & (1 << NFTNL_RULE_CHAIN)) - xfree(r->chain); + nftnl_xfree(r->chain); r->chain = strdup(data); - break; -@@ -165,7 +165,7 @@ void nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, + if (!r->chain) +@@ -163,7 +163,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, break; case NFTNL_RULE_USERDATA: - if (r->user.data != NULL) + if (r->flags & (1 << NFTNL_RULE_USERDATA)) - xfree(r->user.data); + nftnl_xfree(r->user.data); r->user.data = malloc(data_len); if (!r->user.data) -@@ -434,12 +434,12 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) - return -1; +@@ -436,7 +436,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) if (tb[NFTA_RULE_TABLE]) { -- xfree(r->table); -+ nftnl_xfree(r->table); + if (r->flags & (1 << NFTNL_RULE_TABLE)) +- xfree(r->table); ++ nftnl_xfree(r->table); r->table = strdup(mnl_attr_get_str(tb[NFTA_RULE_TABLE])); - r->flags |= (1 << NFTNL_RULE_TABLE); + if (!r->table) + return -1; +@@ -444,7 +444,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) } if (tb[NFTA_RULE_CHAIN]) { -- xfree(r->chain); -+ nftnl_xfree(r->chain); + if (r->flags & (1 << NFTNL_RULE_CHAIN)) +- xfree(r->chain); ++ nftnl_xfree(r->chain); r->chain = strdup(mnl_attr_get_str(tb[NFTA_RULE_CHAIN])); - r->flags |= (1 << NFTNL_RULE_CHAIN); - } -@@ -460,7 +460,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) + if (!r->chain) + return -1; +@@ -473,7 +473,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) mnl_attr_get_payload(tb[NFTA_RULE_USERDATA]); - if (r->user.data) + if (r->flags & (1 << NFTNL_RULE_USERDATA)) - xfree(r->user.data); + nftnl_xfree(r->user.data); r->user.len = mnl_attr_get_payload_len(tb[NFTA_RULE_USERDATA]); -@@ -1054,7 +1054,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_next, nft_rule_expr_iter_next); +@@ -915,7 +915,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_next, nft_rule_expr_iter_next); void nftnl_expr_iter_destroy(struct nftnl_expr_iter *iter) { @@ -480,7 +541,7 @@ index 8ee8648..8158c26 100644 } EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_destroy, nft_rule_expr_iter_destroy); -@@ -1084,7 +1084,7 @@ void nftnl_rule_list_free(struct nftnl_rule_list *list) +@@ -976,7 +976,7 @@ void nftnl_rule_list_free(struct nftnl_rule_list *list) list_del(&r->head); nftnl_rule_free(r); } @@ -489,7 +550,7 @@ index 8ee8648..8158c26 100644 } EXPORT_SYMBOL_ALIAS(nftnl_rule_list_free, nft_rule_list_free); -@@ -1175,6 +1175,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_next, nft_rule_list_iter_next); +@@ -1068,6 +1068,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_next, nft_rule_list_iter_next); void nftnl_rule_list_iter_destroy(const struct nftnl_rule_list_iter *iter) { @@ -498,10 +559,10 @@ index 8ee8648..8158c26 100644 } EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_destroy, nft_rule_list_iter_destroy); diff --git a/src/ruleset.c b/src/ruleset.c -index 414b7c4..6ec38c6 100644 +index b6ca565..0867e2a 100644 --- a/src/ruleset.c +++ b/src/ruleset.c -@@ -74,7 +74,7 @@ void nftnl_ruleset_free(const struct nftnl_ruleset *r) +@@ -71,7 +71,7 @@ void nftnl_ruleset_free(const struct nftnl_ruleset *r) nftnl_set_list_free(r->set_list); if (r->flags & (1 << NFTNL_RULESET_RULELIST)) nftnl_rule_list_free(r->rule_list); @@ -511,16 +572,16 @@ index 414b7c4..6ec38c6 100644 EXPORT_SYMBOL_ALIAS(nftnl_ruleset_free, nft_ruleset_free); diff --git a/src/set.c b/src/set.c -index dbea93b..025d50c 100644 +index 14d28b5..0e93503 100644 --- a/src/set.c +++ b/src/set.c @@ -45,15 +45,15 @@ void nftnl_set_free(const struct nftnl_set *s) struct nftnl_set_elem *elem, *tmp; - if (s->table != NULL) + if (s->flags & (1 << NFTNL_SET_TABLE)) - xfree(s->table); + nftnl_xfree(s->table); - if (s->name != NULL) + if (s->flags & (1 << NFTNL_SET_NAME)) - xfree(s->name); + nftnl_xfree(s->name); @@ -533,55 +594,74 @@ index dbea93b..025d50c 100644 } EXPORT_SYMBOL_ALIAS(nftnl_set_free, nft_set_free); -@@ -69,14 +69,14 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr) +@@ -70,10 +70,10 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr) + + switch (attr) { case NFTNL_SET_TABLE: - if (s->flags & (1 << NFTNL_SET_TABLE)) - if (s->table) { -- xfree(s->table); -+ nftnl_xfree(s->table); - s->table = NULL; - } +- xfree(s->table); ++ nftnl_xfree(s->table); break; case NFTNL_SET_NAME: - if (s->flags & (1 << NFTNL_SET_NAME)) - if (s->name) { -- xfree(s->name); -+ nftnl_xfree(s->name); - s->name = NULL; - } +- xfree(s->name); ++ nftnl_xfree(s->name); + break; + case NFTNL_SET_FLAGS: + case NFTNL_SET_KEY_TYPE: +@@ -89,7 +89,7 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr) + case NFTNL_SET_GC_INTERVAL: break; -@@ -124,13 +124,13 @@ void nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, + case NFTNL_SET_USERDATA: +- xfree(s->user.data); ++ nftnl_xfree(s->user.data); + break; + default: + return; +@@ -122,7 +122,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, switch(attr) { case NFTNL_SET_TABLE: - if (s->table) + if (s->flags & (1 << NFTNL_SET_TABLE)) - xfree(s->table); + nftnl_xfree(s->table); s->table = strdup(data); + if (!s->table) +@@ -130,7 +130,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, break; case NFTNL_SET_NAME: - if (s->name) + if (s->flags & (1 << NFTNL_SET_NAME)) - xfree(s->name); + nftnl_xfree(s->name); s->name = strdup(data); + if (!s->name) +@@ -174,7 +174,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, break; -@@ -435,12 +435,12 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) - return -1; + case NFTNL_SET_USERDATA: + if (s->flags & (1 << NFTNL_SET_USERDATA)) +- xfree(s->user.data); ++ nftnl_xfree(s->user.data); + + s->user.data = malloc(data_len); + if (!s->user.data) +@@ -474,7 +474,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) if (tb[NFTA_SET_TABLE]) { -- xfree(s->table); -+ nftnl_xfree(s->table); + if (s->flags & (1 << NFTNL_SET_TABLE)) +- xfree(s->table); ++ nftnl_xfree(s->table); s->table = strdup(mnl_attr_get_str(tb[NFTA_SET_TABLE])); - s->flags |= (1 << NFTNL_SET_TABLE); + if (!s->table) + return -1; +@@ -482,7 +482,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) } if (tb[NFTA_SET_NAME]) { -- xfree(s->name); -+ nftnl_xfree(s->name); + if (s->flags & (1 << NFTNL_SET_NAME)) +- xfree(s->name); ++ nftnl_xfree(s->name); s->name = strdup(mnl_attr_get_str(tb[NFTA_SET_NAME])); - s->flags |= (1 << NFTNL_SET_NAME); - } -@@ -1087,7 +1087,7 @@ void nftnl_set_list_free(struct nftnl_set_list *list) + if (!s->name) + return -1; +@@ -972,7 +972,7 @@ void nftnl_set_list_free(struct nftnl_set_list *list) list_del(&s->head); nftnl_set_free(s); } @@ -590,7 +670,7 @@ index dbea93b..025d50c 100644 } EXPORT_SYMBOL_ALIAS(nftnl_set_list_free, nft_set_list_free); -@@ -1177,7 +1177,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_next, nft_set_list_iter_next); +@@ -1064,7 +1064,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_next, nft_set_list_iter_next); void nftnl_set_list_iter_destroy(const struct nftnl_set_list_iter *iter) { @@ -600,83 +680,112 @@ index dbea93b..025d50c 100644 EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_destroy, nft_set_list_iter_destroy); diff --git a/src/set_elem.c b/src/set_elem.c -index b9c7e1e..c8ffeae 100644 +index fa87476..6d404bd 100644 --- a/src/set_elem.c +++ b/src/set_elem.c -@@ -43,7 +43,7 @@ void nftnl_set_elem_free(struct nftnl_set_elem *s) +@@ -42,18 +42,18 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_elem_alloc, nft_set_elem_alloc); + void nftnl_set_elem_free(struct nftnl_set_elem *s) { - if (s->flags & (1 << NFTNL_SET_ELEM_CHAIN)) { - if (s->data.chain) { -- xfree(s->data.chain); -+ nftnl_xfree(s->data.chain); - s->data.chain = NULL; - } - } -@@ -52,9 +52,9 @@ void nftnl_set_elem_free(struct nftnl_set_elem *s) + if (s->flags & (1 << NFTNL_SET_ELEM_CHAIN)) +- xfree(s->data.chain); ++ nftnl_xfree(s->data.chain); + + if (s->flags & (1 << NFTNL_SET_ELEM_EXPR)) nftnl_expr_free(s->expr); if (s->flags & (1 << NFTNL_SET_ELEM_USERDATA)) - xfree(s->user.data); + nftnl_xfree(s->user.data); + if (s->flags & (1 << NFTNL_SET_ELEM_OBJREF)) +- xfree(s->objref); ++ nftnl_xfree(s->objref); + - xfree(s); + nftnl_xfree(s); } EXPORT_SYMBOL_ALIAS(nftnl_set_elem_free, nft_set_elem_free); @@ -70,7 +70,7 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr) + + switch (attr) { case NFTNL_SET_ELEM_CHAIN: - if (s->flags & (1 << NFTNL_SET_ELEM_CHAIN)) { - if (s->data.chain) { -- xfree(s->data.chain); -+ nftnl_xfree(s->data.chain); - s->data.chain = NULL; - } - } -@@ -113,7 +113,7 @@ void nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, +- xfree(s->data.chain); ++ nftnl_xfree(s->data.chain); + break; + case NFTNL_SET_ELEM_FLAGS: + case NFTNL_SET_ELEM_KEY: /* NFTA_SET_ELEM_KEY */ +@@ -80,13 +80,13 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr) + case NFTNL_SET_ELEM_EXPIRATION: /* NFTA_SET_ELEM_EXPIRATION */ + break; + case NFTNL_SET_ELEM_USERDATA: /* NFTA_SET_ELEM_USERDATA */ +- xfree(s->user.data); ++ nftnl_xfree(s->user.data); + break; + case NFTNL_SET_ELEM_EXPR: + nftnl_expr_free(s->expr); + break; + case NFTNL_SET_ELEM_OBJREF: +- xfree(s->objref); ++ nftnl_xfree(s->objref); + break; + default: + return; +@@ -112,7 +112,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, break; case NFTNL_SET_ELEM_CHAIN: /* NFTA_SET_ELEM_DATA */ - if (s->data.chain) + if (s->flags & (1 << NFTNL_SET_ELEM_CHAIN)) - xfree(s->data.chain); + nftnl_xfree(s->data.chain); s->data.chain = strdup(data); - break; -@@ -126,7 +126,7 @@ void nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, + if (!s->data.chain) +@@ -127,7 +127,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, break; case NFTNL_SET_ELEM_USERDATA: /* NFTA_SET_ELEM_USERDATA */ - if (s->user.data != NULL) + if (s->flags & (1 << NFTNL_SET_ELEM_USERDATA)) - xfree(s->user.data); + nftnl_xfree(s->user.data); s->user.data = malloc(data_len); if (!s->user.data) -@@ -399,7 +399,7 @@ static int nftnl_set_elems_parse2(struct nftnl_set *s, const struct nlattr *nest +@@ -137,7 +137,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, + break; + case NFTNL_SET_ELEM_OBJREF: + if (s->flags & (1 << NFTNL_SET_ELEM_OBJREF)) +- xfree(s->objref); ++ nftnl_xfree(s->objref); + + s->objref = strdup(data); + if (!s->objref) +@@ -431,7 +431,7 @@ static int nftnl_set_elems_parse2(struct nftnl_set *s, const struct nlattr *nest mnl_attr_get_payload(tb[NFTA_SET_ELEM_USERDATA]); - if (e->user.data) + if (e->flags & (1 << NFTNL_RULE_USERDATA)) - xfree(e->user.data); + nftnl_xfree(e->user.data); e->user.len = mnl_attr_get_payload_len(tb[NFTA_SET_ELEM_USERDATA]); e->user.data = malloc(e->user.len); -@@ -471,13 +471,13 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) - return -1; +@@ -515,7 +515,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) if (tb[NFTA_SET_ELEM_LIST_TABLE]) { -- xfree(s->table); -+ nftnl_xfree(s->table); + if (s->flags & (1 << NFTNL_SET_TABLE)) +- xfree(s->table); ++ nftnl_xfree(s->table); s->table = strdup(mnl_attr_get_str(tb[NFTA_SET_ELEM_LIST_TABLE])); - s->flags |= (1 << NFTNL_SET_TABLE); + if (!s->table) +@@ -524,7 +524,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) } if (tb[NFTA_SET_ELEM_LIST_SET]) { -- xfree(s->name); -+ nftnl_xfree(s->name); + if (s->flags & (1 << NFTNL_SET_NAME)) +- xfree(s->name); ++ nftnl_xfree(s->name); s->name = strdup(mnl_attr_get_str(tb[NFTA_SET_ELEM_LIST_SET])); - s->flags |= (1 << NFTNL_SET_NAME); -@@ -866,7 +866,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_elems_iter_next, nft_set_elems_iter_next); + if (!s->name) +@@ -810,7 +810,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_elems_iter_next, nft_set_elems_iter_next); void nftnl_set_elems_iter_destroy(struct nftnl_set_elems_iter *iter) { @@ -686,7 +795,7 @@ index b9c7e1e..c8ffeae 100644 EXPORT_SYMBOL_ALIAS(nftnl_set_elems_iter_destroy, nft_set_elems_iter_destroy); diff --git a/src/table.c b/src/table.c -index 42fe49f..7363853 100644 +index 4286d51..1e15ea7 100644 --- a/src/table.c +++ b/src/table.c @@ -45,9 +45,9 @@ EXPORT_SYMBOL_ALIAS(nftnl_table_alloc, nft_table_alloc); @@ -701,34 +810,34 @@ index 42fe49f..7363853 100644 } EXPORT_SYMBOL_ALIAS(nftnl_table_free, nft_table_free); -@@ -65,7 +65,7 @@ void nftnl_table_unset(struct nftnl_table *t, uint16_t attr) +@@ -64,7 +64,7 @@ void nftnl_table_unset(struct nftnl_table *t, uint16_t attr) + switch (attr) { case NFTNL_TABLE_NAME: - if (t->name) { -- xfree(t->name); -+ nftnl_xfree(t->name); - t->name = NULL; - } +- xfree(t->name); ++ nftnl_xfree(t->name); break; -@@ -95,7 +95,7 @@ void nftnl_table_set_data(struct nftnl_table *t, uint16_t attr, + case NFTNL_TABLE_FLAGS: + case NFTNL_TABLE_FAMILY: +@@ -90,7 +90,7 @@ int nftnl_table_set_data(struct nftnl_table *t, uint16_t attr, switch (attr) { case NFTNL_TABLE_NAME: - if (t->name) + if (t->flags & (1 << NFTNL_TABLE_NAME)) - xfree(t->name); + nftnl_xfree(t->name); t->name = strdup(data); - break; + if (!t->name) @@ -229,7 +229,7 @@ int nftnl_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_table *t) - return -1; if (tb[NFTA_TABLE_NAME]) { -- xfree(t->name); -+ nftnl_xfree(t->name); + if (t->flags & (1 << NFTNL_TABLE_NAME)) +- xfree(t->name); ++ nftnl_xfree(t->name); t->name = strdup(mnl_attr_get_str(tb[NFTA_TABLE_NAME])); - t->flags |= (1 << NFTNL_TABLE_NAME); - } -@@ -497,7 +497,7 @@ void nftnl_table_list_free(struct nftnl_table_list *list) + if (!t->name) + return -1; +@@ -448,7 +448,7 @@ void nftnl_table_list_free(struct nftnl_table_list *list) list_del(&r->head); nftnl_table_free(r); } @@ -737,7 +846,7 @@ index 42fe49f..7363853 100644 } EXPORT_SYMBOL_ALIAS(nftnl_table_list_free, nft_table_list_free); -@@ -582,6 +582,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_table_list_iter_next, nft_table_list_iter_next); +@@ -534,6 +534,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_table_list_iter_next, nft_table_list_iter_next); void nftnl_table_list_iter_destroy(const struct nftnl_table_list_iter *iter) { @@ -746,7 +855,7 @@ index 42fe49f..7363853 100644 } EXPORT_SYMBOL_ALIAS(nftnl_table_list_iter_destroy, nft_table_list_iter_destroy); diff --git a/src/trace.c b/src/trace.c -index 921fa21..1933bb8 100644 +index bd05d3c..abfc533 100644 --- a/src/trace.c +++ b/src/trace.c @@ -61,13 +61,13 @@ struct nftnl_trace *nftnl_trace_alloc(void) @@ -784,7 +893,7 @@ index 60c2f34..ec1f7dc 100644 EXPORT_SYMBOL(nftnl_udata_buf_free); diff --git a/src/utils.c b/src/utils.c -index 22710b9..f29416e 100644 +index 3e44960..08f668f 100644 --- a/src/utils.c +++ b/src/utils.c @@ -264,7 +264,7 @@ int nftnl_fprintf(FILE *fp, const void *obj, uint32_t cmd, uint32_t type, @@ -797,5 +906,5 @@ index 22710b9..f29416e 100644 return ret; } -- -2.7.3 +2.10.2 diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 66987e159b..63271e0f75 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,2 +1,2 @@ -# From http://www.netfilter.org/projects/libnftnl/downloads.html#libnftnl-1.0.6 -sha1 453f1c2d99d219baeca4ba42aa874f02d2ddf2f7 libnftnl-1.0.6.tar.bz2 +# From http://www.netfilter.org/projects/libnftnl/downloads.html#libnftnl-1.0.7 +sha1 381b2b3cbb3fad186cb3f57bbf32d70f0b3c3c8e libnftnl-1.0.7.tar.bz2 diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index 2f832049e2..0e1ddf8bc6 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.0.6 +LIBNFTNL_VERSION = 1.0.7 LIBNFTNL_SITE = http://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 LIBNFTNL_LICENSE = GPLv2+ From 56ec68a7ce829b7accf6345709036cdcbd5432b8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 11:47:11 -0300 Subject: [PATCH 1974/3392] nftables: bump to version 0.7 And fix small CONF_OPTS assignment snafu. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/nftables/nftables.hash | 4 ++-- package/nftables/nftables.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index 987aae3f47..a743476ae9 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,2 +1,2 @@ -# From http://www.netfilter.org/projects/nftables/downloads.html#nftables-0.6 -sha1 c0f90a208e0ab5d43d3e638350a4fe58e6f4366f nftables-0.6.tar.bz2 +# From http://www.netfilter.org/projects/nftables/downloads.html#nftables-0.7 +sha1 c003fa8b63b1b44c52de345a4d84487d81865a98 nftables-0.7.tar.bz2 diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 10a1b4272c..64d6be72ce 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFTABLES_VERSION = 0.6 +NFTABLES_VERSION = 0.7 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 NFTABLES_SITE = http://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \ @@ -16,7 +16,7 @@ ifeq ($(BR2_PACKAGE_READLINE),y) NFTABLES_DEPENDENCIES += readline NFTABLES_LIBS += -lncurses else -NFTABLES_CONF_OPTS = --without-cli +NFTABLES_CONF_OPTS += --without-cli endif ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy) From 0bf7c74e1551a64ab3164f374304154b21bc5045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 21 Dec 2016 17:01:34 +0100 Subject: [PATCH 1975/3392] package/monit: security bump to version 5.20.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes CVE-2016-7067. Note that since version 5.20.0 monit optionally depends on zlib. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/monit/monit.hash | 4 ++-- package/monit/monit.mk | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package/monit/monit.hash b/package/monit/monit.hash index 04f87901eb..8eb02fce66 100644 --- a/package/monit/monit.hash +++ b/package/monit/monit.hash @@ -1,2 +1,2 @@ -# From https://mmonit.com/monit/dist/monit-5.17.tar.gz.sha256: -sha256 2fbcdea79ae39228791a0aaa685ebbf650f2b58d086eaf77a33226e972cb216e monit-5.17.tar.gz +# From https://mmonit.com/monit/dist/monit-5.20.0.tar.gz.sha256: +sha256 ebac395ec50c1ae64d568db1260bc049d0e0e624c00e79d7b1b9a59c2679b98d monit-5.20.0.tar.gz diff --git a/package/monit/monit.mk b/package/monit/monit.mk index 1d5904b64d..f4899c3c0d 100644 --- a/package/monit/monit.mk +++ b/package/monit/monit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONIT_VERSION = 5.17 +MONIT_VERSION = 5.20.0 MONIT_SITE = http://mmonit.com/monit/dist MONIT_LICENSE = AGPLv3 with OpenSSL exception MONIT_LICENSE_FILES = COPYING @@ -27,4 +27,11 @@ else MONIT_CONF_OPTS += --without-ssl endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +MONIT_CONF_OPTS += --with-zlib +MONIT_DEPENDENCIES += zlib +else +MONIT_CONF_OPTS += --without-zlib +endif + $(eval $(autotools-package)) From be1a3a3e4610deb9434329da643bf7b896989276 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 12:29:53 -0300 Subject: [PATCH 1976/3392] gcc: bump 6.x series to version 6.3.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/gcc/{6.2.0 => 6.3.0}/100-uclibc-conf.patch | 0 package/gcc/{6.2.0 => 6.3.0}/301-missing-execinfo_h.patch | 0 package/gcc/{6.2.0 => 6.3.0}/810-arm-softfloat-libgcc.patch | 0 package/gcc/{6.2.0 => 6.3.0}/830-arm_unbreak_armv4t.patch | 0 ...ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch | 0 package/gcc/{6.2.0 => 6.3.0}/860-cilk-wchar.patch | 0 .../gcc/{6.2.0 => 6.3.0}/870-xtensa-Fix-PR-target-78118.patch | 0 .../gcc/{6.2.0 => 6.3.0}/871-xtensa-Fix-PR-target-78603.patch | 0 package/gcc/{6.2.0 => 6.3.0}/890-fix-m68k-compile.patch | 0 package/gcc/{6.2.0 => 6.3.0}/891-fix-m68k-uclinux.patch | 0 .../892-libgcc-mkmap-symver-support-skip_underscore.patch | 0 ...libgcc-config-bfin-use-the-generic-linker-version-in.patch | 0 .../894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch | 0 package/gcc/{6.2.0 => 6.3.0}/895-bfin-define-REENTRANT.patch | 0 package/gcc/{6.2.0 => 6.3.0}/940-uclinux-enable-threads.patch | 0 .../941-mips-Add-support-for-mips-r6-musl.patch | 0 package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 ++-- 18 files changed, 3 insertions(+), 3 deletions(-) rename package/gcc/{6.2.0 => 6.3.0}/100-uclibc-conf.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/301-missing-execinfo_h.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/810-arm-softfloat-libgcc.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/830-arm_unbreak_armv4t.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/860-cilk-wchar.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/870-xtensa-Fix-PR-target-78118.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/871-xtensa-Fix-PR-target-78603.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/890-fix-m68k-compile.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/891-fix-m68k-uclinux.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/892-libgcc-mkmap-symver-support-skip_underscore.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/895-bfin-define-REENTRANT.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/940-uclinux-enable-threads.patch (100%) rename package/gcc/{6.2.0 => 6.3.0}/941-mips-Add-support-for-mips-r6-musl.patch (100%) diff --git a/package/gcc/6.2.0/100-uclibc-conf.patch b/package/gcc/6.3.0/100-uclibc-conf.patch similarity index 100% rename from package/gcc/6.2.0/100-uclibc-conf.patch rename to package/gcc/6.3.0/100-uclibc-conf.patch diff --git a/package/gcc/6.2.0/301-missing-execinfo_h.patch b/package/gcc/6.3.0/301-missing-execinfo_h.patch similarity index 100% rename from package/gcc/6.2.0/301-missing-execinfo_h.patch rename to package/gcc/6.3.0/301-missing-execinfo_h.patch diff --git a/package/gcc/6.2.0/810-arm-softfloat-libgcc.patch b/package/gcc/6.3.0/810-arm-softfloat-libgcc.patch similarity index 100% rename from package/gcc/6.2.0/810-arm-softfloat-libgcc.patch rename to package/gcc/6.3.0/810-arm-softfloat-libgcc.patch diff --git a/package/gcc/6.2.0/830-arm_unbreak_armv4t.patch b/package/gcc/6.3.0/830-arm_unbreak_armv4t.patch similarity index 100% rename from package/gcc/6.2.0/830-arm_unbreak_armv4t.patch rename to package/gcc/6.3.0/830-arm_unbreak_armv4t.patch diff --git a/package/gcc/6.2.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/package/gcc/6.3.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch similarity index 100% rename from package/gcc/6.2.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch rename to package/gcc/6.3.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch diff --git a/package/gcc/6.2.0/860-cilk-wchar.patch b/package/gcc/6.3.0/860-cilk-wchar.patch similarity index 100% rename from package/gcc/6.2.0/860-cilk-wchar.patch rename to package/gcc/6.3.0/860-cilk-wchar.patch diff --git a/package/gcc/6.2.0/870-xtensa-Fix-PR-target-78118.patch b/package/gcc/6.3.0/870-xtensa-Fix-PR-target-78118.patch similarity index 100% rename from package/gcc/6.2.0/870-xtensa-Fix-PR-target-78118.patch rename to package/gcc/6.3.0/870-xtensa-Fix-PR-target-78118.patch diff --git a/package/gcc/6.2.0/871-xtensa-Fix-PR-target-78603.patch b/package/gcc/6.3.0/871-xtensa-Fix-PR-target-78603.patch similarity index 100% rename from package/gcc/6.2.0/871-xtensa-Fix-PR-target-78603.patch rename to package/gcc/6.3.0/871-xtensa-Fix-PR-target-78603.patch diff --git a/package/gcc/6.2.0/890-fix-m68k-compile.patch b/package/gcc/6.3.0/890-fix-m68k-compile.patch similarity index 100% rename from package/gcc/6.2.0/890-fix-m68k-compile.patch rename to package/gcc/6.3.0/890-fix-m68k-compile.patch diff --git a/package/gcc/6.2.0/891-fix-m68k-uclinux.patch b/package/gcc/6.3.0/891-fix-m68k-uclinux.patch similarity index 100% rename from package/gcc/6.2.0/891-fix-m68k-uclinux.patch rename to package/gcc/6.3.0/891-fix-m68k-uclinux.patch diff --git a/package/gcc/6.2.0/892-libgcc-mkmap-symver-support-skip_underscore.patch b/package/gcc/6.3.0/892-libgcc-mkmap-symver-support-skip_underscore.patch similarity index 100% rename from package/gcc/6.2.0/892-libgcc-mkmap-symver-support-skip_underscore.patch rename to package/gcc/6.3.0/892-libgcc-mkmap-symver-support-skip_underscore.patch diff --git a/package/gcc/6.2.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch b/package/gcc/6.3.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch similarity index 100% rename from package/gcc/6.2.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch rename to package/gcc/6.3.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch diff --git a/package/gcc/6.2.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch b/package/gcc/6.3.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch similarity index 100% rename from package/gcc/6.2.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch rename to package/gcc/6.3.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch diff --git a/package/gcc/6.2.0/895-bfin-define-REENTRANT.patch b/package/gcc/6.3.0/895-bfin-define-REENTRANT.patch similarity index 100% rename from package/gcc/6.2.0/895-bfin-define-REENTRANT.patch rename to package/gcc/6.3.0/895-bfin-define-REENTRANT.patch diff --git a/package/gcc/6.2.0/940-uclinux-enable-threads.patch b/package/gcc/6.3.0/940-uclinux-enable-threads.patch similarity index 100% rename from package/gcc/6.2.0/940-uclinux-enable-threads.patch rename to package/gcc/6.3.0/940-uclinux-enable-threads.patch diff --git a/package/gcc/6.2.0/941-mips-Add-support-for-mips-r6-musl.patch b/package/gcc/6.3.0/941-mips-Add-support-for-mips-r6-musl.patch similarity index 100% rename from package/gcc/6.2.0/941-mips-Add-support-for-mips-r6-musl.patch rename to package/gcc/6.3.0/941-mips-Add-support-for-mips-r6-musl.patch diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 64d1a470cf..d8fbc1857d 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -97,7 +97,7 @@ config BR2_GCC_VERSION default "4.8.5" if BR2_GCC_VERSION_4_8_X default "4.9.4" if BR2_GCC_VERSION_4_9_X default "5.4.0" if BR2_GCC_VERSION_5_X - default "6.2.0" if BR2_GCC_VERSION_6_X + default "6.3.0" if BR2_GCC_VERSION_6_X default "arc-2016.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index a4e60851fe..1988237cac 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -8,8 +8,8 @@ sha512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbc sha512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe gcc-4.9.4.tar.bz2 # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.4.0/sha512.sum sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b gcc-5.4.0.tar.bz2 -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.2.0/sha512.sum -sha512 1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a83ce1cd4cdd2d1cb0b3e3c34e9b7ae1b2ab83dfc649ee817ab05247c76198 gcc-6.2.0.tar.bz2 +# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.3.0/sha512.sum +sha512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78 gcc-6.3.0.tar.bz2 # Locally calculated (fetched from Github) sha512 faae6dc3f7843412068a52de5919797cd23e6ed1b8d140c230d0381f13fd38af67baaa4a09e581c03602127da3dd2fab6f9f5d7ac5d4270585bd079c673dda9a gcc-arc-2016.09-release.tar.gz From 0c5beb6501707dd5cb80484562bf2b0cbe2b4423 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 21 Dec 2016 08:48:49 +0100 Subject: [PATCH 1977/3392] libcurl: security bump to 7.52.0 Fixes CVE-2016-9586 - printf floating point buffer overflow For details, see: https://curl.haxx.se/docs/adv_20161221A.html Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 2 +- package/libcurl/libcurl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index e1283350cc..2b68c6a7b4 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde curl-7.51.0.tar.bz2 +sha256 b9a2e18b4785eb75ad84598720e1559e1c53550ea011c0e00becdb94e2df5cc6 curl-7.52.0.tar.bz2 diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 197e0b579d..b2a1b241dc 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.51.0 +LIBCURL_VERSION = 7.52.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From b97e3c94a9798bbd7eb08f5bd1adb0417cde1fd1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 21 Dec 2016 19:50:46 +0100 Subject: [PATCH 1978/3392] runc: pass -extldflags '-static' in correct variable commit 9101ce5800 (runc: pass -extldflags '-static' on when BR2_STATIC_LIBS=y) contained a small copy/paste error, FLANNEL_GLDFLAGS was used instead of RUNC_GLDFLAGS. [Peter: refer to exact commit] Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/runc/runc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/runc/runc.mk b/package/runc/runc.mk index ef151ede25..661872c962 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -22,7 +22,7 @@ RUNC_GLDFLAGS = \ -X main.gitCommit=$(RUNC_VERSION) ifeq ($(BR2_STATIC_LIBS),y) -FLANNEL_GLDFLAGS += -extldflags '-static' +RUNC_GLDFLAGS += -extldflags '-static' endif RUNC_GOTAGS = cgo static_build From c4cb7a46ac5e4fe4cb88836903f2779fa7dc83d8 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 17:22:44 -0300 Subject: [PATCH 1979/3392] lzlib: depends on lua It's missing the dependency on lua, hence when using the upcoming PPS support its staging directory isn't populated with the required dependencies resulting in build failure. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/lzlib/lzlib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lzlib/lzlib.mk b/package/lzlib/lzlib.mk index 91f380afa2..f468a1c839 100644 --- a/package/lzlib/lzlib.mk +++ b/package/lzlib/lzlib.mk @@ -6,7 +6,7 @@ LZLIB_VERSION = 0.4.3 LZLIB_SITE = $(call github,LuaDist,lzlib,$(LZLIB_VERSION)) -LZLIB_DEPENDENCIES = zlib +LZLIB_DEPENDENCIES = lua zlib LZLIB_LICENSE = MIT LZLIB_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \ -DINSTALL_LMOD="/usr/share/lua/$(LUAINTERPRETER_ABIVER)" From 460cbfe9777673df00221a0b335a5eefd18b2815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Wed, 21 Dec 2016 18:00:39 +0100 Subject: [PATCH 1980/3392] wine: Bump to version 1.8.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Peter Korsgaard --- package/wine/wine.hash | 2 +- package/wine/wine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 0f6b9d3ffd..a5297f0e4e 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 dee2a4959e5f90a89aaf04566c23f2926e9590f8968ea662afd81947fdb6f6d6 wine-1.8.5.tar.bz2 +sha256 b1797896eb3b63aab8a4753cc756d6211a0e85460146a1b52063ec79c13906d3 wine-1.8.6.tar.bz2 diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 47ba90a214..1947daa6a7 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,7 +4,7 @@ # ################################################################################ -WINE_VERSION = 1.8.5 +WINE_VERSION = 1.8.6 WINE_SOURCE = wine-$(WINE_VERSION).tar.bz2 WINE_SITE = https://dl.winehq.org/wine/source/1.8 WINE_LICENSE = LGPLv2.1+ From 68af1dc2575888863ae0015b09555a5e42a5d56c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Dec 2016 07:02:59 +0100 Subject: [PATCH 1981/3392] package/apache: security bump version to 2.4.25 Changelog: http://www.apache.org/dist/httpd/CHANGES_2.4.25 Fixes CVE-2016-8740, CVE-2016-5387, CVE-2016-2161, CVE-2016-0736, CVE-2016-8743. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 2 +- package/apache/apache.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index e4710b0415..38fd883f82 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,2 +1,2 @@ # From http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2.sha1 -sha1 5101be34ac4a509b245adb70a56690a84fcc4e7f httpd-2.4.23.tar.bz2 +sha1 bd6d138c31c109297da2346c6e7b93b9283993d2 httpd-2.4.25.tar.bz2 diff --git a/package/apache/apache.mk b/package/apache/apache.mk index e54b736090..ae629bd2ca 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.23 +APACHE_VERSION = 2.4.25 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 From 60ea16416aed4135cd52aad75c9e6bf58e6b019a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Dec 2016 07:07:09 +0100 Subject: [PATCH 1982/3392] package/libcdio: bump version to 0.94 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libcdio/libcdio.hash | 2 +- package/libcdio/libcdio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcdio/libcdio.hash b/package/libcdio/libcdio.hash index cc87ffb9cb..35c632a906 100644 --- a/package/libcdio/libcdio.hash +++ b/package/libcdio/libcdio.hash @@ -1,2 +1,2 @@ # Locally calculated after checking signature -sha256 4972cd22fd8d0e8bff922d35c7a645be0db0ab0e7b3dfaecc9cd8272429d6975 libcdio-0.93.tar.gz +sha256 96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a libcdio-0.94.tar.gz diff --git a/package/libcdio/libcdio.mk b/package/libcdio/libcdio.mk index 03e6002079..4a7c6745cc 100644 --- a/package/libcdio/libcdio.mk +++ b/package/libcdio/libcdio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCDIO_VERSION = 0.93 +LIBCDIO_VERSION = 0.94 LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio LIBCDIO_INSTALL_STAGING = YES LIBCDIO_LICENSE = GPLv3+ From 5b83b31a824606645c272b49309bb9e44b91497b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Dec 2016 07:03:49 +0100 Subject: [PATCH 1983/3392] package/util-linux: bump version to 2.29 Removed patch applied upstream: http://git.kernel.org/cgit/utils/util-linux/util-linux.git/commit/?id=7f0d4d56a2f1ed34c3da4501e65fb79497b3dda1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- ...01-lib-crc32-prefix-public-functions.patch | 182 ------------------ package/util-linux/util-linux.hash | 4 +- package/util-linux/util-linux.mk | 4 +- 3 files changed, 4 insertions(+), 186 deletions(-) delete mode 100644 package/util-linux/0001-lib-crc32-prefix-public-functions.patch diff --git a/package/util-linux/0001-lib-crc32-prefix-public-functions.patch b/package/util-linux/0001-lib-crc32-prefix-public-functions.patch deleted file mode 100644 index fa68bd01e7..0000000000 --- a/package/util-linux/0001-lib-crc32-prefix-public-functions.patch +++ /dev/null @@ -1,182 +0,0 @@ -From b39b4cac29dcc5d060d8e30344f693462502066a Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Mon, 10 Oct 2016 17:42:42 -0300 -Subject: [PATCH] lib/crc32: prefix public functions - -Make the publicly-visible crc32 library functions prefixed by ul_, such -as crc32() -> ul_crc32(). -This is because it clashes with the crc32() function from zlib. -For newer versions of glib (2.50+) zlib and libblkid are required -dependencies and otherwise results in build failure when building -statically. - -Signed-off-by: Gustavo Zacarias ---- -Status: submitted upstream - - disk-utils/fsck.cramfs.c | 12 ++++++------ - disk-utils/mkfs.cramfs.c | 6 +++--- - include/crc32.h | 4 ++-- - lib/crc32.c | 4 ++-- - libblkid/src/partitions/gpt.c | 2 +- - libblkid/src/superblocks/nilfs.c | 6 +++--- - libfdisk/src/gpt.c | 2 +- - 7 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c -index 12009f2..f34e79f 100644 ---- a/disk-utils/fsck.cramfs.c -+++ b/disk-utils/fsck.cramfs.c -@@ -214,7 +214,7 @@ static void test_crc(int start) - return; - } - -- crc = crc32(0L, Z_NULL, 0); -+ crc = ul_crc32(0L, Z_NULL, 0); - - buf = - mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); -@@ -231,8 +231,8 @@ static void test_crc(int start) - } - if (buf != MAP_FAILED) { - ((struct cramfs_super *)((unsigned char *) buf + start))->fsid.crc = -- crc32(0L, Z_NULL, 0); -- crc = crc32(crc, (unsigned char *) buf + start, super.size - start); -+ ul_crc32(0L, Z_NULL, 0); -+ crc = ul_crc32(crc, (unsigned char *) buf + start, super.size - start); - munmap(buf, super.size); - } else { - int retval; -@@ -249,15 +249,15 @@ static void test_crc(int start) - break; - if (length == 0) - ((struct cramfs_super *)buf)->fsid.crc = -- crc32(0L, Z_NULL, 0); -+ ul_crc32(0L, Z_NULL, 0); - length += retval; - if (length > (super.size - start)) { -- crc = crc32(crc, buf, -+ crc = ul_crc32(crc, buf, - retval - (length - - (super.size - start))); - break; - } -- crc = crc32(crc, buf, retval); -+ crc = ul_crc32(crc, buf, retval); - } - free(buf); - } -diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c -index 4e6b3ab..55d6871 100644 ---- a/disk-utils/mkfs.cramfs.c -+++ b/disk-utils/mkfs.cramfs.c -@@ -406,7 +406,7 @@ static unsigned int write_superblock(struct entry *root, char *base, int size) - super->size = size; - memcpy(super->signature, CRAMFS_SIGNATURE, sizeof(super->signature)); - -- super->fsid.crc = crc32(0L, Z_NULL, 0); -+ super->fsid.crc = ul_crc32(0L, Z_NULL, 0); - super->fsid.edition = opt_edition; - super->fsid.blocks = total_blocks; - super->fsid.files = total_nodes; -@@ -700,7 +700,7 @@ int main(int argc, char **argv) - loff_t fslen_ub = sizeof(struct cramfs_super); - unsigned int fslen_max; - char const *dirname, *outfile; -- uint32_t crc = crc32(0L, Z_NULL, 0); -+ uint32_t crc = ul_crc32(0L, Z_NULL, 0); - int c; - cramfs_is_big_endian = HOST_IS_BIG_ENDIAN; /* default is to use host order */ - -@@ -856,7 +856,7 @@ int main(int argc, char **argv) - sizeof(struct cramfs_super)); - - /* Put the checksum in. */ -- crc = crc32(crc, (unsigned char *) (rom_image+opt_pad), (offset-opt_pad)); -+ crc = ul_crc32(crc, (unsigned char *) (rom_image+opt_pad), (offset-opt_pad)); - ((struct cramfs_super *) (rom_image+opt_pad))->fsid.crc = u32_toggle_endianness(cramfs_is_big_endian, crc); - if (verbose) - printf(_("CRC: %x\n"), crc); -diff --git a/include/crc32.h b/include/crc32.h -index ff2dd99..2551f50 100644 ---- a/include/crc32.h -+++ b/include/crc32.h -@@ -4,8 +4,8 @@ - #include - #include - --extern uint32_t crc32(uint32_t seed, const unsigned char *buf, size_t len); --extern uint32_t crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len, -+extern uint32_t ul_crc32(uint32_t seed, const unsigned char *buf, size_t len); -+extern uint32_t ul_crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len, - size_t exclude_off, size_t exclude_len); - - #endif -diff --git a/lib/crc32.c b/lib/crc32.c -index a5e3216..824693d 100644 ---- a/lib/crc32.c -+++ b/lib/crc32.c -@@ -108,7 +108,7 @@ static inline uint32_t crc32_add_char(uint32_t crc, unsigned char c) - * and does __not__ xor at the end. Then individual users can do - * whatever they need. - */ --uint32_t crc32(uint32_t seed, const unsigned char *buf, size_t len) -+uint32_t ul_crc32(uint32_t seed, const unsigned char *buf, size_t len) - { - uint32_t crc = seed; - const unsigned char *p = buf; -@@ -121,7 +121,7 @@ uint32_t crc32(uint32_t seed, const unsigned char *buf, size_t len) - return crc; - } - --uint32_t crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len, -+uint32_t ul_crc32_exclude_offset(uint32_t seed, const unsigned char *buf, size_t len, - size_t exclude_off, size_t exclude_len) - { - uint32_t crc = seed; -diff --git a/libblkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c -index dcc04e6..e6baa59 100644 ---- a/libblkid/src/partitions/gpt.c -+++ b/libblkid/src/partitions/gpt.c -@@ -105,7 +105,7 @@ struct gpt_entry { - static inline uint32_t count_crc32(const unsigned char *buf, size_t len, - size_t exclude_off, size_t exclude_len) - { -- return (crc32_exclude_offset(~0L, buf, len, exclude_off, exclude_len) ^ ~0L); -+ return (ul_crc32_exclude_offset(~0L, buf, len, exclude_off, exclude_len) ^ ~0L); - } - - static inline unsigned char *get_lba_buffer(blkid_probe pr, -diff --git a/libblkid/src/superblocks/nilfs.c b/libblkid/src/superblocks/nilfs.c -index ee5c5f9..95538ef 100644 ---- a/libblkid/src/superblocks/nilfs.c -+++ b/libblkid/src/superblocks/nilfs.c -@@ -89,9 +89,9 @@ static int nilfs_valid_sb(blkid_probe pr, struct nilfs_super_block *sb, int is_b - if (bytes < crc_start || bytes > sizeof(struct nilfs_super_block)) - return 0; - -- crc = crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff); -- crc = crc32(crc, sum, 4); -- crc = crc32(crc, (unsigned char *)sb + crc_start, bytes - crc_start); -+ crc = ul_crc32(le32_to_cpu(sb->s_crc_seed), (unsigned char *)sb, sumoff); -+ crc = ul_crc32(crc, sum, 4); -+ crc = ul_crc32(crc, (unsigned char *)sb + crc_start, bytes - crc_start); - - return blkid_probe_verify_csum(pr, crc, le32_to_cpu(sb->s_sum)); - } -diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c -index 8377192..208699b 100644 ---- a/libfdisk/src/gpt.c -+++ b/libfdisk/src/gpt.c -@@ -850,7 +850,7 @@ fail: - static inline uint32_t count_crc32(const unsigned char *buf, size_t len, - size_t ex_off, size_t ex_len) - { -- return (crc32_exclude_offset(~0L, buf, len, ex_off, ex_len) ^ ~0L); -+ return (ul_crc32_exclude_offset(~0L, buf, len, ex_off, ex_len) ^ ~0L); - } - - static inline uint32_t gpt_header_count_crc32(struct gpt_header *header) --- -2.7.3 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 340ee943b7..4f198513fe 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,2 +1,2 @@ -# From https://www.kernel.org/pub/linux/utils/util-linux/v2.28/sha256sums.asc -sha256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd util-linux-2.28.2.tar.xz +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.29/sha256sums.asc +sha256 2c59ea67cc7b564104f60532f6e0a95fe17a91acb870ba8fd7e986f273abf9e7 util-linux-2.29.tar.xz diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index cf03fd44ac..1bf2046974 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -4,8 +4,8 @@ # ################################################################################ -UTIL_LINUX_VERSION_MAJOR = 2.28 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION_MAJOR = 2.29 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From 5df0bfa9a0f36c6533e95621363d004bd36785fa Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Dec 2016 07:46:00 +0100 Subject: [PATCH 1984/3392] package/python: security bump version to 2.7.13 Rebased patches 004 & 010. Changelog: https://hg.python.org/cpython/raw-file/v2.7.13/Misc/NEWS Fixes CVE-2016-2183 & CVE-2016-1000110. This bump also fixes the host build with openssl 1.1.0, http://patchwork.ozlabs.org/patch/696139/ is not needed anymore. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/python/004-sysconfigdata-install-location.patch | 6 +++--- package/python/010-fix-python-config.patch | 2 +- package/python/python.hash | 6 +++--- package/python/python.mk | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/python/004-sysconfigdata-install-location.patch b/package/python/004-sysconfigdata-install-location.patch index edf7120e12..2998364fbf 100644 --- a/package/python/004-sysconfigdata-install-location.patch +++ b/package/python/004-sysconfigdata-install-location.patch @@ -58,9 +58,9 @@ Index: b/Makefile.pre.in -rm -f python*-gdb.py - -rm -f pybuilddir.txt + -rm -f pybuilddir.txt pysysconfigdatadir.txt - find $(srcdir)/[a-zA-Z]* '(' -name '*.fdc' -o -name '*~' \ - -o -name '[@,#]*' -o -name '*.old' \ - -o -name '*.orig' -o -name '*.rej' \ + # Issue #28258: set LC_ALL to avoid issues with Estonian locale. + # Expansion is performed here by shell (spawned by make) itself before + # arguments are passed to find. So LC_ALL=C must be set as a separate Index: b/configure.ac =================================================================== --- a/configure.ac diff --git a/package/python/010-fix-python-config.patch b/package/python/010-fix-python-config.patch index 1266f3d3af..b40339b42d 100644 --- a/package/python/010-fix-python-config.patch +++ b/package/python/010-fix-python-config.patch @@ -61,7 +61,7 @@ Index: b/Makefile.pre.in @@ -410,7 +410,7 @@ # Default target - all: build_all + all: @DEF_MAKE_ALL_RULE@ -build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks +build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config diff --git a/package/python/python.hash b/package/python/python.hash index b7d0036008..f285e4243f 100644 --- a/package/python/python.hash +++ b/package/python/python.hash @@ -1,4 +1,4 @@ -# From https://www.python.org/downloads/release/python-2712/ -md5 57dffcee9cee8bb2ab5f82af1d8e9a69 Python-2.7.12.tar.xz +# From https://www.python.org/downloads/release/python-2713/ +md5 53b43534153bb2a0363f08bae8b9d990 Python-2.7.13.tar.xz # Locally calculated -sha256 d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978 Python-2.7.12.tar.xz +sha256 35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731 Python-2.7.13.tar.xz diff --git a/package/python/python.mk b/package/python/python.mk index cfd5a0af12..7b20434c94 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_VERSION_MAJOR = 2.7 -PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).12 +PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).13 PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION) PYTHON_LICENSE = Python software foundation license v2, others From 50d7bf868bf307726e14732d6fc4347685347bdb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Dec 2016 07:51:07 +0100 Subject: [PATCH 1985/3392] package/sdl2: bump version to 2.0.5 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 6e8533f6c1..d69d43811d 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,2 +1,2 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.3.tar.gz.sig -sha256 a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c SDL2-2.0.3.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.5.tar.gz.sig +sha256 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 SDL2-2.0.5.tar.gz diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 814cc196e4..2ec12e639e 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.0.3 +SDL2_VERSION = 2.0.5 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = zlib From 427c432821d2edc349328633af8df359b2a5e075 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 22 Dec 2016 09:02:32 +0100 Subject: [PATCH 1986/3392] libupnp: bump to version 1.6.21 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ndled-POSTs-to-write-to-the-filesyst.patch | 73 ------------------- ...-access-in-create_url_list-CVE-2016-.patch | 64 ---------------- package/libupnp/libupnp.hash | 2 +- package/libupnp/libupnp.mk | 4 +- 4 files changed, 2 insertions(+), 141 deletions(-) delete mode 100644 package/libupnp/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch delete mode 100644 package/libupnp/0002-Fix-out-of-bound-access-in-create_url_list-CVE-2016-.patch diff --git a/package/libupnp/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch b/package/libupnp/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch deleted file mode 100644 index 4bf14732c1..0000000000 --- a/package/libupnp/0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch +++ /dev/null @@ -1,73 +0,0 @@ -From c91a8a3903367e1163765b73eb4d43be7d7927fa Mon Sep 17 00:00:00 2001 -From: Matthew Garrett -Date: Tue, 23 Feb 2016 13:53:20 -0800 -Subject: [PATCH] Don't allow unhandled POSTs to write to the filesystem by - default - -Fixes CVE-2016-6255: write files via POST - -If there's no registered handler for a POST request, the default behaviour -is to write it to the filesystem. Several million deployed devices appear -to have this behaviour, making it possible to (at least) store arbitrary -data on them. Add a configure option that enables this behaviour, and change -the default to just drop POSTs that aren't directly handled. - -Signed-off-by: Marcelo Roberto Jimenez -Signed-off-by: Peter Korsgaard ---- - configure.ac | 4 ++++ - upnp/inc/upnpconfig.h.in | 5 +++++ - upnp/src/genlib/net/http/webserver.c | 4 ++++ - 3 files changed, 13 insertions(+) - -diff --git a/configure.ac b/configure.ac -index dd88734..ea2bc09 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -482,6 +482,10 @@ if test "x$enable_scriptsupport" = xyes ; then - AC_DEFINE(IXML_HAVE_SCRIPTSUPPORT, 1, [see upnpconfig.h]) - fi - -+RT_BOOL_ARG_ENABLE([postwrite], [no], [write to the filesystem on otherwise unhandled POST requests]) -+if test "x$enable_postwrite" = xyes ; then -+ AC_DEFINE(UPNP_ENABLE_POST_WRITE, 1, [see upnpconfig.h]) -+fi - - RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code]) - -diff --git a/upnp/inc/upnpconfig.h.in b/upnp/inc/upnpconfig.h.in -index 46ddc6e..5df8c5a 100644 ---- a/upnp/inc/upnpconfig.h.in -+++ b/upnp/inc/upnpconfig.h.in -@@ -135,5 +135,10 @@ - * (i.e. configure --enable-open_ssl) */ - #undef UPNP_ENABLE_OPEN_SSL - -+/** Defined to 1 if the library has been compiled to support filesystem writes on POST -+ * (i.e. configure --enable-postwrite) */ -+#undef UPNP_ENABLE_POST_WRITE -+ -+ - #endif /* UPNP_CONFIG_H */ - -diff --git a/upnp/src/genlib/net/http/webserver.c b/upnp/src/genlib/net/http/webserver.c -index 8991c16..8b2ecf2 100644 ---- a/upnp/src/genlib/net/http/webserver.c -+++ b/upnp/src/genlib/net/http/webserver.c -@@ -1369,9 +1369,13 @@ static int http_RecvPostMessage( - if (Fp == NULL) - return HTTP_INTERNAL_SERVER_ERROR; - } else { -+#ifdef UPNP_ENABLE_POST_WRITE - Fp = fopen(filename, "wb"); - if (Fp == NULL) - return HTTP_UNAUTHORIZED; -+#else -+ return HTTP_NOT_FOUND; -+#endif - } - parser->position = POS_ENTITY; - do { --- -2.10.2 - diff --git a/package/libupnp/0002-Fix-out-of-bound-access-in-create_url_list-CVE-2016-.patch b/package/libupnp/0002-Fix-out-of-bound-access-in-create_url_list-CVE-2016-.patch deleted file mode 100644 index 1b74d3ef2e..0000000000 --- a/package/libupnp/0002-Fix-out-of-bound-access-in-create_url_list-CVE-2016-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 9c099c2923ab4d98530ab5204af1738be5bddba7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= -Date: Thu, 8 Dec 2016 17:11:53 +0100 -Subject: [PATCH] Fix out-of-bound access in create_url_list() (CVE-2016-8863) - -If there is an invalid URL in URLS->buf after a valid one, uri_parse is -called with out pointing after the allocated memory. As uri_parse writes -to *out before returning an error the loop in create_url_list must be -stopped early to prevent an out-of-bound access - -Bug: https://sourceforge.net/p/pupnp/bugs/133/ -Bug-CVE: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-8863 -Bug-Debian: https://bugs.debian.org/842093 -Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1388771 -(cherry picked from commit a0f6e719bc03c4d2fe6a4a42ef6b8761446f520b) -Signed-off-by: Peter Korsgaard ---- - upnp/src/gena/gena_device.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/upnp/src/gena/gena_device.c b/upnp/src/gena/gena_device.c -index fb04a29..245c56b 100644 ---- a/upnp/src/gena/gena_device.c -+++ b/upnp/src/gena/gena_device.c -@@ -1113,7 +1113,7 @@ static int create_url_list( - /*! [out] . */ - URL_list *out) - { -- size_t URLcount = 0; -+ size_t URLcount = 0, URLcount2 = 0; - size_t i; - int return_code = 0; - uri_type temp; -@@ -1155,16 +1155,23 @@ static int create_url_list( - } - memcpy( out->URLs, URLS->buff, URLS->size ); - out->URLs[URLS->size] = 0; -- URLcount = 0; - for( i = 0; i < URLS->size; i++ ) { - if( ( URLS->buff[i] == '<' ) && ( i + 1 < URLS->size ) ) { - if( ( ( return_code = - parse_uri( &out->URLs[i + 1], URLS->size - i + 1, -- &out->parsedURLs[URLcount] ) ) == -+ &out->parsedURLs[URLcount2] ) ) == - HTTP_SUCCESS ) -- && ( out->parsedURLs[URLcount].hostport.text.size != -+ && ( out->parsedURLs[URLcount2].hostport.text.size != - 0 ) ) { -- URLcount++; -+ URLcount2++; -+ if (URLcount2 >= URLcount) -+ /* -+ * break early here in case there is a bogus URL that -+ * was skipped above. This prevents to access -+ * out->parsedURLs[URLcount] which is beyond the -+ * allocation. -+ */ -+ break; - } else { - if( return_code == UPNP_E_OUTOF_MEMORY ) { - free( out->URLs ); --- -2.10.2 - diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index 64a8bdbbd3..df39f327b6 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 ee3537081e3ea56f66ada10387486823989210bc98002f098305551c966e3a63 libupnp-1.6.20.tar.bz2 +sha256 af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b libupnp-1.6.21.tar.bz2 diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index 2a4e078f9c..8236cee1fe 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBUPNP_VERSION = 1.6.20 +LIBUPNP_VERSION = 1.6.21 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION) LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no LIBUPNP_INSTALL_STAGING = YES LIBUPNP_LICENSE = BSD-3c LIBUPNP_LICENSE_FILES = LICENSE -# configure.ac patched by 0001-Don-t-allow-unhandled-POSTs-to-write-to-the-filesyst.patch -LIBUPNP_AUTORECONF = YES $(eval $(autotools-package)) From 282ffecbe3c6fa123979ad2beb0b8fe86ecf5192 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 21 Dec 2016 23:07:07 +0100 Subject: [PATCH 1987/3392] package/google-breakpad: really fix the C++11 dependency The C++11 build issue is still here since the C++11 is not complete in gcc 4.7 [1]. So disable Google-breakpad for toolchains based on gcc <= 4.7. [1] https://gcc.gnu.org/gcc-4.7/cxx0x_status.html Fixes: http://autobuild.buildroot.net/results/c5e/c5e629f26bf6da369dff1e4588c16d2773173e9f Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- Config.in | 4 ++-- package/google-breakpad/Config.in | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Config.in b/Config.in index d3bb7b8377..ccd777e8bb 100644 --- a/Config.in +++ b/Config.in @@ -529,8 +529,8 @@ config BR2_GOOGLE_BREAKPAD_ENABLE bool "Enable google-breakpad support" select BR2_PACKAGE_GOOGLE_BREAKPAD depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_HOST_GCC_AT_LEAST_4_7 # C++11 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index c6171afefd..e0e91068be 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -6,8 +6,8 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS config BR2_PACKAGE_GOOGLE_BREAKPAD bool "google-breakpad" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_HOST_GCC_AT_LEAST_4_7 # C++11 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) @@ -34,9 +34,9 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD https://chromium.googlesource.com/breakpad/breakpad -comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.7" +comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.8" depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_HOST_GCC_AT_LEAST_4_7 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8 From bbe7874097cf6dd2a5d0a92a660da1300de2604a Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 19:59:12 -0300 Subject: [PATCH 1988/3392] alsa-lib: bump to version 1.1.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../0006-ucm-parser-needs-limits.h.patch | 30 +++++++++++++++++++ package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 package/alsa-lib/0006-ucm-parser-needs-limits.h.patch diff --git a/package/alsa-lib/0006-ucm-parser-needs-limits.h.patch b/package/alsa-lib/0006-ucm-parser-needs-limits.h.patch new file mode 100644 index 0000000000..b47dedb3a9 --- /dev/null +++ b/package/alsa-lib/0006-ucm-parser-needs-limits.h.patch @@ -0,0 +1,30 @@ +From 13a796b4bd00defa9f9297fd23d508b430682aed Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Wed, 21 Dec 2016 19:41:26 -0300 +Subject: [PATCH] ucm: parser needs limits.h + +It's using PATH_MAX which is defined there, otherwise the build fails on +musl libc. + +Signed-off-by: Gustavo Zacarias +--- +Patch status: sent to alsa-devel ML. + + src/ucm/parser.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ucm/parser.c b/src/ucm/parser.c +index c98373a..f520abc 100644 +--- a/src/ucm/parser.c ++++ b/src/ucm/parser.c +@@ -32,6 +32,7 @@ + + #include "ucm_local.h" + #include ++#include + + /** The name of the environment variable containing the UCM directory */ + #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM" +-- +2.10.2 + diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 47542e5f38..6f56a76796 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6 alsa-lib-1.1.2.tar.bz2 +sha256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c alsa-lib-1.1.3.tar.bz2 diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index a86d6bbe11..5957568aa3 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.1.2 +ALSA_LIB_VERSION = 1.1.3 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+ (library), GPLv2+ (aserver) From b6b447f3565835620647ca3c8e3f770080319cb2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 19:59:13 -0300 Subject: [PATCH 1989/3392] alsa-utils: bump to version 1.1.3 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index c2c089fc72..1add17e08b 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7af603c0877d1251599d65b4fbc372e63a54371b888f5c26c6a86ac1d0519071 alsa-utils-1.1.2.tar.bz2 +sha256 127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c alsa-utils-1.1.3.tar.bz2 diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index fc2ac16f79..9113b8de62 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.1.2 +ALSA_UTILS_VERSION = 1.1.3 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils ALSA_UTILS_LICENSE = GPLv2 From 3fd9c062e7ba5ae82c17df4392c2df9cf126c327 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 21 Dec 2016 19:44:32 +0100 Subject: [PATCH 1990/3392] nodejs: bump to version 6.9.2 Signed-off-by: Peter Korsgaard --- package/nodejs/Config.in | 2 +- package/nodejs/nodejs.hash | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 832152b9f0..5c4ee122c6 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_PACKAGE_NODEJS_VERSION_STRING string - default "6.9.1" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS + default "6.9.2" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS default "0.10.48" config BR2_PACKAGE_NODEJS_NPM diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index e55bb1696d..67d0258a64 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ # From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt sha256 365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e node-v0.10.48.tar.xz -# From upstream URL: http://nodejs.org/dist/v6.9.1/SHASUMS256.txt -sha256 0bdd8d1305777cc8cd206129ea494d6c6ce56001868dd80147aff531d6df0729 node-v6.9.1.tar.xz +# From upstream URL: http://nodejs.org/dist/v6.9.2/SHASUMS256.txt +sha256 f41b320b37ce23a34dbc597040e71535ea4f6baa2342bc526bb45f5f9aa9c9fb node-v6.9.2.tar.xz From 77c6476feabead9b0bef736e7615514494a7a97c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 22 Dec 2016 13:32:02 +0200 Subject: [PATCH 1991/3392] iperf3: bump to version 3.1.4 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/iperf3/iperf3.hash | 4 ++-- package/iperf3/iperf3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 1accccd04a..0cac1e3c51 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,2 +1,2 @@ -# From http://software.es.net/iperf/news.html#security-issue-iperf-3-1-3-iperf-3-0-12-released -sha256 60d8db69b1d74a64d78566c2317c373a85fef691b8d277737ee5d29f448595bf iperf-3.1.3.tar.gz +# From http://software.es.net/iperf/news.html +sha256 db61d70ac62003ebe0bf15496bd8c4b3c4b728578a44d0a1a88fcf8afc0e8f76 iperf-3.1.4.tar.gz diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 3d2a7086eb..7623786ae7 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.1.3 +IPERF3_VERSION = 3.1.4 IPERF3_SITE = http://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3c, BSD-2c, MIT From bd9549610f3b90037d0ce996628e99dbbb5bbe9a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 22 Dec 2016 23:17:58 +0200 Subject: [PATCH 1992/3392] iproute2: bump to version 4.9.0 Add the libc-compat.h musl workaround patch to the copy of the kernel header. Add a patch adding missing limits.h for musl. Drop 0001-Avoid-in6_addr-redefinition.patch; not needed after the libc-compat.h patch. Drop upstream 0003-iproute2-tc_bpf.c-fix-building-with-musl-libc..patch. Drop 0004-iproute-no-iptables.patch; should be fixed by upstream commit 4710e46ec3 (tc, ipt: don't enforce iproute2 dependency on iptables-devel). Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...workaround-to-the-libc-compat.h-copy.patch | 38 +++++++++ .../0001-Avoid-in6_addr-redefinition.patch | 79 ------------------- ...c_bpf.c-fix-building-with-musl-libc..patch | 37 --------- .../0003-tc-add-missing-limits.h-header.patch | 38 +++++++++ .../iproute2/0004-iproute-no-iptables.patch | 48 ----------- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 7 files changed, 78 insertions(+), 166 deletions(-) create mode 100644 package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch delete mode 100644 package/iproute2/0001-Avoid-in6_addr-redefinition.patch delete mode 100644 package/iproute2/0003-iproute2-tc_bpf.c-fix-building-with-musl-libc..patch create mode 100644 package/iproute2/0003-tc-add-missing-limits.h-header.patch delete mode 100644 package/iproute2/0004-iproute-no-iptables.patch diff --git a/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch b/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch new file mode 100644 index 0000000000..c7c6e15596 --- /dev/null +++ b/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch @@ -0,0 +1,38 @@ +From b4edb4eebbfd35934b8bc6d7ee0e00e76a01596c Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 22 Dec 2016 15:26:30 +0200 +Subject: [PATCH] Add the musl workaround to the libc-compat.h copy + +The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and +__USE_MISC) to solve conflicts with libc provided headers. This patch makes +libc-compat.h work also for musl libc. + +Signed-off-by: Baruch Siach +--- +Upstream status: libc-compat.h is a local copy of a kernel headers. A proper +musl fix must go to the kernel first. +--- + include/linux/libc-compat.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h +index f38571dabd8d..30f0b67c7a12 100644 +--- a/include/linux/libc-compat.h ++++ b/include/linux/libc-compat.h +@@ -49,10 +49,12 @@ + #define _LIBC_COMPAT_H + + /* We have included glibc headers... */ +-#if defined(__GLIBC__) ++#if 1 ++#define __USE_MISC + + /* Coordinate with glibc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + + /* GLIBC headers included first so don't define anything + * that would already be defined. */ +-- +2.11.0 + diff --git a/package/iproute2/0001-Avoid-in6_addr-redefinition.patch b/package/iproute2/0001-Avoid-in6_addr-redefinition.patch deleted file mode 100644 index 3417339b2b..0000000000 --- a/package/iproute2/0001-Avoid-in6_addr-redefinition.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 48596709d8ab59727b79a5c6db33ebb251c36543 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 19 Nov 2015 17:44:25 +0100 -Subject: [PATCH] Avoid in6_addr redefinition -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Due to both and being included, the -in6_addr is being redefined: once from the C library headers and once -from the kernel headers. This causes some build failures with for -example the musl C library: - -In file included from ../include/linux/xfrm.h:4:0, - from xfrm.h:29, - from ipxfrm.c:39: -../include/linux/in6.h:32:8: error: redefinition of ‘struct in6_addr’ - struct in6_addr { - ^ -In file included from .../output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netdb.h:9:0, - from ipxfrm.c:34: -.../output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:24:8: note: originally defined here - struct in6_addr - ^ - -In order to fix this, use just the C library header . - -Original patch taken from -http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch. - -Signed-off-by: Thomas Petazzoni -[Gustavo: drop ipt_kernel_headers.h chunk since no longer necessary] -Signed-off-by: Gustavo Zacarias ---- - include/linux/if_bridge.h | 1 - - include/linux/netfilter.h | 2 -- - include/linux/xfrm.h | 1 - - 3 files changed, 4 deletions(-) - -diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h -index ee197a3..f823aa4 100644 ---- a/include/linux/if_bridge.h -+++ b/include/linux/if_bridge.h -@@ -15,7 +15,6 @@ - - #include - #include --#include - - #define SYSFS_BRIDGE_ATTR "bridge" - #define SYSFS_BRIDGE_FDB "brforward" -diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h -index b71b4c9..3e4e6ae 100644 ---- a/include/linux/netfilter.h -+++ b/include/linux/netfilter.h -@@ -4,8 +4,6 @@ - #include - - #include --#include --#include - - /* Responses from hook functions. */ - #define NF_DROP 0 -diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h -index b8f5451..a9761a5 100644 ---- a/include/linux/xfrm.h -+++ b/include/linux/xfrm.h -@@ -1,7 +1,6 @@ - #ifndef _LINUX_XFRM_H - #define _LINUX_XFRM_H - --#include - #include - - /* All of the structures in this file may not change size as they are --- -2.6.3 - diff --git a/package/iproute2/0003-iproute2-tc_bpf.c-fix-building-with-musl-libc..patch b/package/iproute2/0003-iproute2-tc_bpf.c-fix-building-with-musl-libc..patch deleted file mode 100644 index 0342abef33..0000000000 --- a/package/iproute2/0003-iproute2-tc_bpf.c-fix-building-with-musl-libc..patch +++ /dev/null @@ -1,37 +0,0 @@ -From 01b287582f25cc3a8a36caee5ce13e14b9233f49 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Fri, 8 Apr 2016 09:52:55 -0300 -Subject: [PATCH] iproute2: tc_bpf.c: fix building with musl libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need limits.h for PATH_MAX, fixes: - -tc_bpf.c: In function ‘bpf_map_selfcheck_pinned’: -tc_bpf.c:222:12: error: ‘PATH_MAX’ undeclared (first use in this -function) - char file[PATH_MAX], buff[4096]; - -Signed-off-by: Gustavo Zacarias ---- -Patch status: submitted upstream - - tc/tc_bpf.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tc/tc_bpf.c b/tc/tc_bpf.c -index d94af82..042e76f 100644 ---- a/tc/tc_bpf.c -+++ b/tc/tc_bpf.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_ELF - #include --- -2.7.3 - diff --git a/package/iproute2/0003-tc-add-missing-limits.h-header.patch b/package/iproute2/0003-tc-add-missing-limits.h-header.patch new file mode 100644 index 0000000000..b9b27f31a7 --- /dev/null +++ b/package/iproute2/0003-tc-add-missing-limits.h-header.patch @@ -0,0 +1,38 @@ +From 1f4547b0a81db617f4b0d02711d9e39278eb8283 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 22 Dec 2016 20:45:11 +0200 +Subject: [PATCH] tc: add missing limits.h header + +This fixes under musl build issues like: + +f_matchall.c: In function ‘matchall_parse_opt’: +f_matchall.c:48:12: error: ‘LONG_MIN’ undeclared (first use in this function) + if (h == LONG_MIN || h == LONG_MAX) { + ^ +f_matchall.c:48:12: note: each undeclared identifier is reported only once for each function it appears in +f_matchall.c:48:29: error: ‘LONG_MAX’ undeclared (first use in this function) + if (h == LONG_MIN || h == LONG_MAX) { + ^ + +Signed-off-by: Baruch Siach +--- +Upstream status: posted http://marc.info/?l=linux-netdev&m=148243283002957&w=2 +--- + tc/tc_util.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tc/tc_util.h b/tc/tc_util.h +index f198a4ad5554..4db26c6d5e25 100644 +--- a/tc/tc_util.h ++++ b/tc/tc_util.h +@@ -2,6 +2,7 @@ + #define _TC_UTIL_H_ 1 + + #define MAX_MSG 16384 ++#include + #include + #include + #include +-- +2.11.0 + diff --git a/package/iproute2/0004-iproute-no-iptables.patch b/package/iproute2/0004-iproute-no-iptables.patch deleted file mode 100644 index 7f7f37b1d4..0000000000 --- a/package/iproute2/0004-iproute-no-iptables.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix build issues when there's no iptables present. - -Patch from Matt Whitlock -See https://bugs.gentoo.org/show_bug.cgi?id=577464 -Status: in theory submitted upstream by Lars Wendler. - ---- iproute2-4.5.0/configure~ 2016-03-14 23:02:31.000000000 +0000 -+++ iproute2-4.5.0/configure 2016-03-17 13:24:17.634743197 +0000 -@@ -169,10 +169,25 @@ - - check_ipt() - { -- if ! grep TC_CONFIG_XT Config > /dev/null -+ if grep -q TC_CONFIG_XT Config - then -+ return -+ fi -+ -+ cat >$TMPDIR/ipttest.c < -+int main() { return 0; } -+EOF -+ -+ if $CC -std=c90 -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL \ -+ $(${PKG_CONFIG} libiptc --cflags --libs 2>/dev/null) -ldl >/dev/null 2>&1 -+ then -+ echo "TC_CONFIG_IPT:=y" >>Config - echo "using iptables" -+ else -+ echo "no" - fi -+ rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest - } - - check_ipt_lib_dir() ---- iproute2-4.5.0/tc/Makefile~ 2016-03-14 23:02:31.000000000 +0000 -+++ iproute2-4.5.0/tc/Makefile 2016-03-17 13:18:18.686689985 +0000 -@@ -88,7 +88,9 @@ - CFLAGS += -DTC_CONFIG_XT_H - TCSO += m_xt_old.so - else -- TCMODULES += m_ipt.o -+ ifeq ($(TC_CONFIG_IPT),y) -+ TCMODULES += m_ipt.o -+ endif - endif - endif - endif diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 1dafa8dbd8..5cacc7f99c 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,2 +1,2 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a iproute2-4.5.0.tar.xz +sha256 c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4 iproute2-4.9.0.tar.xz diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 09e68c5ec3..5ea5299bd3 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 4.5.0 +IPROUTE2_VERSION = 4.9.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From a2ed38c359db5bdc7452c63f315738a86d1a45d5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 21 Dec 2016 22:16:21 +0100 Subject: [PATCH 1993/3392] olimex_a20_olinuxino_lime2_defconfig: correct u-boot configuration This defconfig currently doesn't build: https://travis-ci.org/buildroot/buildroot-defconfig-testing/jobs/185616951 As u-boot needs dtc, so add that and change to kconfig mode like on our other allwinner defconfigs as that is in fact what is used. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- configs/olimex_a20_olinuxino_lime2_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 87fc674b90..807f41c5ce 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -23,9 +23,11 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="A20-OLinuXino-Lime2" +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" +BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y From 80f6660460538f4f318719583619a2be059ed3fe Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 22 Dec 2016 23:37:01 -0800 Subject: [PATCH 1994/3392] docker-containerd: bump version to v0.2.5 Version bump as a dependency of Docker-Engine v1.12.5. Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-containerd/docker-containerd.hash | 2 +- package/docker-containerd/docker-containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash index 533157e5da..f27e38ed23 100644 --- a/package/docker-containerd/docker-containerd.hash +++ b/package/docker-containerd/docker-containerd.hash @@ -1,2 +1,2 @@ # Computed locally -sha256 34805aef6300fbf37adcf4362a2315fac1ea57a9ceb8b0c7b1a0859cba975428 docker-containerd-v0.2.4.tar.gz +sha256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be docker-containerd-v0.2.5.tar.gz diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 17cc9be13d..c04552a68e 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = v0.2.4 +DOCKER_CONTAINERD_VERSION = v0.2.5 DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code From 3eddce6ea04a752388bec22a623320290a5834b5 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 22 Dec 2016 23:37:02 -0800 Subject: [PATCH 1995/3392] docker-engine: bump version to v1.12.5 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index ecc5c6698b..6697d8a30d 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 cf4f876593abde06b4c19f971163a853a21b1992d75bd2fe5d8bea9015b09f87 docker-engine-v1.12.3.tar.gz +sha256 81b337368efafb631a75f6ad5469413fd5828ce672592c374adf894dc05abd38 docker-engine-v1.12.5.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index fdb3c074f6..ade6fbb02a 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = v1.12.3 +DOCKER_ENGINE_VERSION = v1.12.5 DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 006a328ad6bed214ec3c4d92120510ea37329dd1 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 22 Dec 2016 21:57:07 +0530 Subject: [PATCH 1996/3392] util-linux: fix build with ncurses util-linux version 2.29 changed ncurses handling a lot. pkg-config support to detect ncurses is removed from configure.ac and ncurses-config is used to detect it. But it even didn't allow to change config file for cross compilation. However, it is fixed in upstream later and pkg-config support is added back. This commit adds two patches from upstream that adds pkg-config support and allows specifying ncurses-config file as well. However preference is first given to pkg-config and later ncurses-config file. It also first checks for version 6 and later 5. Config option that changed are, ncursesw is enabled by default and ncurses is disabled by default. So we need to explicilty specify with/without wide char support now. This new version also allows disabling widechar support. But it can't be enabled if ncurses without widechar support is enabled. While building ncurses package, we explicitly enable pkg-config support, so we don't need to specify ncurses-config file, but it is specified for completeness. Fixes: http://autobuild.buildroot.net/results/4a2/4a25fb0d4546391d5dbbaa6cde17c45aeddb3549 Signed-off-by: Rahul Bedarkar Cc: Carlos Santos Signed-off-by: Peter Korsgaard --- ...ld-sys-prefer-pkg-config-for-ncurses.patch | 76 ++++++++++++++++ ...2-build-sys-cleanup-UL_NCURSES_CHECK.patch | 91 +++++++++++++++++++ package/util-linux/Config.in | 4 - package/util-linux/util-linux.mk | 18 +++- 4 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 package/util-linux/0001-build-sys-prefer-pkg-config-for-ncurses.patch create mode 100644 package/util-linux/0002-build-sys-cleanup-UL_NCURSES_CHECK.patch diff --git a/package/util-linux/0001-build-sys-prefer-pkg-config-for-ncurses.patch b/package/util-linux/0001-build-sys-prefer-pkg-config-for-ncurses.patch new file mode 100644 index 0000000000..ca22ee2f54 --- /dev/null +++ b/package/util-linux/0001-build-sys-prefer-pkg-config-for-ncurses.patch @@ -0,0 +1,76 @@ +From 3f7429fd2d539c7f948f72bd829404b55ac19d9f Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Mon, 12 Dec 2016 15:23:53 +0100 +Subject: [PATCH] build-sys: prefer pkg-config for ncurses + +and use ncurses{5,6}-config as fallback only. + +Signed-off-by: Karel Zak +--- + m4/ul.m4 | 48 ++++++++++++++++++++++++++++-------------------- + 1 file changed, 28 insertions(+), 20 deletions(-) + +diff --git a/m4/ul.m4 b/m4/ul.m4 +index c569c36..44c721e 100644 +--- a/m4/ul.m4 ++++ b/m4/ul.m4 +@@ -438,28 +438,36 @@ dnl The expected is ncurses or ncursesw. + dnl + AC_DEFUN([UL_NCURSES_CHECK], [ + m4_define([suffix], $1) ++ m4_define([suffixup], m4_toupper($1)) ++ ++ # pkg-config ++ PKG_CHECK_MODULES(suffixup, [$1], [ ++ have_[]suffix=yes ++ NCURSES_LIBS=${suffixup[]_LIBS} ++ NCURSES_CFLAGS=${suffixup[]_CFLAGS} ++ ],[have_[]suffix=no]) + + # ncurses-config should be everywhere, pkg-config is not supported by default + # by ncurses upstream + # +- AC_MSG_CHECKING([$1]) +- if AC_RUN_LOG([suffix[]6-config --version >/dev/null]); then +- have_[]suffix=yes +- NCURSES_LIBS=`suffix[]6-config --libs` +- NCURSES_CFLAGS=`suffix[]6-config --cflags` +- AC_MSG_RESULT([(v6) yes]) +- elif AC_RUN_LOG([suffix[]5-config --version >/dev/null]); then +- have_[]suffix=yes +- NCURSES_LIBS=`suffix[]5-config --libs` +- NCURSES_CFLAGS=`suffix[]5-config --cflags` +- AC_MSG_RESULT([(v5) yes]) +- else +- AC_MSG_RESULT([no]) +- +- # fallback +- AC_CHECK_LIB([$1], [initscr], [have_[]suffix=yes], [have_[]suffix=no]) +- AS_IF([test "x$have_[]suffix" = xyes], [ +- NCURSES_LIBS="-l[]suffix" +- ]) +- fi ++ AS_IF([test "x$have_[]suffix" = xno], [ ++ AC_MSG_CHECKING([$1 config]) ++ if AC_RUN_LOG([suffix[]6-config --version >/dev/null]); then ++ have_[]suffix=yes ++ NCURSES_LIBS=`suffix[]6-config --libs` ++ NCURSES_CFLAGS=`suffix[]6-config --cflags` ++ AC_MSG_RESULT([(v6) yes]) ++ elif AC_RUN_LOG([suffix[]5-config --version >/dev/null]); then ++ have_[]suffix=yes ++ NCURSES_LIBS=`suffix[]5-config --libs` ++ NCURSES_CFLAGS=`suffix[]5-config --cflags` ++ AC_MSG_RESULT([(v5) yes]) ++ else ++ AC_MSG_RESULT([no]) ++ AS_IF([test "x$have_[]suffix" = xno], [ ++ AC_CHECK_LIB([$1], [initscr], [have_[]suffix=yes], [have_[]suffix=no]) ++ AS_IF([test "x$have_[]suffix" = xyes], [NCURSES_LIBS="-l[]suffix"]) ++ ]) ++ fi ++ ]) + ]) +-- +2.6.2 + diff --git a/package/util-linux/0002-build-sys-cleanup-UL_NCURSES_CHECK.patch b/package/util-linux/0002-build-sys-cleanup-UL_NCURSES_CHECK.patch new file mode 100644 index 0000000000..40810b23ea --- /dev/null +++ b/package/util-linux/0002-build-sys-cleanup-UL_NCURSES_CHECK.patch @@ -0,0 +1,91 @@ +From 862326451184bb0fe9c2b2b110fcfc986f9b1734 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 13 Dec 2016 12:41:18 +0100 +Subject: [PATCH] build-sys: cleanup UL_NCURSES_CHECK + +* use SUFFIX for upper-case suffix +* use AC_CHECK_TOOL() to search for ncurses-config (thanks to Mike Frysinger) +* separate checks by AS_IF() + +Signed-off-by: Karel Zak +--- + m4/ul.m4 | 54 +++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 33 insertions(+), 21 deletions(-) + +diff --git a/m4/ul.m4 b/m4/ul.m4 +index 44c721e..f8a0dd7 100644 +--- a/m4/ul.m4 ++++ b/m4/ul.m4 +@@ -438,36 +438,48 @@ dnl The expected is ncurses or ncursesw. + dnl + AC_DEFUN([UL_NCURSES_CHECK], [ + m4_define([suffix], $1) +- m4_define([suffixup], m4_toupper($1)) ++ m4_define([SUFFIX], m4_toupper($1)) + +- # pkg-config +- PKG_CHECK_MODULES(suffixup, [$1], [ ++ # pkg-config (not supported by ncurses upstream by default) ++ # ++ PKG_CHECK_MODULES(SUFFIX, [$1], [ + have_[]suffix=yes +- NCURSES_LIBS=${suffixup[]_LIBS} +- NCURSES_CFLAGS=${suffixup[]_CFLAGS} ++ NCURSES_LIBS=${SUFFIX[]_LIBS} ++ NCURSES_CFLAGS=${SUFFIX[]_CFLAGS} + ],[have_[]suffix=no]) + +- # ncurses-config should be everywhere, pkg-config is not supported by default +- # by ncurses upstream ++ # ncurses6-config + # + AS_IF([test "x$have_[]suffix" = xno], [ +- AC_MSG_CHECKING([$1 config]) +- if AC_RUN_LOG([suffix[]6-config --version >/dev/null]); then ++ AC_CHECK_TOOL(SUFFIX[]6_CONFIG, suffix[]6-config) ++ if AC_RUN_LOG([$SUFFIX[]6_CONFIG --version >/dev/null]); then + have_[]suffix=yes +- NCURSES_LIBS=`suffix[]6-config --libs` +- NCURSES_CFLAGS=`suffix[]6-config --cflags` +- AC_MSG_RESULT([(v6) yes]) +- elif AC_RUN_LOG([suffix[]5-config --version >/dev/null]); then ++ NCURSES_LIBS=`$SUFFIX[]6_CONFIG --libs` ++ NCURSES_CFLAGS=`$SUFFIX[]6_CONFIG --cflags` ++ else ++ have_[]suffix=no ++ fi ++ ]) ++ ++ # ncurses5-config ++ # ++ AS_IF([test "x$have_[]suffix" = xno], [ ++ AC_CHECK_TOOL(SUFFIX[]5_CONFIG, suffix[]5-config) ++ if AC_RUN_LOG([$SUFFIX[]5_CONFIG --version >/dev/null]); then + have_[]suffix=yes +- NCURSES_LIBS=`suffix[]5-config --libs` +- NCURSES_CFLAGS=`suffix[]5-config --cflags` +- AC_MSG_RESULT([(v5) yes]) ++ NCURSES_LIBS=`$SUFFIX[]5_CONFIG --libs` ++ NCURSES_CFLAGS=`$SUFFIX[]5_CONFIG --cflags` + else +- AC_MSG_RESULT([no]) +- AS_IF([test "x$have_[]suffix" = xno], [ +- AC_CHECK_LIB([$1], [initscr], [have_[]suffix=yes], [have_[]suffix=no]) +- AS_IF([test "x$have_[]suffix" = xyes], [NCURSES_LIBS="-l[]suffix"]) +- ]) ++ have_[]suffix=no + fi + ]) ++ ++ # classic autoconf way ++ # ++ AS_IF([test "x$have_[]suffix" = xno], [ ++ AS_IF([test "x$have_[]suffix" = xno], [ ++ AC_CHECK_LIB([$1], [initscr], [have_[]suffix=yes], [have_[]suffix=no]) ++ AS_IF([test "x$have_[]suffix" = xyes], [NCURSES_LIBS="-l[]suffix"]) ++ ]) ++ ]) + ]) +-- +2.6.2 + diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 9b70f9f58d..e957f848bb 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -1,6 +1,5 @@ menuconfig BR2_PACKAGE_UTIL_LINUX bool "util-linux" - depends on BR2_USE_WCHAR select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Various useful/essential linux libraries and utilities. @@ -370,6 +369,3 @@ config BR2_PACKAGE_UTIL_LINUX_ZRAMCTL Set up and control zram devices endif - -comment "util-linux needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 1bf2046974..bec69933a1 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -9,6 +9,10 @@ UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) +# For 0001-build-sys-prefer-pkg-config-for-ncurses.patch and +# 0002-build-sys-cleanup-UL_NCURSES_CHECK.patch +UTIL_LINUX_AUTORECONF = YES + # README.licensing claims that some files are GPLv2-only, but this is not true. # Some files are GPLv3+ but only in tests. UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, LGPLv2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid) @@ -43,8 +47,20 @@ endif ifeq ($(BR2_PACKAGE_NCURSES),y) UTIL_LINUX_DEPENDENCIES += ncurses +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +UTIL_LINUX_CONF_OPTS += --with-ncursesw +UTIL_LINUX_CONF_ENV += NCURSESW5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) +else +UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses --disable-widechar +UTIL_LINUX_CONF_ENV += NCURSES5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) +endif else -UTIL_LINUX_CONF_OPTS += --without-ncurses +ifeq ($(BR2_USE_WCHAR),y) +UTIL_LINUX_CONF_OPTS += --enable-widechar +else +UTIL_LINUX_CONF_OPTS += --disable-widechar +endif +UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses endif ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) From 332360e34289cfaea66cbf04ddc648ba837a904f Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Mon, 19 Dec 2016 22:29:07 +0100 Subject: [PATCH 1997/3392] skalibs: new package This new package provides skalibs, a collection of free software / open source C development files used for building all softwares from skarnet.org. Note that, though skalibs (and all skarnet softwares) follows the "./configure; make; make install" convention, it does not behave like a traditional autotools project: - static libraries are installed in $prefix/usr/lib/skalibs. - pkg-config and libtool are not used: instead a custom system called "sysdeps" is used and locations to libraries and headers are to be passed explicitly via options of the './configure' script. The host variant is provided to allow building the host variants of the other skarnet softwares. Signed-off-by: Eric Le Bihan [Thomas: remove post install target hook, do it directly in the target installation commands.] Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + ...0001-No-runtime-tests-for-endianness.patch | 95 +++++++++++++++++++ ...0002-No-runtime-tests-for-type-sizes.patch | 54 +++++++++++ package/skalibs/Config.in | 9 ++ package/skalibs/skalibs.hash | 2 + package/skalibs/skalibs.mk | 54 +++++++++++ 6 files changed, 215 insertions(+) create mode 100644 package/skalibs/0001-No-runtime-tests-for-endianness.patch create mode 100644 package/skalibs/0002-No-runtime-tests-for-type-sizes.patch create mode 100644 package/skalibs/Config.in create mode 100644 package/skalibs/skalibs.hash create mode 100644 package/skalibs/skalibs.mk diff --git a/package/Config.in b/package/Config.in index 3a49167fbd..f2103b5f51 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1367,6 +1367,7 @@ endif source "package/qhull/Config.in" source "package/qlibc/Config.in" source "package/shapelib/Config.in" + source "package/skalibs/Config.in" source "package/sphinxbase/Config.in" source "package/startup-notification/Config.in" source "package/tinycbor/Config.in" diff --git a/package/skalibs/0001-No-runtime-tests-for-endianness.patch b/package/skalibs/0001-No-runtime-tests-for-endianness.patch new file mode 100644 index 0000000000..4390d449dd --- /dev/null +++ b/package/skalibs/0001-No-runtime-tests-for-endianness.patch @@ -0,0 +1,95 @@ +From 1e6f0b094c6ce6454be572704b866d2ce0962e59 Mon Sep 17 00:00:00 2001 +From: Eric Le Bihan +Date: Sun, 4 Dec 2016 19:10:40 +0100 +Subject: [PATCH] No runtime tests for endianness + +Replace build and execution of runtime test programs for determining +the endianness of the target with compile time test programs. + +This improves support for cross-compilation. + +Signed-off-by: Eric Le Bihan +--- + configure | 15 +++++++++++---- + src/sysdeps/trybigendian.c | 16 ++++++++++++++++ + src/sysdeps/trylittleendian.c | 16 ++++++++++++++++ + 3 files changed, 43 insertions(+), 4 deletions(-) + create mode 100644 src/sysdeps/trybigendian.c + create mode 100644 src/sysdeps/trylittleendian.c + +diff --git a/configure b/configure +index 1579025..4da9c5e 100755 +--- a/configure ++++ b/configure +@@ -463,13 +463,20 @@ EOF + fi + exec 3>&- + +- echo "Checking system endianness..." +- $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -o tryendianness src/sysdeps/tryendianness.c +- endianness=$(./tryendianness) || fail "$0: unable to determine endianness" ++ echo "Checking system endianness..." ++ if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -o trybigendian src/sysdeps/trybigendian.c 2>/dev/null; then ++ endianness=big ++ else ++ if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -o trylittleendian src/sysdeps/trylittleendian.c 2>/dev/null; then ++ endianness=little ++ else ++ fail "$0: unable to determine endianness" ++ fi ++ fi + echo "endianness: $endianness" >> $sysdeps/sysdeps + echo "#define ${package_macro_name}_ENDIANNESS \"$endianness\"" >> $sysdeps/sysdeps.h + echo " ... $endianness" +- rm -f tryendianness ++ rm -f trybigendian trylittleendian + + trytypesize ushort USHORT "unsigned short" + trytypesize uint UINT "unsigned int" +diff --git a/src/sysdeps/trybigendian.c b/src/sysdeps/trybigendian.c +new file mode 100644 +index 0000000..d857572 +--- /dev/null ++++ b/src/sysdeps/trybigendian.c +@@ -0,0 +1,16 @@ ++#if defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN) || \ ++ defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) || \ ++ defined(__BIG_ENDIAN) || \ ++ defined(__ARMEB__) || \ ++ defined(__THUMBEB__) || \ ++ defined(__AARCH64EB__) || \ ++ defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__) ++#define YEAH ++#else ++#error "not big endian" ++#endif ++ ++int main(void) ++{ ++ return 0; ++} +diff --git a/src/sysdeps/trylittleendian.c b/src/sysdeps/trylittleendian.c +new file mode 100644 +index 0000000..eba065a +--- /dev/null ++++ b/src/sysdeps/trylittleendian.c +@@ -0,0 +1,16 @@ ++#if defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN) || \ ++ defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \ ++ defined(__LITTLE_ENDIAN) || \ ++ defined(__ARMEL__) || \ ++ defined(__THUMBEL__) || \ ++ defined(__AARCH64EL__) || \ ++ defined(_MIPSEL) || defined(__MIPSEL) || defined(__MIPSEL__) ++#define YEAH ++#else ++#error "not little endian" ++#endif ++ ++int main(void) ++{ ++ return 0; ++} +-- +2.5.5 + diff --git a/package/skalibs/0002-No-runtime-tests-for-type-sizes.patch b/package/skalibs/0002-No-runtime-tests-for-type-sizes.patch new file mode 100644 index 0000000000..3f16171e21 --- /dev/null +++ b/package/skalibs/0002-No-runtime-tests-for-type-sizes.patch @@ -0,0 +1,54 @@ +From d868600a3f437750bc44a783d677a25a48100096 Mon Sep 17 00:00:00 2001 +From: Eric Le Bihan +Date: Sun, 4 Dec 2016 19:11:25 +0100 +Subject: [PATCH] No runtime tests for type sizes + +Replace build and execution of runtime test programs for determining +some type sizes of the target with compile time test programs. + +This improves support for cross-compilation. + +Signed-off-by: Eric Le Bihan +--- + configure | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index 4da9c5e..b5926ca 100755 +--- a/configure ++++ b/configure +@@ -157,10 +157,28 @@ choose () { + + trytypesize () { + echo "Checking size of $3..." +- $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO $LDFLAGS_AUTO -o trysizeof$1 src/sysdeps/trysizeof$1.c +- type_size=$(./trysizeof$1) || fail "$0: unable to determine size of $3" ++ r=false ++ type_size=0 ++ while true; do ++ cat<trysizeof$1.c ++#include ++ ++int main(void) ++{ ++ static int v = 1 / !!((sizeof($3) == $type_size)); ++ return 0; ++} ++EOF ++ if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO $LDFLAGS_AUTO -o trysizeof$1 trysizeof$1.c 2>/dev/null; then ++ r=true ++ break ++ fi ++ type_size=$(expr $type_size + 1) ++ test $type_size -le 16 || break ++ done ++ test $r = true || fail "$0: unable to determine size of $3" + type_bits=$(expr 8 \* $type_size) +- rm -f trysizeof$1 ++ rm -f trysizeof$1 trysizeof$1.c + echo "sizeof$1: $type_size" >> $sysdeps/sysdeps + echo "#define ${package_macro_name}_SIZEOF$2 $type_size" >> $sysdeps/sysdeps.h + echo "#define ${package_macro_name}_$2_BITS $type_bits" >> $sysdeps/sysdeps.h +-- +2.5.5 + diff --git a/package/skalibs/Config.in b/package/skalibs/Config.in new file mode 100644 index 0000000000..7802ae30c4 --- /dev/null +++ b/package/skalibs/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_SKALIBS + bool "skalibs" + depends on BR2_USE_MMU # fork() + help + skalibs is a package centralizing the FOSS C development + files used for building all software at skarnet.org: + it contains essentially general-purpose libraries. + + http://skarnet.org/software/skalibs/ diff --git a/package/skalibs/skalibs.hash b/package/skalibs/skalibs.hash new file mode 100644 index 0000000000..195ac47988 --- /dev/null +++ b/package/skalibs/skalibs.hash @@ -0,0 +1,2 @@ +# Locally generated +sha256 0708172bc2ec9825f8a4f312d35f8dcd94da5f291425a598c33c873b3de77df8 skalibs-2.4.0.2.tar.gz diff --git a/package/skalibs/skalibs.mk b/package/skalibs/skalibs.mk new file mode 100644 index 0000000000..55b8a293a7 --- /dev/null +++ b/package/skalibs/skalibs.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# skalibs +# +################################################################################ + +SKALIBS_VERSION = 2.4.0.2 +SKALIBS_SITE = http://skarnet.org/software/skalibs +SKALIBS_LICENSE = ISC +SKALIBS_LICENSE_FILES = COPYING +SKALIBS_INSTALL_STAGING = YES + +SKALIBS_CONF_OPTS = \ + --prefix=/usr \ + --with-default-path=/sbin:/usr/sbin:/bin:/usr/bin \ + $(SHARED_STATIC_LIBS_OPTS) + +define SKALIBS_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(SKALIBS_CONF_OPTS)) +endef + +define SKALIBS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define SKALIBS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + rm -rf $(TARGET_DIR)/usr/lib/skalibs +endef + +define SKALIBS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install +endef + +HOST_SKALIBS_CONF_OPTS = \ + --prefix=$(HOST_DIR)/usr \ + --disable-static \ + --enable-shared \ + --disable-allstatic + +define HOST_SKALIBS_CONFIGURE_CMDS + (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure $(HOST_SKALIBS_CONF_OPTS)) +endef + +define HOST_SKALIBS_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_SKALIBS_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package)) From 80332d3be64f1aab6fdab1c8cec2c8499d5b9b34 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Dec 2016 11:20:29 +0100 Subject: [PATCH 1998/3392] DEVELOPERS: add Eric Le Bihan for package/skalibs/ Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index a1d8e57f36..abddf9df41 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -428,6 +428,7 @@ F: package/eudev/ F: package/hicolor-icon-theme/ F: package/jemalloc/ F: package/ninja/ +F: package/skalibs/ F: package/smack/ F: package/xvisor/ From 6fadda7adc7291eb355382d0f05677a92f9c3d57 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Dec 2016 11:26:05 +0100 Subject: [PATCH 1999/3392] util-linux: attempt to fix host-util-linux build Should fix: http://autobuild.buildroot.net/results/65595aa787498087a9a85c9cd19135396b246afb/ Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index bec69933a1..51ece90b63 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -150,6 +150,7 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --enable-libmount \ --enable-libuuid \ --without-ncurses \ + --without-ncursesw \ --without-tinfo ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) From ecc6da3b1ac245f017a7dd5b85cc778af09297dd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Dec 2016 14:36:38 +0100 Subject: [PATCH 2000/3392] xfsprogs: disable on musl Despite a recent bump, xfsprogs still doesn't build on musl. It's been failing for a long long time, so let's disable it in this configuration. Fixes: http://autobuild.buildroot.net/results/c6cd42da1abe2936872da1f9db093ffc72be3c15/ Signed-off-by: Thomas Petazzoni --- package/xfsprogs/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index 6e1a935bbc..a82663f575 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -1,11 +1,12 @@ -comment "xfsprogs needs a toolchain w/ wchar" +comment "xfsprogs needs a glibc or uClibc toolchain w/ wchar" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR + depends on !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL config BR2_PACKAGE_XFSPROGS bool "xfsprogs" depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR # util-linux + depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID From 3477a7520b155eb2f98c56834794f6bea7e688cb Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Fri, 23 Dec 2016 12:10:06 +0100 Subject: [PATCH 2001/3392] python-lxml: bump to version 3.7.0 Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index 656c01f3aa..cab3e37fe1 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 61d5d3e00b5821e6cda099b3b4ccfea4527bf7c595e0fb3a7a760490cedd6172 lxml-3.6.4.tgz +sha256 9c62eb2a1862e1ae285d7e7e3b7dc8772d387b19258086afcec143c6b7b8a5c9 lxml-3.7.0.tgz diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index b117ec8dc9..6495351546 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_LXML_VERSION = 3.6.4 +PYTHON_LXML_VERSION = 3.7.0 PYTHON_LXML_SITE = http://lxml.de/files PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tgz From 3b2c814aebdb782242ec2bbe20b24c71accd1af5 Mon Sep 17 00:00:00 2001 From: Marcin Nowakowski Date: Fri, 23 Dec 2016 12:19:25 +0100 Subject: [PATCH 2002/3392] kexec: bump to 2.0.14 Patch 0002-arm-add-phys_to_virt.h-and-iomem.patch is now obsolete as it's been properly fixed upstream now. Signed-off-by: Marcin Nowakowski Signed-off-by: Peter Korsgaard --- ...002-arm-add-phys_to_virt.h-and-iomem.patch | 35 ------------------- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/kexec/0002-arm-add-phys_to_virt.h-and-iomem.patch diff --git a/package/kexec/0002-arm-add-phys_to_virt.h-and-iomem.patch b/package/kexec/0002-arm-add-phys_to_virt.h-and-iomem.patch deleted file mode 100644 index 748acbde18..0000000000 --- a/package/kexec/0002-arm-add-phys_to_virt.h-and-iomem.patch +++ /dev/null @@ -1,35 +0,0 @@ -arm: add iomem.h and phys_to_virt.h - -Fixes build for arm. - -This patch is equivalent to upstream commit 1574ff1aae4f3 (arm: include -phys_to_virt.h and iomem.h in distribution) when applied to the tarball. - -Signed-off-by: Baruch Siach - ---- -diff -Nuar kexec-tools-2.0.13-orig/kexec/arch/arm/iomem.h kexec-tools-2.0.13/kexec/arch/arm/iomem.h ---- kexec-tools-2.0.13-orig/kexec/arch/arm/iomem.h 1970-01-01 02:00:00.000000000 +0200 -+++ kexec-tools-2.0.13/kexec/arch/arm/iomem.h 2016-10-21 09:45:27.495689269 +0300 -@@ -0,0 +1,9 @@ -+#ifndef IOMEM_H -+#define IOMEM_H -+ -+#define SYSTEM_RAM "System RAM\n" -+#define SYSTEM_RAM_BOOT "System RAM (boot alias)\n" -+#define CRASH_KERNEL "Crash kernel\n" -+#define CRASH_KERNEL_BOOT "Crash kernel (boot alias)\n" -+ -+#endif -diff -Nuar kexec-tools-2.0.13-orig/kexec/arch/arm/phys_to_virt.h kexec-tools-2.0.13/kexec/arch/arm/phys_to_virt.h ---- kexec-tools-2.0.13-orig/kexec/arch/arm/phys_to_virt.h 1970-01-01 02:00:00.000000000 +0200 -+++ kexec-tools-2.0.13/kexec/arch/arm/phys_to_virt.h 2016-10-21 09:45:27.495689269 +0300 -@@ -0,0 +1,8 @@ -+#ifndef PHYS_TO_VIRT_H -+#define PHYS_TO_VIRT_H -+ -+#include -+ -+extern uint64_t phys_offset; -+ -+#endif diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 90a7ce9ab4..9039dad489 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 874baf421171dbfca0084af2da71ccf5a67749dd2a27c3023da5f72460bae5cc kexec-tools-2.0.13.tar.xz +sha256 ffb2e7e99d9d08754c6bc1922aed3c000094f318665d82a72ecc76c4ff1c0dc6 kexec-tools-2.0.14.tar.xz diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 0a74369785..0a8e9f03a1 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.13 +KEXEC_VERSION = 2.0.14 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPLv2 From 5a18eabdf08564688761a9b2f35892d69d8f9a18 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 23 Dec 2016 14:33:30 +0100 Subject: [PATCH 2003/3392] util-linux: fix ncurses/wchar handling Since commit 006a328ad6bed214ec3c4d92120510ea37329dd1 ("util-linux: fix build with ncurses"), we have a build failure that occurs with musl toolchains when wide-char support is not enabled in ncurses. The problem comes from the fact that musl provides wchar support (so it defines wchar_t). But when ncursesw is not available, we currently pass --disable-widechar which tells util-linux that wchar support is not available at all (not only in ncurses). When this gets passed to util-linux configure script, then it defines its own wchar_t, which conflicts with the musl definition. So, we should not pass --disable-widechar when BR2_USE_WCHAR=y, which is what this commit does: it moves the BR2_USE_WCHAR logic outside of the ncurses logic, and passes --enable-widechar/--disable-widechar as appropriate. However, there's a gotcha: util-linux really wants the ncursesw variant of ncurses when the system has wchar support enabled. We take this into account by: - Enabling ncursesw when BR2_PACKAGE_NCURSES_WCHAR=y. In this case, we have ncurses and we have BR2_USE_WCHAR=y, so everything is fine. - Otherwise, enabling ncurses when BR2_PACKAGE_NCURSES=y but BR2_USE_WCHAR is disabled. To make sure that the existing util-linux programs that need ncurses support still build fine, we adjust the Config.in to select BR2_PACKAGE_NCURSES_WCHAR on BR2_USE_WCHAR=y configurations. Fixes: http://autobuild.buildroot.net/results/19de2a0b12380ddc86dbba0dae3a3877b25f83ff/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/util-linux/Config.in | 5 +++++ package/util-linux/util-linux.mk | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index e957f848bb..cfb245123d 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -207,6 +207,7 @@ config BR2_PACKAGE_UTIL_LINUX_MORE bool "more" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR help File perusal filter for crt viewing @@ -252,6 +253,7 @@ config BR2_PACKAGE_UTIL_LINUX_PG bool "pg" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR help Browse pagewise through text files @@ -298,6 +300,7 @@ config BR2_PACKAGE_UTIL_LINUX_SETPRIV config BR2_PACKAGE_UTIL_LINUX_SETTERM bool "setterm" select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR help Set terminal attributes @@ -310,12 +313,14 @@ config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT config BR2_PACKAGE_UTIL_LINUX_TUNELP bool "tunelp" select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR help Set various parameters for the lp device config BR2_PACKAGE_UTIL_LINUX_UL bool "ul" select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR if BR2_USE_WCHAR help Do underlining diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 51ece90b63..414465cff6 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -45,21 +45,21 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) UTIL_LINUX_DEPENDENCIES += busybox endif -ifeq ($(BR2_PACKAGE_NCURSES),y) -UTIL_LINUX_DEPENDENCIES += ncurses -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) -UTIL_LINUX_CONF_OPTS += --with-ncursesw -UTIL_LINUX_CONF_ENV += NCURSESW5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) -else -UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses --disable-widechar -UTIL_LINUX_CONF_ENV += NCURSES5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) -endif -else ifeq ($(BR2_USE_WCHAR),y) UTIL_LINUX_CONF_OPTS += --enable-widechar else UTIL_LINUX_CONF_OPTS += --disable-widechar endif + +ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) +UTIL_LINUX_DEPENDENCIES += ncurses +UTIL_LINUX_CONF_OPTS += --with-ncursesw +UTIL_LINUX_CONF_ENV += NCURSESW5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) +else ifeq ($(BR2_PACKAGE_NCURSES):$(BR2_USE_WCHAR),y:) +UTIL_LINUX_DEPENDENCIES += ncurses +UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses +UTIL_LINUX_CONF_ENV += NCURSES5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) +else UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses endif From 9ffa395fc83c79cc53cbfa533b64c04f5a4a5323 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 21 Dec 2016 21:46:11 +0100 Subject: [PATCH 2004/3392] armadeus_apf9328_defconfig: bump kernel to 3.18.29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Which includes the gcc5+ fix for ftrace: commit aeea3592a13bf12861943e44fc48f1f270941f8d Author: Behan Webster Date: Wed Sep 24 01:06:46 2014 +0100 ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h With compilers which follow the C99 standard (like modern versions of gcc and clang), "extern inline" does the wrong thing (emits code for an externally linkable version of the inline function). In this case using static inline and removing the NULL version of return_address in return_address.c does the right thing. Signed-off-by: Behan Webster Reviewed-by: Mark Charlebois Acked-by: Steven Rostedt Signed-off-by: Russell King Otherwise, the build dies with: arch/arm/kernel/return_address.c:66:7: error: redefinition of ‘return_address’ void *return_address(unsigned int level) ^ In file included from include/linux/ftrace.h:20:0, from arch/arm/kernel/return_address.c:12: ./arch/arm/include/asm/ftrace.h:48:21: note: previous definition of ‘return_address’ was here extern inline void *return_address(unsigned int level) ^ For more details, see: https://travis-ci.org/buildroot/buildroot-defconfig-testing/jobs/185616889 notice: Only build tested as I don't have the hw, which is also why the kernel is only bumped to 3.18 to make it as safe as possible. CC: Julien Boibessot Signed-off-by: Peter Korsgaard --- configs/armadeus_apf9328_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/armadeus_apf9328_defconfig b/configs/armadeus_apf9328_defconfig index d83ed711d1..fbc98643bf 100644 --- a/configs/armadeus_apf9328_defconfig +++ b/configs/armadeus_apf9328_defconfig @@ -10,8 +10,8 @@ BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=y -# Linux headers same as kernel, a 3.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y +# Linux headers same as kernel, a 3.18 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y # System BR2_TARGET_GENERIC_HOSTNAME="apf9328" @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_JFFS2=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.29" BR2_LINUX_KERNEL_DEFCONFIG="imx_v4_v5" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x08008000" From 72b6bf8f57569c14238d223bb6cc6fec7fd3af4d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 23 Dec 2016 11:16:05 +0100 Subject: [PATCH 2005/3392] libcurl: security bump to 7.52.1 Fixes CVE-2016-9594 - Unitilized random Libcurl's (new) internal function that returns a good 32bit random value was implemented poorly and overwrote the pointer instead of writing the value into the buffer the pointer pointed to. Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 2 +- package/libcurl/libcurl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 2b68c6a7b4..7a942f238b 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 b9a2e18b4785eb75ad84598720e1559e1c53550ea011c0e00becdb94e2df5cc6 curl-7.52.0.tar.bz2 +sha256 d16185a767cb2c1ba3d5b9096ec54e5ec198b213f45864a38b3bda4bbf87389b curl-7.52.1.tar.bz2 diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index b2a1b241dc..ea37309d82 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.52.0 +LIBCURL_VERSION = 7.52.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From b6f66b0c532e706852b2a0694dab4b6ca3db8402 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:08 -0300 Subject: [PATCH 2006/3392] collectd: bump to version 5.7.0 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/collectd.hash | 2 +- package/collectd/collectd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/collectd/collectd.hash b/package/collectd/collectd.hash index d385c0dd03..2accf83405 100644 --- a/package/collectd/collectd.hash +++ b/package/collectd/collectd.hash @@ -1,2 +1,2 @@ # From https://collectd.org/files/SHA256SUM -sha256 017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f collectd-5.5.2.tar.bz2 +sha256 25a05fbdc6baad571554342bbac6141928bf95a47fc60ee3b32e46d0c89ef2b2 collectd-5.7.0.tar.bz2 diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 4846ee4cb2..ccb2f1133e 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -4,7 +4,7 @@ # ################################################################################ -COLLECTD_VERSION = 5.5.2 +COLLECTD_VERSION = 5.7.0 COLLECTD_SITE = http://collectd.org/files COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes From 8d6dd49e60250f788c3d35b3982c3b0252143d56 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:09 -0300 Subject: [PATCH 2007/3392] collectd: add notify_nagios plugin support Add explicit support for the new notify_nagios dependency-less plugin. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 5 +++++ package/collectd/collectd.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 6405af6a89..72e57931a5 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -75,6 +75,11 @@ config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL comment "notify_email needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS +config BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS + bool "notify_nagios" + help + Sends notifications to Nagios as a passive check result. + config BR2_PACKAGE_COLLECTD_SYSLOG bool "syslog" default y diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index ccb2f1133e..942ba38893 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -77,6 +77,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_NGINX),--enable-nginx,--disable-nginx) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFICATION),--enable-target_notification,--disable-target_notification) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),--enable-notify_email,--disable-notify_email) \ + $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS),--enable-notify_nagios,--disable-notify_nagios) \ $(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \ $(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \ $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),--enable-openldap,--disable-openldap) \ From a5829f36b8c5c4525cbfbdf296c719d0a7862d27 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:10 -0300 Subject: [PATCH 2008/3392] collectd: drop notify_email global disable It's a no-op since it's disabled/enabled by the config knob. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 942ba38893..060fe0a942 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -16,7 +16,7 @@ COLLECTD_LICENSE_FILES = COPYING COLLECTD_PLUGINS_DISABLE = \ amqp apple_sensors aquaero ascent barometer dbi email \ gmond hddtemp ipmi java libvirt lpar lvm madwifi mbmon \ - mic multimeter netapp notify_desktop notify_email numa \ + mic multimeter netapp notify_desktop numa \ nut onewire oracle perl pf pinba powerdns python redis routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish virt vserver write_kafka \ From 6686a8b2bceb67bf855879f5fba4b2d0f9aa90f3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:11 -0300 Subject: [PATCH 2009/3392] collectd: explicitly disable zone plugin It's intended for solaris so no usage case for buildroot. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 060fe0a942..1fec4143fa 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -20,7 +20,7 @@ COLLECTD_PLUGINS_DISABLE = \ nut onewire oracle perl pf pinba powerdns python redis routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish virt vserver write_kafka \ - write_mongodb write_redis xmms zfs_arc + write_mongodb write_redis xmms zfs_arc zone COLLECTD_CONF_ENV += LIBS="-lm" From c7a2be68febe0b244a4edcf5b01ec3a3d129fe7e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:12 -0300 Subject: [PATCH 2010/3392] collectd: explicitly disable xencpu plugin It requires the libxenctrl library which buildroot doesn't provide yet. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 1fec4143fa..11685cd004 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -20,7 +20,7 @@ COLLECTD_PLUGINS_DISABLE = \ nut onewire oracle perl pf pinba powerdns python redis routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish virt vserver write_kafka \ - write_mongodb write_redis xmms zfs_arc zone + write_mongodb write_redis xencpu xmms zfs_arc zone COLLECTD_CONF_ENV += LIBS="-lm" From 81456f1e920076270b0c6aeac99c3e51fe81325d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:13 -0300 Subject: [PATCH 2011/3392] collectd: add chrony plugin support Add explicit support for the new chrony dependency-less plugin. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 5 +++++ package/collectd/collectd.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 72e57931a5..5e84aa5c5d 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -127,6 +127,11 @@ config BR2_PACKAGE_COLLECTD_CEPH help Statistics from the Ceph distributed storage system. +config BR2_PACKAGE_COLLECTD_CHRONY + bool "chrony" + help + Collects NTP data from the chrony NTP server. + config BR2_PACKAGE_COLLECTD_CGROUPS bool "cgroups" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 11685cd004..5018fb0628 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -35,6 +35,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \ $(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \ $(if $(BR2_PACKAGE_COLLECTD_CEPH),--enable-ceph,--disable-ceph) \ + $(if $(BR2_PACKAGE_COLLECTD_CHRONY),--enable-chrony,--disable-chrony) \ $(if $(BR2_PACKAGE_COLLECTD_CGROUPS),--enable-cgroups,--disable-cgroups) \ $(if $(BR2_PACKAGE_COLLECTD_CONNTRACK),--enable-conntrack,--disable-conntrack) \ $(if $(BR2_PACKAGE_COLLECTD_CONTEXTSWITCH),--enable-contextswitch,--disable-contextswitch) \ From 0c48707f48715e744b8bb3fd03d40509147c6aab Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:14 -0300 Subject: [PATCH 2012/3392] collectd: add cpusleep plugin support Add explicit support for the new cpusleep dependency-less plugin. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 5 +++++ package/collectd/collectd.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 5e84aa5c5d..d1b85aadbe 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -157,6 +157,11 @@ config BR2_PACKAGE_COLLECTD_CPUFREQ help Collects the current CPU's frequency. +config BR2_PACKAGE_COLLECTD_CPUSLEEP + bool "cpusleep" + help + Measures time spent by CPU in deep sleep mode. + config BR2_PACKAGE_COLLECTD_CURL bool "curl" select BR2_PACKAGE_LIBCURL diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 5018fb0628..d8b2576c90 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -41,6 +41,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_CONTEXTSWITCH),--enable-contextswitch,--disable-contextswitch) \ $(if $(BR2_PACKAGE_COLLECTD_CPU),--enable-cpu,--disable-cpu) \ $(if $(BR2_PACKAGE_COLLECTD_CPUFREQ),--enable-cpufreq,--disable-cpufreq) \ + $(if $(BR2_PACKAGE_COLLECTD_CPUSLEEP),--enable-cpusleep,--disable-cpusleep) \ $(if $(BR2_PACKAGE_COLLECTD_CSV),--enable-csv,--disable-csv) \ $(if $(BR2_PACKAGE_COLLECTD_CURL),--enable-curl,--disable-curl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),--enable-curl_json,--disable-curl_json) \ From 66f64ddfbfd9d1929850141ee9a14407502f7d00 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:15 -0300 Subject: [PATCH 2013/3392] collectd: add mqtt plugin support Add explicit support for the mqtt (mosquitto) plugin. Place it under the write category even though it can read as well, since it will normally be used to write (publish) rather than read (subscribe). Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 6 ++++++ package/collectd/collectd.mk | 2 ++ 2 files changed, 8 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index d1b85aadbe..b17abe830c 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -512,6 +512,12 @@ config BR2_PACKAGE_COLLECTD_GRAPHITE Writes data collected to Carbon (Graphite's) storage API. http://graphite.wikidot.com/start +config BR2_PACKAGE_COLLECTD_MQTT + bool "mqtt" + select BR2_PACKAGE_MOSQUITTO + help + Sends metrics to and/or receives metrics from an MQTT broker. + config BR2_PACKAGE_COLLECTD_NETWORK bool "network" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index d8b2576c90..97e2e98db8 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -72,6 +72,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \ $(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \ $(if $(BR2_PACKAGE_COLLECTD_MODBUS),--enable-modbus,--disable-modbus) \ + $(if $(BR2_PACKAGE_COLLECTD_MQTT),--enable-mqtt,--disable-mqtt) \ $(if $(BR2_PACKAGE_COLLECTD_MYSQL),--enable-mysql,--disable-mysql) \ $(if $(BR2_PACKAGE_COLLECTD_NETLINK),--enable-netlink,--disable-netlink) \ $(if $(BR2_PACKAGE_COLLECTD_NETWORK),--enable-network,--disable-network) \ @@ -133,6 +134,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ $(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \ + $(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \ $(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql) \ $(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \ $(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \ From 6b2ef2881e65858f75782575ceabd740a379fa13 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:16 -0300 Subject: [PATCH 2014/3392] collectd: explicitly disable grpc plugin It requires the libgrpc++ library which buildroot doesn't provide yet. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 97e2e98db8..2b57e51d92 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -15,7 +15,7 @@ COLLECTD_LICENSE_FILES = COPYING # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ amqp apple_sensors aquaero ascent barometer dbi email \ - gmond hddtemp ipmi java libvirt lpar lvm madwifi mbmon \ + gmond grpc hddtemp ipmi java libvirt lpar lvm madwifi mbmon \ mic multimeter netapp notify_desktop numa \ nut onewire oracle perl pf pinba powerdns python redis routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ From d430b24ecd4da25fd195905e6f92a501cf79ade0 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:17 -0300 Subject: [PATCH 2015/3392] collectd: add hugepages plugin support Add explicit support for the new hugepages dependency-less plugin. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 5 +++++ package/collectd/collectd.mk | 1 + 2 files changed, 6 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index b17abe830c..7cd6397e68 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -237,6 +237,11 @@ config BR2_PACKAGE_COLLECTD_FSCACHE Collects information about the file-system based caching infrastructure for network file-systems and other slow media. +config BR2_PACKAGE_COLLECTD_HUGEPAGES + bool "hugepages" + help + Reports the number of used and free hugepages on Linux. + config BR2_PACKAGE_COLLECTD_INTERFACE bool "interface" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 2b57e51d92..392c76f7db 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -59,6 +59,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \ $(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \ $(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \ + $(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \ $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ From b3d7b588f42e7231ef613f592448b4be22e136c3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:18 -0300 Subject: [PATCH 2016/3392] collectd: explicitly disable dpdkstat plugin It requires the libdpdk library which buildroot doesn't provide yet. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 392c76f7db..f306d16609 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -14,7 +14,7 @@ COLLECTD_LICENSE_FILES = COPYING # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ - amqp apple_sensors aquaero ascent barometer dbi email \ + amqp apple_sensors aquaero ascent barometer dbi dpdkstat email \ gmond grpc hddtemp ipmi java libvirt lpar lvm madwifi mbmon \ mic multimeter netapp notify_desktop numa \ nut onewire oracle perl pf pinba powerdns python redis routeros \ From 1e8a15a01466aa5cb224c9ad213b32f024d82043 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:19 -0300 Subject: [PATCH 2017/3392] collectd: explicitly disable intel_rdt plugin It requires the libpqos library which buildroot doesn't provide yet. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/collectd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index f306d16609..b105e903ba 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -15,8 +15,8 @@ COLLECTD_LICENSE_FILES = COPYING # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ amqp apple_sensors aquaero ascent barometer dbi dpdkstat email \ - gmond grpc hddtemp ipmi java libvirt lpar lvm madwifi mbmon \ - mic multimeter netapp notify_desktop numa \ + gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lvm \ + madwifi mbmon mic multimeter netapp notify_desktop numa \ nut onewire oracle perl pf pinba powerdns python redis routeros \ rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish virt vserver write_kafka \ From b0631a385863217ab9b781183264400e553cb2bd Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:20 -0300 Subject: [PATCH 2018/3392] collectd: add gps plugin support Add explicit support for the gps plugin that uses libgps from the gpsd package. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 7 +++++++ package/collectd/collectd.mk | 2 ++ 2 files changed, 9 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 7cd6397e68..02c02b7f36 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -237,6 +237,13 @@ config BR2_PACKAGE_COLLECTD_FSCACHE Collects information about the file-system based caching infrastructure for network file-systems and other slow media. +config BR2_PACKAGE_COLLECTD_GPS + bool "gps" + select BR2_PACKAGE_GPSD + help + Reports the number of sattelites seen by and precision + of a GPS receiver. + config BR2_PACKAGE_COLLECTD_HUGEPAGES bool "hugepages" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index b105e903ba..520ce1c77c 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -57,6 +57,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_FHCOUNT),--enable-fhcount,--disable-fhcount) \ $(if $(BR2_PACKAGE_COLLECTD_FILECOUNT),--enable-filecount,--disable-filecount) \ $(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \ + $(if $(BR2_PACKAGE_COLLECTD_GPS),--enable-gps,--disable-gps) \ $(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \ $(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \ $(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \ @@ -131,6 +132,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \ $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \ $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \ + $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ From 2db9867da9bc43dad29de4678273e1b508b4c535 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Dec 2016 22:59:21 -0300 Subject: [PATCH 2019/3392] collectd: add write_prometheus plugin support Add explicit support for the write_prometheus plugin, it requires the libmicrohttpd and protobuf-c libraries. [Peter: add note about where dependencies come from] Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 14 ++++++++++++++ package/collectd/collectd.mk | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 02c02b7f36..ab49b71e02 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -572,6 +572,20 @@ config BR2_PACKAGE_COLLECTD_WRITELOG help Writes data to the log. +config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS + bool "write_prometheus" + depends on BR2_INSTALL_LIBSTDCPP # protobuf-c + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c + select BR2_PACKAGE_LIBMICROHTTPD + select BR2_PACKAGE_PROTOBUF_C + help + Publishes values using an embedded HTTP server, in a format + compatible with Prometheus' collectd_exporter. + +comment "write_prometheus needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + config BR2_PACKAGE_COLLECTD_WRITESENSU bool "write_sensu" help diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 520ce1c77c..50a2e53efa 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -119,6 +119,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ $(if $(BR2_PACKAGE_COLLECTD_WRITELOG),--enable-write_log,--disable-write_log) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),--enable-write_prometheus,--disable-write_prometheus) \ $(if $(BR2_PACKAGE_COLLECTD_WRITESENSU),--enable-write_sensu,--disable-write_sensu) \ $(if $(BR2_PACKAGE_COLLECTD_WRITETSDB),--enable-write_tsdb,--disable-write_tsdb) \ $(if $(BR2_PACKAGE_COLLECTD_ZOOKEEPER),--enable-zookeeper,--disable-zookeeper) @@ -150,7 +151,8 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \ $(if $(BR2_PACKAGE_COLLECTD_SMART),libatasmart) \ $(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \ - $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) + $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) \ + $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c) # include/library fixups ifeq ($(BR2_PACKAGE_LIBCURL),y) From 0533484eb7e2ff8500406035c59d2c3c2c07dda3 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 23 Dec 2016 22:02:46 -0800 Subject: [PATCH 2020/3392] docker-engine: fix docker version output At compile-time the docker build scripts generate a version file used to build the output of the docker version command. This file is generated somewhat properly by the Buildroot build system, however the version number and commit ID are incorrectly formatted. This patch fixes the output to the correct format. This is important as some tools like WeaveWorks won't even start unless they can parse the Docker Version output correctly. [Peter: strip v from version using patsusbt] Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index ade6fbb02a..2cd71dd898 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -5,6 +5,7 @@ ################################################################################ DOCKER_ENGINE_VERSION = v1.12.5 +DOCKER_ENGINE_COMMIT = 7392c3b0ce0f9d3e918a321c66668c5d1ef4f689 DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 @@ -67,7 +68,9 @@ endif define DOCKER_ENGINE_CONFIGURE_CMDS ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker cd $(@D) && \ - GITCOMMIT="unknown" BUILDTIME="$$(date)" VERSION="$(DOCKER_ENGINE_VERSION)" \ + GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \ + BUILDTIME="$$(date)" \ + VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \ bash ./hack/make/.go-autogen endef From 10cce5f36256c8722e4208fad90713d7ecffc997 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 24 Dec 2016 12:37:39 +0100 Subject: [PATCH 2021/3392] package/bullet: bump to version 2.85.1 http://bulletphysics.org/wordpress/?p=456 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/bullet/bullet.hash | 2 +- package/bullet/bullet.mk | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/bullet/bullet.hash b/package/bullet/bullet.hash index 5b5360c621..cccc42580e 100644 --- a/package/bullet/bullet.hash +++ b/package/bullet/bullet.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c26ac96b487d7e44136ff4406dbbfe5a4d7d254ed1a2c09122c464803e7d1314 bullet-19f999ac087e68ffc2551ffb73e35e60271a0d27.tar.gz +sha256 6e157c0b50373bc0e860de27f06397827bb28a4205bc568ae79d76a0f919ed62 bullet-2.85.1.tar.gz diff --git a/package/bullet/bullet.mk b/package/bullet/bullet.mk index 3ec97b4326..99ff423632 100644 --- a/package/bullet/bullet.mk +++ b/package/bullet/bullet.mk @@ -4,15 +4,16 @@ # ################################################################################ -# This is the git id of the 2.82 release. -BULLET_VERSION = 19f999ac087e68ffc2551ffb73e35e60271a0d27 +BULLET_VERSION = 2.85.1 BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION)) BULLET_INSTALL_STAGING = YES BULLET_LICENSE = zlib license -BULLET_LICENSE_FILES = BulletLicense.txt COPYING +BULLET_LICENSE_FILES = LICENSE.txt -# Disable GLUT support since there is no freeglut or OpenGLUT package and we -# don't build the demos apps. -BULLET_CONF_OPTS = -DUSE_GLUT=OFF -DBUILD_DEMOS=OFF +# Disable demos apps and unit tests. +# Disable Bullet3 library. +BULLET_CONF_OPTS = -DBUILD_UNIT_TESTS=OFF \ + -DBUILD_BULLET2_DEMOS=OFF \ + -DBUILD_BULLET3=OFF $(eval $(cmake-package)) From 203813e981ff79c6150bec5adc9d5c5c98c5d6a3 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 24 Dec 2016 20:40:49 +0200 Subject: [PATCH 2022/3392] putty: don't treat warnings as errors Fixes: http://autobuild.buildroot.net/results/652/65246fe6357cd3cd8490bc54baa2394730dcef79/ http://autobuild.buildroot.net/results/853/85320f3b8e770bbfbec306685ad75b66e91bd6ee/ http://autobuild.buildroot.net/results/492/492a7055408ed6b388982cece41e98d956ef85f8/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/putty/putty.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/putty/putty.mk b/package/putty/putty.mk index ca86c47052..7603f693d1 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -11,6 +11,7 @@ PUTTY_SUBDIR = unix PUTTY_LICENSE = MIT PUTTY_LICENSE_FILES = LICENCE PUTTY_CONF_OPTS = --disable-gtktest +PUTTY_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -Wno-error" ifeq ($(BR2_PACKAGE_LIBGTK2),y) PUTTY_CONF_OPTS += --with-gtk=2 From a1914921ebc3c5d5720d7249e3dc2e5d030471f4 Mon Sep 17 00:00:00 2001 From: Jack Kao Date: Sun, 25 Dec 2016 21:54:34 +0800 Subject: [PATCH 2023/3392] collectd: fix option passed to the snmp dependency --with-libnetsnmp doesn't take a path to the netsnmp config script, but to the sysroot where netsnmp can be found. Fixes: http://autobuild.buildroot.org/results/358e2f02f42e08fe362ecd46e636c0048e77c21f/ Signed-off-by: Jack Kao [Thomas: path is $(STAGING_DIR)/usr, not $(STAGING_DIR)/usr/include.] Signed-off-by: Thomas Petazzoni --- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 50a2e53efa..28c1b31e09 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -162,7 +162,7 @@ ifeq ($(BR2_PACKAGE_MYSQL),y) COLLECTD_CONF_OPTS += --with-libmysql=$(STAGING_DIR)/usr endif ifeq ($(BR2_PACKAGE_NETSNMP),y) -COLLECTD_CONF_OPTS += --with-libnetsnmp=$(STAGING_DIR)/usr/bin/net-snmp-config +COLLECTD_CONF_OPTS += --with-libnetsnmp=$(STAGING_DIR)/usr endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) COLLECTD_CONF_OPTS += --with-libpq=$(STAGING_DIR)/usr/bin/pg_config From 62f0195119187449e6f037b3d0f753de855752ae Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 25 Dec 2016 23:38:15 +0100 Subject: [PATCH 2024/3392] exim: security bump to 4.87.1 No features are added or removed. This release contains just a fix for CVE-2016-9963 - Fix CVE-2016-9963 - Info leak from DKIM. When signing DKIM, if either LMTP or PRDR was used for delivery, the key could appear in logs. Additionally, if the experimental feature "DSN_INFO" was used, it could appear in DSN messages (and be sent offsite). Signed-off-by: Peter Korsgaard --- package/exim/exim.hash | 2 +- package/exim/exim.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/exim/exim.hash b/package/exim/exim.hash index 83be731988..ef2d03ba21 100644 --- a/package/exim/exim.hash +++ b/package/exim/exim.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 74691e0dff4d1b5d387e9c33c86f96a8f6d2adbc781c0dec9d2061a847b07dc9 exim-4.87.tar.bz2 +sha256 d4b7994c89240d2f9a9fcd7a2dffa4b72f14379001a24266f4dbb0fbe5131514 exim-4.87.1.tar.bz2 diff --git a/package/exim/exim.mk b/package/exim/exim.mk index ed7d16975f..a9f4685eb9 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,9 +4,9 @@ # ################################################################################ -EXIM_VERSION = 4.87 +EXIM_VERSION = 4.87.1 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.bz2 -EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4 +EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4/old EXIM_LICENSE = GPLv2+ EXIM_LICENSE_FILES = LICENCE EXIM_DEPENDENCIES = pcre berkeleydb host-pkgconf From b36b2d023fc30a1b6fd2616e6f53d61b90ca0ab3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 26 Dec 2016 13:21:22 -0300 Subject: [PATCH 2025/3392] lighttpd: bump to version 1.4.44 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/lighttpd/lighttpd.hash | 2 +- package/lighttpd/lighttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index c00236b671..c325fda0e6 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,2 +1,2 @@ # From http://www.lighttpd.net/ -sha256 fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a lighttpd-1.4.43.tar.xz +sha256 adb66ca985651957feb209c91c55ebbf917d23630bfc3a216a2f70043c7b5422 lighttpd-1.4.44.tar.xz diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 9f7599a1e4..c36c3b6488 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).43 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).44 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3c From 80fdc678921a9093d171d435e540393441834267 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 26 Dec 2016 20:28:23 +0100 Subject: [PATCH 2026/3392] busybox: fix modutils compile Do not use syscall wrappers from uClibc. Patch submitted upstream: http://lists.busybox.net/pipermail/busybox/2016-December/085031.html Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- ...ls-remove-special-handling-of-uClibc.patch | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 package/busybox/0003-modutils-remove-special-handling-of-uClibc.patch diff --git a/package/busybox/0003-modutils-remove-special-handling-of-uClibc.patch b/package/busybox/0003-modutils-remove-special-handling-of-uClibc.patch new file mode 100644 index 0000000000..49ccb8ff43 --- /dev/null +++ b/package/busybox/0003-modutils-remove-special-handling-of-uClibc.patch @@ -0,0 +1,76 @@ +From 7cf41b6e281c42fb7f2117927a8ff7f476103e76 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Sun, 25 Dec 2016 16:53:32 +0100 +Subject: [PATCH] modutils: remove special handling of uClibc + +Commit 3a45b87ac36f (modutils: support finit_module syscall) introduced +macro finit_module. But it is not defined for uClibc. + +The compilation for busybox fails for MIPS with: +With uClibc, we get following build errors: + + modutils/lib.a(modutils.o): In function `bb_init_module': + modutils.c:(.text.bb_init_module+0x94): undefined reference to `finit_module' + modutils.c:(.text.bb_init_module+0xa0): undefined reference to `finit_module' + +We can just use syscall() without any need for the +uClibc wrappers. + +Newer versions of uClibc-ng (>1.0.20) will remove the +module syscall wrappers. + +Found via Buildroot autobuilders: +http://autobuild.buildroot.net/results/556/55655daef23788fb3967f801ec8b79e9bed7122b/build-end.log + +Reported-by: Rahul Bedarkar +Signed-off-by: Waldemar Brodkorb +--- + modutils/modprobe-small.c | 4 ++-- + modutils/modutils.c | 15 +++++---------- + 2 files changed, 7 insertions(+), 12 deletions(-) + +diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c +index 652ff4d..0fc9ea4 100644 +--- a/modutils/modprobe-small.c ++++ b/modutils/modprobe-small.c +@@ -39,8 +39,8 @@ + #include + #include + +-extern int init_module(void *module, unsigned long len, const char *options); +-extern int delete_module(const char *module, unsigned flags); ++#define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts) ++#define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags) + #ifdef __NR_finit_module + # define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags) + #endif +diff --git a/modutils/modutils.c b/modutils/modutils.c +index d36caaf..d56bfc8 100644 +--- a/modutils/modutils.c ++++ b/modutils/modutils.c +@@ -7,17 +7,12 @@ + */ + #include "modutils.h" + +-#ifdef __UCLIBC__ +-extern int init_module(void *module, unsigned long len, const char *options); +-extern int delete_module(const char *module, unsigned int flags); +-#else +-# include +-# define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts) +-# if defined(__NR_finit_module) +-# define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags) +-# endif +-# define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags) ++#include ++#define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts) ++#if defined(__NR_finit_module) ++# define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags) + #endif ++#define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags) + + static module_entry *helper_get_module(module_db *db, const char *module, int create) + { +-- +2.1.4 + From 463cb478a9d2866806bb93eceb97d961c643a335 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 26 Dec 2016 20:29:48 +0100 Subject: [PATCH 2027/3392] uclibc: update to 1.0.21 Remove all patches as they are upstream. Remove MALLOC_GLIBC_COMPAT and UCLIBC_HAS_OBSTACK as they got removed. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- ...ux-common-madvise.c-disable-on-noMMU.patch | 31 ------- ....h-remove-madvise-posix_madvise-prot.patch | 36 -------- .../uclibc/0003-bfin-fix-a-gcc-warning.patch | 25 ------ ...-static-linking-for-FDPIC-toolchains.patch | 49 ----------- .../0005-xtensa-fix-static-linking.patch | 60 -------------- ...ptimize-single-threaded-applications.patch | 83 ------------------- ...definition-of-__attribute_alloc_size.patch | 42 ---------- package/uclibc/uClibc-ng.config | 2 - package/uclibc/uclibc.hash | 2 +- package/uclibc/uclibc.mk | 2 +- 10 files changed, 2 insertions(+), 330 deletions(-) delete mode 100644 package/uclibc/0001-libc-sysdeps-linux-common-madvise.c-disable-on-noMMU.patch delete mode 100644 package/uclibc/0002-include-sys-mman.h-remove-madvise-posix_madvise-prot.patch delete mode 100644 package/uclibc/0003-bfin-fix-a-gcc-warning.patch delete mode 100644 package/uclibc/0004-fix-static-linking-for-FDPIC-toolchains.patch delete mode 100644 package/uclibc/0005-xtensa-fix-static-linking.patch delete mode 100644 package/uclibc/0006-threads-optimize-single-threaded-applications.patch delete mode 100644 package/uclibc/0007-sys-cdefs.h-add-definition-of-__attribute_alloc_size.patch diff --git a/package/uclibc/0001-libc-sysdeps-linux-common-madvise.c-disable-on-noMMU.patch b/package/uclibc/0001-libc-sysdeps-linux-common-madvise.c-disable-on-noMMU.patch deleted file mode 100644 index bc971536b9..0000000000 --- a/package/uclibc/0001-libc-sysdeps-linux-common-madvise.c-disable-on-noMMU.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bf7a84dc1fd8c9c340222260cb3e53019715088c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 7 Dec 2016 23:18:49 +0100 -Subject: [PATCH] libc/sysdeps/linux/common/madvise.c: disable on noMMU - architectures - -Similar to what was done in commit -9945c6d21797553e78cbef8034f6dd16b3824df5 for posix_madvise(). - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Waldemar Brodkorb ---- - libc/sysdeps/linux/common/madvise.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libc/sysdeps/linux/common/madvise.c b/libc/sysdeps/linux/common/madvise.c -index e953d7b..bb486d2 100644 ---- a/libc/sysdeps/linux/common/madvise.c -+++ b/libc/sysdeps/linux/common/madvise.c -@@ -9,6 +9,8 @@ - - #include - #include -+#ifdef __ARCH_USE_MMU__ - #if defined __NR_madvise && defined __USE_BSD - _syscall3(int, madvise, void *, __addr, size_t, __len, int, __advice) -+#endif /* __ARCH_USE_MMU__ */ - #endif --- -2.1.4 - diff --git a/package/uclibc/0002-include-sys-mman.h-remove-madvise-posix_madvise-prot.patch b/package/uclibc/0002-include-sys-mman.h-remove-madvise-posix_madvise-prot.patch deleted file mode 100644 index 1d0d8a63c6..0000000000 --- a/package/uclibc/0002-include-sys-mman.h-remove-madvise-posix_madvise-prot.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 25a60624713990c637f125e094e968ff4655307c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 7 Dec 2016 23:20:18 +0100 -Subject: [PATCH] include/sys/mman.h: remove madvise/posix_madvise - prototypes on noMMU - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Waldemar Brodkorb ---- - include/sys/mman.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/sys/mman.h b/include/sys/mman.h -index 71d553a..fc8fce5 100644 ---- a/include/sys/mman.h -+++ b/include/sys/mman.h -@@ -99,6 +99,7 @@ static __inline__ int msync (void *__addr, size_t __len, int __flags) { return 0 - - #endif - -+#ifdef __ARCH_USE_MMU__ - #if defined __USE_BSD && (defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__) - /* Advise the system about particular usage patterns the program follows - for the region starting at ADDR and extending LEN bytes. */ -@@ -108,6 +109,8 @@ extern int madvise (void *__addr, size_t __len, int __advice) __THROW; - /* This is the POSIX name for this function. */ - extern int posix_madvise (void *__addr, size_t __len, int __advice) __THROW; - #endif -+#endif /* __ARCH_USE_MMU__ */ -+ - - #if defined __UCLIBC_HAS_REALTIME__ - # ifdef __ARCH_USE_MMU__ --- -2.1.4 - diff --git a/package/uclibc/0003-bfin-fix-a-gcc-warning.patch b/package/uclibc/0003-bfin-fix-a-gcc-warning.patch deleted file mode 100644 index 2463e6ca55..0000000000 --- a/package/uclibc/0003-bfin-fix-a-gcc-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1f79f41508d0f9c30be812bea9b84fd7900a273e Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Thu, 8 Dec 2016 04:07:47 +0100 -Subject: [PATCH] bfin: fix a gcc warning - -Signed-off-by: Waldemar Brodkorb ---- - ldso/ldso/bfin/dl-sysdep.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h -index 5758117..4262a26 100644 ---- a/ldso/ldso/bfin/dl-sysdep.h -+++ b/ldso/ldso/bfin/dl-sysdep.h -@@ -93,6 +93,6 @@ static __always_inline void - elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr, - Elf32_Word relative_count) - { -- return 0; -+ return; - } - #endif --- -2.1.4 - diff --git a/package/uclibc/0004-fix-static-linking-for-FDPIC-toolchains.patch b/package/uclibc/0004-fix-static-linking-for-FDPIC-toolchains.patch deleted file mode 100644 index 3dc778f881..0000000000 --- a/package/uclibc/0004-fix-static-linking-for-FDPIC-toolchains.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 569914be2e968a1bda8b4982ca97c1524635174e Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Thu, 8 Dec 2016 04:36:10 +0100 -Subject: [PATCH] fix static linking for FDPIC toolchains - -Fixes following problem, when trying to compile a simple -C application statically with a FDPIC toolchain (for example -with Blackfin architecture): -lib/libc.a(libdl.os): In function `do_dlclose': -(.text+0x6be): undefined reference to `_dl_free' -.. - -Signed-off-by: Waldemar Brodkorb ---- - ldso/libdl/libdl.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c -index 0cf3b70..04d7c43 100644 ---- a/ldso/libdl/libdl.c -+++ b/ldso/libdl/libdl.c -@@ -30,6 +30,14 @@ - */ - - -+/* When libdl is linked in statically into libc.a, we need to replace -+ * these symbols that otherwise would have been loaded in from ldso. -+ * This must be before including ldso.h */ -+#ifndef SHARED -+#define _dl_malloc malloc -+#define _dl_free free -+#endif -+ - #include - #include - #include -@@ -86,9 +94,6 @@ extern char *_dl_debug; - - #else /* !SHARED */ - --#define _dl_malloc malloc --#define _dl_free free -- - /* When libdl is linked as a static library, we need to replace all - * the symbols that otherwise would have been loaded in from ldso... */ - --- -2.1.4 - diff --git a/package/uclibc/0005-xtensa-fix-static-linking.patch b/package/uclibc/0005-xtensa-fix-static-linking.patch deleted file mode 100644 index 7a96bf7fa3..0000000000 --- a/package/uclibc/0005-xtensa-fix-static-linking.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 6579597083e608f5a66fe8a898d113c2588e2c8f Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Wed, 7 Dec 2016 07:59:34 +0100 -Subject: [PATCH] xtensa: fix static linking - -uClibc-ng 1.0.20 fixed static linking with "libdl" by adding all libdl functions -into the libc. On xtensa, though, libdl contains an unresolved reference that is -satisfied by the ld.so - which is not a part of the linking in a static case. - -Signed-off-by: Alexey Neyman -Acked-by: Max Filippov -Signed-off-by: Waldemar Brodkorb ---- - libpthread/nptl/sysdeps/Makefile.commonarch | 5 +++-- - libpthread/nptl/sysdeps/xtensa/Makefile.arch | 2 +- - libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S | 1 + - 3 files changed, 5 insertions(+), 3 deletions(-) - create mode 100644 libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S - -diff --git a/libpthread/nptl/sysdeps/Makefile.commonarch b/libpthread/nptl/sysdeps/Makefile.commonarch -index c206ac9..134eade 100644 ---- a/libpthread/nptl/sysdeps/Makefile.commonarch -+++ b/libpthread/nptl/sysdeps/Makefile.commonarch -@@ -32,10 +32,11 @@ libpthread_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libpthread_ar - libpthread_arch_OBJS = $(libpthread_subarch_OBJS) $(libpthread_arch_COBJ) $(libpthread_arch_SOBJ) - - libc_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_CSRC)) --libc_arch_SOBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC)) -+libc_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC)) - libc_arch_OBJS = $(libc_arch_COBJ) $(libc_arch_SOBJ) - libc_arch_a_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_a_CSRC)) --libc_arch_a_OBJS = $(libc_arch_a_COBJ) -+libc_arch_a_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_a_SSRC)) -+libc_arch_a_OBJS = $(libc_arch_a_COBJ) $(libc_arch_a_SOBJ) - - librt_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(librt_arch_CSRC)) - librt_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(librt_arch_SSRC)) -diff --git a/libpthread/nptl/sysdeps/xtensa/Makefile.arch b/libpthread/nptl/sysdeps/xtensa/Makefile.arch -index 9e63b19..642e4ba 100644 ---- a/libpthread/nptl/sysdeps/xtensa/Makefile.arch -+++ b/libpthread/nptl/sysdeps/xtensa/Makefile.arch -@@ -20,7 +20,7 @@ ASFLAGS-pthread_spin_lock.S = -DNOT_IN_libc -DIS_IN_libpthread - ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread - - libc_arch_a_CSRC = libc-tls.c --librt_arch_a_SSRC = dl-tlsdesc.S -+libc_arch_a_SSRC = libc-dl-tlsdesc.S - - CFLAGS-gen_tlsdesc.c = -S - $(libpthread_arch_OUT)/gen_tlsdesc.c: $(libpthread_arch_DIR)/tlsdesc.sym | $(libpthread_arch_OUT) -diff --git a/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S b/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S -new file mode 100644 -index 0000000..39da7c2 ---- /dev/null -+++ b/libpthread/nptl/sysdeps/xtensa/libc-dl-tlsdesc.S -@@ -0,0 +1 @@ -+#include --- -2.1.4 - diff --git a/package/uclibc/0006-threads-optimize-single-threaded-applications.patch b/package/uclibc/0006-threads-optimize-single-threaded-applications.patch deleted file mode 100644 index 2983820b0f..0000000000 --- a/package/uclibc/0006-threads-optimize-single-threaded-applications.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 5ca03df6978345c297225212cc0ca33d476b0272 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Wed, 7 Dec 2016 07:56:44 +0100 -Subject: [PATCH] threads: optimize single threaded applications - -Revert the removal of the weak pthread functions and -guarantee a link order so that single threaded applications -doesn't link in all the pthread functions they don't use. - -Signed-off-by: Max Filippov -Tested-by: Waldemar Brodkorb -Signed-off-by: Waldemar Brodkorb ---- - libc/misc/internals/Makefile.in | 4 +++- - libc/misc/internals/__uClibc_main.c | 37 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 40 insertions(+), 1 deletion(-) - -diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in -index ae094ee..ce7f75a 100644 ---- a/libc/misc/internals/Makefile.in -+++ b/libc/misc/internals/Makefile.in -@@ -25,7 +25,9 @@ libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.oS - else - libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.os - endif --libc-static-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o -+# link order is important to not pull in pthread functions, when -+# a single threaded application is statically linked -+libc-static-y := $(MISC_INTERNALS_OUT)/__uClibc_main.o $(libc-static-y) - libc-static-$(UCLIBC_FORMAT_FLAT_SEP_DATA) += \ - $(MISC_INTERNALS_OUT)/shared_flat_initfini.o \ - $(MISC_INTERNALS_OUT)/shared_flat_add_library.o -diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c -index 46e24d8..d80565e 100644 ---- a/libc/misc/internals/__uClibc_main.c -+++ b/libc/misc/internals/__uClibc_main.c -@@ -68,6 +68,43 @@ uintptr_t __stack_chk_guard attribute_relro; - - void internal_function _dl_aux_init (ElfW(auxv_t) *av); - -+#ifdef __UCLIBC_HAS_THREADS__ -+/* -+ * uClibc internal locking requires that we have weak aliases -+ * for dummy functions in case a single threaded application is linked. -+ * This needs to be in compilation unit that is pulled always -+ * in or linker will disregard these weaks. -+ */ -+ -+static int __pthread_return_0 (pthread_mutex_t *unused) { return 0; } -+weak_alias (__pthread_return_0, __pthread_mutex_lock) -+weak_alias (__pthread_return_0, __pthread_mutex_trylock) -+weak_alias (__pthread_return_0, __pthread_mutex_unlock) -+ -+int weak_function -+__pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr) -+{ -+ return 0; -+} -+ -+void weak_function -+_pthread_cleanup_push_defer(struct _pthread_cleanup_buffer *__buffer, -+ void (*__routine) (void *), void *__arg) -+{ -+ __buffer->__routine = __routine; -+ __buffer->__arg = __arg; -+} -+ -+void weak_function -+_pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer *__buffer, -+ int __execute) -+{ -+ if (__execute) -+ __buffer->__routine(__buffer->__arg); -+} -+ -+#endif /* __UCLIBC_HAS_THREADS__ */ -+ - #endif /* !SHARED */ - - /* Defeat compiler optimization which assumes function addresses are never NULL */ --- -2.1.4 - diff --git a/package/uclibc/0007-sys-cdefs.h-add-definition-of-__attribute_alloc_size.patch b/package/uclibc/0007-sys-cdefs.h-add-definition-of-__attribute_alloc_size.patch deleted file mode 100644 index c9421ef938..0000000000 --- a/package/uclibc/0007-sys-cdefs.h-add-definition-of-__attribute_alloc_size.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dfcc950af1af003ee9e6fc985b5d6b3eb7d408af Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 19 Dec 2016 22:56:30 +0100 -Subject: [PATCH] sys/cdefs.h: add definition of __attribute_alloc_size__ - -Commit cee0b058fa0b4501b289a2da365182d60314d746 ("add aligned_alloc -required for latest gcc libstdc++") added the prototype of -aligned_alloc() to . This prototype contains -'__attribute_alloc_size__ ((2))', but this is not defined anywhere in -uClibc-ng. - -This commit addresses that by adding the relevant definition in -, borrowed from glibc. - -Signed-off-by: Thomas Petazzoni ---- - include/sys/cdefs.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h -index f725ce9..6cd3811 100644 ---- a/include/sys/cdefs.h -+++ b/include/sys/cdefs.h -@@ -222,6 +222,15 @@ - # define __attribute_malloc__ /* Ignore */ - #endif - -+/* Tell the compiler which arguments to an allocation function -+ indicate the size of the allocation. */ -+#if __GNUC_PREREQ (4, 3) -+# define __attribute_alloc_size__(params) \ -+ __attribute__ ((__alloc_size__ params)) -+#else -+# define __attribute_alloc_size__(params) /* Ignore. */ -+#endif -+ - /* At some point during the gcc 2.96 development the `pure' attribute - for functions was introduced. We don't want to use it unconditionally - (although this would be possible) since it generates warnings. */ --- -2.7.4 - diff --git a/package/uclibc/uClibc-ng.config b/package/uclibc/uClibc-ng.config index 2671e06777..528bce9657 100644 --- a/package/uclibc/uClibc-ng.config +++ b/package/uclibc/uClibc-ng.config @@ -5,8 +5,6 @@ KERNEL_HEADERS="/usr/src/linux/include" # UCLIBC_STATIC_LDCONFIG is not set LDSO_RUNPATH=y LDSO_RUNPATH_OF_EXECUTABLE=y -MALLOC_GLIBC_COMPAT=y -UCLIBC_HAS_OBSTACK=y UCLIBC_HAS_UTMPX=y UCLIBC_HAS_UTMP=y UCLIBC_SUSV2_LEGACY=y diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 9d2a5ec0f2..0c9e71a338 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,2 +1,2 @@ # From http://www.uclibc-ng.org/ -sha256 1c817672a65cf9132c98f84e1b8445650de1c18eca258f49c0050b420a25e946 uClibc-ng-1.0.20.tar.xz +sha256 6e99ebebe8a46ddcd26615828d51b62dbf580568aa58bf5f495da37eba0c872d uClibc-ng-1.0.21.tar.xz diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index aa67a1e763..bef1bb7bfa 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.20 +UCLIBC_VERSION = 1.0.21 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPLv2.1+ From b575baeb1ad787dac1ce31343adfd6ee3415ca41 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 24 Dec 2016 21:10:42 +0200 Subject: [PATCH 2028/3392] stunnel: fix static link zlib is a dependency of OpenSSL. Take that into account when linking statically. Fixes: http://autobuild.buildroot.net/results/dfe/dfe7c82c7976912378e33e03ea4c677bee6a778d/ http://autobuild.buildroot.net/results/48c/48cb55428613e91abfe8e71456182082d9eabb75/ http://autobuild.buildroot.net/results/810/81029efad8b9e2f48c26a7b20f62c90844fc86df/ and many more. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/stunnel/stunnel.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 5e35d67268..f98e7b59eb 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -11,7 +11,8 @@ STUNNEL_DEPENDENCIES = openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ --disable-libwrap STUNNEL_CONF_ENV = \ - ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) + ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) \ + LIBS=$(if $(BR2_STATIC_LIBS),-lz) STUNNEL_LICENSE = GPLv2+ STUNNEL_LICENSE_FILES = COPYING COPYRIGHT.GPL From ef8733ac7d6a75ef2c42e6fa7a0360880fac0b70 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Dec 2016 19:13:27 +0100 Subject: [PATCH 2029/3392] package/sdl2: fix build error on powerpc/powerpc64 Fixes http://autobuild.buildroot.net/results/ffd/ffd689f1ba34ad43f52c38fe37da393a9d8b9d5e/ Signed-off-by: Bernd Kuhls Tested-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/sdl2/0001-ppc.patch | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/sdl2/0001-ppc.patch diff --git a/package/sdl2/0001-ppc.patch b/package/sdl2/0001-ppc.patch new file mode 100644 index 0000000000..0161103067 --- /dev/null +++ b/package/sdl2/0001-ppc.patch @@ -0,0 +1,47 @@ +Fixed bug 3466 - Can't build 2.0.5 on ppc64 + +/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c: In function 'calc_swizzle32': +/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c:127:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] +const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, +^ + +Downloaded from upstream repo +https://hg.libsdl.org/SDL/rev/5184186d4366 + +Signed-off-by: Bernd Kuhls + +diff -r 71d4148e32de -r 5184186d4366 src/video/SDL_blit_N.c +--- a/src/video/SDL_blit_N.c Wed Oct 19 21:22:42 2016 -0700 ++++ b/src/video/SDL_blit_N.c Sat Oct 22 11:01:55 2016 -0700 +@@ -118,12 +118,6 @@ + 16, 8, 0, 24, + 0, NULL + }; +- if (!srcfmt) { +- srcfmt = &default_pixel_format; +- } +- if (!dstfmt) { +- dstfmt = &default_pixel_format; +- } + const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, + 0x04, 0x04, 0x04, 0x04, + 0x08, 0x08, 0x08, 0x08, +@@ -136,6 +130,14 @@ + Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift); + Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift); + Uint32 amask; ++ ++ if (!srcfmt) { ++ srcfmt = &default_pixel_format; ++ } ++ if (!dstfmt) { ++ dstfmt = &default_pixel_format; ++ } ++ + /* Use zero for alpha if either surface doesn't have alpha */ + if (dstfmt->Amask) { + amask = + + + + From 4091d60557d251e5a8d5405e00e6f811e31d96d5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Dec 2016 19:49:52 +0100 Subject: [PATCH 2030/3392] package/sdl2: fix build with gcc6 Fixes http://autobuild.buildroot.net/results/b99/b997c2b6307deb48a42e9b317715a00b65f90149/ Signed-off-by: Bernd Kuhls Tested-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/sdl2/0002-gcc6.patch | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 package/sdl2/0002-gcc6.patch diff --git a/package/sdl2/0002-gcc6.patch b/package/sdl2/0002-gcc6.patch new file mode 100644 index 0000000000..6b5e901dfe --- /dev/null +++ b/package/sdl2/0002-gcc6.patch @@ -0,0 +1,64 @@ + +# HG changeset patch +# User Sam Lantinga +# Date 1479201270 28800 +# Node ID ea44906e19b837f4d5b309525ca79ed9d00b1897 +# Parent 6b2307dbec54f0bf4d5d8abf86241e29f3a03562 +Fixed bug 3490 - Build failure with --enable-video-directfb + +felix + +Building SDL 2.0.5, or even the Mercurial snapshot (r10608) with GCC 6.2.1 and --enable-video-directfb generates a number of compiler diagnostics and fails. + +Downloaded from upstream repo +https://hg.libsdl.org/SDL/rev/ea44906e19b8 + +Signed-off-by: Bernd Kuhls + +diff -r 6b2307dbec54 -r ea44906e19b8 src/video/directfb/SDL_DirectFB_render.c +--- a/src/video/directfb/SDL_DirectFB_render.c Tue Nov 15 01:12:27 2016 -0800 ++++ b/src/video/directfb/SDL_DirectFB_render.c Tue Nov 15 01:14:30 2016 -0800 +@@ -1273,7 +1273,7 @@ + Uint32 format, void * pixels, int pitch) + { + Uint32 sdl_format; +- void * laypixels; ++ unsigned char* laypixels; + int laypitch; + DFBSurfacePixelFormat dfb_format; + DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata; +@@ -1303,7 +1303,7 @@ + SDL_Window *window = renderer->window; + SDL_DFB_WINDOWDATA(window); + Uint32 sdl_format; +- void * laypixels; ++ unsigned char* laypixels; + int laypitch; + DFBSurfacePixelFormat dfb_format; + +diff -r 6b2307dbec54 -r ea44906e19b8 src/video/directfb/SDL_DirectFB_shape.c +--- a/src/video/directfb/SDL_DirectFB_shape.c Tue Nov 15 01:12:27 2016 -0800 ++++ b/src/video/directfb/SDL_DirectFB_shape.c Tue Nov 15 01:14:30 2016 -0800 +@@ -37,17 +37,19 @@ + SDL_WindowShaper* + DirectFB_CreateShaper(SDL_Window* window) { + SDL_WindowShaper* result = NULL; ++ SDL_ShapeData* data; ++ int resized_properly; + + result = malloc(sizeof(SDL_WindowShaper)); + result->window = window; + result->mode.mode = ShapeModeDefault; + result->mode.parameters.binarizationCutoff = 1; + result->userx = result->usery = 0; +- SDL_ShapeData* data = SDL_malloc(sizeof(SDL_ShapeData)); ++ data = SDL_malloc(sizeof(SDL_ShapeData)); + result->driverdata = data; + data->surface = NULL; + window->shaper = result; +- int resized_properly = DirectFB_ResizeWindowShape(window); ++ resized_properly = DirectFB_ResizeWindowShape(window); + SDL_assert(resized_properly == 0); + + return result; + From 8546ff31c58b2501a69e49bc0f27a4ffa1d2ae08 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 26 Dec 2016 15:50:35 +0100 Subject: [PATCH 2031/3392] perl-db-file: remove this package The module DB_File (Berkeley DB wrapper) is a Perl core module. Long time ago, its build as a core module was broken. Since perl-cross-1.0.2, this issue is fixed. So, this package which build DB_File as CPAN module, becomes useless. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 9 +++++++++ package/Config.in | 1 - package/perl-db-file/Config.in | 11 ----------- package/perl-db-file/perl-db-file.hash | 3 --- package/perl-db-file/perl-db-file.mk | 22 ---------------------- 5 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 package/perl-db-file/Config.in delete mode 100644 package/perl-db-file/perl-db-file.hash delete mode 100644 package/perl-db-file/perl-db-file.mk diff --git a/Config.in.legacy b/Config.in.legacy index cdadbd8f59..20445b8a17 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,15 @@ endif ############################################################################### comment "Legacy options removed in 2017.02" +config BR2_PACKAGE_PERL_DB_FILE + bool "perl-db-file removed" + select BR2_LEGACY + select BR2_PACKAGE_BERKELEYDB + select BR2_PACKAGE_PERL + help + DB_File can be built as a core Perl module, so the separate + perl-db-file package has been removed. + config BR2_KERNEL_HEADERS_4_7 bool "kernel headers version 4.7.x are no longer supported" select BR2_KERNEL_HEADERS_4_4 diff --git a/package/Config.in b/package/Config.in index f2103b5f51..18818fa86c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -579,7 +579,6 @@ menu "Perl libraries/modules" source "package/perl-crypt-openssl-random/Config.in" source "package/perl-crypt-openssl-rsa/Config.in" source "package/perl-datetime-tiny/Config.in" - source "package/perl-db-file/Config.in" source "package/perl-digest-hmac/Config.in" source "package/perl-digest-sha1/Config.in" source "package/perl-encode-detect/Config.in" diff --git a/package/perl-db-file/Config.in b/package/perl-db-file/Config.in deleted file mode 100644 index f07e5df483..0000000000 --- a/package/perl-db-file/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PERL_DB_FILE - bool "perl-db-file" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_BERKELEYDB - help - Perl5 access to Berkeley DB version 1.x or 2.x. - - https://metacpan.org/release/DB_File - -comment "perl-db-file needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package/perl-db-file/perl-db-file.hash b/package/perl-db-file/perl-db-file.hash deleted file mode 100644 index df0113c8b9..0000000000 --- a/package/perl-db-file/perl-db-file.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 0ae7910cabc31a44e50b713a8a475514 DB_File-1.835.tar.gz -sha256 41206f39a1bac49db8c1595e300b04c70e1393b2d78ccb9ef15c5c0b81037cfc DB_File-1.835.tar.gz diff --git a/package/perl-db-file/perl-db-file.mk b/package/perl-db-file/perl-db-file.mk deleted file mode 100644 index 3db8c563cb..0000000000 --- a/package/perl-db-file/perl-db-file.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# perl-db-file -# -################################################################################ - -PERL_DB_FILE_VERSION = 1.835 -PERL_DB_FILE_SOURCE = DB_File-$(PERL_DB_FILE_VERSION).tar.gz -PERL_DB_FILE_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PM/PMQS -PERL_DB_FILE_DEPENDENCIES = berkeleydb -PERL_DB_FILE_LICENSE = Artistic or GPLv1+ -PERL_DB_FILE_LICENSE_FILES = README - -define PERL_DB_FILE_FIX_CONFIG_IN - $(SED) 's%^INCLUDE.*%INCLUDE = $(STAGING_DIR)/usr/include%' \ - $(@D)/config.in - $(SED) 's%^LIB.*%LIB = $(STAGING_DIR)/usr/lib%' \ - $(@D)/config.in -endef -PERL_DB_FILE_POST_PATCH_HOOKS += PERL_DB_FILE_FIX_CONFIG_IN - -$(eval $(perl-package)) From 25662d9d81cab62e2b294dbe76804c379c576c4a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Dec 2016 18:56:37 +0100 Subject: [PATCH 2032/3392] package/vdr: bump version to 2.3.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/vdr/vdr.hash | 6 +++--- package/vdr/vdr.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index f076e58ea0..edbcd3fccd 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,4 +1,4 @@ -# From https://www.linuxtv.org/pipermail/vdr/2015-September/028872.html -md5 391c2ed60e2f7d24563fe3ed5854bc4f vdr-2.3.1.tar.bz2 +# From https://www.linuxtv.org/pipermail/vdr/2016-December/029178.html +md5 6dbb208ea3d59658a18912b49af175b3 vdr-2.3.2.tar.bz2 # Locally computed -sha256 456d3f0ceb699b92ebeaf9ff4c0c68979724d10b01a89d5250133e6f4c262fa7 vdr-2.3.1.tar.bz2 +sha256 6c6ab08cf4dadd296e5e4a1c13f793c2e9222ec23103ae7aa9d616619f1496c0 vdr-2.3.2.tar.bz2 diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 1894defb22..cdfa7e3af8 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -VDR_VERSION = 2.3.1 +VDR_VERSION = 2.3.2 VDR_SOURCE = vdr-$(VDR_VERSION).tar.bz2 VDR_SITE = ftp://ftp.tvdr.de/vdr/Developer VDR_LICENSE = GPLv2+ From e09e1873a1b5d33fa2e9787b964abb575bc335a4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 26 Dec 2016 18:58:30 +0100 Subject: [PATCH 2033/3392] support/dependencies: ensure we have 'file' on the host Recently, the autoconf macros for libtool started using '/usr/bin/file' to determine the type of library that is generated by the toolchain. Packages that use this recent version of the libtool autoconf macros will fail in a rather dramatic way when /usr/bin/file is not present on the host: the package will still build but no shared library is generated, which in turn may cause build failures in other packages that link with it. For example, libpng's configure determines that it is not possible to build a shared library on MIPS64 because the expected output from 'file' is not present. Therefore, only a static libpng.a is built. Later, bandwithd links with -lpng but it doesn't use the pkg-config's Private-Libs (because it's not linking statically) and it doesn't have access to the NEEDED reference from the shared library. Therefore, it doesn't link with zlib and fails with pngrutil.c:(.text+0x55c): undefined reference to `inflate' We cant use host-file because it is itself an autotools package and is itself using libtool, so this would be a chicken-n-egg problem. Besides, the libtool script really wants to call /usr/bin/file, so it would not even find our host-file anyway. So, just require that '/usr/bin/file' is present on the host. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Baruch Siach Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- docs/manual/prerequisite.txt | 1 + support/dependencies/dependencies.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt index 7edad1f6db..ac0ab62e35 100644 --- a/docs/manual/prerequisite.txt +++ b/docs/manual/prerequisite.txt @@ -35,6 +35,7 @@ between distributions). ** +python+ (version 2.6 or any later) ** +unzip+ ** +rsync+ +** +file+ (must be in +/usr/bin/file+) * Source fetching tools: ** +wget+ diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index bfd65960ce..168d1960a1 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -69,6 +69,10 @@ check_prog_host "which" # Verify that sed is installed check_prog_host "sed" +# 'file' must be present and must be exactly /usr/bin/file, +# otherwise libtool fails in incomprehensible ways. +check_prog_host "/usr/bin/file" + # Check make MAKE=$(which make 2> /dev/null) if [ -z "$MAKE" ] ; then From c7bdef0d23ee9d06b7dd7dbcb72d52a2bbb149e4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 27 Dec 2016 15:18:29 -0300 Subject: [PATCH 2034/3392] linux-headers: bump 3.18.x and 4.1.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4ab562ce88..967dfadd65 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,10 +218,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.104" if BR2_KERNEL_HEADERS_3_10 default "3.12.69" if BR2_KERNEL_HEADERS_3_12 - default "3.18.45" if BR2_KERNEL_HEADERS_3_18 + default "3.18.46" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.36" if BR2_KERNEL_HEADERS_4_1 + default "4.1.37" if BR2_KERNEL_HEADERS_4_1 default "4.4.39" if BR2_KERNEL_HEADERS_4_4 default "4.8.15" if BR2_KERNEL_HEADERS_4_8 default "4.9" if BR2_KERNEL_HEADERS_4_9 From 0d5b2e9da931bcd445f3534958ede5704ec367dd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 27 Dec 2016 22:05:14 +0100 Subject: [PATCH 2035/3392] package/znc: bump version to 1.6.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/znc/znc.hash | 2 +- package/znc/znc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/znc/znc.hash b/package/znc/znc.hash index f243d4ab02..368235141b 100644 --- a/package/znc/znc.hash +++ b/package/znc/znc.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 znc-1.6.3.tar.gz +sha256 431097eb17860bfc980f3e68fdd75f98af4bdeecd793c84835c6cb11c3320d1c znc-1.6.4.tar.gz diff --git a/package/znc/znc.mk b/package/znc/znc.mk index 31e1bcf6c3..5b96ee529d 100644 --- a/package/znc/znc.mk +++ b/package/znc/znc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZNC_VERSION = 1.6.3 +ZNC_VERSION = 1.6.4 ZNC_SITE = http://znc.in/releases ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE From b3c6181de89ec3cf480e8e6f55140474c5bebe9f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 27 Dec 2016 22:03:56 +0100 Subject: [PATCH 2036/3392] toolchain-external: bump CodeSourcery NIOSII to 2016.11 Keep BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 since it's not fixed in Binutils 2.26. Runtime tested with an experimental version of Qemu 2.7 for Nios2. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- .../toolchain-external-codesourcery-niosII/Config.in | 12 ++++++------ .../toolchain-external-codesourcery-niosII.hash | 4 ++-- .../toolchain-external-codesourcery-niosII.mk | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in index 54eed8c792..9675c67a15 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - bool "Sourcery CodeBench Nios-II 2016.05" + bool "Sourcery CodeBench Nios-II 2016.11" depends on BR2_nios2 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS @@ -8,10 +8,10 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # based-on binutils-2.25.1 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 + select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # based-on binutils-2.26 help Sourcery CodeBench toolchain for the Nios-II architecture, - from Mentor Graphics. It uses gcc 5.3, binutils 2.25.51, - glibc 2.23, gdb 7.10.50 and kernel headers 4.4. + from Mentor Graphics. It uses gcc 6.2, binutils 2.26, + glibc 2.24, gdb 7.11 and kernel headers 4.7. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash index a60c49f839..17130b422d 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 750639290744adda931c81fa2cd2ffc2bde972488047824dcfaa53c42562191d sourceryg++-2016.05-10-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 3dc1c2685c0472059547dd7becb5dc991541b8176af39fa7aa5f601d38b9879a sourceryg++-2016.05-10-nios2-linux-gnu.src.tar.bz2 +sha256 97e3b878c67e46430f2b9a42b11bc95b1ef9fef263e6b5ee9103d1239c9e847d sourceryg++-2016.11-32-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 ee2c4391137be8fee987411301bbf9f0e4a823400e37c9f8c1cae9900485cbca sourceryg++-2016.11-32-nios2-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk index 3eb6679675..7381061cec 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2016.05-10 +TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2016.11-32 TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SOURCE = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 From 0e3526c10e80822b0a25b7171ced77c9cc1d9121 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 27 Dec 2016 21:57:12 +0100 Subject: [PATCH 2037/3392] DEVELOPERS: remove perl-db-file Package perl-db-file was removed today: https://git.buildroot.net/buildroot/commit/?id=8546ff31c58b2501a69e49bc0f27a4ffa1d2ae08 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index abddf9df41..f3d54ef65d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -212,7 +212,6 @@ F: package/mjpg-streamer/ F: package/mplayer/ F: package/perl-crypt-openssl-random/ F: package/perl-crypt-openssl-rsa/ -F: package/perl-db-file/ F: package/perl-digest-sha1/ F: package/perl-encode-detect/ F: package/perl-encode-locale/ From d91ce1aa08016fa3fb186be9e6ef425dad6f050f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 27 Dec 2016 19:42:03 +0200 Subject: [PATCH 2038/3392] fs/tar: make --no-recursion effective The tar --no-recursion option is position sensitive. It only affects following file listing options. Move --no-recursion before the -T option to make it effective. This fixes duplication of entries in the generated rootfs.tar archive. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- fs/tar/tar.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk index b14c977d76..0e3eacbedf 100644 --- a/fs/tar/tar.mk +++ b/fs/tar/tar.mk @@ -8,7 +8,7 @@ TAR_OPTS := $(call qstrip,$(BR2_TARGET_ROOTFS_TAR_OPTIONS)) define ROOTFS_TAR_CMD (cd $(TARGET_DIR); find -print0 | LC_ALL=C sort -z | \ - tar $(TAR_OPTS) -cf $@ --null -T - --no-recursion --numeric-owner) + tar $(TAR_OPTS) -cf $@ --null --no-recursion -T - --numeric-owner) endef $(eval $(call ROOTFS_TARGET,tar)) From 222808a4b678aca0da01cc96f543079f06613554 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 27 Dec 2016 23:07:21 +0100 Subject: [PATCH 2039/3392] cryptopp: add upstream security fix for CVE-2016-9939 Fixes security issue (DoS) in Crypto++ ASN1 decoder: https://github.com/weidai11/cryptopp/issues/346 Signed-off-by: Peter Korsgaard --- ...-DoS-in-ASN.1-decoders-CVE-2016-9939.patch | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch diff --git a/package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch b/package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch new file mode 100644 index 0000000000..ea6ba7fae5 --- /dev/null +++ b/package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch @@ -0,0 +1,69 @@ +From 3d9181d7bdd8e491f745dbc9e34bd20b6f6da069 Mon Sep 17 00:00:00 2001 +From: Gergely Nagy +Date: Wed, 14 Dec 2016 13:19:01 +0100 +Subject: [PATCH] Fix possible DoS in ASN.1 decoders (CVE-2016-9939) + +Signed-off-by: Peter Korsgaard +--- + asn.cpp | 10 ++++++++++ + asn.h | 2 ++ + 2 files changed, 12 insertions(+) + +diff --git a/asn.cpp b/asn.cpp +index 297ff01..2e923ef 100644 +--- a/asn.cpp ++++ b/asn.cpp +@@ -123,6 +123,8 @@ size_t BERDecodeOctetString(BufferedTransformation &bt, SecByteBlock &str) + size_t bc; + if (!BERLengthDecode(bt, bc)) + BERDecodeError(); ++ if (bc > bt.MaxRetrievable()) ++ BERDecodeError(); + + str.New(bc); + if (bc != bt.Get(str, bc)) +@@ -139,6 +141,8 @@ size_t BERDecodeOctetString(BufferedTransformation &bt, BufferedTransformation & + size_t bc; + if (!BERLengthDecode(bt, bc)) + BERDecodeError(); ++ if (bc > bt.MaxRetrievable()) ++ BERDecodeError(); + + bt.TransferTo(str, bc); + return bc; +@@ -161,6 +165,8 @@ size_t BERDecodeTextString(BufferedTransformation &bt, std::string &str, byte as + size_t bc; + if (!BERLengthDecode(bt, bc)) + BERDecodeError(); ++ if (bc > bt.MaxRetrievable()) ++ BERDecodeError(); + + SecByteBlock temp(bc); + if (bc != bt.Get(temp, bc)) +@@ -188,6 +194,10 @@ size_t BERDecodeBitString(BufferedTransformation &bt, SecByteBlock &str, unsigne + size_t bc; + if (!BERLengthDecode(bt, bc)) + BERDecodeError(); ++ if (bc == 0) ++ BERDecodeError(); ++ if (bc > bt.MaxRetrievable()) ++ BERDecodeError(); + + byte unused; + if (!bt.Get(unused)) +diff --git a/asn.h b/asn.h +index ed9de52..33f0dd0 100644 +--- a/asn.h ++++ b/asn.h +@@ -498,6 +498,8 @@ void BERDecodeUnsigned(BufferedTransformation &in, T &w, byte asnTag = INTEGER, + bool definite = BERLengthDecode(in, bc); + if (!definite) + BERDecodeError(); ++ if (bc > in.MaxRetrievable()) ++ BERDecodeError(); + + SecByteBlock buf(bc); + +-- +2.10.2 + From 60d86c81ccdffb98ed460cbc728eeee4a9891a0d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 27 Dec 2016 23:28:18 +0100 Subject: [PATCH 2040/3392] libsigrokdecode: bump to version 0.4.1 For details, see: https://www.sigrok.org/blog/libsigrokdecode-041-released Signed-off-by: Peter Korsgaard --- package/libsigrokdecode/libsigrokdecode.hash | 2 +- package/libsigrokdecode/libsigrokdecode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsigrokdecode/libsigrokdecode.hash b/package/libsigrokdecode/libsigrokdecode.hash index 3ac8a7628d..ccb2016837 100644 --- a/package/libsigrokdecode/libsigrokdecode.hash +++ b/package/libsigrokdecode/libsigrokdecode.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 fd7e9d1b73245e844ead97a16d5321c766196f946c9b28a8646cab2e98ec3537 libsigrokdecode-0.4.0.tar.gz +sha256 065f70c10971173d86e03a8cf5534e600c7a622775113997d8061572135d4a95 libsigrokdecode-0.4.1.tar.gz diff --git a/package/libsigrokdecode/libsigrokdecode.mk b/package/libsigrokdecode/libsigrokdecode.mk index b8b3c59a88..7006b0c6e8 100644 --- a/package/libsigrokdecode/libsigrokdecode.mk +++ b/package/libsigrokdecode/libsigrokdecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSIGROKDECODE_VERSION = 0.4.0 +LIBSIGROKDECODE_VERSION = 0.4.1 LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode LIBSIGROKDECODE_LICENSE = GPLv3+ LIBSIGROKDECODE_LICENSE_FILES = COPYING From 356776d9adaf284f98c1e83715f9bea48adc7df5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 28 Dec 2016 15:42:29 -0200 Subject: [PATCH 2041/3392] DEVELOPERS: Add entry for udoo_neo and wandboard Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f3d54ef65d..b4b460fa6c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -468,7 +468,9 @@ F: board/warp7/ F: configs/freescale_imx* F: configs/imx6ulpico_defconfig F: configs/mx6cubox_defconfig +F: configs/mx6sx_udoo_neo_defconfig F: configs/mx6udoo_defconfig +F: configs/wandboard_defconfig F: configs/warp7_defconfig N: Fabio Porcedda From 26e27bd22fbb985879698292718131f70a0d95d1 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 28 Dec 2016 17:48:06 -0200 Subject: [PATCH 2042/3392] configs/warp7: Bump to mainline kernel 4.9 Use mainline 4.9 instead of a custom kernel based on NXP 4.1. As mx7 boots in non-secure mode in mainline kernel, change the U-Boot target to "warp7". Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- board/warp7/linux.fragment | 1 - configs/warp7_defconfig | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/board/warp7/linux.fragment b/board/warp7/linux.fragment index 00f74cbdd6..892d0cb7b9 100644 --- a/board/warp7/linux.fragment +++ b/board/warp7/linux.fragment @@ -1,2 +1 @@ CONFIG_CFG80211_WEXT=y -CONFIG_BRCMFMAC=m diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index fca7a1d06f..ca7cd00cec 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y -# Linux headers same as kernel, a 4.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y +# Linux headers same as kernel, a 4.9 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -13,17 +13,16 @@ BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Freescale/linux-fslc.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="efaf36531fe7b1fc15a48033e5972825c91f9fc6" -BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/warp7/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp" # U-Boot BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="warp7_secure" +BR2_TARGET_UBOOT_BOARDNAME="warp7" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" BR2_TARGET_UBOOT_FORMAT_IMX=y From cf82c1866b5aa231fea8b402cadee79dd7116e1b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 28 Dec 2016 18:32:14 -0200 Subject: [PATCH 2043/3392] configs/warp7: Select BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV allows the Broadcom wireless driver to be automatically loaded on boot. Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- configs/warp7_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index ca7cd00cec..2d59626c97 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -31,6 +31,9 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y +# For automatic firmware loading +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + # wireless packages BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WPA_SUPPLICANT=y From 2ffd07aaae4504c8b8681235e88c984e6b0d75a5 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Fri, 23 Dec 2016 20:35:16 -0500 Subject: [PATCH 2044/3392] luafilesystem: add license file Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- package/luafilesystem/luafilesystem.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk index 5826e1efa3..a54ae236df 100644 --- a/package/luafilesystem/luafilesystem.mk +++ b/package/luafilesystem/luafilesystem.mk @@ -6,6 +6,7 @@ LUAFILESYSTEM_VERSION = 1.6.3-1 LUAFILESYSTEM_LICENSE = MIT +LUAFILESYSTEM_LICENSE_FILES = luafilesystem/LICENSE LUAFILESYSTEM_SUBDIR = luafilesystem $(eval $(luarocks-package)) From e298cf06f6fe04bf6b52bddeee1a816054195ac4 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Fri, 23 Dec 2016 20:50:55 -0500 Subject: [PATCH 2045/3392] luarocks: fix target-finalize hook processing The LUAROCKS_TARGET_FINALIZE_HOOKS is not running, so detritus is being left in /usr/lib/luarocks. This is because host-luarocks is built by being a dependency in the luarocks package infrastructure, not by being selected by kconfig symbol. This means that the $(PKG)_KCONFIG_VAR in pkg-generic.mk is not met, and (HOST_)LUAROCKS_TARGET_FINALIZE_HOOKS is not added to the global TARGET_FINALIZE_HOOKS. This mod fixes this issue by adding the host-luarocks hook directly to TARGET_FINALIZE_HOOKS when either lua or luajit is enabled. Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard --- package/luarocks/luarocks.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 4e0d537ff7..d18056a527 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -60,4 +60,7 @@ define LUAROCKS_FINALIZE_TARGET rm -rf $(TARGET_DIR)/usr/lib/luarocks endef -LUAROCKS_TARGET_FINALIZE_HOOKS += LUAROCKS_FINALIZE_TARGET +# Apply to global variable directly, as pkg-generic does not +ifneq ($(BR2_PACKAGE_LUAJIT)$(BR2_PACKAGE_LUA),) +TARGET_FINALIZE_HOOKS += LUAROCKS_FINALIZE_TARGET +endif From 9f57959147377e5ee13451a9d5fe6ba002aa20a5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 29 Dec 2016 00:01:54 +0100 Subject: [PATCH 2046/3392] cryptopp: fixup DOS newlines in CVE-2016-9939 patch The patch did contain the correct newlines, but they got stripped by patchwork so now the patch no longer applies. Signed-off-by: Peter Korsgaard --- ...-DoS-in-ASN.1-decoders-CVE-2016-9939.patch | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch b/package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch index ea6ba7fae5..2d0f1d91da 100644 --- a/package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch +++ b/package/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch @@ -14,56 +14,56 @@ index 297ff01..2e923ef 100644 --- a/asn.cpp +++ b/asn.cpp @@ -123,6 +123,8 @@ size_t BERDecodeOctetString(BufferedTransformation &bt, SecByteBlock &str) - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - str.New(bc); - if (bc != bt.Get(str, bc)) + size_t bc; + if (!BERLengthDecode(bt, bc)) + BERDecodeError(); ++ if (bc > bt.MaxRetrievable()) ++ BERDecodeError(); + + str.New(bc); + if (bc != bt.Get(str, bc)) @@ -139,6 +141,8 @@ size_t BERDecodeOctetString(BufferedTransformation &bt, BufferedTransformation & - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - bt.TransferTo(str, bc); - return bc; + size_t bc; + if (!BERLengthDecode(bt, bc)) + BERDecodeError(); ++ if (bc > bt.MaxRetrievable()) ++ BERDecodeError(); + + bt.TransferTo(str, bc); + return bc; @@ -161,6 +165,8 @@ size_t BERDecodeTextString(BufferedTransformation &bt, std::string &str, byte as - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - SecByteBlock temp(bc); - if (bc != bt.Get(temp, bc)) + size_t bc; + if (!BERLengthDecode(bt, bc)) + BERDecodeError(); ++ if (bc > bt.MaxRetrievable()) ++ BERDecodeError(); + + SecByteBlock temp(bc); + if (bc != bt.Get(temp, bc)) @@ -188,6 +194,10 @@ size_t BERDecodeBitString(BufferedTransformation &bt, SecByteBlock &str, unsigne - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc == 0) -+ BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - byte unused; - if (!bt.Get(unused)) + size_t bc; + if (!BERLengthDecode(bt, bc)) + BERDecodeError(); ++ if (bc == 0) ++ BERDecodeError(); ++ if (bc > bt.MaxRetrievable()) ++ BERDecodeError(); + + byte unused; + if (!bt.Get(unused)) diff --git a/asn.h b/asn.h index ed9de52..33f0dd0 100644 --- a/asn.h +++ b/asn.h @@ -498,6 +498,8 @@ void BERDecodeUnsigned(BufferedTransformation &in, T &w, byte asnTag = INTEGER, - bool definite = BERLengthDecode(in, bc); - if (!definite) - BERDecodeError(); -+ if (bc > in.MaxRetrievable()) -+ BERDecodeError(); - - SecByteBlock buf(bc); - + bool definite = BERLengthDecode(in, bc); + if (!definite) + BERDecodeError(); ++ if (bc > in.MaxRetrievable()) ++ BERDecodeError(); + + SecByteBlock buf(bc); + -- 2.10.2 From e5782ec23312cf230400b7b3070f6b2f467a0a69 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 29 Dec 2016 21:41:23 +0100 Subject: [PATCH 2047/3392] CHANGES: update for 2016.11.1 Signed-off-by: Peter Korsgaard (cherry picked from commit bf8fdcc2fa06c18cf4c4381a1d80f4b89699ec82) --- CHANGES | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGES b/CHANGES index d52bcddf6d..8dee2f5c56 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,16 @@ +2016.11.1, Released December 29th, 2016 + + Important / security related fixes. + + Updated/fixed packages: apache, cryptopp, docker-engine, + dovecot, exim, gdk-pixbuf, libcurl, libupnp, links, monit, + nodejs, openssh, php, python, python-bottle, samba4, squid, + uboot, vim, wireshark, xorg-server uboot + + Issues resolved (http://bugs.buildroot.org): + + #9466: VIM_REMOVE_DOCS removes rgb.txt + 2016.11, Released November 30th, 2016 Minor fixes. From 67f23a77c2260809b94f169fde33ff718ae940c5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 29 Dec 2016 22:24:06 +0100 Subject: [PATCH 2048/3392] Update for 2016.11.1 Signed-off-by: Peter Korsgaard --- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 19 +++++++++++++++++++ support/misc/Vagrantfile | 2 +- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/docs/website/download.html b/docs/website/download.html index d7eef3bbc6..d6df438146 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
          Download
          -

          Latest stable release: 2016.11

          +

          Latest stable release: 2016.11.1

          - +
          - +
          -

          buildroot-2016.11.tar.gz

          -

          PGP signature

          +

          buildroot-2016.11.1.tar.gz

          +

          PGP signature

          - +
          - +
          -

          buildroot-2016.11.tar.bz2

          -

          PGP signature

          +

          buildroot-2016.11.1.tar.bz2

          +

          PGP signature

          + + maven-assembly-plugin + +diff --git a/src/main/cpp/locationinfo.cpp b/src/main/cpp/locationinfo.cpp +index e76ea29c..1daa3a5f 100644 +--- a/src/main/cpp/locationinfo.cpp ++++ b/src/main/cpp/locationinfo.cpp +@@ -153,8 +153,8 @@ void LocationInfo::write(ObjectOutputStream& os, Pool& p) const { + 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C, + 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, + 0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, +- 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB, +- 0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01, ++ 0x6E, 0x49, 0x6E, 0x66, 0x6F, static_cast(0xED), static_cast(0x99), static_cast(0xBB), ++ static_cast(0xE1), 0x4A, static_cast(0x91), static_cast(0xA5), 0x7C, 0x02, 0x00, 0x01, + 0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, + 0x6E, 0x66, 0x6F, + 0x74, 0x00, 0x12, 0x4C, 0x6A, +diff --git a/src/main/cpp/loggingevent.cpp b/src/main/cpp/loggingevent.cpp +index 1c0d4be7..edbf40b6 100644 +--- a/src/main/cpp/loggingevent.cpp ++++ b/src/main/cpp/loggingevent.cpp +@@ -242,7 +242,7 @@ void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) { + 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A, + 0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67, + 0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E, +- 0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5, ++ 0x74, static_cast(0xF3), static_cast(0xF2), static_cast(0xB9), 0x23, 0x74, 0x0B, static_cast(0xB5), + 0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D, + 0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F, + 0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, +diff --git a/src/main/cpp/ndc.cpp b/src/main/cpp/ndc.cpp +index 4ab612dd..89788c16 100644 +--- a/src/main/cpp/ndc.cpp ++++ b/src/main/cpp/ndc.cpp +@@ -309,7 +309,7 @@ bool NDC::pop(CFStringRef& dst) + Stack& stack = data->getStack(); + if(!stack.empty()) + { +- dst = Transcoder::encode(stack.top().message); ++ dst = Transcoder::encode(getMessage(stack.top())); + stack.pop(); + data->recycle(); + return true; +@@ -326,7 +326,7 @@ bool NDC::peek(CFStringRef& dst) + Stack& stack = data->getStack(); + if(!stack.empty()) + { +- dst = Transcoder::encode(stack.top().message); ++ dst = Transcoder::encode(getMessage(stack.top())); + return true; + } + data->recycle(); +diff --git a/src/main/cpp/objectoutputstream.cpp b/src/main/cpp/objectoutputstream.cpp +index 7cd696b8..9567a856 100644 +--- a/src/main/cpp/objectoutputstream.cpp ++++ b/src/main/cpp/objectoutputstream.cpp +@@ -36,7 +36,7 @@ ObjectOutputStream::ObjectOutputStream(OutputStreamPtr outputStream, Pool& p) + objectHandle(0x7E0000), + classDescriptions(new ClassDescriptionMap()) + { +- char start[] = { 0xAC, 0xED, 0x00, 0x05 }; ++ char start[] = { static_cast(0xAC), static_cast(0xED), 0x00, 0x05 }; + ByteBuffer buf(start, sizeof(start)); + os->write(buf, p); + } +@@ -85,7 +85,7 @@ void ObjectOutputStream::writeObject(const MDC::Map& val, Pool& p) { + 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, + 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, + 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, +- 0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03, ++ static_cast(0xBB), 0x0F, 0x25, 0x21, 0x4A, static_cast(0xE4), static_cast(0xB8), 0x03, + 0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, + 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, + 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, +diff --git a/src/main/cpp/transcoder.cpp b/src/main/cpp/transcoder.cpp +index d572ffce..32bed844 100644 +--- a/src/main/cpp/transcoder.cpp ++++ b/src/main/cpp/transcoder.cpp +@@ -356,7 +356,7 @@ static void encodeUTF16(unsigned int sv, String& dst) { + unsigned char u = (unsigned char) (sv >> 16); + unsigned char w = (unsigned char) (u - 1); + unsigned short hs = (0xD800 + ((w & 0xF) << 6) + ((sv & 0xFFFF) >> 10)); +- unsigned short ls = (0xDC00 + (sv && 0x3FF)); ++ unsigned short ls = (0xDC00 + (sv & 0x3FF)); + dst.append(1, hs); + dst.append(1, ls); + } +diff --git a/src/main/include/log4cxx/helpers/object.h b/src/main/include/log4cxx/helpers/object.h +index 92d44c55..b9386c47 100644 +--- a/src/main/include/log4cxx/helpers/object.h ++++ b/src/main/include/log4cxx/helpers/object.h +@@ -61,8 +61,8 @@ static const helpers::Class& getStaticClass();\ + static const log4cxx::helpers::ClassRegistration& registerClass(); + + #define IMPLEMENT_LOG4CXX_OBJECT(object)\ +-const log4cxx::helpers::Class& object::getClass() const { return getStaticClass(); }\ +-const log4cxx::helpers::Class& object::getStaticClass() { \ ++const ::log4cxx::helpers::Class& object::getClass() const { return getStaticClass(); }\ ++const ::log4cxx::helpers::Class& object::getStaticClass() { \ + static Clazz##object theClass; \ + return theClass; \ + } \ +@@ -71,7 +71,7 @@ const log4cxx::helpers::ClassRegistration& object::registerClass() { \ + return classReg; \ + }\ + namespace log4cxx { namespace classes { \ +-const log4cxx::helpers::ClassRegistration& object##Registration = object::registerClass(); \ ++const ::log4cxx::helpers::ClassRegistration& object##Registration = object::registerClass(); \ + } } + + +diff --git a/src/main/include/log4cxx/helpers/simpledateformat.h b/src/main/include/log4cxx/helpers/simpledateformat.h +index 9c27f685..76fb784c 100644 +--- a/src/main/include/log4cxx/helpers/simpledateformat.h ++++ b/src/main/include/log4cxx/helpers/simpledateformat.h +@@ -29,7 +29,9 @@ + #include + #include + +-namespace std { class locale; } ++#include ++ ++using std::locale; + + namespace log4cxx + { +diff --git a/src/main/include/log4cxx/logstring.h b/src/main/include/log4cxx/logstring.h +index 3bbcdf2d..19e8aec7 100644 +--- a/src/main/include/log4cxx/logstring.h ++++ b/src/main/include/log4cxx/logstring.h +@@ -27,7 +27,7 @@ + #include + #include + +-#if LOG4CXX_LOGCHAR_IS_WCHAR && LOG4CXX_LOGCHAR_IS_UTF8 && LOG4CXX_LOGCHAR_IS_UNICHAR ++#if (LOG4CXX_LOGCHAR_IS_WCHAR + LOG4CXX_LOGCHAR_IS_UTF8 + LOG4CXX_LOGCHAR_IS_UNICHAR)>1 + #error only one of LOG4CXX_LOGCHAR_IS_WCHAR, LOG4CXX_LOGCHAR_IS_UTF8 or LOG4CXX_LOGCHAR_IS_UNICHAR may be true + #endif + +-- +2.11.0 + diff --git a/package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch b/package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch new file mode 100644 index 0000000000..b3f43bfd7c --- /dev/null +++ b/package/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch @@ -0,0 +1,36 @@ +From afc191aec355619d6ebabb2cad660a5a8ad4569b Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Mon, 30 Jan 2017 23:13:43 +0100 +Subject: [PATCH] domtestcase.cpp: fix narrowing conversion compile error with + gcc 6+ / signed char + +Signed-off-by: Peter Korsgaard +--- + src/test/cpp/xml/domtestcase.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/test/cpp/xml/domtestcase.cpp b/src/test/cpp/xml/domtestcase.cpp +index ad276d1a..2a1e6e2e 100644 +--- a/src/test/cpp/xml/domtestcase.cpp ++++ b/src/test/cpp/xml/domtestcase.cpp +@@ -190,7 +190,7 @@ public: + DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); + LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3") + #if LOG4CXX_LOGCHAR_IS_UTF8 +- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 }; ++ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast(0xC2), static_cast(0xB3), 0 }; + #else + const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 }; + #endif +@@ -209,7 +209,7 @@ public: + DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml")); + LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4") + #if LOG4CXX_LOGCHAR_IS_UTF8 +- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 }; ++ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast(0xE3), static_cast(0x86), static_cast(0x95), 0 }; + #else + const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 }; + #endif +-- +2.11.0 + From c0b8e1835bee9ee2bc5b3ab8c1052c83c907bf19 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 31 Jan 2017 10:20:25 +0100 Subject: [PATCH 2465/3392] riemann-c-client: fix build on bfin Fixes: http://autobuild.buildroot.net/results/8de/8de7e533fed3c48fdbe164bc9286148e63494c8f/build-end.log http://autobuild.buildroot.net/results/828/828a4e09cb14c33b021bd347394104ff8b6dba78/build-end.log http://autobuild.buildroot.net/results/fc8/fc80326880fb19cd6fbd6c0073916373a52ef873/build-end.log LD symbol versioning is not working on blackfin even though ld accepts the --version-script argument, causing link errors, so disable it. Notice: These autobuilder issues happened with an external fdpic toolchain, but the issue also occurs with internal toolchain / binutils 2.27 and fdpic/flat. Signed-off-by: Peter Korsgaard --- package/riemann-c-client/riemann-c-client.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/riemann-c-client/riemann-c-client.mk b/package/riemann-c-client/riemann-c-client.mk index 027898be06..5593519987 100644 --- a/package/riemann-c-client/riemann-c-client.mk +++ b/package/riemann-c-client/riemann-c-client.mk @@ -15,4 +15,9 @@ RIEMANN_C_CLIENT_DEPENDENCIES = \ $(if $(BR2_PACKAGE_GNUTLS),gnutls) \ $(if $(BR2_PACKAGE_JSON_C),json-c) +ifeq ($(BR2_bfin),y) +# ld symbol versioning not working on bfin +RIEMANN_C_CLIENT_CONF_ENV += ac_cv_prog_ld_version_script=no +endif + $(eval $(autotools-package)) From 130b9dcea164f33e7a446b5a9d53e3d499d2d1b7 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 31 Jan 2017 16:05:41 +0000 Subject: [PATCH 2466/3392] cjson: security bump to version v1.2.1 Fixes a potential NULL pointer dereference in cJSONUtils_InplaceDecodePointerString(): https://github.com/DaveGamble/cJSON/issues/96 [Peter: extend commit message, mention (potential) security impact] Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/cjson/cjson.hash | 2 +- package/cjson/cjson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash index a6370de75a..903880f7c5 100644 --- a/package/cjson/cjson.hash +++ b/package/cjson/cjson.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 df549298ea6515058648eaacc62bcc4f82fa34f8b93af7753e30eb35c3841c7d cjson-v1.2.0.tar.gz +sha256 1d976ca423d714b7e836cfbc1980b56f49962d0dfe654edb3c2ffa5c713af242 cjson-v1.2.1.tar.gz diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index f0fe63b347..11c34c5d78 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -CJSON_VERSION = v1.2.0 +CJSON_VERSION = v1.2.1 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT From e5f505efac725b7e12b22f1341ce0523df73a79f Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 31 Jan 2017 16:17:31 +0000 Subject: [PATCH 2467/3392] imagemagick: security bump to version 7.0.4-6 Fixes an use of uninitialized data issue in MAT image format that may have security impact: https://github.com/ImageMagick/ImageMagick/issues/362 [Peter: extend commit message, mention (potential) security impact] 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 3f5bfb1673..90e1db5389 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 69178335a906202928571e25b1670a4bb066500b9693c7ba554583e8d700fcf5 ImageMagick-7.0.4-5.tar.xz +sha256 1ee004740b7ab47fff3c92ae4a89dcbd0181c4d5f31fcb7e3697412ea384a0da ImageMagick-7.0.4-6.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 64c6a35c3a..a91729736b 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.4-5 +IMAGEMAGICK_VERSION = 7.0.4-6 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From bbc042b91ef118cf2fc42b6b5558161c752ce6e8 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 1 Feb 2017 10:28:18 +0000 Subject: [PATCH 2468/3392] redis: security bump to version 3.2.7 Release notes: https://www.reddit.com/r/redis/comments/5r8wxn/redis_327_is_out_important_security_fixes_inside/ From the notes: Upgrade urgency HIGH. This release fixes important security and correctness issues. It is especially important to upgrade for Redis Cluster users and for users running Redis in their laptop since a cross-scripting attack is fixed in this release. [Peter: extend description] Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 4 ++-- package/redis/redis.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index b6e8eac695..d4ac7c3557 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,4 +1,4 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha1 0c7bc5c751bdbc6fabed178db9cdbdd948915d1b redis-3.2.6.tar.gz +sha1 6889af053020cd72ebb16805ead0ce9b3a69a9ef redis-3.2.7.tar.gz # Calculated based on the hash above -sha256 2e1831c5a315e400d72bda4beaa98c0cfbe3f4eb8b20c269371634390cf729fa redis-3.2.6.tar.gz +sha256 bf9df3e5374bfe7bfc3386380f9df13d94990011504ef07632b3609bb2836fa9 redis-3.2.7.tar.gz diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 0b07d18bd3..63964b5f98 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 3.2.6 +REDIS_VERSION = 3.2.7 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From e8334c86aaaaf34e3ab40bc0ec51cfc652b92558 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 1 Feb 2017 13:41:27 -0200 Subject: [PATCH 2469/3392] configs/imx6q-sabresd: Bump to 4.9.7 kernel Kernel 4.9.7 has an important fix: a2104c7cd3b24c432 ("drm/atomic: clear out fence when duplicating state"), which fixes a kernel warning that triggers sometimes when starting/stopping ksmcube application several times in a row. So bump to this version. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6q-sabresd_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/imx6q-sabresd_defconfig b/configs/imx6q-sabresd_defconfig index 14916689a1..cc37ecf2ae 100644 --- a/configs/imx6q-sabresd_defconfig +++ b/configs/imx6q-sabresd_defconfig @@ -30,7 +30,7 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.7" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" From 49d972f0113eefc4bfcc6622225ba6e9cb0cecfa Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 1 Feb 2017 12:54:19 -0200 Subject: [PATCH 2470/3392] package/{mesa3d, mesa3d-headers}: bump version to 13.0.4 Signed-off-by: Fabio Estevam Acked-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 4 ++-- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 58ad97d994..2c62c48ce6 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 = 13.0.3 +MESA3D_HEADERS_VERSION = 13.0.4 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 d0470dd395..b3c4b77726 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2017-January/000283.html -sha256 d9aa8be5c176d00d0cd503cb2f64a5a403ea471ec819c022581414860d7ba40e mesa-13.0.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2017-February/000294.html +sha256 a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726 mesa-13.0.4.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 67c3054ed2..0c68dedfda 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 = 13.0.3 +MESA3D_VERSION = 13.0.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos From b8af80c32172e9a3f70aeda38f4e0f6136cb7429 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 1 Feb 2017 13:25:33 -0200 Subject: [PATCH 2471/3392] linux: bump default to version 4.9.7 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 9caa39a87a..3b8d61363d 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.9.6)" + bool "Latest version (4.9.7)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.9.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.9.7" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From e5918a7c53cdcad7e8729a8f4046351a491c43a5 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 1 Feb 2017 13:25:34 -0200 Subject: [PATCH 2472/3392] linux-headers: bump 4.{4, 9}.x and 3.12 series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8d47365c07..671be96508 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -217,12 +217,12 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.84" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.104" if BR2_KERNEL_HEADERS_3_10 - default "3.12.69" if BR2_KERNEL_HEADERS_3_12 + default "3.12.70" if BR2_KERNEL_HEADERS_3_12 default "3.18.47" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.45" if BR2_KERNEL_HEADERS_4_4 + default "4.4.46" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.6" if BR2_KERNEL_HEADERS_4_9 + default "4.9.7" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From c3637918f36548f58ba4e2d672a8123fcb1c1ce2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:35 +0100 Subject: [PATCH 2473/3392] package/x11r7/xdriver_xf86-video-tdfx: bump version to 1.4.7 Removed 0002-abi23.patch, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-tdfx/0002-abi23.patch | 39 ------------------- .../xdriver_xf86-video-tdfx.hash | 4 +- .../xdriver_xf86-video-tdfx.mk | 2 +- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch deleted file mode 100644 index 7e5d650f95..0000000000 --- a/package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b99390efcb55d7d4a68e8c595119c1af4426fc0b Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 19 Jul 2016 10:03:56 -0400 -Subject: Adapt Block/WakeupHandler signature for ABI 23 - -Signed-off-by: Adam Jackson ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-tdfx/patch/?id=b99390efcb55d7d4a68e8c595119c1af4426fc0b - -Signed-off-by: Bernd Kuhls - -diff --git a/src/compat-api.h b/src/compat-api.h -index 98ba435..44daea4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -78,11 +78,19 @@ - - #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv - -+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -+#define BLOCKHANDLER_ARGS arg, pTimeout -+ -+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result -+#define WAKEUPHANDLER_ARGS arg, result -+#else - #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask - - #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask - #define WAKEUPHANDLER_ARGS arg, result, read_mask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen - #define CLOSE_SCREEN_ARGS pScreen --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash index 1cdef2ab81..84885596f6 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-February/002536.html -sha256 3a8a88867c40ad61f1c9a09ffd7ac64102fa821685855d50ce66c7603dcc6d37 xf86-video-tdfx-1.4.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002755.html +sha256 4cf48ee14ead52b23493c3dce5032496fd68bf1d000170bb138730497e212a42 xf86-video-tdfx-1.4.7.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 942dcf3d60..471e6cf4d2 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.6 +XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.7 XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TDFX_LICENSE = MIT From ea367a7126d4d68627589c43bf569b63800f9e97 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:36 +0100 Subject: [PATCH 2474/3392] package/x11r7/xdriver_xf86-video-sis: bump version to 0.10.9 Removed 0002-abi23.patch, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-sis/0002-abi23.patch | 33 ------------------- .../xdriver_xf86-video-sis.hash | 4 +-- .../xdriver_xf86-video-sis.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch deleted file mode 100644 index 109f745373..0000000000 --- a/package/x11r7/xdriver_xf86-video-sis/0002-abi23.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 96fee560cd8bf7bf27048ce5fe67b7af6838c8d0 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 19 Jul 2016 10:03:56 -0400 -Subject: Adapt Block/WakeupHandler signature for ABI 23 - -Signed-off-by: Adam Jackson ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=96fee560cd8bf7bf27048ce5fe67b7af6838c8d0 - -Signed-off-by: Bernd Kuhls - -diff --git a/src/compat-api.h b/src/compat-api.h -index 6bc946f..89976e4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -75,8 +75,13 @@ - - #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv - -+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -+#define BLOCKHANDLER_ARGS arg, pTimeout -+#else - #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen - #define CLOSE_SCREEN_ARGS pScreen --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash index dfc78143ef..98ea8b1e4c 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-August/002628.html -sha256 c8f3f2577f69334dfcc4bf96477dce45161170555f3abdfa105599e61bc7d3fe xf86-video-sis-0.10.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002756.html +sha256 5226b7407c601afa32d6cbf155f9182da95d92cdc89c1f83471e1927e552c10d xf86-video-sis-0.10.9.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk index 5792f8e341..833246e35e 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.8 +XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.9 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SIS_LICENSE = MIT From 28a51f619a66d600e3862691b1f1eb4ea0fe9950 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:37 +0100 Subject: [PATCH 2475/3392] package/x11r7/xdriver_xf86-video-mga: bump version to 1.6.5 Removed 0002-abi23.patch, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-mga/0002-abi23.patch | 33 ------------------- .../xdriver_xf86-video-mga.hash | 4 +-- .../xdriver_xf86-video-mga.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch deleted file mode 100644 index b2b691789e..0000000000 --- a/package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch +++ /dev/null @@ -1,33 +0,0 @@ -From df094bfffe4ef097bfd9a569f2d2e35649c1a3c7 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 19 Jul 2016 10:03:56 -0400 -Subject: Adapt Block/WakeupHandler signature for ABI 23 - -Signed-off-by: Adam Jackson ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-mga/commit/?id=df094bfffe4ef097bfd9a569f2d2e35649c1a3c7 - -Signed-off-by: Bernd Kuhls - -diff --git a/src/compat-api.h b/src/compat-api.h -index 6bc946f..89976e4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -75,8 +75,13 @@ - - #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv - -+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -+#define BLOCKHANDLER_ARGS arg, pTimeout -+#else - #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen - #define CLOSE_SCREEN_ARGS pScreen --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash index 081577d4ab..0187e6fbb5 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-February/002533.html -sha256 48c6690b6751c76f53de64f8dbeaa9d6c62dbcfe890c768fd87167951247d44f xf86-video-mga-1.6.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002765.html +sha256 b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422 xf86-video-mga-1.6.5.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 771ec18ce5..065a68ea67 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_MGA_VERSION = 1.6.4 +XDRIVER_XF86_VIDEO_MGA_VERSION = 1.6.5 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_MGA_LICENSE = MIT From 0446de43de534fd13a796ca02f73fe36eb48350a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:38 +0100 Subject: [PATCH 2476/3392] package/x11r7/xdriver_xf86-video-siliconmotion: bump version to 1.7.9 Removed 0001-abi23.patch, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-abi23.patch | 33 ------------------- .../xdriver_xf86-video-siliconmotion.hash | 4 +-- .../xdriver_xf86-video-siliconmotion.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-siliconmotion/0001-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/0001-abi23.patch b/package/x11r7/xdriver_xf86-video-siliconmotion/0001-abi23.patch deleted file mode 100644 index 2cd6e637bb..0000000000 --- a/package/x11r7/xdriver_xf86-video-siliconmotion/0001-abi23.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e67f3949648c20e16ac756ae28ea4a2b4a1d0f4c Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 19 Jul 2016 10:03:56 -0400 -Subject: Adapt Block/WakeupHandler signature for ABI 23 - -Signed-off-by: Adam Jackson ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-siliconmotion/patch/?id=e67f3949648c20e16ac756ae28ea4a2b4a1d0f4c - -Signed-off-by: Bernd Kuhls - -diff --git a/src/compat-api.h b/src/compat-api.h -index 6bc946f..89976e4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -75,8 +75,13 @@ - - #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv - -+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -+#define BLOCKHANDLER_ARGS arg, pTimeout -+#else - #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen - #define CLOSE_SCREEN_ARGS pScreen --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash index 42f39d244a..819698c611 100644 --- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash +++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002604.html -sha256 e9d449a9fd9e58b4e018447b6c64005f7874cffb1777e513ac9fc41a86071beb xf86-video-siliconmotion-1.7.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002763.html +sha256 d0f3c691e71108d27a061beb62bf78b36ec35bd755905692734dd68cfb3359bc xf86-video-siliconmotion-1.7.9.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk index f8ea403c8c..53b19f9fea 100644 --- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk +++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.8 +XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.9 XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SILICONMOTION_LICENSE = MIT From 1982e6ae6af6ededba91e0b5c884971cfa4d131c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:39 +0100 Subject: [PATCH 2477/3392] package/x11r7/xdriver_xf86-video-nv: bump version to 2.1.21 Removed 0001-mibstore.patch & 0002-abi23.patch, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-nv/0001-mibstore.patch | 86 ------------------- .../xdriver_xf86-video-nv/0002-abi23.patch | 39 --------- .../xdriver_xf86-video-nv.hash | 4 +- .../xdriver_xf86-video-nv.mk | 2 +- 4 files changed, 3 insertions(+), 128 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-nv/0001-mibstore.patch delete mode 100644 package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-nv/0001-mibstore.patch b/package/x11r7/xdriver_xf86-video-nv/0001-mibstore.patch deleted file mode 100644 index e71418bc9e..0000000000 --- a/package/x11r7/xdriver_xf86-video-nv/0001-mibstore.patch +++ /dev/null @@ -1,86 +0,0 @@ -From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:54:49 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/commit/?id=fc78fe98222b0204b8a2872a529763d6fe5048da - -Signed-off-by: Bernd Kuhls - -diff --git a/src/g80_driver.c b/src/g80_driver.c -index cc4e197..719b96c 100644 ---- a/src/g80_driver.c -+++ b/src/g80_driver.c -@@ -34,7 +34,6 @@ - #include - #endif - #include --#include - #include - #include - #include -@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL) - } - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff --git a/src/nv_driver.c b/src/nv_driver.c -index 6dad6e5..8f35334 100644 ---- a/src/nv_driver.c -+++ b/src/nv_driver.c -@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL) - if (!pNv->NoAccel) - NVAccelInit(pScreen); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff --git a/src/nv_include.h b/src/nv_include.h -index fb190bf..f174eef 100644 ---- a/src/nv_include.h -+++ b/src/nv_include.h -@@ -24,9 +24,6 @@ - /* All drivers initialising the SW cursor need this */ - #include "mipointer.h" - --/* All drivers implementing backing store need this */ --#include "mibstore.h" -- - #include "micmap.h" - - #include "xf86DDC.h" -diff --git a/src/riva_driver.c b/src/riva_driver.c -index e0667ef..759501e 100644 ---- a/src/riva_driver.c -+++ b/src/riva_driver.c -@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL) - if (!pRiva->NoAccel) - RivaAccelInit(pScreen); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff --git a/src/riva_include.h b/src/riva_include.h -index f2c5302..c7aeef7 100644 ---- a/src/riva_include.h -+++ b/src/riva_include.h -@@ -22,9 +22,6 @@ - /* All drivers initialising the SW cursor need this */ - #include "mipointer.h" - --/* All drivers implementing backing store need this */ --#include "mibstore.h" -- - #include "micmap.h" - - #include "xf86DDC.h" --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch deleted file mode 100644 index 7b7bb34cd9..0000000000 --- a/package/x11r7/xdriver_xf86-video-nv/0002-abi23.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 42e260a7ab630fdfa4664f467dad25e7178ff809 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 19 Jul 2016 10:03:56 -0400 -Subject: Adapt Block/WakeupHandler signature for ABI 23 - -Signed-off-by: Adam Jackson ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-nv/commit/?id=42e260a7ab630fdfa4664f467dad25e7178ff809 - -Signed-off-by: Bernd Kuhls - -diff --git a/src/compat-api.h b/src/compat-api.h -index 0a87cf5..62d9481 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -78,11 +78,19 @@ - - #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv - -+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -+#define BLOCKHANDLER_ARGS arg, pTimeout -+ -+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result -+#define WAKEUPHANDLER_ARGS arg, result -+#else - #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask - - #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask - #define WAKEUPHANDLER_ARGS arg, result, read_mask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen - #define CLOSE_SCREEN_ARGS pScreen --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash index 8083ea29d1..fe91307a62 100644 --- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash +++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002030.html -sha256 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf xf86-video-nv-2.1.20.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002761.html +sha256 1f98649e6ff0e8214b9d5dcac661f1d004be8e73823d8247b9c7025fd81db32d xf86-video-nv-2.1.21.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk index 655bee928e..430ce4a1d1 100644 --- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk +++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.20 +XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.21 XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NV_LICENSE = MIT From aa7172806b1644a54642c1499bc1b12b5129990c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:40 +0100 Subject: [PATCH 2478/3392] package/x11r7/xdriver_xf86-video-glint: bump version to 1.2.9 Removed 0001-mbstring.patch & 0002-abi23.patch, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-mbstring.patch | 35 ------------------- .../xdriver_xf86-video-glint/0002-abi23.patch | 33 ----------------- .../xdriver_xf86-video-glint.hash | 4 +-- .../xdriver_xf86-video-glint.mk | 3 +- 4 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-glint/0001-mbstring.patch delete mode 100644 package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-glint/0001-mbstring.patch b/package/x11r7/xdriver_xf86-video-glint/0001-mbstring.patch deleted file mode 100644 index 635600abbf..0000000000 --- a/package/x11r7/xdriver_xf86-video-glint/0001-mbstring.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:54:38 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-glint/commit/?id=073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c - -Signed-off-by: Bernd Kuhls - -diff --git a/src/glint_driver.c b/src/glint_driver.c -index b6d20a9..aa78516 100644 ---- a/src/glint_driver.c -+++ b/src/glint_driver.c -@@ -52,8 +52,6 @@ - #include "compiler.h" - #include "mipointer.h" - --#include "mibstore.h" -- - #include "pm3_regs.h" - #include "glint_regs.h" - #include "IBM.h" -@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL) - } - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch deleted file mode 100644 index 1d8f7f22c2..0000000000 --- a/package/x11r7/xdriver_xf86-video-glint/0002-abi23.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2eb4d03d2280deec4d6f1b06aaa16477a641af9a Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 19 Jul 2016 10:03:56 -0400 -Subject: Adapt Block/WakeupHandler signature for ABI 23 - -Signed-off-by: Adam Jackson ---- -Downloaded from: -https://cgit.freedesktop.org/xorg/driver/xf86-video-glint/commit/?id=2eb4d03d2280deec4d6f1b06aaa16477a641af9a - -Signed-off-by: Bernd Kuhls - -diff --git a/src/compat-api.h b/src/compat-api.h -index 6bc946f..89976e4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -75,8 +75,13 @@ - - #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv - -+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -+#define BLOCKHANDLER_ARGS arg, pTimeout -+#else - #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen - #define CLOSE_SCREEN_ARGS pScreen --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash index ad3fbaa760..f4e42bf4c6 100644 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash +++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002011.html -sha256 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221 xf86-video-glint-1.2.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002759.html +sha256 852833ab2ea9ce519195dfd061a6c7aa5945a093cdc19546d1e9e69df7d577d2 xf86-video-glint-1.2.9.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk index 76c3da1cab..52bc567e59 100644 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk +++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk @@ -4,12 +4,11 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.8 +XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.9 XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_GLINT_LICENSE = MIT XDRIVER_XF86_VIDEO_GLINT_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto $(eval $(autotools-package)) From 558f5c181c54683f373c750ac658e849515c5dc4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:41 +0100 Subject: [PATCH 2479/3392] package/x11r7/xdriver_xf86-video-trident: bump version to 1.3.8 Removed 0001-abi23.patch, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-abi23.patch | 33 ------------------- .../xdriver_xf86-video-trident.hash | 4 +-- .../xdriver_xf86-video-trident.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch b/package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch deleted file mode 100644 index d9aecd535e..0000000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-abi23.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b5f4d35327863a14224d2a63885cd8b3b83a1815 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 19 Jul 2016 10:03:56 -0400 -Subject: Adapt Block/WakeupHandler signature for ABI 23 - -Signed-off-by: Adam Jackson ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-trident/patch/?id=b5f4d35327863a14224d2a63885cd8b3b83a1815 - -Signed-off-by: Bernd Kuhls - -diff --git a/src/compat-api.h b/src/compat-api.h -index 6bc946f..89976e4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -75,8 +75,13 @@ - - #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv - -+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -+#define BLOCKHANDLER_ARGS arg, pTimeout -+#else - #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen - #define CLOSE_SCREEN_ARGS pScreen --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index e92c948a8e..04a559ac5d 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-March/002558.html -sha256 ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae xf86-video-trident-1.3.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html +sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index a136e8777d..727744c532 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.7 +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT From 152f82637ace97ba53d4a6e4b469493fc785c407 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:42 +0100 Subject: [PATCH 2480/3392] package/x11r7/xdriver_xf86-video-savage: bump version to 2.3.9 Removed 0002-abi23.patch, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0002-abi23.patch | 39 ------------------- .../xdriver_xf86-video-savage.hash | 4 +- .../xdriver_xf86-video-savage.mk | 2 +- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch deleted file mode 100644 index 248758545b..0000000000 --- a/package/x11r7/xdriver_xf86-video-savage/0002-abi23.patch +++ /dev/null @@ -1,39 +0,0 @@ -From de3e1803314820968502156703d5bfe3fab24972 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 19 Jul 2016 10:03:56 -0400 -Subject: Adapt Block/WakeupHandler signature for ABI 23 - -Signed-off-by: Adam Jackson ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-savage/commit/?id=de3e1803314820968502156703d5bfe3fab24972 - -Signed-off-by: Bernd Kuhls - -diff --git a/src/compat-api.h b/src/compat-api.h -index 98ba435..44daea4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -78,11 +78,19 @@ - - #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv - -+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -+#define BLOCKHANDLER_ARGS arg, pTimeout -+ -+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result -+#define WAKEUPHANDLER_ARGS arg, result -+#else - #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask - - #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask - #define WAKEUPHANDLER_ARGS arg, result, read_mask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen - #define CLOSE_SCREEN_ARGS pScreen --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash index 25afb13133..4f155359a1 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002603.html -sha256 fdcea4a86532bceb50095eaf0fe2f38bbfa160e98463b815f4b549eb9985fa63 xf86-video-savage-2.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002760.html +sha256 2c93c4db1f71e725dda0caee5821253129d4b52d7aa0fd720593e7769bceec86 xf86-video-savage-2.3.9.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index 95bca7e3b8..ae1dea34ae 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.3.8 +XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.3.9 XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_SAVAGE_LICENSE = MIT From 001cb55d7d4a351bc8bb6a355035b9702fe672c0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:43 +0100 Subject: [PATCH 2481/3392] package/x11r7/xdriver_xf86-video-r128: bump version to 6.10.2 Removed 0002-abi23.patch, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-r128/0002-abi23.patch | 33 ------------------- .../xdriver_xf86-video-r128.hash | 4 +-- .../xdriver_xf86-video-r128.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch deleted file mode 100644 index e79ffdfb60..0000000000 --- a/package/x11r7/xdriver_xf86-video-r128/0002-abi23.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5ab23b3a8ef18ab9ff96ac8be174380d36e185e5 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 19 Jul 2016 10:03:56 -0400 -Subject: Adapt Block/WakeupHandler signature for ABI 23 - -Signed-off-by: Adam Jackson ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-r128/commit/?id=5ab23b3a8ef18ab9ff96ac8be174380d36e185e5 - -Signed-off-by: Bernd Kuhls - -diff --git a/src/compat-api.h b/src/compat-api.h -index 6bc946f..89976e4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -75,8 +75,13 @@ - - #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv - -+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout -+#define BLOCKHANDLER_ARGS arg, pTimeout -+#else - #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen - #define CLOSE_SCREEN_ARGS pScreen --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash index f5c92ab1c3..b6d8bd8197 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2016-January/002670.html -sha256 5ebfef49831c9b12f7b7011c8314010596ac2ab0d5b9b7cfd17908e93d7de4ea xf86-video-r128-6.10.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002764.html +sha256 84da21517f3af7617fdf341e84ccb22444d6cdab1647e4808fa631528b9a77de xf86-video-r128-6.10.2.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk index 5833efcfa7..344b48415c 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_R128_VERSION = 6.10.1 +XDRIVER_XF86_VIDEO_R128_VERSION = 6.10.2 XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_R128_LICENSE = MIT From 34f93bf53dc10dc56cfc0157fe1f2021981a23dd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:44 +0100 Subject: [PATCH 2482/3392] package/x11r7/xdriver_xf86-video-qxl: bump version to 0.1.5 Removed all patches, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-systemincludes.patch | 39 ----------- .../0002-xserverfix.patch | 51 -------------- .../xdriver_xf86-video-qxl/0003-xfont2.patch | 69 ------------------- .../xdriver_xf86-video-qxl.hash | 4 +- .../xdriver_xf86-video-qxl.mk | 4 +- 5 files changed, 3 insertions(+), 164 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-qxl/0001-systemincludes.patch delete mode 100644 package/x11r7/xdriver_xf86-video-qxl/0002-xserverfix.patch delete mode 100644 package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch diff --git a/package/x11r7/xdriver_xf86-video-qxl/0001-systemincludes.patch b/package/x11r7/xdriver_xf86-video-qxl/0001-systemincludes.patch deleted file mode 100644 index 0c681f2898..0000000000 --- a/package/x11r7/xdriver_xf86-video-qxl/0001-systemincludes.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 83e00bb5f9b74c0d7059c189d747ec3c24c7798a Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau -Date: Tue, 4 Aug 2015 17:36:12 +0200 -Subject: Use <> for system-includes - -These headers come from /usr/include/xorg/ so it's clearer if they are -included using <>. While at it, I've reordered them alphabetically. ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=83e00bb5f9b74c0d7059c189d747ec3c24c7798a - -Signed-off-by: Bernd Kuhls - -diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c -index 3e4c075..6201712 100644 ---- a/src/uxa/uxa-damage.c -+++ b/src/uxa/uxa-damage.c -@@ -27,12 +27,13 @@ - #include - #include "uxa-priv.h" - -+#include -+#include -+#include -+#include -+#include - #include --#include "scrnintstr.h" --#include "windowstr.h" --#include "dixfontstr.h" --#include "gcstruct.h" --#include "picturestr.h" -+ - #include "uxa-damage.h" - - typedef struct _damageGCPriv { --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-qxl/0002-xserverfix.patch b/package/x11r7/xdriver_xf86-video-qxl/0002-xserverfix.patch deleted file mode 100644 index c38d42e95b..0000000000 --- a/package/x11r7/xdriver_xf86-video-qxl/0002-xserverfix.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a184774ad161031cceed264d62d48ebd019ac800 Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau -Date: Mon, 3 Aug 2015 20:12:05 +0200 -Subject: Fix compilation with newer Xorg versions - -Xorg 1.18 stopped exporting some xfont related symbols in its -headers/shared libraries, which causes QXL to fail to build: - -uxa-damage.c:947:5: error: implicit declaration of function 'QueryGlyphExtents' [-Werror=implicit-function-declaration] - QueryGlyphExtents(font, charinfo, n, &extents); - -The missing definition can be found in xfont, so this commit addes the -needed configure.ac checks and includes. -Note that dixfontstr.h must be included before the xfont headers or this -will cause compile-time warnings on older Xorg versions (eg 1.17) ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=a184774ad161031cceed264d62d48ebd019ac800 - -Signed-off-by: Bernd Kuhls - -diff --git a/configure.ac b/configure.ac -index 6555a8d..7e95b01 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) - - # Obtain compiler/linker options for the driver dependencies --PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES) -+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto xfont $REQUIRED_MODULES) - - - save_CFLAGS="$CFLAGS" -diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c -index 6201712..a6d1ee3 100644 ---- a/src/uxa/uxa-damage.c -+++ b/src/uxa/uxa-damage.c -@@ -33,6 +33,9 @@ - #include - #include - #include -+#include -+#include -+#include - - #include "uxa-damage.h" - --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch b/package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch deleted file mode 100644 index e93b746f5a..0000000000 --- a/package/x11r7/xdriver_xf86-video-qxl/0003-xfont2.patch +++ /dev/null @@ -1,69 +0,0 @@ -From e13d28ee5d8724fc4b22f26bce01a7d36355f272 Mon Sep 17 00:00:00 2001 -From: "Owen W. Taylor" -Date: Fri, 26 Aug 2016 11:44:55 -0400 -Subject: Check for either xfont.pc or xfont2.pc - -More recent versions of Xfont have a different API (with namespacing -for libXfont functions.) Check for xfont2.pc and if found, use that, and -use the new API. The rational for preferring libXfont2 is that as a recent -change the xserver module looks for and requires libXfont2, and it's better -not to have both versions of the library in process. ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-qxl/commit/?id=e13d28ee5d8724fc4b22f26bce01a7d36355f272 - -Signed-off-by: Bernd Kuhls - -diff --git a/configure.ac b/configure.ac -index 7e95b01..451d42a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -60,8 +60,14 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) - -+# We can use either version 1 or version 2 of libXfont -+PKG_CHECK_EXISTS(xfont2, -+ [xfont_pc=xfont2 -+ AC_DEFINE(HAVE_XFONT2,1,[Version 2 of the libXfont library])], -+ [xfont_pc=xfont]) -+ - # Obtain compiler/linker options for the driver dependencies --PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto xfont $REQUIRED_MODULES) -+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $xfont_pc $REQUIRED_MODULES) - - - save_CFLAGS="$CFLAGS" -diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c -index a6d1ee3..6afb346 100644 ---- a/src/uxa/uxa-damage.c -+++ b/src/uxa/uxa-damage.c -@@ -35,7 +35,11 @@ - #include - #include - #include -+#ifdef HAVE_XFONT2 -+#include -+#else - #include -+#endif - - #include "uxa-damage.h" - -@@ -947,8 +951,12 @@ uxa_damage_chars (RegionPtr region, - { - ExtentInfoRec extents; - BoxRec box; -- -+ -+#ifdef HAVE_XFONT2 -+ xfont2_query_glyph_extents(font, charinfo, n, &extents); -+#else - QueryGlyphExtents(font, charinfo, n, &extents); -+#endif - if (imageblt) - { - if (extents.overallWidth > extents.overallRight) --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash index 1648c29c64..7a09821084 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash @@ -1,2 +1,2 @@ -# From http://lists.freedesktop.org/archives/spice-devel/2015-April/019356.html -sha256 e57ad22f0b1daf8979e722be0cc38d351bfcc2e41568edc566d2bade5a621105 xf86-video-qxl-0.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2016-December/002753.html +sha256 b18682e04503c6326f7bf7190f3ee50a3d4d69758a2a3cc9af102a6b3f114c92 xf86-video-qxl-0.1.5.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk index ac43b9505e..f410f8e95f 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk @@ -4,11 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.4 +XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.5 XDRIVER_XF86_VIDEO_QXL_SOURCE = xf86-video-qxl-$(XDRIVER_XF86_VIDEO_QXL_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_QXL_SITE = http://xorg.freedesktop.org/releases/individual/driver -# 0002-xserverfix.patch -XDRIVER_XF86_VIDEO_QXL_AUTORECONF = YES XDRIVER_XF86_VIDEO_QXL_LICENSE = MIT XDRIVER_XF86_VIDEO_QXL_LICENSE_FILES = COPYING From c3d9d4711e4f5673b66598e28a10adf9cc826a41 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:45 +0100 Subject: [PATCH 2483/3392] package/x11r7/xdriver_xf86-input-evdev: bump version to 2.10.5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../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 389356f9f0..bf9a2cd256 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 https://lists.x.org/archives/xorg-announce/2016-October/002718.html -sha256 bbf6a03fbce1a6c0c7d874eef519fd0a854bf01b515c745d41fa551ce6490cc2 xf86-input-evdev-2.10.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002767.html +sha256 9edaa6205baf6d2922cc4db3d8e54a7e7773b5f733b0ae90f6be7725f983b70d xf86-input-evdev-2.10.5.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 9ec893b4e1..4933c42fda 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.10.4 +XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.10.5 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 77ed5b03b071bfa35de8e7e01b06fef107c9c253 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:46 +0100 Subject: [PATCH 2484/3392] package/x11r7/xlib_libXi: bump version to 1.7.9 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXi/xlib_libXi.hash | 4 ++-- package/x11r7/xlib_libXi/xlib_libXi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXi/xlib_libXi.hash b/package/x11r7/xlib_libXi/xlib_libXi.hash index e7a4032fb5..9f2c3e30b7 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.hash +++ b/package/x11r7/xlib_libXi/xlib_libXi.hash @@ -1,2 +1,2 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002733.html -sha256 d8f2fa8d53141c41ff521627df9b2fa9c05f6f142fd9881152bab36549ac27bb libXi-1.7.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002768.html +sha256 c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45 libXi-1.7.9.tar.bz2 diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk index de680ea05f..d593c1e95a 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXI_VERSION = 1.7.8 +XLIB_LIBXI_VERSION = 1.7.9 XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXI_LICENSE = MIT From 972b0caafcad83e3ac90088889d2d648a28255b7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:47 +0100 Subject: [PATCH 2485/3392] package/x11r7/xproto_presentproto: bump version to 1.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xproto_presentproto/xproto_presentproto.hash | 4 ++-- package/x11r7/xproto_presentproto/xproto_presentproto.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xproto_presentproto/xproto_presentproto.hash b/package/x11r7/xproto_presentproto/xproto_presentproto.hash index f947d915a9..aa45d9167e 100644 --- a/package/x11r7/xproto_presentproto/xproto_presentproto.hash +++ b/package/x11r7/xproto_presentproto/xproto_presentproto.hash @@ -1,2 +1,2 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/2078 -sha256 812c7d48721f909a0f7a2cb1e91f6eead76159a36c4712f4579ca587552839ce presentproto-1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002770.html +sha256 f69b23a8869f78a5898aaf53938b829c8165e597cda34f06024d43ee1e6d26b9 presentproto-1.1.tar.bz2 diff --git a/package/x11r7/xproto_presentproto/xproto_presentproto.mk b/package/x11r7/xproto_presentproto/xproto_presentproto.mk index 6fea0a2f85..0097b9cddb 100644 --- a/package/x11r7/xproto_presentproto/xproto_presentproto.mk +++ b/package/x11r7/xproto_presentproto/xproto_presentproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XPROTO_PRESENTPROTO_VERSION = 1.0 +XPROTO_PRESENTPROTO_VERSION = 1.1 XPROTO_PRESENTPROTO_SOURCE = presentproto-$(XPROTO_PRESENTPROTO_VERSION).tar.bz2 XPROTO_PRESENTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto XPROTO_PRESENTPROTO_LICENSE = MIT From 00be19bcbfbd0a2202346453b114dc159943fec4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:48 +0100 Subject: [PATCH 2486/3392] package/x11r7/xapp_xconsole: bump version to 1.0.7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xconsole/xapp_xconsole.hash | 4 ++-- package/x11r7/xapp_xconsole/xapp_xconsole.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xconsole/xapp_xconsole.hash b/package/x11r7/xapp_xconsole/xapp_xconsole.hash index a62d8cbb22..364cdbe405 100644 --- a/package/x11r7/xapp_xconsole/xapp_xconsole.hash +++ b/package/x11r7/xapp_xconsole/xapp_xconsole.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2013-July/002272.html -sha256 e561959b6ee8b735a32c1050015cfd8c551ed162cabb6cb72e36ce72966855d1 xconsole-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002774.html +sha256 d1144882df207378381bc83927906559defbf7b83a01d52c50ad44234c5851e0 xconsole-1.0.7.tar.bz2 diff --git a/package/x11r7/xapp_xconsole/xapp_xconsole.mk b/package/x11r7/xapp_xconsole/xapp_xconsole.mk index 971b1b32ea..52656de83c 100644 --- a/package/x11r7/xapp_xconsole/xapp_xconsole.mk +++ b/package/x11r7/xapp_xconsole/xapp_xconsole.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XCONSOLE_VERSION = 1.0.6 +XAPP_XCONSOLE_VERSION = 1.0.7 XAPP_XCONSOLE_SOURCE = xconsole-$(XAPP_XCONSOLE_VERSION).tar.bz2 XAPP_XCONSOLE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XCONSOLE_LICENSE = MIT From e7baa85d2ab73bfd59f7138386cb4e4ff37c0947 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:49 +0100 Subject: [PATCH 2487/3392] package/x11r7/xapp_xauth: bump version to 1.0.10 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xauth/xapp_xauth.hash | 4 ++-- package/x11r7/xapp_xauth/xapp_xauth.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xauth/xapp_xauth.hash b/package/x11r7/xapp_xauth/xapp_xauth.hash index 922cecf602..f6987c1c0c 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.hash +++ b/package/x11r7/xapp_xauth/xapp_xauth.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2014-April/002414.html -sha256 56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f xauth-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002772.html +sha256 5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d xauth-1.0.10.tar.bz2 diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk index a2307f2817..80ac6a42d5 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.mk +++ b/package/x11r7/xapp_xauth/xapp_xauth.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XAUTH_VERSION = 1.0.9 +XAPP_XAUTH_VERSION = 1.0.10 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XAUTH_LICENSE = MIT From a20f92a612a67482faa78b8e0b1fd6dbc58e4514 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 31 Jan 2017 19:37:50 +0100 Subject: [PATCH 2488/3392] package/xutil_util-macros: bump version to 1.19.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/xutil_util-macros/xutil_util-macros.hash | 4 ++-- package/xutil_util-macros/xutil_util-macros.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xutil_util-macros/xutil_util-macros.hash b/package/xutil_util-macros/xutil_util-macros.hash index bcb6c585dd..0f0509a132 100644 --- a/package/xutil_util-macros/xutil_util-macros.hash +++ b/package/xutil_util-macros/xutil_util-macros.hash @@ -1,2 +1,2 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/2141 -sha256 2835b11829ee634e19fa56517b4cfc52ef39acea0cd82e15f68096e27cbed0ba util-macros-1.19.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002773.html +sha256 18d459400558f4ea99527bc9786c033965a3db45bf4c6a32eefdc07aa9e306a6 util-macros-1.19.1.tar.bz2 diff --git a/package/xutil_util-macros/xutil_util-macros.mk b/package/xutil_util-macros/xutil_util-macros.mk index 1451a0698d..d01b3e0d24 100644 --- a/package/xutil_util-macros/xutil_util-macros.mk +++ b/package/xutil_util-macros/xutil_util-macros.mk @@ -4,7 +4,7 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.19.0 +XUTIL_UTIL_MACROS_VERSION = 1.19.1 XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util XUTIL_UTIL_MACROS_LICENSE = MIT From 280272c4416baebbe77f94fbe3d7ece7ff02d6db Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 1 Feb 2017 21:40:07 +0100 Subject: [PATCH 2489/3392] package/x11r7/xkeyboard-config: bump version to 2.20 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 1869491e7f..104a5aba1c 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,2 +1,2 @@ -# From https://lists.x.org/archives/xorg-announce/2016-September/002715.html -sha256 83dfd186b9eb9ced69e01d8d8e2f15b6a79b2e30124874ef086f2d3048f45827 xkeyboard-config-2.19.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-February/002775.html +sha256 d1bfc72553c4e3ef1cd6f13eec0488cf940498b612ab8a0b362e7090c94bc134 xkeyboard-config-2.20.tar.bz2 diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index c3d1d8977e..bdaf0268db 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.19 +XKEYBOARD_CONFIG_VERSION = 2.20 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 21d3f1228968c998c50adb0aa068a8ae640a51c9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 1 Feb 2017 21:52:10 +0100 Subject: [PATCH 2490/3392] docs/website/sponsors.html: Google and Mind sponsors of FOSDEM 2017 meeting This commit updates the sponsors page on our web site to indicate that Google and Mind are sponsoring the Buildroot Developers Meeting at FOSDEM 2017 in Brussels. Signed-off-by: Thomas Petazzoni --- docs/website/sponsors.html | 57 +++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index 6d97ca529c..e0f1aab20e 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -9,40 +9,42 @@
          +
          - - + +
          - As it did in previous years and at FOSDEM, Mind - is sponsoring the Friday night dinner at the Buildroot - Developers Meeting at ELCE 2016 in Berlin. + Google is + sponsoring + the Buildroot + Developers Meeting at FOSDEM 2017 in Brussels, by + providing logistics for the meeting: a free meeting + room and lunch for the participants.
          -
          -
          -
          -
          -
          - - - -
          -
          - Free - Electrons is sponsoring the Buildroot - Developers Meeting at ELCE 2016 in Berlin, by making a donation to the - IN-Berlin organization who hosted the event. +
          +
          +
          +
          + + + +
          +
          + As it did in previous years, Mind + is sponsoring the Monday night dinner at the Buildroot + Developers Meeting at FOSDEM 2017 in Brussels. +
          -
          @@ -80,9 +82,10 @@
          Mind sponsored the - dinner of the FOSDEM 2014, 2015 and 2016 Developers - Meeting (Brussels), the meeting room and the dinner - for the ELCE 2014 Developers Meeting (Düsseldorf). + dinner of the FOSDEM 2014, 2015, 2016 and 2017 + Developers Meeting (Brussels) and ELCE 2016 (Berlin), + the meeting room and the dinner for the ELCE 2014 + Developers Meeting (Düsseldorf).
          @@ -214,9 +217,11 @@

          -

          Free Electrons - sponsored the lunch for the ELCE 2009 Developer Days in - Grenoble, France.

          +

          Free + Electrons sponsored the meeting location for the + ELCE 2016 Developer Days in Berlin, Germany, and the + lunch for the ELCE 2009 Developer Days in Grenoble, + France.

        From 4ac8510e127e337c14ac501f78b45ebbe9814327 Mon Sep 17 00:00:00 2001 From: Judd Meinders Date: Tue, 31 Jan 2017 11:26:53 -0600 Subject: [PATCH 2491/3392] libcurl: optional verbose strings config This patch enables a config to set --enable-verbose during the configuration of libcurl. The option is triggered by setting BR2_PACKAGE_LIBCURL_VERBOSE. Signed-off-by: Judd Meinders Signed-off-by: Matt Weber Signed-off-by: Thomas Petazzoni --- package/libcurl/Config.in | 5 +++++ package/libcurl/libcurl.mk | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index 026ae0154b..fc1527f0d9 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -13,4 +13,9 @@ config BR2_PACKAGE_CURL help Install curl binary as well +config BR2_PACKAGE_LIBCURL_VERBOSE + bool "enable verbose strings" + help + Enable verbose text strings + endif diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index ea37309d82..a9fba26627 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -19,8 +19,15 @@ LIBCURL_INSTALL_STAGING = YES # on non-MMU platforms. Moreover, this authentication method is # probably almost never used. See # http://curl.haxx.se/docs/manpage.html#--ntlm. -LIBCURL_CONF_OPTS = --disable-verbose --disable-manual --disable-ntlm-wb \ +LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \ --enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug + +ifeq ($(BR2_PACKAGE_LIBCURL_VERBOSE),y) +LIBCURL_CONF_OPTS += --enable-verbose +else +LIBCURL_CONF_OPTS += --disable-verbose +endif + LIBCURL_CONFIG_SCRIPTS = curl-config ifeq ($(BR2_PACKAGE_OPENSSL),y) From d995fd1258a3b48ee5eae3dd3e0beb1d27c7f449 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 31 Jan 2017 17:03:43 +0100 Subject: [PATCH 2492/3392] DEVELOPERS: update Thomas De Schampheleire The originally added entries were based on 'last committer' heuristics, but I do not particularly feel responsible for them. Instead update the list with more appropriate entries. Additionally, update my email address. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index c7f2dd9537..11011406ea 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1476,10 +1476,11 @@ F: package/fcgiwrap/ N: Thomas Davis F: package/civetweb/ -N: Thomas De Schampheleire -F: package/libpfm4/ -F: package/mkpasswd/ -F: package/zeromq/ +N: Thomas De Schampheleire +F: docs/manual/ +F: support/scripts/size-stats +F: support/scripts/size-stats-compare +F: toolchain/ N: Thomas Petazzoni F: arch/Config.in.arm From 497f69889d21200e55a7519cf64819e9ce6e59cd Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 31 Jan 2017 17:03:38 +0100 Subject: [PATCH 2493/3392] toolchain-external: remove stale references to (ARCH_)LIBC_A_LOCATION The variables LIBC_A_LOCATION and ARCH_LIBC_A_LOCATION were killed in commit 646bd86908f7f995cdc2b95e0be381d97600f905 but the corresponding descriptions were never removed. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- .../pkg-toolchain-external.mk | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index e0a8b410c0..6658875007 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -347,35 +347,27 @@ endef # # Variables are defined as follows: # -# LIBC_A_LOCATION: location of the libc.a file in the default -# multilib variant (allows to find the main -# sysroot directory) -# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/usr/lib/libc.a -# -# SYSROOT_DIR: the main sysroot directory, deduced from -# LIBC_A_LOCATION by removing the -# usr/lib[32|64]/libc.a part of the path. +# SYSROOT_DIR: the main sysroot directory, deduced from the location of +# the libc.a file in the default multilib variant, by +# removing the usr/lib[32|64]/libc.a part of the path. # Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/ # -# ARCH_LIBC_A_LOCATION: location of the libc.a file in the selected -# multilib variant (taking into account the -# CFLAGS). Allows to find the sysroot of the -# selected multilib variant. -# Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/usr/lib/libc.a -# # ARCH_SYSROOT_DIR: the sysroot of the selected multilib variant, -# deduced from ARCH_LIBC_A_LOCATION by removing -# usr/lib[32|64]/libc.a at the end of the path. +# deduced from the location of the libc.a file in the +# selected multilib variant (taking into account the +# CFLAGS), by removing usr/lib[32|64]/libc.a at the end +# of the path. # Ex: /x-tools/mips-2011.03/mips-linux-gnu/libc/mips16/soft-float/el/ # # ARCH_LIB_DIR: 'lib', 'lib32' or 'lib64' depending on where libraries -# are stored. Deduced from ARCH_LIBC_A_LOCATION by -# looking at usr/lib??/libc.a. +# are stored. Deduced from the location of the libc.a file +# in the selected multilib variant, by looking at +# usr/lib??/libc.a. # Ex: lib # # ARCH_SUBDIR: the relative location of the sysroot of the selected # multilib variant compared to the main sysroot. -# Ex: mips16/soft-float/el +# Ex: mips16/soft-float/el # # SUPPORT_LIB_DIR: some toolchains, such as recent Linaro toolchains, # store GCC support libraries (libstdc++, From cee060e98e7681c81ced198f078ddc1e7881c9ee Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 1 Feb 2017 12:27:08 +0100 Subject: [PATCH 2494/3392] core infra: make sure apply-patches is called with correct tar Buildroot has a mechanism to detect a too-old or missing tar program on the host machine, and builds a custom host-tar if needed. An example situation is a RHEL5 host machine, where tar is knowingly too old. The apply-patches script also employs tar, in case the patches come as an archive. However, tar is called as 'tar' without any absolute path, and the environment does not point in any way to the possibly custom tar. As a result, the too-old-tar is called. A particular problem is the flag '-a' which is missing on e.g. RHEL5. Previously, this problem went unnoticed: tar would fail, but apply-patches did not notice it, and the overall return code of the script was 'success'. However, commit d5ae67b4 added 'set -e' to the script, causing any error to halt execution of the script with an error. Fix the problem by adding the Buildroot-built host tools to the PATH when calling apply-patches. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 688d5b1610..4a3eb26963 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -215,7 +215,7 @@ FLEX := $(shell which flex || type -p flex) BISON := $(shell which bison || type -p bison) UNZIP := $(shell which unzip || type -p unzip) -q -APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(QUIET),-s) +APPLY_PATCHES = PATH=$(HOST_DIR)/usr/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s) HOST_CPPFLAGS = -I$(HOST_DIR)/usr/include HOST_CFLAGS ?= -O2 From c06aa42f7c1a0d22a3c816adacc25bb0b12d0179 Mon Sep 17 00:00:00 2001 From: Lionel Flandrin Date: Tue, 31 Jan 2017 12:22:45 +0100 Subject: [PATCH 2495/3392] python-pyzmq: bump to version 16.0.2 Updated the zmq version detection patch to apply cleanly on 16.0.2. Added patch #2 to replace compile_and_run with compile_and_forget in the setup code: this function is only used to check for the availability of "sys/un.h" and we only need to compile the test code to make sure of that. This fixes the cross-compilation. Signed-off-by: Lionel Flandrin Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- ...ldroot-zmq-version-instead-of-detect.patch | 52 +++++++------ ...pile_and_run-with-compile_and_forget.patch | 76 +++++++++++++++++++ package/python-pyzmq/python-pyzmq.hash | 5 +- package/python-pyzmq/python-pyzmq.mk | 4 +- 4 files changed, 111 insertions(+), 26 deletions(-) create mode 100644 package/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch diff --git a/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch b/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch index 560606989e..cb52eaf6de 100644 --- a/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch +++ b/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch @@ -5,39 +5,47 @@ retrieve a version string for the installed ZMQ library, but if the cross compiler links it together, the result cannot be run on the host, due to different architectures and libraries. -And if the host compiler would compile/link it, it would not link with the -library version inside buildroot but with the library from the host, possibly returning a wrong version number. +And if the host compiler would compile/link it, it would not link with +the library version inside buildroot but with the library from the +host, possibly returning a wrong version number. Instead of trying to run the compiled test program to get the version dynamically, return the version of the buildroot environment. -Signed-off-by: Michael Rommel +Written by Michael Rommel, modified for version 16.0.2 by Lionel +Flandrin. ---- pyzmq-13.0.2/buildutils/detect.py.orig 2013-08-10 00:49:28.242557978 +0200 -+++ pyzmq-13.0.2/buildutils/detect.py 2013-08-10 00:44:35.197572704 +0200 -@@ -119,15 +119,17 @@ def detect_zmq(basedir, compiler=None, * - - efile = test_compilation(cfile, compiler=compiler, **compiler_attrs) +Signed-off-by: Lionel Flandrin +--- + buildutils/detect.py | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/buildutils/detect.py b/buildutils/detect.py +index 9520da7..823144f 100644 +--- a/buildutils/detect.py ++++ b/buildutils/detect.py +@@ -117,13 +117,15 @@ def detect_zmq(basedir, compiler=None, **compiler_attrs): + + cc = get_compiler(compiler=compiler, **compiler_attrs) + efile = test_compilation(cfile, compiler=cc) +- patch_lib_paths(efile, cc.library_dirs) ++ #patch_lib_paths(efile, cc.library_dirs) -- result = Popen(efile, stdout=PIPE, stderr=PIPE) -- so, se = result.communicate() -+ # result = Popen(efile, stdout=PIPE, stderr=PIPE) -+ # so, se = result.communicate() - # for py3k: -- so = so.decode() -- se = se.decode() -- if result.returncode: +- rc, so, se = get_output_error([efile]) +- if rc: - msg = "Error running version detection script:\n%s\n%s" % (so,se) - logging.error(msg) - raise IOError(msg) -+ #so = so.decode() -+ #se = se.decode() -+ #if result.returncode: -+ # msg = "Error running version detection script:\n%s\n%s" % (so,se) -+ # logging.error(msg) -+ # raise IOError(msg) ++ #rc, so, se = get_output_error([efile]) ++ # if rc: ++ # msg = "Error running version detection script:\n%s\n%s" % (so,se) ++ # logging.error(msg) ++ # raise IOError(msg) + + so = "vers: ##ZEROMQ_VERSION##" handlers = {'vers': lambda val: tuple(int(v) for v in val.split('.'))} +-- +2.11.0 + diff --git a/package/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch b/package/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch new file mode 100644 index 0000000000..278e939e0e --- /dev/null +++ b/package/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch @@ -0,0 +1,76 @@ +detect.py: replace compile_and_run with compile_and_forget + +This function is only used in setup.py to detect the availability of +sys/un.h by compiling and running a small test program. Since we're +cross-compiling we can't run the generated program, however if the +header is missing the test will fail at the compilation step so +running the test in unnecessary. + +Signed-off-by: Lionel Flandrin +--- + buildutils/detect.py | 16 ++++++++-------- + setup.py | 4 ++-- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/buildutils/detect.py b/buildutils/detect.py +index 7a6c115..9520da7 100644 +--- a/buildutils/detect.py ++++ b/buildutils/detect.py +@@ -58,7 +58,7 @@ def test_compilation(cfile, compiler=None, **compiler_attrs): + cc.link_executable(objs, efile, extra_preargs=lpreargs) + return efile + +-def compile_and_run(basedir, src, compiler=None, **compiler_attrs): ++def compile_and_forget(basedir, src, compiler=None, **compiler_attrs): + if not os.path.exists(basedir): + os.makedirs(basedir) + cfile = pjoin(basedir, os.path.basename(src)) +@@ -66,16 +66,16 @@ def compile_and_run(basedir, src, compiler=None, **compiler_attrs): + try: + cc = get_compiler(compiler, **compiler_attrs) + efile = test_compilation(cfile, compiler=cc) +- patch_lib_paths(efile, cc.library_dirs) +- result = Popen(efile, stdout=PIPE, stderr=PIPE) +- so, se = result.communicate() +- # for py3k: +- so = so.decode() +- se = se.decode() ++ # patch_lib_paths(efile, cc.library_dirs) ++ # result = Popen(efile, stdout=PIPE, stderr=PIPE) ++ # so, se = result.communicate() ++ # # for py3k: ++ # so = so.decode() ++ # se = se.decode() + finally: + shutil.rmtree(basedir) + +- return result.returncode, so, se ++ return None + + + def detect_zmq(basedir, compiler=None, **compiler_attrs): +diff --git a/setup.py b/setup.py +index c3a2879..b8b0aaf 100755 +--- a/setup.py ++++ b/setup.py +@@ -54,7 +54,7 @@ from buildutils import ( + info, warn, fatal, debug, line, copy_and_patch_libzmq, localpath, + fetch_libzmq, stage_platform_hpp, + bundled_version, customize_mingw, +- compile_and_run, ++ compile_and_forget, + patch_lib_paths, + ) + +@@ -327,7 +327,7 @@ class Configure(build_ext): + except Exception: + pass + try: +- compile_and_run(self.tempdir, ++ compile_and_forget(self.tempdir, + pjoin('buildutils', 'check_sys_un.c'), + **minus_zmq + ) +-- +2.11.0 + diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash index 9871ecd1c2..6cdd0b9f18 100644 --- a/package/python-pyzmq/python-pyzmq.hash +++ b/package/python-pyzmq/python-pyzmq.hash @@ -1,2 +1,3 @@ -# locally computed -sha256 00e263c26a524f81127247e6f37cbf427eddf3a3657d170cf4865bd522df3914 pyzmq-14.3.1.tar.gz +# md5 from https://pypi.python.org/pypi/pyzmq/json, sha256 locally computed +md5 9a8768b00a566a400d70318f8c359cfe pyzmq-16.0.2.tar.gz +sha256 0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d pyzmq-16.0.2.tar.gz diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index 0e787b1d22..ade2d3a234 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYZMQ_VERSION = 14.3.1 +PYTHON_PYZMQ_VERSION = 16.0.2 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz -PYTHON_PYZMQ_SITE = http://pypi.python.org/packages/source/p/pyzmq +PYTHON_PYZMQ_SITE = https://pypi.python.org/packages/af/37/8e0bf3800823bc247c36715a52e924e8f8fd5d1432f04b44b8cd7a5d7e55 PYTHON_PYZMQ_LICENSE = LGPLv3+, BSD-3c, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD From 0b4848d6b94dc722fd6cdd6b512bdfe9efaf014a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 1 Feb 2017 22:48:42 +0200 Subject: [PATCH 2496/3392] dbus: remove init script status op The status command calls the Upstart status utility which we don't have. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/dbus/S30dbus | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/dbus/S30dbus b/package/dbus/S30dbus index 4427b5c72c..b4bcf9c7aa 100644 --- a/package/dbus/S30dbus +++ b/package/dbus/S30dbus @@ -53,10 +53,6 @@ case "$1" in stop) stop ;; - status) - status $processname - RETVAL=$? - ;; restart) stop start @@ -72,7 +68,7 @@ case "$1" in RETVAL=$? ;; *) - echo "Usage: $0 {start|stop|status|restart|condrestart|reload}" + echo "Usage: $0 {start|stop|restart|condrestart|reload}" ;; esac exit $RETVAL From ebd029c9d9eacb649d6d1826a061830477e31d39 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 30 Jan 2017 12:00:14 -0500 Subject: [PATCH 2497/3392] sepolgen: bump to version 2.6 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/sepolgen/sepolgen.hash | 2 +- package/sepolgen/sepolgen.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sepolgen/sepolgen.hash b/package/sepolgen/sepolgen.hash index a377c66aef..b338a7019f 100644 --- a/package/sepolgen/sepolgen.hash +++ b/package/sepolgen/sepolgen.hash @@ -1,2 +1,2 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 8a1c6d3a78c9b6ad3555c74def555f65a62950bf21c111c585bfc382fec3a645 sepolgen-1.1.9.tar.gz +sha256 6a327b1576d914e57ad796a541a7a9bcceefb14c445355559993de0fdb8e7a60 sepolgen-2.6.tar.gz diff --git a/package/sepolgen/sepolgen.mk b/package/sepolgen/sepolgen.mk index efecee7567..137eaed612 100644 --- a/package/sepolgen/sepolgen.mk +++ b/package/sepolgen/sepolgen.mk @@ -4,8 +4,8 @@ # ################################################################################ -SEPOLGEN_VERSION = 1.1.9 -SEPOLGEN_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20130423 +SEPOLGEN_VERSION = 2.6 +SEPOLGEN_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 SEPOLGEN_LICENSE = GPLv2 SEPOLGEN_LICENSE_FILES = COPYING From 183b443e579b31b14bd95f98ecd95b2efc0554f7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 3 Feb 2017 07:43:43 +0200 Subject: [PATCH 2498/3392] tcpdump: security bump to version 4.9.0 Security fixes in this release (from the Debian changelog): + CVE-2016-7922: buffer overflow in print-ah.c:ah_print(). + CVE-2016-7923: buffer overflow in print-arp.c:arp_print(). + CVE-2016-7924: buffer overflow in print-atm.c:oam_print(). + CVE-2016-7925: buffer overflow in print-sl.c:sl_if_print(). + CVE-2016-7926: buffer overflow in print-ether.c:ethertype_print(). + CVE-2016-7927: buffer overflow in print-802_11.c:ieee802_11_radio_print(). + CVE-2016-7928: buffer overflow in print-ipcomp.c:ipcomp_print(). + CVE-2016-7929: buffer overflow in print-juniper.c:juniper_parse_header(). + CVE-2016-7930: buffer overflow in print-llc.c:llc_print(). + CVE-2016-7931: buffer overflow in print-mpls.c:mpls_print(). + CVE-2016-7932: buffer overflow in print-pim.c:pimv2_check_checksum(). + CVE-2016-7933: buffer overflow in print-ppp.c:ppp_hdlc_if_print(). + CVE-2016-7934: buffer overflow in print-udp.c:rtcp_print(). + CVE-2016-7935: buffer overflow in print-udp.c:rtp_print(). + CVE-2016-7936: buffer overflow in print-udp.c:udp_print(). + CVE-2016-7937: buffer overflow in print-udp.c:vat_print(). + CVE-2016-7938: integer overflow in print-zeromq.c:zmtp1_print_frame(). + CVE-2016-7939: buffer overflow in print-gre.c, multiple functions. + CVE-2016-7940: buffer overflow in print-stp.c, multiple functions. + CVE-2016-7973: buffer overflow in print-atalk.c, multiple functions. + CVE-2016-7974: buffer overflow in print-ip.c, multiple functions. + CVE-2016-7975: buffer overflow in print-tcp.c:tcp_print(). + CVE-2016-7983: buffer overflow in print-bootp.c:bootp_print(). + CVE-2016-7984: buffer overflow in print-tftp.c:tftp_print(). + CVE-2016-7985: buffer overflow in print-calm-fast.c:calm_fast_print(). + CVE-2016-7986: buffer overflow in print-geonet.c, multiple functions. + CVE-2016-7992: buffer overflow in print-cip.c:cip_if_print(). + CVE-2016-7993: a bug in util-print.c:relts_print() could cause a buffer overflow in multiple protocol parsers (DNS, DVMRP, HSRP, IGMP, lightweight resolver protocol, PIM). + CVE-2016-8574: buffer overflow in print-fr.c:frf15_print(). + CVE-2016-8575: buffer overflow in print-fr.c:q933_print(). + CVE-2017-5202: buffer overflow in print-isoclns.c:clnp_print(). + CVE-2017-5203: buffer overflow in print-bootp.c:bootp_print(). + CVE-2017-5204: buffer overflow in print-ip6.c:ip6_print(). + CVE-2017-5205: buffer overflow in print-isakmp.c:ikev2_e_print(). + CVE-2017-5341: buffer overflow in print-otv.c:otv_print(). + CVE-2017-5342: a bug in multiple protocol parsers (Geneve, GRE, NSH, OTV, VXLAN and VXLAN GPE) could cause a buffer overflow in print-ether.c:ether_print(). + CVE-2017-5482: buffer overflow in print-fr.c:q933_print(). + CVE-2017-5483: buffer overflow in print-snmp.c:asn1_parse(). + CVE-2017-5484: buffer overflow in print-atm.c:sig_print(). + CVE-2017-5485: buffer overflow in addrtoname.c:lookup_nsap(). + CVE-2017-5486: buffer overflow in print-isoclns.c:clnp_print(). Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/tcpdump/tcpdump.hash | 2 +- package/tcpdump/tcpdump.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index 21fb83f418..966db1f3aa 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 20e4341ec48fcf72abcae312ea913e6ba6b958617b2f3fb496d51f0ae88d831c tcpdump-4.8.1.tar.gz +sha256 eae98121cbb1c9adbedd9a777bf2eae9fa1c1c676424a54740311c8abcee5a5e tcpdump-4.9.0.tar.gz diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 3773fcb9c0..e71f9c113f 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.8.1 +TCPDUMP_VERSION = 4.9.0 TCPDUMP_SITE = http://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3c TCPDUMP_LICENSE_FILES = LICENSE From 9be8837ad252c2d37e3732367b9a8eaf5f1b4678 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 2 Feb 2017 07:16:53 +0100 Subject: [PATCH 2499/3392] uclibc: update to 1.0.22 - fixes mips{32,64}r6 support - adds experimental aarch64 support - fixes syscalls with 6 arguments for x86 - removes PID caching and simplifies architecture specific code Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- ...odule-delete_module-syscall-wrappers.patch | 59 ------------------- ...onv.h-when-UCLIBC_HAS_LOCALE-is-not-.patch | 26 -------- .../uclibc/0003-locale-needs-libiconv.patch | 25 -------- ...Makefile.in-Fix-removal-of-libintl.h.patch | 33 ----------- package/uclibc/uclibc.hash | 2 +- package/uclibc/uclibc.mk | 2 +- 6 files changed, 2 insertions(+), 145 deletions(-) delete mode 100644 package/uclibc/0001-add-init_module-delete_module-syscall-wrappers.patch delete mode 100644 package/uclibc/0002-do-not-remove-iconv.h-when-UCLIBC_HAS_LOCALE-is-not-.patch delete mode 100644 package/uclibc/0003-locale-needs-libiconv.patch delete mode 100644 package/uclibc/0004-Makefile.in-Fix-removal-of-libintl.h.patch diff --git a/package/uclibc/0001-add-init_module-delete_module-syscall-wrappers.patch b/package/uclibc/0001-add-init_module-delete_module-syscall-wrappers.patch deleted file mode 100644 index 4a3e07fb5d..0000000000 --- a/package/uclibc/0001-add-init_module-delete_module-syscall-wrappers.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f60f9d6f1f73ab3f77771dafa4f90c2e0de2a7e2 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Tue, 27 Dec 2016 09:24:24 +0100 -Subject: [PATCH] add init_module/delete_module syscall wrappers - -Add the wrappers unconditionally, because kmod package -still uses them. - -Signed-off-by: Waldemar Brodkorb ---- - libc/sysdeps/linux/common/Makefile.in | 1 + - libc/sysdeps/linux/common/module.c | 23 +++++++++++++++++++++++ - 2 files changed, 24 insertions(+) - create mode 100644 libc/sysdeps/linux/common/module.c - -diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in -index 595074c..faed6fd 100644 ---- a/libc/sysdeps/linux/common/Makefile.in -+++ b/libc/sysdeps/linux/common/Makefile.in -@@ -31,6 +31,7 @@ CSRC-$(UCLIBC_LINUX_SPECIFIC) += \ - ioperm.c \ - iopl.c \ - modify_ldt.c \ -+ module.c \ - personality.c \ - pipe2.c \ - ppoll.c \ -diff --git a/libc/sysdeps/linux/common/module.c b/libc/sysdeps/linux/common/module.c -new file mode 100644 -index 0000000..146a43e ---- /dev/null -+++ b/libc/sysdeps/linux/common/module.c -@@ -0,0 +1,23 @@ -+/* -+ * init_module()/delete_module() for uClibc -+ * -+ * Copyright (C) 2000-2006 Erik Andersen -+ * -+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -+ */ -+ -+#include -+ -+#ifdef __NR_init_module -+int init_module(void *first, void *second, void *third, void *fourth, void *fifth); -+/* This may have 5 arguments (for old 2.0 kernels) or 2 arguments -+ * (for 2.2 and 2.4 kernels). Use the greatest common denominator, -+ * and let the kernel cope with whatever it gets. It's good at that. */ -+_syscall5(int, init_module, void *, first, void *, second, void *, third, -+ void *, fourth, void *, fifth) -+#endif -+ -+#ifdef __NR_delete_module -+int delete_module(const char *name, unsigned int flags); -+_syscall2(int, delete_module, const char *, name, unsigned int, flags) -+#endif --- -2.1.4 - diff --git a/package/uclibc/0002-do-not-remove-iconv.h-when-UCLIBC_HAS_LOCALE-is-not-.patch b/package/uclibc/0002-do-not-remove-iconv.h-when-UCLIBC_HAS_LOCALE-is-not-.patch deleted file mode 100644 index 4567720aca..0000000000 --- a/package/uclibc/0002-do-not-remove-iconv.h-when-UCLIBC_HAS_LOCALE-is-not-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0d80d5a235af1a12b606dea6380dc91f755546fe Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Wed, 28 Dec 2016 19:08:15 +0100 -Subject: [PATCH] do not remove iconv.h when UCLIBC_HAS_LOCALE is not set - -Signed-off-by: Waldemar Brodkorb ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 9acf76c..c8afe1c 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -282,7 +282,7 @@ HEADERS_RM-$(UCLIBC_HAS_IPV6) += netinet/ip6.h netinet/icmp6.h - HEADERS_RM-$(UCLIBC_HAS_BACKTRACE) += execinfo.h - HEADERS_RM-$(UCLIBC_HAS_LIBICONV) += iconv.h - HEADERS_RM-$(UCLIBC_HAS_LIBINTL) += intl.h --HEADERS_RM-$(UCLIBC_HAS_LOCALE) += iconv.h bits/uClibc_ctype.h -+HEADERS_RM-$(UCLIBC_HAS_LOCALE) += bits/uClibc_ctype.h - HEADERS_RM-$(UCLIBC_HAS_PTY) += pty.h - HEADERS_RM-$(UCLIBC_HAS_REALTIME) += mqueue.h bits/mqueue.h sched.h \ - bits/sched.h \ --- -2.1.4 - diff --git a/package/uclibc/0003-locale-needs-libiconv.patch b/package/uclibc/0003-locale-needs-libiconv.patch deleted file mode 100644 index e244955e48..0000000000 --- a/package/uclibc/0003-locale-needs-libiconv.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a2c56ee4fbff7af9128d630299d81fb46582673d Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Thu, 29 Dec 2016 13:38:09 +0100 -Subject: [PATCH] locale: needs libiconv - -Signed-off-by: Waldemar Brodkorb ---- - extra/Configs/Config.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in -index 6b0985e..b02054c 100644 ---- a/extra/Configs/Config.in -+++ b/extra/Configs/Config.in -@@ -1442,6 +1442,7 @@ config UCLIBC_HAS_LOCALE - bool "Locale Support" - select UCLIBC_HAS_WCHAR - select UCLIBC_HAS_CTYPE_TABLES -+ select UCLIBC_HAS_LIBICONV - help - uClibc now has full ANSI/ISO C99 locale support (except for - wcsftime() and collating items in regex). Be aware that enabling --- -2.1.4 - diff --git a/package/uclibc/0004-Makefile.in-Fix-removal-of-libintl.h.patch b/package/uclibc/0004-Makefile.in-Fix-removal-of-libintl.h.patch deleted file mode 100644 index 7cbcd47785..0000000000 --- a/package/uclibc/0004-Makefile.in-Fix-removal-of-libintl.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5f7b66fe28a785330a874a11001d7758dd5a59d7 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 16 Jan 2017 21:01:43 +0100 -Subject: [PATCH 1/1] Makefile.in: Fix removal of libintl.h - -A wrong filename was present in Makefile.in leaving libintl.h installed -even if libintl support is disabled leading to wrong configure checks -by other packages. - -Patch sent upstream: -http://mailman.uclibc-ng.org/pipermail/devel/2017-January/001360.html - -Signed-off-by: Bernd Kuhls ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index c8afe1cd0..bb3549c19 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -281,7 +281,7 @@ HEADERS_RM-$(UCLIBC_HAS_GETOPT_LONG) += getopt.h - HEADERS_RM-$(UCLIBC_HAS_IPV6) += netinet/ip6.h netinet/icmp6.h - HEADERS_RM-$(UCLIBC_HAS_BACKTRACE) += execinfo.h - HEADERS_RM-$(UCLIBC_HAS_LIBICONV) += iconv.h --HEADERS_RM-$(UCLIBC_HAS_LIBINTL) += intl.h -+HEADERS_RM-$(UCLIBC_HAS_LIBINTL) += libintl.h - HEADERS_RM-$(UCLIBC_HAS_LOCALE) += bits/uClibc_ctype.h - HEADERS_RM-$(UCLIBC_HAS_PTY) += pty.h - HEADERS_RM-$(UCLIBC_HAS_REALTIME) += mqueue.h bits/mqueue.h sched.h \ --- -2.11.0 - diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 0c9e71a338..d2fbd0aef4 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,2 +1,2 @@ # From http://www.uclibc-ng.org/ -sha256 6e99ebebe8a46ddcd26615828d51b62dbf580568aa58bf5f495da37eba0c872d uClibc-ng-1.0.21.tar.xz +sha256 f2004c85db8e07e9f1c2e8b7c513fa7c237bc9f9685d8e1bfc89535b8a85449b uClibc-ng-1.0.22.tar.xz diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index bef1bb7bfa..9f9bffba98 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.21 +UCLIBC_VERSION = 1.0.22 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPLv2.1+ From 2b3d493095576707691685ce54318ad87340b923 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 3 Feb 2017 15:16:58 +0100 Subject: [PATCH 2500/3392] uclibc: enable mips{32,64}r6 support The config for ISA choice is removed for a long time as the buildsystem does not pass -march=mips* to the compiler anymore. For mips{32,64}r6 support NAN selection is required. Tested with qemu mips32/mips64 defconfigs. A small patch is required. Bug found while testing qemu defconfigs. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- ...fstat-make-new-code-aarch64-specific.patch | 29 +++++++++++++++++++ package/uclibc/Config.in | 7 ++--- package/uclibc/uclibc.mk | 10 +++---- toolchain/toolchain-buildroot/Config.in | 2 -- 4 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 package/uclibc/0001-fstat-make-new-code-aarch64-specific.patch diff --git a/package/uclibc/0001-fstat-make-new-code-aarch64-specific.patch b/package/uclibc/0001-fstat-make-new-code-aarch64-specific.patch new file mode 100644 index 0000000000..eb0198d44d --- /dev/null +++ b/package/uclibc/0001-fstat-make-new-code-aarch64-specific.patch @@ -0,0 +1,29 @@ +From 71127e5cc937878883e6021da3da337a7aa9c099 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Fri, 3 Feb 2017 06:04:16 +0100 +Subject: [PATCH 10229/10229] fstat: make new code aarch64 specific + +The new code get's used by MIPS64 N64 and fails. +Make the new code aarch64 specific. + +Signed-off-by: Waldemar Brodkorb +--- + libc/sysdeps/linux/common/fstat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c +index ac77eb2..c27f926 100644 +--- a/libc/sysdeps/linux/common/fstat.c ++++ b/libc/sysdeps/linux/common/fstat.c +@@ -21,7 +21,7 @@ int fstat(int fd, struct stat *buf) + } + libc_hidden_def(fstat) + +-#elif __WORDSIZE == 64 && defined __NR_newfstatat ++#elif __WORDSIZE == 64 && defined __NR_newfstatat && __aarch64__ + #include + + int fstat(int fd, struct stat *buf) +-- +2.1.4 + diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 4d5f6295f6..0628af309b 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -128,12 +128,11 @@ config BR2_UCLIBC_MIPS_ABI default "N32" if BR2_MIPS_NABI32 default "N64" if BR2_MIPS_NABI64 -config BR2_UCLIBC_MIPS_ISA +config BR2_UCLIBC_MIPS_NAN string depends on BR2_UCLIBC_TARGET_ARCH = "mips" - default "MIPS32" if BR2_MIPS_CPU_MIPS32 - default "MIPS32R2" if BR2_MIPS_CPU_MIPS32R2 - default "MIPS64" if BR2_MIPS_CPU_MIPS64 + default "LEGACY" if BR2_MIPS_CPU_MIPS32 || BR2_MIPS_CPU_MIPS64 + default "2008" if BR2_MIPS_CPU_MIPS32R6 || BR2_MIPS_CPU_MIPS64R6 config BR2_UCLIBC_SH_TYPE string diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 9f9bffba98..8f6035ec2f 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -163,10 +163,10 @@ define UCLIBC_MIPS_ABI_CONFIG $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ABI),$(@D)/.config) endef -UCLIBC_MIPS_ISA = CONFIG_MIPS_ISA_$(call qstrip,$(BR2_UCLIBC_MIPS_ISA)) -define UCLIBC_MIPS_ISA_CONFIG - $(SED) '/CONFIG_MIPS_ISA_.*/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ISA),$(@D)/.config) +UCLIBC_MIPS_NAN = CONFIG_MIPS_NAN_$(call qstrip,$(BR2_UCLIBC_MIPS_NAN)) +define UCLIBC_MIPS_NAN_CONFIG + $(SED) '/CONFIG_MIPS_NAN_.*/d' $(@D)/.config + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_NAN),$(@D)/.config) endef endif # mips @@ -418,7 +418,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(UCLIBC_ARM_NO_CONTEXT_FUNCS) $(UCLIBC_M68K_BINFMT_FLAT) $(UCLIBC_MIPS_ABI_CONFIG) - $(UCLIBC_MIPS_ISA_CONFIG) + $(UCLIBC_MIPS_NAN_CONFIG) $(UCLIBC_SH_TYPE_CONFIG) $(UCLIBC_SPARC_TYPE_CONFIG) $(UCLIBC_POWERPC_TYPE_CONFIG) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 9c672d2d34..a46b65ece8 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -34,8 +34,6 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ BR2_or1k || BR2_powerpc || BR2_sh2a || BR2_sh4 || \ BR2_sh4eb || BR2_sparc || BR2_xtensa || BR2_x86_64 - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 help This option selects uClibc-ng as the C library for the cross-compilation toolchain. From 00995e0e49fafc355fbf56d9b7810c1696a41b2f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 3 Feb 2017 15:28:14 +0100 Subject: [PATCH 2501/3392] uclibc: allow to build aarch64 internal toolchain uClibc-ng from 1.0.22 and up supports aarch64 architecture. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- toolchain/toolchain-buildroot/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index a46b65ece8..91cddc2374 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -23,13 +23,13 @@ config BR2_TOOLCHAIN_BUILDROOT_VENDOR choice prompt "C library" default BR2_TOOLCHAIN_UCLIBC - default BR2_TOOLCHAIN_BUILDROOT_GLIBC if BR2_aarch64 || BR2_aarch64_be \ - || BR2_powerpc64 + default BR2_TOOLCHAIN_BUILDROOT_GLIBC if BR2_powerpc64 config BR2_TOOLCHAIN_BUILDROOT_UCLIBC bool "uClibc-ng" select BR2_TOOLCHAIN_USES_UCLIBC - depends on BR2_arcle || BR2_arceb || BR2_arm || BR2_armeb || \ + depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle || BR2_arceb || \ + BR2_arm || BR2_armeb || \ BR2_bfin || BR2_i386 || BR2_m68k || BR2_microblaze || \ BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ BR2_or1k || BR2_powerpc || BR2_sh2a || BR2_sh4 || \ From 058b7f6a6529f188522bdde696cdc0f1b2dd0a22 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Thu, 2 Feb 2017 17:36:16 +0100 Subject: [PATCH 2502/3392] package/libgpiod: bump version to v0.1.2 This is a small bug-fix release: - include instead of in gpioset - fix a formatting issue in gpioinfo for chips with >100 GPIO lines - fix a bug when requesting both-edges event notifications Signed-off-by: Bartosz Golaszewski Signed-off-by: Peter Korsgaard --- package/libgpiod/libgpiod.hash | 2 +- package/libgpiod/libgpiod.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgpiod/libgpiod.hash b/package/libgpiod/libgpiod.hash index 7ba0531a06..9901be6ace 100644 --- a/package/libgpiod/libgpiod.hash +++ b/package/libgpiod/libgpiod.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 07f75ae1e0c086d28d77ef60d0566180698ce11c3271d89da444c0fc6c2f4580 libgpiod-v0.1.1.tar.gz +sha256 c9a60e1073aacb25b4ad06d513f31416335b5a710f869cb7e838d2abb62e1e00 libgpiod-v0.1.2.tar.gz diff --git a/package/libgpiod/libgpiod.mk b/package/libgpiod/libgpiod.mk index e2e27f95da..dbf9511f44 100644 --- a/package/libgpiod/libgpiod.mk +++ b/package/libgpiod/libgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPIOD_VERSION = v0.1.1 +LIBGPIOD_VERSION = v0.1.2 LIBGPIOD_SITE = $(call github,brgl,libgpiod,$(LIBGPIOD_VERSION)) LIBGPIOD_LICENSE = GPLv3+ LIBGPIOD_LICENSE_FILES = COPYING From ee90313c648b7e0eb28ffad3a458f3e18bab23d7 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Fri, 3 Feb 2017 22:12:18 +0100 Subject: [PATCH 2503/3392] squashfs: bump to fix RHEL 5 compilation error Bump squashfs with one commit to fix a compilation error on the ancient RHEL 5 distribution. Signed-off-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- package/squashfs/squashfs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 1a5f1ea7bf..4f84872319 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUASHFS_VERSION = 9c1db6d13a51a2e009f0027ef336ce03624eac0d +SQUASHFS_VERSION = 3de1687d7432ea9b302c2db9521996f506c140a3 SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git SQUASHFS_SITE_METHOD = git SQUASHFS_LICENSE = GPLv2+ From 774e7b0bfdc875a168348f5b92728e566ead2eb3 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Fri, 3 Feb 2017 23:02:48 +0100 Subject: [PATCH 2504/3392] gengetopt: add patch to fix compilation warnings in generated code getgetopt generates code that causes compilation warnings in current versions of gcc. If gengetopt is used for programs that set -Werror during compilation, these compilation warnings become real problems. Unfortunately, the gengetopt project seems dead for several years now. Last release dates back to 2012. There is an open bug for this problem [1], with a proposed patch, but no response from the maintainers. Apply the patch from the bug report to fix the problem. [1] http://savannah.gnu.org/bugs/?40243 Signed-off-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- ...mpilation-warnings-in-generated-code.patch | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 package/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch diff --git a/package/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch b/package/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch new file mode 100644 index 0000000000..88961e6690 --- /dev/null +++ b/package/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch @@ -0,0 +1,65 @@ +Fix compilation warnings in generated code + +Patch taken from open bug report http://savannah.gnu.org/bugs/?40243 +(project gengetopt seems to be dead; no hope for a new release soon) + +Imported by Philippe Mariman. +This description by Thomas De Schampheleire. + +Signed-off-by: Thomas De Schampheleire + +Index: gengetopt-2.22.6/src/skels/c_source.cc +=================================================================== +--- gengetopt-2.22.6.orig/src/skels/c_source.cc 2012-11-07 20:58:29.000000000 +0100 ++++ gengetopt-2.22.6/src/skels/c_source.cc 2014-11-20 12:05:02.597527761 +0100 +@@ -2424,9 +2424,12 @@ + stream << " FIX_UNUSED (field);"; + stream << "\n"; + stream << indent_str; ++ stream << " FIX_UNUSED (stop_char);"; ++ stream << "\n"; ++ stream << indent_str; ++ stream << " FIX_UNUSED (val);"; + stream << "\n"; + stream << indent_str; +- stream << " stop_char = 0;"; + stream << "\n"; + stream << indent_str; + stream << " found = 0;"; +@@ -3981,6 +3984,12 @@ + stream << "\n"; + stream << indent_str; + } ++ else ++ { ++ stream << " FIX_UNUSED (check_required);"; ++ stream << "\n"; ++ stream << indent_str; ++ } + stream << "\n"; + stream << indent_str; + indent = 2; +Index: gengetopt-2.22.6/src/skels/c_source.h_skel +=================================================================== +--- gengetopt-2.22.6.orig/src/skels/c_source.h_skel 2012-11-02 18:43:24.000000000 +0100 ++++ gengetopt-2.22.6/src/skels/c_source.h_skel 2014-11-20 12:05:22.501528424 +0100 +@@ -767,8 +767,9 @@ + char **string_field; + @ENDIF@ + FIX_UNUSED (field); ++ FIX_UNUSED (stop_char); ++ FIX_UNUSED (val); + +- stop_char = 0; + found = 0; + + if (!multiple_option && prev_given && (*prev_given || (check_ambiguity && *field_given))) +@@ -1327,6 +1328,8 @@ + { + error_occurred += @parser_name@_required2 (args_info, argv[0], additional_error); + } ++@ELSE@ ++ FIX_UNUSED (check_required); + @ENDIF@ + + @parser_name@_release (&local_args_info); From 600c507f07200728afcabca87ce38fe760106267 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Wed, 1 Feb 2017 20:47:02 +0300 Subject: [PATCH 2505/3392] configs: Update Synopsys VDK for ARC HS38 This updates Linux kernel for Synopsys ARC HS38 VDK so it matches real platform and while at it bump kernel version to the latest. Main changes: * Linux kernel v4.9.6 (latest in 4.9.x series in buildroot) * Add support of MMC controller which is used for rootfs * Add support of UIO which is used to communicate with EVSS Now with this update image built by vanilla Buildroot VDK has working UART, MMC, LCD, Ethernet, UIO etc. And while at it we rename defconfing so it: 1) Doesn't mention SMP any more - that's the only option anyways now 2) Matches common naming scheme: vendor_arch_platform Signed-off-by: Alexey Brodkin Cc: Zakharov Vlad Cc: Peter Korsgaard Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .../0001-arc-vdk-Disable-halt-on-reset.patch | 32 +++++++++ ...rc-vdk-Add-support-of-MMC-controller.patch | 70 +++++++++++++++++++ .../0003-arc-vdk-Add-support-of-UIO.patch | 48 +++++++++++++ ...k_defconfig => snps_archs38_vdk_defconfig} | 9 +-- 4 files changed, 155 insertions(+), 4 deletions(-) create mode 100644 board/synopsys/vdk/patches/linux/0001-arc-vdk-Disable-halt-on-reset.patch create mode 100644 board/synopsys/vdk/patches/linux/0002-arc-vdk-Add-support-of-MMC-controller.patch create mode 100644 board/synopsys/vdk/patches/linux/0003-arc-vdk-Add-support-of-UIO.patch rename configs/{snps_hs38_smp_vdk_defconfig => snps_archs38_vdk_defconfig} (61%) diff --git a/board/synopsys/vdk/patches/linux/0001-arc-vdk-Disable-halt-on-reset.patch b/board/synopsys/vdk/patches/linux/0001-arc-vdk-Disable-halt-on-reset.patch new file mode 100644 index 0000000000..7ff7814942 --- /dev/null +++ b/board/synopsys/vdk/patches/linux/0001-arc-vdk-Disable-halt-on-reset.patch @@ -0,0 +1,32 @@ +From 1e248a880ee46921f85213da32b18f6becf07078 Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Tue, 31 Jan 2017 19:00:29 +0300 +Subject: [PATCH 1/3] arc: vdk: Disable halt on reset + +In recent VDKs ARC cores are configured as "run on reset" +which made existing kernel configuration outdated to effect that +slave cores never start execution of the code keeping only master +online. + +With that fix we're again in sync with VDK platform. + +Signed-off-by: Alexey Brodkin +--- + arch/arc/configs/vdk_hs38_smp_defconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig +index 969b206d6c67..00036e814dc1 100644 +--- a/arch/arc/configs/vdk_hs38_smp_defconfig ++++ b/arch/arc/configs/vdk_hs38_smp_defconfig +@@ -15,6 +15,7 @@ CONFIG_ARC_PLAT_AXS10X=y + CONFIG_AXS103=y + CONFIG_ISA_ARCV2=y + CONFIG_SMP=y ++# CONFIG_ARC_SMP_HALT_ON_RESET is not set + # CONFIG_ARC_HAS_GFRC is not set + CONFIG_ARC_UBOOT_SUPPORT=y + CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38_smp" +-- +2.7.4 + diff --git a/board/synopsys/vdk/patches/linux/0002-arc-vdk-Add-support-of-MMC-controller.patch b/board/synopsys/vdk/patches/linux/0002-arc-vdk-Add-support-of-MMC-controller.patch new file mode 100644 index 0000000000..bd5dedb1ff --- /dev/null +++ b/board/synopsys/vdk/patches/linux/0002-arc-vdk-Add-support-of-MMC-controller.patch @@ -0,0 +1,70 @@ +From c9d5ba0157fcfe48c0ec3448bdaecbabb8cefbca Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Tue, 31 Jan 2017 19:02:44 +0300 +Subject: [PATCH 2/3] arc: vdk: Add support of MMC controller + +ARC VDK virtual platform emulates host MMC controller (DW Mobile Storage) +and moreover rootfs is situated on that virtual card. + +Signed-off-by: Alexey Brodkin +--- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 18 ++++++++++++++++++ + arch/arc/configs/vdk_hs38_smp_defconfig | 5 ++++- + 2 files changed, 22 insertions(+), 1 deletion(-) + +diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi +index 99498a4b4216..1953914b9f4f 100644 +--- a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi ++++ b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi +@@ -23,6 +23,12 @@ + #clock-cells = <0>; + }; + ++ mmcclk: mmcclk { ++ compatible = "fixed-clock"; ++ clock-frequency = <50000000>; ++ #clock-cells = <0>; ++ }; ++ + pguclk: pguclk { + #clock-cells = <0>; + compatible = "fixed-clock"; +@@ -94,5 +100,17 @@ + interrupts = <5>; + interrupt-names = "arc_ps2_irq"; + }; ++ ++ mmc@0x15000 { ++ compatible = "snps,dw-mshc"; ++ reg = <0x15000 0x400>; ++ num-slots = <1>; ++ fifo-depth = <1024>; ++ card-detect-delay = <200>; ++ clocks = <&apbclk>, <&mmcclk>; ++ clock-names = "biu", "ciu"; ++ interrupts = <7>; ++ bus-width = <4>; ++ }; + }; + }; +diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig +index 00036e814dc1..85c697a7ef1c 100644 +--- a/arch/arc/configs/vdk_hs38_smp_defconfig ++++ b/arch/arc/configs/vdk_hs38_smp_defconfig +@@ -79,9 +79,12 @@ CONFIG_USB_OHCI_HCD=y + CONFIG_USB_OHCI_HCD_PLATFORM=y + CONFIG_USB_STORAGE=y + CONFIG_USB_SERIAL=y ++CONFIG_MMC=y ++CONFIG_MMC_SDHCI=y ++CONFIG_MMC_SDHCI_PLTFM=y ++CONFIG_MMC_DW=y + # CONFIG_IOMMU_SUPPORT is not set + CONFIG_EXT3_FS=y +-CONFIG_EXT4_FS=y + CONFIG_MSDOS_FS=y + CONFIG_VFAT_FS=y + CONFIG_NTFS_FS=y +-- +2.7.4 + diff --git a/board/synopsys/vdk/patches/linux/0003-arc-vdk-Add-support-of-UIO.patch b/board/synopsys/vdk/patches/linux/0003-arc-vdk-Add-support-of-UIO.patch new file mode 100644 index 0000000000..2b084a93cc --- /dev/null +++ b/board/synopsys/vdk/patches/linux/0003-arc-vdk-Add-support-of-UIO.patch @@ -0,0 +1,48 @@ +From caa0dca3f4913712d1883e9b3b540f0815864ed9 Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Tue, 31 Jan 2017 19:03:56 +0300 +Subject: [PATCH 3/3] arc: vdk: Add support of UIO + +ARC VDK for EVSS uses UIO for communication with Embedded Vision +Subsystem. + +Signed-off-by: Alexey Brodkin +--- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 8 ++++++++ + arch/arc/configs/vdk_hs38_smp_defconfig | 2 ++ + 2 files changed, 10 insertions(+) + +diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi +index 1953914b9f4f..f0df59b23e21 100644 +--- a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi ++++ b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi +@@ -112,5 +112,13 @@ + interrupts = <7>; + bus-width = <4>; + }; ++ ++ /* Embedded Vision subsystem UIO mappings; only relevant for EV VDK */ ++ uio_ev: uio@0xD0000000 { ++ compatible = "generic-uio"; ++ reg = <0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000>; ++ reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem"; ++ interrupts = <23>; ++ }; + }; + }; +diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig +index 85c697a7ef1c..ecd7f42d50c9 100644 +--- a/arch/arc/configs/vdk_hs38_smp_defconfig ++++ b/arch/arc/configs/vdk_hs38_smp_defconfig +@@ -83,6 +83,8 @@ CONFIG_MMC=y + CONFIG_MMC_SDHCI=y + CONFIG_MMC_SDHCI_PLTFM=y + CONFIG_MMC_DW=y ++CONFIG_UIO=y ++CONFIG_UIO_PDRV_GENIRQ=y + # CONFIG_IOMMU_SUPPORT is not set + CONFIG_EXT3_FS=y + CONFIG_MSDOS_FS=y +-- +2.7.4 + diff --git a/configs/snps_hs38_smp_vdk_defconfig b/configs/snps_archs38_vdk_defconfig similarity index 61% rename from configs/snps_hs38_smp_vdk_defconfig rename to configs/snps_archs38_vdk_defconfig index d4dcd1ba93..d13fcb2236 100644 --- a/configs/snps_hs38_smp_vdk_defconfig +++ b/configs/snps_archs38_vdk_defconfig @@ -3,17 +3,18 @@ BR2_arcle=y BR2_archs38=y # System -BR2_TARGET_GENERIC_HOSTNAME="hs38_vdk" +BR2_TARGET_GENERIC_HOSTNAME="archs38_vdk" BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform" BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay" BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y +# Linux headers same as kernel, a 4.9 series +BR2_KERNEL_HEADERS_4_9=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6" +BR2_LINUX_KERNEL_PATCH="board/synopsys/vdk/patches/linux" BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp" BR2_LINUX_KERNEL_VMLINUX=y From 738871e601e9e6d65b8827c9e3e8bf01ecd6a8d4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 4 Feb 2017 12:31:53 +0100 Subject: [PATCH 2506/3392] package/git: bump version to 2.11.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index ee7615797e..07ed47bd03 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b git-2.11.0.tar.xz +sha256 c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415 git-2.11.1.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 7d4d363639..29e430d3e6 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.11.0 +GIT_VERSION = 2.11.1 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2 LGPLv2.1+ From 215773d063a832ee0b7c259e2c8c1d9dc3f27701 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Feb 2017 15:29:49 -0500 Subject: [PATCH 2507/3392] acpid: bump to version 2.0.28 Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/acpid/acpid.hash | 4 ++-- package/acpid/acpid.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/acpid/acpid.hash b/package/acpid/acpid.hash index 91990fd108..9cf91d9333 100644 --- a/package/acpid/acpid.hash +++ b/package/acpid/acpid.hash @@ -1,3 +1,3 @@ # From https://sourceforge.net/projects/acpid2/files/ -md5 e41bdf628e122edb4342fca432ea7db9 acpid-2.0.27.tar.xz -sha1 aabf129499f99b3c14e7a9f5b5ec717b0913e9c8 acpid-2.0.27.tar.xz +md5 0432407b5ff75ae8e08afb43052fde2b acpid-2.0.28.tar.xz +sha1 a5cb34d53eb6965293c436db23dc81550273975b acpid-2.0.28.tar.xz diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index 510282bb48..f561b9083d 100644 --- a/package/acpid/acpid.mk +++ b/package/acpid/acpid.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACPID_VERSION = 2.0.27 +ACPID_VERSION = 2.0.28 ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz ACPID_SITE = http://downloads.sourceforge.net/project/acpid2 ACPID_LICENSE = GPLv2+ From 7858e7fd5cb8966198caaf25556961bac018099b Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Feb 2017 15:29:50 -0500 Subject: [PATCH 2508/3392] audit: bump to version 2.7.1 Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/audit/audit.hash | 2 +- package/audit/audit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/audit/audit.hash b/package/audit/audit.hash index 6b0f0c3cff..2ae8f99bb7 100644 --- a/package/audit/audit.hash +++ b/package/audit/audit.hash @@ -1,2 +1,2 @@ #Locally computed -sha256 05533f5d88d9520ceebfd8bfb3fd998ca4a2b246757fec7bbd8e33c287544537 audit-2.7.tar.gz +sha256 0441790794fd9375dbca598fa0ffb46c57ff37b3a24b94ffec0bbee3215cca09 audit-2.7.1.tar.gz diff --git a/package/audit/audit.mk b/package/audit/audit.mk index a5766624e3..298ef20b7b 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUDIT_VERSION = 2.7 +AUDIT_VERSION = 2.7.1 AUDIT_SITE = http://people.redhat.com/sgrubb/audit AUDIT_LICENSE = GPLv2+ (programs), unclear (libraries) AUDIT_LICENSE_FILES = COPYING From b30764ba2dc9a078967efe0dce88781c87445d1d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Feb 2017 15:29:52 -0500 Subject: [PATCH 2509/3392] jansson: bump to version 2.9 Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/jansson/jansson.hash | 2 +- package/jansson/jansson.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/jansson/jansson.hash b/package/jansson/jansson.hash index 013d9296f4..adb345d2f0 100644 --- a/package/jansson/jansson.hash +++ b/package/jansson/jansson.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 7905e6590fb316c0ff943df3dc6a21cd81a59cff7a6d12514054c359d04d78d7 jansson-2.7.tar.gz +sha256 0ad0d074ca049a36637e7abef755d40849ad73e926b93914ce294927b97bd2a5 jansson-2.9.tar.gz diff --git a/package/jansson/jansson.mk b/package/jansson/jansson.mk index 193fafbaa9..5e131188fa 100644 --- a/package/jansson/jansson.mk +++ b/package/jansson/jansson.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANSSON_VERSION = 2.7 +JANSSON_VERSION = 2.9 JANSSON_SITE = http://www.digip.org/jansson/releases JANSSON_LICENSE = MIT JANSSON_LICENSE_FILES = LICENSE From 4af22306f5b0106310a3f015bd47bef028522e96 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Feb 2017 15:29:53 -0500 Subject: [PATCH 2510/3392] libevent: bump to version 2.1.8 I also modified the Disable-building-test-programs.patch to work with the newer Makefile. [Peter: add s-o-b / note to patch] Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- .../0001-Disable-building-test-programs.patch | 13 +++++++------ package/libevent/libevent.hash | 6 +++--- package/libevent/libevent.mk | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/package/libevent/0001-Disable-building-test-programs.patch b/package/libevent/0001-Disable-building-test-programs.patch index eb1acfd676..a1ce774640 100644 --- a/package/libevent/0001-Disable-building-test-programs.patch +++ b/package/libevent/0001-Disable-building-test-programs.patch @@ -8,6 +8,8 @@ Moreover, these programs use fork() function that is not available on MMU-less architectures. Signed-off-by: Gilles Talis +[aduskett@gmail.com: Updated for 2.1.8] +Signed-off-by: Adam Duskett --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -16,12 +18,11 @@ diff --git a/Makefile.am b/Makefile.am index 42879a3..dc90359 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -126,7 +126,7 @@ else - noinst_LTLIBRARIES = $(LIBEVENT_LIBS_LA) - endif - --SUBDIRS = . include sample test -+SUBDIRS = . include sample +@@ -144,7 +144,6 @@ + BUILT_SOURCES = + include include/include.am + include sample/include.am +-include test/include.am if BUILD_WIN32 diff --git a/package/libevent/libevent.hash b/package/libevent/libevent.hash index 633cf5b8fa..21381c87b3 100644 --- a/package/libevent/libevent.hash +++ b/package/libevent/libevent.hash @@ -1,3 +1,3 @@ -# From http://sourceforge.net/projects/levent/files/libevent/libevent-2.0/ -md5 c4c56f986aa985677ca1db89630a2e11 libevent-2.0.22-stable.tar.gz -sha1 a586882bc93a208318c70fc7077ed8fca9862864 libevent-2.0.22-stable.tar.gz +# locally computed +md5 f3eeaed018542963b7d2416ef1135ecc libevent-2.1.8-stable.tar.gz +sha1 2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec libevent-2.1.8-stable.tar.gz diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 820beea9c5..0a5417f98b 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVENT_VERSION = 2.0.22-stable +LIBEVENT_VERSION = 2.1.8-stable LIBEVENT_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION) LIBEVENT_INSTALL_STAGING = YES LIBEVENT_LICENSE = BSD-3c, OpenBSD From c24187114fc4489117400f9e3dfbdebe0edd1799 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Feb 2017 15:29:54 -0500 Subject: [PATCH 2511/3392] libmicrohttpd: bump version to 0.9.52 Signed-off-by: Adam Duskett 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 b228716300..5c15b9dfde 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d1b6385068abded29b6470e383287aa7705de05ae3c08ad0bf5747ac4dc6ebd7 libmicrohttpd-0.9.50.tar.gz +sha256 54797f6e763d417627f89f60e4ae0a431dab0523f92f83def23ea02d0defafea libmicrohttpd-0.9.52.tar.gz diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 2266d3ceaa..83791b34f7 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.50 +LIBMICROHTTPD_VERSION = 0.9.52 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES From faacba16934064844807040cb2ff525f9b875247 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Feb 2017 15:29:55 -0500 Subject: [PATCH 2512/3392] libv4l: bump version to 1.12.2 Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/libv4l/libv4l.hash | 2 +- package/libv4l/libv4l.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libv4l/libv4l.hash b/package/libv4l/libv4l.hash index 2bf17eefa1..c02fa0aedc 100644 --- a/package/libv4l/libv4l.hash +++ b/package/libv4l/libv4l.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0 v4l-utils-1.10.1.tar.bz2 +sha256 ac9f8c88bfffa3a7e85c0edd04f7d3d54e6a30c214e79f2c6ecc6fbf57cb229d v4l-utils-1.12.2.tar.bz2 diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index d557414268..78f9ddcdcf 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBV4L_VERSION = 1.10.1 +LIBV4L_VERSION = 1.12.2 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils LIBV4L_INSTALL_STAGING = YES From 181a3e6fba661c6b6d5cb95c68913fca8c40ea9d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Feb 2017 15:29:56 -0500 Subject: [PATCH 2513/3392] nginx: bump version to 1.10.3 Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/nginx/nginx.hash | 2 +- package/nginx/nginx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 7db2adabfc..498d272dac 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 1045ac4987a396e2fa5d0011daf8987b612dd2f05181b67507da68cbe7d765c2 nginx-1.10.2.tar.gz +sha256 75020f1364cac459cb733c4e1caed2d00376e40ea05588fb8793076a4c69dd90 nginx-1.10.3.tar.gz diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index b7384a26e8..f9b2cd1d3c 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.10.2 +NGINX_VERSION = 1.10.3 NGINX_SITE = http://nginx.org/download NGINX_LICENSE = BSD-2c NGINX_LICENSE_FILES = LICENSE From 648fef3edf2b4cd243a463a41f324c1db99eb56b Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Feb 2017 15:29:57 -0500 Subject: [PATCH 2514/3392] nginx-naxsi: bump version to 0.55.1 Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/nginx-naxsi/nginx-naxsi.hash | 2 +- package/nginx-naxsi/nginx-naxsi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx-naxsi/nginx-naxsi.hash b/package/nginx-naxsi/nginx-naxsi.hash index 238993eb2c..e545a1dab3 100644 --- a/package/nginx-naxsi/nginx-naxsi.hash +++ b/package/nginx-naxsi/nginx-naxsi.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 nginx-naxsi-0.54.tar.gz +sha256 45dd0df7a6b0b6aa9c64eb8c39a8e294d659d87fb18e192cf58f1402f3cdb0a8 nginx-naxsi-0.55.1.tar.gz diff --git a/package/nginx-naxsi/nginx-naxsi.mk b/package/nginx-naxsi/nginx-naxsi.mk index 0e1f714421..1c5bd8d2b0 100644 --- a/package/nginx-naxsi/nginx-naxsi.mk +++ b/package/nginx-naxsi/nginx-naxsi.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_NAXSI_VERSION = 0.54 +NGINX_NAXSI_VERSION = 0.55.1 NGINX_NAXSI_SITE = $(call github,nbs-system,naxsi,$(NGINX_NAXSI_VERSION)) NGINX_NAXSI_LICENSE = GPLv2+ with OpenSSL exception NGINX_NAXSI_LICENSE_FILES = naxsi_src/naxsi_json.c From c225bd9762903b4c39524446c77f8bedcaa66bf5 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Feb 2017 15:29:58 -0500 Subject: [PATCH 2515/3392] openvmtools: bump version to 5a9033ddfa95786d867e4d02bbb9a29bac8fb64f Technically this is 10.1.0, however the initial release left out a config directory causing autoconfig to fail. See this post: https://github.com/vmware/open-vm-tools/issues/115#issuecomment-269963907 As such, I specified the hash to fix the release: https://github.com/vmware/open-vm-tools/commit/5a9033ddfa95786d867e4d02bbb9a29bac8fb64f Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/openvmtools/openvmtools.hash | 2 +- package/openvmtools/openvmtools.mk | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/package/openvmtools/openvmtools.hash b/package/openvmtools/openvmtools.hash index ae2837785a..bf344e506b 100644 --- a/package/openvmtools/openvmtools.hash +++ b/package/openvmtools/openvmtools.hash @@ -1,2 +1,2 @@ # locally computed -sha256 6b415f6093a15ffce10d3c4b69aa7ff106bdc0efd88e18a70a59d6941d4d2379 openvmtools-stable-9.10.2.tar.gz +sha256 ff384ab0c11e19db0fd6ddab60e8ae48a4591b141fb3a8e8f1d4e1a489dd293f openvmtools-5a9033ddfa95786d867e4d02bbb9a29bac8fb64f.tar.gz diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk index 40a7dac098..d3eda5c0b1 100644 --- a/package/openvmtools/openvmtools.mk +++ b/package/openvmtools/openvmtools.mk @@ -4,11 +4,12 @@ # ################################################################################ -OPENVMTOOLS_VERSION = stable-9.10.2 +OPENVMTOOLS_VERSION = 5a9033ddfa95786d867e4d02bbb9a29bac8fb64f OPENVMTOOLS_SITE = $(call github,vmware,open-vm-tools,$(OPENVMTOOLS_VERSION)) OPENVMTOOLS_SUBDIR = open-vm-tools OPENVMTOOLS_LICENSE = LGPLv2.1 OPENVMTOOLS_LICENSE_FILES = $(OPENVMTOOLS_SUBDIR)/COPYING + # Autoreconf needed or config/missing will run configure again at buildtime OPENVMTOOLS_AUTORECONF = YES OPENVMTOOLS_CONF_OPTS = --with-dnet \ @@ -45,13 +46,6 @@ else OPENVMTOOLS_CONF_OPTS += --without-pam endif -# configure needs execution permission -define OPENVMTOOLS_PRE_CONFIGURE_CHMOD - chmod 0755 $(@D)/$(OPENVMTOOLS_SUBDIR)/configure -endef - -OPENVMTOOLS_PRE_CONFIGURE_HOOKS += OPENVMTOOLS_PRE_CONFIGURE_CHMOD - # symlink needed by lib/system/systemLinux.c (or will cry in /var/log/messages) # defined in lib/misc/hostinfoPosix.c # /sbin/shutdown needed for Guest OS restart/shutdown from hypervisor From fbc5bdf8b95f15719efb4aa69fe2f9277d6fce57 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 3 Feb 2017 15:29:59 -0500 Subject: [PATCH 2516/3392] portaudio: bump to version 190600_20161030 Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/portaudio/portaudio.hash | 2 +- package/portaudio/portaudio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/portaudio/portaudio.hash b/package/portaudio/portaudio.hash index 2a1931634e..ca7baf7fbc 100644 --- a/package/portaudio/portaudio.hash +++ b/package/portaudio/portaudio.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8fe024a5f0681e112c6979808f684c3516061cc51d3acc0b726af98fc96c8d57 pa_stable_v19_20140130.tgz +sha256 f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 pa_stable_v190600_20161030.tgz diff --git a/package/portaudio/portaudio.mk b/package/portaudio/portaudio.mk index d1ef07a260..0cf754c7d5 100644 --- a/package/portaudio/portaudio.mk +++ b/package/portaudio/portaudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PORTAUDIO_VERSION = v19_20140130 +PORTAUDIO_VERSION = v190600_20161030 PORTAUDIO_SITE = http://www.portaudio.com/archives PORTAUDIO_SOURCE = pa_stable_$(PORTAUDIO_VERSION).tgz PORTAUDIO_INSTALL_STAGING = YES From 0064b2fb749e309a24e5983f08204b85468fcab4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 4 Feb 2017 17:43:27 +0100 Subject: [PATCH 2517/3392] package/unixodbc: add optional dependency to libtool To get reproducible builds of unixodbc add libtool as optional dependency. Without libtool: $ host/usr/bin/x86_64-linux-readelf -a target/usr/lib/libodbc.so.2.0.0 | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libc.so.0] With libtool: $ host/usr/bin/x86_64-linux-readelf -a target/usr/lib/libodbc.so.2.0.0 | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [libltdl.so.7] 0x0000000000000001 (NEEDED) Shared library: [libc.so.0] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/unixodbc/unixodbc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk index f66daab4a8..280fe57913 100644 --- a/package/unixodbc/unixodbc.mk +++ b/package/unixodbc/unixodbc.mk @@ -20,6 +20,13 @@ else UNIXODBC_CONF_OPTS += --disable-iconv endif +ifeq ($(BR2_PACKAGE_LIBTOOL),y) +UNIXODBC_CONF_OPTS += --without-included-ltdl +UNIXODBC_DEPENDENCIES += libtool +else +UNIXODBC_CONF_OPTS += --with-included-ltdl +endif + ifeq ($(BR2_PACKAGE_READLINE),y) UNIXODBC_CONF_OPTS += --enable-readline UNIXODBC_DEPENDENCIES += readline From bf1c9828f2c7ef37a0af4da5532472fb7e03ba67 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 4 Feb 2017 12:44:19 +0100 Subject: [PATCH 2518/3392] package/libcec: bump version to 4.0.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libcec/libcec.hash | 2 +- package/libcec/libcec.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcec/libcec.hash b/package/libcec/libcec.hash index 377f343a22..5416c20fec 100644 --- a/package/libcec/libcec.hash +++ b/package/libcec/libcec.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 0f29d5a2d155b507807ba896bc3b3e50a0ab56bf8f543a2bf5c2798c790292b5 libcec-2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd.tar.gz +sha256 b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27 libcec-4.0.2.tar.gz diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index 55c5fbb83d..1fe69ee982 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCEC_VERSION = 2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd -LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION)) +LIBCEC_VERSION = 4.0.2 +LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION)) LIBCEC_LICENSE = GPLv2+ LIBCEC_LICENSE_FILES = COPYING From 971a13472d9c52c1498f603bd1bc9f70f51ef925 Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Fri, 3 Feb 2017 10:26:41 +0300 Subject: [PATCH 2519/3392] toolchain-external: Update Synopsys prebuilt toolchain for ARC cores Sync external prebuilt toolchain with the one we now build in Buildroot, i.e. arc-2016.09. Since that prebuilt toolchain finally has IPv6 enabled it works pretty fine for building packages in Buildroot. Still note: 1) There might be subtle differences between uClibc configuration compared to Buildroot's one. 2) A couple of patches we apply on top of Builroot-built toolchain are obviously missing in the prebuilt version - they will be available in the next release. Signed-off-by: Alexey Brodkin Cc: Vlad Zakharov Cc: Peter Korsgaard Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- .../toolchain-external-synopsys-arc/Config.in | 12 +++++------- .../toolchain-external-synopsys-arc.hash | 8 ++++---- .../toolchain-external-synopsys-arc.mk | 6 +++--- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index 641eca8484..f438ea765d 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -1,20 +1,18 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC - bool "Synopsys ARC 2014.12 toolchain" + bool "Synopsys ARC 2016.09 toolchain" depends on BR2_arc depends on BR2_HOSTARCH = "x86_64" - # does not provide IPv6, and lacks many uClibc features - # expected by Buildroot. The next Synopsys toolchain version - # should fix those problems. - depends on BROKEN select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_ENABLE_LOCALE select BR2_USE_WCHAR select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + select BR2_TOOLCHAIN_HAS_SSP + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + select BR2_TOOLCHAIN_GCC_AT_LEAST_6 help Toolchain for the ARC cores, from https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash index b684cced9a..c96f53b1f6 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1fa4ea2c8616623205f1c7beca02ea31b019099528a7433e5b020b0876b93bf3 arc_gnu_2014.12_prebuilt_uclibc_le_arc700_linux_install.tar.gz -sha256 1080f07fcae2bfc176a3ea8d30b9ed8eaecab70fb786639d6ec70cae8322df10 arc_gnu_2014.12_prebuilt_uclibc_be_arc700_linux_install.tar.gz -sha256 aaaf6facd1f60a3cd2a537154ea39cd7d70501c175e30e01a97e8df6cb8226c7 arc_gnu_2014.12_prebuilt_uclibc_le_archs_linux_install.tar.gz -sha256 30711c5f15762764d4cd5ec1e6ced5b1fddd03aac41c424b0c4ec8a45d5d79cd arc_gnu_2014.12_prebuilt_uclibc_be_archs_linux_install.tar.gz +sha256 9123e35510cc9105e5f9468d5154e0093770d7c11ed771c1a595ecf813692baf arc_gnu_2016.09_prebuilt_uclibc_le_arc700_linux_install.tar.gz +sha256 3140066cdbda2df7ed0fb60424bbd9db740fb25393928e733234b0bf65508df2 arc_gnu_2016.09_prebuilt_uclibc_be_arc700_linux_install.tar.gz +sha256 aa6edb2101b13df3ac59f8d8ccbcfba37a6f7882f0e03baa9d9883480dbed4e7 arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install.tar.gz +sha256 4de227bf73536a87784d88e5f10085b91ede62c76ef8fedf53b4bf2e215054cf arc_gnu_2016.09_prebuilt_uclibc_be_archs_linux_install.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk index 14ea5e350c..f4cb7b73a1 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk @@ -4,8 +4,8 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2014.12 -TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SITE = https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION) +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2016.09 +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SITE = https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)-release ifeq ($(BR2_arc750d)$(BR2_arc770d),y) TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_CORE = arc700 @@ -19,6 +19,6 @@ else TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_ENDIANESS = be endif -TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SOURCE = arc_gnu_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)_prebuilt_uclibc_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ENDIANESS)_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_CORE)_linux_install.tar.gz +TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SOURCE = arc_gnu_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)_prebuilt_uclibc_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_ENDIANESS)_$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_CORE)_linux_install.tar.gz $(eval $(toolchain-external-package)) From f60f3e610a6100672d7323afaf590f9f63c3eccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 5 Feb 2017 15:08:35 +0100 Subject: [PATCH 2520/3392] package/libuv: bump to version 0.11.0 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/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 412479f0bc..9ad1c8a771 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4b5f71939dd4272ebcfb8e04833e9a273a08b1bf1277d37d14085d7b04b19832 libuv-v1.10.1.tar.gz +sha256 6ec7eec6ecc24b1a8ffedebedb2fe9313fffb5410de89aaf784dd01080411c7a libuv-v1.11.0.tar.gz diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 745c077269..6f6a1cc9fa 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.10.1 +LIBUV_VERSION = v1.11.0 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From ff28d37dfa1b961f438c007f81b6b8d28f1f2624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 5 Feb 2017 15:13:51 +0100 Subject: [PATCH 2521/3392] package/mpd: bump to version 0.20.4 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/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index e4709e691e..ee46f3cc5d 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 2238c1233f5318800ede7c37eeaf705c04920315de572dc666aff6ca682eb0f9 mpd-0.20.3.tar.xz +sha256 712b25351c12616630c580204e1c3dcba3ae2993a56cff1c346c87e334d69728 mpd-0.20.4.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 527de77512..0efc8685f5 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.20 -MPD_VERSION = $(MPD_VERSION_MAJOR).3 +MPD_VERSION = $(MPD_VERSION_MAJOR).4 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost From bd8b531d24431141a919daf6c50cca7de8547023 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Fri, 3 Feb 2017 21:57:42 +0100 Subject: [PATCH 2522/3392] graph-depends: avoid use of global var 'rule' in get_depends Function get_depends was recently changed to support both normal dependencies as reverse dependencies, via a global variable 'rule' that equals 'show-depends' or 'show-rdepends'. As a subsequent function will extract this function get_depends to a separate file, the use of globals is problematic. Instead, pass the global as an argument. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- support/scripts/graph-depends | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index c3c97cb389..095619a27a 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -161,7 +161,7 @@ def get_targets(): # Execute the "make -show-depends" command to get the list of # dependencies of a given list of packages, and return the list of # dependencies formatted as a Python dictionary. -def get_depends(pkgs): +def get_depends(pkgs, rule): sys.stderr.write("Getting dependencies for %s\n" % pkgs) cmd = ["make", "-s", "--no-print-directory" ] for pkg in pkgs: @@ -204,7 +204,7 @@ def get_all_depends(pkgs): if len(filtered_pkgs) == 0: return [] - depends = get_depends(filtered_pkgs) + depends = get_depends(filtered_pkgs, rule) deps = set() for pkg in filtered_pkgs: From 465d0ee71846a8512b9f003e09008aa4a6d8977a Mon Sep 17 00:00:00 2001 From: Dagg Stompler Date: Fri, 3 Feb 2017 14:11:17 +0200 Subject: [PATCH 2523/3392] libamcodec: bump version to 296f39bc6fc47ddf5d88b9fd3cfb82a5b39048ca - remove 0001-Include-stdint.h-where-needed.patch as it was merged into the tree. Signed-off-by: Dagg Stompler Signed-off-by: Thomas Petazzoni --- .../0001-Include-stdint.h-where-needed.patch | 47 ------------------- package/libamcodec/libamcodec.hash | 2 +- package/libamcodec/libamcodec.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/libamcodec/0001-Include-stdint.h-where-needed.patch diff --git a/package/libamcodec/0001-Include-stdint.h-where-needed.patch b/package/libamcodec/0001-Include-stdint.h-where-needed.patch deleted file mode 100644 index 6d588f6b15..0000000000 --- a/package/libamcodec/0001-Include-stdint.h-where-needed.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ff6d4326f839321c079d60ae9301c6202942f675 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 27 Aug 2016 14:31:04 +0200 -Subject: [PATCH] Include where needed - -The {u,}int{8,16,32}_t types are defined in , so it should be -included when such types are used. - -Not including might work by accident with some C libraries -due to it being included by other headers, but it for example causes -build failures with the musl C library. - -Signed-off-by: Thomas Petazzoni -Upstream-status: https://github.com/mdrjr/c2_aml_libs/pull/1 ---- - amadec/audio-dec.h | 1 + - amavutils/include/Amvideoutils.h | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/amadec/audio-dec.h b/amadec/audio-dec.h -index 4325fe4..ac0f36b 100644 ---- a/amadec/audio-dec.h -+++ b/amadec/audio-dec.h -@@ -12,6 +12,7 @@ - #define AUDIO_DEC_H - - #include -+#include - - #include - #include -diff --git a/amavutils/include/Amvideoutils.h b/amavutils/include/Amvideoutils.h -index 6f978e4..94f10a6 100644 ---- a/amavutils/include/Amvideoutils.h -+++ b/amavutils/include/Amvideoutils.h -@@ -5,6 +5,8 @@ - extern "C" { - #endif - -+#include -+ - #define HDMI_HDCP_PASS (1) - #define HDMI_HDCP_FAILED (0) - #define HDMI_NOCONNECT (-1) --- -2.7.4 - diff --git a/package/libamcodec/libamcodec.hash b/package/libamcodec/libamcodec.hash index 13bb1e85bb..a76d20a953 100644 --- a/package/libamcodec/libamcodec.hash +++ b/package/libamcodec/libamcodec.hash @@ -1,2 +1,2 @@ # Locally computed hash -sha256 5e4a1157e75f802585445df55182b5ef123f635b7faca95fbda3f7cdef8bad1c libamcodec-6f9b99182f94be14fce785c75aa1e9bce868e229.tar.gz +sha256 2c9812154b6dfd6a6c9c43aa334d0d03f299379fdf83c20121ad3f3d3f97c666 libamcodec-296f39bc6fc47ddf5d88b9fd3cfb82a5b39048ca.tar.gz diff --git a/package/libamcodec/libamcodec.mk b/package/libamcodec/libamcodec.mk index 8fab95dce7..3fab228fd4 100644 --- a/package/libamcodec/libamcodec.mk +++ b/package/libamcodec/libamcodec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAMCODEC_VERSION = 6f9b99182f94be14fce785c75aa1e9bce868e229 +LIBAMCODEC_VERSION = 296f39bc6fc47ddf5d88b9fd3cfb82a5b39048ca LIBAMCODEC_SITE = $(call github,mdrjr,c2_aml_libs,$(LIBAMCODEC_VERSION)) LIBAMCODEC_DEPENDENCIES = alsa-lib LIBAMCODEC_LICENSE = Unclear From bc0bd6fe92dd5f0c294c109e845274983d5a0ed9 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 5 Feb 2017 12:40:22 -0200 Subject: [PATCH 2524/3392] linux: bump default to version 4.9.8 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 3b8d61363d..ff2defccdf 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.9.7)" + bool "Latest version (4.9.8)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.9.7" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.9.8" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From c9ebd70fb12c27918fd3cda18e50c2f0b964a833 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 5 Feb 2017 12:40:23 -0200 Subject: [PATCH 2525/3392] linux-headers: bump 4.{4, 9}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 671be96508..20c96107b3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.46" if BR2_KERNEL_HEADERS_4_4 + default "4.4.47" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.7" if BR2_KERNEL_HEADERS_4_9 + default "4.9.8" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 7d987f16ed8e75af81d9223997989c02bd836096 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 5 Feb 2017 17:21:26 +0100 Subject: [PATCH 2526/3392] package/tmux: fix build The bump to the latest libevent version exposed a latent bug in tmux, which tries to re-define a variable exposed by the C library. This breaks with uClibc-ng which defines it const char*, while glibc and musl define it as non-const. Fixes: http://autobuild.buildroot.org/results/31d/31d37c95b40d297b90a6181ec79c42ee1e2e5090/ http://autobuild.buildroot.org/results/ccc/ccc9d2e995ba1eaf19f6b325b0af5ebeb8066e7f/ http://autobuild.buildroot.org/results/8a2/8a28d43bd0c079c1b49b61b0c6ef7de79eda0549/ Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...define-program_invocation_short_name.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch diff --git a/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch b/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch new file mode 100644 index 0000000000..bddc2c720d --- /dev/null +++ b/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch @@ -0,0 +1,42 @@ +From 9b18a98614a9f201b0883c2b15e7c7bde0aa0ff2 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 5 Feb 2017 17:12:00 +0100 +Subject: [PATCH] compat: don't re-define program_invocation_short_name + +program_invocation_short_name is defined in errno.h, and its definition +can differ between the various C libraries: glibc defines it as: + extern char *program_invocation_short_name; + +while uClibc defines it as: + extern const char *program_invocation_short_name; + +So there is not simple solution to know the prototype. + +But since it is defined in errno.h, there is no reason to try and define +it ourselves; let's just trust what the header provides. + +Signed-off-by: "Yann E. MORIN" +--- + compat/getprogname.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/compat/getprogname.c b/compat/getprogname.c +index 80a496d..ad619fc 100644 +--- a/compat/getprogname.c ++++ b/compat/getprogname.c +@@ -19,11 +19,10 @@ + #include "compat.h" + + #if defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME) ++#include + const char * + getprogname(void) + { +- extern char *program_invocation_short_name; +- + return (program_invocation_short_name); + } + #elif defined(HAVE___PROGNAME) +-- +2.7.4 + From ad2f351a1d981978df74823ebb78cc6a3323f2fa Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sun, 5 Feb 2017 17:59:30 +0100 Subject: [PATCH 2527/3392] docs/website: bump jquery and bootstrap This patch bumps jquery and bootstrap to the latest versions. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- docs/website/footer.html | 4 ++-- docs/website/header.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/website/footer.html b/docs/website/footer.html index 16fab36c95..1fcfd70071 100644 --- a/docs/website/footer.html +++ b/docs/website/footer.html @@ -1,5 +1,5 @@ - - + + diff --git a/docs/website/header.html b/docs/website/header.html index 3842f32721..ef6724f288 100644 --- a/docs/website/header.html +++ b/docs/website/header.html @@ -10,7 +10,7 @@ Buildroot - Making Embedded Linux Easy - + http://server/path/to/name.config + toolchains=( $( curl -s "${TOOLCHAINS_URL}" \ + |sed -r -e 's/,.*//; /internal/d;' + ) + ) + + if [ ${#toolchains[@]} -eq 0 ]; then + printf "error: no toolchain found (networking issue?)\n" >&2; exit 1 + fi + + for toolchain in "${toolchains[@]}"; do + build_one "${dir}" "${toolchain}" "${cfg}" "${pkg}" + done +} + +build_one() { + local dir="${1}" + local url="${2}" + local cfg="${3}" + local pkg="${4}" + local toolchain line + + # Using basename(1) on a URL works nicely + toolchain="$( basename "${url}" .config )" + + printf "%40s: " "${toolchain}" + + dir="${dir}/${toolchain}" + mkdir -p "${dir}" + + printf "download config" + if ! curl -s "${url}" >"${dir}/.config"; then + printf ": FAILED\n" + return + fi + + cat >>"${dir}/.config" <<-_EOF_ + BR2_INIT_NONE=y + BR2_SYSTEM_BIN_SH_NONE=y + # BR2_PACKAGE_BUSYBOX is not set + # BR2_TARGET_ROOTFS_TAR is not set + _EOF_ + cat "${cfg}" >>"${dir}/.config" + + printf ", olddefconfig" + if ! make O="${dir}" olddefconfig >/dev/null 2>&1; then + printf ": FAILED\n" + return + fi + # We want all the options from the snippet to be present as-is (set + # or not set) in the actual .config; if one of them is not, it means + # some dependency from the toolchain or arch is not available, in + # which case this config is untestable and we skip it. + while read line; do + if ! grep "^${line}\$" "${dir}/.config" >/dev/null 2>&1; then + printf ", SKIPPED\n" + return + fi + done <"${cfg}" + + if [ -n "${pkg}" ]; then + printf ", dirclean" + if ! make O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then + printf ": FAILED\n" + return + fi + fi + + printf ", build" + # shellcheck disable=SC2086 + if ! make O="${dir}" ${pkg} >> "${dir}/logfile" 2>&1; then + printf ": FAILED\n" + return + fi + + printf ": OK\n" +} + +help() { + cat <<_EOF_ +test-pkg: test-build a package against various toolchains and architectures + +The supplied config snippet is appended to each toolchain config, the +resulting configuration is checked to ensure it still contains all options +specified in the snippet; if any is missing, the build is skipped, on the +assumption that the package under test requires a toolchain or architecture +feature that is missing. + +In case failures are noticed, you can fix the package and just re-run the +same command again; it will re-run the test where it failed. If you did +specify a package (with -p), the package build dir will be removed first. + +The list of toolchains is retrieved from the Buildroot autobuilders, available +at ${TOOLCHAINS_URL}. + +Options: + + -h, --help + Print this help. + + -c CFG, --config-snippet CFG + Use the CFG file as the source for the config snippet. This file + should contain all the config options required to build a package. + + -d DIR, --build-dir DIR + Do the builds in directory DIR, one sub-dir per toolchain. + + -p PKG, --package PKG + Test-build the package PKG, by running 'make PKG'; if not specified, + just runs 'make'. + +Example: + + Testing libcec would require a config snippet that contains: + BR2_PACKAGE_LIBCEC=y + + Testing libcurl with openSSL support would require a snippet such as: + BR2_PACKAGE_OPENSSL=y + BR2_PACKAGE_LIBCURL=y + +_EOF_ +} + +my_name="${0##*/}" +main "${@}" From d5c58ceec2aad7415bfb8d4cee1d98779535b615 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 8 Feb 2017 21:15:25 +0100 Subject: [PATCH 2625/3392] support/test-pkg: store lines missing from resulting configuraiton When a build is skipped, store the lines from the config snippet, that are missing in the resulting configuration, in a file in the build directory, for the user to inspect. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Luca Ceresoli Cc: Thomas De Schampheleire Acked-by: Luca Ceresoli Tested-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- support/scripts/test-pkg | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg index 008b32ca2a..5eeaf63dbb 100755 --- a/support/scripts/test-pkg +++ b/support/scripts/test-pkg @@ -61,7 +61,7 @@ build_one() { local url="${2}" local cfg="${3}" local pkg="${4}" - local toolchain line + local toolchain line skip # Using basename(1) on a URL works nicely toolchain="$( basename "${url}" .config )" @@ -94,12 +94,19 @@ build_one() { # or not set) in the actual .config; if one of them is not, it means # some dependency from the toolchain or arch is not available, in # which case this config is untestable and we skip it. + skip=false while read line; do if ! grep "^${line}\$" "${dir}/.config" >/dev/null 2>&1; then - printf ", SKIPPED\n" - return + printf "%s\n" "${line}" + skip=true fi - done <"${cfg}" + done <"${cfg}" >"${dir}/missing.config" + if ${skip}; then + printf ", SKIPPED\n" + return + fi + # Remove file, it's empty anyway. + rm -f "${dir}/missing.config" if [ -n "${pkg}" ]; then printf ", dirclean" From 9e7885d5f76f8068fa566344ba17721d049c42de Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 8 Feb 2017 21:15:27 +0100 Subject: [PATCH 2626/3392] support/test-pkg: add option to limit the number of tests Sometimes, it interesting to have a global overview of whether the package builds at all or not, rather than test on all toolchains. Add an option that allows testing on a limited set of randomly choosen toolchains. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Luca Ceresoli Cc: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- support/scripts/test-pkg | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg index 5eeaf63dbb..b867da8bb8 100755 --- a/support/scripts/test-pkg +++ b/support/scripts/test-pkg @@ -5,14 +5,15 @@ TOOLCHAINS_URL='http://autobuild.buildroot.org/toolchains/configs/toolchain-conf main() { local o O opts - local cfg dir pkg toolchain + local cfg dir pkg random toolchain local -a toolchains - o='hc:d:p:' - O='help,config-snippet:build-dir:package:' + o='hc:d:p:r:' + O='help,config-snippet:build-dir:package:,random:' opts="$( getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}" )" eval set -- "${opts}" + random=0 while [ ${#} -gt 0 ]; do case "${1}" in (-h|--help) @@ -27,6 +28,9 @@ main() { (-p|--package) pkg="${2}"; shift 2 ;; + (-r|--random) + random="${2}"; shift 2 + ;; (--) shift; break ;; @@ -43,7 +47,12 @@ main() { # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config toolchains=( $( curl -s "${TOOLCHAINS_URL}" \ - |sed -r -e 's/,.*//; /internal/d;' + |sed -r -e 's/,.*//; /internal/d;' \ + |if [ ${random} -gt 0 ]; then \ + sort -R |head -n ${random} + else + cat + fi |sort ) ) @@ -159,6 +168,10 @@ Options: Test-build the package PKG, by running 'make PKG'; if not specified, just runs 'make'. + -r N, --random N + Limit the tests to the N randomly selected toolchains, instead of + building with all toolchains. + Example: Testing libcec would require a config snippet that contains: From d07ad7f399ad53d230787f2347e3dffb43641a07 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 9 Feb 2017 22:36:48 +0100 Subject: [PATCH 2627/3392] lxc: bump to version 2.0.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/lxc/lxc.hash | 3 +-- package/lxc/lxc.mk | 8 +------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 8fb4dc0cc3..f80c88d6e6 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,3 +1,2 @@ # Locally calculated -sha256 7c292cd0055dac1a0e6fbb6a7740fd12b6ffb204603c198faf37c11c9d6dcd7a lxc-2.0.6.tar.gz -sha256 e8ca30fb1e8d6dbafb5cccc04b3fd1784c35bc8ccf79112036e5166924b6b01d 64fa248372c90c9d98fc9d67f80327d865c11a48.patch +sha256 1c09c075f06ec029f86fa6370c7d379494ff4c66a129eda17af7b7b41e055f5d lxc-2.0.7.tar.gz diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index d803916a94..455814b9c9 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,18 +4,12 @@ # ################################################################################ -LXC_VERSION = 2.0.6 +LXC_VERSION = 2.0.7 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = LGPLv2.1+ LXC_LICENSE_FILES = COPYING LXC_DEPENDENCIES = libcap host-pkgconf LXC_INSTALL_STAGING = YES -# we're patching configure.ac -LXC_AUTORECONF = YES - -# This patch adds --enable-gnutls option -LXC_PATCH = \ - https://github.com/lxc/lxc/commit/64fa248372c90c9d98fc9d67f80327d865c11a48.patch LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ --disable-python --disable-werror \ From 29c00e40af7799153d78c62cb2536ba877ffc2d4 Mon Sep 17 00:00:00 2001 From: Lionel Flandrin Date: Mon, 30 Jan 2017 11:33:25 +0100 Subject: [PATCH 2628/3392] mkpimage: bump to latest barebox version Adds support for header v1 (used on Arria 10 SoCs) Signed-off-by: Lionel Flandrin Signed-off-by: Thomas Petazzoni --- package/mkpimage/mkpimage.c | 149 ++++++++++++++++++++++++++++------- package/mkpimage/mkpimage.mk | 6 +- 2 files changed, 122 insertions(+), 33 deletions(-) diff --git a/package/mkpimage/mkpimage.c b/package/mkpimage/mkpimage.c index 1a7a66d988..d7fe1b1b69 100644 --- a/package/mkpimage/mkpimage.c +++ b/package/mkpimage/mkpimage.c @@ -12,7 +12,12 @@ #define VALIDATION_WORD 0x31305341 -#define MAX_IMAGE_SIZE (60 * 1024 - 4) +#define BRANCH_INST 0xea /* ARM opcode for "b" (unconditional branch) */ + +#define MAX_V0IMAGE_SIZE (60 * 1024 - 4) +/* Max size without authentication is 224 KB, due to memory used by + * the ROM boot code as a workspace out of the 256 KB of OCRAM */ +#define MAX_V1IMAGE_SIZE (224 * 1024 - 4) static int add_barebox_header; @@ -20,9 +25,21 @@ struct socfpga_header { uint8_t validation_word[4]; uint8_t version; uint8_t flags; - uint8_t program_length[2]; - uint8_t spare[2]; - uint8_t checksum[2]; + union { + struct { + uint8_t program_length[2]; + uint8_t spare[2]; + uint8_t checksum[2]; + uint8_t start_vector[4]; + } v0; + struct { + uint8_t header_length[2]; + uint8_t program_length[4]; + uint8_t entry_offset[4]; + uint8_t spare[2]; + uint8_t checksum[2]; + } v1; + }; }; static uint32_t bb_header[] = { @@ -45,7 +62,7 @@ static uint32_t bb_header[] = { 0x00000000, /* socfpga header */ 0x00000000, /* socfpga header */ 0x00000000, /* socfpga header */ - 0xea00006b, /* entry. b 0x200 */ + 0xea00006b, /* entry. b 0x200 (offset may be adjusted) */ }; static int read_full(int fd, void *buf, size_t size) @@ -84,7 +101,7 @@ static int write_full(int fd, void *buf, size_t size) return insize; } -static uint32_t crc_table[256] = { +static const uint32_t crc_table[256] = { 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7, @@ -140,37 +157,94 @@ uint32_t crc32(uint32_t crc, void *_buf, int length) return crc; } -static int add_socfpga_header(void *buf, int size) +/* Create an ARM relative branch instuction + * branch is where the instruction will be placed and dest points to where + * it should branch too. */ +static void branch(uint8_t *branch, uint8_t *dest) +{ + int offset = dest - branch - 8; /* PC is offset +8 bytes on ARM */ + + branch[0] = (offset >> 2) & 0xff; /* instruction uses offset/4 */ + branch[1] = (offset >> 10) & 0xff; + branch[2] = (offset >> 18) & 0xff; + branch[3] = BRANCH_INST; +} + +/* start_addr is where the socfpga header's start instruction should branch to. + * It should be relative to the start of buf */ +static int add_socfpga_header(void *buf, size_t size, unsigned start_addr, unsigned version) { struct socfpga_header *header = buf + 0x40; - uint8_t *buf_header = buf + 0x40; + void *entry; + uint8_t *bufp, *sumendp; uint32_t *crc; unsigned checksum; - int length = size >> 2; - int i; if (size & 0x3) { fprintf(stderr, "%s: size must be multiple of 4\n", __func__); return -EINVAL; } + /* Absolute address of entry point in buf */ + entry = buf + start_addr; + if (version == 0) { + sumendp = &header->v0.checksum[0]; + } else { + sumendp = &header->v1.checksum[0]; + + /* The ROM loader can't handle a negative offset */ + if (entry < (void*)header) { + /* add a trampoline branch inst after end of the header */ + uint8_t *trampoline = (void*)(header + 1); + branch(trampoline, entry); + + /* and then make the trampoline the entry point */ + entry = trampoline; + } + /* Calculate start address as offset relative to start of header */ + start_addr = entry - (void*)header; + } + header->validation_word[0] = VALIDATION_WORD & 0xff; header->validation_word[1] = (VALIDATION_WORD >> 8) & 0xff; header->validation_word[2] = (VALIDATION_WORD >> 16) & 0xff; header->validation_word[3] = (VALIDATION_WORD >> 24) & 0xff; - header->version = 0; + header->version = version; header->flags = 0; - header->program_length[0] = length & 0xff; - header->program_length[1] = (length >> 8) & 0xff; - header->spare[0] = 0; - header->spare[1] = 0; - checksum = 0; - for (i = 0; i < sizeof(*header) - 2; i++) - checksum += buf_header[i]; + if (version == 0) { + header->v0.program_length[0] = (size >> 2) & 0xff; /* length in words */ + header->v0.program_length[1] = (size >> 10) & 0xff; + header->v0.spare[0] = 0; + header->v0.spare[1] = 0; + branch(header->v0.start_vector, entry); + } else { + header->v1.header_length[0] = (sizeof(*header) >> 0) & 0xff; + header->v1.header_length[1] = (sizeof(*header) >> 8) & 0xff; + header->v1.program_length[0] = (size >> 0) & 0xff; + header->v1.program_length[1] = (size >> 8) & 0xff; + header->v1.program_length[2] = (size >> 16) & 0xff; + header->v1.program_length[3] = (size >> 24) & 0xff; + header->v1.entry_offset[0] = (start_addr >> 0) & 0xff; + header->v1.entry_offset[1] = (start_addr >> 8) & 0xff; + header->v1.entry_offset[2] = (start_addr >> 16) & 0xff; + header->v1.entry_offset[3] = (start_addr >> 24) & 0xff; + header->v1.spare[0] = 0; + header->v1.spare[1] = 0; + } - header->checksum[0] = checksum & 0xff;; - header->checksum[1] = (checksum >> 8) & 0xff;; + /* Sum from beginning of header to start of checksum field */ + checksum = 0; + for (bufp = (uint8_t*)header; bufp < sumendp; bufp++) + checksum += *bufp; + + if (version == 0) { + header->v0.checksum[0] = checksum & 0xff;; + header->v0.checksum[1] = (checksum >> 8) & 0xff;; + } else { + header->v1.checksum[0] = checksum & 0xff;; + header->v1.checksum[1] = (checksum >> 8) & 0xff;; + } crc = buf + size - sizeof(uint32_t); @@ -182,7 +256,7 @@ static int add_socfpga_header(void *buf, int size) static void usage(const char *prgname) { - fprintf(stderr, "usage: %s [OPTIONS] \n", prgname); + fprintf(stderr, "usage: %s [-hb] [-v version] -o \n", prgname); } int main(int argc, char *argv[]) @@ -192,16 +266,23 @@ int main(int argc, char *argv[]) struct stat s; void *buf; int fd; - int min_image_size = 80; - int max_image_size = MAX_IMAGE_SIZE; + int max_image_size, min_image_size = 80; int addsize = 0, pad; + unsigned int version = 0; - while ((opt = getopt(argc, argv, "o:hb")) != -1) { + while ((opt = getopt(argc, argv, "o:hbv:")) != -1) { switch (opt) { + case 'v': + version = atoi(optarg); + if (version > 1) { + printf("Versions supported: 0 or 1\n"); + usage(argv[0]); + exit(1); + } + break; case 'b': add_barebox_header = 1; min_image_size = 0; - max_image_size = MAX_IMAGE_SIZE - 512; addsize = 512; break; case 'h': @@ -211,15 +292,21 @@ int main(int argc, char *argv[]) outfile = optarg; break; default: + usage(argv[0]); exit(1); } } + if (version == 0) { + max_image_size = MAX_V0IMAGE_SIZE; + } else { + max_image_size = MAX_V1IMAGE_SIZE; + } + max_image_size -= addsize; - if (optind == argc) { + if (optind == argc || !outfile) { usage(argv[0]); exit(1); } - infile = argv[optind]; ret = stat(infile, &s); @@ -229,7 +316,8 @@ int main(int argc, char *argv[]) } if (s.st_size < min_image_size) { - fprintf(stderr, "input image too small. Minimum is 80 bytes\n"); + fprintf(stderr, "input image too small. Minimum is %d bytes\n", + min_image_size); exit(1); } @@ -240,7 +328,7 @@ int main(int argc, char *argv[]) } fd = open(infile, O_RDONLY); - if (fd < 0) { + if (fd == -1) { perror("open infile"); exit(1); } @@ -267,7 +355,8 @@ int main(int argc, char *argv[]) memcpy(buf, bb_header, sizeof(bb_header)); } - ret = add_socfpga_header(buf, s.st_size + 4 + addsize + pad); + ret = add_socfpga_header(buf, s.st_size + 4 + addsize + pad, addsize, + version); if (ret) exit(1); diff --git a/package/mkpimage/mkpimage.mk b/package/mkpimage/mkpimage.mk index c30a6809ce..04b2ef080b 100644 --- a/package/mkpimage/mkpimage.mk +++ b/package/mkpimage/mkpimage.mk @@ -4,11 +4,11 @@ # ################################################################################ -# source included in the package -# came from barebox's repository: -# http://git.pengutronix.de/?p=barebox.git;a=blob;f=scripts/socfpga_mkimage.c;h=1a7a66d98841e9f52c3ea49c651286aa1412c9a5;hb=HEAD HOST_MKPIMAGE_LICENSE = GPLv2 +# source included in the package +# came from barebox's repository: +# https://git.pengutronix.de/cgit/barebox/tree/scripts/socfpga_mkimage.c?id=55d29525146dcd280987dfd565bfd34f08858fb3 define HOST_MKPIMAGE_BUILD_CMDS $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ package/mkpimage/mkpimage.c -o $(@D)/mkpimage From 0172c72b257f0298bb56cd0e5d9d3baab16ba779 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 10 Feb 2017 21:21:12 +0100 Subject: [PATCH 2629/3392] ddrescue: needs c++ compiler Fixes [1]. [1] http://autobuild.buildroot.net/results/0af569ad06efa36e8e1ae45acd1facfd98b86f20 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/ddrescue/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ddrescue/Config.in b/package/ddrescue/Config.in index 7ec87ced7b..2ec3e7e303 100644 --- a/package/ddrescue/Config.in +++ b/package/ddrescue/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_DDRESCUE bool "ddrescue" + depends on BR2_INSTALL_LIBSTDCPP help GNU ddrescue is a data recovery tool. It copies data from one file or block device (hard disc, cdrom, etc) to another, trying to rescue the good parts first in case of read errors. http://www.gnu.org/software/ddrescue/ddrescue.html + +comment "ddrescue needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP From 59c86d0e1775b18452064378bb8e9b3208e58ea6 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Fri, 10 Feb 2017 19:31:40 +0530 Subject: [PATCH 2630/3392] util-linux: enable AUTORECONF Commit 55a9737895cb ("util-linux: link scriptreplay with libm (for isnan)") added two patches that touch configure.ac and Makemodule.am. But forgot to enable AUTORECONF. When AUTORECONF is disabled and configure.ac is patched, it looks like make will detect change in timestamps and trigger reconfig. But it later fails because of missing dependencies. To fix this, explicitly enable AUTORECONF. Fixes: http://autobuild.buildroot.net/results/544/544e8da290d40424ea3d1bffad7e0b8a566de495 Fixes: 55a9737895cb ("util-linux: link scriptreplay with libm (for isnan)") Signed-off-by: Rahul Bedarkar Cc: Carlos Santos Acked-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 84c4f0ec09..441c2527b9 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,6 +8,9 @@ UTIL_LINUX_VERSION_MAJOR = 2.29 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) +# For 0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch and +# 0002-build-sys-improve-detection-of-the-isnan-function-in.patch +UTIL_LINUX_AUTORECONF = YES # README.licensing claims that some files are GPLv2-only, but this is not true. # Some files are GPLv3+ but only in tests. From 7d50d52c37a4d766849a363a58e25fe2a05b7bc3 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Fri, 10 Feb 2017 12:24:40 +0530 Subject: [PATCH 2631/3392] wget: add upstream patch to fix build failure Fixes: http://autobuild.buildroot.net/results/c86/c8657563e63e1012a3ae3c0c47663a951e280022 Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni --- ...ipping-libunistring-with-disable-iri.patch | 35 +++++++++++++++++++ package/wget/wget.mk | 3 ++ 2 files changed, 38 insertions(+) create mode 100644 package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch diff --git a/package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch b/package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch new file mode 100644 index 0000000000..a1461df930 --- /dev/null +++ b/package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch @@ -0,0 +1,35 @@ +From 990f3d67d340d226bbd4187f5d310a4d2bf2bfe4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= +Date: Mon, 6 Feb 2017 11:25:48 +0100 +Subject: [PATCH] Remove skipping libunistring with --disable-iri + +* configure.ac: Remove checking for IRI=no + +On certain systems, gnulib falls back to libunistring +for mbtowc() and wcwidth() (used in src/progress.c). + +Reported-by: Zhiming Wang +Signed-off-by: Rahul Bedarkar +--- + configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8786e00..686f040 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -663,11 +663,6 @@ if test "X$iri" != "Xno"; then + # ]) + ]) + fi +-if test "X$iri" = "Xno"; then +- # we don't need libunistring - clear settings from gnulib module +- LIBUNISTRING="" +- LTLIBUNISTRING="" +-fi + + dnl + dnl Check for UUID +-- +2.6.2 + diff --git a/package/wget/wget.mk b/package/wget/wget.mk index e0f680bb7e..8698cdf3a7 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -11,6 +11,9 @@ WGET_DEPENDENCIES = host-pkgconf WGET_LICENSE = GPLv3+ WGET_LICENSE_FILES = COPYING +# For 0002-Remove-skipping-libunistring-with-disable-iri.patch +WGET_AUTORECONF = YES + # Prefer full-blown wget over busybox ifeq ($(BR2_PACKAGE_BUSYBOX),y) WGET_DEPENDENCIES += busybox From 995d1532b9c2ebe88d76168f96d6e8ae94417d95 Mon Sep 17 00:00:00 2001 From: Ray Kinsella Date: Fri, 10 Feb 2017 10:36:59 +0000 Subject: [PATCH 2632/3392] motion: disable autotools host optimization The motion autotools script helpfully detects the host Microprocessors intr set and optimizes for it. Disabling this feature causes autotools to use the target parameters passed by BR instead. Signed-off-by: Ray Kinsella Signed-off-by: Thomas Petazzoni --- package/motion/motion.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/motion/motion.mk b/package/motion/motion.mk index d27def2fd8..d76b547017 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -14,7 +14,7 @@ MOTION_AUTORECONF = YES # motion does not use any specific function of jpeg-turbo, so just relies on # jpeg selection -MOTION_CONF_OPTS += --without-jpeg-turbo +MOTION_CONF_OPTS += --without-jpeg-turbo --without-optimizecpu ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y) MOTION_DEPENDENCIES += ffmpeg From 49a33d3a229571e22ab783cbb1e5cace06ad7b99 Mon Sep 17 00:00:00 2001 From: Naumann Andreas Date: Sat, 11 Feb 2017 12:05:29 +0100 Subject: [PATCH 2633/3392] qt5: Rename version variable to include _PACKAGE_ Signed-off-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- package/libv4l/libv4l.mk | 2 +- package/qt5/Config.in | 4 ++-- package/qt5/qt5.mk | 2 +- package/qt5/qt5base/qt5base.mk | 10 +++++----- package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- package/qt5/qt5location/qt5location.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- package/qt5/qt5sensors/qt5sensors.mk | 2 +- package/qt5/qt5serialport/qt5serialport.mk | 2 +- package/qt5/qt5svg/qt5svg.mk | 2 +- package/qt5/qt5tools/qt5tools.mk | 2 +- package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- package/qt5/qt5websockets/qt5websockets.mk | 2 +- package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 90ff045ce2..4fec14f384 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -67,7 +67,7 @@ LIBV4L_CONF_ENV += \ ac_cv_prog_RCC=$(HOST_DIR)/usr/bin/rcc \ ac_cv_prog_UIC=$(HOST_DIR)/usr/bin/uic # qt5 needs c++11 (since qt-5.7) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" endif else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index df6ce4deb2..b3cb2adfe0 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -34,7 +34,7 @@ if BR2_PACKAGE_QT5 choice prompt "Qt5 version" -config BR2_QT5_VERSION_LATEST +config BR2_PACKAGE_QT5_VERSION_LATEST bool "Latest (5.8)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 @@ -45,7 +45,7 @@ config BR2_QT5_VERSION_LATEST comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8" depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8 -config BR2_QT5_VERSION_5_6 +config BR2_PACKAGE_QT5_VERSION_5_6 bool "LTS (5.6)" help This option builds Qt 5.6, which is licensed under diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 9e20902658..9e77ce351c 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -1,4 +1,4 @@ -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5_VERSION_MAJOR = 5.8 QT5_VERSION = $(QT5_VERSION_MAJOR).0 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 2cf0331b04..09bf5cf7bd 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -43,13 +43,13 @@ else QT5BASE_CONFIGURE_OPTS += -release endif -ifeq ($(BR2_QT5_VERSION_5_6),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) QT5BASE_CONFIGURE_OPTS += -largefile endif ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5BASE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else @@ -166,7 +166,7 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples -ifeq ($(BR2_QT5_VERSION_5_6),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) # gstreamer 0.10 support is broken in qt5multimedia ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 @@ -192,7 +192,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration else QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration @@ -262,7 +262,7 @@ define QT5BASE_INSTALL_TARGET_PLUGINS fi endef -ifeq ($(BR2_QT5_VERSION_5_6),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) define QT5BASE_INSTALL_TARGET_FONTS if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \ mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \ diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index e8136c412b..f00dcb22f8 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -11,7 +11,7 @@ QT5CONNECTIVITY_DEPENDENCIES = qt5base QT5CONNECTIVITY_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5CONNECTIVITY_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 5512baa2e5..fb546bd73b 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -11,7 +11,7 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns QT5DECLARATIVE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5DECLARATIVE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index 88abb0caf5..aef69eb419 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -11,7 +11,7 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5GRAPHICALEFFECTS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 0aa397111f..d7649255f1 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -11,7 +11,7 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5IMAGEFORMATS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index 460a4a4e55..dbdc64573d 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -11,7 +11,7 @@ QT5LOCATION_DEPENDENCIES = qt5base QT5LOCATION_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5LOCATION_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index d2e0ff45c9..fccdd5d64b 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -11,7 +11,7 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base QT5MULTIMEDIA_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5MULTIMEDIA_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index d412f69a93..f6aca2cd46 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -36,7 +36,7 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES endef endif -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index 98c20caf24..fb9ef32e64 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -11,7 +11,7 @@ QT5SENSORS_DEPENDENCIES = qt5base QT5SENSORS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5SENSORS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 7ae71683dd..4fbca9ea1b 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -11,7 +11,7 @@ QT5SERIALPORT_DEPENDENCIES = qt5base QT5SERIALPORT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5SERIALPORT_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index c21c3e820d..08821e486e 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -11,7 +11,7 @@ QT5SVG_DEPENDENCIES = qt5base QT5SVG_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5SVG_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index e74911c7c0..0395f96bab 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -20,7 +20,7 @@ QT5TOOLS_DEPENDENCIES += qt5declarative endif ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5TOOLS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index f5ccb203b5..9522a745ac 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -11,7 +11,7 @@ QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBCHANNEL_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index 1794036612..975ea64388 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -11,7 +11,7 @@ QT5WEBSOCKETS_DEPENDENCIES = qt5base QT5WEBSOCKETS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5WEBSOCKETS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools) QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 else diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 0ac0108940..996056b719 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -11,7 +11,7 @@ QT5X11EXTRAS_DEPENDENCIES = qt5base QT5X11EXTRAS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5X11EXTRAS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 661c62de05..e5981af532 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -11,7 +11,7 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base QT5XMLPATTERNS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_QT5_VERSION_LATEST),y) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5XMLPATTERNS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL else From 056b5572fc20b4d3a98dbe12e4ec77f2fa360090 Mon Sep 17 00:00:00 2001 From: Jens Kleintje Date: Sat, 11 Feb 2017 12:05:30 +0100 Subject: [PATCH 2634/3392] poppler: Add option for Qt5 support Add an option to build the libpoppler-qt5 library. Signed-off-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- package/poppler/Config.in | 9 +++++++++ package/poppler/poppler.mk | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/package/poppler/Config.in b/package/poppler/Config.in index 2ca3ff62b5..d741f65287 100644 --- a/package/poppler/Config.in +++ b/package/poppler/Config.in @@ -24,6 +24,15 @@ config BR2_PACKAGE_POPPLER_QT comment "poppler Qt support needs a toolchain not affected by Binutils bug 19405" depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 +config BR2_PACKAGE_POPPLER_QT5 + bool "Qt5 support" + depends on BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5BASE_XML + help + Build Qt support into the Poppler library + endif comment "poppler needs a toolchain w/ C++, threads" diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 3e8a9f4c36..022c2c5e99 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -87,6 +87,13 @@ else POPPLER_CONF_OPTS += --disable-poppler-qt4 endif +ifeq ($(BR2_PACKAGE_POPPLER_QT5),y) +POPPLER_DEPENDENCIES += qt5base +POPPLER_CONF_OPTS += --enable-poppler-qt5 +else +POPPLER_CONF_OPTS += --disable-poppler-qt5 +endif + ifeq ($(BR2_PACKAGE_OPENJPEG),y) POPPLER_DEPENDENCIES += openjpeg POPPLER_CONF_OPTS += --enable-libopenjpeg From 30403351d1a3a4c65e415981808301053628b01e Mon Sep 17 00:00:00 2001 From: Naumann Andreas Date: Sat, 11 Feb 2017 12:05:31 +0100 Subject: [PATCH 2635/3392] poppler: qt5 support needs c++11 (since Qt5.7) Signed-off-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- package/poppler/poppler.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 022c2c5e99..fda8284507 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -90,6 +90,10 @@ endif ifeq ($(BR2_PACKAGE_POPPLER_QT5),y) POPPLER_DEPENDENCIES += qt5base POPPLER_CONF_OPTS += --enable-poppler-qt5 +# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement) +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +POPPLER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +endif else POPPLER_CONF_OPTS += --disable-poppler-qt5 endif From 4f17e8cfcce1f8625f11a38a1739bf0fe35eeeae Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 11 Feb 2017 15:41:10 +0100 Subject: [PATCH 2636/3392] CHANGES: prepare for 2017.02-rc1 Signed-off-by: Thomas Petazzoni --- CHANGES | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/CHANGES b/CHANGES index ec749a148c..db7a541b95 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,85 @@ +2017.02-rc1, Released February 11th, 2017 + + Fixes all over the tree and new features. + + Infrastructure: + + - numerous improvements to support reproducible builds + + - new waf-package package infrastructure to support packages + that use the Waf build system. 6 packages converted to + this infrastructure. + + - add support for the OpenRISC CPU architecture + + - merge description of the ARM and ARM64 options, and add + support for selecting a specific ARM64 core + + Toolchain: + + - major rework of the external toolchain support. It is now + split into several packages, one per external toolchain, + and a common infrastructure. + + - important fix for musl to prevent a conflict between musl + and kernel headers (fixes the build of numerous packages + with musl) + + - uClibc-ng bumped to 1.0.22, and therefore enable uClibc + for ARM64, mips32r6 and mips64r6 + + - add gdb 7.12.1, and switch to gdb 7.11 as the default + + - Linaro toolchains updated to 2016.11, ARC toolchain + components updated to arc-2016.09, MIPS Codescape + toolchains bumped to 2016.05-06, CodeSourcery AMD64 bumped + to 2016.11-19 + + - remove Analog Devices toolchain for the Blackfin + architecture + + New defconfigs: Freescale i.MX23EVK, Qemu OpenRISC emulation, + Grinn chiliBoard, Freescale i.MX6Q SabreSD, BeagleBoard X15, + OrangePi One, ARC HS38 HAPS + + New packages: angular-websocket, aubio, bctoolbox, darkhttpd, + ddrescue, easydbus, fakedate, git-crypt, hiredis, ifenslave, + jsmn, libgpiod, libgsm, linux-syscall-support, mariadb, mimic, + nginx-dav-ext, nmon, opkg-utils, policycoreutils, + pru-software-support, python-arrow, python-attrs, + python-babel, python-bitstring, python-chardet, + python-constantly, python-flask-babel, python-gunicorn, + python-incremental, python-jsonschema, python-logbook, + python-markdown2, python-mbstrdecoder, python-mutagen, + python-pathpy, python-pudb, python-pyqrcode, + python-pytablereader, python-setuptools-scm, python-sh, + python-toml, python-vcversioner, python-whoosh, + raspberrypi-usbboot, riemann-c-client, rtl8723bs, skalibs, + sslh, sngrep, ti-cgt-pru, uclibc-ng-test, udpxy, uhttpd, + upower, ustream-ssl, waf, xlib_libXfont2 + + Removed packages: perl-db-file, snowball-hdmiservice, + snowball-init + + Tooling: addition of a test-pkg script to help contributors + build test their package. + + Issues resolved (http://bugs.buildroot.org): + + #8946: Valgrind fails to build with stack protection turned on + #9461: odroidc2 - toolchain Linaro AArch64 2016.11 compile error + #9466: VIM_REMOVE_DOCS removes rgb.txt + #9486: xorg-server 1.19 fails to compile for glibc with systemd init (x86_64) + #9501: eudev fails to build with older kernel headers + #9526: Embedded NPM fails to start with "no such file or directory" error + #9541: Platform drivers autoloading from info in device tree does not work + #9546: seems BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS do nothing + #9551: Coreutils fails to build target src/src_libsinglebin_pinky_a-pinky.o + #9566: [kmod] Compilation fails with uclibc + #9571: buildroot fails while building opencv for arm64 platform + #9576: External tree with BR 2016.11 does not work anymore + #9606: xorg-server cannot build for ARM target + 2016.11.2, Released January 25th, 2017 Important / security related fixes. From 7320758cad162cfe153cbe1ac00ef3e0e2c70dbe Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 11 Feb 2017 15:47:27 +0100 Subject: [PATCH 2637/3392] Prepare for 2017.02-rc1 Signed-off-by: Thomas Petazzoni --- Makefile | 4 ++-- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 24 ++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index df3b64eb03..dcda8fe024 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02-git +export BR2_VERSION := 2017.02-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1478206447 +BR2_VERSION_EPOCH = 1486825200 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 37adfad593..8d8aae32f2 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -41,41 +41,41 @@

        buildroot-2016.11.2.tar.bz2

        PGP signature

        - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/. diff --git a/docs/website/news.html b/docs/website/news.html index 71391449b8..7be1ddfc3c 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,30 @@

        News

          +
        • +
          +
          +
          +

          2017.02-rc1 released

          +

          11 February 2017

          +
          +
          +

          We have a new release candidate! Lots of + changes all over the tree, see + the CHANGES + file for details. +

          + +

          Head to the downloads page to pick up the + 2017.12-rc1 + release candidate, and report any + problems found to the + mailing list or + bug tracker.

          +
          +
          +
          • +
        • From 133811eeefd35126050ef735d5f8eb76e13d3861 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 11 Feb 2017 15:47:42 +0100 Subject: [PATCH 2638/3392] CHANGES: final updates before 2017.02-rc1 Signed-off-by: Thomas Petazzoni --- CHANGES | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index db7a541b95..b13f6dbc69 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,11 @@ that use the Waf build system. 6 packages converted to this infrastructure. + - add option _PREFER_INSTALLER to the perl package + infrastructure + + Architecture: + - add support for the OpenRISC CPU architecture - merge description of the ARM and ARM64 options, and add @@ -32,15 +37,16 @@ - Linaro toolchains updated to 2016.11, ARC toolchain components updated to arc-2016.09, MIPS Codescape - toolchains bumped to 2016.05-06, CodeSourcery AMD64 bumped - to 2016.11-19 + toolchains bumped to 2016.05-06, CodeSourcery AMD64 and + NIOS2 toolchains bumped - remove Analog Devices toolchain for the Blackfin - architecture + architecture, remove pre-built musl toolchains from + musl.codu.org New defconfigs: Freescale i.MX23EVK, Qemu OpenRISC emulation, - Grinn chiliBoard, Freescale i.MX6Q SabreSD, BeagleBoard X15, - OrangePi One, ARC HS38 HAPS + Qemu NIOS2 emulation, Grinn chiliBoard, Freescale i.MX6Q + SabreSD, BeagleBoard X15, OrangePi One, ARC HS38 HAPS New packages: angular-websocket, aubio, bctoolbox, darkhttpd, ddrescue, easydbus, fakedate, git-crypt, hiredis, ifenslave, From c75f55870520348e09b5536f2f63918849d94aaf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 11 Feb 2017 16:31:46 +0100 Subject: [PATCH 2639/3392] docs/website: update release announcement with mailing list link Signed-off-by: Thomas Petazzoni --- docs/website/news.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/website/news.html b/docs/website/news.html index 7be1ddfc3c..6e81c6ea30 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -17,10 +17,11 @@

          2017.02-rc1 released

          11 February 2017

          -

          We have a new release candidate! Lots of - changes all over the tree, see +

          We have a new release candidate! Lots of changes all over + the tree, see the CHANGES - file for details. + file for details, read + the announcement.

          Head to the downloads page to pick up the From 80522943010ab2f0b4233fe3cbe6799505081990 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 10 Feb 2017 21:28:43 +0100 Subject: [PATCH 2640/3392] DEVELOPERS: update my entry list Interested in all qt5 stuff. Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 94f6804548..7f65909ff5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1195,9 +1195,7 @@ F: package/gstreamer1/gst1-validate/ F: package/libevdev/ F: package/log4cplus/ F: package/postgresql/ -F: package/qt5/qt53d/ -F: package/qt5/qt5quickcontrols2/ -F: package/qt5/qt5tools/ +F: package/qt5/ F: package/racehound/ F: package/wiringpi/ From baba42687af3d845739d74a7c1fa3faf9c0f7cd0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 11 Feb 2017 23:51:19 +0100 Subject: [PATCH 2641/3392] package/gdb: backport upstream fix for simulator build issue with bfin This revert the commit [1] which break the simulator for aarch64. Backport the upstream fix instead (from 7.12). [1] f71ad71f24fbeca1a81cc9efe79016a7db6f1320 Tested with gcc 4.4.5 (debian squeeze chroot). Fixes: http://autobuild.buildroot.net/results/cfd/cfdc9117fef7ecdf5cc5fc907a6fe8701a2c174a Signed-off-by: Romain Naour Cc: Waldemar Brodkorb Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- ...-Revert-sim-unify-SIM_CPU-definition.patch | 355 ------------------ ...ut-common-mach-model-defines-into-ar.patch | 155 ++++++++ 2 files changed, 155 insertions(+), 355 deletions(-) delete mode 100644 package/gdb/7.11.1/0001-Revert-sim-unify-SIM_CPU-definition.patch create mode 100644 package/gdb/7.11.1/0001-sim-bfin-split-out-common-mach-model-defines-into-ar.patch diff --git a/package/gdb/7.11.1/0001-Revert-sim-unify-SIM_CPU-definition.patch b/package/gdb/7.11.1/0001-Revert-sim-unify-SIM_CPU-definition.patch deleted file mode 100644 index 8a8eece684..0000000000 --- a/package/gdb/7.11.1/0001-Revert-sim-unify-SIM_CPU-definition.patch +++ /dev/null @@ -1,355 +0,0 @@ -From 77080d5f7fd47dd567f22807d336bc9111f93d7b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 4 Aug 2016 23:44:24 +0200 -Subject: [PATCH] Revert "sim: unify SIM_CPU definition" - -This reverts commit 20bca71d82598a015de0991196e45f0b5f7ead81. - -This change causes a redefinition of SIM_CPU on the Blackfin -architecture, as it is defined in both the common sim/common/sim-base.h -and the architecture specific sim/bfin/sim-main.h. - -Signed-off-by: Thomas Petazzoni ---- - sim/arm/sim-main.h | 3 +++ - sim/avr/sim-main.h | 2 ++ - sim/bfin/sim-main.h | 2 -- - sim/common/sim-base.h | 2 -- - sim/cr16/sim-main.h | 2 ++ - sim/cris/sim-main.h | 3 +++ - sim/d10v/sim-main.h | 2 ++ - sim/frv/sim-main.h | 3 +++ - sim/ft32/sim-main.h | 2 ++ - sim/h8300/sim-main.h | 3 +++ - sim/iq2000/sim-main.h | 3 +++ - sim/lm32/sim-main.h | 3 +++ - sim/m32r/sim-main.h | 3 +++ - sim/m68hc11/sim-main.h | 3 +++ - sim/mcore/sim-main.h | 2 ++ - sim/microblaze/sim-main.h | 3 +++ - sim/mips/sim-main.h | 3 +++ - sim/mn10300/sim-main.h | 2 ++ - sim/moxie/sim-main.h | 3 +++ - sim/msp430/sim-main.h | 3 +++ - sim/sh/sim-main.h | 3 +++ - sim/sh64/sim-main.h | 3 +++ - sim/v850/sim-main.h | 3 +++ - 23 files changed, 57 insertions(+), 4 deletions(-) - -diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h -index 3620810..f644122 100644 ---- a/sim/arm/sim-main.h -+++ b/sim/arm/sim-main.h -@@ -20,6 +20,9 @@ - #define SIM_MAIN_H - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h -index 47155e3..cd41045 100644 ---- a/sim/avr/sim-main.h -+++ b/sim/avr/sim-main.h -@@ -21,6 +21,8 @@ along with this program. If not, see . */ - - #include "sim-basics.h" - -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - - struct _sim_cpu { -diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h -index 51fb87e..cf1ed57 100644 ---- a/sim/bfin/sim-main.h -+++ b/sim/bfin/sim-main.h -@@ -24,8 +24,6 @@ - #include "sim-basics.h" - #include "sim-signal.h" - --/* TODO: Delete this. Need to convert bu32/etc... to common sim types -- and unwind the bfin-sim.h/machs.h include below first though. */ - typedef struct _sim_cpu SIM_CPU; - - #include "bfin-sim.h" -diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h -index 350b352..1b849f4 100644 ---- a/sim/common/sim-base.h -+++ b/sim/common/sim-base.h -@@ -72,8 +72,6 @@ typedef address_word sim_cia; - #define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1) - #endif - --/* TODO: Probably should just delete SIM_CPU. */ --typedef struct _sim_cpu SIM_CPU; - typedef struct _sim_cpu sim_cpu; - - #include "sim-module.h" -diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h -index 208f917..78e3996 100644 ---- a/sim/cr16/sim-main.h -+++ b/sim/cr16/sim-main.h -@@ -24,6 +24,8 @@ - typedef long int word; - typedef unsigned long int uword; - -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h -index 8aab970..0ff907f 100644 ---- a/sim/cris/sim-main.h -+++ b/sim/cris/sim-main.h -@@ -29,6 +29,9 @@ along with this program. If not, see . */ - one of -scache/-pbb. */ - #define WITH_SCACHE_PBB 1 - -+struct _sim_cpu; -+typedef struct _sim_cpu SIM_CPU; -+ - #include "symcat.h" - #include "sim-basics.h" - #include "cgen-types.h" -diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h -index 76f06d8..fd5bd51 100644 ---- a/sim/d10v/sim-main.h -+++ b/sim/d10v/sim-main.h -@@ -24,6 +24,8 @@ - typedef long int word; - typedef unsigned long int uword; - -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h -index f95c1cc..701e208 100644 ---- a/sim/frv/sim-main.h -+++ b/sim/frv/sim-main.h -@@ -19,6 +19,9 @@ along with this program. If not, see . */ - - /* Main header for the frv. */ - -+struct _sim_cpu; /* FIXME: should be in sim-basics.h */ -+typedef struct _sim_cpu SIM_CPU; -+ - /* sim-basics.h includes config.h but cgen-types.h must be included before - sim-basics.h and cgen-types.h needs config.h. */ - #include "config.h" -diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h -index a15b247..eef0201 100644 ---- a/sim/ft32/sim-main.h -+++ b/sim/ft32/sim-main.h -@@ -25,6 +25,8 @@ - #include "sim-base.h" - #include "bfd.h" - -+typedef struct _sim_cpu SIM_CPU; -+ - #include "ft32-sim.h" - - struct _sim_cpu { -diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h -index 6dbc1ac..e95c4d9 100644 ---- a/sim/h8300/sim-main.h -+++ b/sim/h8300/sim-main.h -@@ -87,6 +87,9 @@ enum h8_typecodes { - }; - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - - /* Structure used to describe addressing */ -diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h -index 829f9bb..a770dc5 100644 ---- a/sim/iq2000/sim-main.h -+++ b/sim/iq2000/sim-main.h -@@ -4,6 +4,9 @@ - #ifndef SIM_MAIN_H - #define SIM_MAIN_H - -+struct _sim_cpu; /* FIXME: should be in sim-basics.h */ -+typedef struct _sim_cpu SIM_CPU; -+ - /* sim-basics.h includes config.h but cgen-types.h must be included before - sim-basics.h and cgen-types.h needs config.h. */ - #include "config.h" -diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h -index 20e2b71..eeffde3 100644 ---- a/sim/lm32/sim-main.h -+++ b/sim/lm32/sim-main.h -@@ -25,6 +25,9 @@ - - #define WITH_SCACHE_PBB 1 - -+struct _sim_cpu; /* FIXME: should be in sim-basics.h */ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "symcat.h" - #include "sim-basics.h" - #include "cgen-types.h" -diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h -index 5b24ce8..39f7ecc 100644 ---- a/sim/m32r/sim-main.h -+++ b/sim/m32r/sim-main.h -@@ -8,6 +8,9 @@ - one of -scache/-pbb. */ - #define WITH_SCACHE_PBB 1 - -+struct _sim_cpu; /* FIXME: should be in sim-basics.h */ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "symcat.h" - #include "sim-basics.h" - #include "cgen-types.h" -diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h -index b940df7..0aa096f 100644 ---- a/sim/m68hc11/sim-main.h -+++ b/sim/m68hc11/sim-main.h -@@ -21,6 +21,9 @@ along with this program. If not, see . */ - #define _SIM_MAIN_H - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-signal.h" - #include "sim-base.h" - -diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h -index fce26e8..fa7ee9f 100644 ---- a/sim/mcore/sim-main.h -+++ b/sim/mcore/sim-main.h -@@ -24,6 +24,8 @@ along with this program. If not, see . */ - typedef long int word; - typedef unsigned long int uword; - -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h -index 3a7b088..9e6bf01 100644 ---- a/sim/microblaze/sim-main.h -+++ b/sim/microblaze/sim-main.h -@@ -20,6 +20,9 @@ - - #include "microblaze.h" - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - - /* The machine state. -diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h -index 0ea1234..eedbfc9 100644 ---- a/sim/mips/sim-main.h -+++ b/sim/mips/sim-main.h -@@ -27,6 +27,9 @@ along with this program. If not, see . */ - mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR)) - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h -index 7171c03..3a917e7 100644 ---- a/sim/mn10300/sim-main.h -+++ b/sim/mn10300/sim-main.h -@@ -38,6 +38,8 @@ - #include "itable.h" - #include "idecode.h" - -+typedef struct _sim_cpu SIM_CPU; -+ - #define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR) \ - mn10300_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR)) - -diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h -index 7091f21..b6b5ca3 100644 ---- a/sim/moxie/sim-main.h -+++ b/sim/moxie/sim-main.h -@@ -21,6 +21,9 @@ along with this program. If not, see . */ - #define SIM_MAIN_H - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h -index 4a2ab22..c7cdc5e 100644 ---- a/sim/msp430/sim-main.h -+++ b/sim/msp430/sim-main.h -@@ -23,6 +23,9 @@ - - #include "sim-basics.h" - #include "sim-signal.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "msp430-sim.h" - #include "sim-base.h" - -diff --git a/sim/sh/sim-main.h b/sim/sh/sim-main.h -index 4af7b03..6ab42a6 100644 ---- a/sim/sh/sim-main.h -+++ b/sim/sh/sim-main.h -@@ -20,6 +20,9 @@ along with this program. If not, see . */ - #define SIM_MAIN_H - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - - typedef struct -diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h -index da8f516..5fd7095 100644 ---- a/sim/sh64/sim-main.h -+++ b/sim/sh64/sim-main.h -@@ -3,6 +3,9 @@ - #ifndef SIM_MAIN_H - #define SIM_MAIN_H - -+struct _sim_cpu; /* FIXME: should be in sim-basics.h */ -+typedef struct _sim_cpu SIM_CPU; -+ - /* sim-basics.h includes config.h but cgen-types.h must be included before - sim-basics.h and cgen-types.h needs config.h. */ - #include "config.h" -diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h -index e7276a6..1a45f97 100644 ---- a/sim/v850/sim-main.h -+++ b/sim/v850/sim-main.h -@@ -9,6 +9,9 @@ - #include "sim-basics.h" - #include "sim-signal.h" - #include "sim-fpu.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - - #include "simops.h" --- -2.7.4 - diff --git a/package/gdb/7.11.1/0001-sim-bfin-split-out-common-mach-model-defines-into-ar.patch b/package/gdb/7.11.1/0001-sim-bfin-split-out-common-mach-model-defines-into-ar.patch new file mode 100644 index 0000000000..5841cfd4d1 --- /dev/null +++ b/package/gdb/7.11.1/0001-sim-bfin-split-out-common-mach-model-defines-into-ar.patch @@ -0,0 +1,155 @@ +From 7a09ed68e203a813d88fb7fc6eeb1e92209561a5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 8 Aug 2016 13:06:49 +0800 +Subject: [PATCH] sim: bfin: split out common mach/model defines into arch.h + [PR sim/20438] + +The current machs.h mixes common enums with Blackfin-specific defines. +This causes us troubles with header inclusion order such that we can't +drop the old SIM_CPU typedef (which is duplicated in common code). By +splitting the two up, we can unwind this dependency chain, and drop the +old typedef. It also fixes building with older gcc versions. + +[Romain: backport from gdb 7.12] +Signed-off-by: Romain Naour + +--- + sim/bfin/ChangeLog | 9 +++++++++ + sim/bfin/arch.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ + sim/bfin/machs.h | 20 -------------------- + sim/bfin/sim-main.h | 8 ++------ + 4 files changed, 55 insertions(+), 26 deletions(-) + create mode 100644 sim/bfin/arch.h + +diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog +index 3dea7c9..a995436 100644 +--- a/sim/bfin/ChangeLog ++++ b/sim/bfin/ChangeLog +@@ -1,3 +1,12 @@ ++2016-08-13 Mike Frysinger ++ ++ PR sim/20438 ++ * machs.h (MODEL_TYPE, MACH_ATTR, BFIN_INSN_*): Move ... ++ * arch.h: ... to this new header file. ++ * sim-main.h (SIM_CPU): Delete. ++ Include arch.h before sim-base.h, and move sim-base.h before ++ bfin-sim.h. ++ + 2016-01-10 Mike Frysinger + + * config.in, configure: Regenerate. +diff --git a/sim/bfin/arch.h b/sim/bfin/arch.h +new file mode 100644 +index 0000000..b86d3e9 +--- /dev/null ++++ b/sim/bfin/arch.h +@@ -0,0 +1,44 @@ ++/* Simulator for Analog Devices Blackfin processors. ++ ++ Copyright (C) 2005-2016 Free Software Foundation, Inc. ++ Contributed by Analog Devices, Inc. ++ ++ This file is part of simulators. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#ifndef BFIN_ARCH_H ++#define BFIN_ARCH_H ++ ++typedef enum model_type { ++#define P(n) MODEL_BF##n, ++#include "proc_list.def" ++#undef P ++ MODEL_MAX ++} MODEL_TYPE; ++ ++typedef enum mach_attr { ++ MACH_BASE, ++ MACH_BFIN, ++ MACH_MAX ++} MACH_ATTR; ++ ++enum { ++#define I(insn) BFIN_INSN_##insn, ++#include "insn_list.def" ++#undef I ++ BFIN_INSN_MAX ++}; ++ ++#endif +diff --git a/sim/bfin/machs.h b/sim/bfin/machs.h +index 0372982..36819ae 100644 +--- a/sim/bfin/machs.h ++++ b/sim/bfin/machs.h +@@ -21,19 +21,6 @@ + #ifndef _BFIN_MACHS_H_ + #define _BFIN_MACHS_H_ + +-typedef enum model_type { +-#define P(n) MODEL_BF##n, +-#include "proc_list.def" +-#undef P +- MODEL_MAX +-} MODEL_TYPE; +- +-typedef enum mach_attr { +- MACH_BASE, +- MACH_BFIN, +- MACH_MAX +-} MACH_ATTR; +- + #define CPU_MODEL_NUM(cpu) MODEL_NUM (CPU_MODEL (cpu)) + + /* XXX: Some of this probably belongs in CPU_MODEL. */ +@@ -46,13 +33,6 @@ void bfin_model_cpu_init (SIM_DESC, SIM_CPU *); + bu32 bfin_model_get_chipid (SIM_DESC); + bu32 bfin_model_get_dspid (SIM_DESC); + +-enum { +-#define I(insn) BFIN_INSN_##insn, +-#include "insn_list.def" +-#undef I +- BFIN_INSN_MAX +-}; +- + #define BFIN_COREMMR_CEC_BASE 0xFFE02100 + #define BFIN_COREMMR_CEC_SIZE (4 * 5) + #define BFIN_COREMMR_CTIMER_BASE 0xFFE03000 +diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h +index 51fb87e..34fd153 100644 +--- a/sim/bfin/sim-main.h ++++ b/sim/bfin/sim-main.h +@@ -23,17 +23,13 @@ + + #include "sim-basics.h" + #include "sim-signal.h" +- +-/* TODO: Delete this. Need to convert bu32/etc... to common sim types +- and unwind the bfin-sim.h/machs.h include below first though. */ +-typedef struct _sim_cpu SIM_CPU; ++#include "arch.h" ++#include "sim-base.h" + + #include "bfin-sim.h" + + #include "machs.h" + +-#include "sim-base.h" +- + struct _sim_cpu { + /* ... simulator specific members ... */ + struct bfin_cpu_state state; +-- +2.9.3 + From 8ac3f121f0ccc31a79b08c473e19e4d4ae922942 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 11 Feb 2017 23:04:08 +0100 Subject: [PATCH 2642/3392] wiringpi: fix static linking Update patch 0001-Adjust-for-buildroot-build.patch to use real static linking (command line flag '-static' for target gpio-static). Fixes [1]: [Link] .../output/host/usr/lib/gcc/powerpc-buildroot-linux-uclibc/5.4.0/libgcc.a(unwind-dw2-fde-dip.o): In function `_Unwind_Find_FDE': ...output/build/host-gcc-final-5.4.0/build/powerpc-buildroot-linux-uclibc/libgcc/../../../libgcc/unwind-dw2-fde-dip.c:465: undefined reference to `dl_iterate_phdr' collect2: error: ld returned 1 exit status make[1]: *** [gpio-static] Error 1 make[1]: Leaving directory `.../output/build/wiringpi-2.32/gpio' [1] http://autobuild.buildroot.net/results/b905617dda0e120d04c54daf7cae2bad236ac767 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- .../0001-Adjust-for-buildroot-build.patch | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch index 4add46e216..4fddc9951e 100644 --- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch +++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch @@ -1,4 +1,4 @@ -From a16012bf4ea63f714468d80ebe101481c917e4b8 Mon Sep 17 00:00:00 2001 +From 10d5bde8d628a93993dd7305dc9a406da69f65a9 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 2 Dec 2015 00:22:26 +0100 Subject: [PATCH] Adjust for buildroot build. @@ -14,12 +14,12 @@ Subject: [PATCH] Adjust for buildroot build. Signed-off-by: Peter Seiderer --- devLib/Makefile | 9 +++++---- - gpio/Makefile | 12 ++++++++---- + gpio/Makefile | 14 +++++++++----- wiringPi/Makefile | 7 ++++--- - 3 files changed, 17 insertions(+), 11 deletions(-) + 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/devLib/Makefile b/devLib/Makefile -index 0fb0033..3117479 100644 +index 1b1ebe0..84b4d2a 100644 --- a/devLib/Makefile +++ b/devLib/Makefile @@ -36,10 +36,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION) @@ -36,7 +36,7 @@ index 0fb0033..3117479 100644 LIBS = -@@ -67,6 +67,7 @@ $(STATIC): $(OBJ) +@@ -69,6 +69,7 @@ $(STATIC): $(OBJ) $(DYNAMIC): $(OBJ) $Q echo "[Link (Dynamic)]" $Q $(CC) -shared -Wl,-soname,libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ) @@ -44,7 +44,7 @@ index 0fb0033..3117479 100644 .c.o: $Q echo [Compile] $< -@@ -91,7 +92,7 @@ install: $(DYNAMIC) +@@ -93,7 +94,7 @@ install: $(DYNAMIC) $Q echo "[Install Dynamic Lib]" $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib $Q install -m 0755 libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) @@ -54,7 +54,7 @@ index 0fb0033..3117479 100644 .PHONY: install-static diff --git a/gpio/Makefile b/gpio/Makefile -index 7dcd090..e8e43f9 100644 +index 7dcd090..dc4be72 100644 --- a/gpio/Makefile +++ b/gpio/Makefile @@ -32,11 +32,11 @@ endif @@ -73,19 +73,23 @@ index 7dcd090..e8e43f9 100644 LIBS = -lwiringPi -lwiringPiDev -lpthread # May not need to alter anything below this line -@@ -55,6 +55,10 @@ gpio: $(OBJ) - $Q echo [Link] +@@ -52,9 +52,13 @@ version.h: ../VERSION + $Q echo Need to run newVersion above. + + gpio: $(OBJ) +- $Q echo [Link] ++ $Q echo "[Link (Dynamic)]" $Q $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIBS) +gpio-static: $(OBJ) -+ $Q echo [Link] -+ $Q $(CC) -o gpio $(OBJ) ../wiringPi/libwiringPi.a ../devLib/libwiringPiDev.a -lpthread ++ $Q echo "[Link (Static)]" ++ $Q $(CC) -static -o gpio $(OBJ) ../wiringPi/libwiringPi.a ../devLib/libwiringPiDev.a -lpthread + .c.o: $Q echo [Compile] $< $Q $(CC) -c $(CFLAGS) $< -o $@ diff --git a/wiringPi/Makefile b/wiringPi/Makefile -index 6bbcc5d..e0ccc52 100644 +index acb6e58..8b84dc6 100644 --- a/wiringPi/Makefile +++ b/wiringPi/Makefile @@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) @@ -119,5 +123,5 @@ index 6bbcc5d..e0ccc52 100644 .PHONY: install-static -- -2.1.4 +2.11.0 From 67a221be1bf00ea012a8a9cf6ac4aa9459264cb3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Feb 2017 15:53:05 +0100 Subject: [PATCH 2643/3392] support/test-pkg: fix code style Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/scripts/test-pkg | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg index b867da8bb8..9066fa0667 100755 --- a/support/scripts/test-pkg +++ b/support/scripts/test-pkg @@ -10,7 +10,7 @@ main() { o='hc:d:p:r:' O='help,config-snippet:build-dir:package:,random:' - opts="$( getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}" )" + opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" eval set -- "${opts}" random=0 @@ -46,14 +46,14 @@ main() { # Extract the URLs of the toolchains; drop internal toolchains # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config - toolchains=( $( curl -s "${TOOLCHAINS_URL}" \ - |sed -r -e 's/,.*//; /internal/d;' \ - |if [ ${random} -gt 0 ]; then \ - sort -R |head -n ${random} - else - cat - fi |sort - ) + toolchains=($(curl -s "${TOOLCHAINS_URL}" \ + |sed -r -e 's/,.*//; /internal/d;' \ + |if [ ${random} -gt 0 ]; then \ + sort -R |head -n ${random} + else + cat + fi |sort + ) ) if [ ${#toolchains[@]} -eq 0 ]; then @@ -73,7 +73,7 @@ build_one() { local toolchain line skip # Using basename(1) on a URL works nicely - toolchain="$( basename "${url}" .config )" + toolchain="$(basename "${url}" .config)" printf "%40s: " "${toolchain}" From 55bbbe04c31dd32bd2f4eb8c1c27e95abea666d8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Feb 2017 15:53:06 +0100 Subject: [PATCH 2644/3392] support/test-pkg: check the config snippet exists Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/scripts/test-pkg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg index 9066fa0667..11ec18ca52 100755 --- a/support/scripts/test-pkg +++ b/support/scripts/test-pkg @@ -39,6 +39,9 @@ main() { if [ -z "${cfg}" ]; then printf "error: no config snippet specified\n" >&2; exit 1 fi + if [ ! -e "${cfg}" ]; then + printf "error: %s: no such file\n" "${cfg}" >&2; exit 1 + fi if [ -z "${dir}" ]; then dir="${HOME}/br-test-pkg" fi From aeabb58dc50e0a6c5242274949e8c5b0c4c3c170 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Feb 2017 15:53:07 +0100 Subject: [PATCH 2645/3392] support/test-pkg: simplify the config check Use comm(1) to check that all our config options are properly set in the resulting configuration, rather than our canned and fragile code. Reported-by: Cam Hutchison Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/scripts/test-pkg | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg index 11ec18ca52..a1d272a0d8 100755 --- a/support/scripts/test-pkg +++ b/support/scripts/test-pkg @@ -73,7 +73,7 @@ build_one() { local url="${2}" local cfg="${3}" local pkg="${4}" - local toolchain line skip + local toolchain # Using basename(1) on a URL works nicely toolchain="$(basename "${url}" .config)" @@ -106,14 +106,10 @@ build_one() { # or not set) in the actual .config; if one of them is not, it means # some dependency from the toolchain or arch is not available, in # which case this config is untestable and we skip it. - skip=false - while read line; do - if ! grep "^${line}\$" "${dir}/.config" >/dev/null 2>&1; then - printf "%s\n" "${line}" - skip=true - fi - done <"${cfg}" >"${dir}/missing.config" - if ${skip}; then + # We don't care about the locale to sort in, as long as both sort are + # done in the same locale. + comm -23 <(sort "${cfg}") <(sort "${dir}/.config") >"${dir}/missing.config" + if [ -s "${dir}/missing.config" ]; then printf ", SKIPPED\n" return fi From c3c69c4dbb95cd068d861051d967e79daaa48649 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Feb 2017 15:53:08 +0100 Subject: [PATCH 2646/3392] support/test-pkg: be less verbose Requested-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/scripts/test-pkg | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg index a1d272a0d8..d9ae5c584c 100755 --- a/support/scripts/test-pkg +++ b/support/scripts/test-pkg @@ -83,9 +83,8 @@ build_one() { dir="${dir}/${toolchain}" mkdir -p "${dir}" - printf "download config" if ! curl -s "${url}" >"${dir}/.config"; then - printf ": FAILED\n" + printf "FAILED\n" return fi @@ -97,9 +96,8 @@ build_one() { _EOF_ cat "${cfg}" >>"${dir}/.config" - printf ", olddefconfig" if ! make O="${dir}" olddefconfig >/dev/null 2>&1; then - printf ": FAILED\n" + printf "FAILED\n" return fi # We want all the options from the snippet to be present as-is (set @@ -110,28 +108,26 @@ build_one() { # done in the same locale. comm -23 <(sort "${cfg}") <(sort "${dir}/.config") >"${dir}/missing.config" if [ -s "${dir}/missing.config" ]; then - printf ", SKIPPED\n" + printf "SKIPPED\n" return fi # Remove file, it's empty anyway. rm -f "${dir}/missing.config" if [ -n "${pkg}" ]; then - printf ", dirclean" if ! make O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then - printf ": FAILED\n" + printf "FAILED\n" return fi fi - printf ", build" # shellcheck disable=SC2086 if ! make O="${dir}" ${pkg} >> "${dir}/logfile" 2>&1; then - printf ": FAILED\n" + printf "FAILED\n" return fi - printf ": OK\n" + printf "OK\n" } help() { From 5bf12ad141f5de02c79c04a773e7709b87070229 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Feb 2017 15:53:09 +0100 Subject: [PATCH 2647/3392] support/test-pkg: report number and types of failures Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Luca Ceresoli Cc: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- support/scripts/test-pkg | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg index d9ae5c584c..a040ce1af1 100755 --- a/support/scripts/test-pkg +++ b/support/scripts/test-pkg @@ -6,6 +6,7 @@ TOOLCHAINS_URL='http://autobuild.buildroot.org/toolchains/configs/toolchain-conf main() { local o O opts local cfg dir pkg random toolchain + local ret nb nb_skip nb_fail local -a toolchains o='hc:d:p:r:' @@ -63,9 +64,20 @@ main() { printf "error: no toolchain found (networking issue?)\n" >&2; exit 1 fi + nb=0 + nb_skip=0 + nb_fail=0 for toolchain in "${toolchains[@]}"; do - build_one "${dir}" "${toolchain}" "${cfg}" "${pkg}" + build_one "${dir}" "${toolchain}" "${cfg}" "${pkg}" && ret=0 || ret=${?} + case ${ret} in + (0) ;; + (1) : $((nb_skip++));; + (2) : $((nb_fail++));; + esac + : $((nb++)) done + + printf "%d builds, %d skipped, %d failed\n" ${nb} ${nb_skip} ${nb_fail} } build_one() { @@ -85,7 +97,7 @@ build_one() { if ! curl -s "${url}" >"${dir}/.config"; then printf "FAILED\n" - return + return 2 fi cat >>"${dir}/.config" <<-_EOF_ @@ -98,7 +110,7 @@ build_one() { if ! make O="${dir}" olddefconfig >/dev/null 2>&1; then printf "FAILED\n" - return + return 2 fi # We want all the options from the snippet to be present as-is (set # or not set) in the actual .config; if one of them is not, it means @@ -109,7 +121,7 @@ build_one() { comm -23 <(sort "${cfg}") <(sort "${dir}/.config") >"${dir}/missing.config" if [ -s "${dir}/missing.config" ]; then printf "SKIPPED\n" - return + return 1 fi # Remove file, it's empty anyway. rm -f "${dir}/missing.config" @@ -117,14 +129,14 @@ build_one() { if [ -n "${pkg}" ]; then if ! make O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then printf "FAILED\n" - return + return 2 fi fi # shellcheck disable=SC2086 if ! make O="${dir}" ${pkg} >> "${dir}/logfile" 2>&1; then printf "FAILED\n" - return + return 2 fi printf "OK\n" From b9141fc88b24b6e0d565f84ee768f3199f31a6cd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 12 Feb 2017 22:59:58 +0100 Subject: [PATCH 2648/3392] bind: security bump to version 9.11.0-P3 Fixes CVE-2017-3135: Combination of DNS64 and RPZ Can Lead to Crash: https://kb.isc.org/article/AA-01453 Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index dc472b1216..780e43b9a0 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,2 +1,2 @@ -# Verified from http://ftp.isc.org/isc/bind9/9.11.0-P2/bind-9.11.0-P2.tar.gz.sha256.asc -sha256 d651f83ce1c08c83d6ac8201685c4f2b5fdb79794f3a4f93c3948e0ef439c1e5 bind-9.11.0-P2.tar.gz +# Verified from http://ftp.isc.org/isc/bind9/9.11.0-P3/bind-9.11.0-P3.tar.gz.sha256.asc +sha256 0feee0374bcbdee73a9d4277f3c5007622279572d520d7c27a4b64015d8ca9e9 bind-9.11.0-P3.tar.gz diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 714308977a..860ee9d5e8 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.0-P2 +BIND_VERSION = 9.11.0-P3 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) From 896455cff7ff46dd069c74be39c39aa85cb4e129 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Feb 2017 10:07:41 +0100 Subject: [PATCH 2649/3392] riemann-c-client: disable parallel make Fixes: http://autobuild.buildroot.net/results/2f8/2f85a2d19232365f7e5fddde6092af9dd74d4518/ http://autobuild.buildroot.net/results/80d/80d83c650c668ee1e87c288bd7a0ce63eab95631/ The build system doesn't specify any dependencies between the generated header files and the source files including them, causing a race condition: GEN lib/riemann/proto/riemann.pb-c.c GEN lib/riemann/proto/riemann.pb-c.h CC src/src_riemann_client-riemann-client.o In file included from ./lib/riemann/riemann-client.h:23:0, from src/riemann-client.c:18: ./lib/riemann/attribute.h:21:40: fatal error: riemann/proto/riemann.pb-c.h: No such file or directory Work around it by forcing non-parallel make. Signed-off-by: Peter Korsgaard --- package/riemann-c-client/riemann-c-client.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/riemann-c-client/riemann-c-client.mk b/package/riemann-c-client/riemann-c-client.mk index 5593519987..c8a411c32b 100644 --- a/package/riemann-c-client/riemann-c-client.mk +++ b/package/riemann-c-client/riemann-c-client.mk @@ -10,6 +10,7 @@ RIEMANN_C_CLIENT_SITE = https://github.com/algernon/riemann-c-client/releases/do RIEMANN_C_CLIENT_LICENSE = LGPLv3+ RIEMANN_C_CLIENT_LICENSE_FILES = LICENSE RIEMANN_C_CLIENT_INSTALL_STAGING = YES +RIEMANN_C_CLIENT_MAKE = $(MAKE1) RIEMANN_C_CLIENT_DEPENDENCIES = \ host-pkgconf protobuf-c \ $(if $(BR2_PACKAGE_GNUTLS),gnutls) \ From de0985455e1991095f98bf149522bab4393cf8f1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 13 Feb 2017 21:01:33 +0100 Subject: [PATCH 2650/3392] docs/website/news.html: fix link to 2017.02-rc1 tarball Signed-off-by: Thomas Petazzoni --- docs/website/news.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index 6e81c6ea30..96cadfd81a 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -25,7 +25,7 @@

          2017.02-rc1 released

          Head to the downloads page to pick up the - 2017.12-rc1 + 2017.12-rc1 release candidate, and report any problems found to the mailing list or From c557a22438647890e27c77bbf76f3a9f16d6d103 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 13 Feb 2017 21:26:20 +0100 Subject: [PATCH 2651/3392] xfsprogs: needs thread support Fixes: http://autobuild.buildroot.net/results/57975f401f39b673eeec304b4738cfb41a19ece7/ Signed-off-by: Thomas Petazzoni --- package/xfsprogs/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in index ccb3214674..9f0d2509c0 100644 --- a/package/xfsprogs/Config.in +++ b/package/xfsprogs/Config.in @@ -1,11 +1,12 @@ -comment "xfsprogs needs a glibc or uClibc toolchain" +comment "xfsprogs needs a glibc or uClibc toolchain w/ threads" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_USES_MUSL + depends on BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_XFSPROGS bool "xfsprogs" depends on BR2_USE_MMU # fork() depends on !BR2_TOOLCHAIN_USES_MUSL + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBBLKID From c36f0d65ad63589f1b21833ef53d429c018b6f8a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 13 Feb 2017 22:10:43 +0100 Subject: [PATCH 2652/3392] wget: bump to 1.19.1 to fix build issue Due to the patches we have on wget 1.19, we need to autoreconf. Unfortunately, when the autoreconfiguration process occurs with host-gettext already built and installed, the build of wget fails with a fairly weird error: In file included from str-two-way.h:44:0, from c-strcasestr.c:37: ./stdint.h:89:5: error: #if with no expression #if As explained in http://git.net/ml/bug-gnulib-gnu/2017-01/msg00067.html and the links pointed by this page, this is due to an incompatibility between the newer version of gnulib used in wget, and an older .m4 file in gettext. In the context of Buildroot, the easiest way to avoid the issue is to not autoreconf wget. The wget project has conveniently released a 1.19.1 release, which contains our two patches, plus just one small feature addition. It is therefore reasonable to apply this as a solution to this build issue. Fixes: http://autobuild.buildroot.net/results/b62ac6fd5ce36453935c309e112262467cf0e3bf/ Signed-off-by: Thomas Petazzoni --- ...ne-clash-with-gnulib-s-unlink-module.patch | 71 ------------------- ...ipping-libunistring-with-disable-iri.patch | 35 --------- package/wget/wget.hash | 2 +- package/wget/wget.mk | 5 +- 4 files changed, 2 insertions(+), 111 deletions(-) delete mode 100644 package/wget/0001-Fix-include-define-clash-with-gnulib-s-unlink-module.patch delete mode 100644 package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch diff --git a/package/wget/0001-Fix-include-define-clash-with-gnulib-s-unlink-module.patch b/package/wget/0001-Fix-include-define-clash-with-gnulib-s-unlink-module.patch deleted file mode 100644 index 03c0a619d9..0000000000 --- a/package/wget/0001-Fix-include-define-clash-with-gnulib-s-unlink-module.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 31ac36e170f4777655451fce10a2fa5b2b27ecd7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Sat, 4 Feb 2017 18:02:54 +0100 -Subject: [PATCH] Fix include/define clash with gnulib's unlink module - -* src/options.h: Rename options.unlink to options.unlink_requested -* src/init.c: Replace options unlink member by unlink_requested -* src/http.c: Likewise -* src/ftp.c: Likewise ---- - src/ftp.c | 2 +- - src/http.c | 2 +- - src/init.c | 2 +- - src/options.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/ftp.c b/src/ftp.c -index fe09817..2f2866c 100644 ---- a/src/ftp.c -+++ b/src/ftp.c -@@ -1463,7 +1463,7 @@ Error in server response, closing control connection.\n")); - else if (opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct - || opt.output_document || count > 0) - { -- if (opt.unlink && file_exists_p (con->target)) -+ if (opt.unlink_requested && file_exists_p (con->target)) - { - if (unlink (con->target) < 0) - { -diff --git a/src/http.c b/src/http.c -index bd1f115..3c3c8b2 100644 ---- a/src/http.c -+++ b/src/http.c -@@ -2486,7 +2486,7 @@ open_output_stream (struct http_stat *hs, int count, FILE **fp) - } - else if (ALLOW_CLOBBER || count > 0) - { -- if (opt.unlink && file_exists_p (hs->local_file)) -+ if (opt.unlink_requested && file_exists_p (hs->local_file)) - { - if (unlink (hs->local_file) < 0) - { -diff --git a/src/init.c b/src/init.c -index 271bc77..623ef9d 100644 ---- a/src/init.c -+++ b/src/init.c -@@ -321,7 +321,7 @@ static const struct { - { "timestamping", &opt.timestamping, cmd_boolean }, - { "tries", &opt.ntry, cmd_number_inf }, - { "trustservernames", &opt.trustservernames, cmd_boolean }, -- { "unlink", &opt.unlink, cmd_boolean }, -+ { "unlink", &opt.unlink_requested, cmd_boolean }, - { "useaskpass" , &opt.use_askpass, cmd_use_askpass }, - { "useproxy", &opt.use_proxy, cmd_boolean }, - { "user", &opt.user, cmd_string }, -diff --git a/src/options.h b/src/options.h -index d713acc..8a818ca 100644 ---- a/src/options.h -+++ b/src/options.h -@@ -61,7 +61,7 @@ struct options - bool add_hostdir; /* Do we add hostname directory? */ - bool protocol_directories; /* Whether to prepend "http"/"ftp" to dirs. */ - bool noclobber; /* Disables clobbering of existing data. */ -- bool unlink; /* remove file before clobbering */ -+ bool unlink_requested; /* remove file before clobbering */ - char *dir_prefix; /* The top of directory tree */ - char *lfilename; /* Log filename */ - char *input_filename; /* Input filename */ --- -2.6.2 - diff --git a/package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch b/package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch deleted file mode 100644 index a1461df930..0000000000 --- a/package/wget/0002-Remove-skipping-libunistring-with-disable-iri.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 990f3d67d340d226bbd4187f5d310a4d2bf2bfe4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Mon, 6 Feb 2017 11:25:48 +0100 -Subject: [PATCH] Remove skipping libunistring with --disable-iri - -* configure.ac: Remove checking for IRI=no - -On certain systems, gnulib falls back to libunistring -for mbtowc() and wcwidth() (used in src/progress.c). - -Reported-by: Zhiming Wang -Signed-off-by: Rahul Bedarkar ---- - configure.ac | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8786e00..686f040 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -663,11 +663,6 @@ if test "X$iri" != "Xno"; then - # ]) - ]) - fi --if test "X$iri" = "Xno"; then -- # we don't need libunistring - clear settings from gnulib module -- LIBUNISTRING="" -- LTLIBUNISTRING="" --fi - - dnl - dnl Check for UUID --- -2.6.2 - diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 8611cfbfa8..5f22396b05 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 0f1157bbf4daae19f3e1ddb70c6ccb2067feb834a6aa23c9d9daa7f048606384 wget-1.19.tar.xz +sha256 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 wget-1.19.1.tar.xz diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 8698cdf3a7..22e057dbae 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,16 +4,13 @@ # ################################################################################ -WGET_VERSION = 1.19 +WGET_VERSION = 1.19.1 WGET_SOURCE = wget-$(WGET_VERSION).tar.xz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf WGET_LICENSE = GPLv3+ WGET_LICENSE_FILES = COPYING -# For 0002-Remove-skipping-libunistring-with-disable-iri.patch -WGET_AUTORECONF = YES - # Prefer full-blown wget over busybox ifeq ($(BR2_PACKAGE_BUSYBOX),y) WGET_DEPENDENCIES += busybox From a75ab1fc1dcc7eee8668b1c3c19b703f1390b2cd Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 13 Feb 2017 21:08:38 +0100 Subject: [PATCH 2653/3392] package/classpath: Don't depend on jamvm GNU classpath can exist without jamvm, so don't depend on it. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/classpath/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/classpath/Config.in b/package/classpath/Config.in index ce71160307..caab619868 100644 --- a/package/classpath/Config.in +++ b/package/classpath/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_CLASSPATH bool "classpath" select BR2_NEEDS_HOST_JAR select BR2_NEEDS_HOST_JAVAC - depends on BR2_PACKAGE_JAMVM help GNU Classpath, Essential Libraries for Java, is a GNU project to create free core class libraries for use with From 8b8b4f7bfe50a33bbda9ed0cbbdc5170c3147625 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Mon, 13 Feb 2017 21:06:19 +0100 Subject: [PATCH 2654/3392] glmark2: bump version to fix build The package otherwise fails to build with a recent toolchain with GCC6 (tested with Linaro ARM 2016.11). It used to fail at sqrt check during package configuration: Checking for function sqrt : not found The configuration failed Bumping version to latest HEAD fixes the issue as explained in the following discussion: https://github.com/glmark2/glmark2/issues/15 Fixes: http://autobuild.buildroot.net/results/8dc9400505b9087ce290981d95486598df0beb56/ Signed-off-by: Gary Bisson [Thomas: add reference to autobuilder failure.] Signed-off-by: Thomas Petazzoni --- package/glmark2/glmark2.hash | 2 +- package/glmark2/glmark2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/glmark2/glmark2.hash b/package/glmark2/glmark2.hash index 7868b37d9d..92c53e5410 100644 --- a/package/glmark2/glmark2.hash +++ b/package/glmark2/glmark2.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 421bdb87ed8c04a25f60816c7754d45e91a45136f5489df59d74001c159882b8 glmark2-fa71af2dfab711fac87b9504b6fc9862f44bf72a.tar.gz +sha256 ea59bd267a88e2c773423eec43f7cb90b0ca1c369762e836dec575ebdcdcc012 glmark2-7215c0f337dae0b232535549c37fca441747a891.tar.gz diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index e35e36a4e6..f9631a0c3c 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLMARK2_VERSION = fa71af2dfab711fac87b9504b6fc9862f44bf72a +GLMARK2_VERSION = 7215c0f337dae0b232535549c37fca441747a891 GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) GLMARK2_LICENSE = GPLv3+ SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI From 5c4d3560b94c9cb8f1594c9200a632b89ddf7aa0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 Feb 2017 10:01:32 +0100 Subject: [PATCH 2655/3392] bctoolbox: fix typos and logic error To get the directory path from the library name you need to use a single filename. Fix typo in variable name. This fixes the ortp autobuild errors which uses the broken pkgconfig file from bctoolbox. Fixes: http://autobuild.buildroot.net/results/37d5625df4be11ccdc063871e9f6e13d5f59fb52 http://autobuild.buildroot.net/results/1999c841fae41f860f00747a362327cb2857e687 Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/bctoolbox/0001-fix-typo.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/bctoolbox/0001-fix-typo.patch diff --git a/package/bctoolbox/0001-fix-typo.patch b/package/bctoolbox/0001-fix-typo.patch new file mode 100644 index 0000000000..b94daee8d1 --- /dev/null +++ b/package/bctoolbox/0001-fix-typo.patch @@ -0,0 +1,18 @@ +Fix a typo in the variable name. Only check path for a single library name. + +Signed-off-by: Waldemar Brodkorb + +diff -Nur bctoolbox-0.4.0.orig/CMakeLists.txt bctoolbox-0.4.0/CMakeLists.txt +--- bctoolbox-0.4.0.orig/CMakeLists.txt 2016-10-06 17:30:41.000000000 +0200 ++++ bctoolbox-0.4.0/CMakeLists.txt 2017-02-13 23:30:38.641288032 +0100 +@@ -103,8 +103,8 @@ + endif() + + if(MBEDTLS_FOUND) +- get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH) +- set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}") ++ get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH) ++ set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path}") + endif() + if(POLARSSL_FOUND) + get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH) From 0e76cde70f651b17e74681d17fb0afb16400102d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Feb 2017 23:08:08 +0100 Subject: [PATCH 2656/3392] vim: security bump to version 8.0.0329 Fixes: - CVE-2016-1248: vim before patch 8.0.0056 does not properly validate values for the 'filetype', 'syntax' and 'keymap' options, which may result in the execution of arbitrary code if a file with a specially crafted modeline is opened. - CVE-2017-5953: vim before patch 8.0.0322 does not properly validate values for tree length when handling a spell file, which may result in an integer overflow at a memory allocation site and a resultant buffer overflow. Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index bc4a08e9cf..28c6b97e31 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 9b4790dafc886537096a6e1953ee0424b8c308881b97151a7bfba1f9fd14e3f9 vim-v8.0.0001.tar.gz +sha256 6fbe0ec1228f951ba598b48ac8033f41ca4934cc34689a6008685e7c26477ae2 vim-v8.0.0329.tar.gz diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 308855eaee..ec494608e7 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = v8.0.0001 +VIM_VERSION = v8.0.0329 VIM_SITE = $(call github,vim,vim,$(VIM_VERSION)) # Win over busybox vi since vim is more feature-rich VIM_DEPENDENCIES = \ From 6f971f354c14a8948477a0936668b8baae8ec86e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Feb 2017 23:51:10 +0100 Subject: [PATCH 2657/3392] ntfs-3g: add security fix for CVE-2017-0358 Jann Horn, Project Zero (Google) discovered that ntfs-3g, a read-write NTFS driver for FUSE does not not scrub the environment before executing modprobe to load the fuse module. This influence the behavior of modprobe (MODPROBE_OPTIONS environment variable, --config and --dirname options) potentially allowing for local root privilege escalation if ntfs-3g is installed setuid. Notice that Buildroot does NOT install netfs-3g setuid root, but custom permission tables might be used, causing it to vulnerable to the above. ntfs-3g does not seem to have a publicly available version control system and no new releases have been made, so instead grab the patch from Debian. Signed-off-by: Peter Korsgaard --- package/ntfs-3g/ntfs-3g.hash | 1 + package/ntfs-3g/ntfs-3g.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/ntfs-3g/ntfs-3g.hash b/package/ntfs-3g/ntfs-3g.hash index 4875cc47bc..eaa3d98718 100644 --- a/package/ntfs-3g/ntfs-3g.hash +++ b/package/ntfs-3g/ntfs-3g.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 d7b72c05e4b3493e6095be789a760c9f5f2b141812d5b885f3190c98802f1ea0 ntfs-3g_ntfsprogs-2016.2.22.tgz +sha256 43deadaeade489934b0b45e2ed8aa5f853ad0364fbde7ad144211b80132ea041 0003-CVE-2017-0358.patch diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk index b59e335bcb..6e1a8f9460 100644 --- a/package/ntfs-3g/ntfs-3g.mk +++ b/package/ntfs-3g/ntfs-3g.mk @@ -7,6 +7,7 @@ NTFS_3G_VERSION = 2016.2.22 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz NTFS_3G_SITE = http://tuxera.com/opensource +NTFS_3G_PATCH = https://sources.debian.net/data/main/n/ntfs-3g/1:2016.2.22AR.1-4/debian/patches/0003-CVE-2017-0358.patch NTFS_3G_CONF_OPTS = --disable-ldconfig NTFS_3G_INSTALL_STAGING = YES NTFS_3G_DEPENDENCIES = host-pkgconf From 3a89cfc46489e0bedf27796134698878d0de9281 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Feb 2017 22:30:45 +0100 Subject: [PATCH 2658/3392] openswan: fix autobuild failures with uClibc-ng Add patch to fix following autobuild failures: Fixes: http://autobuild.buildroot.net/results/31cf680c48bec8ba4450a6fe2156cb441c4dd660 http://autobuild.buildroot.net/results/95220f231810cb12ba97a6b44af79f84af706c82 Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- ...001-uClibc-ng-is-compatible-to-glibc.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/openswan/0001-uClibc-ng-is-compatible-to-glibc.patch diff --git a/package/openswan/0001-uClibc-ng-is-compatible-to-glibc.patch b/package/openswan/0001-uClibc-ng-is-compatible-to-glibc.patch new file mode 100644 index 0000000000..aa4d0ede24 --- /dev/null +++ b/package/openswan/0001-uClibc-ng-is-compatible-to-glibc.patch @@ -0,0 +1,39 @@ +From 0f7bf4706d2932aaa50904fc529a853c9f86478f Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Mon, 13 Feb 2017 22:18:11 +0100 +Subject: [PATCH] uClibc-ng is compatible to glibc + +Signed-off-by: Waldemar Brodkorb + +Pull-Request: https://github.com/xelerance/Openswan/pull/227 + +--- + linux/include/openswan.h | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/linux/include/openswan.h b/linux/include/openswan.h +index e2c45a130..66b9d42b2 100644 +--- a/linux/include/openswan.h ++++ b/linux/include/openswan.h +@@ -27,18 +27,6 @@ + #endif + + /* +- * When using uclibc, malloc(0) returns NULL instead of success. This is +- * to make it use the inbuilt work-around. +- * See: http://osdir.com/ml/network.freeswan.devel/2003-11/msg00009.html +- */ +-#ifdef __UCLIBC__ +-# if !defined(__MALLOC_GLIBC_COMPAT__) && !defined(MALLOC_GLIBC_COMPAT) +-# warning Please compile uclibc with GLIBC_COMPATIBILITY defined +-# endif +-#endif +- +- +-/* + * We've just got to have some datatypes defined... And annoyingly, just + * where we get them depends on whether we're in userland or not. + */ +-- +2.11.1 + From d42032213968f203bc4099384e4945e6da8fb7ff Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 Feb 2017 15:08:31 +0100 Subject: [PATCH 2659/3392] lcdapi: fix build error for m68k/coldfire Fixes: http://autobuild.buildroot.net/results/d47/d47fa41aa860d82471b83ac90967d3a3dacd8611/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/lcdapi/lcdapi.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/lcdapi/lcdapi.mk b/package/lcdapi/lcdapi.mk index 5d8c2ee571..75390421d6 100644 --- a/package/lcdapi/lcdapi.mk +++ b/package/lcdapi/lcdapi.mk @@ -11,6 +11,12 @@ LCDAPI_LICENSE_FILES = COPYING LCDAPI_AUTORECONF = YES LCDAPI_INSTALL_STAGING = YES +# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509 +ifeq ($(BR2_m68k_cf),y) +LCDAPI_CONF_OPTS += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm" +endif + define LCDAPI_CREATE_M4_DIR mkdir -p $(@D)/m4 endef From 6e6368044162af4b8f9f50e5a2237a53dc1d7c12 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 Feb 2017 15:09:27 +0100 Subject: [PATCH 2660/3392] libasplib: add url to gcc bug report Add comment to bug report. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/libasplib/libasplib.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libasplib/libasplib.mk b/package/libasplib/libasplib.mk index b3b1fdb30f..558d173496 100644 --- a/package/libasplib/libasplib.mk +++ b/package/libasplib/libasplib.mk @@ -19,6 +19,7 @@ LIBASPLIB_CONF_OPTS = \ -DBUILD_TIMER=ON # Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509 ifeq ($(BR2_m68k_cf),y) LIBASPLIB_CXXFLAGS += -fno-dwarf2-cfi-asm endif From 82a935ae493b8159062c9c32b328c30ee130c5a8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 Feb 2017 15:10:06 +0100 Subject: [PATCH 2661/3392] kmsxx: fix build error for m68k/coldfire Fixes: http://autobuild.buildroot.org/results/fc8/fc820e0b558537f771588b0e1291a8332427ff8d/ Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/kmsxx/kmsxx.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/kmsxx/kmsxx.mk b/package/kmsxx/kmsxx.mk index 730292eb7e..c06d20be61 100644 --- a/package/kmsxx/kmsxx.mk +++ b/package/kmsxx/kmsxx.mk @@ -12,6 +12,12 @@ KMSXX_INSTALL_STAGING = YES KMSXX_DEPENDENCIES = libdrm host-pkgconf KMSXX_CONF_OPTS = -DKMSXX_ENABLE_PYTHON=OFF +# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509 +ifeq ($(BR2_m68k_cf),y) +KMSXX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm" +endif + ifeq ($(BR2_PACKAGE_KMSXX_INSTALL_TESTS),y) KMSXX_TESTS = \ fbtestpat kmsblank kmscapture \ From 6cff741ebaf7123739398686ace186ed9974e71c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 14 Feb 2017 18:24:32 +0100 Subject: [PATCH 2662/3392] package/ccache: do not force colored diagnostics When GCC_COLORS is set, ccache passes '-fdiagnostics-color' to GCC but this flag requires GCC v4.9 or later. Older versions complain about the unrecognized command line option. Using GCC_COLORS in the context of Buildroot is seldom useful, so we just unexport GCC_COLORS altogether. Reported-by: Carlos Santos Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index dcda8fe024..4db971b0cd 100644 --- a/Makefile +++ b/Makefile @@ -402,6 +402,7 @@ unexport QMAKESPEC unexport TERMINFO unexport MACHINE unexport O +unexport GCC_COLORS GNU_HOST_NAME := $(shell support/gnuconfig/config.guess) From adb6ffda7890de932a4f6e435cfd903c345ca039 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 14 Feb 2017 21:21:31 +0100 Subject: [PATCH 2663/3392] package/hiredis: fix makefile code Signed-off-by: "Yann E. MORIN" Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hiredis/hiredis.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index eb96711ab7..cd406f1439 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -19,7 +19,7 @@ ifeq ($(BR2_STATIC_LIBS),y) HIREDIS_TARGETS += static else ifeq ($(BR2_SHARED_LIBS),y) HIREDIS_TARGETS += dynamic -else ifeq $(BR2_SHARED_STATIC_LIBS),y) +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) HIREDIS_TARGETS += dynamic static endif From 2d262d90646de7841e5063e56fd95b4a3cfec5e6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 14 Feb 2017 21:34:58 +0100 Subject: [PATCH 2664/3392] cbootimage: disable on musl cbootimage uses non-standard u_intXX_t types instead of the C99 types uintXX_t types, which prevents it from building with the musl C library. A patch to fix this has been submitted upstream, but since there are many many occurences of such types, the patch is a bit large to carry in Buildroot, especially compared to the fact that having this package building against musl is probably not a top priority. So for now, simply disable this package on musl, until upstream fixes the issue and releases a new version. Fixes: http://autobuild.buildroot.net/results/61bdfb7e0ff9628190d9eb86e40c4c90e768b8e2 Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/cbootimage/Config.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/cbootimage/Config.in b/package/cbootimage/Config.in index 1a7fef0b39..b798e5d988 100644 --- a/package/cbootimage/Config.in +++ b/package/cbootimage/Config.in @@ -1,9 +1,16 @@ config BR2_PACKAGE_CBOOTIMAGE bool "cbootimage" depends on BR2_arm || BR2_armeb + # uses non-standard u_intXX_t types + # https://github.com/NVIDIA/cbootimage/pull/7 + depends on !BR2_TOOLCHAIN_USES_MUSL help This project provides a tool which compiles BCT (Boot Configuration Table) images to place into the boot flash of a Tegra-based device. https://github.com/NVIDIA/cbootimage + +comment "cbootimage needs a glibc or uClibc toolchain" + depends on BR2_arm || BR2_armeb + depends on BR2_TOOLCHAIN_USES_MUSL From b6ae70eba239054052da977920462f8bb40f3965 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 14 Feb 2017 21:47:59 +0100 Subject: [PATCH 2665/3392] cups: add host-pkgconf as a dependency cups configure script checks for a pkg-config program. If host-pkgconf has not been built prior to cups, it uses the system pkg-config, which might potentially lead to bogus results: checking for i586-buildroot-linux-musl-pkg-config... no checking for pkg-config... /usr/bin/pkg-config With this patch applied: checking for i586-buildroot-linux-musl-pkg-config... no checking for pkg-config... /home/thomas/projets/buildroot/output/host/usr/bin/pkg-config Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/cups/cups.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 05737767f8..7ef2f36a22 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -28,6 +28,7 @@ CUPS_CONF_OPTS = \ CUPS_CONFIG_SCRIPTS = cups-config CUPS_DEPENDENCIES = \ host-autoconf \ + host-pkgconf \ $(if $(BR2_PACKAGE_ZLIB),zlib) ifeq ($(BR2_PACKAGE_SYSTEMD),y) From 41d8daa7e94c1b6a86c4d0cd50e712698c2c4571 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 14 Feb 2017 21:34:50 +0100 Subject: [PATCH 2666/3392] libv4l/ir-ctl: fix musl compile - add copy of TEMP_FAILURE_RETRY macro - use strdup instead of strdupa Fixes [1]: ir-ctl.c:(.text+0xb06): undefined reference to `strndupa' ir-ctl.c:(.text+0xe01): undefined reference to `TEMP_FAILURE_RETRY' [1] http://autobuild.buildroot.net/results/b8b96c7bbf2147dacac62485cbfdbcfd758271a5 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- .../0002-ir-ctl-fixes-for-musl-compile.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch diff --git a/package/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch b/package/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch new file mode 100644 index 0000000000..5bce2d916a --- /dev/null +++ b/package/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch @@ -0,0 +1,59 @@ +From 9908872aaa614a6c4bba80d7a5f1adea7ca7117e Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 14 Feb 2017 21:27:59 +0100 +Subject: [PATCH] ir-ctl: fixes for musl compile + +- add copy of TEMP_FAILURE_RETRY macro +- use strdup instead of strdupa + +Fixes [1]: + + ir-ctl.c:(.text+0xb06): undefined reference to `strndupa' + ir-ctl.c:(.text+0xe01): undefined reference to `TEMP_FAILURE_RETRY' + +[1] http://autobuild.buildroot.net/results/b8b96c7bbf2147dacac62485cbfdbcfd758271a5 + +Signed-off-by: Peter Seiderer +--- + utils/ir-ctl/ir-ctl.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c +index bc58cee..e9da777 100644 +--- a/utils/ir-ctl/ir-ctl.c ++++ b/utils/ir-ctl/ir-ctl.c +@@ -44,6 +44,15 @@ + + # define N_(string) string + ++/* taken from glibc unistd.h */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif + + /* See drivers/media/rc/ir-lirc-codec.c line 23 */ + #define LIRCBUF_SIZE 512 +@@ -344,12 +353,14 @@ static struct file *read_scancode(const char *name) + return NULL; + } + +- pstr = strndupa(name, p - name); ++ pstr = strndup(name, p - name); + + if (!protocol_match(pstr, &proto)) { + fprintf(stderr, _("error: protocol '%s' not found\n"), pstr); ++ free(pstr); + return NULL; + } ++ free(pstr); + + if (!strtoscancode(p + 1, &scancode)) { + fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1); +-- +2.11.0 + From 3c0aeeed04ecfb9a2e8650b4fa0f515a7959e7cf Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 14 Feb 2017 20:45:08 +0100 Subject: [PATCH 2667/3392] ddrescue: fix uclibc compile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes compile failure with uclibc [1] because of missing stdio.h include: In file included from io.cc:28:0: block.h:219:22: error: ‘FILE’ has not been declared int write_mapfile( FILE * f = 0, const bool timestamp = false, [1] http://autobuild.buildroot.net/results/4ac0754f1cc5ea934d6437e89d1f4906fb3fd0a8 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- .../0001-io.cc-add-stdio.h-include.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/ddrescue/0001-io.cc-add-stdio.h-include.patch diff --git a/package/ddrescue/0001-io.cc-add-stdio.h-include.patch b/package/ddrescue/0001-io.cc-add-stdio.h-include.patch new file mode 100644 index 0000000000..e719c708e8 --- /dev/null +++ b/package/ddrescue/0001-io.cc-add-stdio.h-include.patch @@ -0,0 +1,36 @@ +From 0f72787b922c53c33d497b17300a959b911e621f Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Tue, 14 Feb 2017 20:12:05 +0100 +Subject: [PATCH] io.cc: add stdio.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes buildroot compile failure with uclibc [1]: + + In file included from io.cc:28:0: + block.h:219:22: error: ‘FILE’ has not been declared + int write_mapfile( FILE * f = 0, const bool timestamp = false, + +[1] http://autobuild.buildroot.net/results/4ac0754f1cc5ea934d6437e89d1f4906fb3fd0a8 + +Signed-off-by: Peter Seiderer +--- + io.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/io.cc b/io.cc +index 36b8341..2d6a76e 100644 +--- a/io.cc ++++ b/io.cc +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + #include "block.h" +-- +2.11.0 + From d5c22302f9d1a73d40e5f4748440b37b22da04f2 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Tue, 14 Feb 2017 10:33:54 +0100 Subject: [PATCH 2668/3392] package/libgpiod: bump version to 0.1.3 Release 0.1.2 claimed to fix an issue with requesting both types of line events, but actually didn't. This time it's really fixed. Signed-off-by: Bartosz Golaszewski Signed-off-by: Thomas Petazzoni --- package/libgpiod/libgpiod.hash | 2 +- package/libgpiod/libgpiod.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgpiod/libgpiod.hash b/package/libgpiod/libgpiod.hash index 9901be6ace..eee2a66280 100644 --- a/package/libgpiod/libgpiod.hash +++ b/package/libgpiod/libgpiod.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 c9a60e1073aacb25b4ad06d513f31416335b5a710f869cb7e838d2abb62e1e00 libgpiod-v0.1.2.tar.gz +sha256 670a13518fabf2a99f9e349c33d5421c2146eec15b73c5edef3f1981a7adaeda libgpiod-v0.1.3.tar.gz diff --git a/package/libgpiod/libgpiod.mk b/package/libgpiod/libgpiod.mk index dbf9511f44..bc9c6eca39 100644 --- a/package/libgpiod/libgpiod.mk +++ b/package/libgpiod/libgpiod.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPIOD_VERSION = v0.1.2 +LIBGPIOD_VERSION = v0.1.3 LIBGPIOD_SITE = $(call github,brgl,libgpiod,$(LIBGPIOD_VERSION)) LIBGPIOD_LICENSE = GPLv3+ LIBGPIOD_LICENSE_FILES = COPYING From 258bb0381144d1c663756af72acff4602bcc2700 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 15 Feb 2017 11:50:52 +0100 Subject: [PATCH 2669/3392] musl: no SSP on i386 and PowerPC Due to what appears a bug in gcc according to the musl developers, but that the gcc developers don't want to fix, SSP support currently don't work on i386 and PowerPC with musl. Additional details can be found at: http://www.openwall.com/lists/musl/2016/12/04/2 OpenWRT and Alpine Linux both have musl and gcc patches to work around the issue, but in the context of Buildroot, we at this point don't care enough about SSP support specifically with musl on those architectures to carry additional patches. Currently, having SSP enabled with musl/i386 causes a number of build failures in the autobuilders: cups, ipmiutil, openssh, ruby, stunnel, sudo and mosh at least all fail to build because of this. So we simply disable SSP support in the toolchain when musl is used on i386 and PowerPC. The PowerPC case is not tested in the autobuilders, but has been reproduced locally and is also fixed by this patch. Fixes: mosh http://autobuild.buildroot.net/results/60aa12f1aed08e3b7a98f9ce7091bee3a44d692c/ ipmi-util http://autobuild.buildroot.net/results/fb9a071b8739527f424cfe2886ec480f438f70ab/ cups http://autobuild.buildroot.net/results/486dea944d6ecba5c4e6e8ac664261c1909f4b4c/ openssh http://autobuild.buildroot.net/results/742a8bf4726de6e9ba6926e3fb6019a434454e48/ sudo http://autobuild.buildroot.net/results/682531f368c4e982cafe9e625dd41f6d8c7f93f9/ ruby http://autobuild.buildroot.net/results/dac660f96c7f85e933a6b82cf61edd429eeae9aa/ stunnel http://autobuild.buildroot.net/results/cee52505f1ac2da2f5ba86c9ebfd1f5cd9e301be/ Thanks to Yann E. Morin for suggesting to simply disable SSP support rather than trying to fix it. [Peter: add comment explaining why] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/musl/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/musl/Config.in b/package/musl/Config.in index 18ae69d280..2775313af5 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MUSL depends on BR2_TOOLCHAIN_USES_MUSL default y select BR2_PACKAGE_LINUX_HEADERS - select BR2_TOOLCHAIN_HAS_SSP + # SSP broken on i386/ppc: http://www.openwall.com/lists/musl/2016/12/04/2 + select BR2_TOOLCHAIN_HAS_SSP if !(BR2_i386 || BR2_powerpc) # Compatibility headers: cdefs.h, queue.h select BR2_PACKAGE_MUSL_COMPAT_HEADERS From f4cb8f2d4a9805ccdd084f16a25990e88da463c1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 15:10:36 -0300 Subject: [PATCH 2670/3392] redis: bump to version 3.2.8 It fixes a regression in the 3.2.7 security release that can cause server deadlocks. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/redis/redis.hash | 4 ++-- package/redis/redis.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index d4ac7c3557..3cd86470bd 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,4 +1,4 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha1 6889af053020cd72ebb16805ead0ce9b3a69a9ef redis-3.2.7.tar.gz +sha1 6780d1abb66f33a97aad0edbe020403d0a15b67f redis-3.2.8.tar.gz # Calculated based on the hash above -sha256 bf9df3e5374bfe7bfc3386380f9df13d94990011504ef07632b3609bb2836fa9 redis-3.2.7.tar.gz +sha256 61b373c23d18e6cc752a69d5ab7f676c6216dc2853e46750a8c4ed791d68482c redis-3.2.8.tar.gz diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 63964b5f98..8ab6e726e3 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 3.2.7 +REDIS_VERSION = 3.2.8 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From 4d09d968aa8cf06459b2e8e00864a13ddfa637ee Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 16:07:03 -0300 Subject: [PATCH 2671/3392] linux-headers: bump 3.10.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index b1d117a8ca..73420d61d9 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -216,7 +216,7 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.84" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 - default "3.10.104" if BR2_KERNEL_HEADERS_3_10 + default "3.10.105" if BR2_KERNEL_HEADERS_3_10 default "3.12.70" if BR2_KERNEL_HEADERS_3_12 default "3.18.48" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 From b82b4441a634dfa3fdcf02f6a565e98430445b3e Mon Sep 17 00:00:00 2001 From: Mylene JOSSERAND Date: Wed, 15 Feb 2017 18:12:16 +0100 Subject: [PATCH 2672/3392] package/x11r7/xserver_xorg-server: Add patch to fix v1.19.1 with SIGIO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The commit 6a5a4e60373c from xserver v1.19.1 removes SIGIO support for input [1]. The current patch coming from Open Embedded [2] removes a check of 'useSIGIO'. This check was producing a segfault error while using X11 and Vivante driver [3]. Thanks to Gary Bisson to point out this patch! [1] https://cgit.freedesktop.org/xorg/xserver/commit/?id=6a5a4e60373c1386b311b2a8bb666c32d68a9d99 [2] https://patchwork.openembedded.org/patch/136696/ [3] http://lists.busybox.net/pipermail/buildroot/2017-February/183994.html Signed-off-by: Mylène Josserand Signed-off-by: Thomas Petazzoni --- ...003-Remove-check-for-useSIGIO-option.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/x11r7/xserver_xorg-server/1.19.1/0003-Remove-check-for-useSIGIO-option.patch diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0003-Remove-check-for-useSIGIO-option.patch b/package/x11r7/xserver_xorg-server/1.19.1/0003-Remove-check-for-useSIGIO-option.patch new file mode 100644 index 0000000000..d4f0cca67e --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.19.1/0003-Remove-check-for-useSIGIO-option.patch @@ -0,0 +1,53 @@ +From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001 +From: Prabhu Sundararaj +Date: Mon, 30 Jan 2017 16:32:06 -0600 +Subject: [PATCH] Remove check for useSIGIO option + +Original patch follows: +Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO +option. + +As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO +and OsReleaseSIGIO. + +No longer the check for useSIGIO is needed + +Upstream-Status: Pending + +Signed-off-by: Prabhu Sundararaj + +Downloaded from +https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch + +Signed-off-by: Mylène Josserand +--- + hw/xfree86/os-support/shared/sigio.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c +index 884a71c..be76498 100644 +--- a/hw/xfree86/os-support/shared/sigio.c ++++ b/hw/xfree86/os-support/shared/sigio.c +@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure) + int i; + int installed = FALSE; + +- if (!xf86Info.useSIGIO) +- return 0; +- + for (i = 0; i < MAX_FUNCS; i++) { + if (!xf86SigIOFuncs[i].f) { + if (xf86IsPipe(fd)) +@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd) + int max; + int ret; + +- if (!xf86Info.useSIGIO) +- return 0; +- + max = 0; + ret = 0; + for (i = 0; i < MAX_FUNCS; i++) { +-- +2.7.4 + From 990d2715fec8ccd974a1adc9a11c7d193594e147 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 15 Feb 2017 16:30:47 +0100 Subject: [PATCH 2673/3392] mesa3d-headers: fix installation of dri.pc /usr/lib/pkg-config/ is not the correct installation path for .pc files, it should be in /usr/lib/pkgconfig/ Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 2c62c48ce6..7ae5966926 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -47,7 +47,7 @@ define MESA3D_HEADERS_INSTALL_DRI_PC $(INSTALL) -D -m 0644 $(@D)/include/GL/internal/dri_interface.h \ $(STAGING_DIR)/usr/include/GL/internal/dri_interface.h $(INSTALL) -D -m 0644 $(@D)/src/mesa/drivers/dri/dri.pc \ - $(STAGING_DIR)/usr/lib/pkg-config/dri.pc + $(STAGING_DIR)/usr/lib/pkgconfig/dri.pc endef endif # Xorg From 8988e43dc19d5a42f1d8bf606df596ae5b928ecf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 15 Feb 2017 16:30:48 +0100 Subject: [PATCH 2674/3392] mesa3d-headers: remove installation of OpenVG headers OpenVG support has been completely removed from mesa3d in commit 3acd7a34ab05b87521b74f626ec637e7fdcc6595, merged in mesa-10.6.0. Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 7ae5966926..35b1a71442 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -62,10 +62,6 @@ ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) MESA3D_HEADERS_DIRS += GLES GLES2 endif -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -MESA3D_HEADERS_DIRS += VG -endif - define MESA3D_HEADERS_BUILD_CMDS $(MESA3D_HEADERS_BUILD_DRI_PC) endef From 326d4f3b9ac4d45a4534b0fa9557a8a89e5bca24 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 15 Feb 2017 11:51:26 -0200 Subject: [PATCH 2675/3392] linux: bump default to version 4.9.10 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 740dd391c9..95ccfb3721 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.9.9)" + bool "Latest version (4.9.10)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.9.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.9.10" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From cd2826c183c5d4ce356aabd319e49cfab9bba889 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 15 Feb 2017 11:51:27 -0200 Subject: [PATCH 2676/3392] linux-headers: bump 4.{4, 9}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 73420d61d9..6485025608 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.48" if BR2_KERNEL_HEADERS_4_4 + default "4.4.49" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.9" if BR2_KERNEL_HEADERS_4_9 + default "4.9.10" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 0692d7facb0f28686b5366ac40fce48cee1d91a1 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 15 Feb 2017 10:27:36 -0200 Subject: [PATCH 2677/3392] board/udoo/neo: specify an offset for the rootfs partition When manually writing SPL and u-boot.img to the SD card the rootfs gets corrupted. Fix this issue by passing a 1MB offset for the rootfs. Reported-by: Breno Lima Signed-off-by: Fabio Estevam Tested-by: Breno Lima Signed-off-by: Thomas Petazzoni --- board/udoo/neo/genimage.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/board/udoo/neo/genimage.cfg b/board/udoo/neo/genimage.cfg index 1f7edf4aa3..46209120f0 100644 --- a/board/udoo/neo/genimage.cfg +++ b/board/udoo/neo/genimage.cfg @@ -26,6 +26,7 @@ image sdcard.img { partition rootfs { partition-type = 0x83 image = "rootfs.ext4" + offset = 1M size = 512M } } From 08992f9c3a47b54d6b3d9d4130a6f00b79385595 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 15 Feb 2017 12:38:10 +0100 Subject: [PATCH 2678/3392] cannelloni: fix build failure caused by missing include Add a patch, that explicitly includes cstdio header. Fixes: http://autobuild.buildroot.net/results/82d/82d1dca3aa7ee9189baae985db59464d95696ed7/ Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- .../0001-Add-missing-cstdio-include.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/cannelloni/0001-Add-missing-cstdio-include.patch diff --git a/package/cannelloni/0001-Add-missing-cstdio-include.patch b/package/cannelloni/0001-Add-missing-cstdio-include.patch new file mode 100644 index 0000000000..1e4ad00396 --- /dev/null +++ b/package/cannelloni/0001-Add-missing-cstdio-include.patch @@ -0,0 +1,29 @@ +From d41f5ec6bb66654558757c3ef9cd2a158ee06ccc Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Wed, 15 Feb 2017 09:29:29 +0100 +Subject: [PATCH] Add missing include + +This header defines EOF macro. Some toolchains cannot +find this macro, if is missing. So include it +explicitly. + +Signed-off-by: Yegor Yefremov +--- + sctpthread.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sctpthread.cpp b/sctpthread.cpp +index 6c83fed..d83b472 100644 +--- a/sctpthread.cpp ++++ b/sctpthread.cpp +@@ -19,6 +19,7 @@ + */ + + #include ++#include + #include + + #include +-- +2.1.4 + From 9244ad854d30e8c942460646ef6f6194ee44942d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 15 Feb 2017 15:51:02 +0100 Subject: [PATCH 2679/3392] package/mpd: add choice between version 0.19 and 0.20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MPD version 0.20 being affected by GCC PR libstdc++/64735 means no mpd package available in Buildroot for the architectures NIOSII, ARMv4, ARMv5 and SPARCv8 until GCC 7 is released. As the next Buildroot release is in 2017.02, which is before GCC 7 is expected to be finished we add hidden config symbols to select the version branch to use. Note, that we bumped the version from 0.19 to 0.20 quite recently within the current Buildroot release cycle. This way we can keep the support for mpd on the affected architectures, like ARMv5, until GCC 7 is out. Note, that for the version 0.19 MPD requires libglib2. Signed-off-by: Jörg Krause Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/mpd/Config.in | 26 +++++++++++++++++++++----- package/mpd/mpd.hash | 1 + package/mpd/mpd.mk | 10 +++++++++- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 8a28b4f1a3..8eabbbc796 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -4,9 +4,10 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_USE_WCHAR # flac depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 depends on BR2_TOOLCHAIN_HAS_ATOMIC + # 0.19.x could be built with GCC 4.6, but for simplicity we require + # the same toolchain dependencies for all versions. + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG) @@ -20,6 +21,24 @@ menuconfig BR2_PACKAGE_MPD if BR2_PACKAGE_MPD +# Hidden config symbols to select the branch 0.20 by default and fallback +# to branch 0.19 for toolchains affected by GCC bug PR 64735. This way we +# keep support for mpd on some architectures, like ARMv5, until GCC 7 is +# released, which will fix this issue. +config BR2_PACKAGE_MPD_VERSION_STRING + string + default "0.20" if !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + default "0.19" + +config BR2_PACKAGE_MPD_VERSION_0_20 + bool + default y if BR2_PACKAGE_MPD_VERSION_STRING = "0.20" + +config BR2_PACKAGE_MPD_VERSION_0_19 + bool + default y if BR2_PACKAGE_MPD_VERSION_STRING = "0.19" + select BR2_PACKAGE_LIBGLIB2 + comment "Archive plugins" config BR2_PACKAGE_MPD_BZIP2 @@ -320,6 +339,3 @@ comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - -comment "mpd needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index ee46f3cc5d..ecd78e97c1 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature sha256 712b25351c12616630c580204e1c3dcba3ae2993a56cff1c346c87e334d69728 mpd-0.20.4.tar.xz +sha256 8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730 mpd-0.19.21.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 0efc8685f5..8869176d2d 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -4,8 +4,12 @@ # ################################################################################ -MPD_VERSION_MAJOR = 0.20 +MPD_VERSION_MAJOR = $(call qstrip,$(BR2_PACKAGE_MPD_VERSION_STRING)) +ifeq ($(BR2_PACKAGE_MPD_VERSION_0_20),y) MPD_VERSION = $(MPD_VERSION_MAJOR).4 +else +MPD_VERSION = $(MPD_VERSION_MAJOR).21 +endif MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost @@ -13,6 +17,10 @@ MPD_LICENSE = GPLv2+ MPD_LICENSE_FILES = COPYING MPD_AUTORECONF = YES +ifeq ($(BR2_MPD_VERSION_0_19),y) +MPD_DEPENDENCIES += libglib2 +endif + # Some options need an explicit --disable or --enable # Zeroconf support depends on libdns_sd from avahi. From dc7fcbe494ffddcaba630889fe1a2915569be3f1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 12 Feb 2017 22:15:38 +0200 Subject: [PATCH 2680/3392] package: refactor listing of extractor dependencies Don't special case $(XZCAT) when constructing DL_TOOLS_DEPENDENCIES. The next commit will introduce another extractor that automatically builds when not installed. Introduce EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS that lists archive extensions for which the extractor is already checked in support/dependencies/check-host-foo.mk. Use this in the newly introduced extractor-dependency to populate DL_TOOLS_DEPENDENCIES. Cc: Thomas De Schampheleire Signed-off-by: Baruch Siach Reviewed-by: Thomas De Schampheleire [Thomas: add missing space after "firstword", as noticed by Thomas DS.] Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 8 +------- package/pkg-utils.mk | 7 +++++++ support/dependencies/check-host-xzcat.mk | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 3ca71b03b9..e8a8021e3c 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -926,13 +926,7 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD -# $(firstword) is used here because the extractor can have arguments, like -# ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'. -# Do not add xzcat to the list of required dependencies, as it gets built -# automatically if it isn't found. -ifneq ($$(call suitable-extractor,$$($(2)_SOURCE)),$$(XZCAT)) -DL_TOOLS_DEPENDENCIES += $$(firstword $$(call suitable-extractor,$$($(2)_SOURCE))) -endif +DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. .PHONY: $(1) \ diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index c5d4080c72..38d00dbbfb 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -45,6 +45,13 @@ INFLATE.tar = cat # suitable-extractor(filename): returns extractor based on suffix suitable-extractor = $(INFLATE$(suffix $(1))) +# extractor-dependency(filename): returns extractor for 'filename' if the +# extractor is a dependency. If we build the extractor return nothing. +# $(firstword) is used here because the extractor can have arguments, like +# ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'. +extractor-dependency = $(firstword $(INFLATE$(filter-out \ + $(EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS),$(suffix $(1))))) + # check-deprecated-variable -- throw an error on deprecated variables # example: # $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS)) diff --git a/support/dependencies/check-host-xzcat.mk b/support/dependencies/check-host-xzcat.mk index 5e08b6e886..c6d9eebe4d 100644 --- a/support/dependencies/check-host-xzcat.mk +++ b/support/dependencies/check-host-xzcat.mk @@ -3,5 +3,6 @@ ifeq (,$(call suitable-host-package,xzcat,$(XZCAT))) DEPENDENCIES_HOST_PREREQ += host-xz +EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .xz .lzma XZCAT = $(HOST_DIR)/usr/bin/xzcat endif From f165032e4f01aa46b43cc8136bac1c5b47aa8545 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 12 Feb 2017 22:15:39 +0200 Subject: [PATCH 2681/3392] package: add generic support for lz archives This commit teaches the generic package handling code how to extract .tar.lz archives. When lzip is not installed on the host, host-lzip gets built automatically. Signed-off-by: Baruch Siach Reviewed-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- Config.in | 7 +++++++ Makefile | 1 + package/pkg-utils.mk | 1 + support/dependencies/check-host-lzip.mk | 5 +++++ support/dependencies/check-host-lzip.sh | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 support/dependencies/check-host-lzip.mk create mode 100755 support/dependencies/check-host-lzip.sh diff --git a/Config.in b/Config.in index ccd777e8bb..bd8f0d1a10 100644 --- a/Config.in +++ b/Config.in @@ -158,6 +158,13 @@ config BR2_XZCAT Command to be used to extract a xz'ed file to stdout. Default is "xzcat" +config BR2_LZCAT + string "lzcat command" + default "lzip -d -c" + help + Command to be used to extract a lzip'ed file to stdout. + Default is "lzip -d -c" + config BR2_TAR_OPTIONS string "Tar options" default "" diff --git a/Makefile b/Makefile index 4db971b0cd..9663d15ee0 100644 --- a/Makefile +++ b/Makefile @@ -432,6 +432,7 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \ ZCAT := $(call qstrip,$(BR2_ZCAT)) BZCAT := $(call qstrip,$(BR2_BZCAT)) XZCAT := $(call qstrip,$(BR2_XZCAT)) +LZCAT := $(call qstrip,$(BR2_LZCAT)) TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf # packages compiled for the host go here diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 38d00dbbfb..c95e77953b 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -36,6 +36,7 @@ pkgname = $(lastword $(subst /, ,$(pkgdir))) # Define extractors for different archive suffixes INFLATE.bz2 = $(BZCAT) INFLATE.gz = $(ZCAT) +INFLATE.lz = $(LZCAT) INFLATE.lzma = $(XZCAT) INFLATE.tbz = $(BZCAT) INFLATE.tbz2 = $(BZCAT) diff --git a/support/dependencies/check-host-lzip.mk b/support/dependencies/check-host-lzip.mk new file mode 100644 index 0000000000..6acfdc6dfa --- /dev/null +++ b/support/dependencies/check-host-lzip.mk @@ -0,0 +1,5 @@ +ifeq (,$(call suitable-host-package,lzip,$(LZCAT))) +DEPENDENCIES_HOST_PREREQ += host-lzip +EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .lz +LZCAT = $(HOST_DIR)/usr/bin/lzip -d -c +endif diff --git a/support/dependencies/check-host-lzip.sh b/support/dependencies/check-host-lzip.sh new file mode 100755 index 0000000000..4f8a2ba3de --- /dev/null +++ b/support/dependencies/check-host-lzip.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +candidate="$1" + +lzip=`which $candidate 2>/dev/null` +if [ ! -x "$lzip" ]; then + lzip=`which lzip 2>/dev/null` + if [ ! -x "$lzip" ]; then + # echo nothing: no suitable lzip found + exit 1 + fi +fi + +echo $lzip From 77941272f41c484a71c2a76be285a514ed518957 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 12 Feb 2017 22:15:40 +0200 Subject: [PATCH 2682/3392] ed: use generic extract command The generic code now knows how to extract .tar.lz archives. Remove the local extract code. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/ed/ed.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/ed/ed.mk b/package/ed/ed.mk index 50adeb4ec5..6b9f65ec52 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -10,15 +10,9 @@ ED_SOURCE = ed-$(ED_VERSION).tar.lz ED_CONF_OPTS = \ CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" -ED_DEPENDENCIES = host-lzip ED_LICENSE = GPLv3+ ED_LICENSE_FILES = COPYING -define ED_EXTRACT_CMDS - $(HOST_DIR)/usr/bin/lzip -d -c $(DL_DIR)/$(ED_SOURCE) | \ - tar --strip-components=1 -C $(@D) $(TAR_OPTIONS) - -endef - define ED_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_MAKE_ENV) ./configure \ From 42a7a97c270c2148136093d6ad372f390ac20685 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 12 Feb 2017 22:15:41 +0200 Subject: [PATCH 2683/3392] ddrescue: use generic extract command The generic code now knows how to extract .tar.lz archives. Remove the local extract code Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/ddrescue/ddrescue.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk index 145d0520d6..4e244e6bda 100644 --- a/package/ddrescue/ddrescue.mk +++ b/package/ddrescue/ddrescue.mk @@ -9,12 +9,6 @@ DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPLv2+ DDRESCUE_LICENSE_FILES = COPYING -DDRESCUE_DEPENDENCIES = host-lzip - -define DDRESCUE_EXTRACT_CMDS - $(HOST_DIR)/usr/bin/lzip -d -c $(DL_DIR)/$(DDRESCUE_SOURCE) | \ - tar --strip-components=1 -C $(@D) $(TAR_OPTIONS) - -endef define DDRESCUE_CONFIGURE_CMDS (cd $(@D); \ From bfbd42fd1c5ddc374bd26fea29cc1ac819101fc7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 12 Feb 2017 22:15:42 +0200 Subject: [PATCH 2684/3392] ocrad: use generic extract command The generic code now knows how to extract .tar.lz archives. Remove the local extract code Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/ocrad/ocrad.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk index d19e83ef42..54b607c791 100644 --- a/package/ocrad/ocrad.mk +++ b/package/ocrad/ocrad.mk @@ -10,12 +10,6 @@ OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad OCRAD_LICENSE = GPLv3+ OCRAD_LICENSE_FILES = COPYING OCRAD_INSTALL_STAGING = YES -OCRAD_DEPENDENCIES = host-lzip - -define OCRAD_EXTRACT_CMDS - $(HOST_DIR)/usr/bin/lzip -d -c $(DL_DIR)/$(OCRAD_SOURCE) | \ - tar --strip-components=1 -C $(@D) $(TAR_OPTIONS) - -endef # This is not a true autotools package. define OCRAD_CONFIGURE_CMDS From 8ae3dce5275915a1784b00bf145af907827fed0d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 15 Feb 2017 22:34:44 +0100 Subject: [PATCH 2685/3392] postgresql: disable spinlocks on openrisc Just like all non-mainstream architectures, postgresql doesn't provide its internal spinlock implementation on OpenRISC, so disable it. Fixes: http://autobuild.buildroot.net/results/e9de750e34f10c4a2403696936260ad1547d0d15/ Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 786ef4876a..bc2bf47ee7 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -29,7 +29,7 @@ ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) POSTGRESQL_CONF_OPTS += --disable-thread-safety endif -ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_nios2)$(BR2_xtensa),y) +ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_or1k)$(BR2_nios2)$(BR2_xtensa),y) POSTGRESQL_CONF_OPTS += --disable-spinlocks endif From dd6893adad3693cd3440d0ced10e67b296a08c47 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 15 Feb 2017 22:48:25 +0100 Subject: [PATCH 2686/3392] tcping: fix upstream location The upstream site is no longer available from http://www.linuxco.de, but only from http://linuxco.de. Fixes: http://autobuild.buildroot.net/results/03caf8403c31e2424c338de4df636dd900408b14/ Signed-off-by: Thomas Petazzoni --- package/tcping/Config.in | 2 +- package/tcping/tcping.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcping/Config.in b/package/tcping/Config.in index 6677b58b7c..e72df096c3 100644 --- a/package/tcping/Config.in +++ b/package/tcping/Config.in @@ -11,4 +11,4 @@ config BR2_PACKAGE_TCPING desired port is reachable and then start connection establishment. - http://www.linuxco.de/tcping/tcping.html + http://linuxco.de/tcping/tcping.html diff --git a/package/tcping/tcping.mk b/package/tcping/tcping.mk index 4633b98265..f5919bb8bc 100644 --- a/package/tcping/tcping.mk +++ b/package/tcping/tcping.mk @@ -5,7 +5,7 @@ ################################################################################ TCPING_VERSION = 1.3.5 -TCPING_SITE = http://www.linuxco.de/tcping +TCPING_SITE = http://linuxco.de/tcping TCPING_LICENSE = GPLv3+ TCPING_LICENSE_FILES = LICENSE From d246cf5fd01bb0d20a0e64194ffed514ea8dd0aa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 16 Feb 2017 09:23:51 +0100 Subject: [PATCH 2687/3392] libraw: fix build with old glibc versions Prior to glibc 2.18, definitions like SIZE_MAX or INT_FAST32_MAX from were only made available for C code, or in C++ if __STDC_LIMIT_MACROS was defined. The code from jasper uses such definitions, without defining __STDC_LIMIT_MACROS. Unfortunately, defining __STDC_LIMIT_MACROS in the jasper headers doesn't work, since has already been included before, at a point where __STDC_LIMIT_MACROS was not defined. So to solve this problem, we simply pass -D__STDC_LIMIT_MACROS in CXXFLAGS when building libraw with jasper support. Fixes: http://autobuild.buildroot.net/results/908aef6c82d56060933713df217b6b2ba21a01b0/ Signed-off-by: Thomas Petazzoni --- package/libraw/libraw.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index d76a1808d5..f78ce1e0cb 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -21,10 +21,15 @@ LIBRAW_CONF_OPTS += \ LIBRAW_LICENSE = LGPLv2.1 or CDDL 1.0 or LibRaw Software License 27032010 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL LICENSE.LibRaw.pdf README LIBRAW_DEPENDENCIES = host-pkgconf +LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) +LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" ifeq ($(BR2_PACKAGE_JASPER),y) LIBRAW_CONF_OPTS += --enable-jasper LIBRAW_DEPENDENCIES += jasper +# glibc prior to 2.18 only defines constants such as SIZE_MAX or +# INT_FAST32_MAX for C++ code if __STDC_LIMIT_MACROS is defined +LIBRAW_CXXFLAGS += -D__STDC_LIMIT_MACROS else LIBRAW_CONF_OPTS += --disable-jasper endif From 23fa0f66a0ef05358c340adf807033db69faeb19 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 15 Feb 2017 23:20:41 +0100 Subject: [PATCH 2688/3392] trousers: disable on ARC This package has been failing to build on ARC due to a toolchain bug since December 2015, causing a total of 168 build failures. Therefore, let's disable this package for now, until the toolchain issue gets resolved. Fixes^Wavoids: http://autobuild.buildroot.net/results/e65d1d7c5a4dd4616167cfe2aa938be6af139602/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/tpm-tools/Config.in | 2 ++ package/trousers/Config.in | 3 +++ 2 files changed, 5 insertions(+) diff --git a/package/tpm-tools/Config.in b/package/tpm-tools/Config.in index dd59aaaf49..83b65f3ae4 100644 --- a/package/tpm-tools/Config.in +++ b/package/tpm-tools/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_TPM_TOOLS select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE depends on BR2_TOOLCHAIN_HAS_THREADS # trousers depends on !BR2_STATIC_LIBS # trousers + depends on !BR2_arc # trousers help Tools to manage and diagnose a TPM @@ -12,3 +13,4 @@ config BR2_PACKAGE_TPM_TOOLS comment "tpm-tools needs a toolchain w/ threads, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_arc diff --git a/package/trousers/Config.in b/package/trousers/Config.in index 6ab74bf9a5..11ab874f00 100644 --- a/package/trousers/Config.in +++ b/package/trousers/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_TROUSERS depends on BR2_TOOLCHAIN_HAS_THREADS # doesn't build properly in static only configurations depends on !BR2_STATIC_LIBS + # broken toolchain + depends on !BR2_arc help The open-source TCG Software Stack (TSS). @@ -16,3 +18,4 @@ config BR2_PACKAGE_TROUSERS comment "trousers needs a toolchain w/ threads, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_arc From c9556ed90f22185b3abf822f0fe07afea661938a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 16 Feb 2017 19:38:46 +0100 Subject: [PATCH 2689/3392] dbus: security bump to version 1.10.16 >From http://www.openwall.com/lists/oss-security/2017/02/16/4 The latest dbus release 1.10.16 fixes two symlink attacks in non-production-suitable configurations. I am treating these as bugs rather than practical vulnerabilities, and very much hope neither of these is going to affect any real users, but I'm reporting them to oss-security in case there's an attack vector that I've missed. No CVEs assigned so far. Signed-off-by: Peter Korsgaard --- 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 14bee20455..af8143d315 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 23238f70353e38ce5ca183ebc9525c0d97ac00ef640ad29cf794782af6e6a083 dbus-1.10.14.tar.gz +sha256 a7b0ba6ea3e8d0e08afec5e3030d0245614268276620c536726f8fa6e5c43388 dbus-1.10.16.tar.gz diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index c765e0ae26..2d1583e550 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.10.14 +DBUS_VERSION = 1.10.16 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools) DBUS_LICENSE_FILES = COPYING From 426ffbe9522fe7e8d140c70747be28e369b3f7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 16 Feb 2017 09:26:29 +0100 Subject: [PATCH 2690/3392] package/mpd: use proper BR2_PACKAGE_MPD_VERSION_0_19 symbol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 9244ad854 [1] adds a hidden choice between version 0.19 and 0.20. The Makefile now uses a wrong symbol introduced by this commit. Fix by: s/BR2_MPD_VERSION_0_19/BR2_PACKAGE_MPD_VERSION_0_19. [1] https://git.buildroot.net/buildroot/commit/?id=9244ad854d30e8c942460646ef6f6194ee44942d Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/mpd/mpd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 8869176d2d..8e71ae2141 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -17,7 +17,7 @@ MPD_LICENSE = GPLv2+ MPD_LICENSE_FILES = COPYING MPD_AUTORECONF = YES -ifeq ($(BR2_MPD_VERSION_0_19),y) +ifeq ($(BR2_PACKAGE_MPD_VERSION_0_19),y) MPD_DEPENDENCIES += libglib2 endif From 9b2175c40d440ccad34e3aa3379214adda8c9f4d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 17 Feb 2017 21:24:03 +0100 Subject: [PATCH 2691/3392] samba4: requires NPTL With OpenRISC there is a uClibc-ng based toolchain for an architecture with MMU support, but with only Linuxthreads and no NPTL. Samba4 uses pthread_mutexattr_setrobust which is not implemented in uClibc-ng Linuxthreads. Fixes: http://autobuild.buildroot.net/results/ec8f078046c92ae23dc973c88ac0fef136ad1535 Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/samba4/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/Config.in b/package/samba4/Config.in index ce97bea84f..447418568d 100644 --- a/package/samba4/Config.in +++ b/package/samba4/Config.in @@ -1,7 +1,7 @@ -comment "samba4 needs a toolchain w/ RPC, wchar, dynamic library, threads" +comment "samba4 needs a toolchain w/ RPC, wchar, dynamic library, NPTL" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_NATIVE_RPC \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU config BR2_PACKAGE_SAMBA4 @@ -9,7 +9,7 @@ config BR2_PACKAGE_SAMBA4 depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR # python depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC - depends on BR2_TOOLCHAIN_HAS_THREADS # python -> libffi + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # python -> libffi depends on !BR2_STATIC_LIBS # python depends on !BR2_nios2 # binary too large, relocations don't fit depends on BR2_TOOLCHAIN_HAS_SYNC_4 From a97307259343fe6f0b94d04fb345a69a8008bc37 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 18 Feb 2017 14:18:03 +0100 Subject: [PATCH 2692/3392] gstreamer: fix unaligned detection for or1k Similar to how we do it for the other niche/new architectures. Signed-off-by: Peter Korsgaard --- package/gstreamer/gstreamer/gstreamer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gstreamer/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer/gstreamer.mk index f2bde30d29..cde7f8f62c 100644 --- a/package/gstreamer/gstreamer/gstreamer.mk +++ b/package/gstreamer/gstreamer/gstreamer.mk @@ -15,7 +15,7 @@ GSTREAMER_LICENSE_FILES = COPYING # Checking if unaligned memory access works correctly cannot be done when cross # compiling. For the following architectures there is no information available # in the configure script. -ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze)$(BR2_nios2),y) +ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze)$(BR2_nios2)$(BR2_or1k),y) GSTREAMER_CONF_ENV = as_cv_unaligned_access=no endif ifeq ($(BR2_aarch64),y) From 87c89c041aa60e6ab652ec8256905718057fc53c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 18 Feb 2017 14:18:04 +0100 Subject: [PATCH 2693/3392] gstreamer1: fix unaligned detection for or1k Fixes: http://autobuild.buildroot.net/results/717/717d78ce0935749f477bdf3133b6f20057a28c01/ Add patch to fix unaligned detection for or1k. Patch submitted upstream: https://bugzilla.gnome.org/show_bug.cgi?id=778866 Signed-off-by: Peter Korsgaard --- ...ix-unaligned-access-support-for-the-.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch diff --git a/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch b/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch new file mode 100644 index 0000000000..88f337328c --- /dev/null +++ b/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch @@ -0,0 +1,33 @@ +From 437b3e38d9127ae021ca8510709c2e6be3e6b819 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Sat, 18 Feb 2017 10:03:24 +0100 +Subject: [PATCH] gstconfig.h.in: Fix unaligned access support for the openrisc + architecture + +Teach gstconfig.h.in about the openrisc (or1k) architecture. Fixes +buildroot autobuild failure: + +http://autobuild.buildroot.net/results/717/717d78ce0935749f477bdf3133b6f20057a28c01/build-end.log + +Submitted-upstream: https://bugzilla.gnome.org/show_bug.cgi?id=778866 +Signed-off-by: Peter Korsgaard +--- + gst/gstconfig.h.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in +index cf95f61ab..1b2ca64ac 100644 +--- a/gst/gstconfig.h.in ++++ b/gst/gstconfig.h.in +@@ -104,7 +104,7 @@ + * http://docs.oracle.com/cd/E19205-01/820-4155/c++_faq.html#Vers6 + * https://software.intel.com/en-us/node/583402 + */ +-#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__) ++#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__) + # define GST_HAVE_UNALIGNED_ACCESS 0 + #elif defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__m68k__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__zarch__) + # define GST_HAVE_UNALIGNED_ACCESS 1 +-- +2.11.0 + From 95e7d45f2853238d06a71a9ac94505689e4c1809 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 18 Feb 2017 14:18:05 +0100 Subject: [PATCH 2694/3392] gstreamer1: drop unused configure time unaligned access handling logic gstreamer has moved to build time unaligned access support detection using ifdefs in gstconfig.h since 1.9.2: commit 6ef601367e0f5adb7a8b02cec94dec04fccf701a Author: Nirbheek Chauhan Date: Tue Jun 21 18:59:49 2016 +0530 gstconfig.h: Detect unaligned access support at compile-time This makes gstconfig.h completely arch-independent. Should cover all compilers that gstreamer is known to build on, and all architectures that I could find information on. People are encouraged to file bugs if their platform/arch is missing. So ac_cv_unaligned_access is no longer used and our logic can be removed. Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index ac2c988706..e110dee7d7 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -11,16 +11,6 @@ GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING GSTREAMER1_LICENSE = LGPLv2+, LGPLv2.1+ -# Checking if unaligned memory access works correctly cannot be done when cross -# compiling. For the following architectures there is no information available -# in the configure script. -ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze)$(BR2_nios2),y) -GSTREAMER1_CONF_ENV = as_cv_unaligned_access=no -endif -ifeq ($(BR2_aarch64),y) -GSTREAMER1_CONF_ENV = as_cv_unaligned_access=yes -endif - GSTREAMER1_CONF_OPTS = \ --disable-examples \ --disable-tests \ From c273e4907a3bcdb86e1a61cc6b9d584358ed7b2a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 18 Feb 2017 15:33:04 +0100 Subject: [PATCH 2695/3392] DEVELOPERS: adopt freerdp Julian only ever sent one patch to freerdp, the one adding it, in 2012. I'm somewhat interested in this package, so I'll adopt it. Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 7f65909ff5..09a0a6e85b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -848,9 +848,6 @@ F: package/rabbitmq-c/ N: Juha Rantanen F: package/acsccid/ -N: Julian Lunz -F: package/freerdp/ - N: Julian Scheel F: package/bitstream/ F: package/cbootimage/ @@ -1618,6 +1615,7 @@ F: package/celt051/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/ +F: package/freerdp/ F: package/keyutils/ F: package/libbsd/ F: package/libedit/ From fceb1afd5dda45cf180f22877a6ab0e51d1b3dac Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 18 Feb 2017 22:40:02 +0100 Subject: [PATCH 2696/3392] libnss: workaround for microblaze ld bug Add a workaround for a microblaze specific ld bug to avoid segfault. Fixes: http://autobuild.buildroot.net/results/638a65453879777a0d5bdb29231034cd261b41c0 [Peter: rename to LIBNSS_DROP_GC_SECTIONS for clarity] Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/libnss/libnss.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 4a40b0a8d7..76532e8117 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -13,6 +13,16 @@ LIBNSS_DEPENDENCIES = libnspr sqlite zlib LIBNSS_LICENSE = MPLv2.0 LIBNSS_LICENSE_FILES = nss/COPYING +# --gc-sections triggers binutils ld segfault +# https://sourceware.org/bugzilla/show_bug.cgi?id=21180 +ifeq ($(BR2_microblaze),y) +define LIBNSS_DROP_GC_SECTIONS + sed -i 's:-Wl,--gc-sections::g' $(@D)/nss/coreconf/Linux.mk +endef + +LIBNSS_PRE_CONFIGURE_HOOKS += LIBNSS_DROP_GC_SECTIONS +endif + LIBNSS_BUILD_VARS = \ MOZILLA_CLIENT=1 \ NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \ From 0d81107f021bf2a663f102bace1e3f9590641170 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 18 Feb 2017 22:40:54 +0100 Subject: [PATCH 2697/3392] kmod: workaround for microblaze ld bug Add a workaround for a microblaze specific ld bug to avoid segfault. Fixes: http://autobuild.buildroot.net/results/aef1b915ffd3e5678af8682727c22c5618edfd89 [Peter: force --gc-sections configure check to false instead of patching configure] Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/kmod/kmod.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index 7492b926f0..407d90d817 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -15,6 +15,12 @@ HOST_KMOD_DEPENDENCIES = host-pkgconf KMOD_LICENSE = LGPLv2.1+ (library) KMOD_LICENSE_FILES = libkmod/COPYING +# --gc-sections triggers binutils ld segfault +# https://sourceware.org/bugzilla/show_bug.cgi?id=21180 +ifeq ($(BR2_microblaze),y) +KMOD_CONF_ENV += cc_cv_LDFLAGS__Wl___gc_sections=false +endif + # static linking not supported, see # https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=b7016153ec8 KMOD_CONF_OPTS = --disable-static --enable-shared From 49ca0b9ce9a2110c0a68089a28b9bf61318cc2ac Mon Sep 17 00:00:00 2001 From: Sam bobroff Date: Mon, 19 Dec 2016 10:31:17 +1100 Subject: [PATCH 2698/3392] package/mpv: fixup fix build on powerpc64 w/ altivec The initial fix for this issue, re-including stdbool.h, is not working. Instead, fix using the method used for other packages with a similar problem: add -std=gnu99, which prevents bool from being redefined and removes the need for any source code change. Fixes: 64904f0f6d691cfea5ae1c8f58e2d61aac0684c2 Signed-off-by: Sam Bobroff Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- .../0002-Fix-build-on-powerpc64-altivec.patch | 28 ---------------- package/mpv/0002-fix-powerpc64-altivec.patch | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 package/mpv/0002-Fix-build-on-powerpc64-altivec.patch create mode 100644 package/mpv/0002-fix-powerpc64-altivec.patch diff --git a/package/mpv/0002-Fix-build-on-powerpc64-altivec.patch b/package/mpv/0002-Fix-build-on-powerpc64-altivec.patch deleted file mode 100644 index 6db911d7cb..0000000000 --- a/package/mpv/0002-Fix-build-on-powerpc64-altivec.patch +++ /dev/null @@ -1,28 +0,0 @@ -Subject: [PATCH] Work around bool type redefinition by altivec - -On powerpc64le, the SDL header from SDL2 may include altivec.h and this -(combined with -std=c99) will cause a compile failure due to bool being -redefined as a vector type. - -Re-include stdbool.h after SDL.h to restore the normal bool type. - -Signed-off-by: Sam Bobroff ---- - audio/out/ao_sdl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c -index d9d0062..0cb80d6 100644 ---- a/audio/out/ao_sdl.c -+++ b/audio/out/ao_sdl.c -@@ -29,6 +29,7 @@ - #include "osdep/timer.h" - - #include -+#include - - struct priv - { --- -2.10.0.297.gf6727b0 - diff --git a/package/mpv/0002-fix-powerpc64-altivec.patch b/package/mpv/0002-fix-powerpc64-altivec.patch new file mode 100644 index 0000000000..45983fec8f --- /dev/null +++ b/package/mpv/0002-fix-powerpc64-altivec.patch @@ -0,0 +1,32 @@ +Subject: [PATCH] Work around bool type redefinition by altivec + +On powerpc64le, the SDL header may include altivec.h and this +(combined with -std=c99) will cause a compile failure due to bool +being redefined as a vector type. + +Adjust the compiler flags to add -std=gnu99 (which is compatible with +altivec) when using gcc. The generic flag '-std=c99' is left in place for other +compilers (in the gcc case it is overridden by the (later) gnu flag). + +Signed-off-by: Sam Bobroff +--- + waftools/detections/compiler.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/waftools/detections/compiler.py b/waftools/detections/compiler.py +index 5bbba87..50836a2 100644 +--- a/waftools/detections/compiler.py ++++ b/waftools/detections/compiler.py +@@ -43,7 +43,8 @@ def __add_gcc_flags__(ctx): + "-Wno-switch", "-Wparentheses", "-Wpointer-arith", + "-Wno-pointer-sign", + # GCC bug 66425 +- "-Wno-unused-result"] ++ "-Wno-unused-result", ++ "-std=gnu99"] + + def __add_clang_flags__(ctx): + ctx.env.CFLAGS += ["-Wno-logical-op-parentheses", "-fcolor-diagnostics", +-- +2.10.0.297.gf6727b0 + From 874d0784bb23d6cb5fd991f382b4401308a54afc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 19 Feb 2017 11:52:01 +0100 Subject: [PATCH 2699/3392] package/mosquito: needs sync_4 Fixes: http://autobuild.buildroot.org/results/2bc/2bc84ba2d1167018e2d48e5183ead22b6425dcf5/ http://autobuild.buildroot.org/results/445/445f377ae70397b5f675f541977900e8986b79a4/ http://autobuild.buildroot.org/results/57e/57e6984427f8c5d906a93884cc461b8f93cf5ce0/ ... [Peter: also add dependency to mosquitto comment] Signed-off-by: "Yann E. MORIN" Cc: Baruch Siach Signed-off-by: Peter Korsgaard --- package/collectd/Config.in | 1 + package/domoticz/Config.in | 2 ++ package/mosquitto/Config.in | 2 ++ 3 files changed, 5 insertions(+) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 683141b120..47bfe95d98 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -526,6 +526,7 @@ config BR2_PACKAGE_COLLECTD_GRAPHITE config BR2_PACKAGE_COLLECTD_MQTT bool "mqtt" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto select BR2_PACKAGE_MOSQUITTO help Sends metrics to and/or receives metrics from an MQTT broker. diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index f128e6f88c..c6550d2ad0 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DOMOTICZ bool "domoticz" depends on BR2_USE_MMU # mosquitto + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto depends on !BR2_STATIC_LIBS # mosquitto depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP @@ -28,6 +29,7 @@ config BR2_PACKAGE_DOMOTICZ comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, threads, wchar, dynamic library" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ diff --git a/package/mosquitto/Config.in b/package/mosquitto/Config.in index 50937d0554..1e6418a4de 100644 --- a/package/mosquitto/Config.in +++ b/package/mosquitto/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_MOSQUITTO bool "mosquitto" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_STATIC_LIBS # builds .so help Mosquitto is an open source message broker that implements @@ -15,4 +16,5 @@ config BR2_PACKAGE_MOSQUITTO comment "mosquitto needs a toolchain w/ dynamic library" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_STATIC_LIBS From dbdf1ae69eb91b2d1d19c93fff530c62849cb778 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 19 Feb 2017 11:35:38 +0100 Subject: [PATCH 2700/3392] package/glmark2: needs gcc >= 4.9 for C++14 Fixes: http://autobuild.buildroot.org/results/511/51162285d197deabb63727c19cdf5512b0e68f29/ [Peter: also add libstdcpp dependency] Signed-off-by: "Yann E. MORIN" Cc: Bernd Kuhls Cc: Spenser Gilliland Signed-off-by: Peter Korsgaard --- package/glmark2/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/glmark2/Config.in b/package/glmark2/Config.in index c8380b1d34..addd7a906e 100644 --- a/package/glmark2/Config.in +++ b/package/glmark2/Config.in @@ -10,11 +10,17 @@ config BR2_PACKAGE_GLMARK2_GL depends on BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_MESA3D_DRI_DRIVER +comment "glmark2 needs a toolchain w/ C++, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + comment "glmark2 needs an OpenGL or an openGL ES and EGL backend provided by mesa3d" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 && BR2_INSTALL_LIBSTDCPP depends on !BR2_PACKAGE_GLMARK2_GL && !BR2_PACKAGE_GLMARK2_EGL_GLES config BR2_PACKAGE_GLMARK2 bool "glmark2" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on BR2_PACKAGE_GLMARK2_GL || BR2_PACKAGE_GLMARK2_EGL_GLES select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBPNG From 4bb5e380f07f21c48cb315cc385fb60f5d3c0a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 19 Feb 2017 16:00:12 +0100 Subject: [PATCH 2701/3392] wavpack: fetch upstream patch to remove wchar dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The recent bump to version 5.1.0 added a dependency on wchar: ``` import_id3.c:37:34: error: unknown type name 'wchar_t' ``` This issue has been reported upstream [1] and a fix was commited by upstream to remove the wchar dependency [2]. Fixes: http://autobuild.buildroot.net/results/9a6/9a693f5b798571917f36cfb7661e2f2638aac550/ http://autobuild.buildroot.net/results/44c/44c8227043045baf4f043da44b8129e43dfff687/ http://autobuild.buildroot.net/results/a80/a80221dcc0860046ebdf0bbf454e056b1e20df83/ .. and more. The build was successfully tested with the 'br-arm-basic-2017.02-rc1-2-g133c5ac' toolchain. [1] https://github.com/dbry/WavPack/issues/19 [2] https://github.com/dbry/WavPack/commit/876fc3f3907e871d0938ac6c8c5252f5f31abd1f Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/wavpack/wavpack.hash | 1 + package/wavpack/wavpack.mk | 3 +++ 2 files changed, 4 insertions(+) diff --git a/package/wavpack/wavpack.hash b/package/wavpack/wavpack.hash index 56ba7d839c..16ff08cc6c 100644 --- a/package/wavpack/wavpack.hash +++ b/package/wavpack/wavpack.hash @@ -1,2 +1,3 @@ # locally computed hash sha256 1939627d5358d1da62bc6158d63f7ed12905552f3a799c799ee90296a7612944 wavpack-5.1.0.tar.bz2 +sha256 3890ab081dc6f8ee02161ace180381327031cc24cc6c3d71668367b7e5f6e4be 876fc3f3907e871d0938ac6c8c5252f5f31abd1f.patch diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index daa0888dfb..a613506234 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -12,6 +12,9 @@ WAVPACK_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv) WAVPACK_LICENSE = BSD-3c WAVPACK_LICENSE_FILES = COPYING +# Fetch patch from upstream to remove wchar dependency +WAVPACK_PATCH = https://github.com/dbry/WavPack/commit/876fc3f3907e871d0938ac6c8c5252f5f31abd1f.patch + ifeq ($(BR2_PACKAGE_LIBICONV),y) WAVPACK_CONF_OPTS += LIBS=-liconv endif From 90ef9a24bce917f8d2e9619c1ebeda92633be251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 19 Feb 2017 16:00:13 +0100 Subject: [PATCH 2702/3392] wavpack: properly wrap help text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wrap help text to fit 72 columns. Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/wavpack/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/wavpack/Config.in b/package/wavpack/Config.in index 1ef3e420da..db7b893413 100644 --- a/package/wavpack/Config.in +++ b/package/wavpack/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_WAVPACK bool "wavpack" select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help - WavPack is a completely open audio compression format providing - lossless, high-quality lossy, and a unique hybrid compression mode. + WavPack is a completely open audio compression format + providing lossless, high-quality lossy, and a unique + hybrid compression mode. http://www.wavpack.com/ From 9e90efa52ec3fd2d62b59488a1b347a55d356234 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sat, 18 Feb 2017 16:01:11 -0500 Subject: [PATCH 2703/3392] erlang: set ERL_TOP to avoid using user's version Explicitly set the ERL_TOP environment variable to override values set on a user's system. This prevents Erlang's configure scripts from using source files outside of the ones that Buildroot downloaded. Signed-off-by: Frank Hunleth Signed-off-by: Peter Korsgaard --- package/erlang/erlang.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 3200c388fd..364085c4dd 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -30,6 +30,12 @@ ERLANG_CONF_ENV += erl_xcomp_sysroot=$(STAGING_DIR) ERLANG_CONF_OPTS = --without-javac +# Force ERL_TOP to the downloaded source directory. This prevents +# Erlang's configure script from inadvertantly using files from +# a version of Erlang installed on the host. +ERLANG_CONF_ENV += ERL_TOP=$(@D) +HOST_ERLANG_CONF_ENV += ERL_TOP=$(@D) + # erlang uses openssl for all things crypto. Since the host tools (such as # rebar) uses crypto, we need to build host-erlang with support for openssl. HOST_ERLANG_DEPENDENCIES = host-openssl From 49c543a79b7bdf3c9fbde83577ac14850721057f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 20 Feb 2017 09:24:59 +0100 Subject: [PATCH 2704/3392] qt5: disallow 5.8 version for ARMv4 Fixes: http://autobuild.buildroot.net/results/197/197ab8a12bf1d780a986e5d447d1e0f5ee070405/ qt5.8 no longer supports ARMv4. From src/corelib/global/qprocessordetection.h: if Q_PROCESSOR_ARM >= 6 define Q_PROCESSOR_ARM_V6 endif if Q_PROCESSOR_ARM >= 5 define Q_PROCESSOR_ARM_V5 else error "ARM architecture too old" [Peter: also hide comment as pointed out by Baruch] Signed-off-by: Peter Korsgaard --- package/qt5/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index b3cb2adfe0..8de2481398 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -38,12 +38,14 @@ config BR2_PACKAGE_QT5_VERSION_LATEST bool "Latest (5.8)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 + depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ help This option builds Qt 5.8, which is licensed under (L)GPLv3+. comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8" depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8 + depends on !BR2_ARM_CPU_ARMV4 config BR2_PACKAGE_QT5_VERSION_5_6 bool "LTS (5.6)" From a24a7b3c2f0fed2cd51f7e1340ec67cb5ca0cb49 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 17 Feb 2017 22:48:49 +0100 Subject: [PATCH 2705/3392] uclibc: define struct ucontext for or1k Add missing define for struct ucontext for OpenRISC. Fixes: http://autobuild.buildroot.net/results/d8715a2b3783d877edf91bb14a80d36eac749b36 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...k-add-missing-definition-of-ucontext.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch diff --git a/package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch b/package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch new file mode 100644 index 0000000000..7c6022818d --- /dev/null +++ b/package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch @@ -0,0 +1,33 @@ +From 228d03bf0032e5799e9bf04810170c0653ca846d Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Fri, 17 Feb 2017 22:33:49 +0100 +Subject: [PATCH] or1k: add missing definition of ucontext + +Signed-off-by: Waldemar Brodkorb +--- + libc/sysdeps/linux/or1k/sys/ucontext.h | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/libc/sysdeps/linux/or1k/sys/ucontext.h b/libc/sysdeps/linux/or1k/sys/ucontext.h +index b11928e..dd97b60 100644 +--- a/libc/sysdeps/linux/or1k/sys/ucontext.h ++++ b/libc/sysdeps/linux/or1k/sys/ucontext.h +@@ -20,6 +20,14 @@ + + #include + #include +-#include ++#include ++ ++typedef struct ucontext { ++ unsigned long uc_flags; ++ struct ucontext *uc_link; ++ stack_t uc_stack; ++ struct sigcontext uc_mcontext; ++ sigset_t uc_sigmask; /* mask last for extensibility */ ++} ucontext_t; + + #endif /* sys/ucontext.h */ +-- +2.1.4 + From 5cb4b3f2cae802913b88443fa0f268fd40c7e70a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 17 Feb 2017 20:24:04 +0100 Subject: [PATCH 2706/3392] uclibc: add fix for ARM specific static linking issues Fixes: http://autobuild.buildroot.net/results/fb14e37aaf453874d1c33e5ed73b9c751ace5ae3 http://autobuild.buildroot.net/results/774a8dd489760bc213ac7cf3e8040cee6a4e2437 And hopefully all other static ARM issues with uClibc-ng. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../0002-arm-fix-static-linking-issues.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/uclibc/0002-arm-fix-static-linking-issues.patch diff --git a/package/uclibc/0002-arm-fix-static-linking-issues.patch b/package/uclibc/0002-arm-fix-static-linking-issues.patch new file mode 100644 index 0000000000..5480b0dca7 --- /dev/null +++ b/package/uclibc/0002-arm-fix-static-linking-issues.patch @@ -0,0 +1,38 @@ +From 94810a91c48ac62daed55b4aec70d04a44c10795 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Thu, 16 Feb 2017 20:22:21 +0100 +Subject: [PATCH] arm: fix static linking issues + +As reported by Buildroot developers these files causing static +linking issues. The original contribution with the ARM unwind-resume +rework and GNU libc sync was made before the combined libc change. +But the patch was applied later, after the libc change and +it seems the test coverage for static linking didn't catch it in +the regression testing. Remove the files. + +Signed-off-by: Waldemar Brodkorb +--- + libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c | 2 -- + libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c | 1 - + 2 files changed, 3 deletions(-) + delete mode 100644 libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c + delete mode 100644 libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c + +diff --git a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c +deleted file mode 100644 +index fd0cec4..0000000 +--- a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c ++++ /dev/null +@@ -1,2 +0,0 @@ +-__asm__ (".set __libgcc_s_init, pthread_cancel_init"); +-#include +diff --git a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c +deleted file mode 100644 +index 2641dc5..0000000 +--- a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c ++++ /dev/null +@@ -1 +0,0 @@ +-#include +-- +2.1.4 + From 3fdab1a070d6ecce92adac3906bfd93e57d2f79f Mon Sep 17 00:00:00 2001 From: Philippe Reynes Date: Mon, 20 Feb 2017 11:31:24 +0100 Subject: [PATCH 2707/3392] directfb: add gfx-state initialisation The patch 0006-fix-client-gfx_state-initialisation.patch add the initialisation for the variable gfx-state. This patch was provided by the community and it is already integrated in OpenEmbedded. Signed-off-by: Philippe Reynes Signed-off-by: Thomas Petazzoni --- ...-fix-client-gfx_state-initialisation.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/directfb/0006-fix-client-gfx_state-initialisation.patch diff --git a/package/directfb/0006-fix-client-gfx_state-initialisation.patch b/package/directfb/0006-fix-client-gfx_state-initialisation.patch new file mode 100644 index 0000000000..5b7a202ca3 --- /dev/null +++ b/package/directfb/0006-fix-client-gfx_state-initialisation.patch @@ -0,0 +1,39 @@ +From 8e53c0b9cedb62b82e2b7680d793d433b647ae20 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Mon, 13 Jun 2016 13:32:44 -0700 +Subject: [PATCH] fix client->gfx_state initialisation + +Shortly before the DirectFB 1.7.7 release, an optimisation was added +to CoreGraphicsStateClient_Init() to avoid creating an extended +Graphics State object if it will not later be required: + + 4d422fb Client: Create extended Graphics State object when needed for later usage + +Unfortunately the client->gfx_state variable used to track the +extended Graphics State object is not initialised, which can lead to +crashes etc due to creation of the Graphics State object erroneously +being skipped. + +Upstream-Status: Pending + +Signed-off-by: Andre McCurdy +Signed-off-by: Philippe Reynes +--- + src/core/CoreGraphicsStateClient.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/core/CoreGraphicsStateClient.cpp b/src/core/CoreGraphicsStateClient.cpp +index 5d46f0e..5007755 100644 +--- a/src/core/CoreGraphicsStateClient.cpp ++++ b/src/core/CoreGraphicsStateClient.cpp +@@ -364,6 +364,7 @@ CoreGraphicsStateClient_Init( CoreGraphicsStateClient *client, + client->renderer = NULL; + client->requestor = NULL; + client->throttle = NULL; ++ client->gfx_state = NULL; + + if (dfb_config->task_manager) { + if (dfb_config->call_nodirect) { +-- +1.9.1 + From 125213d6164a395f7d0bfb136f3a873a02630ebc Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 20 Feb 2017 14:05:35 -0300 Subject: [PATCH 2708/3392] util-linux: build schedutils without enabling basic binaries Pull an upstream fix to allow building schedutils (ionice, taskset, chrt) when util-linux is configured with $ configure --disable-all-programs --enable-schedutils Fixes: https://bugs.busybox.net/show_bug.cgi?id=9656 Reported-by: Aaron Holtzman Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- ...sable-all-programs-enable-schedutils.patch | 99 +++++++++++++++++++ package/util-linux/util-linux.mk | 4 +- 2 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 package/util-linux/0003-build-sys-fix-disable-all-programs-enable-schedutils.patch diff --git a/package/util-linux/0003-build-sys-fix-disable-all-programs-enable-schedutils.patch b/package/util-linux/0003-build-sys-fix-disable-all-programs-enable-schedutils.patch new file mode 100644 index 0000000000..bf19e10546 --- /dev/null +++ b/package/util-linux/0003-build-sys-fix-disable-all-programs-enable-schedutils.patch @@ -0,0 +1,99 @@ +From 6f2eb03433bcb2d3c351efed848a1f8554a7ff78 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Mon, 20 Feb 2017 14:17:37 +0100 +Subject: [PATCH] build-sys: fix --disable-all-programs --enable-schedutils + +* add UL_ENABLE_ALIAS(NAME, MASTERNAME) to initialize $enable_ + according to MASTERNAME. Note that we have to use $build_, + the $enable_ is just AC_ARG_ENABLE() stuff only. The + $build_ is evaluated and modified by our UL_...() functions. + +* add enable-schedutils.conf to have build-system regression test for + this use-case + +Addresses: https://github.com/karelzak/util-linux/issues/415 +Signed-off-by: Karel Zak +--- + configure.ac | 14 ++++++++------ + m4/ul.m4 | 15 +++++++++++++++ + tools/config-gen.d/enable-schedutils.conf | 3 +++ + 3 files changed, 26 insertions(+), 6 deletions(-) + create mode 100644 tools/config-gen.d/enable-schedutils.conf + +diff --git a/configure.ac b/configure.ac +index ad241fe..be282f0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1909,8 +1909,9 @@ AC_ARG_ENABLE([schedutils], + ) + UL_BUILD_INIT([schedutils]) + +-UL_BUILD_INIT([ionice], [check]) +-UL_REQUIRES_BUILD([ionice], [schedutils]) ++ ++UL_ENABLE_ALIAS([ionice], [schedutils]) ++UL_BUILD_INIT([ionice]) + UL_REQUIRES_SYSCALL_CHECK([ionice], + [UL_CHECK_SYSCALL([ioprio_set], + [alpha], [442], +@@ -1937,8 +1938,9 @@ UL_REQUIRES_SYSCALL_CHECK([ionice], + + AM_CONDITIONAL([BUILD_IONICE], [test "x$build_ionice" = xyes]) + +-UL_BUILD_INIT([taskset], [check]) +-UL_REQUIRES_BUILD([taskset], [schedutils]) ++ ++UL_ENABLE_ALIAS([taskset], [schedutils]) ++UL_BUILD_INIT([taskset]) + UL_REQUIRES_HAVE([taskset], [cpu_set_t], [cpu_set_t type]) + UL_REQUIRES_SYSCALL_CHECK([taskset], + [UL_CHECK_SYSCALL([sched_getaffinity])], +@@ -1950,8 +1952,8 @@ have_schedsetter=no + AS_IF([test "x$ac_cv_func_sched_setscheduler" = xyes], [have_schedsetter=yes], + [test "x$ac_cv_func_sched_setattr" = xyes], [have_schedsetter=yes]) + +-UL_BUILD_INIT([chrt], [check]) +-UL_REQUIRES_BUILD([chrt], [schedutils]) ++UL_ENABLE_ALIAS([chrt], [schedutils]) ++UL_BUILD_INIT([chrt]) + UL_REQUIRES_HAVE([chrt], [schedsetter], [sched_set functions]) + AM_CONDITIONAL([BUILD_CHRT], [test "x$build_chrt" = xyes]) + +diff --git a/m4/ul.m4 b/m4/ul.m4 +index f8a0dd7..ed7227c 100644 +--- a/m4/ul.m4 ++++ b/m4/ul.m4 +@@ -429,6 +429,21 @@ AC_DEFUN([UL_DEFAULT_ENABLE], [ + fi + ]) + ++ ++dnl UL_ENABLE_ALIAS(NAME, MASTERNAME) ++dnl ++dnl Initializes $enable_ variable according to $build_. This ++dnl is usefull for example if you want to use one --enable-mastername option ++dnl for group of programs. ++dnl ++AC_DEFUN([UL_ENABLE_ALIAS], [ ++ m4_define([suffix], $1) ++ m4_define([mastersuffix], $2) ++ ++ enable_[]suffix=$build_[]mastersuffix ++]) ++ ++ + dnl UL_NCURSES_CHECK(NAME) + dnl + dnl Initializes $have_, NCURSES_LIBS and NCURSES_CFLAGS variables according to +diff --git a/tools/config-gen.d/enable-schedutils.conf b/tools/config-gen.d/enable-schedutils.conf +new file mode 100644 +index 0000000..08deee4 +--- /dev/null ++++ b/tools/config-gen.d/enable-schedutils.conf +@@ -0,0 +1,3 @@ ++include:disable-all.conf ++ ++--enable-schedutils +-- +2.7.4 + diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 441c2527b9..f991b44b18 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,8 +8,8 @@ UTIL_LINUX_VERSION_MAJOR = 2.29 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) -# For 0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch and -# 0002-build-sys-improve-detection-of-the-isnan-function-in.patch + +# Required because of the patches for configure.ac. UTIL_LINUX_AUTORECONF = YES # README.licensing claims that some files are GPLv2-only, but this is not true. From 3a9006f622d4e979c373dabf1498f7d3cc1a4ee0 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 18 Feb 2017 12:32:00 +0100 Subject: [PATCH 2709/3392] qt5base: move linuxfb configure option comment Move the two comment lines to where they apply. Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 09bf5cf7bd..582421ac55 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -97,10 +97,10 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite) endif -# We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb -# is to add a link against the "inuxfb" library. QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets) +# We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb +# is to add a link against the "inuxfb" library. QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) From 23b6afdacd04c709f2b6a5955c994160de848c99 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 18 Feb 2017 12:32:01 +0100 Subject: [PATCH 2710/3392] qt5base: use system/buildroot provided freetype Select (and use) builroot provided freetype in case qt5base gui is selected (gui without freetype/font support makes not much sense and gives compile errors). Qt 5.6 needs some support to find the include headers, 5.8 is clever enough inherently. Fixes [1] (by avoiding the build-in freetype library which depends on activated libpng support): Project ERROR: Library 'libpng' is not defined. make[3]: *** [sub-3rdparty-freetype-make_first] Error 3 [1] http://autobuild.buildroot.net/results/219162ba616289f799a5053c4dcc6b8574284283 Signed-off-by: Peter Seiderer Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/Config.in | 1 + package/qt5/qt5base/qt5base.mk | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index f22e034b30..337dcf2454 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -128,6 +128,7 @@ config BR2_PACKAGE_QT5BASE_XML config BR2_PACKAGE_QT5BASE_GUI bool "gui module" + select BR2_PACKAGE_FREETYPE # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT5BASE_LINUXFB if \ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 582421ac55..7a335736db 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -97,7 +97,13 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite) endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui) +ifeq ($(BR2_PACKAGE_QT5BASE_GUI),y) +QT5BASE_CONFIGURE_OPTS += -gui -system-freetype +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5_VERSION_5_6),-I$(STAGING_DIR)/usr/include/freetype2) +QT5BASE_DEPENDENCIES += freetype +else +QT5BASE_CONFIGURE_OPTS += -no-gui -no-freetype +endif QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets) # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb # is to add a link against the "inuxfb" library. From a3a2dbc409a950823c3a1547392943d2067a8311 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Sat, 18 Feb 2017 00:38:52 -0500 Subject: [PATCH 2711/3392] packages: improve license type lists Make license type lists more uniform: * put content license applies to in parenthesis; ex: "GPLv2+ (programs)" * use commas to separate types listed without conjuction; ex: "GPLv2, LGPLv2" No attempt was made to validate the claimed licenses. This is just a tweak to increase uniformity of the _LICENSE variables. Signed-off-by: Danomi Manchego Reviewed-by: Thomas Petazzoni [Thomas: replace semi-colons by commas in LIBURCU_LICENSE.] Signed-off-by: Thomas Petazzoni --- package/cups/cups.mk | 2 +- package/duma/duma.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 2 +- package/file/file.mk | 2 +- package/git/git.mk | 2 +- package/glmark2/glmark2.mk | 2 +- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- package/hplip/hplip.mk | 2 +- package/liblockfile/liblockfile.mk | 2 +- package/liburcu/liburcu.mk | 2 +- package/lm-sensors/lm-sensors.mk | 2 +- package/openssh/openssh.mk | 2 +- package/procps-ng/procps-ng.mk | 2 +- package/slirp/slirp.mk | 2 +- package/sudo/sudo.mk | 2 +- package/valgrind/valgrind.mk | 2 +- package/vlc/vlc.mk | 2 +- package/xenomai/xenomai.mk | 2 +- package/xscreensaver/xscreensaver.mk | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 7ef2f36a22..ae3b9caae0 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -7,7 +7,7 @@ CUPS_VERSION = 2.2.2 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION) -CUPS_LICENSE = GPLv2 LGPLv2 +CUPS_LICENSE = GPLv2, LGPLv2 CUPS_LICENSE_FILES = LICENSE.txt CUPS_INSTALL_STAGING = YES CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install diff --git a/package/duma/duma.mk b/package/duma/duma.mk index a8348b95a2..cd7f33edca 100644 --- a/package/duma/duma.mk +++ b/package/duma/duma.mk @@ -7,7 +7,7 @@ DUMA_VERSION = 2.5.15 DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION) -DUMA_LICENSE = GPLv2+ LGPLv2.1+ +DUMA_LICENSE = GPLv2+, LGPLv2.1+ DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL DUMA_INSTALL_STAGING = YES diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 0253510bf7..3829053d71 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -7,7 +7,7 @@ E2FSPROGS_VERSION = 1.43.3 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) -E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause +E2FSPROGS_LICENSE = GPLv2, BSD-3c (libuuid), MIT-like with advertising clause (libss and libet) E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h E2FSPROGS_INSTALL_STAGING = YES E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux diff --git a/package/file/file.mk b/package/file/file.mk index 3309c95fa8..39d1781ff0 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -10,7 +10,7 @@ FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES -FILE_LICENSE = BSD-2c, one file BSD-4c, one file BSD-3c +FILE_LICENSE = BSD-2c, BSD-4c (one file), BSD-3c (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c $(eval $(autotools-package)) diff --git a/package/git/git.mk b/package/git/git.mk index 29e430d3e6..1c15740076 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -7,7 +7,7 @@ GIT_VERSION = 2.11.1 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git -GIT_LICENSE = GPLv2 LGPLv2.1+ +GIT_LICENSE = GPLv2, LGPLv2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_DEPENDENCIES = zlib host-gettext diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index f9631a0c3c..c7cefeb16c 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -6,7 +6,7 @@ GLMARK2_VERSION = 7215c0f337dae0b232535549c37fca441747a891 GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) -GLMARK2_LICENSE = GPLv3+ SGIv1 +GLMARK2_LICENSE = GPLv3+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libpng \ $(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \ diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 062849497e..b96bfe95e6 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -11,7 +11,7 @@ GST1_PLUGINS_BAD_INSTALL_STAGING = YES GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB # Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if # enabled. -GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+ +GST1_PLUGINS_BAD_LICENSE = LGPLv2+, LGPLv2.1+ GST1_PLUGINS_BAD_CONF_OPTS = \ --disable-examples \ diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk index 9a2c9db029..cd1be042a5 100644 --- a/package/hplip/hplip.mk +++ b/package/hplip/hplip.mk @@ -8,7 +8,7 @@ HPLIP_VERSION = 3.16.11 HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip HPLIP_AUTORECONF = YES HPLIP_DEPENDENCIES = cups libusb jpeg host-pkgconf -HPLIP_LICENSE = GPLv2 BSD-3c MIT +HPLIP_LICENSE = GPLv2, BSD-3c, MIT HPLIP_LICENSE_FILES = COPYING HPLIP_CONF_OPTS = \ diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index e42b83066c..59fced6851 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -9,7 +9,7 @@ LIBLOCKFILE_SOURCE = liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz LIBLOCKFILE_SITE = http://snapshot.debian.org/archive/debian/20151026T153523Z/pool/main/libl/liblockfile LIBLOCKFILE_PATCH = liblockfile_$(LIBLOCKFILE_VERSION)-6.debian.tar.bz2 -LIBLOCKFILE_LICENSE = LGPLv2+, dotlockfile GPLv2+ +LIBLOCKFILE_LICENSE = LGPLv2+, GPLv2+ (dotlockfile) LIBLOCKFILE_LICENSE_FILES = COPYRIGHT LIBLOCKFILE_INSTALL_STAGING = YES diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk index 33a301df17..c21c210a07 100644 --- a/package/liburcu/liburcu.mk +++ b/package/liburcu/liburcu.mk @@ -7,7 +7,7 @@ LIBURCU_VERSION = 0.9.2 LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 -LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE; GPLv2+ for test; GPLv3 for few *.m4 files +LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPLv2+ (test), GPLv3 (few *.m4 files) LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE LIBURCU_INSTALL_STAGING = YES diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index a72bba26e6..c198817881 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -9,7 +9,7 @@ LM_SENSORS_SOURCE = lm-sensors_$(LM_SENSORS_VERSION).orig.tar.bz2 LM_SENSORS_SITE = http://snapshot.debian.org/archive/debian/20170208T211941Z/pool/main/l/lm-sensors LM_SENSORS_INSTALL_STAGING = YES LM_SENSORS_DEPENDENCIES = host-bison host-flex -LM_SENSORS_LICENSE = libsensors LGPLv2.1+, programs GPLv2+ +LM_SENSORS_LICENSE = LGPLv2.1+ (libsensors), GPLv2+ (programs) LM_SENSORS_LICENSE_FILES = COPYING.LGPL COPYING LM_SENSORS_BINS_ = bin/sensors-conf-convert diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index dd8350b19d..ce37ee7ff2 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -6,7 +6,7 @@ OPENSSH_VERSION = 7.4p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_LICENSE = BSD-3c BSD-2c Public Domain +OPENSSH_LICENSE = BSD-3c, BSD-2c, Public Domain OPENSSH_LICENSE_FILES = LICENCE OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)" OPENSSH_CONF_OPTS = \ diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 48b4720941..0f8b20c560 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -7,7 +7,7 @@ PROCPS_NG_VERSION = 3.3.12 PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production -PROCPS_NG_LICENSE = GPLv2+, libproc and libps LGPLv2+ +PROCPS_NG_LICENSE = GPLv2+, LGPLv2+ (libproc and libps) PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 7a5f51539d..be3e72d951 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -9,7 +9,7 @@ # of today) SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550 SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp -SLIRP_LICENSE = BSD-4c BSD-2c +SLIRP_LICENSE = BSD-4c, BSD-2c # Note: The license file 'COPYRIGHT' is missing from the sources, # although some files refer to it. SLIRP_INSTALL_STAGING = YES diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index b1a6dd35fc..bb0a2b5e69 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -6,7 +6,7 @@ SUDO_VERSION = 1.8.19p2 SUDO_SITE = http://www.sudo.ws/sudo/dist -SUDO_LICENSE = ISC BSD-3c +SUDO_LICENSE = ISC, BSD-3c SUDO_LICENSE_FILES = doc/LICENSE # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 652432ff37..ccc6cc3905 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -7,7 +7,7 @@ VALGRIND_VERSION = 3.12.0 VALGRIND_SITE = http://valgrind.org/downloads VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 -VALGRIND_LICENSE = GPLv2 GFDLv1.2 +VALGRIND_LICENSE = GPLv2, GFDLv1.2 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS VALGRIND_CONF_OPTS = \ --disable-ubsan \ diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index cf0b557bb1..666b8d4bf5 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -7,7 +7,7 @@ VLC_VERSION = 2.2.4 VLC_SITE = http://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz -VLC_LICENSE = GPLv2+ LGPLv2.1+ +VLC_LICENSE = GPLv2+, LGPLv2.1+ VLC_LICENSE_FILES = COPYING COPYING.LIB VLC_DEPENDENCIES = host-pkgconf VLC_AUTORECONF = YES diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index 11ebf72cb9..6e0e441636 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -13,7 +13,7 @@ endif XENOMAI_SITE = https://xenomai.org/downloads/xenomai/stable XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 -XENOMAI_LICENSE = headers: GPLv2+ with exception, libraries: LGPLv2.1+, kernel: GPLv2+, docs: GFDLv1.2+, ipipe patch and can driver: GPLv2 +XENOMAI_LICENSE = GPLv2+ with exception (headers), LGPLv2.1+ (libraries), GPLv2+ (kernel), GFDLv1.2+ (docs), GPLv2 (ipipe patch, can driver) # GFDL is not included but refers to gnu.org XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index ec714fe399..831349be4c 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -8,7 +8,7 @@ XSCREENSAVER_VERSION = 5.32 XSCREENSAVER_SITE = http://www.jwz.org/xscreensaver # N.B. GPLv2+ code (in the hacks/glx subdirectory) is not currently built. -XSCREENSAVER_LICENSE = MIT-like GPLv2+ +XSCREENSAVER_LICENSE = MIT-like, GPLv2+ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \ From 7dd52cabc3eb43fc477af53bd7a817bac081e962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 14 Feb 2017 23:43:59 +0100 Subject: [PATCH 2712/3392] Revert "bctoolbox: fix typos and logic error" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5c4d3560b94c9cb8f1594c9200a632b89ddf7aa0. Although the patch fixes the build error it does not set the flags for Libs.private properly. A follow-up patch will provide a better solution for this issue. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/bctoolbox/0001-fix-typo.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 package/bctoolbox/0001-fix-typo.patch diff --git a/package/bctoolbox/0001-fix-typo.patch b/package/bctoolbox/0001-fix-typo.patch deleted file mode 100644 index b94daee8d1..0000000000 --- a/package/bctoolbox/0001-fix-typo.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix a typo in the variable name. Only check path for a single library name. - -Signed-off-by: Waldemar Brodkorb - -diff -Nur bctoolbox-0.4.0.orig/CMakeLists.txt bctoolbox-0.4.0/CMakeLists.txt ---- bctoolbox-0.4.0.orig/CMakeLists.txt 2016-10-06 17:30:41.000000000 +0200 -+++ bctoolbox-0.4.0/CMakeLists.txt 2017-02-13 23:30:38.641288032 +0100 -@@ -103,8 +103,8 @@ - endif() - - if(MBEDTLS_FOUND) -- get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH) -- set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}") -+ get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH) -+ set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path}") - endif() - if(POLARSSL_FOUND) - get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH) From ec52c7427f1a122250a883996c2377e311864542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 14 Feb 2017 23:44:00 +0100 Subject: [PATCH 2713/3392] bctoolbox: add patch to fix static linking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Static linking with bctoolbox fails when using pkg-config as the generated bctoolbox.pc file only consists of an '-L' string without any search path or libraries flags: ``` libtool: link: need path for `-L' option ``` That's because of an typo in mbedtls_library_path. However, mbedtls_library_path contains a string of the mbedtls libraries concatenated by an ';' which cannot be parsed by pkg-config. Therefore, use MBEDTLS_LIBRARY instead of MBEDTLS_LIBRARIES to get the library path. Furthermore, add the three mbedtls libraries mbedtls, mbedcrypto, and mbedx509 to LIBS_PRIVATE so these libraries are added to the Libs.private field of bctoolbox.pc. Fixes: http://autobuild.buildroot.net/results/37d5625df4be11ccdc063871e9f6e13d5f59fb52 http://autobuild.buildroot.net/results/1999c841fae41f860f00747a362327cb2857e687 .. and many more. Upstream status: Pending https://github.com/BelledonneCommunications/bctoolbox/pull/4 Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- ...1-Fix-Libs.private-flags-for-mbedtls.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch diff --git a/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch b/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch new file mode 100644 index 0000000000..a70c7c633a --- /dev/null +++ b/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch @@ -0,0 +1,49 @@ +From c0b3dbb43aa3a38c47311556c85eadc6072e2d68 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Tue, 14 Feb 2017 22:02:26 +0100 +Subject: [PATCH] Fix Libs.private flags for mbedtls +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Static linking with bctoolbox fails when using pkg-config as the +generated bctoolbox.pc file only consists of an '-L' string without any +search path or libraries flags. + +That's because of an typo in `mbedtls_library_path`. However, +`mbedtls_library_path` contains a string of the mbedtls libraries +concatenated by an ';' which cannot be parsed by pkg-config. + +Therefore, use `MBEDTLS_LIBRARY` instead of `MBEDTLS_LIBRARIES` to get +the library path. + +Furthermore, add the three mbedtls libraries *mbedtls*, *mbedcrypto*, and +*mbedx509* to `LIBS_PRIVATE` so these libraries are added to the +`Libs.private` field of bctoolbox.pc. + +Upstream status: Pending +https://github.com/BelledonneCommunications/bctoolbox/pull/4 + +Signed-off-by: Jörg Krause +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed7aa00..4127f0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,8 +103,8 @@ else() + endif() + + if(MBEDTLS_FOUND) +- get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH) +- set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}") ++ get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH) ++ set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path} -lmbedtls -lmbedcrypto -lmbedx509") + endif() + if(POLARSSL_FOUND) + get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH) +-- +2.11.1 + From 2c3be02dfb16a39f9cd494f8215a4b1c4d4d8a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 14 Feb 2017 23:44:01 +0100 Subject: [PATCH 2714/3392] bctoolbox: fix mbedtls/polarssl dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we force selection on mbedtls for bctoolbox. If, for whatever reason, mbedTLS is not found, bctoolbox searches for PolarSSL and, if not present, fails with: ``` Could NOT find PolarSSL (missing: POLARSSL_INCLUDE_DIRS HAVE_POLARSSL_SSL_H) ``` This happens because bctoolbox enables support for mbedTLS and PolarSSL by default, whereas, if both are enabled, mbedTLS is preferred over PolarSSL. However, crypto support is not mandatory and support for both libraries can be turned off. Therefore, optionally depend on mbedTLS or PolarSSL and enable/disable the library support explicitly. This fixes the issue of searching for PolarSSL altough the dependency is not declared in the bctoolbox package. Note, that this does not fix the issue why mbedtls is not found although it is enabled. This issue is address in this thread [1]. Fixes: http://autobuild.buildroot.net/results/cfe/cfeb2f542598e5d450b332fb51a6d79bae24158c/ .. and more. [1] http://lists.busybox.net/pipermail/buildroot/2017-February/183055.html Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/bctoolbox/Config.in | 4 +++- package/bctoolbox/bctoolbox.mk | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package/bctoolbox/Config.in b/package/bctoolbox/Config.in index 834f6e2a6a..e9e69205f8 100644 --- a/package/bctoolbox/Config.in +++ b/package/bctoolbox/Config.in @@ -2,11 +2,13 @@ config BR2_PACKAGE_BCTOOLBOX bool "bctoolbox" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_MBEDTLS # mbedtls is preferred over polarssl help Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone. + Select BR2_PACKAGE_MBEDTLS (preferred) or + BR2_PACKAGE_POLARSSL for crypto support. + https://github.com/BelledonneCommunications/bctoolbox comment "bctoolbox needs a toolchain w/ C++, threads" diff --git a/package/bctoolbox/bctoolbox.mk b/package/bctoolbox/bctoolbox.mk index 64c67792a7..5eea0575fc 100644 --- a/package/bctoolbox/bctoolbox.mk +++ b/package/bctoolbox/bctoolbox.mk @@ -17,6 +17,22 @@ BCTOOLBOX_CONF_OPTS = \ -DENABLE_TESTS=OFF \ -DGIT_EXECUTABLE=OFF +# bctoolbox can be build with mbedTLS or PolarSSL support. If both +# libraries are present, mbedTLS is preferred over PolarSSL. +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +BCTOOLBOX_DEPENDENCIES += mbedtls +BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON +else +BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=OFF +endif + +ifeq ($(BR2_PACKAGE_POLARSSL),y) +BCTOOLBOX_DEPENDENCIES += polarssl +BCTOOLBOX_CONF_OPTS += -DENABLE_POLARSSL=ON +else +BCTOOLBOX_CONF_OPTS += -DENABLE_POLARSSL=OFF +endif + ifeq ($(BR2_STATIC_LIBS),y) BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON else ifeq ($(BR2_SHARED_STATIC_LIBS),y) From 87dadc1f8e7f3a8d062f98fab01ff0787b436daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 14 Feb 2017 23:44:02 +0100 Subject: [PATCH 2715/3392] bctoolbox: disable rpath MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By default, bctoolbox adds the rpath to the shared library. Prevent this by setting `CMAKE_SKIP_RPATH` [1] to a true value. [1] https://cmake.org/cmake/help/latest/variable/CMAKE_SKIP_RPATH.html Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/bctoolbox/bctoolbox.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/bctoolbox/bctoolbox.mk b/package/bctoolbox/bctoolbox.mk index 5eea0575fc..76737aa3c8 100644 --- a/package/bctoolbox/bctoolbox.mk +++ b/package/bctoolbox/bctoolbox.mk @@ -11,11 +11,14 @@ BCTOOLBOX_LICENSE_FILES = COPYING BCTOOLBOX_DEPENDENCIES = mbedtls BCTOOLBOX_INSTALL_STAGING = YES +# Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to +# shared library. BCTOOLBOX_CONF_OPTS = \ -DENABLE_STRICT=OFF \ -DENABLE_TESTS_COMPONENT=OFF \ -DENABLE_TESTS=OFF \ - -DGIT_EXECUTABLE=OFF + -DGIT_EXECUTABLE=OFF \ + -DCMAKE_SKIP_RPATH=ON # bctoolbox can be build with mbedTLS or PolarSSL support. If both # libraries are present, mbedTLS is preferred over PolarSSL. From 2e19aad44adb6951932446bda007d76af2227e04 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 18 Feb 2017 15:52:57 +0100 Subject: [PATCH 2716/3392] package/sunxi-mali: reorder select/depends >From [1]: "Even though the ordering has absolutely no consequences in Kconfig, it is not logical (when reading). It is more logical and far easier to understand when depends come first, followed by the selects." Also, the Config.in example in the manual suggests to use this coding style [2]. [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html [2] https://buildroot.org/downloads/manual/manual.html#writing-rules-config-in Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/sunxi-mali/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sunxi-mali/Config.in b/package/sunxi-mali/Config.in index 5e3ae4cd01..c6754c2821 100644 --- a/package/sunxi-mali/Config.in +++ b/package/sunxi-mali/Config.in @@ -1,10 +1,10 @@ config BR2_PACKAGE_SUNXI_MALI bool "sunxi-mali" + depends on BR2_arm + depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_LIBUMP - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_arm help Install the ARM Mali drivers for sunxi based systems (i.e systems based on ARM Allwinner SoCs). This driver requires From 1c8c0d91a431fda2c052072af87e0de35bd3b953 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 20 Feb 2017 18:16:31 +0100 Subject: [PATCH 2717/3392] Revert "reproducible: fix DATE/TIME macros in toolchain-wrapper" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 76838f63412a30a358210e457dda4b79f7730624. The commit referenced above explicitly states that the function was copied as-is from the gcc source code at the time. And indeed that is exactly how the function appeared in gcc in commit e3e8c48c4a494d9da741c1c8ea6c4c0b7c4ff934. However, our toolchain wrapper is "GPLv2 only", while the file this function was copied from is "GPLv3 or later". As such we can't include that function and still comply to both licenses. Furthermore, the code is far from optimum. Since this feature is not release-critical, revert it until we re-implement it. Signed-off-by: "Yann E. MORIN" Cc: Jérôme Pouiller Cc: Samuel Martin Cc: Peter Korsgaard Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- toolchain/toolchain-wrapper.c | 72 +---------------------------------- 1 file changed, 1 insertion(+), 71 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index eb4ee8de4a..100aa181c6 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -22,15 +22,12 @@ #include #include #include -#include #ifdef BR_CCACHE static char ccache_path[PATH_MAX]; #endif static char path[PATH_MAX]; static char sysroot[PATH_MAX]; -static char source_time[sizeof("-D__TIME__=\"HH:MM:SS\"")]; -static char source_date[sizeof("-D__DATE__=\"MMM DD YYYY\"")]; /** * GCC errors out with certain combinations of arguments (examples are @@ -42,11 +39,8 @@ static char source_date[sizeof("-D__DATE__=\"MMM DD YYYY\"")]; * -mfloat-abi= * -march= * -mcpu= - * -D__TIME__= - * -D__DATE__= - * -Wno-builtin-macro-redefined */ -#define EXCLUSIVE_ARGS 6 +#define EXCLUSIVE_ARGS 3 static char *predef_args[] = { #ifdef BR_CCACHE @@ -163,47 +157,6 @@ static void check_unsafe_path(const char *arg, } } -/* Read SOURCE_DATE_EPOCH from environment to have a deterministic - * timestamp to replace embedded current dates to get reproducible - * results. Returns -1 if SOURCE_DATE_EPOCH is not defined. - */ -static time_t get_source_date_epoch() -{ - char *source_date_epoch; - long long epoch; - char *endptr; - - source_date_epoch = getenv("SOURCE_DATE_EPOCH"); - if (!source_date_epoch) - return (time_t) -1; - - errno = 0; - epoch = strtoll(source_date_epoch, &endptr, 10); - if ((errno == ERANGE && (epoch == LLONG_MAX || epoch == LLONG_MIN)) - || (errno != 0 && epoch == 0)) { - fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: " - "strtoll: %s\n", strerror(errno)); - exit(2); - } - if (endptr == source_date_epoch) { - fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: " - "no digits were found: %s\n", endptr); - exit(2); - } - if (*endptr != '\0') { - fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: " - "trailing garbage: %s\n", endptr); - exit(2); - } - if (epoch < 0) { - fprintf(stderr, "environment variable $SOURCE_DATE_EPOCH: " - "value must be nonnegative: %lld \n", epoch); - exit(2); - } - - return (time_t) epoch; -} - int main(int argc, char **argv) { char **args, **cur, **exec_args; @@ -214,7 +167,6 @@ int main(int argc, char **argv) char *paranoid_wrapper; int paranoid; int ret, i, count = 0, debug; - time_t source_date_epoch; /* Calculate the relative paths */ basename = strrchr(progpath, '/'); @@ -320,28 +272,6 @@ int main(int argc, char **argv) } #endif /* ARCH || CPU */ - source_date_epoch = get_source_date_epoch(); - if (source_date_epoch != -1) { - struct tm *tm = localtime(&source_date_epoch); - if (!tm) { - perror("__FILE__: localtime"); - return 3; - } - ret = strftime(source_time, sizeof(source_time), "-D__TIME__=\"%T\"", tm); - if (!ret) { - perror("__FILE__: overflow"); - return 3; - } - *cur++ = source_time; - ret = strftime(source_date, sizeof(source_date), "-D__DATE__=\"%b %e %Y\"", tm); - if (!ret) { - perror("__FILE__: overflow"); - return 3; - } - *cur++ = source_date; - *cur++ = "-Wno-builtin-macro-redefined"; - } - paranoid_wrapper = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); if (paranoid_wrapper && strlen(paranoid_wrapper) > 0) paranoid = 1; From e482ebf51d9e8e00c3e58eb65af0dfb70d05d8cc Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 20 Feb 2017 22:41:05 +0100 Subject: [PATCH 2718/3392] qt5quickcontrols: fix LTS (5.6) qml file install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #9666 [1] cp -dpfr .../host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/qml/QtQuick/PrivateWidgets .../target/usr/qml/QtQuick cp: cannot stat ‘.../host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/qml/QtQuick/PrivateWidgets’: No such file or directory [1] https://bugs.busybox.net/show_bug.cgi?id=9666 Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index c2946bc753..8a63629c35 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -30,11 +30,20 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install endef +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick endef +else +define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick +endef +endif $(eval $(generic-package)) From e7c7a8bf5481e898e7591442b0d924c2952797ef Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 20 Feb 2017 23:12:19 +0100 Subject: [PATCH 2719/3392] gcc: add patches for or1k specific gcc version This commit adds a number of patches from package/gcc/5.4.0 to package/gcc/musl-5.4.0, so that they apply to the or1k specific gcc version. All patches from package/gcc/5.4.0 that are not architecture specific and not related to the musl C library have been added to package/gcc/musl-5.4.0/. Note that doing a symbolic link does not work, as some patches from package/gcc/5.4.0 do not apply as-is to the or1k gcc version. The most important patch is 850-libstdcxx-uclibc-c99.patch, which fixes a number of build issues. Fixes: http://autobuild.buildroot.net/results/eebf4ce5ecb896e54912cfa21268e81ff5fb6593/ (alljoyn) http://autobuild.buildroot.net/results/8dbf406898a59e36ac6a1e16f543b6260da775c8/ (jsoncpp) http://autobuild.buildroot.net/results/206fbd5473c8c6840489990cb2552566c62ef3c8/ (dawgic) Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/gcc/musl-5.4.0/100-uclibc-conf.patch | 15 + .../musl-5.4.0/301-missing-execinfo_h.patch | 13 + .../musl-5.4.0/850-libstdcxx-uclibc-c99.patch | 273 ++++++++++++++++++ package/gcc/musl-5.4.0/860-cilk-wchar.patch | 56 ++++ ...libgcc-disable-split-stack-nothreads.patch | 14 + 5 files changed, 371 insertions(+) create mode 100644 package/gcc/musl-5.4.0/100-uclibc-conf.patch create mode 100644 package/gcc/musl-5.4.0/301-missing-execinfo_h.patch create mode 100644 package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch create mode 100644 package/gcc/musl-5.4.0/860-cilk-wchar.patch create mode 100644 package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch diff --git a/package/gcc/musl-5.4.0/100-uclibc-conf.patch b/package/gcc/musl-5.4.0/100-uclibc-conf.patch new file mode 100644 index 0000000000..73d1f0d3a9 --- /dev/null +++ b/package/gcc/musl-5.4.0/100-uclibc-conf.patch @@ -0,0 +1,15 @@ +Index: b/contrib/regression/objs-gcc.sh +=================================================================== +--- a/contrib/regression/objs-gcc.sh ++++ b/contrib/regression/objs-gcc.sh +@@ -106,6 +106,10 @@ + then + make all-gdb all-dejagnu all-ld || exit 1 + make install-gdb install-dejagnu install-ld || exit 1 ++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] ++ then ++ make all-gdb all-dejagnu all-ld || exit 1 ++ make install-gdb install-dejagnu install-ld || exit 1 + elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then + make bootstrap || exit 1 + make install || exit 1 diff --git a/package/gcc/musl-5.4.0/301-missing-execinfo_h.patch b/package/gcc/musl-5.4.0/301-missing-execinfo_h.patch new file mode 100644 index 0000000000..2d0e7baa44 --- /dev/null +++ b/package/gcc/musl-5.4.0/301-missing-execinfo_h.patch @@ -0,0 +1,13 @@ +Index: b/boehm-gc/include/gc.h +=================================================================== +--- a/boehm-gc/include/gc.h ++++ b/boehm-gc/include/gc.h +@@ -503,7 +503,7 @@ + #if defined(__linux__) || defined(__GLIBC__) + # include + # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ +- && !defined(__ia64__) ++ && !defined(__ia64__) && !defined(__UCLIBC__) + # ifndef GC_HAVE_BUILTIN_BACKTRACE + # define GC_HAVE_BUILTIN_BACKTRACE + # endif diff --git a/package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch b/package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch new file mode 100644 index 0000000000..9e97d945d3 --- /dev/null +++ b/package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch @@ -0,0 +1,273 @@ +Allow C99-depending features of libstdc++ with uClibc + +The libstdc++ code is fairly restrictive on how it checks for C99 +compatibility: it requires *complete* C99 support to enable certain +features. For example, uClibc provides a good number of C99 features, +but not C99 complex number support. For this reason, libstdc++ +completely disables many the standard C++ methods that can in fact +work because uClibc provides the necessary functions. + +This patch is similar and highly inspired from +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in +a way that doesn't involve changing the configure.ac script, as +autoreconfiguring gcc is complicated. It simply relies on the fact +that uClibc defines the __UCLIBC__ definition. + +Signed-off-by: Thomas Petazzoni + +Index: b/libstdc++-v3/config/locale/generic/c_locale.h +=================================================================== +--- a/libstdc++-v3/config/locale/generic/c_locale.h ++++ b/libstdc++-v3/config/locale/generic/c_locale.h +@@ -70,7 +70,7 @@ + __builtin_va_list __args; + __builtin_va_start(__args, __fmt); + +-#ifdef _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); + #else + const int __ret = __builtin_vsprintf(__out, __fmt, __args); +Index: b/libstdc++-v3/config/locale/gnu/c_locale.h +=================================================================== +--- a/libstdc++-v3/config/locale/gnu/c_locale.h ++++ b/libstdc++-v3/config/locale/gnu/c_locale.h +@@ -88,7 +88,7 @@ + __builtin_va_list __args; + __builtin_va_start(__args, __fmt); + +-#ifdef _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); + #else + const int __ret = __builtin_vsprintf(__out, __fmt, __args); +Index: b/libstdc++-v3/include/bits/basic_string.h +=================================================================== +--- a/libstdc++-v3/include/bits/basic_string.h ++++ b/libstdc++-v3/include/bits/basic_string.h +@@ -5239,7 +5239,7 @@ + _GLIBCXX_END_NAMESPACE_VERSION + } // namespace + +-#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99) ++#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) + + #include + +Index: b/libstdc++-v3/include/bits/locale_facets.tcc +=================================================================== +--- a/libstdc++-v3/include/bits/locale_facets.tcc ++++ b/libstdc++-v3/include/bits/locale_facets.tcc +@@ -992,7 +992,7 @@ + char __fbuf[16]; + __num_base::_S_format_float(__io, __fbuf, __mod); + +-#ifdef _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + // Precision is always used except for hexfloat format. + const bool __use_prec = + (__io.flags() & ios_base::floatfield) != ios_base::floatfield; +Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc +=================================================================== +--- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc ++++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc +@@ -578,7 +578,7 @@ + { + const locale __loc = __io.getloc(); + const ctype<_CharT>& __ctype = use_facet >(__loc); +-#ifdef _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + // First try a buffer perhaps big enough. + int __cs_size = 64; + char* __cs = static_cast(__builtin_alloca(__cs_size)); +Index: b/libstdc++-v3/include/c_compatibility/math.h +=================================================================== +--- a/libstdc++-v3/include/c_compatibility/math.h ++++ b/libstdc++-v3/include/c_compatibility/math.h +@@ -56,7 +56,7 @@ + using std::floor; + using std::fmod; + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + using std::fpclassify; + using std::isfinite; + using std::isinf; +Index: b/libstdc++-v3/include/c_compatibility/wchar.h +=================================================================== +--- a/libstdc++-v3/include/c_compatibility/wchar.h ++++ b/libstdc++-v3/include/c_compatibility/wchar.h +@@ -103,7 +103,7 @@ + using std::wmemset; + using std::wcsftime; + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + using std::wcstold; + using std::wcstoll; + using std::wcstoull; +Index: b/libstdc++-v3/include/c_global/cstdlib +=================================================================== +--- a/libstdc++-v3/include/c_global/cstdlib ++++ b/libstdc++-v3/include/c_global/cstdlib +@@ -195,7 +195,7 @@ + _GLIBCXX_END_NAMESPACE_VERSION + } // namespace + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + + #undef _Exit + #undef llabs +Index: b/libstdc++-v3/include/c_global/cwchar +=================================================================== +--- a/libstdc++-v3/include/c_global/cwchar ++++ b/libstdc++-v3/include/c_global/cwchar +@@ -232,7 +232,7 @@ + _GLIBCXX_END_NAMESPACE_VERSION + } // namespace + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + + #undef wcstold + #undef wcstoll +@@ -289,7 +289,7 @@ + using std::vwscanf; + #endif + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + using std::wcstold; + using std::wcstoll; + using std::wcstoull; +Index: b/libstdc++-v3/include/c_std/cstdio +=================================================================== +--- a/libstdc++-v3/include/c_std/cstdio ++++ b/libstdc++-v3/include/c_std/cstdio +@@ -144,7 +144,7 @@ + using ::vsprintf; + } // namespace std + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + + #undef snprintf + #undef vfscanf +Index: b/libstdc++-v3/include/c_std/cstdlib +=================================================================== +--- a/libstdc++-v3/include/c_std/cstdlib ++++ b/libstdc++-v3/include/c_std/cstdlib +@@ -192,7 +192,7 @@ + _GLIBCXX_END_NAMESPACE_VERSION + } // namespace + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + + #undef _Exit + #undef llabs +Index: b/libstdc++-v3/include/c_std/cwchar +=================================================================== +--- a/libstdc++-v3/include/c_std/cwchar ++++ b/libstdc++-v3/include/c_std/cwchar +@@ -228,7 +228,7 @@ + _GLIBCXX_END_NAMESPACE_VERSION + } // namespace + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + + #undef wcstold + #undef wcstoll +Index: b/libstdc++-v3/include/ext/vstring.h +=================================================================== +--- a/libstdc++-v3/include/ext/vstring.h ++++ b/libstdc++-v3/include/ext/vstring.h +@@ -2680,7 +2680,7 @@ + _GLIBCXX_END_NAMESPACE_VERSION + } // namespace + +-#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) ++#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))) + + #include + +Index: b/libstdc++-v3/include/tr1/cstdio +=================================================================== +--- a/libstdc++-v3/include/tr1/cstdio ++++ b/libstdc++-v3/include/tr1/cstdio +@@ -33,7 +33,7 @@ + + #include + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + + namespace std _GLIBCXX_VISIBILITY(default) + { +Index: b/libstdc++-v3/include/tr1/cstdlib +=================================================================== +--- a/libstdc++-v3/include/tr1/cstdlib ++++ b/libstdc++-v3/include/tr1/cstdlib +@@ -35,7 +35,7 @@ + + #if _GLIBCXX_HOSTED + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + + namespace std _GLIBCXX_VISIBILITY(default) + { +Index: b/libstdc++-v3/include/tr1/cwchar +=================================================================== +--- a/libstdc++-v3/include/tr1/cwchar ++++ b/libstdc++-v3/include/tr1/cwchar +@@ -52,7 +52,7 @@ + using std::vwscanf; + #endif + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + using std::wcstold; + using std::wcstoll; + using std::wcstoull; +Index: b/libstdc++-v3/include/tr1/stdlib.h +=================================================================== +--- a/libstdc++-v3/include/tr1/stdlib.h ++++ b/libstdc++-v3/include/tr1/stdlib.h +@@ -33,7 +33,7 @@ + + #if _GLIBCXX_HOSTED + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + + using std::tr1::atoll; + using std::tr1::strtoll; +Index: b/libstdc++-v3/src/c++11/debug.cc +=================================================================== +--- a/libstdc++-v3/src/c++11/debug.cc ++++ b/libstdc++-v3/src/c++11/debug.cc +@@ -788,7 +788,7 @@ + int __n __attribute__ ((__unused__)), + const char* __fmt, _Tp __s) const throw () + { +-#ifdef _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + std::snprintf(__buf, __n, __fmt, __s); + #else + std::sprintf(__buf, __fmt, __s); +Index: b/libstdc++-v3/include/c_global/cstdio +=================================================================== +--- a/libstdc++-v3/include/c_global/cstdio ++++ b/libstdc++-v3/include/c_global/cstdio +@@ -146,7 +146,7 @@ + using ::vsprintf; + } // namespace + +-#if _GLIBCXX_USE_C99 ++#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) + + #undef snprintf + #undef vfscanf diff --git a/package/gcc/musl-5.4.0/860-cilk-wchar.patch b/package/gcc/musl-5.4.0/860-cilk-wchar.patch new file mode 100644 index 0000000000..1d9916f554 --- /dev/null +++ b/package/gcc/musl-5.4.0/860-cilk-wchar.patch @@ -0,0 +1,56 @@ +[PATCH] cilk: fix build without wchar + +When building against uClibc with wchar support disabled, WCHAR_MIN and +WCHAR_MAX are not defined leading to compilation errors. + +Fix it by only including the wchar code if available. + +Signed-off-by: Peter Korsgaard +--- + libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +Index: b/libcilkrts/include/cilk/reducer_min_max.h +=================================================================== +--- a/libcilkrts/include/cilk/reducer_min_max.h ++++ b/libcilkrts/include/cilk/reducer_min_max.h +@@ -3154,7 +3154,9 @@ + CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) + CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) + CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) ++#ifdef WCHAR_MIN + CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) ++#endif + CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) + CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) + CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) +@@ -3306,7 +3308,9 @@ + CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) ++#ifdef WCHAR_MIN + CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) ++#endif + CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) + CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) +@@ -3432,7 +3436,9 @@ + CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) + CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) + CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) ++#ifdef WCHAR_MAX + CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) ++#endif + CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) + CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) + CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) +@@ -3584,7 +3590,9 @@ + CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) ++#ifdef WCHAR_MAX + CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) ++#endif + CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) + CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) diff --git a/package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch b/package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch new file mode 100644 index 0000000000..07f9a7395b --- /dev/null +++ b/package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch @@ -0,0 +1,14 @@ +disable split-stack for non-thread builds + +Signed-off-by: Waldemar Brodkorb + +diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack +--- gcc-5.3.0.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200 ++++ gcc-5.3.0/libgcc/config/t-stack 2016-03-07 03:25:32.000000000 +0100 +@@ -1,4 +1,6 @@ + # Makefile fragment to provide generic support for -fsplit-stack. + # This should be used in config.host for any host which supports + # -fsplit-stack. ++ifeq ($(enable_threads),yes) + LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c ++endif From bedc0ccd7052d063e6ce0ab816b44cad29dbc658 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 21 Feb 2017 00:20:50 +0100 Subject: [PATCH 2720/3392] Update for 2017.02-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 32 ++++++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 22 ++++++++++++++++++++++ 4 files changed, 65 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index b13f6dbc69..f241f3641f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,35 @@ +2017.02-rc2, Released February 20th, 2017 + + Fixes all over the tree. + + Support for SOURCE_DATE_EPOCH in the toolchain wrapper for + older gcc versions for reproducible builds has been + (temporarily) reverted because of licensing compatiblity + concerns. + + Defconfigs: SD card generation fix for the Udoo Neo board + + Infrastructure to handle .lz compressed tarballs added, and + affected packages updated to use it. + + Updated/fixed packages: bctoolbox, bind, canelloni, + cbootimage, ccache, classpath, cups, dbus, ddrescue, directfb, + ed, erlang, gcc, gdb, glmark2, gstreamer, gstreamer1, hiredis, + kmod, kmsxx, lcdapi, libasplib, libgpiod, libnss, libraw, + libv4l, mesa3d-headers, mosquitto, mpd, mpv, musl, ntfs-3g, + ocrad, openswan, postgresql, qt5base, qt5quickcontrols, redis, + riemann-c-client, samba4, sunxi-mali, tcping, trousers, + uclibc, util-linux, vim, wavpack, wget, wiringpi, xfsprogs, + xserver_xorg-server + + Issues resolved (http://bugs.buildroot.org): + + #8941: Valgrind fails to build with stack protection turned on + #9291: perl: SysV message queues not configured, even if available + #9651: libxcb-1.12 built Error + #9656: util-linux: schedutils doesn't build on target w/o enabl... + #9666: qt5quickcontrols install fails + 2017.02-rc1, Released February 11th, 2017 Fixes all over the tree and new features. diff --git a/Makefile b/Makefile index 9663d15ee0..b5b431a705 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02-rc1 +export BR2_VERSION := 2017.02-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1486825200 +BR2_VERSION_EPOCH = 1487631000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 8d8aae32f2..85eb5f0cdd 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

          buildroot-2016.11.2.tar.bz2

          -

          Latest release candidate: 2017.02-rc1

          +

          Latest release candidate: 2017.02-rc2

          - +
          - +
          -

          buildroot-2017.02-rc1.tar.gz

          -

          PGP signature

          +

          buildroot-2017.02-rc2.tar.gz

          +

          PGP signature

          - +
          - +
          -

          buildroot-2017.02-rc1.tar.bz2

          -

          PGP signature

          +

          buildroot-2017.02-rc2.tar.bz2

          +

          PGP signature

          diff --git a/docs/website/news.html b/docs/website/news.html index 96cadfd81a..38ed846f92 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

          News

            +
          • +
            +
            +
            +

            2017.02-rc2 released

            +

            20 February 2017

            +
            +
            +

            We have a new release candidate! Lots of changes all over the tree, see + the CHANGES + file for details. +

            + +

            Head to the downloads page to pick up the + 2017.02-rc2 + release candidate, and report any problems found to the + mailing list or + bug tracker.

            +
            +
            +
            • +
          • From 059029edf3c58907a605e84ca6860719dc1b084b Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Wed, 22 Feb 2017 21:03:47 +0100 Subject: [PATCH 2721/3392] docs/website: Speedup javascript query This commit limits results from the javascript query for selecting messages from the mailing list. It was not limited before. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- docs/website/js/buildroot.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/website/js/buildroot.js b/docs/website/js/buildroot.js index da43664162..a30da633e9 100644 --- a/docs/website/js/buildroot.js +++ b/docs/website/js/buildroot.js @@ -1,7 +1,7 @@ function load_activity(feedurl, divid) { var yqlURL = "https://query.yahooapis.com/v1/public/yql"; - var yqlQS = "?q=select%20*%20from%20xml%20where%20url%20%3D%20'"; - var yqlOPTS = "'&format=json&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys&callback="; + var yqlQS = "?q=select%20entry%20from%20xml%20where%20url%20%3D%20'"; + var yqlOPTS = "'%20limit%2010&format=json&callback="; var container = document.getElementById(divid); var url = yqlURL + yqlQS + encodeURIComponent(feedurl) + yqlOPTS; @@ -10,8 +10,8 @@ function load_activity(feedurl, divid) { var loaded = 0; var nb_display = 8; if (result==null) return; - for (var i = 0; i < result.feed.entry.length; i++) { - var entry = result.feed.entry[i]; + for (var i = 0; i < result.feed.length; i++) { + var entry = result.feed[i].entry; if (entry.title.indexOf("git commit") != -1) continue; loaded += 1; From e453fb9e3280a1a1ce6180e165aab9c4f1642555 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 22 Feb 2017 19:31:05 +0100 Subject: [PATCH 2722/3392] qt5: disable qt-5.8.0 support for arc, nios2 and xtensa Fixes [1], [2], [3]: ../3rdparty/double-conversion/include/double-conversion/utils.h:81:2: error: #error Target architecture was not detected as supported by Double-Conversion. [1] http://autobuild.buildroot.net/results/ce6/ce6f506f610434dff1d0eb64644be0200d7c52f6 [2] http://autobuild.buildroot.net/results/fda/fda8a5165cc599adfa4b3cb012916fa4dc38aeca [3] http://autobuild.buildroot.net/results/779/779fd562c28f3a47f9caea7d0e0cb1dcda7fe489 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 8de2481398..4bcbc6ef54 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -39,6 +39,8 @@ config BR2_PACKAGE_QT5_VERSION_LATEST depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ + # no built-in double-conversion support + depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa help This option builds Qt 5.8, which is licensed under (L)GPLv3+. @@ -46,6 +48,7 @@ config BR2_PACKAGE_QT5_VERSION_LATEST comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8" depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8 depends on !BR2_ARM_CPU_ARMV4 + depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa config BR2_PACKAGE_QT5_VERSION_5_6 bool "LTS (5.6)" From 0aac65bd6371ab5fb1b30ebec05a59dbe1a87d5a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 22 Feb 2017 19:27:43 +0100 Subject: [PATCH 2723/3392] uclibc-ng-test: pass LDFLAGS while building When static linking is in use we need to pass -static while linking. Fixes: http://autobuild.buildroot.net/results/37ca35854a36fab1690f6ae789e338a1e55307f6 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/uclibc-ng-test/uclibc-ng-test.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/uclibc-ng-test/uclibc-ng-test.mk b/package/uclibc-ng-test/uclibc-ng-test.mk index 9a0240c431..610ca010fb 100644 --- a/package/uclibc-ng-test/uclibc-ng-test.mk +++ b/package/uclibc-ng-test/uclibc-ng-test.mk @@ -39,6 +39,7 @@ define UCLIBC_NG_TEST_BUILD_CMDS $(TARGET_MAKE_ENV) $(UCLIBC_NG_TEST_MAKE_ENV) $(MAKE) -C $(@D) \ CC="$(TARGET_CC)" \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ test_compile $(TARGET_MAKE_ENV) $(UCLIBC_NG_TEST_MAKE_ENV) $(MAKE1) -C $(@D) \ CC="$(TARGET_CC)" \ From ac8912579f469273b7163577ef71b5f76d7dba9b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 22 Feb 2017 13:51:10 +0100 Subject: [PATCH 2724/3392] berkeleydb: workaround m68k/coldfire issue Fixes: http://autobuild.buildroot.net/results/40423aa6c8f6fe66c771cca3e09b21e15525eb5f Signed-off-by: Waldemar Brodkorb [Thomas: rename BERKELEYDB_CONF_OPTS to BERKELEYDB_CONF_ENV.] Signed-off-by: Thomas Petazzoni --- package/berkeleydb/berkeleydb.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index e5c11bddcf..a315943ee6 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -20,11 +20,18 @@ BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \ db_hotbackup db_load db_log_verify db_printlog db_recover db_replicate \ db_stat db_tuner db_upgrade db_verify +# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509 +ifeq ($(BR2_m68k_cf),y) +BERKELEYDB_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm" +endif + # build directory can't be the directory where configure are there, so.. define BERKELEYDB_CONFIGURE_CMDS (cd $(@D)/build_unix; rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ + $(BERKELEYDB_CONF_ENV) \ ../dist/configure $(QUIET) \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ From a5015f1025a1aee173c2c2ab39ccac5ce38f30c3 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 22 Feb 2017 16:56:53 -0300 Subject: [PATCH 2725/3392] util-linux: security bump to version 2.29.2 From https://www.kernel.org/pub/linux/utils/util-linux/v2.29/v2.29.2-ReleaseNotes This release fixes su(1) security issue CVE-2017-2616: It is possible for any local user to send SIGKILL to other processes with root privileges. To exploit this, the user must be able to perform su with a successful login. SIGKILL can only be sent to processes which were executed after the su process. It is not possible to send SIGKILL to processes which were already running. Drop upstream patches and autoreconf since it's no longer required. [Peter: extend commit message with CVE info / description] Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...e-detection-of-the-isnan-function-in.patch | 37 ------- ...sable-all-programs-enable-schedutils.patch | 99 ------------------- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 5 +- 4 files changed, 2 insertions(+), 141 deletions(-) delete mode 100644 package/util-linux/0002-build-sys-improve-detection-of-the-isnan-function-in.patch delete mode 100644 package/util-linux/0003-build-sys-fix-disable-all-programs-enable-schedutils.patch diff --git a/package/util-linux/0002-build-sys-improve-detection-of-the-isnan-function-in.patch b/package/util-linux/0002-build-sys-improve-detection-of-the-isnan-function-in.patch deleted file mode 100644 index 5395104df7..0000000000 --- a/package/util-linux/0002-build-sys-improve-detection-of-the-isnan-function-in.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 064a0445f33a67e5498d492dabe0dfc687859756 Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Wed, 8 Feb 2017 09:29:30 -0200 -Subject: [PATCH] build-sys: improve detection of the "isnan" function in - uClibc - -Since commit beceb14b450ded6560ed743634a5e80604a8edf3, MATH_LIBS is set -to "-lm" when the isnan function is detected. In uClibc, however, isnan -is a macro that calls __isnan, __isnanf, or __isnanl, depending on the -size of the argument (double, float or long double). - -Fixes: - http://autobuild.buildroot.net/results/2c2/2c29a78ed81ca844a87dcd076ab3e14ea080296d/ - http://autobuild.buildroot.net/results/404/404b10f359b2ae8a7216729fa1bab37fed2d3d4c/ - -Signed-off-by: Carlos Santos ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index cc0563b..d03469c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -428,7 +428,8 @@ AC_CHECK_FUNCS([reboot], [have_reboot=yes],[have_reboot=no]) - AM_CONDITIONAL([HAVE_OPENAT], [test "x$have_openat" = xyes]) - - AC_CHECK_FUNCS([isnan], [], -- [AC_CHECK_LIB([m], [isnan], [MATH_LIBS="-lm"])] -+ [AC_CHECK_LIB([m], [isnan], [MATH_LIBS="-lm"])] -+ [AC_CHECK_LIB([m], [__isnan], [MATH_LIBS="-lm"])] - ) - AC_SUBST([MATH_LIBS]) - --- -2.7.4 - diff --git a/package/util-linux/0003-build-sys-fix-disable-all-programs-enable-schedutils.patch b/package/util-linux/0003-build-sys-fix-disable-all-programs-enable-schedutils.patch deleted file mode 100644 index bf19e10546..0000000000 --- a/package/util-linux/0003-build-sys-fix-disable-all-programs-enable-schedutils.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 6f2eb03433bcb2d3c351efed848a1f8554a7ff78 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 20 Feb 2017 14:17:37 +0100 -Subject: [PATCH] build-sys: fix --disable-all-programs --enable-schedutils - -* add UL_ENABLE_ALIAS(NAME, MASTERNAME) to initialize $enable_ - according to MASTERNAME. Note that we have to use $build_, - the $enable_ is just AC_ARG_ENABLE() stuff only. The - $build_ is evaluated and modified by our UL_...() functions. - -* add enable-schedutils.conf to have build-system regression test for - this use-case - -Addresses: https://github.com/karelzak/util-linux/issues/415 -Signed-off-by: Karel Zak ---- - configure.ac | 14 ++++++++------ - m4/ul.m4 | 15 +++++++++++++++ - tools/config-gen.d/enable-schedutils.conf | 3 +++ - 3 files changed, 26 insertions(+), 6 deletions(-) - create mode 100644 tools/config-gen.d/enable-schedutils.conf - -diff --git a/configure.ac b/configure.ac -index ad241fe..be282f0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1909,8 +1909,9 @@ AC_ARG_ENABLE([schedutils], - ) - UL_BUILD_INIT([schedutils]) - --UL_BUILD_INIT([ionice], [check]) --UL_REQUIRES_BUILD([ionice], [schedutils]) -+ -+UL_ENABLE_ALIAS([ionice], [schedutils]) -+UL_BUILD_INIT([ionice]) - UL_REQUIRES_SYSCALL_CHECK([ionice], - [UL_CHECK_SYSCALL([ioprio_set], - [alpha], [442], -@@ -1937,8 +1938,9 @@ UL_REQUIRES_SYSCALL_CHECK([ionice], - - AM_CONDITIONAL([BUILD_IONICE], [test "x$build_ionice" = xyes]) - --UL_BUILD_INIT([taskset], [check]) --UL_REQUIRES_BUILD([taskset], [schedutils]) -+ -+UL_ENABLE_ALIAS([taskset], [schedutils]) -+UL_BUILD_INIT([taskset]) - UL_REQUIRES_HAVE([taskset], [cpu_set_t], [cpu_set_t type]) - UL_REQUIRES_SYSCALL_CHECK([taskset], - [UL_CHECK_SYSCALL([sched_getaffinity])], -@@ -1950,8 +1952,8 @@ have_schedsetter=no - AS_IF([test "x$ac_cv_func_sched_setscheduler" = xyes], [have_schedsetter=yes], - [test "x$ac_cv_func_sched_setattr" = xyes], [have_schedsetter=yes]) - --UL_BUILD_INIT([chrt], [check]) --UL_REQUIRES_BUILD([chrt], [schedutils]) -+UL_ENABLE_ALIAS([chrt], [schedutils]) -+UL_BUILD_INIT([chrt]) - UL_REQUIRES_HAVE([chrt], [schedsetter], [sched_set functions]) - AM_CONDITIONAL([BUILD_CHRT], [test "x$build_chrt" = xyes]) - -diff --git a/m4/ul.m4 b/m4/ul.m4 -index f8a0dd7..ed7227c 100644 ---- a/m4/ul.m4 -+++ b/m4/ul.m4 -@@ -429,6 +429,21 @@ AC_DEFUN([UL_DEFAULT_ENABLE], [ - fi - ]) - -+ -+dnl UL_ENABLE_ALIAS(NAME, MASTERNAME) -+dnl -+dnl Initializes $enable_ variable according to $build_. This -+dnl is usefull for example if you want to use one --enable-mastername option -+dnl for group of programs. -+dnl -+AC_DEFUN([UL_ENABLE_ALIAS], [ -+ m4_define([suffix], $1) -+ m4_define([mastersuffix], $2) -+ -+ enable_[]suffix=$build_[]mastersuffix -+]) -+ -+ - dnl UL_NCURSES_CHECK(NAME) - dnl - dnl Initializes $have_, NCURSES_LIBS and NCURSES_CFLAGS variables according to -diff --git a/tools/config-gen.d/enable-schedutils.conf b/tools/config-gen.d/enable-schedutils.conf -new file mode 100644 -index 0000000..08deee4 ---- /dev/null -+++ b/tools/config-gen.d/enable-schedutils.conf -@@ -0,0 +1,3 @@ -+include:disable-all.conf -+ -+--enable-schedutils --- -2.7.4 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index ec6cc8eadd..71b4982f01 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/util-linux/v2.29/sha256sums.asc -sha256 0ce40600b934ec2fecfa6bfc4efe6982d051ba96c2832b05201347aec582f54f util-linux-2.29.1.tar.xz +sha256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 util-linux-2.29.2.tar.xz diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index f991b44b18..0fc46d4f17 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -5,13 +5,10 @@ ################################################################################ UTIL_LINUX_VERSION_MAJOR = 2.29 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) -# Required because of the patches for configure.ac. -UTIL_LINUX_AUTORECONF = YES - # README.licensing claims that some files are GPLv2-only, but this is not true. # Some files are GPLv3+ but only in tests. UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, LGPLv2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid) From ddbf1fe62d9e7bc27aefc968750d45671b38acfc Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 16:23:08 -0300 Subject: [PATCH 2726/3392] linux-headers: bump 4.{4, 9}.x and 3.2.x series Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6485025608..8f7c2bbec2 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -214,7 +214,7 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.84" if BR2_KERNEL_HEADERS_3_2 + default "3.2.85" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 default "3.12.70" if BR2_KERNEL_HEADERS_3_12 @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.49" if BR2_KERNEL_HEADERS_4_4 + default "4.4.50" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.10" if BR2_KERNEL_HEADERS_4_9 + default "4.9.11" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 8a9b9a48539c6984f898f137555308210c5d2cd5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 16:23:09 -0300 Subject: [PATCH 2727/3392] linux: bump default to version 4.9.11 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 95ccfb3721..1d375dd742 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.9.10)" + bool "Latest version (4.9.11)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.9.10" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.9.11" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From c5f5d9fa4e378f3b81f51284e32ee1c23ab2a575 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 22 Feb 2017 08:25:05 +0100 Subject: [PATCH 2728/3392] libcurl: security bump to version 7.53.0 Fixes CVE-2017-2629 - curl SSL_VERIFYSTATUS ignored >From the advisory (http://www.openwall.com/lists/oss-security/2017/02/21/6): Curl and libcurl support "OCSP stapling", also known as the TLS Certificate Status Request extension (using the `CURLOPT_SSL_VERIFYSTATUS` option). When telling curl to use this feature, it uses that TLS extension to ask for a fresh proof of the server's certificate's validity. If the server doesn't support the extension, or fails to provide said proof, curl is expected to return an error. Due to a coding mistake, the code that checks for a test success or failure, ends up always thinking there's valid proof, even when there is none or if the server doesn't support the TLS extension in question. Contrary to how it used to function and contrary to how this feature is documented to work. This could lead to users not detecting when a server's certificate goes invalid or otherwise be mislead that the server is in a better shape than it is in reality. Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 2 +- package/libcurl/libcurl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 7a942f238b..72cae81c0e 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 d16185a767cb2c1ba3d5b9096ec54e5ec198b213f45864a38b3bda4bbf87389b curl-7.52.1.tar.bz2 +sha256 b2345a8bef87b4c229dedf637cb203b5e21db05e20277c8e1094f0d4da180801 curl-7.53.0.tar.bz2 diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a9fba26627..b5dcb377b5 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.52.1 +LIBCURL_VERSION = 7.53.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 739cfe7a089138992681d4c6d7c5c535e8b99ea2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 23 Feb 2017 12:37:35 +0200 Subject: [PATCH 2729/3392] poco: doesn't support openrisc Fixes: http://autobuild.buildroot.net/results/5b3/5b3fd6d4a7bdefadba89fdb53de4ba786f4df9e2/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/poco/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index dfdc8d17c3..b3b247f906 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_POCO depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # dlopen() depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \ - || BR2_xtensa) + || BR2_or1k || BR2_xtensa) select BR2_PACKAGE_ZLIB select BR2_PACKAGE_PCRE help @@ -65,4 +65,4 @@ comment "poco needs a toolchain w/ wchar, threads, C++, dynamic library" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \ - || BR2_xtensa) + || BR2_or1k || BR2_xtensa) From 3b1f2c7719da847c3a5f9b8f54225212cc399da2 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Wed, 22 Feb 2017 21:43:39 -0500 Subject: [PATCH 2730/3392] libimxvpuapi: bump to version 0.10.3 Because with libimxvpuapi older than 0.10.3, the gst1-imx-0.12.3 "imxvpu" plugin will not build. Changelog: * properly pass on color format in simplified JPEG encoder interface * add alternative write-callback-style encoding mode also add encode example variant which uses write-callback style output * add support for "fake grayscale mode" in encoders this is done by using I420 internally and filling the U and V planes with 0x80 bytes * make sure JPEG quantization table is copied in standardized zig zag order the VPU does not, so this has to be done explicitely Signed-off-by: Danomi Manchego Reviewed-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/libimxvpuapi/libimxvpuapi.hash | 2 +- package/libimxvpuapi/libimxvpuapi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libimxvpuapi/libimxvpuapi.hash b/package/libimxvpuapi/libimxvpuapi.hash index c8cabcf285..cd0c8f1f5f 100644 --- a/package/libimxvpuapi/libimxvpuapi.hash +++ b/package/libimxvpuapi/libimxvpuapi.hash @@ -1,2 +1,2 @@ # locally computed hash -sha256 8e6dc4105db6164c0de72fd60eb73f4ba1632f7ba5052b1abc834b462b566da2 libimxvpuapi-0.10.2.tar.gz +sha256 7151e10a24929935bada1d3d87626f17e411575b3a4ac0d86440999ad0100a55 libimxvpuapi-0.10.3.tar.gz diff --git a/package/libimxvpuapi/libimxvpuapi.mk b/package/libimxvpuapi/libimxvpuapi.mk index fde4429375..d368d3d064 100644 --- a/package/libimxvpuapi/libimxvpuapi.mk +++ b/package/libimxvpuapi/libimxvpuapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIMXVPUAPI_VERSION = 0.10.2 +LIBIMXVPUAPI_VERSION = 0.10.3 LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION)) LIBIMXVPUAPI_LICENSE = LGPLv2.1+ LIBIMXVPUAPI_LICENSE_FILES = LICENSE From 5d436ac5a6271ed08774c7110e4569c6b4484c4e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 21 Feb 2017 22:12:22 +0100 Subject: [PATCH 2731/3392] package/sslh: fix script, does not build in parallel The Makefile is not parallel-safe, so we build with MAKE1. Since the source is very small, this has minor impact on performance. The genver.sh script contains a troll character U+c2a0 (non-break space) which is refused by some versions of /bin/sh. Patch it away. Fixes: http://autobuild.buildroot.net/results/867/867c74ed74fd04ab06d1a10ff34ca177fe005fd2/ http://autobuild.buildroot.net/results/f97/f971629bc99147f9014e52c6ef71c3417faa6b67/ Signed-off-by: "Yann E. MORIN" Cc: David Bachelart Signed-off-by: Thomas Petazzoni --- package/sslh/0002-replace-U+c2a0.patch | 12 ++++++++++++ package/sslh/sslh.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 package/sslh/0002-replace-U+c2a0.patch diff --git a/package/sslh/0002-replace-U+c2a0.patch b/package/sslh/0002-replace-U+c2a0.patch new file mode 100644 index 0000000000..38093fa250 --- /dev/null +++ b/package/sslh/0002-replace-U+c2a0.patch @@ -0,0 +1,12 @@ +diff -durN sslh-v1.18.orig/genver.sh sslh-v1.18/genver.sh +--- sslh-v1.18.orig/genver.sh 2017-02-21 22:03:40.849161283 +0100 ++++ sslh-v1.18/genver.sh 2017-02-21 22:03:59.173402356 +0100 +@@ -25,7 +25,7 @@ + fi + fi + +-if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then ++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then + # generate the version info based on the tag + release=`(git describe --tags || git --describe || git describe --all --long) \ + 2>/dev/null | tr -d '\n'` diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index 31774441ca..17aafd16c2 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -12,7 +12,7 @@ SSLH_LICENSE_FILES = COPYING SSLH_DEPENDENCIES = libconfig define SSLH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) endef define SSLH_INSTALL_TARGET_CMDS From 6d2f7b4f8883a5a837fb1d23a1da2fe662a0c0e4 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 22 Feb 2017 16:36:54 +0000 Subject: [PATCH 2732/3392] qt5webkit: disable for MIPS soft-float It assumes the MIPS target has an FPU and uses FPU assembler instructions which cause the compilation to fail when building it for soft-float. Fixes: http://autobuild.buildroot.net/results/f40/f407ca9245e2445619420a9dfd595856729a2b2b/ Signed-off-by: Vicente Olivert Riera [Thomas: - propagate dependency to Config.in comment - add comment above the "depends on" to explain why.] Signed-off-by: Thomas Petazzoni --- package/qt-webkit-kiosk/Config.in | 1 + package/qt5/qt5webkit/Config.in | 3 +++ 2 files changed, 4 insertions(+) diff --git a/package/qt-webkit-kiosk/Config.in b/package/qt-webkit-kiosk/Config.in index 32952d7c50..1b0e0dee09 100644 --- a/package/qt-webkit-kiosk/Config.in +++ b/package/qt-webkit-kiosk/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK depends on !BR2_STATIC_LIBS # qt5webkit depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit depends on !BR2_BINFMT_FLAT # qt5webkit + depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit help Simple kiosk-mode browser powered by Qt5Webkit diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index e9c11fbe6f..2534360459 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -9,6 +9,8 @@ config BR2_PACKAGE_QT5WEBKIT depends on !BR2_STATIC_LIBS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_BINFMT_FLAT # icu + # assumes a FPU is available on MIPS + depends on !BR2_MIPS_SOFT_FLOAT help Qt is a cross-platform application and UI framework for developers using C++. @@ -28,3 +30,4 @@ comment "qt5webkit needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_BINFMT_FLAT + depends on !BR2_MIPS_SOFT_FLOAT From 07d43820f28a523f09a4885b9a13b26833999f37 Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Wed, 22 Feb 2017 16:10:10 +0300 Subject: [PATCH 2733/3392] vlc: disable on ARC This package fails when building for ARC due to ARC toolchain issue. Marking this with special comment "# ARC toolchain issue" as the package is to be enabled as soon as the issue with the ARC toolchain is resolved. Fixes: http://autobuild.buildroot.net/results/ebae0ed90b88db5a3b34a46f2ca1ff97e01fe83c/ Signed-off-by: Vlad Zakharov [Thomas: - add autobuilder reference - propagate dependency to Config.in comment.] Signed-off-by: Thomas Petazzoni --- package/vlc/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/vlc/Config.in b/package/vlc/Config.in index 166e7d256a..78023fb500 100644 --- a/package/vlc/Config.in +++ b/package/vlc/Config.in @@ -11,6 +11,8 @@ config BR2_PACKAGE_VLC depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 + # ARC toolchain issue + depends on !BR2_arc select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3 @@ -34,5 +36,6 @@ config BR2_PACKAGE_VLC_OPENCV3_BACKEND comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7" depends on BR2_USE_MMU + depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 From c8b2bd81a1a5401c10287f2d5c6c8b4a14994764 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 23 Feb 2017 22:08:39 +0100 Subject: [PATCH 2734/3392] trousers: update ARC comment Update the comment about the ARC exception to match the one used in VLC, so that a 'git grep "ARC toolchain issue"' returns the list of packages to re-evaluate on ARC when the ARC toolchain gets upgraded. Signed-off-by: Thomas Petazzoni --- package/trousers/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/trousers/Config.in b/package/trousers/Config.in index 11ab874f00..de3b951958 100644 --- a/package/trousers/Config.in +++ b/package/trousers/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_TROUSERS depends on BR2_TOOLCHAIN_HAS_THREADS # doesn't build properly in static only configurations depends on !BR2_STATIC_LIBS - # broken toolchain + # ARC toolchain issue depends on !BR2_arc help The open-source TCG Software Stack (TSS). From a862b53ef953b14dc864f04694e8bf3ebfb29162 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 21 Feb 2017 22:04:36 +0100 Subject: [PATCH 2735/3392] bctoolbox: remove redundant mbedtls dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: Makefile:532: *** mbedtls is in the dependency chain of bctoolbox that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Signed-off-by: Peter Seiderer Acked-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/bctoolbox/bctoolbox.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/bctoolbox/bctoolbox.mk b/package/bctoolbox/bctoolbox.mk index 76737aa3c8..78269751ef 100644 --- a/package/bctoolbox/bctoolbox.mk +++ b/package/bctoolbox/bctoolbox.mk @@ -8,7 +8,6 @@ BCTOOLBOX_VERSION = 0.4.0 BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION)) BCTOOLBOX_LICENSE = GPLv2+ BCTOOLBOX_LICENSE_FILES = COPYING -BCTOOLBOX_DEPENDENCIES = mbedtls BCTOOLBOX_INSTALL_STAGING = YES # Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to From 06b555b6d5baadb6fe73e5d8a9fd640602908251 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 20 Feb 2017 23:43:55 +0100 Subject: [PATCH 2736/3392] btrfs-progs: don't use with uClibc This commit adds a patch to btrfs-progs that fixes the build of docker-engine, and possibly other packages including kerncompat.h from btrfs-progs. For the btrfs-progs build itself, a --disable-backtrace option allows to indicate whether backtrace()/ support should be used or not. However, once btrfs-progs is installed, it simply looks at whether __GLIBC__ is defined or not to decide to use backtrace() or not. However, uClibc defines __GLIBC__ but does not provide backtrace() functionality. The additional patch tweaks the kerncompat.h to look at __UCLIBC__ and not use backtrace() functionality in this case. Fixes: http://autobuild.buildroot.net/results/9dc9370a79c5c44e6c92be6a44334842c211d923/ Signed-off-by: Thomas Petazzoni --- ...ine-BTRFS_DISABLE_BACKTRACE-when-bui.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch diff --git a/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch b/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch new file mode 100644 index 0000000000..9c1173b3fe --- /dev/null +++ b/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch @@ -0,0 +1,42 @@ +From 1fc5444f5620670bb9d293be4f92df59661e1810 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 20 Feb 2017 23:31:24 +0100 +Subject: [PATCH] kerncompat.h: define BTRFS_DISABLE_BACKTRACE when building + with uClibc + +uClibc does not provide backtrace() nor . When building +btrfs-progs, passing --disable-backtrace is enough to make it build with +uClibc. But once btrfs-progs is installed and another program/library +includes kerncompat.h, it fails to build with uClibc, because +BTRFS_DISABLE_BACKTRACE is not defined. + +The most correct fix for this would be to have kerncompat.h generated +from kerncompat.h.in during the btrfs-progs build process, and tuned +depending on autoconf/automake variables. But as a quick fix that +follows the current strategy, we simply tweak the existing __GLIBC__ +conditional. Indeed, uClibc pretends to be glibc and defines __GLIBC__, +but it does not replace it completely, hence the need to define +BTRFS_DISABLE_BACKTRACE when __GLIBC__ is not defined *or* when +__UCLIBC__ is defined. + +Signed-off-by: Thomas Petazzoni +--- + kerncompat.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kerncompat.h b/kerncompat.h +index 0f207b7..e47d164 100644 +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -32,7 +32,7 @@ + + #include + +-#ifndef __GLIBC__ ++#if !defined(__GLIBC__) || defined(__UCLIBC__) + #ifndef BTRFS_DISABLE_BACKTRACE + #define BTRFS_DISABLE_BACKTRACE + #endif +-- +2.7.4 + From 911ac036e0e09149e31d5b67a71e4a896e2d8fdf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 23 Feb 2017 22:43:08 +0100 Subject: [PATCH 2737/3392] package/sslh: fix a patch, drop the other It turned out that the troll character U+c2a0 was added by our own patch. So fix it amd drop our second patch. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- ...rsion-while-building-sslh-in-a-larger-git-t.patch | 4 +++- package/sslh/0002-replace-U+c2a0.patch | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 package/sslh/0002-replace-U+c2a0.patch diff --git a/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch b/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch index 5cb8ce2541..d23bc9fae6 100644 --- a/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch +++ b/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch @@ -12,6 +12,8 @@ subtree only, this patch adds a check : a .git directory has to exist at the root of the project to enable git-extracted version string. Signed-off-by: David Bachelart +[yann.morin.1998@free.fr: fix troll character U+c2a0] +Signed-off-by: "Yann E. MORIN" --- genver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -34,7 +36,7 @@ index 79fd0a0..051e57b 100755 fi -if head=`git rev-parse --verify HEAD 2>/dev/null`; then -+if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then ++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then # generate the version info based on the tag release=`(git describe --tags || git --describe || git describe --all --long) \ 2>/dev/null | tr -d '\n'` diff --git a/package/sslh/0002-replace-U+c2a0.patch b/package/sslh/0002-replace-U+c2a0.patch deleted file mode 100644 index 38093fa250..0000000000 --- a/package/sslh/0002-replace-U+c2a0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -durN sslh-v1.18.orig/genver.sh sslh-v1.18/genver.sh ---- sslh-v1.18.orig/genver.sh 2017-02-21 22:03:40.849161283 +0100 -+++ sslh-v1.18/genver.sh 2017-02-21 22:03:59.173402356 +0100 -@@ -25,7 +25,7 @@ - fi - fi - --if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then -+if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then - # generate the version info based on the tag - release=`(git describe --tags || git --describe || git describe --all --long) \ - 2>/dev/null | tr -d '\n'` From 3bdd3647167ac2934e31cf44e68ef19949ec1831 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 15:55:21 -0300 Subject: [PATCH 2738/3392] gstreamer1: bump to version 1.10.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index f65061b2eb..455e7fb48c 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.3.tar.xz.sha256sum -sha256 85b9dc1b2991f224fa90d534ec57014896c479e061dc9fa1bc16ae17cbebb63d gstreamer-1.10.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.4.tar.xz.sha256sum +sha256 50c2f5af50a6cc6c0a3f3ed43bdd8b5e2bff00bacfb766d4be139ec06d8b5218 gstreamer-1.10.4.tar.xz diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index e110dee7d7..5a0a369c7e 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.10.3 +GSTREAMER1_VERSION = 1.10.4 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From 4664da91c29449895edba20d491748f943921d8f Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 15:55:22 -0300 Subject: [PATCH 2739/3392] gst1-plugins-base: bump to version 1.10.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index 86116f00dc..b526b1454b 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.3.tar.xz.sha256sum -sha256 e6299617d705a0cbfb535107c1d3a8fc0f0967f14193a8c5c7583f46a88b1710 gst-plugins-base-1.10.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.4.tar.xz.sha256sum +sha256 f6d245b6b3d4cb733f81ebb021074c525ece83db0c10e932794b339b8d935eb7 gst-plugins-base-1.10.4.tar.xz diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 76602cc3d4..6ab63a3512 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.10.3 +GST1_PLUGINS_BASE_VERSION = 1.10.4 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From 268a8bab9e8c92dbbdd42bbffca83e85ab59ef17 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 15:55:23 -0300 Subject: [PATCH 2740/3392] gst1-plugins-good: bump to version 1.10.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 90578a2ac1..21ee18d15f 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.3.tar.xz.sha256sum -sha256 4e07e93e34d4b93208f1579c21e7d91a236577b36f128a5332ffee85b4465955 gst-plugins-good-1.10.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.4.tar.xz.sha256sum +sha256 8a86c61434a8c44665365bd0b3557a040937d1f44bf69caee4e9ea816ce74d7e gst-plugins-good-1.10.4.tar.xz diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 6fe92217ae..e25149a846 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.10.3 +GST1_PLUGINS_GOOD_VERSION = 1.10.4 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From 36fd6fa84a460e1a179f18c5387f0e266fe4796c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 15:55:24 -0300 Subject: [PATCH 2741/3392] gst1-plugins-bad: security bump to version 1.10.4 Fixes: CVE-2017-5848 - The gst_ps_demux_parse_psm function in gst/mpegdemux/gstmpegdemux.c in gst-plugins-bad in GStreamer allows remote attackers to cause a denial of service (invalid memory read and crash) via vectors involving PSM parsing. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 2d0f91348c..441afa2c52 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.3.tar.xz.sha256sum -sha256 24099351fb6984c9e7560de06e072ff2e33d0b2db38b8fcc7afefb536e5094e7 gst-plugins-bad-1.10.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.4.tar.xz.sha256sum +sha256 23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966 gst-plugins-bad-1.10.4.tar.xz diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index b96bfe95e6..00add02af9 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.10.3 +GST1_PLUGINS_BAD_VERSION = 1.10.4 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From 1060ff1c7055a499b5f7ebf97c88268542b68bf4 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 15:55:25 -0300 Subject: [PATCH 2742/3392] gst1-plugins-ugly: security bump to version 1.10.4 Fixes: CVE-2017-5847 - The gst_asf_demux_process_ext_content_desc function in gst/asfdemux/gstasfdemux.c in gst-plugins-ugly in GStreamer allows remote attackers to cause a denial of service (out-of-bounds heap read) via vectors involving extended content descriptors. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 6b4f0c7590..9567d9ca0c 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.3.tar.xz.sha256sum -sha256 c91597d03abff9df435ad4892eae44df1ee14159c7cc7317ac9d2766ff446bd2 gst-plugins-ugly-1.10.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.4.tar.xz.sha256sum +sha256 6386c77ca8459cba431ed0b63da780c7062c7cc48055d222024d8eaf198ffa59 gst-plugins-ugly-1.10.4.tar.xz diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 2f68145ca6..d503555cf4 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.10.3 +GST1_PLUGINS_UGLY_VERSION = 1.10.4 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From 97ca45aa494aa9b5caa051adf0d821c30c667558 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 15:55:26 -0300 Subject: [PATCH 2743/3392] gst1-libav: security bump to version 1.10.4 It updates to the ffmpeg 3.2.4 codebase, fixing several security bugs. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 9c846308e5..cc83429f6a 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.3.tar.xz.sha256sum -sha256 9a6bc165b1862b18b98d9f1755c43806e4839a80f69ec7ea9a2dab61b65752a9 gst-libav-1.10.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.4.tar.xz.sha256sum +sha256 6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b gst-libav-1.10.4.tar.xz diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index ec84b770c0..5726bb5d61 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.10.3 +GST1_LIBAV_VERSION = 1.10.4 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_CONF_OPTS = --with-system-libav From e6f4235756d3f77584b26346595b03d05f0595e1 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 15:55:27 -0300 Subject: [PATCH 2744/3392] gst1-rtsp-server: bump to version 1.10.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 21d4ba564a..d4c540d690 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,2 +1,2 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.3.tar.xz.sha256sum -sha256 baf9f7d229711cb3d823a447a930132f809b3321eab3535491bb01c8a21566fe gst-rtsp-server-1.10.3.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.4.tar.xz.sha256sum +sha256 2f6e12fd4e3568ee190dc24e57e4c3a878971c3a3fb6904a9674404fac256de6 gst-rtsp-server-1.10.4.tar.xz diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index a2e8eec7b3..bfdd4c433a 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.10.3 +GST1_RTSP_SERVER_VERSION = 1.10.4 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPLv2+ From 28f11b4852ef21da1a979fa35a999ed687ee0d14 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 15:55:28 -0300 Subject: [PATCH 2745/3392] gst1-validate: bump to version 1.10.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-validate/gst1-validate.hash | 4 ++-- package/gstreamer1/gst1-validate/gst1-validate.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-validate/gst1-validate.hash b/package/gstreamer1/gst1-validate/gst1-validate.hash index 164ee2dab6..10c6667357 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.hash +++ b/package/gstreamer1/gst1-validate/gst1-validate.hash @@ -1,2 +1,2 @@ -# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.3.tar.xz.sha256sum -sha256 be6b48569324c541266310e7e6d1098b1a2ec7cd06b9e95b6701c96bc4562c02 gst-validate-1.10.3.tar.xz +# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.4.tar.xz.sha256sum +sha256 e59c00bf64cca9c477cdb44eb8dd0b3aac5499b17d77bf28ee054fd211e8d73c gst-validate-1.10.4.tar.xz diff --git a/package/gstreamer1/gst1-validate/gst1-validate.mk b/package/gstreamer1/gst1-validate/gst1-validate.mk index 695e53e043..cf7a8aff5c 100644 --- a/package/gstreamer1/gst1-validate/gst1-validate.mk +++ b/package/gstreamer1/gst1-validate/gst1-validate.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VALIDATE_VERSION = 1.10.3 +GST1_VALIDATE_VERSION = 1.10.4 GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate GST1_VALIDATE_LICENSE = LGPLv2.1+ From 5bffdf2a1a478fc84cdf7ba124b8859cacd11843 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 15:55:29 -0300 Subject: [PATCH 2746/3392] gst-omx: bump to version 1.10.4 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index be39ef764b..dff9840455 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,2 +1,2 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.3.tar.xz.sha256sum -sha256 dd88451e175df7a6b6f619eff0f43a6078054ec7068787b19faf89af94cdb6e1 gst-omx-1.10.3.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.4.tar.xz.sha256sum +sha256 45072925cf262f0fd528fab78f0de52734e46a5a88aa802fae51c67c09c81aa2 gst-omx-1.10.4.tar.xz diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index d55ef5fe6d..6ce7baad2f 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.10.3 +GST_OMX_VERSION = 1.10.4 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From 01464f56bd8a61b461fce4c108be299a47a6a405 Mon Sep 17 00:00:00 2001 From: Chris Smart Date: Wed, 22 Feb 2017 14:14:23 +1100 Subject: [PATCH 2747/3392] package/python: apply unicode config to host build Currently the host build of Python 2 defaults to narrow unicode (UCS2), ignoring the BR2_PACKAGE_PYTHON_UCS4 configuration option which may be set to wide (UCS4). This results in host and target Python packages which are incompatible in subtle ways. For example, installing wheels into the target fails when they are made with the host python, citing incompatibility (as can be seen by the package tags which may be "cp27u-manylinux1" instead of "cp27mu-manylinux1"). Compiling the host Python 2 with the same UCS configuration as the target ensures that the packages are compatible (and the tags match). This does not affect Python 3 as support for narrow unicode was deprecated in version 3.3, see https://www.python.org/dev/peps/pep-0393/ Thanks to Tony Breeds for reporting this. Signed-off-by: Chris Smart [Thomas: add comment in the code.] Signed-off-by: Thomas Petazzoni --- package/python/python.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/python/python.mk b/package/python/python.mk index 7b20434c94..281130c68b 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -105,6 +105,9 @@ endif # Default is UCS2 w/o a conf opt ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y) +# host-python must have the same UCS2/4 configuration as the target +# python +HOST_PYTHON_CONF_OPTS += --enable-unicode=ucs4 PYTHON_CONF_OPTS += --enable-unicode=ucs4 endif From 6cda6506ad9c0505c8a154b12daf1c71551977f7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 24 Feb 2017 10:40:06 +0100 Subject: [PATCH 2748/3392] package/libepoxy: needs host-pkgconf configure.ac uses PKG_CHECK_MODULES() so it needs host-pkgconf. Signed-off-by: "Yann E. MORIN" Cc: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/libepoxy/libepoxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk index 7436e8fed6..1dd583e3ed 100644 --- a/package/libepoxy/libepoxy.mk +++ b/package/libepoxy/libepoxy.mk @@ -9,7 +9,7 @@ LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION)) LIBEPOXY_INSTALL_STAGING = YES # For patches 0001-0006: LIBEPOXY_AUTORECONF = YES -LIBEPOXY_DEPENDENCIES = xutil_util-macros +LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros LIBEPOXY_LICENSE = MIT LIBEPOXY_LICENSE_FILES = COPYING From ce1dac2d429c34c1f60e58aa45c05fc17f8cbf5a Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Fri, 24 Feb 2017 11:47:53 +0100 Subject: [PATCH 2749/3392] board/atmel/readme.txt: fix typos Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- board/atmel/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/atmel/readme.txt b/board/atmel/readme.txt index 0b6634687e..4f90e4b4cc 100644 --- a/board/atmel/readme.txt +++ b/board/atmel/readme.txt @@ -44,7 +44,7 @@ using SAM-BA" section below. For the Xplained boards, an alternative Buildroot configuration is provided to boot from an SD card. Those configurations are labeled as 'mmc'. In this case, after building Buildroot, follow the instructions -in the "Preparting the SD card" sction. +in the "Preparing the SD card" section. To configure and build Buildroot, run: From a3c07d08eae55deeb1b1731174309750bb0ea628 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 24 Feb 2017 12:00:02 +0100 Subject: [PATCH 2750/3392] util-linux: re-add _AUTORECONF = YES Commit a5015f1025a1aee173c2c2ab39ccac5ce38f30c3 ("util-linux: security bump to version 2.29.2") incorrectly removed _AUTORECONF = YES. While the patches touching configure.ac have indeed been removed, there is still a patch touching a Makemodule.am file, which triggers an autoreconf a build time, which itself fails because autoconf/automake are not available. So re-add _AUTORECONF, with a comment pointing specifically at the patch that makes it necessary. Fixes: http://autobuild.buildroot.net/results/309127a532eed00e406bbaf0b1a51b7241a10505/ Signed-off-by: Thomas Petazzoni --- package/util-linux/util-linux.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 0fc46d4f17..05e1398937 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -9,6 +9,9 @@ UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) +# 0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch +UTIL_LINUX_AUTORECONF = YES + # README.licensing claims that some files are GPLv2-only, but this is not true. # Some files are GPLv3+ but only in tests. UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, LGPLv2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid) From ba684f0a128e33b24b7c4a4bce0d0d557887f8df Mon Sep 17 00:00:00 2001 From: Jesper Baekdahl Date: Fri, 24 Feb 2017 10:03:07 +0100 Subject: [PATCH 2751/3392] glibc: install libanl.so to target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libanl.so is needed for asynchronous network address and service translation, declared in netdb.h Signed-off-by: Jesper Bækdahl Signed-off-by: Thomas Petazzoni --- package/glibc/glibc.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index c11f7cd867..ee5253968d 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -101,9 +101,9 @@ endef # GLIBC_LIBS_LIB = \ - ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* \ - libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.* \ - libnss_files.so.* libnss_dns.so.* libmvec.so.* + ld*.so.* libanl.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* \ + libm.so.* libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* \ + libutil.so.* libnss_files.so.* libnss_dns.so.* libmvec.so.* ifeq ($(BR2_PACKAGE_GDB),y) GLIBC_LIBS_LIB += libthread_db.so.* From e9abb4a8b4d9498a8eb4e0fdd3a625534adc9382 Mon Sep 17 00:00:00 2001 From: Jesper Baekdahl Date: Fri, 24 Feb 2017 10:03:08 +0100 Subject: [PATCH 2752/3392] toolchain-external: install libanl.so for glibc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libanl.so is needed for asynchronous network address and service translation, declared in netdb.h Signed-off-by: Jesper Bækdahl Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 6658875007..11a1bf5e24 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -124,7 +124,7 @@ endif # ! no threads endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y) -TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* +TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* libanl.so.* endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) From 7e4c99b95012881aacbc686e952b26e38422b389 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 25 Feb 2017 15:31:23 +0100 Subject: [PATCH 2753/3392] package/oracle-mysql: fix path to systemd service file The path is a remnant from before the rename of the package. Rather than hard-code the path, use the available variable. Also use that variable when copying the Sys-V init script. Fixes: http://autobuild.buildroot.org/results/767/767f0be3894c45c1e6d18bc4528d0da7b50e3757/ http://autobuild.buildroot.org/results/e93/e934683ebcb33c9cc8fe9de7b1d5dcd7866f3bce/ http://autobuild.buildroot.org/results/5d0/5d04163de80f7900d4aed14cff75b2e0761f101d/ Signed-off-by: "Yann E. MORIN" Cc: Ryan Coe Signed-off-by: Thomas Petazzoni --- package/oracle-mysql/oracle-mysql.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk index ed3c0ea983..f0f0649618 100644 --- a/package/oracle-mysql/oracle-mysql.mk +++ b/package/oracle-mysql/oracle-mysql.mk @@ -108,12 +108,12 @@ endef ORACLE_MYSQL_POST_INSTALL_TARGET_HOOKS += ORACLE_MYSQL_ADD_FOLDER define ORACLE_MYSQL_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/oracle-mysql/S97mysqld \ + $(INSTALL) -D -m 0755 $(ORACLE_MYSQL_PKGDIR)/S97mysqld \ $(TARGET_DIR)/etc/init.d/S97mysqld endef define ORACLE_MYSQL_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/mysql/mysqld.service \ + $(INSTALL) -D -m 644 $(ORACLE_MYSQL_PKGDIR)/mysqld.service \ $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ From a384ce7d4b8485460d342ee54cfee491fc11a5a4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 25 Feb 2017 02:37:14 +0100 Subject: [PATCH 2754/3392] binutils: fix for ld segfault for microblaze when --gc-sections is used The workarounds for kmod/libnss can be removed when the patch is applied and the autobuilder toolchains got rebuild. kmod: 0d81107f021bf2a663f102bace1e3f9590641170 libnss: fceb1afd5dda45cf180f22877a6ab0e51d1b3dac Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- .../2.25.1/916-microblaze-pr21180.patch | 33 +++++++++++++++++++ .../2.26.1/0906-microblaze-pr21180.patch | 33 +++++++++++++++++++ .../2.27/0906-microblaze-pr21180.patch | 33 +++++++++++++++++++ 3 files changed, 99 insertions(+) create mode 100644 package/binutils/2.25.1/916-microblaze-pr21180.patch create mode 100644 package/binutils/2.26.1/0906-microblaze-pr21180.patch create mode 100644 package/binutils/2.27/0906-microblaze-pr21180.patch diff --git a/package/binutils/2.25.1/916-microblaze-pr21180.patch b/package/binutils/2.25.1/916-microblaze-pr21180.patch new file mode 100644 index 0000000000..2ffae49f62 --- /dev/null +++ b/package/binutils/2.25.1/916-microblaze-pr21180.patch @@ -0,0 +1,33 @@ +Fix ld segfault for microblaze when --gc-sections is used +Upstream: pending +https://sourceware.org/bugzilla/show_bug.cgi?id=21180 + +Signed-off-by: Waldemar Brodkorb + +diff -Nur binutils-2.25.1.orig/bfd/elf32-microblaze.c binutils-2.25.1/bfd/elf32-microblaze.c +--- binutils-2.25.1.orig/bfd/elf32-microblaze.c 2015-07-21 10:20:58.000000000 +0200 ++++ binutils-2.25.1/bfd/elf32-microblaze.c 2017-02-23 19:43:24.560776208 +0100 +@@ -3297,13 +3297,20 @@ + && h->def_regular) + { + asection *sec = h->root.u.def.section; ++ bfd_vma value; ++ ++ value = h->root.u.def.value; ++ if (sec->output_section != NULL) ++ /* PR 21180: If the output section is NULL, then the symbol is no ++ longer needed, and in theory the GOT entry is redundant. But ++ it is too late to change our minds now... */ ++ value += sec->output_section->vma + sec->output_offset; ++ + microblaze_elf_output_dynamic_relocation (output_bfd, + srela, srela->reloc_count++, + /* symindex= */ 0, + R_MICROBLAZE_REL, offset, +- h->root.u.def.value +- + sec->output_section->vma +- + sec->output_offset); ++ value); + } + else + { diff --git a/package/binutils/2.26.1/0906-microblaze-pr21180.patch b/package/binutils/2.26.1/0906-microblaze-pr21180.patch new file mode 100644 index 0000000000..8104db3462 --- /dev/null +++ b/package/binutils/2.26.1/0906-microblaze-pr21180.patch @@ -0,0 +1,33 @@ +Fix ld segfault for microblaze when --gc-sections is used +Upstream: pending +https://sourceware.org/bugzilla/show_bug.cgi?id=21180 + +Signed-off-by: Waldemar Brodkorb + +diff -Nur binutils-2.26.1.orig/bfd/elf32-microblaze.c binutils-2.26.1/bfd/elf32-microblaze.c +--- binutils-2.26.1.orig/bfd/elf32-microblaze.c 2015-11-13 09:27:40.000000000 +0100 ++++ binutils-2.26.1/bfd/elf32-microblaze.c 2017-02-23 19:43:18.536542964 +0100 +@@ -3300,13 +3300,20 @@ + && h->def_regular) + { + asection *sec = h->root.u.def.section; ++ bfd_vma value; ++ ++ value = h->root.u.def.value; ++ if (sec->output_section != NULL) ++ /* PR 21180: If the output section is NULL, then the symbol is no ++ longer needed, and in theory the GOT entry is redundant. But ++ it is too late to change our minds now... */ ++ value += sec->output_section->vma + sec->output_offset; ++ + microblaze_elf_output_dynamic_relocation (output_bfd, + srela, srela->reloc_count++, + /* symindex= */ 0, + R_MICROBLAZE_REL, offset, +- h->root.u.def.value +- + sec->output_section->vma +- + sec->output_offset); ++ value); + } + else + { diff --git a/package/binutils/2.27/0906-microblaze-pr21180.patch b/package/binutils/2.27/0906-microblaze-pr21180.patch new file mode 100644 index 0000000000..48e5e14b45 --- /dev/null +++ b/package/binutils/2.27/0906-microblaze-pr21180.patch @@ -0,0 +1,33 @@ +Fix ld segfault for microblaze when --gc-sections is used +Upstream: pending +https://sourceware.org/bugzilla/show_bug.cgi?id=21180 + +Signed-off-by: Waldemar Brodkorb + +diff -Nur binutils-2.27.orig/bfd/elf32-microblaze.c binutils-2.27/bfd/elf32-microblaze.c +--- binutils-2.27.orig/bfd/elf32-microblaze.c 2016-08-03 09:36:50.000000000 +0200 ++++ binutils-2.27/bfd/elf32-microblaze.c 2017-02-23 19:43:12.612313590 +0100 +@@ -3297,13 +3297,20 @@ + || h->dynindx == -1)) + { + asection *sec = h->root.u.def.section; ++ bfd_vma value; ++ ++ value = h->root.u.def.value; ++ if (sec->output_section != NULL) ++ /* PR 21180: If the output section is NULL, then the symbol is no ++ longer needed, and in theory the GOT entry is redundant. But ++ it is too late to change our minds now... */ ++ value += sec->output_section->vma + sec->output_offset; ++ + microblaze_elf_output_dynamic_relocation (output_bfd, + srela, srela->reloc_count++, + /* symindex= */ 0, + R_MICROBLAZE_REL, offset, +- h->root.u.def.value +- + sec->output_section->vma +- + sec->output_offset); ++ value); + } + else + { From 021f95a2a43b9d3e765856ab9eb5e8d5af5a3dcd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 25 Feb 2017 22:17:01 +0100 Subject: [PATCH 2755/3392] synergy: Fix build with gcc 6 Fixes: http://autobuild.buildroot.net/results/05b/05bbc22dd6cd5564462226e612ab1e95778fe935/ http://autobuild.buildroot.net/results/edf/edfe58749d1b7a1bb2e0184a6824a74b9d38ddb9/ http://autobuild.buildroot.net/results/139/1395eca13ca537bde928ddd68a5bc6e130e82ba3/ http://autobuild.buildroot.net/results/94a/94ad6e8bbbeb926ea834d9d6e3ba87d0398acb86/ Gcc 6.x defaults to C++14, and the iostream operator bool behaviour changed in C++11. In previous versions, a somewhat odd operator void* was used to return the status of the stream as a pointer. Since C++11 a more sensible operator bool is used to return the stream staus. For details, see: http://en.cppreference.com/w/cpp/io/basic_ios/operator_bool The code in CConfigReadContext assumes the pre-C++11 behaviour and provides its own operator void overload to return the status of the embedded iostream. With C++11, iostream no longer provides this overload, breaking the build: CConfig.cpp: In member function 'CConfigReadContext::operator void*() const': CConfig.cpp:1851:9: error: cannot convert 'std::istream {aka std::basic_istream}' to 'void*' in return return m_stream; To fix it, backport part of upstream commit 3d963bfbe7897d0a33ad (possible fix for mavericks) which changes the code to simply provide a getStream() method which returns a reference to the embedded stream and the calling code is changed to use operator bool on the returned stream, making the code compatible with both old and new compilers. This upstream commit is part of the 1.6.0 release, so can be dropped when the version is bumped. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- .../synergy/0003-Fix-build-with-gcc-6.patch | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 package/synergy/0003-Fix-build-with-gcc-6.patch diff --git a/package/synergy/0003-Fix-build-with-gcc-6.patch b/package/synergy/0003-Fix-build-with-gcc-6.patch new file mode 100644 index 0000000000..843078fe63 --- /dev/null +++ b/package/synergy/0003-Fix-build-with-gcc-6.patch @@ -0,0 +1,86 @@ +From b79d478c21ed6af20554ead97da72de845dc3206 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Sat, 25 Feb 2017 21:57:19 +0100 +Subject: [PATCH] Fix build with gcc 6 + +Gcc 6.x defaults to C++14, and the iostream operator bool behaviour changed +in C++11. In previous versions, a somewhat odd operator void* was used to +return the status of the stream as a pointer. Since C++11 a more sensible +operator bool is used to return the stream staus. + +For details, see: + +http://en.cppreference.com/w/cpp/io/basic_ios/operator_bool + +The code in CConfigReadContext assumes the pre-C++11 behaviour and provides +its own operator void overload to return the status of the embedded +iostream. With C++11, iostream no longer provides this overload, breaking +the build: + +CConfig.cpp: In member function 'CConfigReadContext::operator void*() const': +CConfig.cpp:1851:9: error: cannot convert 'std::istream {aka std::basic_istream}' to 'void*' in return + return m_stream; + +To fix it, backport part of upstream commit 3d963bfbe7897d0a33ad (possible +fix for mavericks) which changes the code to simply provide a getStream() +method which returns a reference to the embedded stream and the calling code +is changed to use operator bool on the returned stream, making the code +compatible with both old and new compilers. + +This upstream commit is part of the 1.6.0 release, so can be dropped when +the version is bumped. + +Signed-off-by: Peter Korsgaard +--- + lib/server/CConfig.cpp | 7 +------ + lib/server/CConfig.h | 2 +- + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/lib/server/CConfig.cpp b/lib/server/CConfig.cpp +index a502fe78..d67dde20 100644 +--- a/lib/server/CConfig.cpp ++++ b/lib/server/CConfig.cpp +@@ -607,7 +607,7 @@ void + CConfig::read(CConfigReadContext& context) + { + CConfig tmp; +- while (context) { ++ while (context.getStream()) { + tmp.readSection(context); + } + *this = tmp; +@@ -1846,11 +1846,6 @@ CConfigReadContext::getLineNumber() const + return m_line; + } + +-CConfigReadContext::operator void*() const +-{ +- return m_stream; +-} +- + bool + CConfigReadContext::operator!() const + { +diff --git a/lib/server/CConfig.h b/lib/server/CConfig.h +index c0d2faa8..0ee453cb 100644 +--- a/lib/server/CConfig.h ++++ b/lib/server/CConfig.h +@@ -480,7 +480,6 @@ public: + bool readLine(CString&); + UInt32 getLineNumber() const; + +- operator void*() const; + bool operator!() const; + + OptionValue parseBoolean(const CString&) const; +@@ -502,6 +501,7 @@ public: + IPlatformScreen::CButtonInfo* + parseMouse(const CString& mouse) const; + KeyModifierMask parseModifier(const CString& modifiers) const; ++ std::istream& getStream() const { return m_stream; }; + + private: + // not implemented +-- +2.11.0 + From be8177fcea62a3ea1a3c3e870b0da3b600f092ce Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 26 Feb 2017 11:51:27 +0100 Subject: [PATCH 2756/3392] libpcap: sparc needs -fPIC as sparc64/microblaze Fixes nmap build for sparc. Fixes: http://autobuild.buildroot.net/results/8e476939f1daaa20c316dbd0508fa343034f2397 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/libpcap/libpcap.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 2583087953..505e2abe3d 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -53,8 +53,8 @@ else LIBPCAP_CONF_OPTS += --without-libnl endif -# microblaze/sparc64 need -fPIC instead of -fpic -ifeq ($(BR2_microblaze)$(BR2_sparc64),y) +# microblaze/sparc/sparc64 need -fPIC instead of -fpic +ifeq ($(BR2_microblaze)$(BR2_sparc)$(BR2_sparc64),y) LIBPCAP_CFLAGS += -fPIC endif From 779ec7f36dfb85c43c093ec5a19116399bcd3252 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 26 Feb 2017 12:19:03 +0100 Subject: [PATCH 2757/3392] package/xfsprogs: fix static build xfsprogs links to some libraries from util-linux. Those in turn may use i18n functions when locales are enabled. When doing a uClibc build, those i18n functions are provided by the libintl library from the gettext package. xfsprogs does not use pkgconfig to find the util-linux libraries, so it misses the Requires.private field from libblkid, and thus misses the Libs.private field from libuid. And so a static link fails because of undefined references to i18n symbols. Furthermore, xfsprogs does not use automake; the hand-made Makefiles do not make use of the LIBS variable set by configure. We fix that in two ways: - pass LIBS=-lintl to configure, so that the configure step has a chance to succeed (as suggested by Waldemar) - patch a Makefile to link with EXTRALIBS, and pass EXTRALIBS via XFSPROGS_MAKE_OPTS Fixes: http://autobuild.buildroot.org/results/503/50314716a9f72e8bb238e52e9dc342c68f7e0b8b/ http://autobuild.buildroot.org/results/253/253a024698b55dece992b2631e30edf4ff9092f7/ http://autobuild.buildroot.org/results/3fe/3fe0d96cf13af12b0051a95f7865d4e38f4a78af/ http://autobuild.buildroot.org/results/d48/d48e61785d25d33106b7dab1b5cb200cf27d4044/ ... Signed-off-by: "Yann E. MORIN" Cc: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- ...004-build-add-EXTRALIBS-to-link-with.patch | 53 +++++++++++++++++++ package/xfsprogs/xfsprogs.mk | 17 ++++++ 2 files changed, 70 insertions(+) create mode 100644 package/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch diff --git a/package/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch b/package/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch new file mode 100644 index 0000000000..8ff0580f6b --- /dev/null +++ b/package/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch @@ -0,0 +1,53 @@ +From 1e9bb2fba94bc508659f1667bf95501324849bb9 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 26 Feb 2017 12:04:54 +0100 +Subject: [PATCH] build: add EXTRALIBS to link with + +When doing a uClibc static build, the build fails to link: + http://autobuild.buildroot.org/results/503/50314716a9f72e8bb238e52e9dc342c68f7e0b8b/build-end.log + +The cause is due to: + - xfsprogs links dome programs with util-linux' libblkid + - util-linux' libblkid is linked to util-linux' libuuid + - util-linux' libuuid uses i18n functions when locales are enabled + - uClibc does not provide i18n functions + - i18n functions are provided by libintl from libintl from gettext + +util-linux installs pkg-config files for thos two libs. However, +xfsprogs does not use pkg-config to find libblkid or libuuid, thus it +misses the Libs.private field from libuid. + +In this case, it is necessary to pass LIBS=-lintl at configure time, so +that configure correctly finds libblkid. + +Still, this is not enough, because the build will not use LIBS during +the link phase. + +We fix that last bit by adding EXTRALIBS to the libraries to link with, +so that it is possible to pass EXTRALIBS=-lintl at build time: + + $ ./configure [...] LIBS=-lintl + $ make EXTRALIBS=-lintl + +Signed-off-by: "Yann E. MORIN" +Cc: Waldemar Brodkorb +--- + include/buildmacros | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/buildmacros b/include/buildmacros +index a7c5d8a..dd62d80 100644 +--- a/include/buildmacros ++++ b/include/buildmacros +@@ -11,7 +11,7 @@ BUILDRULES = $(TOPDIR)/include/buildrules + + LDFLAGS += $(LOADERFLAGS) $(LLDFLAGS) + LTLDFLAGS += $(LOADERFLAGS) +-LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB) ++LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB) $(EXTRALIBS) + + MAKEOPTS = --no-print-directory Q=$(Q) + SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES) +-- +2.7.4 + diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index e59f1f6905..c110733c83 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -18,6 +18,23 @@ XFSPROGS_CONF_OPTS = \ INSTALL_GROUP=root \ --enable-static +# xfsprogs links some of its programs to libs from util-linux, which use +# i18n functions. For shared-only builds, that's automatically pulled in. +# Static builds need some help, though... +# +# No need to depend on gettext in this case: xfsprogs does not use it for +# itself; util-linux does need it and has it in its own dependencies. +# +# xfsprogs' buildsystem uses hand-made Makefiles, not automake, and they +# do not use the LIBS variable set by configure. So we use EXTRALIBS that +# is added by our patch. +# +# It is not needed to propagate the EXTRALIBS to the install step. +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS)$(BR2_NEEDS_GETTEXT_IF_LOCALE),yy) +XFSPROGS_CONF_OPTS += LIBS=-lintl +XFSPROGS_MAKE_OPTS = EXTRALIBS=-lintl +endif + XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install $(eval $(autotools-package)) From 4b47baac6426786791d2accf249bf4bbaee30552 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 25 Feb 2017 18:14:10 -0300 Subject: [PATCH 2758/3392] linux: bump default to version 4.9.12 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 1d375dd742..ddaaff3e94 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.9.11)" + bool "Latest version (4.9.12)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.9.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.9.12" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From be4d3ff6fcfcb1f2800df2ab25d2061ff05a3cb3 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 25 Feb 2017 18:14:11 -0300 Subject: [PATCH 2759/3392] linux-headers: bump 4.{4, 9}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8f7c2bbec2..84778f29ae 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.50" if BR2_KERNEL_HEADERS_4_4 + default "4.4.51" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.11" if BR2_KERNEL_HEADERS_4_9 + default "4.9.12" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 92b770cd825915d56ea8d92d063aebdf7ef270a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacy=20Gaw=C4=99dzki?= Date: Fri, 24 Feb 2017 15:26:24 +0100 Subject: [PATCH 2760/3392] openssh: Move key generation to the start function of init script. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since there's not much point in generating missing host keys when the init script is called with "stop", the call to ssh-keygen should not be done inconditionally, but in the start function instead. Signed-off-by: Ignacy Gawędzki Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/openssh/S50sshd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd index c15114257f..22da41d1ca 100644 --- a/package/openssh/S50sshd +++ b/package/openssh/S50sshd @@ -6,12 +6,12 @@ # Make sure the ssh-keygen progam exists [ -f /usr/bin/ssh-keygen ] || exit 0 -# Create any missing keys -/usr/bin/ssh-keygen -A - umask 077 start() { + # Create any missing keys + /usr/bin/ssh-keygen -A + printf "Starting sshd: " /usr/sbin/sshd touch /var/lock/sshd From 4fec9fc8ff9fbda8eebbb9ad337a11fd148c92f4 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 26 Feb 2017 10:40:27 -0300 Subject: [PATCH 2761/3392] linux: bump default to version 4.9.13 Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- linux/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index ddaaff3e94..1967dcca84 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -26,7 +26,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.9.12)" + bool "Latest version (4.9.13)" config BR2_LINUX_KERNEL_CUSTOM_VERSION bool "Custom version" @@ -97,7 +97,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.9.12" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.9.13" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL From 7bf47ef773c444b1f73b932068a5daedb27fd257 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 26 Feb 2017 10:40:28 -0300 Subject: [PATCH 2762/3392] linux-headers: bump 4.{4, 9}.x series Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 84778f29ae..ee02a45daf 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.51" if BR2_KERNEL_HEADERS_4_4 + default "4.4.52" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.12" if BR2_KERNEL_HEADERS_4_9 + default "4.9.13" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 0c5946acc24a36f9dff079edd054d948c69434f6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 23 Feb 2017 19:08:45 +0100 Subject: [PATCH 2763/3392] ncurses: remove BR2_PACKAGE_NCURSES_TARGET_{FORM, MENU, PANEL} options The ncurses sub-options BR2_PACKAGE_NCURSES_TARGET_{FORM,MENU,PANEL} are currently very badly broken: they only control whether the libform, libmenu and libpanel libraries are installed in $(TARGET_DIR), but do absolutely nothing about their installation in $(STAGING_DIR). This means that when one of those options is disabled, the corresponding library is indeed not installed in the target, but is available in staging. It can therefore be detected by the configure script of another package and used... even though the library will not be in the target, causing a runtime failure. Internally, ncurses.mk uses the "make install" logic of ncurses for the staging installation, but uses a completely hand-written logic for the target installation, which is the reason for this desynchronization between what's installed in staging and target. When BR2_PACKAGE_NCURSES_WCHAR=y, this also causes some build failures. Indeed, when BR2_PACKAGE_NCURSES_WCHAR=y, Buildroot creates some symbolic links lib.so -> libw.so in staging and target, but only for the lib that have been enabled by BR2_PACKAGE_NCURSES_TARGET_{FORM,MENU,PANEL}. Due to this, a package that for example needed the libmenu library but forgot to select BR2_PACKAGE_NCURSES_TARGET_MENU was: - Building fine with BR2_PACKAGE_NCURSES_WCHAR disabled (because libmenu.so exists in staging), but would fail to run at runtime because libmenu.so is not in the target. - Fail to build with BR2_PACKAGE_NCURSES_WCHAR=y because only libmenuw.so exists, and not the libmenu.so symbolic link. Since those libraries are small (43K for libform, 21K for libmenu and 8.2K for libpanel), this commit takes the very simple approach of removing those options, and installing the libraries unconditionally. It therefore uses the "make install" logic for both the staging *and* target installation. In detail, this commit: - Removes the NCURSES_PROGS variable, not needed since --without-progs already allows to disable the build and installation of programs. - Removes the NCURSES_LIBS-y variable, and replaces it with a single unconditional assignement to NCURSES_LIBS, only used to create the libw.so -> lib.so symbolic links when wchar support is enabled. - Removes NCURSES_INSTALL_TARGET_CMDS and the functions it was calling: NCURSES_INSTALL_TARGET_LIBS and NCURSES_INSTALL_TARGET_PROGS. - Adds a NCURSES_TARGET_SYMLINK_RESET hook to create the reset -> tset symbolic link, as was done before. - Adds a NCURSES_TARGET_CLEANUP_TERMINFO to cleanup the terminfo files in the target, so that we stay in the same situation in terms of installed terminfo files. - Removes the BR2_PACKAGE_NCURSES_TARGET_{FORM,MENU,PANEL} options from the Config.in files: both their definition and usage. - Simplifies all the symlink dance for lib -> libw, because as Yann E. Morin suggested, this dance is only needed in staging, not in the target. Once binaries have been built, they refer to the SONAME of the library, which is the libw variant (for shared linking). For static linking and .pc files, it's obvious that we don't care about them on the target. Therefore the NCURSES_LINK_LIBS_STATIC, NCURSES_LINK_LIBS_SHARED and NCURSES_LINK_PC functions no longer take any argument: they always apply to STAGING_DIR only. NCURSES_LINK_TARGET_LIBS is removed. It is worth mentioning that adding Config.in.legacy support is *NOT* necessary. Indeed: - If they were disabled before this patch, having them in Config.in.legacy would not trigger the legacy warning. - If they were enabled before this patch, then the behavior is unchanged: all libraries are now unconditionally installed. So there is no point in warning the user. We double-checked the installed size of a filesystem containing just ncurses before and after this patch, and the only folder that has its size changed is /usr/lib, growing from 852 KB to 932 KB in the wchar enabled case. That's a 80 KB system size increase. This commit fixes the sngrep build failure and potentially numerous runtime issues with ncurses. Fixes: http://autobuild.buildroot.net/results/7b5db21a6c568e6c6c8fe2b5d5a2f5ca24df510c/ Signed-off-by: Thomas Petazzoni --- package/alsa-utils/Config.in | 3 -- package/iprutils/Config.in | 3 -- package/iptraf-ng/Config.in | 1 - package/kismet/Config.in | 1 - package/ncurses/Config.in | 15 --------- package/ncurses/ncurses.mk | 65 ++++++++++++------------------------ package/nload/Config.in | 1 - package/samba4/samba4.mk | 2 +- 8 files changed, 22 insertions(+), 69 deletions(-) diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in index b58e6583c3..adc0aabd8e 100644 --- a/package/alsa-utils/Config.in +++ b/package/alsa-utils/Config.in @@ -34,9 +34,6 @@ config BR2_PACKAGE_ALSA_UTILS_ALSALOOP config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER bool "alsamixer" select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_TARGET_PANEL - select BR2_PACKAGE_NCURSES_TARGET_FORM - select BR2_PACKAGE_NCURSES_TARGET_MENU select BR2_PACKAGE_ALSA_LIB_MIXER depends on BR2_USE_WCHAR default y diff --git a/package/iprutils/Config.in b/package/iprutils/Config.in index 42f372cefc..b429e71c8b 100644 --- a/package/iprutils/Config.in +++ b/package/iprutils/Config.in @@ -1,9 +1,6 @@ config BR2_PACKAGE_IPRUTILS bool "iprutils" select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_TARGET_PANEL - select BR2_PACKAGE_NCURSES_TARGET_FORM - select BR2_PACKAGE_NCURSES_TARGET_MENU select BR2_PACKAGE_LIBSYSFS select BR2_PACKAGE_PCIUTILS depends on BR2_USE_MMU # fork() diff --git a/package/iptraf-ng/Config.in b/package/iptraf-ng/Config.in index 5574cfa9a5..5afb81dacf 100644 --- a/package/iptraf-ng/Config.in +++ b/package/iptraf-ng/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_IPTRAF_NG bool "iptraf-ng" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_TARGET_PANEL help IPTraf-ng is a ncurses-based network monitoring utility. It gathers data like TCP connection packet and byte counts, interface statistics diff --git a/package/kismet/Config.in b/package/kismet/Config.in index 7265c63e87..ab91c0e6fb 100644 --- a/package/kismet/Config.in +++ b/package/kismet/Config.in @@ -10,7 +10,6 @@ config BR2_PACKAGE_KISMET depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlfcn.h select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_TARGET_PANEL select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBNL help diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in index 44713f9e30..92be16435a 100644 --- a/package/ncurses/Config.in +++ b/package/ncurses/Config.in @@ -18,21 +18,6 @@ config BR2_PACKAGE_NCURSES_WCHAR help Enable wide char & UTF-8 support in ncurses libraries -config BR2_PACKAGE_NCURSES_TARGET_PANEL - bool "ncurses libpanel in target" - help - Includes ncurses dynamic libpanel in target - -config BR2_PACKAGE_NCURSES_TARGET_FORM - bool "ncurses libform in target" - help - Includes ncurses dynamic libform in target - -config BR2_PACKAGE_NCURSES_TARGET_MENU - bool "ncurses libmenu in target" - help - Includes ncurses dynamic libmenu in target - config BR2_PACKAGE_NCURSES_TARGET_PROGS bool "ncurses programs" help diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 343909fe3f..9d1b75d641 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -8,7 +8,6 @@ NCURSES_VERSION = 5.9 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses -NCURSES_PROGS = clear infocmp tabs tic toe tput tset NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = README NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)$(NCURSES_ABI_VERSION)-config @@ -50,11 +49,6 @@ else NCURSES_CONF_OPTS += --without-gpm endif -NCURSES_LIBS-y = ncurses -NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_MENU) += menu -NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_PANEL) += panel -NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_FORM) += form - NCURSES_TERMINFO_FILES = \ a/ansi \ l/linux \ @@ -73,38 +67,36 @@ NCURSES_TERMINFO_FILES = \ ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) NCURSES_CONF_OPTS += --enable-widec NCURSES_LIB_SUFFIX = w +NCURSES_LIBS = ncurses menu panel form define NCURSES_LINK_LIBS_STATIC - $(foreach lib,$(NCURSES_LIBS-y:%=lib%), \ - ln -sf $(lib)$(NCURSES_LIB_SUFFIX).a $(1)/usr/lib/$(lib).a + $(foreach lib,$(NCURSES_LIBS:%=lib%), \ + ln -sf $(lib)$(NCURSES_LIB_SUFFIX).a $(STAGING_DIR)/usr/lib/$(lib).a ) ln -sf libncurses$(NCURSES_LIB_SUFFIX).a \ - $(1)/usr/lib/libcurses.a + $(STAGING_DIR)/usr/lib/libcurses.a endef define NCURSES_LINK_LIBS_SHARED - $(foreach lib,$(NCURSES_LIBS-y:%=lib%), \ - ln -sf $(lib)$(NCURSES_LIB_SUFFIX).so $(1)/usr/lib/$(lib).so + $(foreach lib,$(NCURSES_LIBS:%=lib%), \ + ln -sf $(lib)$(NCURSES_LIB_SUFFIX).so $(STAGING_DIR)/usr/lib/$(lib).so ) ln -sf libncurses$(NCURSES_LIB_SUFFIX).so \ - $(1)/usr/lib/libcurses.so + $(STAGING_DIR)/usr/lib/libcurses.so endef define NCURSES_LINK_PC - $(foreach pc,$(NCURSES_LIBS-y), \ + $(foreach pc,$(NCURSES_LIBS), \ ln -sf $(pc)$(NCURSES_LIB_SUFFIX).pc \ - $(1)/usr/lib/pkgconfig/$(pc).pc + $(STAGING_DIR)/usr/lib/pkgconfig/$(pc).pc ) endef -NCURSES_LINK_TARGET_LIBS = \ - $(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_STATIC,$(TARGET_DIR));) \ - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_SHARED,$(TARGET_DIR))) NCURSES_LINK_STAGING_LIBS = \ - $(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_STATIC,$(STAGING_DIR));) \ - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_SHARED,$(STAGING_DIR))) + $(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_STATIC);) \ + $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_SHARED)) -NCURSES_LINK_STAGING_PC = $(call NCURSES_LINK_PC,$(STAGING_DIR)) +NCURSES_LINK_STAGING_PC = $(call NCURSES_LINK_PC) NCURSES_CONF_OPTS += --enable-ext-colors NCURSES_ABI_VERSION = 6 @@ -132,36 +124,21 @@ define NCURSES_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) endef -ifneq ($(BR2_STATIC_LIBS),y) -define NCURSES_INSTALL_TARGET_LIBS - $(foreach lib,$(NCURSES_LIBS-y:%=lib%), \ - cp -dpf $(NCURSES_DIR)/lib/$(lib)$(NCURSES_LIB_SUFFIX).so* \ - $(TARGET_DIR)/usr/lib/ - ) -endef -endif - ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PROGS),y) -define NCURSES_INSTALL_TARGET_PROGS - $(foreach prog,$(NCURSES_PROGS), \ - $(INSTALL) -m 0755 $(NCURSES_DIR)/progs/$(prog) \ - $(TARGET_DIR)/usr/bin/$(prog) - ) +define NCURSES_TARGET_SYMLINK_RESET ln -sf tset $(TARGET_DIR)/usr/bin/reset endef +NCURSES_POST_INSTALL_TARGET_HOOKS += NCURSES_TARGET_SYMLINK_RESET endif -define NCURSES_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - $(NCURSES_INSTALL_TARGET_LIBS) - $(NCURSES_LINK_TARGET_LIBS) - $(NCURSES_INSTALL_TARGET_PROGS) - ln -snf /usr/share/terminfo $(TARGET_DIR)/usr/lib/terminfo - $(foreach terminfo,$(NCURSES_TERMINFO_FILES),\ - $(INSTALL) -D -m 0644 $(STAGING_DIR)/usr/share/terminfo/$(terminfo) \ - $(TARGET_DIR)/usr/share/terminfo/$(terminfo) +define NCURSES_TARGET_CLEANUP_TERMINFO + $(RM) -rf $(TARGET_DIR)/usr/share/terminfo $(TARGET_DIR)/usr/share/tabset + $(foreach t,$(NCURSES_TERMINFO_FILES), \ + $(INSTALL) -D -m 0644 $(STAGING_DIR)/usr/share/terminfo/$(t) \ + $(TARGET_DIR)/usr/share/terminfo/$(t) ) -endef # NCURSES_INSTALL_TARGET_CMDS +endef +NCURSES_POST_INSTALL_TARGET_HOOKS += NCURSES_TARGET_CLEANUP_TERMINFO # # On systems with an older version of tic, the installation of ncurses hangs diff --git a/package/nload/Config.in b/package/nload/Config.in index 68ddbe6ca7..c938d8eae8 100644 --- a/package/nload/Config.in +++ b/package/nload/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_NLOAD bool "nload" depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_TARGET_FORM help nload is a console application which monitors network traffic and bandwidth usage in real time. It visualizes the in- and diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 4020caafe6..f64b684bf8 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -59,7 +59,7 @@ else SAMBA4_CONF_OPTS += --disable-gnutls endif -ifeq ($(BR2_PACKAGE_NCURSES_TARGET_FORM)$(BR2_PACKAGE_NCURSES_TARGET_MENU)$(BR2_PACKAGE_NCURSES_TARGET_PANEL),yyy) +ifeq ($(BR2_PACKAGE_NCURSES),y) SAMBA4_CONF_ENV += NCURSES_CONFIG="$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)" SAMBA4_DEPENDENCIES += ncurses else From f12a146f817c8ef07a7d41a31a5336b5ef6a96e8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 26 Feb 2017 20:30:47 +0100 Subject: [PATCH 2764/3392] classpath: add patch to fix or1k compile error Fixes: http://autobuild.buildroot.net/results/a0bb5535fd197b9dd1607a5f0bca477c9575c99f Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- package/classpath/0003-add-or1k-endian.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/classpath/0003-add-or1k-endian.patch diff --git a/package/classpath/0003-add-or1k-endian.patch b/package/classpath/0003-add-or1k-endian.patch new file mode 100644 index 0000000000..8bc87841db --- /dev/null +++ b/package/classpath/0003-add-or1k-endian.patch @@ -0,0 +1,18 @@ +Set endianess for or1k + +Signed-off-by: Waldemar Brodkorb + +diff -Nur classpath-0.98.orig/native/fdlibm/ieeefp.h classpath-0.98/native/fdlibm/ieeefp.h +--- classpath-0.98.orig/native/fdlibm/ieeefp.h 2008-01-13 18:33:50.000000000 +0100 ++++ classpath-0.98/native/fdlibm/ieeefp.h 2017-02-26 12:39:12.316327363 +0100 +@@ -123,6 +123,10 @@ + #define __IEEE_BIG_ENDIAN + #endif + ++#ifdef __or1k__ ++#define __IEEE_BIG_ENDIAN ++#endif ++ + #ifdef __v800 + #define __IEEE_LITTLE_ENDIAN + #endif From 410082e1d980668385ffd2993920785e0fffd2c1 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Sun, 26 Feb 2017 16:08:49 +0100 Subject: [PATCH 2765/3392] support/misc/Vagrantfile: reorganize provisioning * Remove distribution upgrade cause it slows down the first boot and presents a bug when executed non interactively. * Reorganize provision scripts to be in privileged and non privileged sections * Add Ubuntu mirror automatic handling for apt packages sources Fixes bug #9581 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- support/misc/Vagrantfile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index dc4c15d51e..89973ceeb0 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -41,19 +41,20 @@ Vagrant.configure('2') do |config| end end - config.vm.provision 'shell', inline: - "sudo dpkg --add-architecture i386 - sudo apt-get -q update - sudo apt-get purge -q -y snapd lxcfs lxd ubuntu-core-launcher snap-confine - sudo apt-get -q -y upgrade - sudo apt-get -q -y install build-essential libncurses5-dev \ + config.vm.provision 'shell', privileged: true, inline: + "sed -i 's|deb http://us.archive.ubuntu.com/ubuntu/|deb mirror://mirrors.ubuntu.com/mirrors.txt|g' /etc/apt/sources.list + dpkg --add-architecture i386 + apt-get -q update + apt-get purge -q -y snapd lxcfs lxd ubuntu-core-launcher snap-confine + apt-get -q -y install build-essential libncurses5-dev \ git bzr cvs mercurial subversion libc6:i386 unzip bc - sudo apt-get -q -y autoremove - sudo apt-get -q -y clean - sudo update-locale LC_ALL=C" + apt-get -q -y autoremove + apt-get -q -y clean + update-locale LC_ALL=C" config.vm.provision 'shell', privileged: false, inline: "echo 'Downloading and extracting buildroot #{RELEASE}' wget -q -c http://buildroot.org/downloads/buildroot-#{RELEASE}.tar.gz tar axf buildroot-#{RELEASE}.tar.gz" + end From dbd30cd5d8d1970e2838ffb59d0179a1524b0ce4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 23 Feb 2017 23:17:13 +0100 Subject: [PATCH 2766/3392] package/directfb: disable for static builds DirectFB is written in C++, but can be linked to by a C library or program. When doing shared link, this is fine because the linker gets help from the DT_NEEDED flags and knows what libraries to pull in during the link. However, during a static link, the linker does not get such help. Properly fixing this would require that there is support in pkg-config and autotools to specify that the C++ runtime must be linked. Alas there is no sush support. The only option is to add -lstdc++ to the Libs.Private field in directfb.pc. But this is not upstreamable, because there are other C++ runtimes in the wild (e.g. -lc++ from llvm/clang). However, DirectFB in a static scenario is probably not a very common scenario. Disable DirectFB for static builds. Fixes: http://autobuild.buildroot.org/results/3d3/3d3036d40ddad71d872d910aae7a24975706d2e9/ http://autobuild.buildroot.org/results/d1c/d1c35a6003396942b584f2f2a5e8bf4ac2fbe370/ http://autobuild.buildroot.org/results/d45/d4504871bd47930e8363032d380cdfcc5bb8aee7/ [...] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/directfb/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/directfb/Config.in b/package/directfb/Config.in index b552164777..6a3d71868f 100644 --- a/package/directfb/Config.in +++ b/package/directfb/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DIRECTFB bool "directfb" + depends on !BR2_STATIC_LIBS # static link issues depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 @@ -161,7 +162,8 @@ config BR2_PACKAGE_DIRECTFB_TESTS endif # BR2_PACKAGE_DIRECTFB -comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5" +comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL || \ + BR2_STATIC_LIBS From 1914ce3f312e645cadd83d44628f4bdf2983122d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 25 Feb 2017 19:51:30 +0100 Subject: [PATCH 2767/3392] Revert "cmake: bump version to 3.7.2" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cmake 3.7 causes serious regressions in some cmake-based packages, related to how RPATH is handled. This reverts commit f8a6990c92451dab2ff9e14f3e94fdecbd79b604. Signed-off-by: "Yann E. MORIN" Cc: Vicente Olivert Riera Cc: Samuel Martin Cc: Thomas Petazzoni Cc: Jörg Krause Cc: Baruch Siach Signed-off-by: Peter Korsgaard --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 13c0237594..7a22f21ea0 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,2 +1,2 @@ -# From http://www.cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt -sha256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 cmake-3.7.2.tar.gz +# From http://www.cmake.org/files/v3.7/cmake-3.7.1-SHA-256.txt +sha256 449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 cmake-3.7.1.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 0fd71391fa..107715ce49 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -5,7 +5,7 @@ ################################################################################ CMAKE_VERSION_MAJOR = 3.7 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt From f3f0ba82c5cb7ecdd6766c454001bf3daca6f30c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 25 Feb 2017 19:51:31 +0100 Subject: [PATCH 2768/3392] Revert "cmake: adjust dependencies added for libuv" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cmake 3.7 causes serious regressions in some cmake-based packages, related to how RPATH is handled. This reverts commit b754237520a4795eadc0edec768b267dd598ab0e. Signed-off-by: "Yann E. MORIN" Cc: Vicente Olivert Riera Cc: Samuel Martin Cc: Thomas Petazzoni Cc: Jörg Krause Cc: Baruch Siach Signed-off-by: Peter Korsgaard --- package/cmake/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 2706db51fa..716d80ec55 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -26,7 +26,7 @@ config BR2_PACKAGE_CMAKE_CTEST depends on BR2_USE_WCHAR # libarchive depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS # libuv depends on BR2_USE_MMU # libuv help CTest is a testing tool distributed as a part of CMake. It @@ -37,9 +37,9 @@ config BR2_PACKAGE_CMAKE_CTEST http://www.cmake.org/ -comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL" +comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, threads" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL + !BR2_TOOLCHAIN_HAS_THREADS From b6ac8cfbfa6f207f36254ad925127c6fe3a180e8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 25 Feb 2017 19:51:32 +0100 Subject: [PATCH 2769/3392] Revert "cmake: bump version to 3.7.1" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cmake 3.7 causes serious regressions in some cmake-based packages, related to how RPATH is handled. This reverts commit d96fafc3d346af8790df45557b16069d6ce81e79. Signed-off-by: "Yann E. MORIN" Cc: Vicente Olivert Riera Cc: Samuel Martin Cc: Thomas Petazzoni Cc: Jörg Krause Cc: Baruch Siach Signed-off-by: Peter Korsgaard --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 7a22f21ea0..687e5a4483 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,2 +1,2 @@ -# From http://www.cmake.org/files/v3.7/cmake-3.7.1-SHA-256.txt -sha256 449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 cmake-3.7.1.tar.gz +# From http://www.cmake.org/files/v3.7/cmake-3.7.0-SHA-256.txt +sha256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 cmake-3.7.0.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 107715ce49..e4904fcf09 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -5,7 +5,7 @@ ################################################################################ CMAKE_VERSION_MAJOR = 3.7 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt From 85b852a969c87ccae423ffe2bf250d836aa7832c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 25 Feb 2017 19:51:33 +0100 Subject: [PATCH 2770/3392] Revert "cmake: bump version to 3.7.0" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cmake 3.7 causes serious regressions in some cmake-based packages, related to how RPATH is handled. This reverts commit 1ffcf364b6e9894a876dc581a090f87685945412. Signed-off-by: "Yann E. MORIN" Cc: Vicente Olivert Riera Cc: Samuel Martin Cc: Thomas Petazzoni Cc: Jörg Krause Cc: Baruch Siach Signed-off-by: Peter Korsgaard --- package/cmake/Config.in | 9 ++------- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 6 +++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 716d80ec55..6f04a4ad39 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -20,14 +20,11 @@ config BR2_PACKAGE_CMAKE_CTEST select BR2_PACKAGE_EXPAT select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_XZ - select BR2_PACKAGE_LIBUV depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp depends on BR2_USE_WCHAR # libarchive depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS # libuv - depends on BR2_USE_MMU # libuv help CTest is a testing tool distributed as a part of CMake. It can be used to automate updating (using CVS for example), @@ -37,9 +34,7 @@ config BR2_PACKAGE_CMAKE_CTEST http://www.cmake.org/ -comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, threads" +comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS - depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 687e5a4483..f846dc9541 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,2 +1,2 @@ -# From http://www.cmake.org/files/v3.7/cmake-3.7.0-SHA-256.txt -sha256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 cmake-3.7.0.tar.gz +# From http://www.cmake.org/files/v3.6/cmake-3.6.3-SHA-256.txt +sha256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe cmake-3.6.3.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index e4904fcf09..bc555092c2 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.7 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 +CMAKE_VERSION_MAJOR = 3.6 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt @@ -22,7 +22,7 @@ CMAKE_LICENSE_FILES = Copyright.txt # the system-wide libraries instead of rebuilding and statically # linking with the ones bundled into the CMake sources. -CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv +CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz CMAKE_CONF_OPTS = \ -DKWSYS_LFS_WORKS=TRUE \ From fc4250119582043bf57a6296ae0264aa95f97fac Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 Feb 2017 18:42:48 +0100 Subject: [PATCH 2771/3392] pkg-cmake: pass _CONF_ENV for the target configure step The Buildroot manual documents that _CONF_ENV is passed in the environment when calling cmake during the configure step. However, the actual implementation in pkg-cmake passes HOST__CONF_ENV when configuring the host variant of a cmake package, but does not pass _CONF_ENV when configuring the target variant of a cmake package. This commit fixes that by passing _CONF_ENV in the environment as expected. It should not cause any behavior change, because this feature is in fact not used by any package in upstream Buildroot: $ grep CONF_ENV $(git grep -l cmake-package package/) package/pkg-cmake.mk:$(2)_CONF_ENV ?= package/pkg-cmake.mk: $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ package/pkg-cmake.mk: $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ This issue was reported by Olivier as bug #9616. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-cmake.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 4e0e8382de..a7c8dc3b34 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -109,7 +109,7 @@ define $(2)_CONFIGURE_CMDS cd $$($$(PKG)_BUILDDIR) && \ rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ - $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ From a4b7bdd469e3d37ae7bd755db35bd52c2b0cce40 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 Feb 2017 22:12:04 +0100 Subject: [PATCH 2772/3392] htop: work-around old uClibc issue when static linking htop wants to use backtrace() support from the C library. Unfortunately, with old uClibc versions such as the one we use for the ARC architecture, the backtrace() implementation is in libubacktrace. In addition, this implementation needs dladdr() support, which is in libdl, not available when static linking. Since this problem no longer exists in more recent versions of uClibc, we simply special case the ARC+static linking case, and make the configure script believe that is not available. Fixes: http://autobuild.buildroot.net/results/cdea351fad7a0f61ddec3e6a141da8da0523a902/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/htop/htop.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/htop/htop.mk b/package/htop/htop.mk index adc5090146..9451d159fa 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -18,4 +18,11 @@ else HTOP_CONF_OPTS += --disable-unicode endif +# ARC uses an old uClibc that needs dladdr() for backtrace support, +# which doesn't work for static only scenario, so as a workaround, we +# pretend that execinfo.h is not available. +ifeq ($(BR2_arc)$(BR2_STATIC_LIBS),yy) +HTOP_CONF_ENV += ac_cv_header_execinfo_h=no +endif + $(eval $(autotools-package)) From 7c77d965bdcd301c2644004140faec613c1ee202 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 23 Feb 2017 23:49:45 +0100 Subject: [PATCH 2773/3392] libuv: add dependency on BR2_TOOLCHAIN_HAS_SYNC_4 The libuv library uses __sync atomic built-ins: $ readelf -a -W output/target/usr/lib/libuv.so.1.0.0 | grep __sync 122: 00000000 0 NOTYPE GLOBAL DEFAULT UND __sync_val_compare_and_swap_4 but this is not currently taken into account in the libuv package, causing some build failures in packages using libuv as an optional dependency, such as janus-gateway and mosquitto. Therefore, this commit updates the libuv package with this additional dependency. The reverse dependencies of libuv are also updated: luv, luvi and moarvm. Fixes: - http://autobuild.buildroot.net/results/bdaa67d763c0d8d377a04529c74f73bee7d4ccef/ (janus-gateway) - http://autobuild.buildroot.net/results/2bc84ba2d1167018e2d48e5183ead22b6425dcf5/ (mosquitto) [Peter: drop cmake changes after cmake revert] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libuv/Config.in | 2 ++ package/luv/Config.in | 2 ++ package/luvi/Config.in | 2 ++ package/moarvm/Config.in | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/libuv/Config.in b/package/libuv/Config.in index 93fbd56557..cdd73a672f 100644 --- a/package/libuv/Config.in +++ b/package/libuv/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBUV depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_barrier_* depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 help libuv is a multi-platform support library with a focus on asynchronous I/O. @@ -12,3 +13,4 @@ config BR2_PACKAGE_LIBUV comment "libuv needs a toolchain w/ NPTL, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/luv/Config.in b/package/luv/Config.in index b085baf546..e9d01099f2 100644 --- a/package/luv/Config.in +++ b/package/luv/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LUV depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv help libuv bindings for LuaJIT and Lua. @@ -12,3 +13,4 @@ config BR2_PACKAGE_LUV comment "luv needs a toolchain w/ NPTL, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/luvi/Config.in b/package/luvi/Config.in index 18317f401e..a9dd2ef740 100644 --- a/package/luvi/Config.in +++ b/package/luvi/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LUVI depends on BR2_USE_MMU # libuv depends on !BR2_STATIC_LIBS # libuv depends on BR2_PACKAGE_LUAJIT + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LUV help @@ -25,6 +26,7 @@ config BR2_PACKAGE_LUVI comment "luvi needs a toolchain w/ NPTL, dynamic library" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 comment "luvi needs LuaJIT" depends on !BR2_PACKAGE_LUAJIT diff --git a/package/moarvm/Config.in b/package/moarvm/Config.in index c6e1efa39d..c318ab4b86 100644 --- a/package/moarvm/Config.in +++ b/package/moarvm/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MOARVM depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # libatomic_ops # needs AO_fetch_compare_and_swap, not implemented for sparcv8/sparcv9 depends on !BR2_sparc64 && !BR2_sparc + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv select BR2_PACKAGE_LIBUV select BR2_PACKAGE_LIBTOMMATH select BR2_PACKAGE_LIBATOMIC_OPS @@ -23,4 +24,4 @@ comment "moarvm needs a toolchain w/ NPTL, dynamic library" depends on BR2_USE_MMU depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS depends on !BR2_sparc64 && !BR2_sparc - + depends on BR2_TOOLCHAIN_HAS_SYNC_4 From 87a23e538a05c043635ed6dac155c3e6f109b3d6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 26 Feb 2017 23:17:04 +0100 Subject: [PATCH 2774/3392] Update for 2017.02-rc3 Signed-off-by: Peter Korsgaard --- CHANGES | 26 ++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 22 ++++++++++++++++++++++ 4 files changed, 59 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index f241f3641f..7c9add7dca 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,29 @@ +2017.02-rc3, Released February 26th, 2017 + + Fixes all over the tree. + + Cmake reverted to version 3.6.3 to workaround regressions + related to RPATH handling. + + Updated/fixed packages: bctoolbox, berkeleydb, binutils, + btrfs-progs, classpath, directfb, glibc, gstreamer1, + gst1-plugins-{base,good,bad,ugly}, gst1-libav, + gst1-rtsp-server, gst1-validate, gst-omx, htop, libcurl, + libepoxy, libimxvpuapi, libpcap, libuv, ncurses, openssh, + oracle-mysql, poco, python, qt5base, qt5webkit, sslh, synergy, + trousers, uclibc-ng-test, util-linux, vlc, xfsprogs + + Issues resolved (http://bugs.buildroot.org): + + #9251: Shared C++ libraries for Microblaze results in Segmentation... + #9456: mkusers script bash errors + #9506: Collectd 5.7.0 fails to build with libcrypt + #9581: VagrantFile provisioning step fails due to issue with grub-pc + #9586: usbmount: usbmount slows down the system... to a state of... + #9616: CMake host packages cannot provide CONF_ENV + #9641: Need raptor package installed in staging + #9671: stunnel build error + 2017.02-rc2, Released February 20th, 2017 Fixes all over the tree. diff --git a/Makefile b/Makefile index b5b431a705..68b2d47ca0 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02-rc2 +export BR2_VERSION := 2017.02-rc3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1487631000 +BR2_VERSION_EPOCH = 1488147000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 85eb5f0cdd..83d618c10d 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

            buildroot-2016.11.2.tar.bz2

            -

            Latest release candidate: 2017.02-rc2

            +

            Latest release candidate: 2017.02-rc3

            - +
            - +
            -

            buildroot-2017.02-rc2.tar.gz

            -

            PGP signature

            +

            buildroot-2017.02-rc3.tar.gz

            +

            PGP signature

            - +
            - +
            -

            buildroot-2017.02-rc2.tar.bz2

            -

            PGP signature

            +

            buildroot-2017.02-rc3.tar.bz2

            +

            PGP signature

            diff --git a/docs/website/news.html b/docs/website/news.html index 38ed846f92..25d6bce3ad 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

            News

              +
            • +
              +
              +
              +

              2017.02-rc3 released

              +

              26 February 2017

              +
              +
              +

              Release candidate 3 is out with more cleanups and security + / build fixes. See + the CHANGES + file for details.

              +

              Head to the downloads page to + pick up + the 2017.02-rc3 + release candidate, and report any problems found to + the mailing list + or bug tracker.

              +
              +
              +
              • +
            • From 2c2920c457bfe75756942a1185c575b17c5459b0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 Feb 2017 23:41:22 +0100 Subject: [PATCH 2775/3392] python-libconfig: disable on musl The python-libconfig package fails to build with musl with very weird errors coming all the way from Boost Python, which nobody ever bothered to fix. It's time to disable this package on musl to avoid the repetitive build failures. Fixes: http://autobuild.buildroot.net/results/f0f6cdc8c38c024772615d5e677b0f4ad63ef7ec Signed-off-by: Thomas Petazzoni --- package/python-libconfig/Config.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/python-libconfig/Config.in b/package/python-libconfig/Config.in index 7cc5f8a3cd..a222f9a130 100644 --- a/package/python-libconfig/Config.in +++ b/package/python-libconfig/Config.in @@ -1,5 +1,6 @@ -comment "python-libconfig needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "python-libconfig needs a glibc or uClibc toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_TOOLCHAIN_USES_MUSL config BR2_PACKAGE_PYTHON_LIBCONFIG bool "python-libconfig" @@ -8,6 +9,8 @@ config BR2_PACKAGE_PYTHON_LIBCONFIG select BR2_PACKAGE_LIBCONFIG depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + # error: invalid use of incomplete type 'struct _IO_FILE' + depends on !BR2_TOOLCHAIN_USES_MUSL help Python bindings to the C++ library libconfig From 076095a860ba24a4bc8302e5bfa5c753c00d228a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 Feb 2017 23:43:28 +0100 Subject: [PATCH 2776/3392] mplayer: not supported on or1k MPlayer doesn't support OpenRISC: The architecture of your CPU (or1k) is not supported by this configure script It seems nobody has ported MPlayer to your OS or CPU type yet. so disable it on this architecture. Fixes: http://autobuild.buildroot.net/results/47207dfd10ff6e5ec4ccdcf8454aaf5f408ad1e3/ Signed-off-by: Thomas Petazzoni --- package/mplayer/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in index 8474b0ec48..a10ad26b29 100644 --- a/package/mplayer/Config.in +++ b/package/mplayer/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS default y # Those architectures are not supported by MPlayer depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \ - || BR2_m68k || BR2_microblaze || BR2_nios2) + || BR2_m68k || BR2_microblaze || BR2_nios2 || BR2_or1k) # Broken support for Date: Mon, 27 Feb 2017 07:07:25 +0100 Subject: [PATCH 2777/3392] vlc: workaround microblaze gcc internal compiler error Override gcc optimization flags with -O0. The workaround is not required for gcc6 anymore, so we take this into account into our condition. Fixes: http://autobuild.buildroot.net/results/a318f0838a6a602046e719103ac81965c0084d52 Signed-off-by: Waldemar Brodkorb [Thomas: add gcc 6.x condition.] Signed-off-by: Thomas Petazzoni --- package/vlc/vlc.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 666b8d4bf5..583edf3659 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -15,6 +15,13 @@ VLC_AUTORECONF = YES # Install vlc libraries in staging. VLC_INSTALL_STAGING = YES +# gcc bug internal compiler error: in merge_overlapping_regs, at +# regrename.c:304. This bug is fixed since gcc 6. +ifeq ($(BR2_microblaze):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:) +VLC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0" +VLC_CONF_OPTS += --disable-optimizations +endif + # VLC defines two autoconf functions which are also defined by our own pkg.m4 # from pkgconf. Unfortunately, they are defined in a different way: VLC adds # --enable- options, but pkg.m4 adds --with- options. To make sure we use From 0fae8618a3c9f180da432ce904d1a37d15ea50bd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 Feb 2017 23:22:28 +0100 Subject: [PATCH 2778/3392] assimp: remove dead "depends on" dependency BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX has been removed in commit 311bc137da2952445683413794f3ebc8e477c9ef ("toolchain: kill ADI Blackfin toolchain"), so this "depends on" is useless. Signed-off-by: Thomas Petazzoni --- package/assimp/Config.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/assimp/Config.in b/package/assimp/Config.in index 8fa6429da0..93020f7238 100644 --- a/package/assimp/Config.in +++ b/package/assimp/Config.in @@ -4,11 +4,6 @@ config BR2_PACKAGE_ASSIMP # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that # cause an infinite loop in gcc when building this package. depends on !BR2_microblaze - # The ADI Blackfin toolchain does not build assimp properly, - # fails with "internal compiler error: in simplify_subreg, at - # simplify-rtx.c:5001". It builds fine with a mainline gcc for - # Blackfin. - depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_ZLIB help From 68cebedeb977396f64f5f591f5e93f34fab8e0a8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 Feb 2017 23:38:26 +0100 Subject: [PATCH 2779/3392] assimp: work around gcc bug on SuperH gcc versions earlier than gcc 6.x fail to build assimp on SuperH when static linking: AssxmlExporter.cpp:623:1: error: unable to find a register to spill in class 'GENERAL_REGS' It's the combination of -Os and *not* having -fPIC that makes gcc fail, which explains why configurations with dynamic linking work fine. -Os -fPIC -> works -Os -> fails -O2 -fPIC -> works -O2 -> works Therefore, as a workaround, we are forcing the use of -O2 on SuperH when the gcc version is older than gcc 6.x and we're statically linking. Fixes: http://autobuild.buildroot.net/results/ec88aa8118179e30e24603cc45292047dca19216/ Signed-off-by: Thomas Petazzoni --- package/assimp/assimp.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 08893fff00..298e121cb8 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -16,6 +16,14 @@ ifeq ($(BR2_m68k),y) ASSIMP_CXXFLAGS += -mxgot endif +# workaround SuperH compiler failure when static linking (i.e -fPIC is +# not passed) in gcc versions 5.x or older. The -Os optimization level +# causes a "unable to find a register to spill in class +# ‘GENERAL_REGS’" error. -O2 works fine. +ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_HOST_GCC_AT_LEAST_6),y:y:) +ASSIMP_CXXFLAGS += -O2 +endif + ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)" From 35e02aeb7b493d61bbc3e90903337b4964e0213c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 27 Feb 2017 22:53:24 +0100 Subject: [PATCH 2780/3392] assimp: fix gcc version condition In commit 68cebedeb977396f64f5f591f5e93f34fab8e0a8 ("assimp: work around gcc bug on SuperH"), a work around was added to make the package build with gcc on SuperH. The condition included a test on the gcc version, which was mistakenly done on the host gcc version, while a test on the target gcc version was intended. Thanks to Peter Korsgaard for spotting the issue. Signed-off-by: Thomas Petazzoni --- package/assimp/assimp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 298e121cb8..acd3701a38 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -20,7 +20,7 @@ endif # not passed) in gcc versions 5.x or older. The -Os optimization level # causes a "unable to find a register to spill in class # ‘GENERAL_REGS’" error. -O2 works fine. -ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_HOST_GCC_AT_LEAST_6),y:y:) +ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:) ASSIMP_CXXFLAGS += -O2 endif From 4422eca2d418e2b817b419ff6c4c62f7f4cb7871 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 26 Feb 2017 23:42:47 +0100 Subject: [PATCH 2781/3392] dependencies/cmake: blacklist cmake 3.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cmake-3.7 has a bug in how it handles rpath, linking with libraries from the host. Until we completely understand the issue, just blacklist cmake-3.7. The issue has been reported upstream: http://public.kitware.com/pipermail/cmake/2017-February/064970.html Reported-by: Baruch Siach Signed-off-by: "Yann E. MORIN" Cc: Jörg Krause Cc: Ben Boeckel Cc: Samuel Martin Signed-off-by: Peter Korsgaard --- support/dependencies/check-host-cmake.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/support/dependencies/check-host-cmake.sh b/support/dependencies/check-host-cmake.sh index 9b63b0648d..84c26c25cd 100755 --- a/support/dependencies/check-host-cmake.sh +++ b/support/dependencies/check-host-cmake.sh @@ -6,6 +6,9 @@ version_min="${2}" major_min="${version_min%.*}" minor_min="${version_min#*.}" +# cmake-3.7 incorrectly handles rpath, linking to host libraries +blacklist_version="3.7" + cmake=`which ${candidate}` if [ ! -x "${cmake}" ]; then # echo nothing: no suitable cmake found @@ -27,6 +30,11 @@ version="$(${cmake} --version \ major="${version%.*}" minor="${version#*.}" +if [ "${version}" = "${blacklist_version}" ]; then + # echo nothing: no suitable cmake found + exit 1 +fi + if [ ${major} -gt ${major_min} ]; then echo "${cmake}" else From 84617352f3c0508b3f14b526318048b5629e23b6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 Feb 2017 23:22:16 +0100 Subject: [PATCH 2782/3392] openocd: avoid documentation rebuild to fix build issues On PowerPC64(le), we patch all configure scripts. Due to this, the version.texi in OpenOCD files gets regenerated, and then since it has a newer date than openocd.info, openocd build system rebuilds the documentation. Unfortunately, this documentation rebuild fails on old machines. We work around this by faking the date of the generated version.texi file, to make the build system believe the documentation doesn't need to be regenerated. Fixes: http://autobuild.buildroot.net/results/3cbe65a46e75b8e67846d593884c96df97dec7a4 Signed-off-by: Thomas Petazzoni Reviewed-by: Sam Bobroff Signed-off-by: Peter Korsgaard --- package/openocd/openocd.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 21a302ff25..0d1836573d 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -99,5 +99,20 @@ HOST_OPENOCD_CONF_OPTS = \ HOST_OPENOCD_DEPENDENCIES = host-libftdi host-libusb host-libusb-compat +# Avoid documentation rebuild. On PowerPC64(le), we patch the +# configure script. Due to this, the version.texi files gets +# regenerated, and then since it has a newer date than openocd.info, +# openocd build system rebuilds the documentation. Unfortunately, this +# documentation rebuild fails on old machines. We work around this by +# faking the date of the generated version.texi file, to make the +# build system believe the documentation doesn't need to be +# regenerated. +define OPENOCD_FIX_VERSION_TEXI + touch -r $(@D)/doc/openocd.info $(@D)/doc/version.texi +endef +OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI +HOST_OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI + + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 39b5a72ee504f146c8d395048f6784ffdc23924b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 27 Feb 2017 23:16:11 +0100 Subject: [PATCH 2783/3392] classpath: only allow on supported architectures In commit a75ab1fc1dcc7eee8668b1c3c19b703f1390b2cd ("package/classpath: Don't depend on jamvm"), we removed the dependency of classpath on jamvm. Since jamvm is only available for a reduced set of architectures, classpath could until this commit until be built on those architectures. However, now that this dependency has been removed, classpath can potentially be built for all architectures supported by Buildroot, even though it doesn't support all of them. Since adding support for additional architectures in classpath doesn't make much sense, because classpath is in Buildroot only usable with JamVM anyway, and JamVM is only available for a small set of architectures, this commit simply makes classpath available on the architectures that it supports. By doing so, it also removes the or1k support patch which was added by commit f12a146f817c8ef07a7d41a31a5336b5ef6a96e8, since anyway or1k is not supported by JamVM. Fixes: http://autobuild.buildroot.net/results/55eb89f89e96b94a821778bc18ed844af08b7460/ (classpath on microblaze) http://autobuild.buildroot.net/results/279dd731bd9ecf5f9d54bda3715caeaa7cbcdbb3/ (classpath on nios2) Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/classpath/0003-add-or1k-endian.patch | 18 ------------------ package/classpath/Config.in | 8 ++++++++ package/jamvm/Config.in | 2 ++ 3 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 package/classpath/0003-add-or1k-endian.patch diff --git a/package/classpath/0003-add-or1k-endian.patch b/package/classpath/0003-add-or1k-endian.patch deleted file mode 100644 index 8bc87841db..0000000000 --- a/package/classpath/0003-add-or1k-endian.patch +++ /dev/null @@ -1,18 +0,0 @@ -Set endianess for or1k - -Signed-off-by: Waldemar Brodkorb - -diff -Nur classpath-0.98.orig/native/fdlibm/ieeefp.h classpath-0.98/native/fdlibm/ieeefp.h ---- classpath-0.98.orig/native/fdlibm/ieeefp.h 2008-01-13 18:33:50.000000000 +0100 -+++ classpath-0.98/native/fdlibm/ieeefp.h 2017-02-26 12:39:12.316327363 +0100 -@@ -123,6 +123,10 @@ - #define __IEEE_BIG_ENDIAN - #endif - -+#ifdef __or1k__ -+#define __IEEE_BIG_ENDIAN -+#endif -+ - #ifdef __v800 - #define __IEEE_LITTLE_ENDIAN - #endif diff --git a/package/classpath/Config.in b/package/classpath/Config.in index caab619868..c49ff7a620 100644 --- a/package/classpath/Config.in +++ b/package/classpath/Config.in @@ -1,7 +1,15 @@ +config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS + bool + default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k \ + || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \ + || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le \ + || BR2_sh || BR2_x86_64 + config BR2_PACKAGE_CLASSPATH bool "classpath" select BR2_NEEDS_HOST_JAR select BR2_NEEDS_HOST_JAVAC + depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS help GNU Classpath, Essential Libraries for Java, is a GNU project to create free core class libraries for use with diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in index 2cc97a1398..57e1a8e6f4 100644 --- a/package/jamvm/Config.in +++ b/package/jamvm/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_JAMVM depends on !BR2_STATIC_LIBS depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \ || BR2_mips || BR2_mipsel || BR2_powerpc + depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS select BR2_PACKAGE_ZLIB select BR2_PACKAGE_CLASSPATH help @@ -15,4 +16,5 @@ config BR2_PACKAGE_JAMVM comment "jamvm needs a toolchain w/ threads, dynamic library" depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \ || BR2_mips || BR2_mipsel || BR2_powerpc + depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS From 6395652c0a7101bfe5c1ca65d2c8a740fd45ba64 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 28 Feb 2017 12:21:29 +0100 Subject: [PATCH 2784/3392] genimage: Fix typo in description Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/genimage/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/genimage/Config.in.host b/package/genimage/Config.in.host index acf777c8bf..5c5a8a8a2c 100644 --- a/package/genimage/Config.in.host +++ b/package/genimage/Config.in.host @@ -5,7 +5,7 @@ config BR2_PACKAGE_HOST_GENIMAGE images from a given root filesystem tree. genimage is intended to be run in a fakeroot environment. - Configuration is done is a config file parsed by + Configuration is done in a config file parsed by libconfuse. Options like the path to tools can be given in environment variables, the config file or commandline switches. From 1c186c6ca1689111fb2a4a164f57b3b96ebd21c8 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Tue, 28 Feb 2017 12:02:52 +0100 Subject: [PATCH 2785/3392] qt5quickcontrols: fix installation of PrivateWidgets Commit e482ebf51d9e8e00c3e58eb65af0dfb70d05d8cc attempted to fix the installation of qt5quickcontrols by only installing the PrivateWidgets directory for the 5.8.0 version. However, the availability of PrivateWidgets has nothing to do with the version; in both 5.6.2 and 5.8.0, the installation is gated by the following statement in src/src.pro: qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += widgets i.e. it is installed when both the Quick and the Widgets module are available. The Widgets module is controlled by Buildroot's BR2_PACKAGE_QT5BASE_WIDGETS symbol, the Quick module is controlled by Buildroot's BR2_PACKAGE_QT5DECLARATIVE_QUICK. The qt5quickcontrols package selects BR2_PACKAGE_QT5DECLARATIVE_QUICK so it is not really needed to include it in the condition. However, it is theoretically possible to build this package without QtQuick. Also, adding this condition makes it consistent with src.pro. Note that commit e482ebf51d9e8e00c3e58eb65af0dfb70d05d8cc introduces a second fix (not mentioned in the commit message): for version 5.6.2, the Layouts directory is installed, but in 5.8.0 this directory doesn't exist any more. Therefore, a separate condition on the version is still needed. Fixes: http://autobuild.buildroot.net/results/1ff3e9ad4ba518d0a37f9fc12038bf9020f28094 Cc: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- .../qt5/qt5quickcontrols/qt5quickcontrols.mk | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 8a63629c35..43254ba06b 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -30,20 +30,25 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install endef -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick + +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy) +define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick endef -else +endif + +ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) +define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick +endef +endif + define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick + $(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS) + $(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS) endef -endif $(eval $(generic-package)) From f920873b412900df8060573c11f800ccfc324edf Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Tue, 28 Feb 2017 18:20:16 +0300 Subject: [PATCH 2786/3392] xterm: disable with ARC external toolchain This package fails when building with ARC external toolchain Marking this with special comment "# ARC toolchain issue" as the package is to be enabled as soon as the issue with the ARC toolchain is resolved. Fixes: http://autobuild.buildroot.net/results/28a/28a92049a6ceef005787c5779f77ecf3fe8ad642// Signed-off-by: Vlad Zakharov Signed-off-by: Peter Korsgaard --- package/xterm/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/xterm/Config.in b/package/xterm/Config.in index e17d2c6d90..f11aafad7a 100644 --- a/package/xterm/Config.in +++ b/package/xterm/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_XTERM select BR2_PACKAGE_XLIB_LIBXAW depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork() + # ARC toolchain issue + depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC help xterm terminal emulator From 1a8b1eac87ede3cee48669efe95cb27df8f673a1 Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Tue, 28 Feb 2017 18:21:34 +0300 Subject: [PATCH 2787/3392] mpv: disable with ARC external toolchain This package fails when building with ARC external toolchain Marking this with special comment "# ARC toolchain issue" as the package is to be enabled as soon as the issue with the ARC toolchain is resolved. Fixes: http://autobuild.buildroot.net/results/fb6/fb677a917545adee321bdcd2c2519c81326448c4// Signed-off-by: Vlad Zakharov Signed-off-by: Peter Korsgaard --- package/mpv/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 2719981467..6e115aedb1 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_MPV depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 + # ARC toolchain issue + depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE @@ -21,3 +23,4 @@ comment "mpv needs a toolchain w/ threads, gcc >= 4.5" depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC From 962d1530841336d64d0843de9826a199cb07405a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 28 Feb 2017 21:55:54 +0100 Subject: [PATCH 2788/3392] qt5base: fix VNC platform plugin build on big-endian machines Fixes [1], [2]: In file included from qvncintegration.cpp:38:0: qvncscreen.h:76:22: error: expected ';' at end of member declaration bool swapBytes() const [1] http://autobuild.buildroot.net/results/718/7180ad7d7e78f1c3ce6a1f83a5a8fcc5e0ac03a2 [2] http://autobuild.buildroot.net/results/14f/14f8c436b184192681fb79c7f0c0d0daa35f867b Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- ...-plugin-build-on-big-endian-machines.patch | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch diff --git a/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch b/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch new file mode 100644 index 0000000000..e7d7ee3600 --- /dev/null +++ b/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch @@ -0,0 +1,97 @@ +From 35ee8b53549fab6ebffe289417e1d94298447af7 Mon Sep 17 00:00:00 2001 +From: Shawn Rutledge +Date: Fri, 10 Feb 2017 13:56:58 +0100 +Subject: [PATCH] fix VNC platform plugin build on big-endian machines + +Task-number: QTBUG-58734 +Change-Id: I3e44ee4be5003acaba2f1b8ed2658a3ff1bd700e +Reviewed-by: Lars Knoll +Reviewed-by: Dmitry Shachnev + +Upstream: http://code.qt.io/cgit/qt/qtbase.git/patch/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44 +Signed-off-by: Peter Seiderer +--- + src/plugins/platforms/vnc/qvncclient.cpp | 6 +++--- + src/plugins/platforms/vnc/qvncscreen.cpp | 7 ++++++- + src/plugins/platforms/vnc/qvncscreen.h | 2 +- + 3 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp +index dae3e83f..58dcfc9b 100644 +--- a/src/plugins/platforms/vnc/qvncclient.cpp ++++ b/src/plugins/platforms/vnc/qvncclient.cpp +@@ -142,7 +142,7 @@ void QVncClient::convertPixels(char *dst, const char *src, int count) const + case 16: { + quint16 p = *reinterpret_cast(src); + #if Q_BYTE_ORDER == Q_BIG_ENDIAN +- if (swapBytes) ++ if (m_swapBytes) + p = ((p & 0xff) << 8) | ((p & 0xff00) >> 8); + #endif + r = (p >> 11) & 0x1f; +@@ -484,7 +484,7 @@ void QVncClient::setPixelFormat() + m_sameEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) == !!m_pixelFormat.bigEndian; + m_needConversion = pixelConversionNeeded(); + #if Q_BYTE_ORDER == Q_BIG_ENDIAN +- m_swapBytes = qvnc_screen->swapBytes(); ++ m_swapBytes = server()->screen()->swapBytes(); + #endif + } + } +@@ -639,7 +639,7 @@ bool QVncClient::pixelConversionNeeded() const + return true; + + #if Q_BYTE_ORDER == Q_BIG_ENDIAN +- if (qvnc_screen->swapBytes()) ++ if (server()->screen()->swapBytes()) + return true; + #endif + +diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp +index 34def457..64f1bc0b 100644 +--- a/src/plugins/platforms/vnc/qvncscreen.cpp ++++ b/src/plugins/platforms/vnc/qvncscreen.cpp +@@ -43,6 +43,7 @@ + #include + + #include ++#include + #include + + +@@ -172,14 +173,18 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con + } + + #if Q_BYTE_ORDER == Q_BIG_ENDIAN +-bool QVNCScreen::swapBytes() const ++bool QVncScreen::swapBytes() const + { ++ return false; ++ ++ /* TODO + if (depth() != 16) + return false; + + if (screen()) + return screen()->frameBufferLittleEndian(); + return frameBufferLittleEndian(); ++ */ + } + #endif + +diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h +index 785abd6d..0b42c3c7 100644 +--- a/src/plugins/platforms/vnc/qvncscreen.h ++++ b/src/plugins/platforms/vnc/qvncscreen.h +@@ -73,7 +73,7 @@ public: + void clearDirty() { dirtyRegion = QRegion(); } + + #if Q_BYTE_ORDER == Q_BIG_ENDIAN +- bool swapBytes() const ++ bool swapBytes() const; + #endif + + QStringList mArgs; +-- +2.11.0 + From 083c0735e924e0d534328095a944ae159f661219 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 28 Feb 2017 21:57:09 +0100 Subject: [PATCH 2789/3392] Update for 2017.02 Signed-off-by: Peter Korsgaard --- CHANGES | 12 ++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 18 ++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index 7c9add7dca..5fedca19eb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,15 @@ +2017.02, Released February 28th, 2017 + + Minor fixes, mainly fixing autobuilder issues. + + Don't use cmake 3.7.x from the build host as it is also + affected by the RPATH handling issues, and instead build our + own if needed. + + Updated/fixed packages: assimp, classpath, genimage, mplayer, + mpv, openocd, python-libconfig, qt5base, qt5quickcontrols, + vlc, xterm + 2017.02-rc3, Released February 26th, 2017 Fixes all over the tree. diff --git a/Makefile b/Makefile index 68b2d47ca0..0308f9b538 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02-rc3 +export BR2_VERSION := 2017.02 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1488147000 +BR2_VERSION_EPOCH = 1488315000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 83d618c10d..929557f5e2 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,40 +8,40 @@
              Download
              -

              Latest stable release: 2016.11.2

              +

              Latest stable release: 2017.02

              - +
              - +
              -

              buildroot-2016.11.2.tar.gz

              -

              PGP signature

              +

              buildroot-2017.02.tar.gz

              +

              PGP signature

              - +
              - +
              -

              buildroot-2016.11.2.tar.bz2

              -

              PGP signature

              +

              buildroot-2017.02.tar.bz2

              +

              PGP signature

              - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
              diff --git a/docs/website/news.html b/docs/website/news.html index 25d6bce3ad..6b32a80b1a 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,24 @@

              News

                +
              • +
                +
                +
                +

                2017.02 released

                +

                28 February 2017

                +
                +
                +

                The stable 2017.02 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2017.02 release.

                +
                +
                +
                • +
              • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 89973ceeb0..33ca6b802a 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2016.11.2' +RELEASE='2017.02' ### Change here for more memory/cores ### VM_MEMORY=2048 From 23656f1c96c5197ea91e307f350e768a28f935b9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Dec 2016 15:32:46 +0100 Subject: [PATCH 2790/3392] package/x11r7/xdriver_xf86-video-vmware: fix compilation without udev https://cgit.freedesktop.org/xorg/driver/xf86-video-vmware/commit/configure.ac?id=755e38f373a511bd774a61c9420a67f630f71037 added a check for libudev which fails if the check is not disabled. Fixes http://autobuild.buildroot.net/results/7b3/7b38105dd1115ac622964cf243ac137b7624fb43/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 19ad2ade72b2b6e5fa4797a2752e28d9a9684c10) Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk index ef262f8942..1b2066d277 100644 --- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk +++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk @@ -11,4 +11,11 @@ XDRIVER_XF86_VIDEO_VMWARE_LICENSE = MIT XDRIVER_XF86_VIDEO_VMWARE_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = mesa3d xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +XDRIVER_XF86_VIDEO_VMWARE_CONF_OPTS += --with-libudev +XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES += udev +else +XDRIVER_XF86_VIDEO_VMWARE_CONF_OPTS += --without-libudev +endif + $(eval $(autotools-package)) From 2875495e2017df287241d179f37d049a430258bf Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 15 Feb 2017 08:42:12 +0100 Subject: [PATCH 2791/3392] perl-gd: fix build of native part EUMM don't find .xs file in subdirectory (only .pm files are handled) So, let move lib/GD.xs in the root directory. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit 9475997b247a21b654ebad2f41c1d9a16a3bd751) Signed-off-by: Peter Korsgaard --- package/perl-gd/perl-gd.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index ea8fd5cddb..2ad966c15c 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -12,6 +12,11 @@ PERL_GD_LICENSE = Artistic or GPLv1+ PERL_GD_LICENSE_FILES = LICENSE PERL_GD_PREFER_INSTALLER = EUMM +define PERL_GD_MOVE_XS + mv $(@D)/lib/GD.xs $(@D)/GD.xs +endef +PERL_GD_POST_PATCH_HOOKS += PERL_GD_MOVE_XS + PERL_GD_CONF_OPTS = \ -options=FT,PNG \ -lib_gd_path=$(STAGING_DIR)/usr \ From b73c73d802366adc90128d6034fb16428ad08029 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 1 Mar 2017 21:05:42 +0100 Subject: [PATCH 2792/3392] fs/iso9660: doesn't support (grub2) EFI The iso9660 generation for grub2 assumes that grub-eltorito.img is available. However, this image is only available for the i386-pc target (i.e. legacy BIOS). An EFI-bootable iso9660 requires a different layout. Since we currently can't generate the EFI-bootable iso9660 layout, require the i386-pc target to be selected in grub. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reported-by: arnaud.miche@orange.com Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit 3e57fa370cb8e4d5f80c6abb34671f0c0467e506) Signed-off-by: Peter Korsgaard --- fs/iso9660/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in index 2482e44e31..d162586f38 100644 --- a/fs/iso9660/Config.in +++ b/fs/iso9660/Config.in @@ -3,7 +3,7 @@ config BR2_TARGET_ROOTFS_ISO9660 depends on (BR2_i386 || BR2_x86_64) depends on BR2_LINUX_KERNEL depends on BR2_TARGET_GRUB || \ - BR2_TARGET_GRUB2 || \ + BR2_TARGET_GRUB2_I386_PC || \ BR2_TARGET_SYSLINUX_ISOLINUX select BR2_LINUX_KERNEL_INSTALL_TARGET \ if (!BR2_TARGET_ROOTFS_ISO9660_INITRD && !BR2_TARGET_ROOTFS_INITRAMFS) @@ -33,7 +33,7 @@ config BR2_TARGET_ROOTFS_ISO9660_GRUB config BR2_TARGET_ROOTFS_ISO9660_GRUB2 bool "grub2" - depends on BR2_TARGET_GRUB2 + depends on BR2_TARGET_GRUB2_I386_PC help Use Grub 2 as the bootloader for the ISO9660 image. Make sure to enable the 'iso9660' module in @@ -82,7 +82,7 @@ config BR2_TARGET_ROOTFS_ISO9660_HYBRID endif -comment "iso image needs a Linux kernel and one of grub, grub2 or isolinux to be built" +comment "iso image needs a Linux kernel and one of grub, grub2 i386-pc or isolinux to be built" depends on BR2_i386 || BR2_x86_64 depends on !BR2_LINUX_KERNEL || \ - !(BR2_TARGET_GRUB || BR2_TARGET_GRUB2 || BR2_TARGET_SYSLINUX_ISOLINUX) + !(BR2_TARGET_GRUB || BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_SYSLINUX_ISOLINUX) From 4c60c444a174b0b71673493ed416c7801471e145 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 28 Feb 2017 23:54:37 +0100 Subject: [PATCH 2793/3392] ncftp: fix host/target confusion The ncftp build process tries to build and run a small program called ccdv to beautify the build process output. If it manages to build and run it, then it uses it. Unfortunately, this doesn't work well when the target architecture is close to the host architecture, but not exactly the same. Because both architectures are close to each other, the test run of ccdv succeeds, but real use of ccdv during ncftp build process causes an Illegal instruction issue. This for example happens with the CodeSourcery AMD64 toolchain, on a build machine running an i7-4600U, and has been detected in the autobuilders since the CodeSourcery AMD64 toolchain was upgraded at the end of January: http://autobuild.buildroot.net/?reason=ncftp-3.2.6 The issue was also reported by Christopher Arguin back in July 2016: http://lists.busybox.net/pipermail/buildroot/2016-July/168026.html and at the time, we identified that simply disabling the ccdv tool, by passing --disable-ccdv, was enough to solve the issue. But Christopher never submitted the patch, so the problem remained unfixed. Therefore, we pass --disable-ccdv to the configure script, which fixes: http://autobuild.buildroot.net/results/6eadad0e879ca70bb07b13b4196d42c64b11699f/ Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit 9647c3c5e9976c8ee666fdd91039289d09e07a4b) Signed-off-by: Peter Korsgaard --- package/ncftp/ncftp.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 5c88556a39..11bfccaa25 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -12,6 +12,7 @@ NCFTP_LICENSE = Clarified Artistic License NCFTP_LICENSE_FILES = doc/LICENSE.txt NCFTP_DEPENDENCIES = host-autoconf +NCFTP_CONF_OPTS = --disable-ccdv # The bundled configure script is generated by autoconf 2.13 and doesn't # detect cross-compilation correctly. Therefore, we have to regenerate it. From 111b9fc8ea3b95cda48c5d1fdc7ed959d3b7cab1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 1 Mar 2017 21:43:46 +0100 Subject: [PATCH 2794/3392] libsidplay2: fix build on ppc64le by not autoreconfiguring The libsidplay2 package build system is completely broken. It is made of a top-level configure script, which calls into sub-configure scripts in sub-directories. However, since it doesn't use the autoconf provided AC_CONFIG_SUBDIRS() mechanism, an "autoreconf" doesn't recurse into the subdirectories. Due to this, the aclocal.m4 in the libsidplay/ subdirectory doesn't get re-generated when Buildroot autoreconfs the package. However, since we patch one of the .m4 files in this subdirectory, when build time comes, the package notices its aclocal.m4 is older than one of the .m4 file, and triggers an automatic autoreconf. Since _AUTORECONF = YES is enabled, this automatic autoreconf works fine: host-autoconf and host-automake are available. Expect that on powerpc64le, we patch the configure script itself to make it recognize powerpc64le. But this patching of the configure script itself gets overwritten by the automatic autoreconf at the beginning of the build step, causing the build to fail on powerpc64le. Switching to AC_CONFIG_SUBDIRS() would allow to fix this, but libsidplay2 needs to pass custom configure options to each of the sub-configure scripts, something that AC_CONFIG_SUBDIRS() doesn't support. And since libsidplay2 upstream looks completely dead, the incentive to fix the whole thing is very limited. Since what's broken is the autoreconfiguration of the package, what we do is modify patch 0001-sidplay2-libs-2.1.1.patch to directly tweak the configure script (instead of the relevant .m4 file). Thanks to this, _AUTORECONF = YES is no longer needed, the .m4 file is no longer newer than the sub-configure script, and no automatic autoreconf triggers at build time. This allows the package to build properly on powerpc64le. While we normally don't like patching 'configure' scripts directly, in this case the size of the change in the configure script is very small, and as explained above, the incentive to fix the package properly is very limited. In detail, the changes: * Patch 0001-sidplay2-libs-2.1.1.patch is turned into a Git-formatted patch * The irrelevant changes to Makefile.in files, aclocal.m4, config.h.in, sidint.h are removed. * The change to my_macros.m4 is applied directly to the corresponding configure script. * The change to the configure.ac script regarding libdir is applied directly to the corresponding configure script. * The change to the configure.ac script regarding "*-k*bsd*-gnu" is dropped, since we don't care about kFreeBSD support. * LIBSIDPLAY2_AUTORECONF = YES is dropped from the .mk file. Fixes: http://autobuild.buildroot.net/results/1f6a42bfece24e09c9c7f4078d549ec5c099c89d/ Signed-off-by: Thomas Petazzoni Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit df1b6d8cb2063c7a6f961cc2319879e50b3530a3) Signed-off-by: Peter Korsgaard --- .../0001-sidplay2-libs-2.1.1.patch | 254 ++++++------------ package/libsidplay2/libsidplay2.mk | 1 - 2 files changed, 75 insertions(+), 180 deletions(-) diff --git a/package/libsidplay2/0001-sidplay2-libs-2.1.1.patch b/package/libsidplay2/0001-sidplay2-libs-2.1.1.patch index 3f7664407a..7c6813bb66 100644 --- a/package/libsidplay2/0001-sidplay2-libs-2.1.1.patch +++ b/package/libsidplay2/0001-sidplay2-libs-2.1.1.patch @@ -1,93 +1,30 @@ -Various fixes to compile libsidplay2 with newer gcc compilers +From 38493fceb39ac33e12c9c69d78f5584413b479f4 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Wed, 1 Mar 2017 10:03:40 +0100 +Subject: [PATCH] Various fixes to compile libsidplay2 with newer gcc compilers Downloaded from http://tsubasa.googlecode.com/svn/trunk/tsubasa/sidplay2-libs/sidplay2-libs-2.1.1.diff Signed-off-by: Bernd Kuhls +[Thomas: adjusted to avoid the need to autoreconf, which doesn't work +properly on this package.] +Signed-off-by: Thomas Petazzoni +--- + builders/hardsid-builder/src/hardsid-builder.cpp | 1 + + builders/resid-builder/src/resid-builder.cpp | 1 + + builders/resid-builder/src/resid.cpp | 1 + + configure | 2 +- + libsidplay/configure | 5 +++-- + libsidplay/include/sidplay/SmartPtr.h | 28 ++++++++++++------------ + libsidplay/include/sidplay/sidendian.h | 18 +++++++++------ + libsidutils/include/sidplay/utils/SidUsage.h | 2 +- + 8 files changed, 33 insertions(+), 25 deletions(-) ---- sidplay-libs-2.1.1.orig/Makefile.in -+++ sidplay-libs-2.1.1/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.8.4 from Makefile.am. -+# Makefile.in generated by automake 1.8.5 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -253,7 +253,7 @@ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -264,7 +264,7 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -z "$$unique" && unique=$$empty_fix; \ -+ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi ---- sidplay-libs-2.1.1.orig/aclocal.m4 -+++ sidplay-libs-2.1.1/aclocal.m4 -@@ -1,4 +1,4 @@ --# generated automatically by aclocal 1.8.4 -*- Autoconf -*- -+# generated automatically by aclocal 1.8.5 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 - # Free Software Foundation, Inc. -@@ -40,7 +40,7 @@ - # Call AM_AUTOMAKE_VERSION so it can be traced. - # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.8.4])]) -+ [AM_AUTOMAKE_VERSION([1.8.5])]) - - # AM_AUX_DIR_EXPAND - ---- sidplay-libs-2.1.1.orig/builders/Makefile.in -+++ sidplay-libs-2.1.1/builders/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.8.4 from Makefile.am. -+# Makefile.in generated by automake 1.8.5 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -130,9 +130,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu builders/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign builders/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu builders/Makefile -+ $(AUTOMAKE) --foreign builders/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -234,7 +234,7 @@ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -245,7 +245,7 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -z "$$unique" && unique=$$empty_fix; \ -+ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi ---- sidplay-libs-2.1.1.orig/builders/hardsid-builder/src/hardsid-builder.cpp -+++ sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp +diff --git a/builders/hardsid-builder/src/hardsid-builder.cpp b/builders/hardsid-builder/src/hardsid-builder.cpp +index f54d0a9..9375e40 100644 +--- a/builders/hardsid-builder/src/hardsid-builder.cpp ++++ b/builders/hardsid-builder/src/hardsid-builder.cpp @@ -47,6 +47,7 @@ ***************************************************************************/ @@ -96,8 +33,10 @@ Signed-off-by: Bernd Kuhls #include "config.h" #ifdef HAVE_EXCEPTIONS ---- sidplay-libs-2.1.1.orig/builders/resid-builder/src/resid-builder.cpp -+++ sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp +diff --git a/builders/resid-builder/src/resid-builder.cpp b/builders/resid-builder/src/resid-builder.cpp +index e6e4eaa..4c7650f 100644 +--- a/builders/resid-builder/src/resid-builder.cpp ++++ b/builders/resid-builder/src/resid-builder.cpp @@ -37,6 +37,7 @@ ***************************************************************************/ @@ -106,8 +45,10 @@ Signed-off-by: Bernd Kuhls #include "config.h" #ifdef HAVE_EXCEPTIONS ---- sidplay-libs-2.1.1.orig/builders/resid-builder/src/resid.cpp -+++ sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp +diff --git a/builders/resid-builder/src/resid.cpp b/builders/resid-builder/src/resid.cpp +index 8c27850..d3123c5 100644 +--- a/builders/resid-builder/src/resid.cpp ++++ b/builders/resid-builder/src/resid.cpp @@ -16,6 +16,7 @@ * * ***************************************************************************/ @@ -116,9 +57,11 @@ Signed-off-by: Bernd Kuhls #include "config.h" #ifdef HAVE_EXCEPTIONS ---- sidplay-libs-2.1.1.orig/configure.ac -+++ sidplay-libs-2.1.1/configure.ac -@@ -2,7 +2,7 @@ +diff --git a/configure b/configure +index 1200eaf..77948b4 100755 +--- a/configure ++++ b/configure +@@ -1227,7 +1227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu #Variables pwd=`pwd` @@ -126,19 +69,28 @@ Signed-off-by: Bernd Kuhls +builders='${libdir}'/ ac_configure_args="$ac_configure_args --disable-library-checks" - AC_CONFIG_AUX_DIR(unix) -@@ -11,7 +11,7 @@ - - hardsid=false - case "$host" in -- *linux*) hardsid=true -+ *linux*|*-k*bsd*-gnu) hardsid=true - ;; - esac - AM_CONDITIONAL(HARDSID, test x$hardsid = xtrue) ---- sidplay-libs-2.1.1.orig/libsidplay/include/sidplay/SmartPtr.h -+++ sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h -@@ -17,16 +17,16 @@ + ac_aux_dir= +diff --git a/libsidplay/configure b/libsidplay/configure +index 05a8ea6..3d93956 100755 +--- a/libsidplay/configure ++++ b/libsidplay/configure +@@ -23466,8 +23466,9 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include +- #include ++#include ++ #include ++ using namespace std; + int + main () + { +diff --git a/libsidplay/include/sidplay/SmartPtr.h b/libsidplay/include/sidplay/SmartPtr.h +index c0cbb1a..15efd10 100644 +--- a/libsidplay/include/sidplay/SmartPtr.h ++++ b/libsidplay/include/sidplay/SmartPtr.h +@@ -17,16 +17,16 @@ class SmartPtrBase_sidtt doFree = bufOwner; if ( bufferLen >= 1 ) { @@ -162,7 +114,7 @@ Signed-off-by: Bernd Kuhls } } -@@ -211,16 +211,16 @@ +@@ -211,16 +211,16 @@ class SmartPtr_sidtt : public SmartPtrBase_sidtt { if ( bufferLen >= 1 ) { @@ -186,8 +138,10 @@ Signed-off-by: Bernd Kuhls } } }; ---- sidplay-libs-2.1.1.orig/libsidplay/include/sidplay/sidendian.h -+++ sidplay-libs-2.1.1/libsidplay/include/sidplay/sidendian.h +diff --git a/libsidplay/include/sidplay/sidendian.h b/libsidplay/include/sidplay/sidendian.h +index 9fa8582..6115282 100644 +--- a/libsidplay/include/sidplay/sidendian.h ++++ b/libsidplay/include/sidplay/sidendian.h @@ -16,6 +16,10 @@ ***************************************************************************/ /*************************************************************************** @@ -199,7 +153,7 @@ Signed-off-by: Bernd Kuhls * Revision 1.5 2001/07/03 22:44:13 s_a_white * Added endian_16 to convert a 16 bit value to an array of 8s. * -@@ -141,7 +145,7 @@ +@@ -141,7 +145,7 @@ inline void endian_16swap8 (uint_least16_t &word) // Convert high-byte and low-byte to 16-bit word. inline uint_least16_t endian_16 (uint8_t hi, uint8_t lo) { @@ -208,7 +162,7 @@ Signed-off-by: Bernd Kuhls endian_16lo8 (word, lo); endian_16hi8 (word, hi); return word; -@@ -165,7 +169,7 @@ +@@ -165,7 +169,7 @@ inline void endian_16 (uint8_t ptr[2], uint_least16_t word) inline void endian_16 (char ptr[2], uint_least16_t word) { @@ -217,7 +171,7 @@ Signed-off-by: Bernd Kuhls } // Convert high-byte and low-byte to 16-bit little endian word. -@@ -334,7 +338,7 @@ +@@ -334,7 +338,7 @@ inline void endian_32swap16 (uint_least32_t &dword) // Swap word endian. inline void endian_32swap8 (uint_least32_t &dword) { @@ -226,7 +180,7 @@ Signed-off-by: Bernd Kuhls lo = endian_32lo16 (dword); hi = endian_32hi16 (dword); endian_16swap8 (lo); -@@ -346,8 +350,8 @@ +@@ -346,8 +350,8 @@ inline void endian_32swap8 (uint_least32_t &dword) // Convert high-byte and low-byte to 32-bit word. inline uint_least32_t endian_32 (uint8_t hihi, uint8_t hilo, uint8_t hi, uint8_t lo) { @@ -237,7 +191,7 @@ Signed-off-by: Bernd Kuhls endian_32lo8 (dword, lo); endian_32hi8 (dword, hi); endian_16lo8 (word, hilo); -@@ -374,7 +378,7 @@ +@@ -374,7 +378,7 @@ inline void endian_little32 (uint8_t ptr[4], uint_least32_t dword) defined(SID_WORDS_LITTLEENDIAN) *((uint_least32_t *) ptr) = dword; #else @@ -246,7 +200,7 @@ Signed-off-by: Bernd Kuhls ptr[0] = endian_32lo8 (dword); ptr[1] = endian_32hi8 (dword); word = endian_32hi16 (dword); -@@ -401,7 +405,7 @@ +@@ -401,7 +405,7 @@ inline void endian_big32 (uint8_t ptr[4], uint_least32_t dword) defined(SID_WORDS_BIGENDIAN) *((uint_least32_t *) ptr) = dword; #else @@ -255,72 +209,11 @@ Signed-off-by: Bernd Kuhls word = endian_32hi16 (dword); ptr[1] = endian_16lo8 (word); ptr[0] = endian_16hi8 (word); ---- sidplay-libs-2.1.1.orig/libsidplay/unix/config.h.in -+++ sidplay-libs-2.1.1/libsidplay/unix/config.h.in -@@ -72,22 +72,22 @@ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - --/* The size of a `char', as computed by sizeof. */ -+/* The size of `char', as computed by sizeof. */ - #undef SIZEOF_CHAR - --/* The size of a `int', as computed by sizeof. */ -+/* The size of `int', as computed by sizeof. */ - #undef SIZEOF_INT - - /* The number of bytes in type long */ - #undef SIZEOF_LONG - --/* The size of a `long int', as computed by sizeof. */ -+/* The size of `long int', as computed by sizeof. */ - #undef SIZEOF_LONG_INT - - /* The number of bytes in type short */ - #undef SIZEOF_SHORT - --/* The size of a `short int', as computed by sizeof. */ -+/* The size of `short int', as computed by sizeof. */ - #undef SIZEOF_SHORT_INT - - /* The number of bytes in type void* */ ---- sidplay-libs-2.1.1.orig/libsidplay/unix/my_macros.m4 -+++ sidplay-libs-2.1.1/libsidplay/unix/my_macros.m4 -@@ -105,8 +105,9 @@ - AC_CACHE_VAL(test_cv_have_ios_openmode, - [ - AC_TRY_COMPILE( -- [#include -- #include ], -+ [#include -+ #include -+ using namespace std;], - [ios::openmode myTest = ios::in;], - [test_cv_have_ios_openmode=yes], - [test_cv_have_ios_openmode=no] ---- sidplay-libs-2.1.1.orig/libsidplay/unix/sidint.h -+++ sidplay-libs-2.1.1/libsidplay/unix/sidint.h -@@ -0,0 +1,17 @@ -+#ifndef _UNIX_SIDINT_H -+#define _UNIX_SIDINT_H 1 -+#ifndef _GENERATED_STDINT_H -+#define _GENERATED_STDINT_H "libsidplay 2.1.1" -+/* generated using a gnu compiler version gcc (Debian 4.3-20080219-1) 4.3.0 20080219 (prerelease) [gcc-4_3-branch revision 132456] Copyright (C) 2007 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -+ -+#include -+ -+ -+/* system headers have good uint64_t */ -+#ifndef _HAVE_UINT64_T -+#define _HAVE_UINT64_T -+#endif -+ -+ /* once */ -+#endif -+#endif ---- sidplay-libs-2.1.1.orig/libsidutils/include/sidplay/utils/SidUsage.h -+++ sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h -@@ -33,7 +33,7 @@ +diff --git a/libsidutils/include/sidplay/utils/SidUsage.h b/libsidutils/include/sidplay/utils/SidUsage.h +index 2afb0f3..0496eea 100755 +--- a/libsidutils/include/sidplay/utils/SidUsage.h ++++ b/libsidutils/include/sidplay/utils/SidUsage.h +@@ -33,7 +33,7 @@ struct sid2_usage_t: public sid_usage_t uint_least16_t length; // usage scan length // Copy common parts of basic usage to extended usage. @@ -329,3 +222,6 @@ Signed-off-by: Bernd Kuhls { *((sid_usage_t *) this) = usage; return *this; +-- +2.7.4 + diff --git a/package/libsidplay2/libsidplay2.mk b/package/libsidplay2/libsidplay2.mk index b294964397..cf4406898b 100644 --- a/package/libsidplay2/libsidplay2.mk +++ b/package/libsidplay2/libsidplay2.mk @@ -9,7 +9,6 @@ LIBSIDPLAY2_SOURCE = sidplay-libs-$(LIBSIDPLAY2_VERSION).tar.gz LIBSIDPLAY2_SITE = http://downloads.sourceforge.net/project/sidplay2/sidplay2/sidplay-libs-$(LIBSIDPLAY2_VERSION) LIBSIDPLAY2_LICENSE = GPLv2+ LIBSIDPLAY2_LICENSE_FILES = libsidplay/COPYING -LIBSIDPLAY2_AUTORECONF = YES LIBSIDPLAY2_INSTALL_STAGING = YES $(eval $(autotools-package)) From d5015443f1f7b508439512a91c22d7fd83decccd Mon Sep 17 00:00:00 2001 From: Zakharov Vlad Date: Wed, 1 Mar 2017 14:03:34 +0300 Subject: [PATCH 2795/3392] mpd: fix build for ARC mpd package fails for both internal and external ARC toolchain as check for pthread support fails. Such checks fails because _REENTRANT flag is not defined in gcc even when -pthread is passed. So we add patch to gcc that defines _REENTRANT on ARC when -pthread is passed. Also it disables mpd package for external ARC toolchain as it fails due to the same issue. This patch should be reverted as soon as the patch for GCC becomes a part of ARC toolchain. Fixes: http://autobuild.buildroot.net/results/7d7/7d70b62ad996830fbeca46dffcc7a1dc030e575d// Signed-off-by: Vlad Zakharov Signed-off-by: Thomas Petazzoni (cherry picked from commit 4d3556662deba0014d9368a84344a59b5e167fac) Signed-off-by: Peter Korsgaard --- ...ne-_REENTRANT-when-pthread-is-passed.patch | 34 +++++++++++++++++++ package/mpd/Config.in | 3 ++ 2 files changed, 37 insertions(+) create mode 100644 package/gcc/arc-2016.09-release/895-arc-define-_REENTRANT-when-pthread-is-passed.patch diff --git a/package/gcc/arc-2016.09-release/895-arc-define-_REENTRANT-when-pthread-is-passed.patch b/package/gcc/arc-2016.09-release/895-arc-define-_REENTRANT-when-pthread-is-passed.patch new file mode 100644 index 0000000000..ee9add53c4 --- /dev/null +++ b/package/gcc/arc-2016.09-release/895-arc-define-_REENTRANT-when-pthread-is-passed.patch @@ -0,0 +1,34 @@ +From 4c6367c99461fdd7bd5613483f2582d7f08fba87 Mon Sep 17 00:00:00 2001 +From: Vlad Zakharov +Date: Tue, 28 Feb 2017 17:41:11 +0300 +Subject: [PATCH] arc: define _REENTRANT when -pthread is passed + +The compiler is supposed to have the builtin defined _REENTRANT defined +when -pthread is passed, which wasn't done on the ARC architecture. + +When _REENTRANT is not passed, the C library will not use reentrant +functions, and the latest version of ax_pthread.m4 from the +autoconf-archive will no longer detect that thread support is +available (see https://savannah.gnu.org/patch/?8186). + +Signed-off-by: Vlad Zakharov +Signed-off-by: Thomas Petazzoni +--- + gcc/config/arc/arc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gcc/config/arc/arc.h b/gcc/config/arc/arc.h +index 611ef54..fdd4b5d 100644 +--- a/gcc/config/arc/arc.h ++++ b/gcc/config/arc/arc.h +@@ -93,6 +93,7 @@ along with GCC; see the file COPYING3. If not see + %{mdsp-packa:-D__Xdsp_packa} %{mcrc:-D__Xcrc} %{mdvbf:-D__Xdvbf} \ + %{mtelephony:-D__Xtelephony} %{mxy:-D__Xxy} %{mmul64: -D__Xmult32} \ + %{mlock:-D__Xlock} %{mswape:-D__Xswape} %{mrtsc:-D__Xrtsc} \ ++%{pthread:-D_REENTRANT} \ + %{mcpu=nps400:-D__NPS400__}" + + #define CC1_SPEC "\ +-- +2.7.4 + diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 8eabbbc796..0c73548fbb 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -8,6 +8,8 @@ menuconfig BR2_PACKAGE_MPD # 0.19.x could be built with GCC 4.6, but for simplicity we require # the same toolchain dependencies for all versions. depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + # ARC toolchain issue + depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG) @@ -339,3 +341,4 @@ comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC From ed5f5941f8185bbcf8f22404522238413ea807a3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 3 Mar 2017 23:07:20 +0100 Subject: [PATCH 2796/3392] support/mkusers: rename variable to avoid name clashing The LINES variable is automatically set by bash to represent the number of lines in the terminal. That variable can be set when the shell receives SIGWINCH. If the shell does receive SIGWINCH after our LINES array is filled, the content of the array is mangled. Rename the variable to avoid that. Fixes #9456 Reported-by: George Y. Reported-by: Paul Stewart Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni (cherry picked from commit 00d34e8a6f378653a384c66d68f9a65e13b8034f) Signed-off-by: Peter Korsgaard --- support/scripts/mkusers | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index d834578761..2ac76f9863 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -359,7 +359,7 @@ add_one_user() { main() { local username uid group gid passwd home shell groups comment local line - local -a LINES + local -a ENTRIES # Some sanity checks if [ ${MIN_UID} -le 0 ]; then @@ -371,7 +371,7 @@ main() { # Read in all the file in memory, exclude empty lines and comments while read line; do - LINES+=( "${line}" ) + ENTRIES+=( "${line}" ) done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) # We first create groups whose gid is not -1, and then we create groups @@ -380,14 +380,14 @@ main() { # used, rather than a different automatic gid is computed. # First, create all the main groups which gid is *not* automatic - for line in "${LINES[@]}"; do + for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" [ ${gid} -ge 0 ] || continue # Automatic gid add_one_group "${group}" "${gid}" done # Then, create all the main groups which gid *is* automatic - for line in "${LINES[@]}"; do + for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" [ ${gid} -eq -1 ] || continue # Non-automatic gid add_one_group "${group}" "${gid}" @@ -396,7 +396,7 @@ main() { # Then, create all the additional groups # If any additional group is already a main group, we should use # the gid of that main group; otherwise, we can use any gid - for line in "${LINES[@]}"; do + for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" if [ "${groups}" != "-" ]; then for g in ${groups//,/ }; do @@ -411,7 +411,7 @@ main() { # uid be generated. # Now, add users whose uid is *not* automatic - for line in "${LINES[@]}"; do + for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" [ "${username}" != "-" ] || continue # Magic string to skip user creation [ ${uid} -ge 0 ] || continue # Automatic uid @@ -420,7 +420,7 @@ main() { done # Finally, add users whose uid *is* automatic - for line in "${LINES[@]}"; do + for line in "${ENTRIES[@]}"; do read username uid group gid passwd home shell groups comment <<<"${line}" [ "${username}" != "-" ] || continue # Magic string to skip user creation [ ${uid} -eq -1 ] || continue # Non-automatic uid From e31990ea557f888f80ae5cd01079cc69a30b73f8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 4 Mar 2017 11:35:03 +0100 Subject: [PATCH 2797/3392] package/librsvg: disable gdk-pixbuf-loader gdk-pixbuf-loader support is enabled by default but it silently fail to generate gdk-pixbuf.loaders file when host != target. For exemple on ARM target: output/host/usr/bin/gdk-pixbuf-query-loaders ./libpixbufloader-svg.la g_module_open() failed for output/build/librsvg-2.40.16/gdk-pixbuf-loader/./libpixbufloader-svg.la: output/build/librsvg-2.40.16/gdk-pixbuf-loader/./.libs/libpixbufloader-svg.so: wrong ELF class: ELFCLASS32 But it doesn't break the build. When host = target using the Sourcery CodeBench AMD64 2016.11 toolchain optimized for x86_68 AMD Puma/Jaguar or AMD Steamroller, it break the build due to "Illegal instruction". output/host/usr/bin/gdk-pixbuf-query-loaders libpixbufloader-svg.la Illegal instruction (core dumped) Since this option is broken for cross-compilation, disable it. Fixes: http://autobuild.buildroot.net/results/393/393145bc9bcb93d6df55ec8c63725c3d9a299957 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 7372c80cc5b07b25d5ee5bc9909ed807a9e69fd7) Signed-off-by: Peter Korsgaard --- package/librsvg/librsvg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index b711de47cd..db57193482 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -9,7 +9,7 @@ LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).16 LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz LIBRSVG_INSTALL_STAGING = YES -LIBRSVG_CONF_OPTS = --disable-tools --enable-introspection=no +LIBRSVG_CONF_OPTS = --disable-pixbuf-loader --disable-tools --enable-introspection=no HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \ $(if $(BR2_PACKAGE_LIBGTK3),libgtk3) From 3b50cf050751829e345f42c2b3b0eb1c42f241f5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 6 Mar 2017 19:11:59 +0100 Subject: [PATCH 2798/3392] Revert "package/libplatform: bump version to 2.1.0" This reverts commit 2ac3045453d701b1fbea0d04333642a76fbfecc4. This commit was part of the Kodi 17 series and was committed too early, current Kodi 16 is incompatible with this bump and needs to be reverted, fixes https://bugs.busybox.net/show_bug.cgi?id=9711 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3e05aa6f5397d59fe30db82c66dfd216fc31a190) Signed-off-by: Peter Korsgaard --- ...-p8-platform-config-fix-lookup-paths.patch | 38 ------------------ ...cmake-fix-paths-for-cross-compilatio.patch | 40 +++++++++++++++++++ package/libplatform/libplatform.hash | 2 +- package/libplatform/libplatform.mk | 8 ++-- 4 files changed, 45 insertions(+), 43 deletions(-) delete mode 100644 package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch create mode 100644 package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch diff --git a/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch b/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch deleted file mode 100644 index d487fd942e..0000000000 --- a/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 01b5478638c705af29f09ad4ed70289f70a21dcf Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 6 Feb 2017 14:04:47 +0100 -Subject: [PATCH] p8-platform-config: fix lookup paths - -Use the proper methods to find the headers and the library. - -Signed-off-by: Samuel Martin -Signed-off-by: "Yann E. MORIN" ---- - p8-platform-config.cmake.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in -index 47f30f1..f59418d 100644 ---- a/p8-platform-config.cmake.in -+++ b/p8-platform-config.cmake.in -@@ -10,7 +10,7 @@ - # - # propagate these properties from one build system to the other - set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") --set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) -+find_path (p8-platform_INCLUDE_DIRS p8-platform/os.h) - set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") - set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") - set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") -@@ -19,7 +19,7 @@ set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") - if(WIN32) - set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") - else(WIN32) -- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") -+ find_library (p8-platform_LIBRARY p8-platform) - endif(WIN32) - set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") - mark_as_advanced (p8-platform_LIBRARY) --- -2.7.4 - diff --git a/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch b/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch new file mode 100644 index 0000000000..89f35bdb3d --- /dev/null +++ b/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch @@ -0,0 +1,40 @@ +From 65ba437ed5514dd5762a796d349ed5db49e40fe7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 29 Jul 2015 21:26:16 +0200 +Subject: [PATCH] platform-config.cmake: fix paths for cross-compilation + +Headers and library paths in platform-config.cmake must take into +account ${CMAKE_FIND_ROOT_PATH} to work in cross-compilation. + +Signed-off-by: Thomas Petazzoni +--- + platform-config.cmake.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/platform-config.cmake.in b/platform-config.cmake.in +index 7fe35fe..78b5085 100644 +--- a/platform-config.cmake.in ++++ b/platform-config.cmake.in +@@ -10,16 +10,16 @@ + # + # propagate these properties from one build system to the other + set (platform_VERSION "@platform_VERSION_MAJOR@.@platform_VERSION_MINOR@") +-set (platform_INCLUDE_DIRS @platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) ++set (platform_INCLUDE_DIRS ${CMAKE_FIND_ROOT_PATH}/@platform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/include) + set (platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") + set (platform_LINKER_FLAGS "@platform_LINKER_FLAGS@") + set (platform_CONFIG_VARS "@platform_CONFIG_VARS@") + + # libraries come from the build tree where this file was generated + if(WIN32) +- set (platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/platform.lib") ++ set (platform_LIBRARY "${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/platform.lib") + else(WIN32) +- set (platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lplatform") ++ set (platform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lplatform") + endif(WIN32) + set (platform_LIBRARIES ${platform_LIBRARY} "@platform_LIBRARIES@") + mark_as_advanced (platform_LIBRARY) +-- +2.5.0 + diff --git a/package/libplatform/libplatform.hash b/package/libplatform/libplatform.hash index e3d5ed5a91..8975dfd8ab 100644 --- a/package/libplatform/libplatform.hash +++ b/package/libplatform/libplatform.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 88711f1b949285867538a0b2e4189532778e1515325dfa1851eae9d18b6affd9 libplatform-2.1.0.tar.gz +sha256 3603ead8b16a48cb35b1e6dea330a693f10552b1a6ea036c5db9ec248cd8baf5 libplatform-feafe68e3e0b02c3261aefb3d711863ef6fadd38.tar.gz diff --git a/package/libplatform/libplatform.mk b/package/libplatform/libplatform.mk index d9cd582f71..6d549151d7 100644 --- a/package/libplatform/libplatform.mk +++ b/package/libplatform/libplatform.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPLATFORM_VERSION = 2.1.0 -LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,p8-platform-$(LIBPLATFORM_VERSION)) -LIBPLATFORM_LICENSE = GPLv2+ -LIBPLATFORM_LICENSE_FILES = src/os.h +LIBPLATFORM_VERSION = feafe68e3e0b02c3261aefb3d711863ef6fadd38 +LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION)) +LIBPLATFORM_LICENSE = GPLv2+, PHP license v3.01 +LIBPLATFORM_LICENSE_FILES = src/os.h src/util/fstrcmp.c LIBPLATFORM_INSTALL_STAGING = YES $(eval $(cmake-package)) From 45c871662fdd1b3592a9637c402f21704d9ace1d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 6 Mar 2017 19:12:00 +0100 Subject: [PATCH 2799/3392] Revert "package/libcec: bump version to 4.0.2" This reverts commit bf1c9828f2c7ef37a0af4da5532472fb7e03ba67. This commit was part of the Kodi 17 series and was committed too early, current Kodi 16 is incompatible with this bump and needs to be reverted, fixes https://bugs.busybox.net/show_bug.cgi?id=9711 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 9642d9589ce2c973340b391ddf0dd042b57025aa) Signed-off-by: Peter Korsgaard --- package/libcec/libcec.hash | 2 +- package/libcec/libcec.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcec/libcec.hash b/package/libcec/libcec.hash index 5416c20fec..377f343a22 100644 --- a/package/libcec/libcec.hash +++ b/package/libcec/libcec.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27 libcec-4.0.2.tar.gz +sha256 0f29d5a2d155b507807ba896bc3b3e50a0ab56bf8f543a2bf5c2798c790292b5 libcec-2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd.tar.gz diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index f00e10f5d2..c9a05a5fba 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCEC_VERSION = 4.0.2 -LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION)) +LIBCEC_VERSION = 2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd +LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION)) LIBCEC_LICENSE = GPLv2+ LIBCEC_LICENSE_FILES = COPYING From 6f2009a93621bea5103fc2eb92d8c20d562381f9 Mon Sep 17 00:00:00 2001 From: Oleg Kitain Date: Mon, 6 Mar 2017 03:02:02 +0300 Subject: [PATCH 2800/3392] pcre: change download location The location at ftp.csx.cam.ac.uk only stores 2 latest versions of PCRE. This results in old (2015.11 and older currently) buildroot versions timing out on wget several times and having to retrieve the package from sources.buildroot.org afterwards. Signed-off-by: Oleg Kitain Signed-off-by: Thomas Petazzoni (cherry picked from commit 6d7644df7043706e455b06817abbe24da5613210) Signed-off-by: Peter Korsgaard --- package/pcre/pcre.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index 211e2359af..e302ed7d8d 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -5,7 +5,7 @@ ################################################################################ PCRE_VERSION = 8.40 -PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre +PCRE_SITE = https://ftp.pcre.org/pub/pcre PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 PCRE_LICENSE = BSD-3c PCRE_LICENSE_FILES = LICENCE From a71ee5ce2af37b1b303f56d91ac32b5b8bae6ece Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 6 Mar 2017 11:54:49 -0300 Subject: [PATCH 2801/3392] harfbuzz: security bump to version 1.4.4 Fixes a buffer-overrun in Bengali. Switch to https URL to avoid a small delay in protocol redirection. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni (cherry picked from commit 7bbdd9afa4fa1014fdb050c1437d6cd90ca3a44a) Signed-off-by: Peter Korsgaard --- package/harfbuzz/harfbuzz.hash | 4 ++-- package/harfbuzz/harfbuzz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 6bf5bee1ec..b7da64b48d 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.4.2.tar.bz2.sha256 -sha256 8f234dcfab000fdec24d43674fffa2fdbdbd654eb176afbde30e8826339cb7b3 harfbuzz-1.4.2.tar.bz2 +# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.4.4.tar.bz2.sha256 +sha256 35d2f8ca476cbbec64ee824eca6b0209ff8db0334990b9f5af893b94f119d255 harfbuzz-1.4.4.tar.bz2 diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 458b072abf..646448093e 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,8 +4,8 @@ # ################################################################################ -HARFBUZZ_VERSION = 1.4.2 -HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release +HARFBUZZ_VERSION = 1.4.4 +HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 HARFBUZZ_LICENSE = MIT, ISC (ucdn library) HARFBUZZ_LICENSE_FILES = COPYING src/hb-ucdn/COPYING From abab5b94cd815b13b042d1d89688eb260265081b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Feb 2017 23:17:27 +0100 Subject: [PATCH 2802/3392] gnutls: bump version to 3.5.9 Signed-off-by: Peter Korsgaard (cherry picked from commit 743f5076df0a852f25d55c3bcb1d3e33eec07055) Signed-off-by: Peter Korsgaard --- 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 121f75a702..156d2aa94d 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff gnutls-3.5.8.tar.xz +sha256 82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951 gnutls-3.5.9.tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 4fab812819..932c0fab0c 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.5 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).9 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library) From 4e10b104b8c6955ad915c2a6be9ce71c7144fc72 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 6 Mar 2017 11:55:06 -0300 Subject: [PATCH 2803/3392] gnutls: security bump to version 3.5.10 Fixes: GNUTLS-SA-2017-3A - Addressed integer overflow resulting to invalid memory write in OpenPGP certificate parsing. GNUTLS-SA-2017-3B - Addressed crashes in OpenPGP certificate parsing, related to private key parser. No longer allow OpenPGP certificates (public keys) to contain private key sub-packets. GNUTLS-SA-2017-3C - Addressed large allocation in OpenPGP certificate parsing, that could lead in out-of-memory condition. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni (cherry picked from commit 6fdb2b109bdec24ea426e0a6786ced7dbb591732) Signed-off-by: Peter Korsgaard --- 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 156d2aa94d..64b86d7599 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951 gnutls-3.5.9.tar.xz +sha256 af443e86ba538d4d3e37c4732c00101a492fe4b56a55f4112ff0ab39dbe6579d gnutls-3.5.10.tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 932c0fab0c..be1cf00e06 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.5 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).9 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).10 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library) From 785d474cb4a11b50f9f8744889df10fe7f855eea Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 6 Mar 2017 11:55:27 -0300 Subject: [PATCH 2804/3392] wireshark: security bump to version 2.2.5 Fixes: wnpa-sec-2017-03 - LDSS dissector crash wnpa-sec-2017-04 - RTMTP dissector infinite loop wnpa-sec-2017-05 - WSP dissector infinite loop wnpa-sec-2017-06 - STANAG 4607 file parser infinite loop wnpa-sec-2017-07 - NetScaler file parser infinite loop wnpa-sec-2017-08 - NetScaler file parser crash wnpa-sec-2017-09 - K12 file parser crash wnpa-sec-2017-10 - IAX2 dissector infinite loop wnpa-sec-2017-11 - NetScaler file parser infinite loop Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni (cherry picked from commit e9e594d99add12ec2b10f79a351cdd8bae093d0e) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index e3eeef334e..3d1f7af4f3 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,2 +1,2 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.4.txt -sha256 42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911 wireshark-2.2.4.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.5.txt +sha256 75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 wireshark-2.2.5.tar.bz2 diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index edd830d80b..14c29431fc 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.4 +WIRESHARK_VERSION = 2.2.5 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From a3124be629db7546afd42f3664b43d7801865eab Mon Sep 17 00:00:00 2001 From: Kurt Van Dijck Date: Sun, 5 Mar 2017 19:27:48 +0100 Subject: [PATCH 2805/3392] libwebsockets: bump to version 2.1.1 Mosquitto combined with version 2.1.0 of libwebsockets yields a failing system. Version 2.1.1 restores the websocket interface again. Signed-off-by: Kurt Van Dijck Signed-off-by: Thomas Petazzoni (cherry picked from commit 71d54786a325e9c1af3352f87434e0a8eab4c726) Signed-off-by: Peter Korsgaard --- package/libwebsockets/libwebsockets.hash | 2 +- package/libwebsockets/libwebsockets.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index cbd1101d75..df7221ee81 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66 libwebsockets-v2.1.0.tar.gz +sha256 96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d libwebsockets-v2.1.1.tar.gz diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index bf46291ad4..983ffce7f3 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = v2.1.0 +LIBWEBSOCKETS_VERSION = v2.1.1 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE From 052ae797324bbe652a14e38773dcf2953cace99a Mon Sep 17 00:00:00 2001 From: Kurt Van Dijck Date: Mon, 6 Mar 2017 15:41:39 +0100 Subject: [PATCH 2806/3392] libwebsockets: cherry-pick upstream patch for v2.1.1 This commit cherry-picks an upstream patch that fixes a compile error that was introduced in v2.1.1 Signed-off-by: Kurt Van Dijck Signed-off-by: Thomas Petazzoni (cherry picked from commit f80fc852a3f9fc26fe522cf843b075da52c68dbc) Signed-off-by: Peter Korsgaard --- package/libwebsockets/libwebsockets.hash | 1 + package/libwebsockets/libwebsockets.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index df7221ee81..7976a6975e 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d libwebsockets-v2.1.1.tar.gz +sha256 49ae9f959394686d469f960951ece3ad1101655afe64df28ea5b1a61c1d124f0 f9f5a5760782b68fba190fb46d306f7c08f027c0.patch diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index 983ffce7f3..74b6b2b3f3 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -12,6 +12,8 @@ LIBWEBSOCKETS_DEPENDENCIES = zlib LIBWEBSOCKETS_INSTALL_STAGING = YES LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON +LIBWEBSOCKETS_PATCH = https://github.com/warmcat/libwebsockets/commit/f9f5a5760782b68fba190fb46d306f7c08f027c0.patch + # If LWS_MAX_SMP=1, then there is no code related to pthreads compiled # in the library. If unset, LWS_MAX_SMP defaults to 32 and a small # amount of pthread mutex code is built into the library. From 26e751617f279ef808f7b36c205fde907e06865a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 4 Mar 2017 15:15:58 +0100 Subject: [PATCH 2807/3392] sngrep: use pkg-config to discover OpenSSL to fix static linking Building sngrep with OpenSSL support in static linking configurations currently fails due to undefined symbols in the OpenSSL library. It's the usual problem with using AC_CHECK_LIB() to discover libraries instead of the pkg-config based PKG_CHECK_MODULES(). Therefore, this commit introduces a patch that switches to using pkg-config to discover OpenSSL. A preliminary patch is needed, without which appending to LIBS/CFLAGS doesn't work. Both patches have been submitted upstream. Fixes: http://autobuild.buildroot.net/results/911143de823b2c749ac0a59dfa06adb6ddd3de50/ Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit bfd273d83ad02b96841d36a05916a12130b4f739) Signed-off-by: Peter Korsgaard --- ...0001-src-Makefile.am-don-t-use-VPATH.patch | 43 +++++++++++ ...switch-to-pkg-config-to-find-openssl.patch | 75 +++++++++++++++++++ package/sngrep/sngrep.mk | 2 +- 3 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch create mode 100644 package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch diff --git a/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch b/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch new file mode 100644 index 0000000000..3d98203424 --- /dev/null +++ b/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch @@ -0,0 +1,43 @@ +From b6dcae8ec4334e2436cfa19a8052c3473f57a586 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 4 Mar 2017 15:02:43 +0100 +Subject: [PATCH 1/2] src/Makefile.am: don't use VPATH + +VPATH is a mechanism used to allow out-of-tree build, not to use source +code from a different directory. For this purpose, one should simply use +the "subdir-objects" AUTOMAKE_OPTIONS, and reference the source code of +the sub-directory in the _SOURCES variable. + +Signed-off-by: Thomas Petazzoni +Upstream-status: https://github.com/irontec/sngrep/pull/176 +--- + src/Makefile.am | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 931ee06..961f4a0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,5 +1,5 @@ ++AUTOMAKE_OPTIONS=subdir-objects + bin_PROGRAMS=sngrep +-VPATH=curses + sngrep_SOURCES=capture.c + if USE_EEP + sngrep_SOURCES+=capture_eep.c +@@ -12,8 +12,8 @@ sngrep_SOURCES+=capture_openssl.c + endif + sngrep_SOURCES+=address.c packet.c sip.c sip_call.c sip_msg.c sip_attr.c main.c + sngrep_SOURCES+=option.c group.c filter.c keybinding.c media.c setting.c rtp.c +-sngrep_SOURCES+=util.c hash.c vector.c ui_panel.c scrollbar.c +-sngrep_SOURCES+=ui_manager.c ui_call_list.c ui_call_flow.c ui_call_raw.c +-sngrep_SOURCES+=ui_stats.c ui_filter.c ui_save.c ui_msg_diff.c +-sngrep_SOURCES+=ui_column_select.c ui_settings.c ++sngrep_SOURCES+=util.c hash.c vector.c curses/ui_panel.c curses/scrollbar.c ++sngrep_SOURCES+=curses/ui_manager.c curses/ui_call_list.c curses/ui_call_flow.c curses/ui_call_raw.c ++sngrep_SOURCES+=curses/ui_stats.c curses/ui_filter.c curses/ui_save.c curses/ui_msg_diff.c ++sngrep_SOURCES+=curses/ui_column_select.c curses/ui_settings.c + +-- +2.7.4 + diff --git a/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch b/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch new file mode 100644 index 0000000000..b51581f5c1 --- /dev/null +++ b/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch @@ -0,0 +1,75 @@ +From 22b08ab1a45eb3773b3c90dc37a31a7574520daa Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 4 Mar 2017 14:56:53 +0100 +Subject: [PATCH 2/2] configure.ac: switch to pkg-config to find openssl + +Using AC_CHECK_LIB() doesn't work properly for static linking, because +it doesn't return information on transitive dependencies of +libraries. For example, if library A internally uses library B, then +with dynamic linking, doing -lA is sufficient. However, with static +linking, one must do -lA -lB, and AC_CHECK_LIB() will only give the -lA +information. This for example causes a build failure when building +sngrep statically with openssl enabled: + +checking for SSL_new in -lssl... no +configure: error: You need to have libssl installed to compile sngrep + +due to undefined symbols in the OpenSSL library. + +The proper solution for this is to discover the library using +pkg-config, because pkg-config properly returns the list of necessary +libraries, as it understands the concept of "list of libraries needed +when dynamic linking" and "list of libraries needed for static linking". + +Signed-off-by: Thomas Petazzoni +Upstream-status: https://github.com/irontec/sngrep/pull/176 +--- + configure.ac | 9 +-------- + src/Makefile.am | 4 ++++ + 2 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 42e00e9..9f8e6d2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -129,14 +129,7 @@ AS_IF([test "x$WITH_OPENSSL" == "xyes"], [ + AS_IF([test "x$WITH_GNUTLS" == "xyes"], [ + AC_MSG_ERROR([ GnuTLS and OpenSSL can not be enabled at the same time ]) + ], []) +- +- AC_CHECK_LIB([ssl], [SSL_new], [], [ +- AC_MSG_ERROR([ You need to have libssl installed to compile sngrep]) +- ]) +- +- AC_CHECK_LIB([crypto], [EVP_get_cipherbyname], [], [ +- AC_MSG_ERROR([ You need to have libcrypto installed to compile sngrep]) +- ]) ++ PKG_CHECK_MODULES([SSL], [libssl libcrypto]) + AC_DEFINE([WITH_OPENSSL],[],[Compile With Openssl compatibility]) + ], []) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 961f4a0..3a471b7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,6 +1,8 @@ + AUTOMAKE_OPTIONS=subdir-objects + bin_PROGRAMS=sngrep + sngrep_SOURCES=capture.c ++sngrep_CFLAGS= ++sngrep_LDADD= + if USE_EEP + sngrep_SOURCES+=capture_eep.c + endif +@@ -9,6 +11,8 @@ sngrep_SOURCES+=capture_gnutls.c + endif + if WITH_OPENSSL + sngrep_SOURCES+=capture_openssl.c ++sngrep_CFLAGS+=$(SSL_CFLAGS) ++sngrep_LDADD+=$(SSL_LIBS) + endif + sngrep_SOURCES+=address.c packet.c sip.c sip_call.c sip_msg.c sip_attr.c main.c + sngrep_SOURCES+=option.c group.c filter.c keybinding.c media.c setting.c rtp.c +-- +2.7.4 + diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index b82d8cefa7..1e0e051433 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -9,7 +9,7 @@ SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION)) SNGREP_LICENSE = GPLv3+ SNGREP_LICENSE_FILES = LICENSE SNGREP_AUTORECONF = YES -SNGREP_DEPENDENCIES = libpcap ncurses +SNGREP_DEPENDENCIES = libpcap ncurses host-pkgconf SNGREP_CONF_ENV += \ $(if $(BR2_STATIC_LIBS),LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --libs`") From 9fc41f884c4cc2b9774c341f61cca96f718b24c2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 28 Feb 2017 23:09:30 +0100 Subject: [PATCH 2808/3392] lttng-libust: fix build on musl This commit backports two upstream patches in lttng-libust, that fix the build with the musl C library. Fixes: http://autobuild.buildroot.net/results/8bbcac9f9debf76cd1f56734bfd494677f2acd21/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 0f67757f699e60cde568696cee516d34acf8963c) Signed-off-by: Peter Korsgaard --- ...resence-of-dlmopen-at-configure-time.patch | 130 ++++++++++++++++++ ...ude-config.h-to-resolve-HAVE_DLMOPEN.patch | 30 ++++ package/lttng-libust/lttng-libust.mk | 1 + 3 files changed, 161 insertions(+) create mode 100644 package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch create mode 100644 package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch diff --git a/package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch b/package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch new file mode 100644 index 0000000000..699f1e0327 --- /dev/null +++ b/package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch @@ -0,0 +1,130 @@ +From 42330adcefcd1830dad89e2a960c93d8dd1da125 Mon Sep 17 00:00:00 2001 +From: Jonathan Rajotte +Date: Tue, 21 Feb 2017 16:00:27 -0500 +Subject: [PATCH] Validate the presence of dlmopen at configure time + +Signed-off-by: Michael Jeanson +Signed-off-by: Jonathan Rajotte +Signed-off-by: Mathieu Desnoyers +[Backport from upstream commit 42330adcefcd1830dad89e2a960c93d8dd1da125.] +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 8 ++++++++ + liblttng-ust-dl/lttng-ust-dl.c | 8 ++++++++ + liblttng-ust-dl/ust_dl.h | 2 ++ + 3 files changed, 18 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 450b43b..023cfd4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -125,15 +125,23 @@ AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [ + # Checks for libraries. + AC_CHECK_LIB([dl], [dlopen], [ + have_libdl=yes ++ libdl_name=dl + ], [ + #libdl not found, check for dlopen in libc. + AC_CHECK_LIB([c], [dlopen], [ + have_libc_dl=yes ++ libdl_name=c + ], [ + AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.]) + ]) + ]) + ++# Check if libdl has dlmopen support. ++AH_TEMPLATE([HAVE_DLMOPEN], ["Define to 1 if dlmopen is available."]) ++AC_CHECK_LIB([$libdl_name], [dlmopen], ++ [AC_DEFINE([HAVE_DLMOPEN], [1])] ++) ++ + AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"]) + AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"]) + +diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c +index b0737b6..ce2ae0e 100644 +--- a/liblttng-ust-dl/lttng-ust-dl.c ++++ b/liblttng-ust-dl/lttng-ust-dl.c +@@ -38,8 +38,10 @@ + #include "ust_dl.h" + + static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags); ++#ifdef HAVE_DLMOPEN + static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename, + int flags); ++#endif + static int (*__lttng_ust_plibc_dlclose)(void *handle); + + static +@@ -55,6 +57,7 @@ void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags) + return __lttng_ust_plibc_dlopen(filename, flags); + } + ++#ifdef HAVE_DLMOPEN + static + void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename, + int flags) +@@ -68,6 +71,7 @@ void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename, + } + return __lttng_ust_plibc_dlmopen(nsid, filename, flags); + } ++#endif + + static + int _lttng_ust_dl_libc_dlclose(void *handle) +@@ -143,6 +147,7 @@ end: + return; + } + ++#ifdef HAVE_DLMOPEN + static + void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name, + int flags, void *ip) +@@ -203,6 +208,7 @@ end: + lttng_ust_elf_destroy(elf); + return; + } ++#endif + + void *dlopen(const char *filename, int flags) + { +@@ -223,6 +229,7 @@ void *dlopen(const char *filename, int flags) + return handle; + } + ++#ifdef HAVE_DLMOPEN + void *dlmopen(Lmid_t nsid, const char *filename, int flags) + { + void *handle; +@@ -243,6 +250,7 @@ void *dlmopen(Lmid_t nsid, const char *filename, int flags) + return handle; + + } ++#endif + + int dlclose(void *handle) + { +diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h +index b8cfe82..afa8e84 100644 +--- a/liblttng-ust-dl/ust_dl.h ++++ b/liblttng-ust-dl/ust_dl.h +@@ -51,6 +51,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlopen, + ) + ) + ++#ifdef HAVE_DLMOPEN + TRACEPOINT_EVENT(lttng_ust_dl, dlmopen, + TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid, + const char *, path, int, flags, +@@ -66,6 +67,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlmopen, + ctf_integer(uint8_t, has_debug_link, has_debug_link) + ) + ) ++#endif + + TRACEPOINT_EVENT(lttng_ust_dl, build_id, + TP_ARGS( +-- +2.7.4 + diff --git a/package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch b/package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch new file mode 100644 index 0000000000..734d3c4c4a --- /dev/null +++ b/package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch @@ -0,0 +1,30 @@ +From 0b2253f5c9af73904d49da32085036c16b9d2d75 Mon Sep 17 00:00:00 2001 +From: Jonathan Rajotte +Date: Tue, 21 Feb 2017 18:10:11 -0500 +Subject: [PATCH] Fix: include config.h to resolve HAVE_DLMOPEN + +Fixes commit 42330adcefcd1830dad89e2a960c93d8dd1da125 + +Signed-off-by: Jonathan Rajotte +Signed-off-by: Mathieu Desnoyers +[Backported from upstream commit 0b2253f5c9af73904d49da32085036c16b9d2d75.] +Signed-off-by: Thomas Petazzoni +--- + liblttng-ust-dl/ust_dl.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h +index afa8e84..c8a0695 100644 +--- a/liblttng-ust-dl/ust_dl.h ++++ b/liblttng-ust-dl/ust_dl.h +@@ -33,6 +33,7 @@ extern "C" { + + #include + #include ++#include + + #define LTTNG_UST_DL_PROVIDER + #include +-- +2.7.4 + diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index 5667abb82d..f8c4c118fb 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -13,6 +13,7 @@ LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux LTTNG_LIBUST_CONF_OPTS += --disable-man-pages # 0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch +# 0003-Validate-the-presence-of-dlmopen-at-configure-time.patch LTTNG_LIBUST_AUTORECONF = YES ifeq ($(BR2_PACKAGE_PYTHON),y) From db30e441b4cd09b646f9d1883a43f144b7b64148 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 9 Mar 2017 17:03:15 +0000 Subject: [PATCH 2809/3392] qt5base: fix compilation error with gcc-4.8 Add a patch to fix a compilation error when using gcc-4.8. Bug report: https://bugreports.qt.io/browse/QTBUG-59399 Patch sent upstream: https://codereview.qt-project.org/#/c/187980/ Fixes: http://autobuild.buildroot.net/results/2ac/2ac16335d16cd53cceeabda8f963c9b288a9a1c8/ Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 80fbef58533ad6b3ea7e24dbd1a7f165e9177e9d) Signed-off-by: Peter Korsgaard --- ...licit-failure-mode-to-std-atomic-com.patch | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch diff --git a/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch b/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch new file mode 100644 index 0000000000..3a43584eeb --- /dev/null +++ b/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch @@ -0,0 +1,65 @@ +From c5d7425f8ad391112758db161e3e08f18dc9d299 Mon Sep 17 00:00:00 2001 +From: Marc Mutz +Date: Thu, 26 May 2016 08:30:26 +0200 +Subject: [PATCH] QAtomic: pass explicit failure mode to + std::atomic::compare_exchange_strong + +... in an attempt to avoid GCC 4.8 errors such as + + bits/atomic_base.h:577:70: error: failure memory model cannot be stronger than success memory model for '__atomic_compare_exchange' + return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2); + ^ + +as seen on Android. + +Change-Id: If046e735888cf331d2d6506d8d5ca9aa7402f9ad +[Bug report: https://bugreports.qt.io/browse/QTBUG-59399 + Patch sent upstream: https://codereview.qt-project.org/#/c/187980/] +Signed-off-by: Vicente Olivert Riera +--- + src/corelib/arch/qatomic_cxx11.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/arch/qatomic_cxx11.h +index bb49aae..d6731ec 100644 +--- a/src/corelib/arch/qatomic_cxx11.h ++++ b/src/corelib/arch/qatomic_cxx11.h +@@ -153,7 +153,7 @@ template struct QAtomicOps + template + static bool testAndSetRelaxed(std::atomic &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW + { +- bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed); ++ bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed, std::memory_order_relaxed); + if (currentValue) + *currentValue = expectedValue; + return tmp; +@@ -162,7 +162,7 @@ template struct QAtomicOps + template + static bool testAndSetAcquire(std::atomic &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW + { +- bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire); ++ bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire, std::memory_order_acquire); + if (currentValue) + *currentValue = expectedValue; + return tmp; +@@ -171,7 +171,7 @@ template struct QAtomicOps + template + static bool testAndSetRelease(std::atomic &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW + { +- bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release); ++ bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release, std::memory_order_relaxed); + if (currentValue) + *currentValue = expectedValue; + return tmp; +@@ -180,7 +180,7 @@ template struct QAtomicOps + template + static bool testAndSetOrdered(std::atomic &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW + { +- bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel); ++ bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel, std::memory_order_acquire); + if (currentValue) + *currentValue = expectedValue; + return tmp; +-- +1.7.10.4 + From 47793a94b50dc1f65bd1686c7973438c26fd2ce1 Mon Sep 17 00:00:00 2001 From: Krzysztof Konopko Date: Thu, 9 Mar 2017 09:01:36 +0100 Subject: [PATCH 2810/3392] toolchain/external: use -dumpversion to check gcc version Currently, `--version` option is used and later matched with a regex to get the actual gcc version. There's a dedicated gcc option to do exactly that: `-dumpversion`. Also `--version` may return a string customised by a vendor that provides the toolchain, which makes the current regex approach error prone. In fact, this situation has been seen with a real customised toolchain. Signed-off-by: Krzysztof Konopko Signed-off-by: Tomasz Szkutkowski Signed-off-by: Thomas Petazzoni (cherry picked from commit 06cd604ec6d34f25b436ab729543418042a87e1c) Signed-off-by: Peter Korsgaard --- toolchain/helpers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 72e7292353..0ed8fdccc6 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -147,7 +147,7 @@ check_gcc_version = \ if [ -z "$${expected_version}" ]; then \ exit 0 ; \ fi; \ - real_version=`$(1) --version | sed -r -e '1!d; s/^[^)]+\) ([^[:space:]]+).*/\1/;'` ; \ + real_version=`$(1) -dumpversion` ; \ if [[ ! "$${real_version}" =~ ^$${expected_version}\. ]] ; then \ printf "Incorrect selection of gcc version: expected %s.x, got %s\n" \ "$${expected_version}" "$${real_version}" ; \ From b4e0100cdb500ab0f23c8506e5975a3ca406aedb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 9 Mar 2017 21:28:52 +0100 Subject: [PATCH 2811/3392] toolchain: remove no longer relevant comment The somewhat complicated sed expression has been removed in commit 06cd604ec6d34f25b436ab729543418042a87e1c ("toolchain/external: use -dumpversion to check gcc version"), so let's remove the comment that was explaining this sed expression. Signed-off-by: Thomas Petazzoni (cherry picked from commit d9fee6b286798d27f45dd6ca6e4b5aabf0cc658d) Signed-off-by: Peter Korsgaard --- toolchain/helpers.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 0ed8fdccc6..922c8215e9 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -132,16 +132,6 @@ check_kernel_headers_version = \ # $1: path to gcc # $2: expected gcc version # -# Some details about the sed expression: -# - 1!d -# - delete if not line 1 -# -# - s/^[^)]+\) ([^[:space:]]+).*/\1/ -# - eat all until the first ')' character followed by a space -# - match as many non-space chars as possible -# - eat all the remaining chars on the line -# - replace by the matched expression -# check_gcc_version = \ expected_version="$(strip $2)" ; \ if [ -z "$${expected_version}" ]; then \ From b0e41b01d8aae96ae5c8a985bd7709570cf6948b Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Fri, 10 Mar 2017 16:16:53 +0100 Subject: [PATCH 2812/3392] package/elfutils: change upstream site fedorahosted.org has been closed on March 1st, 2017, so use a different upstream location for the elfutils project. Signed-off-by: Julien BOIBESSOT Signed-off-by: Thomas Petazzoni (cherry picked from commit 94fba6644e5e612befde675b18cc94c32ccc135b) Signed-off-by: Peter Korsgaard --- package/elfutils/Config.in | 2 +- package/elfutils/elfutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in index 0419e27902..7db84724b5 100644 --- a/package/elfutils/Config.in +++ b/package/elfutils/Config.in @@ -22,7 +22,7 @@ config BR2_PACKAGE_ELFUTILS Note that this option only installs the libraries, and not the programs. - https://fedorahosted.org/elfutils + https://sourceware.org/elfutils/ if BR2_PACKAGE_ELFUTILS diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 566e0bf840..0bf105e528 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -6,7 +6,7 @@ ELFUTILS_VERSION = 0.166 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 -ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION) +ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES ELFUTILS_LICENSE = GPLv2+ or LGPLv3+ (library) ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3 From 34345f1b033e338b1933381a992d9f92f4fe9ae5 Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Fri, 10 Mar 2017 16:22:10 +0100 Subject: [PATCH 2813/3392] package/logrotate: update upstream site in Config.in help fedorahosted.org has closed on March 1st, 2017, and we were anyway already using github as a source for logrotate. This commit therefore updates the Config.in help text to also use github as the upstream site. Signed-off-by: Julien BOIBESSOT Signed-off-by: Thomas Petazzoni (cherry picked from commit cdb1ab8ca0f10782a2f5bba84a34294de18c7273) Signed-off-by: Peter Korsgaard --- package/logrotate/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/logrotate/Config.in b/package/logrotate/Config.in index 8528361b12..2b1ae64365 100644 --- a/package/logrotate/Config.in +++ b/package/logrotate/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LOGROTATE help A simple program to rotate logs. - https://fedorahosted.org/logrotate/ + https://github.com/logrotate/logrotate comment "logrotate needs a toolchain w/ wchar" depends on BR2_USE_MMU From de33cffb6631ec116679fbd6352aef5cf912df65 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 11 Mar 2017 22:26:45 +0100 Subject: [PATCH 2814/3392] package/gdb: fix gnulib issue with musl and uClibc toolchains again The commit [1] doesn't fix this issue for all cases (it doesn't work when BR2_PACKAGE_GDB_DEBUGGER=y). So, leave the configure script alone and override gl_cv_func_gettimeofday_clobber from GDB_MAKE_ENV. [1] 560334bb2a46a77081a3944d092df7732dfca432 Fixes: http://autobuild.buildroot.net/results/719/719a441421030b79c0aa1bbfb707130f3ac87338 Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni (cherry picked from commit faf38b78aee613a732f96d5022a2894efd024a25) Signed-off-by: Peter Korsgaard --- package/gdb/gdb.mk | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 606f1f9600..ccfed4c5fe 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -67,13 +67,6 @@ GDB_DISABLE_BINUTILS_CONF_OPTS = \ --disable-ld \ --disable-gas -# Starting with gdb 7.11, the bundled gnulib tries to use -# rpl_gettimeofday (gettimeofday replacement) due to the code being -# unable to determine if the replacement function should be used or -# not when cross-compiling with uClibc or musl as C libraries. So use -# gl_cv_func_gettimeofday_clobber=no to not use rpl_gettimeofday, -# assuming musl and uClibc have a properly working gettimeofday -# implementation. GDB_CONF_ENV = \ ac_cv_type_uintptr_t=yes \ gt_cv_func_gettext_libintl=yes \ @@ -83,8 +76,18 @@ GDB_CONF_ENV = \ bash_cv_must_reinstall_sighandlers=no \ bash_cv_func_sigsetjmp=present \ bash_cv_have_mbstate_t=yes \ - gdb_cv_func_sigsetjmp=yes \ - gl_cv_func_gettimeofday_clobber=no + gdb_cv_func_sigsetjmp=yes + +# Starting with gdb 7.11, the bundled gnulib tries to use +# rpl_gettimeofday (gettimeofday replacement) due to the code being +# unable to determine if the replacement function should be used or +# not when cross-compiling with uClibc or musl as C libraries. So use +# gl_cv_func_gettimeofday_clobber=no to not use rpl_gettimeofday, +# assuming musl and uClibc have a properly working gettimeofday +# implementation. It needs to be passed to GDB_MAKE_ENV and not +# GDB_CONF_ENV, because otherwise it does not get passed to the +# configure script of nested packages. +GDB_MAKE_ENV = gl_cv_func_gettimeofday_clobber=no # The shared only build is not supported by gdb, so enable static build for # build-in libraries with --enable-static. From 8d36b6d034ea07c9dbddd4f407f34f1d2d01ccd8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 7 Mar 2017 22:16:28 +0100 Subject: [PATCH 2815/3392] package/rpi-userland: don't install file in random location Currently, rpi-userland installs files in $(@D)/../../bin/ which is entirely stupid, especially in cross-compilation. Get rid of the dubious, broken, custom install command. Signed-off-by: "Yann E. MORIN" Tested-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit ffa39b23f7ece3a3d9ea914c2e385ce222bdf921) Signed-off-by: Peter Korsgaard --- ...lay-don-t-install-script-in-random-l.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch diff --git a/package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch b/package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch new file mode 100644 index 0000000000..2900eb74fd --- /dev/null +++ b/package/rpi-userland/0006-host-apps-dtoverlay-don-t-install-script-in-random-l.patch @@ -0,0 +1,45 @@ +From a5a4e361c8116ca9228a896f672102c02be56bb7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Tue, 7 Mar 2017 22:01:39 +0100 +Subject: [PATCH] host-apps/dtoverlay: don't install script in random location + +Currently, we add a custom command that installs the dtoverlay pre/post +scripts in ${CMAKE_BINARY_DIR}/../../bin + +However: + + - this points outside of the package directory.; it even points two + directories higher; + + - when doing cross-compilation, this is definitely not the place where + the /bin directory really is; + + - the scripts are already properly installed without this code. + +Remove that code, it serves no purpose and breaks for cross-compilation. + +Signed-off-by: "Yann E. MORIN" +--- + host_applications/linux/apps/dtoverlay/CMakeLists.txt | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/host_applications/linux/apps/dtoverlay/CMakeLists.txt b/host_applications/linux/apps/dtoverlay/CMakeLists.txt +index 9009200..dd48d83 100755 +--- a/host_applications/linux/apps/dtoverlay/CMakeLists.txt ++++ b/host_applications/linux/apps/dtoverlay/CMakeLists.txt +@@ -22,12 +22,4 @@ add_custom_command(TARGET dtoverlay POST_BUILD COMMAND ln;-sf;dtoverlay;dtparam) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin) + + set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post) +-foreach(_script ${DTOVERLAY_SCRIPTS}) +- add_custom_command( +- TARGET dtoverlay +- COMMAND ${CMAKE_COMMAND} +- -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script} +- ${CMAKE_BINARY_DIR}/../../bin/${_script} +- ) +-endforeach() + install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin) +-- +2.7.4 + From f63fab1bae878509a79219ebff634af208daab0b Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 10 Mar 2017 17:06:18 +0000 Subject: [PATCH 2816/3392] imagemagick: bump version to 7.0.5-0 (security) - Fixed memory leak when creating nested exceptions in Magick++ https://www.imagemagick.org/discourse-server/viewtopic.php?f=23&p=142634 - Fixed fd leak for webp coder https://github.com/ImageMagick/ImageMagick/pull/382 - Fixed Spurious memory allocation message https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31438 Full changelog: http://imagemagick.org/script/changelog.php Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit d6cc5462535acf954abccd585efc3a07623cc416) Signed-off-by: Peter Korsgaard --- ...c-unbreak-build-without-JPEG-support.patch | 47 ------------------- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch diff --git a/package/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch b/package/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch deleted file mode 100644 index 00a1045bb7..0000000000 --- a/package/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5d0e9c53f49022df5154eb3c04900f48b1c6448e Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 6 Feb 2017 17:39:31 +0100 -Subject: [PATCH] png.c: unbreak build without JPEG support - -Since commit a9e228f8ac26 (Implemented a private PNG caNv (canvas) chunk), -PNGsLong gets called unconditionally, but it is only defined if JPEG -support is enabled (which defines JNG_SUPPORTED), breaking the build: - -MagickCore/.libs/libMagickCore-7.Q16HDRI.a(MagickCore_libMagickCore_7_Q16HDRI_la-png.o): In function `WriteOnePNGImage': -png.c:(.text+0x748d): undefined reference to `PNGsLong' -png.c:(.text+0x74b7): undefined reference to `PNGsLong' - -For build log, see: -http://autobuild.buildroot.net/results/d20/d20eecec8e7b947759185f77a6c8e610dd7393f3/build-end.log - -Fix it by unconditionally defining the helper function. - -Submitted-upstream: https://github.com/ImageMagick/ImageMagick/pull/373 -Signed-off-by: Peter Korsgaard ---- - coders/png.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/coders/png.c b/coders/png.c -index aebe59281..1328b1aab 100644 ---- a/coders/png.c -+++ b/coders/png.c -@@ -1229,7 +1229,6 @@ static void PNGLong(png_bytep p,png_uint_32 value) - *p++=(png_byte) (value & 0xff); - } - --#if defined(JNG_SUPPORTED) - static void PNGsLong(png_bytep p,png_int_32 value) - { - *p++=(png_byte) ((value >> 24) & 0xff); -@@ -1237,7 +1236,6 @@ static void PNGsLong(png_bytep p,png_int_32 value) - *p++=(png_byte) ((value >> 8) & 0xff); - *p++=(png_byte) (value & 0xff); - } --#endif - - static void PNGShort(png_bytep p,png_uint_16 value) - { --- -2.11.0 - diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 90e1db5389..75bc9a9a25 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 1ee004740b7ab47fff3c92ae4a89dcbd0181c4d5f31fcb7e3697412ea384a0da ImageMagick-7.0.4-6.tar.xz +sha256 7362805eaa9f9b90cdb67a1f8762782bef4a42ca44939629aecad3c40305bf4c ImageMagick-7.0.5-0.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index a91729736b..d1cd608b18 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.4-6 +IMAGEMAGICK_VERSION = 7.0.5-0 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From 2e1b15a6fba60f077fad070738801b592c794038 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 13 Feb 2017 18:24:51 +0100 Subject: [PATCH 2817/3392] domoticz: fix build on powerpc64le There is an issue with powerpc64le and boost::uuids::random_generator on the following line of code (from include/boost/uuid/seed_rng.hpp): sha.process_bytes( (unsigned char const*)&std::rand, sizeof( void(*)() ) ) This line "inspects the first couple bytes (here eight) of the std::rand function to seed some rng. Due to the implementation of process_bytes and inlining happening, it seems that one of the loops therein uses &rand-1 as some boundary, compiling with -O0 makes that reloc come out as 'rand + 0' and the link will succeed." See: https://bugzilla.suse.com/show_bug.cgi?id=955832#c7 Fixes: - http://autobuild.buildroot.org/results/454c0ea393615bae2d1b44be9920f25b5c49fc33 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 00d2a3da72455213b87069af475173060750d50d) Signed-off-by: Peter Korsgaard --- package/domoticz/domoticz.mk | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index f43dbda49e..48cdbc4152 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -18,6 +18,21 @@ DOMOTICZ_DEPENDENCIES = \ sqlite \ zlib +# Fixes: +# http://autobuild.buildroot.org/results/454c0ea393615bae2d1b44be9920f25b5c49fc33 +# There is an issue with powerpc64le and boost::uuids::random_generator on the +# following line of code (from include/boost/uuid/seed_rng.hpp): +# sha.process_bytes( (unsigned char const*)&std::rand, sizeof( void(*)() ) ) +# This line "inspects the first couple bytes (here eight) of the std::rand +# function to seed some rng. Due to the implementation of process_bytes and +# inlining happening, it seems that one of the loops therein uses &rand-1 as +# some boundary, compiling with -O0 makes that reloc come out as 'rand + 0' and +# the link will succeed." +# See: https://bugzilla.suse.com/show_bug.cgi?id=955832#c7 +ifeq ($(BR2_powerpc64le),y) +DOMOTICZ_CXXFLAGS += -O0 +endif + # Due to the dependency on mosquitto, domoticz depends on # !BR2_STATIC_LIBS so set USE_STATIC_BOOST to OFF DOMOTICZ_CONF_OPTS += -DUSE_STATIC_BOOST=OFF @@ -27,7 +42,8 @@ DOMOTICZ_CONF_OPTS += -DUSE_STATIC_BOOST=OFF DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_LUA=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ - -DUSE_BUILTIN_MQTT=OFF + -DUSE_BUILTIN_MQTT=OFF \ + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(DOMOTICZ_CXXFLAGS)" ifeq ($(BR2_PACKAGE_LIBUSB),y) DOMOTICZ_DEPENDENCIES += libusb From 91bb73cb5a5a6764054a6f07eae1b6da12ed4086 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 10 Mar 2017 23:15:46 +0100 Subject: [PATCH 2818/3392] qt5base: fix eglfs x11 header related compile failure Add egl config and QT_EGL_NO_X11 define (as all other eglfs project files do) to src/plugins/platforms/eglfs/eglfs-plugin.pro. Fixes ([1]): In file included from .../host/usr/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/EGL/egl.h:39:0, from ../../../../include/QtEglSupport/5.8.0/QtEglSupport/private/../../../../../src/platformsupport/eglconvenience/qt_egl_p.h:63, from ../../../../include/QtEglSupport/5.8.0/QtEglSupport/private/qt_egl_p.h:1, from api/qeglfsglobal_p.h:56, from api/qeglfsintegration_p.h:54, from qeglfsmain.cpp:41: .../host/usr/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/EGL/eglplatform.h:119:22: fatal error: X11/Xlib.h: No such file or directory compilation terminated. Makefile.eglfs-plugin:1024: recipe for target '.obj/qeglfsmain.o' failed make[2]: *** [.obj/qeglfsmain.o] Error 1 make[2]: Leaving directory '.../qt5base-5.8.0/src/plugins/platforms/eglfs' Makefile:71: recipe for target 'sub-eglfs-plugin-pro-make_first-ordered' failed make[1]: *** [sub-eglfs-plugin-pro-make_first-ordered] Error 2 [1] http://lists.busybox.net/pipermail/buildroot/2017-March/186158.html Signed-off-by: Peter Seiderer Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit 5840e8bd505cef8846ed4f8fc769f306165ee174) Signed-off-by: Peter Korsgaard --- ...x-x11-header-related-compile-failure.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch diff --git a/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch b/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch new file mode 100644 index 0000000000..0e8bcffa2e --- /dev/null +++ b/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch @@ -0,0 +1,36 @@ +From 8902f4d7b7c532592d1a34ad117698d3e380e9e1 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Fri, 10 Mar 2017 22:23:06 +0100 +Subject: [PATCH] eglfs: fix x11 header related compile failure + +Add egl config and QT_EGL_NO_X11 define (as all other eglfs project +files do). + +Task-number: QTBUG-59427 +Change-Id: Ifbb11eae0fdf0e58c0b7feecb9a7914a889c8f77 + +Upstream: https://codereview.qt-project.org/188158 +Signed-off-by: Peter Seiderer +--- + src/plugins/platforms/eglfs/eglfs-plugin.pro | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro +index cf4863975a..ec229796e5 100644 +--- a/src/plugins/platforms/eglfs/eglfs-plugin.pro ++++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro +@@ -2,6 +2,11 @@ TARGET = qeglfs + + QT += eglfsdeviceintegration-private + ++CONFIG += egl ++ ++# Avoid X11 header collision, use generic EGL native types ++DEFINES += QT_EGL_NO_X11 ++ + SOURCES += $$PWD/qeglfsmain.cpp + + OTHER_FILES += $$PWD/eglfs.json +-- +2.11.0 + From a3d83660c5352249d8da2bab8520442d13a06cec Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 10 Mar 2017 23:15:47 +0100 Subject: [PATCH 2819/3392] qt5base: install libQt5EglFsKmsSupport According to src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro depends on eglfs_gbm which depends according to src/gui/configure.json on features.eglfs and features.gbm and features.kms, so dependency on BR2_PACKAGE_MESA3D_OPENGL_EGL which enables mesa3d gbm support should be sufficient. Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 5efe07f9af53c0cf0795d316cb84d58e530a9619) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 7a335736db..1020348909 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -200,6 +200,9 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport +endif else QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration endif From b3442f2fe397bbd33f9ab745ff2601a8994a7153 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Mar 2017 10:58:16 +0100 Subject: [PATCH 2820/3392] package/nbd: fix utilities locations Currently, the code expects both the client and server to be in /usr/bin, while the client is in /usr/sbin Fix that. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit 4aabbeb245794862e8434317e885d6d028d23679) Signed-off-by: Peter Korsgaard --- package/nbd/nbd.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index d91c2d717e..a763d83df6 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -19,14 +19,14 @@ NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no endif ifneq ($(BR2_NBD_CLIENT),y) -NBD_TOREMOVE += nbd-client +NBD_TOREMOVE += /usr/sbin/nbd-client endif ifneq ($(BR2_NBD_SERVER),y) -NBD_TOREMOVE += nbd-server +NBD_TOREMOVE += /usr/bin/nbd-server endif define NBD_CLEANUP_AFTER_INSTALL - rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(NBD_TOREMOVE)) + rm -f $(addprefix $(TARGET_DIR), $(NBD_TOREMOVE)) endef NBD_POST_INSTALL_TARGET_HOOKS += NBD_CLEANUP_AFTER_INSTALL From c365c42ef371d948570a2b41b4f87af193a0eab6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Mar 2017 17:32:59 +0100 Subject: [PATCH 2821/3392] package/tor: bump version to 0.2.9.10 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 660651491ea2ff8fc82d503a8e28bbd54e8d9131) Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 470fc4829b..d14db040e7 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 33325d2b250fd047ba2ddc5d11c2190c4e2951f4b03ec48ebd8bf0666e990d43 tor-0.2.9.9.tar.gz +sha256 d611283e1fb284b5f884f8c07e7d3151016851848304f56cfdf3be2a88bd1341 tor-0.2.9.10.tar.gz diff --git a/package/tor/tor.mk b/package/tor/tor.mk index bb0fbb16b5..9ccde799da 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.2.9.9 +TOR_VERSION = 0.2.9.10 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3c TOR_LICENSE_FILES = LICENSE From 894a37c031cce0715d28f5003ccc58db07b1cce9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Mar 2017 15:06:05 +0100 Subject: [PATCH 2822/3392] package/python: add optional support for libintl Python links to gettext when available: $ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/lib/python2.7/lib-dynload/_locale.so | grep NEEDED 0x00000001 (NEEDED) Shared library: [libintl.so.8] 0x00000001 (NEEDED) Shared library: [libpython2.7.so.1.0] 0x00000001 (NEEDED) Shared library: [libc.so.0] In comparison the same library compiled without gettext: $ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/lib/python2.7/lib-dynload/_locale.so | grep NEEDED 0x00000001 (NEEDED) Shared library: [libpython2.7.so.1.0] 0x00000001 (NEEDED) Shared library: [libc.so.0] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 70759f5359d6e5f7b868b74399e20d8ea7956769) Signed-off-by: Peter Korsgaard --- package/python/python.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/python/python.mk b/package/python/python.mk index 281130c68b..8eb82b2a4d 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -60,6 +60,10 @@ HOST_PYTHON_DEPENDENCIES = host-expat host-zlib PYTHON_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_GETTEXT),y) +PYTHON_DEPENDENCIES += gettext +endif + ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y) PYTHON_DEPENDENCIES += readline endif From 32a9eb6e5abbc1787e0a82756d35aa8fb5b411cb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Mar 2017 13:43:14 +0100 Subject: [PATCH 2823/3392] package/git: add optional support for gettext git links to libintl if available: $ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/bin/git | grep NEEDED 0x00000001 (NEEDED) Shared library: [libz.so.1] 0x00000001 (NEEDED) Shared library: [libintl.so.8] 0x00000001 (NEEDED) Shared library: [libc.so.0] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit aecab2f29c396a04d24e61479d7fc3f53149448f) Signed-off-by: Peter Korsgaard --- package/git/git.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/git/git.mk b/package/git/git.mk index 1c15740076..d3a494f7b7 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -11,6 +11,10 @@ GIT_LICENSE = GPLv2, LGPLv2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_DEPENDENCIES = zlib host-gettext +ifeq ($(BR2_PACKAGE_GETTEXT),y) +GIT_DEPENDENCIES += gettext +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) GIT_DEPENDENCIES += openssl GIT_CONF_OPTS += --with-openssl From 9739750396da0af7a449eed9e38e003e0dc2d159 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Mar 2017 13:12:03 +0100 Subject: [PATCH 2824/3392] package/git: fix pcre support The current code contains some obvious typos. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit d830807794245077e73ee1d3c78eecb8d224dc04) Signed-off-by: Peter Korsgaard --- package/git/git.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.mk b/package/git/git.mk index d3a494f7b7..960e4ba03a 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -23,8 +23,8 @@ else GIT_CONF_OPTS += --without-openssl endif -ifeq ($(BR2_PACKAGE_PERL),y) -GIT_DEPENDENCIES += perl +ifeq ($(BR2_PACKAGE_PCRE),y) +GIT_DEPENDENCIES += pcre GIT_CONF_OPTS += --with-libpcre else GIT_CONF_OPTS += --without-libpcre From 8ddd530004229e032dda14c64db629b862b27fa3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Mar 2017 12:44:57 +0100 Subject: [PATCH 2825/3392] package/mplayer: add optional support for pulseaudio Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a085b7c3139b2c4543530fb0adf0047d8a4c1fd3) Signed-off-by: Peter Korsgaard --- package/mplayer/mplayer.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk index 07307cede2..8288dcb1ec 100644 --- a/package/mplayer/mplayer.mk +++ b/package/mplayer/mplayer.mk @@ -224,6 +224,12 @@ else MPLAYER_CONF_OPTS += --disable-gif endif +# We intentionally don't pass --enable-pulse, to let the +# autodetection find which library to link with. +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +MPLAYER_DEPENDENCIES += pulseaudio +endif + # We intentionally don't pass --enable-librtmp to let autodetection # find which library to link with. ifeq ($(BR2_PACKAGE_RTMPDUMP),y) From 14dc993718941fb0d1194fc2eedcab0b5fe33260 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Tue, 14 Mar 2017 19:59:37 +0530 Subject: [PATCH 2826/3392] zmqpp: update license Since version 4.1.2, zmqpp is provided under MPLv2. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni (cherry picked from commit 87e9391e69cae06836723dcc5525e07d89c14acb) Signed-off-by: Peter Korsgaard --- package/zmqpp/zmqpp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk index 18da709691..3e35fd758a 100644 --- a/package/zmqpp/zmqpp.mk +++ b/package/zmqpp/zmqpp.mk @@ -8,7 +8,7 @@ ZMQPP_VERSION = 4.1.2 ZMQPP_SITE = $(call github,zeromq,zmqpp,$(ZMQPP_VERSION)) ZMQPP_INSTALL_STAGING = YES ZMQPP_DEPENDENCIES = zeromq -ZMQPP_LICENSE = MIT +ZMQPP_LICENSE = MPLv2.0 ZMQPP_LICENSE_FILES = LICENSE ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread From 3bf15bfc84f646efbdeead006378265fa56855a9 Mon Sep 17 00:00:00 2001 From: Matthew Fornero Date: Mon, 13 Mar 2017 15:35:02 -0400 Subject: [PATCH 2827/3392] libiio: explicitly disable matlab bindings If building on a machine with MATLAB installed, the MATLAB bindings will default to ON, which is not the desired behavior for a cross build. The bindings are designed to be called from within MATLAB, and we are not currently running MATLAB on buildroot-generated targets. This does not preclude the use of the bindings from a host connecting over the network backend (assuming libiio on the host has the bindings enabled). Signed-off-by: Matthew Fornero Acked-By: Paul Cercueil Signed-off-by: Thomas Petazzoni (cherry picked from commit f358078b3374f3b316551660e89f5c463cb61608) Signed-off-by: Peter Korsgaard --- package/libiio/libiio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 8977610999..aaa6c7060d 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -14,6 +14,7 @@ LIBIIO_CONF_OPTS = -DENABLE_IPV6=ON \ -DWITH_LOCAL_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_LOCAL_BACKEND),ON,OFF) \ -DWITH_NETWORK_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_NETWORK_BACKEND),ON,OFF) \ -DWITH_MATLAB_BINDINGS_API=OFF \ + -DMATLAB_BINDINGS=OFF \ -DINSTALL_UDEV_RULE=$(if $(BR2_PACKAGE_HAS_UDEV),ON,OFF) \ -DWITH_TESTS=$(if $(BR2_PACKAGE_LIBIIO_TESTS),ON,OFF) \ -DWITH_DOC=OFF From fb398d3a4d806399e52c1f970a415cd718133403 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 13 Mar 2017 11:41:44 +0000 Subject: [PATCH 2828/3392] linux-headers: bump 4.{4, 9, 10}.x and 3.12.x series [Peter: skip 4.10.x] Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit d18cdcebc238706d1bf50460b85ea36eaed83b21) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ee02a45daf..72fbcc6d41 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -217,12 +217,12 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.85" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 - default "3.12.70" if BR2_KERNEL_HEADERS_3_12 + default "3.12.71" if BR2_KERNEL_HEADERS_3_12 default "3.18.48" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.52" if BR2_KERNEL_HEADERS_4_4 + default "4.4.53" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.13" if BR2_KERNEL_HEADERS_4_9 + default "4.9.14" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 840969ed617f772c866ea61e27cab97eaaf63eff Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 13 Mar 2017 12:31:20 +0000 Subject: [PATCH 2829/3392] rpm: bump version to 4.13.0.1 (security) Security fixes: - Fix several out of bounds reads in the OpenPGP parser - Fix handling of OpenPGP reserved tag (should be rejected) - Fix various crashes from malformed packages with invalid tags Release notes: http://rpm.org/wiki/Releases/4.13.0.1 This patch also switches from GitHub to rpm.org since the last one seems to be more up-to-date. [Peter: use RPM_VERSION_MAJOR as suggested by Jerzy Grzegorek] Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit 7adbcd174a17ff1b74c4b20d94ca4a9e7f396d68) Signed-off-by: Peter Korsgaard --- package/rpm/rpm.hash | 4 ++-- package/rpm/rpm.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/rpm/rpm.hash b/package/rpm/rpm.hash index c9c4d659a1..fd77d33fa2 100644 --- a/package/rpm/rpm.hash +++ b/package/rpm/rpm.hash @@ -1,5 +1,5 @@ -# From http://rpm.org/wiki/Releases/4.13.0 -sha1 c6ce4f879ca6a75340921093105e5ef9d33381d3 rpm-4.13.0.tar.bz2 +# From http://rpm.org/wiki/Releases/4.13.0.1 +sha1 9566f95f38fcb214e439c552f378c2f64ba0aff9 rpm-4.13.0.1.tar.bz2 # Locally computed sha256 a3e5568d721737a24141737e6036bb39ba9dfbeaa03fa4a51cc7881a243e0c5d b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch sha256 7ab0e08e143bb2d43d5b0553ee22ea34da15a611c597860a6110745467d20fa8 c810a0aca3f1148d2072d44b91b8cc9caeb4cf19.patch diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 2e829d751a..1c03f2eaa1 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -4,9 +4,10 @@ # ################################################################################ -RPM_VERSION = 4.13.0 +RPM_VERSION_MAJOR = 4.13 +RPM_VERSION = $(RPM_VERSION_MAJOR).0.1 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 -RPM_SITE = https://github.com/rpm-software-management/rpm/releases/download/rpm-$(RPM_VERSION)-release +RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib RPM_LICENSE = GPLv2 or LGPLv2 (library only) RPM_LICENSE_FILES = COPYING From 1a1ec309d748d1d1cdb4f3b9dbcd7eb08c7b0e93 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 15 Mar 2017 08:07:38 -0300 Subject: [PATCH 2830/3392] linux-headers: bump 4.{4, 9, 10}.x series [Peter: skip 4.10.x] Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit b3d736b9b6b92b70a9020be470a4cf5f7f012b2e) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 72fbcc6d41..a848be6636 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.53" if BR2_KERNEL_HEADERS_4_4 + default "4.4.54" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.14" if BR2_KERNEL_HEADERS_4_9 + default "4.9.15" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 607c2635ca1f48f3aacb84404a4cd0ee49215827 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 14 Mar 2017 23:58:21 +0100 Subject: [PATCH 2831/3392] jasper: add upstream security fix for CVE-2017-6850 Fixes a NULL pointer dereference in jp2_cdef_destroy: https://blogs.gentoo.org/ago/2017/01/25/jasper-null-pointer-dereference-in-jp2_cdef_destroy-jp2_cod-c/ https://github.com/mdadams/jasper/issues/112 Signed-off-by: Peter Korsgaard (cherry picked from commit a105443b24f7c75b10dab44c2916fc9f2b58363a) Signed-off-by: Peter Korsgaard --- ...o-uninitialized-data-in-the-JP2-deco.patch | 286 ++++++++++++++++++ 1 file changed, 286 insertions(+) create mode 100644 package/jasper/0002-Fixed-bugs-due-to-uninitialized-data-in-the-JP2-deco.patch diff --git a/package/jasper/0002-Fixed-bugs-due-to-uninitialized-data-in-the-JP2-deco.patch b/package/jasper/0002-Fixed-bugs-due-to-uninitialized-data-in-the-JP2-deco.patch new file mode 100644 index 0000000000..be8472053f --- /dev/null +++ b/package/jasper/0002-Fixed-bugs-due-to-uninitialized-data-in-the-JP2-deco.patch @@ -0,0 +1,286 @@ +From e96fc4fdd525fa0ede28074a7e2b1caf94b58b0d Mon Sep 17 00:00:00 2001 +From: Michael Adams +Date: Sat, 4 Mar 2017 14:43:24 -0800 +Subject: [PATCH] Fixed bugs due to uninitialized data in the JP2 decoder. + Also, added some comments marking I/O stream interfaces that probably need to + be changed (in the long term) to fix integer overflow problems. + +Signed-off-by: Peter Korsgaard +--- + src/libjasper/base/jas_stream.c | 18 +++++++++++++++++ + src/libjasper/jp2/jp2_cod.c | 44 ++++++++++++++++++++++++++++------------- + 2 files changed, 48 insertions(+), 14 deletions(-) + +diff --git a/src/libjasper/base/jas_stream.c b/src/libjasper/base/jas_stream.c +index 327ee57..d70408f 100644 +--- a/src/libjasper/base/jas_stream.c ++++ b/src/libjasper/base/jas_stream.c +@@ -664,6 +664,7 @@ int jas_stream_ungetc(jas_stream_t *stream, int c) + return 0; + } + ++/* FIXME integral type */ + int jas_stream_read(jas_stream_t *stream, void *buf, int cnt) + { + int n; +@@ -690,6 +691,7 @@ int jas_stream_read(jas_stream_t *stream, void *buf, int cnt) + return n; + } + ++/* FIXME integral type */ + int jas_stream_write(jas_stream_t *stream, const void *buf, int cnt) + { + int n; +@@ -742,6 +744,7 @@ int jas_stream_puts(jas_stream_t *stream, const char *s) + return 0; + } + ++/* FIXME integral type */ + char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize) + { + int c; +@@ -765,6 +768,7 @@ char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize) + return buf; + } + ++/* FIXME integral type */ + int jas_stream_gobble(jas_stream_t *stream, int n) + { + int m; +@@ -783,6 +787,7 @@ int jas_stream_gobble(jas_stream_t *stream, int n) + return n; + } + ++/* FIXME integral type */ + int jas_stream_pad(jas_stream_t *stream, int n, int c) + { + int m; +@@ -885,6 +890,7 @@ long jas_stream_tell(jas_stream_t *stream) + * Buffer initialization code. + \******************************************************************************/ + ++/* FIXME integral type */ + static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf, + int bufsize) + { +@@ -1060,6 +1066,7 @@ static int jas_strtoopenmode(const char *s) + return openmode; + } + ++/* FIXME integral type */ + int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n) + { + int all; +@@ -1085,6 +1092,7 @@ int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n) + return 0; + } + ++/* FIXME integral type */ + long jas_stream_setrwcount(jas_stream_t *stream, long rwcnt) + { + int old; +@@ -1094,6 +1102,7 @@ long jas_stream_setrwcount(jas_stream_t *stream, long rwcnt) + return old; + } + ++/* FIXME integral type */ + int jas_stream_display(jas_stream_t *stream, FILE *fp, int n) + { + unsigned char buf[16]; +@@ -1168,6 +1177,7 @@ long jas_stream_length(jas_stream_t *stream) + * Memory stream object. + \******************************************************************************/ + ++/* FIXME integral type */ + static int mem_read(jas_stream_obj_t *obj, char *buf, int cnt) + { + ssize_t n; +@@ -1209,6 +1219,7 @@ static int mem_resize(jas_stream_memobj_t *m, size_t bufsize) + return 0; + } + ++/* FIXME integral type */ + static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt) + { + size_t n; +@@ -1264,6 +1275,7 @@ static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt) + return ret; + } + ++/* FIXME integral type */ + static long mem_seek(jas_stream_obj_t *obj, long offset, int origin) + { + jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj; +@@ -1310,6 +1322,7 @@ static int mem_close(jas_stream_obj_t *obj) + * File stream object. + \******************************************************************************/ + ++/* FIXME integral type */ + static int file_read(jas_stream_obj_t *obj, char *buf, int cnt) + { + jas_stream_fileobj_t *fileobj; +@@ -1318,6 +1331,7 @@ static int file_read(jas_stream_obj_t *obj, char *buf, int cnt) + return read(fileobj->fd, buf, cnt); + } + ++/* FIXME integral type */ + static int file_write(jas_stream_obj_t *obj, char *buf, int cnt) + { + jas_stream_fileobj_t *fileobj; +@@ -1326,6 +1340,7 @@ static int file_write(jas_stream_obj_t *obj, char *buf, int cnt) + return write(fileobj->fd, buf, cnt); + } + ++/* FIXME integral type */ + static long file_seek(jas_stream_obj_t *obj, long offset, int origin) + { + jas_stream_fileobj_t *fileobj; +@@ -1352,6 +1367,7 @@ static int file_close(jas_stream_obj_t *obj) + * Stdio file stream object. + \******************************************************************************/ + ++/* FIXME integral type */ + static int sfile_read(jas_stream_obj_t *obj, char *buf, int cnt) + { + FILE *fp; +@@ -1367,6 +1383,7 @@ static int sfile_read(jas_stream_obj_t *obj, char *buf, int cnt) + return result; + } + ++/* FIXME integral type */ + static int sfile_write(jas_stream_obj_t *obj, char *buf, int cnt) + { + FILE *fp; +@@ -1377,6 +1394,7 @@ static int sfile_write(jas_stream_obj_t *obj, char *buf, int cnt) + return (n != JAS_CAST(size_t, cnt)) ? (-1) : cnt; + } + ++/* FIXME integral type */ + static long sfile_seek(jas_stream_obj_t *obj, long offset, int origin) + { + FILE *fp; +diff --git a/src/libjasper/jp2/jp2_cod.c b/src/libjasper/jp2/jp2_cod.c +index 7f3608a..8d98a2c 100644 +--- a/src/libjasper/jp2/jp2_cod.c ++++ b/src/libjasper/jp2/jp2_cod.c +@@ -183,15 +183,28 @@ jp2_boxinfo_t jp2_boxinfo_unk = { + * Box constructor. + \******************************************************************************/ + +-jp2_box_t *jp2_box_create(int type) ++jp2_box_t *jp2_box_create0() + { + jp2_box_t *box; +- jp2_boxinfo_t *boxinfo; +- + if (!(box = jas_malloc(sizeof(jp2_box_t)))) { + return 0; + } + memset(box, 0, sizeof(jp2_box_t)); ++ box->type = 0; ++ box->len = 0; ++ // Mark the box data as never having been constructed ++ // so that we will not errantly attempt to destroy it later. ++ box->ops = &jp2_boxinfo_unk.ops; ++ return box; ++} ++ ++jp2_box_t *jp2_box_create(int type) ++{ ++ jp2_box_t *box; ++ jp2_boxinfo_t *boxinfo; ++ if (!(box = jp2_box_create0())) { ++ return 0; ++ } + box->type = type; + box->len = 0; + if (!(boxinfo = jp2_boxinfolookup(type))) { +@@ -248,14 +261,9 @@ jp2_box_t *jp2_box_get(jas_stream_t *in) + box = 0; + tmpstream = 0; + +- if (!(box = jas_malloc(sizeof(jp2_box_t)))) { ++ if (!(box = jp2_box_create0())) { + goto error; + } +- +- // Mark the box data as never having been constructed +- // so that we will not errantly attempt to destroy it later. +- box->ops = &jp2_boxinfo_unk.ops; +- + if (jp2_getuint32(in, &len) || jp2_getuint32(in, &box->type)) { + goto error; + } +@@ -263,10 +271,12 @@ jp2_box_t *jp2_box_get(jas_stream_t *in) + box->info = boxinfo; + box->len = len; + JAS_DBGLOG(10, ( +- "preliminary processing of JP2 box: type=%c%s%c (0x%08x); length=%d\n", ++ "preliminary processing of JP2 box: " ++ "type=%c%s%c (0x%08x); length=%"PRIuFAST32"\n", + '"', boxinfo->name, '"', box->type, box->len + )); + if (box->len == 1) { ++ JAS_DBGLOG(10, ("big length\n")); + if (jp2_getuint64(in, &extlen)) { + goto error; + } +@@ -382,6 +392,7 @@ static int jp2_bpcc_getdata(jp2_box_t *box, jas_stream_t *in) + { + jp2_bpcc_t *bpcc = &box->data.bpcc; + unsigned int i; ++ bpcc->bpcs = 0; + bpcc->numcmpts = box->datalen; + if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) { + return -1; +@@ -462,6 +473,7 @@ static int jp2_cdef_getdata(jp2_box_t *box, jas_stream_t *in) + jp2_cdef_t *cdef = &box->data.cdef; + jp2_cdefchan_t *chan; + unsigned int channo; ++ cdef->ents = 0; + if (jp2_getuint16(in, &cdef->numchans)) { + return -1; + } +@@ -518,7 +530,9 @@ int jp2_box_put(jp2_box_t *box, jas_stream_t *out) + } + + if (dataflag) { +- if (jas_stream_copy(out, tmpstream, box->len - JP2_BOX_HDRLEN(false))) { ++ if (jas_stream_copy(out, tmpstream, box->len - ++ JP2_BOX_HDRLEN(false))) { ++ jas_eprintf("cannot copy box data\n"); + goto error; + } + jas_stream_close(tmpstream); +@@ -777,6 +791,7 @@ static int jp2_cmap_getdata(jp2_box_t *box, jas_stream_t *in) + jp2_cmap_t *cmap = &box->data.cmap; + jp2_cmapent_t *ent; + unsigned int i; ++ cmap->ents = 0; + + cmap->numchans = (box->datalen) / 4; + if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) { +@@ -835,6 +850,7 @@ static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in) + int_fast32_t x; + + pclr->lutdata = 0; ++ pclr->bpc = 0; + + if (jp2_getuint16(in, &pclr->numlutents) || + jp2_getuint8(in, &pclr->numchans)) { +@@ -869,9 +885,9 @@ static int jp2_pclr_putdata(jp2_box_t *box, jas_stream_t *out) + #if 0 + jp2_pclr_t *pclr = &box->data.pclr; + #endif +-/* Eliminate warning about unused variable. */ +-box = 0; +-out = 0; ++ /* Eliminate warning about unused variable. */ ++ box = 0; ++ out = 0; + return -1; + } + +-- +2.11.0 + From 604b463d534943701024d7878dd2017c45ed5088 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 14 Mar 2017 23:58:22 +0100 Subject: [PATCH 2832/3392] jasper: add upstream security fix Fixes a NULL Pointer Dereference jp2_encode: https://github.com/mdadams/jasper/issues/120 No CVE assigned yet. Signed-off-by: Peter Korsgaard (cherry picked from commit 76da579431a78875afeaeda76e459aca69e85d36) Signed-off-by: Peter Korsgaard --- ...-the-JP2-encoder-to-ensure-that-the-.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/jasper/0003-Added-a-check-in-the-JP2-encoder-to-ensure-that-the-.patch diff --git a/package/jasper/0003-Added-a-check-in-the-JP2-encoder-to-ensure-that-the-.patch b/package/jasper/0003-Added-a-check-in-the-JP2-encoder-to-ensure-that-the-.patch new file mode 100644 index 0000000000..16a3e75bf1 --- /dev/null +++ b/package/jasper/0003-Added-a-check-in-the-JP2-encoder-to-ensure-that-the-.patch @@ -0,0 +1,30 @@ +From 58ba0365d911b9f9dd68e9abf826682c0b4f2293 Mon Sep 17 00:00:00 2001 +From: Michael Adams +Date: Mon, 6 Mar 2017 08:06:54 -0800 +Subject: [PATCH] Added a check in the JP2 encoder to ensure that the image to + be coded has at least one component. + +Signed-off-by: Peter Korsgaard +--- + src/libjasper/jp2/jp2_enc.c | 5 +++++ + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/libjasper/jp2/jp2_enc.c b/src/libjasper/jp2/jp2_enc.c +index 9a5e106..af4d9a4 100644 +--- a/src/libjasper/jp2/jp2_enc.c ++++ b/src/libjasper/jp2/jp2_enc.c +@@ -115,6 +115,11 @@ int jp2_encode(jas_image_t *image, jas_stream_t *out, const char *optstr) + iccstream = 0; + iccprof = 0; + ++ if (jas_image_numcmpts(image) < 1) { ++ jas_eprintf("image must have at least one component\n"); ++ goto error; ++ } ++ + allcmptssame = 1; + sgnd = jas_image_cmptsgnd(image, 0); + prec = jas_image_cmptprec(image, 0); +-- +2.11.0 + From f2e01f9c189b3d04cae85c72263c88d49c171b8d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 15 Mar 2017 11:48:32 +0100 Subject: [PATCH 2833/3392] mariadb: security bump to version 10.1.22 Fixes: CVE-2017-3302 - C client library for MySQL (libmysqlclient.so) has use-after-free defect which can cause crash of applications using that MySQL client. CVE-2017-3313 - Difficult to exploit vulnerability allows low privileged attacker with logon to the infrastructure where MySQL Server executes to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized access to critical data or complete access to all MySQL Server accessible data. And a number of important, but non-security related fixes: MDEV-11842: Fix a 10.1.21 regression with failed INSERT, BEFORE INSERT triggers, and columns with no default value MDEV-12075: Fix a 10.1.21 regression in the InnoDB data file extension code For details, see the release notes: https://mariadb.com/kb/en/mariadb/mariadb-10122-release-notes/ Signed-off-by: Peter Korsgaard (cherry picked from commit 467b38892aa23927ad1140119f0f17c23e896e7e) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 7 ++----- package/mariadb/mariadb.mk | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 3d6520f342..afcf37803d 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,5 +1,2 @@ -# From https://downloads.mariadb.org/mariadb/10.1.21/ -sha1 f9ccaa9881b98eeef68f4dbcf5ab9653c903819f mariadb-10.1.21.tar.gz - -# Locally computed -sha256 5a816355781ea22a6c65a436d8162f19bd292ec90e2b7d9499c031ae4a659490 mariadb-10.1.21.tar.gz +# From https://downloads.mariadb.org/mariadb/10.1.22/ +sha256 bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce mariadb-10.1.22.tar.gz diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index aa4afc5b5c..8c7375a3ae 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.1.21 +MARIADB_VERSION = 10.1.22 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library) MARIADB_LICENSE_FILES = README COPYING COPYING.LESSER From bae94a6e65449729a1c73dc38698e11379b645d6 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Mar 2017 15:08:36 -0300 Subject: [PATCH 2834/3392] mbedtls: security bump to verison 2.4.2 Fixes: CVE-2017-2784 - Freeing of memory allocated on stack when validating a public key with a secp224k1 curve. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard (cherry picked from commit 465ce2ea73cc1d98972cde45114f7b0e35e32ff2) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 4 ++-- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 5f9786c292..70a0dc506d 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,2 +1,2 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.3.0-2.1.5-and-1.3.17-released -sha256 c1c3559ed39f7a1b1550c4cf4ccb918bf239301a3311d98dda92bed8a25b7f0d mbedtls-2.4.0-apache.tgz +# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.4.2-2.1.7-and-1.3.19-released +sha256 17dd98af7478aadacc480c7e4159e447353b5b2037c1b6d48ed4fd157fb1b018 mbedtls-2.4.2-apache.tgz diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 198879da4d..a571ed0e52 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -5,7 +5,7 @@ ################################################################################ MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.4.0 +MBEDTLS_VERSION = 2.4.2 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From 8cd0e35189346419b4ca60f275f8663de21877c2 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Thu, 16 Mar 2017 17:24:01 +0530 Subject: [PATCH 2835/3392] taglib: update homepage link Avoid redirect. Signed-off-by: Rahul Bedarkar Signed-off-by: Peter Korsgaard (cherry picked from commit a411212d22cb84b92201b5a02ef8b860b0a17280) Signed-off-by: Peter Korsgaard --- package/taglib/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/taglib/Config.in b/package/taglib/Config.in index 6521d48c60..a95f332a46 100644 --- a/package/taglib/Config.in +++ b/package/taglib/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_TAGLIB and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files. - http://taglib.github.com + http://taglib.org/ if BR2_PACKAGE_TAGLIB From fd28c44ce87b7480a24e596f7a34e3d30e577333 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 16 Mar 2017 20:41:23 +0200 Subject: [PATCH 2836/3392] tcpreplay: patch security issue Add upstream patch for CVE-2017-6429: Buffer overflow when reading crafted pcap file with large packets. https://github.com/appneta/tcpreplay/issues/278 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 62bf2bfd53885fbd62a8e9345c7f3d7a4d619342) Signed-off-by: Peter Korsgaard --- ...ure-has-a-packet-that-is-too-large-2.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch diff --git a/package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch b/package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch new file mode 100644 index 0000000000..233b6d959f --- /dev/null +++ b/package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch @@ -0,0 +1,44 @@ +From d689d14dbcd768c028eab2fb378d849e543dcfe9 Mon Sep 17 00:00:00 2001 +From: Fred Klassen +Date: Sun, 26 Feb 2017 20:45:59 -0800 +Subject: [PATCH] #278 fail if capture has a packet that is too large (#286) + +* #278 fail if capture has a packet that is too large + +[baruch: remove the CHANGELOG update] +Signed-off-by: Baruch Siach +--- +Upstream status: upstream commit d689d14db + +diff --git a/src/tcpcapinfo.c b/src/tcpcapinfo.c +index 775f1625b00f..96928820fe94 100644 +--- a/src/tcpcapinfo.c ++++ b/src/tcpcapinfo.c +@@ -281,6 +281,15 @@ main(int argc, char *argv[]) + caplen = pcap_ph.caplen; + } + ++ if (caplentoobig) { ++ printf("\n\nCapture file appears to be damaged or corrupt.\n" ++ "Contains packet of size %u, bigger than snap length %u\n", ++ caplen, pcap_fh.snaplen); ++ ++ close(fd); ++ break; ++ } ++ + /* check to make sure timestamps don't go backwards */ + if (last_sec > 0 && last_usec > 0) { + if ((pcap_ph.ts.tv_sec == last_sec) ? +@@ -306,7 +315,7 @@ main(int argc, char *argv[]) + } + + close(fd); +- continue; ++ break; + } + + /* print the frame checksum */ +-- +2.11.0 + From 2a778d53fa6bf7c232ad57eedbd0fd9bf7328c84 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 17 Mar 2017 00:02:06 +0100 Subject: [PATCH 2837/3392] package/cairo: update license information As noticed by Rahul Bedarkar, the cairo library is LGPLv2.1 only (not LGPLv2.1+) or MPLv1.1. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 0768932a0229b2c201c292023f59a868ecdb1222) Signed-off-by: Peter Korsgaard --- package/cairo/cairo.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 761c6f4df2..ac91a56ff9 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -6,8 +6,8 @@ CAIRO_VERSION = 1.14.8 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz -CAIRO_LICENSE = LGPLv2.1+ -CAIRO_LICENSE_FILES = COPYING +CAIRO_LICENSE = LGPLv2.1 or MPLv1.1 (library) +CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES CAIRO_AUTORECONF = YES From 3e386020722b85aaf89b9dccc0263905763c8d08 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 16 Mar 2017 16:31:46 +0100 Subject: [PATCH 2838/3392] xlib_libXv: correct license info The license is actually closer to ISC than MIT, E.G.: https://opensource.org/licenses/ISC vs https://opensource.org/licenses/MIT >From COPYING: Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. E.G. this is very similar to the normal ISC text which has been extended with a BSD-3c style advertisinc clause. Both are permissive licenses, but it is more correct to call it ISC-like. Notice: As pointed out by Rahul Bedarkar, this may actually be more closely related to the OpenBSD template license: http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/share/misc/license.template?rev=HEAD But that is also based on the ISC license, so calling it ISC-like is still correct. Signed-off-by: Peter Korsgaard (cherry picked from commit aad15918520391ea0952d742db9c52c3ac2b1f7e) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXv/xlib_libXv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk index 26f8badc5c..0e02439fa8 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.mk +++ b/package/x11r7/xlib_libXv/xlib_libXv.mk @@ -7,7 +7,7 @@ XLIB_LIBXV_VERSION = 1.0.11 XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2 XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXV_LICENSE = MIT +XLIB_LIBXV_LICENSE = ISC-like XLIB_LIBXV_LICENSE_FILES = COPYING XLIB_LIBXV_INSTALL_STAGING = YES XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto From c7c5c7e5f6837bd47fb95d2df96726aeacbaf28f Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 17 Mar 2017 17:06:14 +0100 Subject: [PATCH 2839/3392] acl: make sure build picks up TARGET_CFLAGS The acl build system doesn't use automake, therefore it is broken. It doesn't use the CFLAGS passed by configure. Work around this by passing CFLAGS in the environment. The makefiles append to CFLAGS, so this works. This issue hasn't led to build failures, but it is visible e.g. when stack protector is enabled: the stack protector options are not applied to acl. Also debug and optimisation options aren't applied. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 99c9b0affde4fcc3270425319b98a0e5e32f5964) Signed-off-by: Peter Korsgaard --- package/acl/acl.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/acl/acl.mk b/package/acl/acl.mk index cbe5e93961..9fd5de18a4 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -15,7 +15,13 @@ ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL # While the configuration system uses autoconf, the Makefiles are # hand-written and do not use automake. Therefore, we have to hack -# around their deficiencies by passing installation paths. +# around their deficiencies by: +# - explicitly passing CFLAGS (LDFLAGS are passed on from configure, +# CFLAGS are not). +# - explicitly passing the installation prefix, not using DESTDIR. + +ACL_MAKE_ENV = CFLAGS="$(TARGET_CFLAGS)" + ACL_INSTALL_STAGING_OPTS = \ prefix=$(STAGING_DIR)/usr \ exec_prefix=$(STAGING_DIR)/usr \ From f6ba4399324396d690d95a2b1a11d87a4ffe173f Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 17 Mar 2017 17:06:15 +0100 Subject: [PATCH 2840/3392] acl: add host variant We need host-acl to fix issues with fakeroot. Unfortunately, all the hacks (except the .la fixup) have to be repeated. Cc: Yegor Yefremov Cc: Andreas Naumann Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit c83446fccace19694e20b1d0a730680244d724fe) Signed-off-by: Peter Korsgaard --- package/acl/acl.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/acl/acl.mk b/package/acl/acl.mk index 9fd5de18a4..e1462b60aa 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -43,4 +43,15 @@ endef ACL_POST_INSTALL_STAGING_HOOKS += ACL_FIX_LIBTOOL_LA_LIBDIR +HOST_ACL_DEPENDENCIES = host-attr +HOST_ACL_CONF_OPTS = --enable-gettext=no +HOST_ACL_MAKE_ENV = CFLAGS="$(HOST_CFLAGS)" +HOST_ACL_INSTALL_OPTS = \ + prefix=$(HOST_DIR)/usr \ + exec_prefix=$(HOST_DIR)/usr \ + PKG_DEVLIB_DIR=$(HOST_DIR)/usr/lib \ + install-dev install-lib +# For the host, libacl.la is correct, no fixup needed. + $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 74293a15bdfda83bb83f15f9dc459a54a6ab99f0 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 17 Mar 2017 17:06:16 +0100 Subject: [PATCH 2841/3392] fakeroot: depend on acl Recent versions of fakeroot have grown support for acl. We don't really need this since we don't use acls in Buildroot. However, it turns out that "cp -a" does something funky with acls, with the result that fakeroot without acl support looses the ownership and permissions on the copied file. "cp -a" may be (is even likely to be) used in a BR2_ROOTFS_POST_FAKEROOT_SCRIPT, so we need to support this. Note that host-acl itself depends on host-attr, so this pulls in two extra packages in each build. The impact on build time is about 10s. Cc: Andreas Naumann Cc: Maxime Hadjinlian Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit 2a222446b4614a38b4042df54b68b69b96939708) Signed-off-by: Peter Korsgaard --- package/fakeroot/fakeroot.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 168cd13a48..731b06a5f4 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -7,6 +7,8 @@ FAKEROOT_VERSION = 1.20.2 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2 FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot + +HOST_FAKEROOT_DEPENDENCIES = host-acl # Force capabilities detection off # For now these are process capabilities (faked) rather than file # so they're of no real use From 8c6080b06cee662b409e2256cee0570684170f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= Date: Fri, 17 Mar 2017 17:02:54 +0100 Subject: [PATCH 2842/3392] skeleton: fix permissions on /dev/pts/ptmx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this patch, it is not possible to allocate PTYs when a generated rootfs image with a recent glibc and systemd is launched as a container on an RHEL7 system via machinectl/systemd-nspawn. The container boots, but `machinectl login mycontainer` fails. The culprit is /dev/pts/ptmx with 0000 perms. On a typical system, there are two `ptmx` devices. One is provided by the devpts at /dev/pts/ptmx and it is typically not directly accessed from userspace. The other one which actually *is* opened by processes is /dev/ptmx. Kernel's documentation says these days that /dev/ptmx should be either a symlink, or a bind mount of the /dev/pts/ptmx from devpts. When a container is launched via machinectl/machined/systemd-nspawn, the container manager prepares a root filesystem so that the container can live in an appropriate namespace (this is similar to what initramfs is doing on x86 desktops). During these preparations, systemd-nspawn mounts a devpts instance using a correct ptmxmode=0666 within the container-to-be's /dev/pts, and it adds a compatibility symlink at /dev/ptmx. However, once systemd takes over as an init in the container, /lib/systemd/systemd-remount-fs applies mount options from /etc/fstab to all fileystems. Because the buildroot's template used to not include the ptmxmode=... option, a default value of 0000 was taking an effect which in turn led to not being able to allocate any pseudo-terminals. The relevant kernel option was introduced upstream in commit 1f8f1e29 back in 2009. The oldest linux-headers referenced from buildroot's config is 3.0, and that version definitely has that commit. Mount options that are not understood by the system are anyway ignored, so backward compatibility is preserved. Signed-off-by: Jan Kundrát Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: fix commit title, adjust commit log.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 8196b299ba12bd6741bf7f4462cad180dab77fb0) Signed-off-by: Peter Korsgaard --- system/skeleton/etc/fstab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/skeleton/etc/fstab b/system/skeleton/etc/fstab index 2b418a0eb6..169054b74f 100644 --- a/system/skeleton/etc/fstab +++ b/system/skeleton/etc/fstab @@ -1,7 +1,7 @@ # /dev/root / ext2 rw,noauto 0 1 proc /proc proc defaults 0 0 -devpts /dev/pts devpts defaults,gid=5,mode=620 0 0 +devpts /dev/pts devpts defaults,gid=5,mode=620,ptmxmode=0666 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /tmp tmpfs mode=1777 0 0 tmpfs /run tmpfs mode=0755,nosuid,nodev 0 0 From 55c742f83a563668caf4435526a780c80bdd6014 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 18 Mar 2017 11:21:42 -0300 Subject: [PATCH 2843/3392] linux-headers: bump 4.{4, 9, 10}.x series [Peter: drop 4.10.x update] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit f4978bf018d4f03834f879f3dfc4e8237846742e) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a848be6636..81ddc9df64 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.54" if BR2_KERNEL_HEADERS_4_4 + default "4.4.55" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.15" if BR2_KERNEL_HEADERS_4_9 + default "4.9.16" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 05bc9b0c339d3ed0830cff3e702cdccefcf2b068 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 20 Mar 2017 06:16:56 +0200 Subject: [PATCH 2844/3392] wget: add upstream security fix Fixes CVE-2017-6508: CRLF injection in the url_parse function in url.c http://lists.gnu.org/archive/html/bug-wget/2017-03/msg00018.html Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 7132fc9c11573a460243895c85e66b514b71c041) Signed-off-by: Peter Korsgaard --- ...Fix-CRLF-injection-in-Wget-host-part.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/wget/0001-Fix-CRLF-injection-in-Wget-host-part.patch diff --git a/package/wget/0001-Fix-CRLF-injection-in-Wget-host-part.patch b/package/wget/0001-Fix-CRLF-injection-in-Wget-host-part.patch new file mode 100644 index 0000000000..380b075244 --- /dev/null +++ b/package/wget/0001-Fix-CRLF-injection-in-Wget-host-part.patch @@ -0,0 +1,40 @@ +From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= +Date: Mon, 6 Mar 2017 10:04:22 +0100 +Subject: [PATCH] Fix CRLF injection in Wget host part + +* src/url.c (url_parse): Reject control characters in host part of URL + +Reported-by: Orange Tsai +Signed-off-by: Baruch Siach +--- +Patch status: upstream commit 4d729e322fae35 + + src/url.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/url.c b/src/url.c +index 8f8ff0b881af..7d36b27d7b92 100644 +--- a/src/url.c ++++ b/src/url.c +@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode) + url_unescape (u->host); + host_modified = true; + ++ /* check for invalid control characters in host name */ ++ for (p = u->host; *p; p++) ++ { ++ if (c_iscntrl(*p)) ++ { ++ url_free(u); ++ error_code = PE_INVALID_HOST_NAME; ++ goto error; ++ } ++ } ++ + /* Apply IDNA regardless of iri->utf8_encode status */ + if (opt.enable_iri && iri) + { +-- +2.11.0 + From eb021f3547a721d77de73789bd23a44c6e3ea8f7 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Mon, 20 Mar 2017 21:11:22 +0100 Subject: [PATCH 2845/3392] skalibs: fix endianness detection on x86 Update the patch for compile time endianness detection so it works on x86 platforms using GCC <= 4.4. Fixes: http://autobuild.buildroot.net/results/c2e8e1180571976b412cbba729c45a3698aea0b2 http://autobuild.buildroot.net/results/2ee47107d8a67470f7bc3e10cf763202d5455d17 Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni (cherry picked from commit 8eecaf2d122f7da6f59964f5eb00139a32373d06) Signed-off-by: Peter Korsgaard --- .../0001-No-runtime-tests-for-endianness.patch | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/package/skalibs/0001-No-runtime-tests-for-endianness.patch b/package/skalibs/0001-No-runtime-tests-for-endianness.patch index 4390d449dd..5f763c4261 100644 --- a/package/skalibs/0001-No-runtime-tests-for-endianness.patch +++ b/package/skalibs/0001-No-runtime-tests-for-endianness.patch @@ -1,6 +1,6 @@ -From 1e6f0b094c6ce6454be572704b866d2ce0962e59 Mon Sep 17 00:00:00 2001 +From 6754b208e7ec3bd1d4265db18fa4c0e7961a77bf Mon Sep 17 00:00:00 2001 From: Eric Le Bihan -Date: Sun, 4 Dec 2016 19:10:40 +0100 +Date: Mon, 20 Mar 2017 20:05:00 +0100 Subject: [PATCH] No runtime tests for endianness Replace build and execution of runtime test programs for determining @@ -12,8 +12,8 @@ Signed-off-by: Eric Le Bihan --- configure | 15 +++++++++++---- src/sysdeps/trybigendian.c | 16 ++++++++++++++++ - src/sysdeps/trylittleendian.c | 16 ++++++++++++++++ - 3 files changed, 43 insertions(+), 4 deletions(-) + src/sysdeps/trylittleendian.c | 19 +++++++++++++++++++ + 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 src/sysdeps/trybigendian.c create mode 100644 src/sysdeps/trylittleendian.c @@ -70,16 +70,19 @@ index 0000000..d857572 +} diff --git a/src/sysdeps/trylittleendian.c b/src/sysdeps/trylittleendian.c new file mode 100644 -index 0000000..eba065a +index 0000000..68b93c1 --- /dev/null +++ b/src/sysdeps/trylittleendian.c -@@ -0,0 +1,16 @@ +@@ -0,0 +1,19 @@ +#if defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN) || \ + defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \ + defined(__LITTLE_ENDIAN) || \ + defined(__ARMEL__) || \ + defined(__THUMBEL__) || \ + defined(__AARCH64EL__) || \ ++ defined(__i386) || defined(__i386__) || \ ++ defined(__amd64) || defined(__amd64__) || \ ++ defined(__x86_64) || defined(__x86_64__) || \ + defined(_MIPSEL) || defined(__MIPSEL) || defined(__MIPSEL__) +#define YEAH +#else @@ -91,5 +94,5 @@ index 0000000..eba065a + return 0; +} -- -2.5.5 +2.1.4 From b277a7f0db52b02f79a29a7816169abfefd51f91 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Mon, 20 Mar 2017 20:41:18 +0530 Subject: [PATCH 2846/3392] filemq: correct license All source files, except src/filemq_client.c and src/filemq_server.c, has MPL Version 2.0 license text in file header. As confirmed with upstream [1] (L)GPLv3 license texts COPYING and COPYING.LESSER are leftover from previous implementation. [1] - https://github.com/zeromq/filemq/issues/74 Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni (cherry picked from commit 205a0289d4a0aefc76b0c937c2f725517114c658) Signed-off-by: Peter Korsgaard --- package/filemq/filemq.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/filemq/filemq.mk b/package/filemq/filemq.mk index d57208ec72..62ddfaf42c 100644 --- a/package/filemq/filemq.mk +++ b/package/filemq/filemq.mk @@ -11,8 +11,8 @@ FILEMQ_AUTORECONF = YES FILEMQ_CONF_ENV = filemq_have_asciidoc=no FILEMQ_INSTALL_STAGING = YES FILEMQ_DEPENDENCIES = czmq openssl zeromq -FILEMQ_LICENSE = LGPLv3+ with exceptions -FILEMQ_LICENSE_FILES = COPYING COPYING.LESSER +FILEMQ_LICENSE = MPLv2.0 +FILEMQ_LICENSE_FILES = LICENSE define FILEMQ_CREATE_CONFIG_DIR mkdir -p $(@D)/config From 51038b08eebee72d89ec7871d1ffe5c84abb2b9f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 19 Mar 2017 21:51:53 +0100 Subject: [PATCH 2847/3392] package/mesa3d: add lm-sensors optional dependency radeon-pci-0008 Adapter: PCI adapter temp1: +56.0 C (crit = +120.0 C, hyst = +90.0 C) Signed-off-by: Romain Naour Cc: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 73401587e5984397bedddab61ad6c89712041267) Signed-off-by: Peter Korsgaard --- package/mesa3d/mesa3d.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 0c68dedfda..bf2ab6e4de 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -177,6 +177,13 @@ else MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2 endif +ifeq ($(BR2_PACKAGE_LM_SENSORS),y) +MESA3D_CONF_OPTS += --enable-lmsensors +MESA3D_DEPENDENCIES += lm-sensors +else +MESA3D_CONF_OPTS += --disable-lmsensors +endif + # Avoid automatic search of llvm-config MESA3D_CONF_OPTS += --with-llvm-prefix=$(STAGING_DIR)/usr/bin From 1c1b702a466023f8826cfb6a386e9b4683880875 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 10 Mar 2017 20:54:54 +0100 Subject: [PATCH 2848/3392] libxkbcommon: disable wayland support Disable wayland support (only needed for the interactive-wayland test program). This fixes a compile failure in case wayland support is autodetected: GEN xdg-shell-unstable-v5-protocol.c /bin/sh: /usr/bin/wayland-scanner: No such file or directory Makefile:2426: recipe for target 'xdg-shell-unstable-v5-protocol.c' failed make[3]: *** [xdg-shell-unstable-v5-protocol.c] Error 127 make[3]: *** Waiting for unfinished jobs.... GEN xdg-shell-unstable-v5-client-protocol.h /bin/sh: /usr/bin/wayland-scanner: No such file or directory Makefile:2428: recipe for target 'xdg-shell-unstable-v5-client-protocol.h' failed make[3]: *** [xdg-shell-unstable-v5-client-protocol.h] Error 127 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 7665b5870995ef059d1654c35557b53c04a71d1d) Signed-off-by: Peter Korsgaard --- package/libxkbcommon/libxkbcommon.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index c39a7c0c55..601181446d 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -11,6 +11,7 @@ LIBXKBCOMMON_LICENSE = MIT/X11 LIBXKBCOMMON_LICENSE_FILES = LICENSE LIBXKBCOMMON_INSTALL_STAGING = YES LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex +LIBXKBCOMMON_CONF_OPTS = --disable-wayland # uses C99 features LIBXKBCOMMON_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" From dc9ecb90c58908ffa0d896d4da5b1d4b917253c7 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 6 Mar 2017 21:43:47 +0100 Subject: [PATCH 2849/3392] gst1-plugins-bad: waylandsink needs wayland-protocols Signed-off-by: Peter Seiderer ---- Changes v1 -> v2: - use select instead of depends for BR2_PACKAGE_WAYLAND_PROTOCOLS (suggested by Thomas Petazzoni) - add select BR2_PACKAGE_WAYLAND_PROTOCOLS to missing second place (BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND) Signed-off-by: Thomas Petazzoni (cherry picked from commit 5a2d37ca125c1742864af0e9324234f8f3ecc071) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 2 ++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 6bec362db0..1db51877d4 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -112,6 +112,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND default y depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL depends on BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW comment "wayland needs the egl platform and the wayland package" @@ -686,6 +687,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND bool "wayland" depends on BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS default y help Wayland Video Sink diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 00add02af9..c6a151a626 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -121,7 +121,7 @@ endif ifneq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND)$(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),) GST1_PLUGINS_BAD_CONF_OPTS += --enable-wayland -GST1_PLUGINS_BAD_DEPENDENCIES += wayland +GST1_PLUGINS_BAD_DEPENDENCIES += wayland wayland-protocols else GST1_PLUGINS_BAD_CONF_OPTS += --disable-wayland endif From df0c78d61e142781b6da3d0cf789b8b7b1ae3055 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 21 Mar 2017 15:11:22 +0200 Subject: [PATCH 2850/3392] openssh: security bump to version 7.5 From the release notes (https://www.openssh.com/txt/release-7.5): Security -------- * ssh(1), sshd(8): Fix weakness in CBC padding oracle countermeasures that allowed a variant of the attack fixed in OpenSSH 7.3 to proceed. Note that the OpenSSH client disables CBC ciphers by default, sshd offers them as lowest-preference options and will remove them by default entriely in the next release. Reported by Jean Paul Degabriele, Kenny Paterson, Martin Albrecht and Torben Hansen of Royal Holloway, University of London. * sftp-client(1): [portable OpenSSH only] On Cygwin, a client making a recursive file transfer could be maniuplated by a hostile server to perform a path-traversal attack. creating or modifying files outside of the intended target directory. Reported by Jann Horn of Google Project Zero. [Peter: mention security fixes] Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 2204f4deb1c6c6ff4accd84b5aa2d42f5930b730) Signed-off-by: Peter Korsgaard --- package/openssh/openssh.hash | 5 ++--- package/openssh/openssh.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 09010d3b29..3685bc0dbf 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,3 +1,2 @@ -# Locally calculated after checking pgp signature -# Also from http://www.openssh.com/txt/release-7.4 -sha256 1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1 openssh-7.4p1.tar.gz +# From http://www.openssh.com/txt/release-7.5 (base64 encoded) +sha256 9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 openssh-7.5p1.tar.gz diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ce37ee7ff2..ba48770afc 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION = 7.4p1 +OPENSSH_VERSION = 7.5p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3c, BSD-2c, Public Domain OPENSSH_LICENSE_FILES = LICENCE From 2239406dc1820c1b9958f559737abc9d904d5142 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 13 Mar 2017 11:43:50 +0000 Subject: [PATCH 2851/3392] memcached: bump version to 1.4.35 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 36cabc5a744d97090784a29a4001a994728e0539) Signed-off-by: Peter Korsgaard --- package/memcached/memcached.hash | 6 +++--- package/memcached/memcached.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 11cac3a590..3876a08d47 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,4 +1,4 @@ -# From http://www.memcached.org/files/memcached-1.4.34.tar.gz.sha1 -sha1 7c7214f5183c6e20c22b243e21ed1ffddb91497e memcached-1.4.34.tar.gz +# From http://www.memcached.org/files/memcached-1.4.35.tar.gz.sha1 +sha1 787991c0df75defbb91518c9796f8244852a018a memcached-1.4.35.tar.gz # Calculated based on the hash above -sha256 5064c87f91a37d822dfeab8768490c55fe686a742f07f67c7121101e48d87c79 memcached-1.4.34.tar.gz +sha256 f4815ac95aa06c0f360052a0a12010533b2b78c3bfe475b171606c1b61469476 memcached-1.4.35.tar.gz diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index caebe0289f..83d4d59287 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.4.34 +MEMCACHED_VERSION = 1.4.35 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From 22dd05433e0e0309628489b983569d2d47c57341 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 21 Mar 2017 15:40:08 +0000 Subject: [PATCH 2852/3392] memcached: bump version to 1.4.36 From the release notes (https://github.com/memcached/memcached/wiki/ReleaseNotes1436): Important bug fix that could lead to a hung slab mover. Also improves memory efficiency of chunked items. [Peter: add release notes link / mention important bug fix] Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit adfe049d85b09a2ce780ce49f8e53d9cfaf90e2d) Signed-off-by: Peter Korsgaard --- package/memcached/memcached.hash | 6 +++--- package/memcached/memcached.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 3876a08d47..f9f68d5309 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,4 +1,4 @@ -# From http://www.memcached.org/files/memcached-1.4.35.tar.gz.sha1 -sha1 787991c0df75defbb91518c9796f8244852a018a memcached-1.4.35.tar.gz +# From http://www.memcached.org/files/memcached-1.4.36.tar.gz.sha1 +sha1 519b417515206b0b95ff9bf14106a891f6a2252e memcached-1.4.36.tar.gz # Calculated based on the hash above -sha256 f4815ac95aa06c0f360052a0a12010533b2b78c3bfe475b171606c1b61469476 memcached-1.4.35.tar.gz +sha256 773b6bb20bf80223ca6a15d75f570fbab346ad11ec98595e5af5e33f54bd82d8 memcached-1.4.36.tar.gz diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 83d4d59287..4de1bf64b3 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.4.35 +MEMCACHED_VERSION = 1.4.36 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' From 3b9349e3cb8804bf3f1d2de3823f58371e735ab9 Mon Sep 17 00:00:00 2001 From: Julien Beraud Date: Tue, 21 Mar 2017 14:23:56 +0100 Subject: [PATCH 2853/3392] apr: fix size of pid_t pid_t is a signed 32bits integer on both 32bits and 64bits architectures. This fixes an issue with apache server which causes bad pid to be written in PidFile Signed-off-by: Julien Beraud Signed-off-by: Thomas Petazzoni (cherry picked from commit ee8cbc5fca779ff054a50ed8e6271952367147c7) Signed-off-by: Peter Korsgaard --- package/apr/apr.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apr/apr.mk b/package/apr/apr.mk index 361a79f99b..f09f94368c 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -22,6 +22,7 @@ APR_CONF_ENV = \ apr_cv_mutex_robust_shared=no \ apr_cv_tcp_nodelay_with_cork=yes \ ac_cv_sizeof_struct_iovec=8 \ + ac_cv_sizeof_pid_t=4 \ ac_cv_struct_rlimit=yes \ ac_cv_o_nonblock_inherited=no \ apr_cv_mutex_recursive=yes From 55a23407aff9ab0b3e3c72b7c5fd6c8873a910d2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 21 Mar 2017 22:33:59 +0100 Subject: [PATCH 2854/3392] package/dbus-cpp: fix cross-compilation dbus-cpp has an ugly hack to not cross-build the tools when it detects cross-compilation. However, we already have a host variant that builds those tools (and we anyway don't seem to need them to begin with). Drop our patch that propagates the CXXFLAGS/LDFLAGS_FOR_BUILD. Replace with a patch to cross-compile the tools. Fixes: http://autobuild.buildroot.org/results/110/1100539caae6ef62c61a3b96bc54f7c0a215cc62/ and many, many more. Signed-off-by: "Yann E. MORIN" Cc: Gustavo Zacarias Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni (cherry picked from commit f5dbd0dea159393e779f6a1f5fa53b9fa07ff34a) Signed-off-by: Peter Korsgaard --- .../dbus-cpp/0002-cross-compile-tools.patch | 34 +++++++++++++++++++ .../0002-cxxflags-ldflags-for-build.patch | 32 ----------------- 2 files changed, 34 insertions(+), 32 deletions(-) create mode 100644 package/dbus-cpp/0002-cross-compile-tools.patch delete mode 100644 package/dbus-cpp/0002-cxxflags-ldflags-for-build.patch diff --git a/package/dbus-cpp/0002-cross-compile-tools.patch b/package/dbus-cpp/0002-cross-compile-tools.patch new file mode 100644 index 0000000000..39eff3147a --- /dev/null +++ b/package/dbus-cpp/0002-cross-compile-tools.patch @@ -0,0 +1,34 @@ +tools: just do proper cross-compile + +Those tools are not used during the build; besides, they are installed. + +So they don't need to not be cross-compiled. + +Signed-off-by: "Yann E. MORIN" + +--- +Upstream status: not submitted, upstream is dead. + +diff -durN dbus-cpp-0.9.0.orig/tools/Makefile.am dbus-cpp-0.9.0/tools/Makefile.am +--- dbus-cpp-0.9.0.orig/tools/Makefile.am 2017-03-21 21:48:57.013409423 +0100 ++++ dbus-cpp-0.9.0/tools/Makefile.am 2017-03-21 21:49:35.329979798 +0100 +@@ -1,7 +1,3 @@ +-# hacky, but ... +- +-CXX = $(CXX_FOR_BUILD) +- + AM_CPPFLAGS = \ + $(dbus_CFLAGS) \ + $(xml_CFLAGS) \ +@@ -9,11 +3,7 @@ + -I$(top_builddir)/include \ + -Wall + +-if CROSS_COMPILING +-libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la +-else + libdbus_cxx_la = $(top_builddir)/src/libdbus-c++-1.la +-endif + + bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect + diff --git a/package/dbus-cpp/0002-cxxflags-ldflags-for-build.patch b/package/dbus-cpp/0002-cxxflags-ldflags-for-build.patch deleted file mode 100644 index fefb9690d3..0000000000 --- a/package/dbus-cpp/0002-cxxflags-ldflags-for-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -Use CXXFLAGS_FOR_BUILD and LDFLAGS_FOR_BUILD for the tools since expat -may not be living in the default include & library path. - -Signed-off-by: Gustavo Zacarias - -diff -Nura libdbus-c++-0.9.0.orig/configure.ac libdbus-c++-0.9.0/configure.ac ---- libdbus-c++-0.9.0.orig/configure.ac 2014-01-05 15:28:03.653886567 -0300 -+++ libdbus-c++-0.9.0/configure.ac 2014-01-05 15:44:32.571172225 -0300 -@@ -65,7 +65,11 @@ - AC_PROG_CXX - - CXX_FOR_BUILD=${CXX_FOR_BUILD-${CXX}} -+CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} -+LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} - AC_SUBST(CXX_FOR_BUILD) -+AC_SUBST(CXXFLAGS_FOR_BUILD) -+AC_SUBST(LDFLAGS_FOR_BUILD) - - AM_PROG_LIBTOOL - -diff -Nura libdbus-c++-0.9.0.orig/tools/Makefile.am libdbus-c++-0.9.0/tools/Makefile.am ---- libdbus-c++-0.9.0.orig/tools/Makefile.am 2014-01-05 15:28:03.652886535 -0300 -+++ libdbus-c++-0.9.0/tools/Makefile.am 2014-01-05 15:44:42.071482390 -0300 -@@ -1,6 +1,8 @@ - # hacky, but ... - - CXX = $(CXX_FOR_BUILD) -+CXXFLAGS = $(CXXFLAGS_FOR_BUILD) -+LDFLAGS = $(LDFLAGS_FOR_BUILD) - - AM_CPPFLAGS = \ - $(dbus_CFLAGS) \ From eaadfab8e8c77d9b66b0b9b1215a6ebd0ca6307c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 21 Mar 2017 22:21:20 +0100 Subject: [PATCH 2855/3392] ltp-testsuite: disable Open POSIX testsuite The Open POSIX testsuite builds and installs to the target directory a program called 't0' that isn't cross-compiled, which is bad. Since the LTP build system is autoconf but not automake based, and the Open POSIX testsuite is a sort of sub-project inside it, fixing the issue is not trivial. Therefore, we simply disable the Open POSIX testsuite entirely. Oddly enough, --without-open-posix-testsuite doesn't work due to another bug, so we simply have to remove --with-open-posix-testsuite. Open POSIX testsuite cross-compilation issue reported at https://github.com/linux-test-project/ltp/issues/144. Configure script bug reported at https://github.com/linux-test-project/ltp/issues/143. Fixes: http://autobuild.buildroot.net/results/8326ba9eb257dfc92c1ad282ba6d3565e8250def/ Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit b57e1355a72da407c19315cb4187767d28e4d064) Signed-off-by: Peter Korsgaard --- package/ltp-testsuite/ltp-testsuite.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 9d82087f7f..29f374beda 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -9,8 +9,16 @@ 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+ LTP_TESTSUITE_LICENSE_FILES = COPYING + +# Do not enable Open POSIX testsuite as it doesn't cross-compile +# properly: t0 program is built for the host machine. Notice that due +# to a bug, --without-open-posix-testsuite actually enables the test +# suite. +# See https://github.com/linux-test-project/ltp/issues/143 (invalid +# autoconf test) and +# https://github.com/linux-test-project/ltp/issues/144 (Open POSIX +# testsuite not cross-compiling). LTP_TESTSUITE_CONF_OPTS += \ - --with-open-posix-testsuite \ --with-realtime-testsuite ifeq ($(BR2_LINUX_KERNEL),y) From ac75d32ae79aed38e003361503a601edad384d23 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 21 Mar 2017 09:22:33 +0100 Subject: [PATCH 2856/3392] graph-depends: rename pkgutil.py to brpkgutil.py pkgutil.py is also part of Python itself. Placing pkgutil.py as is in a folder with other scripts that require original pkgutil will break them. This is the case with scanpypi. So rename pkgutil.py to brpkgutil.py to avoid naming collision. Fixes: https://bugs.busybox.net/show_bug.cgi?id=9766 Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 3b627c89dc8adf8c60efd773935bf66004e8433d) Signed-off-by: Peter Korsgaard --- support/scripts/{pkgutil.py => brpkgutil.py} | 0 support/scripts/graph-depends | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename support/scripts/{pkgutil.py => brpkgutil.py} (100%) diff --git a/support/scripts/pkgutil.py b/support/scripts/brpkgutil.py similarity index 100% rename from support/scripts/pkgutil.py rename to support/scripts/brpkgutil.py diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index fbd5917053..b258c565b0 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -26,7 +26,7 @@ import subprocess import argparse from fnmatch import fnmatch -import pkgutil +import brpkgutil # Modes of operation: MODE_FULL = 1 # draw full dependency graph for all selected packages @@ -102,13 +102,13 @@ else: transitive = args.transitive if args.direct: - get_depends_func = pkgutil.get_depends + get_depends_func = brpkgutil.get_depends arrow_dir = "forward" else: if mode == MODE_FULL: sys.stderr.write("--reverse needs a package\n") sys.exit(1) - get_depends_func = pkgutil.get_rdepends + get_depends_func = brpkgutil.get_rdepends arrow_dir = "back" # Get the colours: we need exactly three colours, @@ -330,7 +330,7 @@ if check_only: sys.exit(0) dict_deps = remove_extra_deps(dict_deps) -dict_version = pkgutil.get_version([pkg for pkg in allpkgs +dict_version = brpkgutil.get_version([pkg for pkg in allpkgs if pkg != "all" and not pkg.startswith("root")]) # Print the attributes of a node: label and fill-color From e6b2152cd15bd8a9ed8a72c2ef2c07959839d46d Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Tue, 21 Mar 2017 01:06:57 +0100 Subject: [PATCH 2857/3392] download/git: create GNU format tar files On most distros, the tar format defaults to GNU. However, at build time the default format may be changed to posix. Also, future versions of tar will default to posix. Since we want the tarballs created by the git download method to be reproducible (so their hash can be checked), we should explicitly specify the format. Since existing tarballs on sources.buildroot.org use the GNU format, and also the existing hashes in the *.hash files are based on GNU format tarballs, we use the GNU format. In addition, the Posix format encodes atime and ctime as well as mtime, but tar offers no option like --mtime to override them. In the GNU format, atime and ctime are only encoded if the --incremental option is given. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 0f369a9231b2c67748f4f0c2dbb33ebdc2890478) Signed-off-by: Peter Korsgaard --- support/download/git | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/support/download/git b/support/download/git index 7921411835..056057c700 100755 --- a/support/download/git +++ b/support/download/git @@ -94,6 +94,8 @@ popd >/dev/null # Generate the archive, sort with the C locale so that it is reproducible find "${basename}" -not -type d >"${basename}.list" LC_ALL=C sort <"${basename}.list" >"${basename}.list.sorted" -tar cf - --numeric-owner --owner=0 --group=0 --mtime="${date}" \ +# Create GNU-format tarballs, since that's the format of the tarballs on +# sources.buildroot.org and used in the *.hash files +tar cf - --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ -T "${basename}.list.sorted" >"${output}.tar" gzip -n <"${output}.tar" >"${output}" From 2f426dadad24fa46909ed6504d19eb7ccbd55657 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Tue, 21 Mar 2017 01:06:59 +0100 Subject: [PATCH 2858/3392] fmc: correct hash file It had sha256sum instead of sha256. This wasn't noticed before since hashes for git downloads are not checked. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Matthew Weber Reviewed-by: Matthew Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit ba717fde72c862a283a035b3b44377bb48d08284) Signed-off-by: Peter Korsgaard --- package/fmc/fmc.hash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index 2402831855..13d9d77ee5 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,2 +1,2 @@ -# Locally Computed -sha256sum a91e0c9b7c7f238634c64a755c05671f33f2acdb6ae2d09cad4d683b364ee8e4 fmc-fsl-sdk-v2.0.tar.gz +# Locally calculated +sha256 a91e0c9b7c7f238634c64a755c05671f33f2acdb6ae2d09cad4d683b364ee8e4 fmc-fsl-sdk-v2.0.tar.gz From a2c0793636adaf44df268dc9a406d12a8bd42e7f Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Tue, 21 Mar 2017 01:07:00 +0100 Subject: [PATCH 2859/3392] linux-firmware: correct hash When linux-firmware was bumped to 6d3bc8886 in commit 3ff5896ff, a hash file was added but the hash was wrong. This wasn't noticed before since hashes are not checked for git downloads. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 0409b136985ff582d561076f03685da9890fa325) Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index e8ee2b72a1..164603947e 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 256378564e36b8f222adb8fbe746529e73413c6cbe2b0e5574f41dfd62d92577 linux-firmware-6d3bc8886517d171068fd1263176b8b5c51df204.tar.gz +sha256 1cd14477a392fe8c7c44e62623b85466df90ed72a55ae213b637e1c4335739fd linux-firmware-6d3bc8886517d171068fd1263176b8b5c51df204.tar.gz From 293f9d2f18d28e2f5f235ba4c94a6bb695ecf6c9 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Tue, 21 Mar 2017 01:07:01 +0100 Subject: [PATCH 2860/3392] squashfs: correct hash When squashfs was bumped to 3de1687d in commit ee90313c64, the hash file was not updated. This wasn't noticed before since hashes are not checked for git downloads. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni (cherry picked from commit 85c832247e40f00f48ac328970bb39ab7851f042) Signed-off-by: Peter Korsgaard --- package/squashfs/squashfs.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/squashfs/squashfs.hash b/package/squashfs/squashfs.hash index eb456be364..74fdb44354 100644 --- a/package/squashfs/squashfs.hash +++ b/package/squashfs/squashfs.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 e807202ab4dcfeea214df49d3a728b9a85644a7e7262fc6fcd875a0def99d4ed squashfs-9c1db6d13a51a2e009f0027ef336ce03624eac0d.tar.gz +sha256 2c49392816615b73bf5d6cdce9776cb66a01f5a1494b1d9af580667e32bab001 squashfs-3de1687d7432ea9b302c2db9521996f506c140a3.tar.gz From 13eec966adfdc6c7659bff0cb7fd27056c248127 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 22 Mar 2017 22:03:13 +0100 Subject: [PATCH 2861/3392] package/ntp: security bump to 4.2.8p10 Changed NTP_SITE to https to circumvent "URL transformed to HTTPS due to an HSTS policy" during download. For details about the bugs fixed see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities http://www.kb.cert.org/vuls/id/633847 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b47aec79d2e19ef7e3f04d2758c3a2930d47cebe) Signed-off-by: Peter Korsgaard --- package/ntp/ntp.hash | 6 +++--- package/ntp/ntp.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash index c6838d812f..d8b7083c47 100644 --- a/package/ntp/ntp.hash +++ b/package/ntp/ntp.hash @@ -1,4 +1,4 @@ -# From http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p9.tar.gz.md5 -md5 857452b05f5f2e033786f77ade1974ed ntp-4.2.8p9.tar.gz +# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p10.tar.gz.md5 +md5 745384ed0dedb3f66b33fe84d66466f9 ntp-4.2.8p10.tar.gz # Calculated based on the hash above -sha256 b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72 ntp-4.2.8p9.tar.gz +sha256 ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f ntp-4.2.8p10.tar.gz diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index edbf1c86b6..b6eb1b1863 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -5,8 +5,8 @@ ################################################################################ NTP_VERSION_MAJOR = 4.2 -NTP_VERSION = $(NTP_VERSION_MAJOR).8p9 -NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) +NTP_VERSION = $(NTP_VERSION_MAJOR).8p10 +NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent openssl $(if $(BR2_PACKAGE_BUSYBOX),busybox) NTP_LICENSE = ntp license NTP_LICENSE_FILES = COPYRIGHT From 5bc876f43b1954e0494b5f360c8e0f9ddc5624e4 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 22 Mar 2017 13:19:27 +0000 Subject: [PATCH 2862/3392] linux-headers: bump 3.{2, 12}.x and 4.{1, 4, 9, 10}.x series [Peter: drop 4.10.x update] Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 0d70d1dbf054f4a0609ba1076bc7e097305013d2) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 81ddc9df64..de55b04f52 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -214,15 +214,15 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.85" if BR2_KERNEL_HEADERS_3_2 + default "3.2.87" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 - default "3.12.71" if BR2_KERNEL_HEADERS_3_12 + default "3.12.72" if BR2_KERNEL_HEADERS_3_12 default "3.18.48" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.55" if BR2_KERNEL_HEADERS_4_4 + default "4.1.39" if BR2_KERNEL_HEADERS_4_1 + default "4.4.56" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.16" if BR2_KERNEL_HEADERS_4_9 + default "4.9.17" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 03316d1719645ea47aac6de3a29877345c5e0a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 24 Mar 2017 09:47:43 +0100 Subject: [PATCH 2863/3392] upmpdcli: add user to the audio group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit upmpdcli runs as user and group upmpdcli. In order to allow it to access the ALSA devices add it to the audio group. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni (cherry picked from commit ab9842e360ae08954b07504a20cd053fe146f383) Signed-off-by: Peter Korsgaard --- package/upmpdcli/upmpdcli.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 83efa0530b..a9b057d826 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -12,7 +12,7 @@ UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp # Upmpdcli only runs if user upmpdcli exists define UPMPDCLI_USERS - upmpdcli -1 upmpdcli -1 * - - - Upmpdcli MPD UPnP Renderer Front-End + upmpdcli -1 upmpdcli -1 * - - audio Upmpdcli MPD UPnP Renderer Front-End endef define UPMPDCLI_INSTALL_INIT_SYSV From 30a9181448690d01d3aad51d0c2458b0c5ec1761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 24 Mar 2017 08:53:21 +0100 Subject: [PATCH 2864/3392] busybox: fix mdev.conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mdev does not set "/dev/snd" and "/dev/input" group and permission propery, because with commit c3cf1e30a3022453311a7e9fe11d94c7a381640e (May 2013!) the behavior of mdev has changed. The device name is now taken directly from the uevent file and does no longer match the old rule. Fix the rules for "/dev/snd" and "/dev/input" according to the example given in [1]. [1] http://lists.busybox.net/pipermail/busybox/2015-February/082297.html Signed-off-by: Jörg Krause Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit afb585468b33c76d41686cb92e7f56565fe150e4) Signed-off-by: Peter Korsgaard --- package/busybox/mdev.conf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package/busybox/mdev.conf b/package/busybox/mdev.conf index 241c1c27df..eaece1b73e 100644 --- a/package/busybox/mdev.conf +++ b/package/busybox/mdev.conf @@ -23,17 +23,17 @@ ttyS[0-9]* root:root 660 ttyUSB[0-9]* root:root 660 # alsa sound devices -pcm.* root:audio 660 =snd/ -control.* root:audio 660 =snd/ -midi.* root:audio 660 =snd/ -seq root:audio 660 =snd/ -timer root:audio 660 =snd/ +snd/pcm.* root:audio 660 +snd/control.* root:audio 660 +snd/midi.* root:audio 660 +snd/seq root:audio 660 +snd/timer root:audio 660 # input stuff -event[0-9]+ root:root 640 =input/ -mice root:root 640 =input/ -mouse[0-9] root:root 640 =input/ -ts[0-9] root:root 600 =input/ +input/event[0-9]+ root:root 640 +input/mice root:root 640 +input/mouse[0-9] root:root 640 +input/ts[0-9] root:root 600 # load modules $MODALIAS=.* root:root 660 @modprobe "$MODALIAS" From ccf0e0767d6c73dd23852fad5de2900c6f88fd56 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 23 Mar 2017 20:37:00 +0100 Subject: [PATCH 2865/3392] package/ntp: fix build for toolchains without ssp ntp defaults to use ssp support http://bk1.ntp.org/ntp-stable/sntp/harden/README by using these flags http://bk1.ntp.org/ntp-stable/sntp/harden/linux If the toolchain lacks SSP support this patch forces ntp to use an empty set of flags: http://bk1.ntp.org/ntp-stable/sntp/harden/default Fixes http://autobuild.buildroot.net/results/1d5/1d58bd8745b22c8eb71fea4c7255d3ace69f6f7a/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 00968bcac0674250956e99b6fafbf9b373446488) Signed-off-by: Peter Korsgaard --- package/ntp/ntp.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index b6eb1b1863..e3e53a803f 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -23,6 +23,12 @@ NTP_CONF_OPTS = \ # 0002-ntp-syscalls-fallback.patch NTP_AUTORECONF = YES +ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) +NTP_CONF_OPTS += --with-locfile=linux +else +NTP_CONF_OPTS += --with-locfile=default +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) NTP_CONF_OPTS += --enable-linuxcaps NTP_DEPENDENCIES += libcap From 9d70c89b8029cef33a3abfa2ab98f1f68656c947 Mon Sep 17 00:00:00 2001 From: Rodrigo Rebello Date: Sun, 26 Mar 2017 03:36:53 -0300 Subject: [PATCH 2866/3392] slang: use correct ncurses config script name The ncurses config script can have different names depending on the configuration (e.g. wchar support enabled/disabled). So, use $(NCURSES_CONFIG_SCRIPTS) from the ncurses package as it contains the proper name. Fixes: http://autobuild.buildroot.net/results/c97554c05e121c76407be53ba37924cfcb658e9d/ http://autobuild.buildroot.net/results/b0a31a3491a30ee0d6e6e7dbba68a86f0e00943d/ http://autobuild.buildroot.net/results/a77241141cf8710fa945523ef62327798e3c4824/ [...] Signed-off-by: Rodrigo Rebello Signed-off-by: Thomas Petazzoni (cherry picked from commit b3e4ed92380080334d3d09bb4a53dc6102edd8aa) Signed-off-by: Peter Korsgaard --- package/slang/slang.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/slang/slang.mk b/package/slang/slang.mk index 9078bf293c..e6abdeebe8 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -40,7 +40,7 @@ endif ifeq ($(BR2_PACKAGE_NCURSES),y) SLANG_DEPENDENCIES += ncurses -SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/ncurses5-config +SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) else SLANG_CONF_OPTS += ac_cv_path_nc5config=no endif @@ -49,7 +49,7 @@ ifeq ($(BR2_PACKAGE_READLINE),y) SLANG_CONF_OPTS += --with-readline=gnu SLANG_DEPENDENCIES += readline ifeq ($(BR2_STATIC_LIBS),y) -SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/ncurses5-config --libs`" +SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) --libs`" endif endif From 3400806b9d555cf2f30154feeecd19221b8b52a0 Mon Sep 17 00:00:00 2001 From: Rodrigo Rebello Date: Sun, 26 Mar 2017 03:36:54 -0300 Subject: [PATCH 2867/3392] htop: use correct ncurses config script name The ncurses config script can have different names depending on the configuration (e.g. wchar support enabled/disabled). So, use $(NCURSES_CONFIG_SCRIPTS) from the ncurses package as it contains the proper name. Signed-off-by: Rodrigo Rebello Signed-off-by: Thomas Petazzoni (cherry picked from commit 8cd1554ee162f6344dab078233f4f6c0d93e7c24) Signed-off-by: Peter Korsgaard --- package/htop/htop.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 9451d159fa..dd3bed41b8 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -8,7 +8,7 @@ HTOP_VERSION = 2.0.2 HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses # Prevent htop build system from searching the host paths -HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/ncurses5-config +HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) HTOP_LICENSE = GPLv2 HTOP_LICENSE_FILES = COPYING From 2d7d618f7c8d53da9fb828ced4b445635ddb44c0 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 26 Mar 2017 10:49:43 -0300 Subject: [PATCH 2868/3392] linux-headers: bump 4.{4, 9, 10}.x series [Peter: drop 4.10.x update] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit b718c776ca1a5d204f2ae9a765331a32e87e9560) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index de55b04f52..ea08cc2fe6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.56" if BR2_KERNEL_HEADERS_4_4 + default "4.4.57" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.17" if BR2_KERNEL_HEADERS_4_9 + default "4.9.18" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 0b670f3879eaa1bc56b6eaeeed54f36aba831219 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Wed, 22 Mar 2017 23:18:50 +0530 Subject: [PATCH 2869/3392] dbus-glib: fix legal info dbus glib bindings are dual licensed under AFLv2.1 or GPLv2+. Separate licenses using 'or' keyword. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni (cherry picked from commit f70f0b497f8a072eb22aff0bd934467b706cffd8) Signed-off-by: Peter Korsgaard --- package/dbus-glib/dbus-glib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 4a1e4b40b7..5a6f5a0876 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -7,7 +7,7 @@ DBUS_GLIB_VERSION = 0.108 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib DBUS_GLIB_INSTALL_STAGING = YES -DBUS_GLIB_LICENSE = AFLv2.1, GPLv2+ +DBUS_GLIB_LICENSE = AFLv2.1 or GPLv2+ DBUS_GLIB_LICENSE_FILES = COPYING DBUS_GLIB_CONF_ENV = \ From c1be21ac128640dd600da2ad5840c74d72a799ee Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Wed, 22 Mar 2017 23:18:51 +0530 Subject: [PATCH 2870/3392] dbus-triggerd: add license file In absence of license file, use source file as a license file since it has license header in comments. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni (cherry picked from commit 50284570fbefa37c8874b47cd5998bd890e54632) Signed-off-by: Peter Korsgaard --- package/dbus-triggerd/dbus-triggerd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/dbus-triggerd/dbus-triggerd.mk b/package/dbus-triggerd/dbus-triggerd.mk index 48d5fb29fe..0d693b4814 100644 --- a/package/dbus-triggerd/dbus-triggerd.mk +++ b/package/dbus-triggerd/dbus-triggerd.mk @@ -7,6 +7,7 @@ DBUS_TRIGGERD_VERSION = ba3dbec805cb707c94c54de21666bf18b79bcc09 DBUS_TRIGGERD_SITE = git://rg42.org/dbustriggerd.git DBUS_TRIGGERD_LICENSE = GPLv2+ +DBUS_TRIGGERD_LICENSE_FILES = dbus-triggerd.c DBUS_TRIGGERD_DEPENDENCIES = host-pkgconf dbus define DBUS_TRIGGERD_BUILD_CMDS From 74ed2a833da74b33e0ad8c4fd77e789885b3a9fd Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Wed, 22 Mar 2017 23:18:52 +0530 Subject: [PATCH 2871/3392] taglib: fix legal info taglib is dual licensed under LGPLv2.1 or MPLv1.1. Almost all source files have license text mentioning LGPLv2.1 or alternatively MPLv1.1. Signed-off-by: Rahul Bedarkar [Thomas: use MPL-1.1 instead of MPLv1.1, since MPL-1.1 is the SPDX license code for this license.] Signed-off-by: Thomas Petazzoni (cherry picked from commit f30a3940c8dc5fc9bbe3a0ace457201808142183) Signed-off-by: Peter Korsgaard --- package/taglib/taglib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk index f47c4ba43f..58bb889f57 100644 --- a/package/taglib/taglib.mk +++ b/package/taglib/taglib.mk @@ -7,7 +7,7 @@ TAGLIB_VERSION = 1.11.1 TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES -TAGLIB_LICENSE = LGPLv2.1, MPL +TAGLIB_LICENSE = LGPLv2.1 or MPL-1.1 TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL ifeq ($(BR2_PACKAGE_ZLIB),y) From e29fa95b8368f9b85a1bfb2cef9741c6218c59b3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 28 Jan 2017 11:41:32 +0100 Subject: [PATCH 2872/3392] core/br2-external: properly report unexpected errors Unextected error in the br2-external script are properly caught, but they are not reported properly, and we end up in either of two situations: - the .br2-external.mk file is not generated, in which case make will try to find a rule to generate it (because the 'include' directive tries to generate missing files); - the .br-external.mk file is generated but does not contain the error variable, and thus the build might not get interrupted. We fix that by using a trap on the pseudo ERR signal, to emit the error variable on unexpected errors. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit c5fa9308ea4e3810a7f7d9d0df75cbf090c414c4) Signed-off-by: Peter Korsgaard --- support/scripts/br2-external | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 26bcac8aa1..7e816081a1 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -40,6 +40,9 @@ main() { exec >"${ofile}" + # Trap any unexpected error to generate a meaningful error message + trap "error 'unexpected error while generating ${ofile}\n'" ERR + do_validate ${@//:/ } do_${ofmt} From 119e94b830a14a2c82d11bf5dfc16b46ece06702 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 28 Mar 2017 17:18:08 +0200 Subject: [PATCH 2873/3392] samba4: security bump to version 4.5.7 Fixes CVE-2017-2619: All versions of Samba prior to 4.6.1, 4.5.7, 4.4.11 are vulnerable to a malicious client using a symlink race to allow access to areas of the server file system not exported under the share definition. Samba uses the realpath() system call to ensure when a client requests access to a pathname that it is under the exported share path on the server file system. Clients that have write access to the exported part of the file system via SMB1 unix extensions or NFS to create symlinks can race the server by renaming a realpath() checked path and then creating a symlink. If the client wins the race it can cause the server to access the new symlink target after the exported share path check has been done. This new symlink target can point to anywhere on the server file system. This is a difficult race to win, but theoretically possible. Note that the proof of concept code supplied wins the race reliably only when the server is slowed down using the strace utility running on the server. Exploitation of this bug has not been seen in the wild. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 493cedf3af061b90a899826e0c184c2f484414f6) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 2 +- package/samba4/samba4.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 4fec55dd60..71d24f7feb 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 bff02762b3e4ee030f02266c6e24a0b888248b387246219b7fbe3e1758ef2184 samba-4.5.5.tar.gz +sha256 ac70f09af80639d8189e1b9bc0a554841ee44df2b1ef58e7e682ad5400fd9400 samba-4.5.7.tar.gz diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index f64b684bf8..aa7cb576d2 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.5.5 +SAMBA4_VERSION = 4.5.7 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From d09c7e4d45261ef03277c9f46a07c81686f5e5bb Mon Sep 17 00:00:00 2001 From: Pawel Sikora Date: Mon, 27 Mar 2017 00:44:14 +0200 Subject: [PATCH 2874/3392] syslog-ng: Bump version header in conf file to 3.9 Package version of syslog-ng is 3.9.1. Bumping version number in syslog-ng.conf to 3.9 Fixing warning message about configuration file being too old. Signed-off-by: Pawel Sikora Signed-off-by: Thomas Petazzoni (cherry picked from commit 3dad25466d2931eeecde23867bed79b1d7213887) Signed-off-by: Peter Korsgaard --- package/syslog-ng/syslog-ng.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index 0b4a860cfa..a3384eebc3 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.7 +@version: 3.9 source s_sys { file("/proc/kmsg" program_override("kernel")); From 1244b189543a11f1d712caf12efb7ee8703eba97 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 26 Mar 2017 23:43:40 +0200 Subject: [PATCH 2875/3392] system: do not overwrite /bin/sh Busybox symlink The BR2_SYSTEM_BIN_SH hidden option defines to what binary the /bin/sh symlinks should point to. If busybox is chosen, then /bin/sh is created to point to /bin/busybox. This works fine with the default installation mode of Busybox, but it fails with the upcoming "individual binaries" mode, in which each applet is installed as its own binary, and /bin/busybox doesn't exist: we get /bin/sh as a broken symlink to /bin/busybox. Since Busybox already installs its own /bin/sh symlink, properly pointing to /bin/ash or /bin/hush depending on the selected shell, it doesn't make sense for the BR2_SYSTEM_BIN_SH logic to override this. Just let Busybox install its own /bin/sh by making BR2_SYSTEM_BIN_SH empty when Busybox shell is selected as /bin/sh. Signed-off-by: Thomas Petazzoni Reviewed-by: Matthew Weber Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit fc91501e6b32ef1b015ac9b0fbf6d64aa1ce0162) Signed-off-by: Peter Korsgaard --- package/skeleton/skeleton.mk | 2 ++ system/Config.in | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 1000161c34..9940944313 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -203,10 +203,12 @@ define SKELETON_BIN_SH rm -f $(TARGET_DIR)/bin/sh endef else +ifneq ($(SKELETON_TARGET_GENERIC_BIN_SH),) define SKELETON_BIN_SH ln -sf $(SKELETON_TARGET_GENERIC_BIN_SH) $(TARGET_DIR)/bin/sh endef endif +endif TARGET_FINALIZE_HOOKS += SKELETON_BIN_SH ifeq ($(BR2_TARGET_GENERIC_GETTY),y) diff --git a/system/Config.in b/system/Config.in index 3ddf8433d4..b47ae43844 100644 --- a/system/Config.in +++ b/system/Config.in @@ -298,7 +298,6 @@ endchoice # /bin/sh config BR2_SYSTEM_BIN_SH string - default "busybox" if BR2_SYSTEM_BIN_SH_BUSYBOX default "bash" if BR2_SYSTEM_BIN_SH_BASH default "dash" if BR2_SYSTEM_BIN_SH_DASH default "mksh" if BR2_SYSTEM_BIN_SH_MKSH From 40192c1aa1339514ec166ef1ffbf1657f47d8c86 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 30 Mar 2017 11:24:45 -0300 Subject: [PATCH 2876/3392] linux-headers: bump 4.{4, 9, 10}.x series [Peter: drop 4.10.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit c720701c4d3b23e35908319e6ade082c9e5a1433) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ea08cc2fe6..7ee1a575cc 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.57" if BR2_KERNEL_HEADERS_4_4 + default "4.4.58" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.18" if BR2_KERNEL_HEADERS_4_9 + default "4.9.19" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 9eb481bbfea238ee6c0b9258ef039a9a20a3dac4 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 31 Mar 2017 14:09:36 +0300 Subject: [PATCH 2877/3392] pcre: add upstream security fixes Take Debian adapted patches of upstream. Fixes: CVE-2017-6004: crafted regular expression may cause denial of service CVE-2017-7186: invalid Unicode property lookup may cause denial of service Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 3143910eec12a5b23e853b3177bf316ac186b87a) Signed-off-by: Peter Korsgaard --- package/pcre/0003-CVE-2017-6004.patch | 21 ++++++++++ package/pcre/0004-CVE-2017-7186.patch | 60 +++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 package/pcre/0003-CVE-2017-6004.patch create mode 100644 package/pcre/0004-CVE-2017-7186.patch diff --git a/package/pcre/0003-CVE-2017-6004.patch b/package/pcre/0003-CVE-2017-6004.patch new file mode 100644 index 0000000000..d0b6d51ba7 --- /dev/null +++ b/package/pcre/0003-CVE-2017-6004.patch @@ -0,0 +1,21 @@ +Description: CVE-2017-6004: crafted regular expression may cause denial of service +Origin: upstream, https://vcs.pcre.org/pcre/code/trunk/pcre_jit_compile.c?r1=1676&r2=1680&view=patch +Bug: https://bugs.exim.org/show_bug.cgi?id=2035 +Bug-Debian: https://bugs.debian.org/855405 +Forwarded: not-needed +Author: Salvatore Bonaccorso +Last-Update: 2017-02-17 + +Signed-off-by: Baruch Siach + +--- a/pcre_jit_compile.c ++++ b/pcre_jit_compile.c +@@ -8111,7 +8111,7 @@ if (opcode == OP_COND || opcode == OP_SC + + if (*matchingpath == OP_FAIL) + stacksize = 0; +- if (*matchingpath == OP_RREF) ++ else if (*matchingpath == OP_RREF) + { + stacksize = GET2(matchingpath, 1); + if (common->currententry == NULL) diff --git a/package/pcre/0004-CVE-2017-7186.patch b/package/pcre/0004-CVE-2017-7186.patch new file mode 100644 index 0000000000..980923ae4c --- /dev/null +++ b/package/pcre/0004-CVE-2017-7186.patch @@ -0,0 +1,60 @@ +Description: Upstream fix for CVE-2017-7186 (Upstream rev 1688) + Fix Unicode property crash for 32-bit characters greater than 0x10ffff. +Author: Matthew Vernon +X-Dgit-Generated: 2:8.39-3 c4c2c7c4f74d53b263af2471d8e11db88096bd13 + +Signed-off-by: Baruch Siach +--- + +--- pcre3-8.39.orig/pcre_internal.h ++++ pcre3-8.39/pcre_internal.h +@@ -2772,6 +2772,9 @@ extern const pcre_uint8 PRIV(ucd_stage1 + extern const pcre_uint16 PRIV(ucd_stage2)[]; + extern const pcre_uint32 PRIV(ucp_gentype)[]; + extern const pcre_uint32 PRIV(ucp_gbtable)[]; ++#ifdef COMPILE_PCRE32 ++extern const ucd_record PRIV(dummy_ucd_record)[]; ++#endif + #ifdef SUPPORT_JIT + extern const int PRIV(ucp_typerange)[]; + #endif +@@ -2780,9 +2783,15 @@ extern const int PRIV(ucp_typera + /* UCD access macros */ + + #define UCD_BLOCK_SIZE 128 +-#define GET_UCD(ch) (PRIV(ucd_records) + \ ++#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ + PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ + UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) ++ ++#ifdef COMPILE_PCRE32 ++#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) ++#else ++#define GET_UCD(ch) REAL_GET_UCD(ch) ++#endif + + #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype + #define UCD_SCRIPT(ch) GET_UCD(ch)->script +--- pcre3-8.39.orig/pcre_ucd.c ++++ pcre3-8.39/pcre_ucd.c +@@ -38,6 +38,20 @@ const pcre_uint16 PRIV(ucd_stage2)[] = { + const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0}; + #else + ++/* If the 32-bit library is run in non-32-bit mode, character values ++greater than 0x10ffff may be encountered. For these we set up a ++special record. */ ++ ++#ifdef COMPILE_PCRE32 ++const ucd_record PRIV(dummy_ucd_record)[] = {{ ++ ucp_Common, /* script */ ++ ucp_Cn, /* type unassigned */ ++ ucp_gbOther, /* grapheme break property */ ++ 0, /* case set */ ++ 0, /* other case */ ++ }}; ++#endif ++ + /* When recompiling tables with a new Unicode version, please check the + types in this structure definition from pcre_internal.h (the actual + field names will be different): From 4f533d049ae78647431a9384206b8fe8733b61d9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 30 Mar 2017 23:03:31 +0200 Subject: [PATCH 2878/3392] audiofile: add security patch for CVE-2017-6827 / CVE-2017-6828 / CVE-2017-6832 / CVE-2017-6833 / CVE-2017-6835 / CVE-2017-6837 CVE-2017-6827: A heap-based buffer overflow in the MSADPCM::initializeCoefficients function in MSADPCM.cpp in audiofile (aka libaudiofile and Audio File Library) 0.3.6 allows remote attackers to have unspecified impact via a crafted audio file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-msadpcminitializecoefficients-msadpcm-cpp https://github.com/mpruett/audiofile/issues/32 CVE-2017-6828: A Heap-based buffer overflow in the readValue function in FileHandle.cpp in audiofile (aka libaudiofile and Audio File Library) 0.3.6 allows remote attackers to have unspecified impact via a crafted WAV file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-readvalue-filehandle-cpp https://github.com/mpruett/audiofile/issues/31 CVE-2017-6832: A Heap-based buffer overflow in the decodeBlock in MSADPCM.cpp in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (crash) via a crafted file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-msadpcmdecodeblock-msadpcm-cpp https://github.com/mpruett/audiofile/issues/36 CVE-2017-6833: The runPull function in libaudiofile/modules/BlockCodec.cpp in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (divide-by-zero error and crash) via a crafted file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-divide-by-zero-in-blockcodecrunpull-blockcodec-cpp https://github.com/mpruett/audiofile/issues/37 CVE-2017-6835: The reset1 function in libaudiofile/modules/BlockCodec.cpp in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (divide-by-zero error and crash) via a crafted file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-divide-by-zero-in-blockcodecreset1-blockcodec-cpp https://github.com/mpruett/audiofile/issues/39 CVE-2017-6837: WAVE.cpp in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (crash) via vectors related to a large number of coefficients. http://blogs.gentoo.org/ago/2017/02/20/audiofile-multiple-ubsan-crashes/ https://github.com/mpruett/audiofile/issues/41 Signed-off-by: Peter Korsgaard (cherry picked from commit cc00bde57fc20d11f8fa4e8ec5f193c091714c55) Signed-off-by: Peter Korsgaard --- ...ays-check-the-number-of-coefficients.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/audiofile/0003-Always-check-the-number-of-coefficients.patch diff --git a/package/audiofile/0003-Always-check-the-number-of-coefficients.patch b/package/audiofile/0003-Always-check-the-number-of-coefficients.patch new file mode 100644 index 0000000000..5c99c3cd7e --- /dev/null +++ b/package/audiofile/0003-Always-check-the-number-of-coefficients.patch @@ -0,0 +1,36 @@ +From c48e4c6503f7dabd41f11d4c9c7b7f8960e7f2c0 Mon Sep 17 00:00:00 2001 +From: Antonio Larrosa +Date: Mon, 6 Mar 2017 12:51:22 +0100 +Subject: [PATCH] Always check the number of coefficients + +When building the library with NDEBUG, asserts are eliminated +so it's better to always check that the number of coefficients +is inside the array range. + +This fixes the 00191-audiofile-indexoob issue in #41 + +Signed-off-by: Peter Korsgaard +--- + libaudiofile/WAVE.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp +index 0e81cf7..61f9541 100644 +--- a/libaudiofile/WAVE.cpp ++++ b/libaudiofile/WAVE.cpp +@@ -281,6 +281,12 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size) + + /* numCoefficients should be at least 7. */ + assert(numCoefficients >= 7 && numCoefficients <= 255); ++ if (numCoefficients < 7 || numCoefficients > 255) ++ { ++ _af_error(AF_BAD_HEADER, ++ "Bad number of coefficients"); ++ return AF_FAIL; ++ } + + m_msadpcmNumCoefficients = numCoefficients; + +-- +2.11.0 + From 5e24ed52e4513ed49810455a91c70f496efbc9cc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 30 Mar 2017 23:03:32 +0200 Subject: [PATCH 2879/3392] audiofile: add security patch for CVE-2017-6829 The decodeSample function in IMA.cpp in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (crash) via a crafted file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-global-buffer-overflow-in-decodesample-ima-cpp https://github.com/mpruett/audiofile/issues/33 Signed-off-by: Peter Korsgaard (cherry picked from commit 434890df2a7c131b40fec1c49e6239972ab299d2) Signed-off-by: Peter Korsgaard --- ...ues-to-fix-index-overflow-in-IMA.cpp.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch diff --git a/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch b/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch new file mode 100644 index 0000000000..21f899a46f --- /dev/null +++ b/package/audiofile/0004-clamp-index-values-to-fix-index-overflow-in-IMA.cpp.patch @@ -0,0 +1,39 @@ +From 25eb00ce913452c2e614548d7df93070bf0d066f Mon Sep 17 00:00:00 2001 +From: Antonio Larrosa +Date: Mon, 6 Mar 2017 18:02:31 +0100 +Subject: [PATCH] clamp index values to fix index overflow in IMA.cpp + +This fixes #33 +(also reported at https://bugzilla.opensuse.org/show_bug.cgi?id=1026981 +and https://blogs.gentoo.org/ago/2017/02/20/audiofile-global-buffer-overflow-in-decodesample-ima-cpp/) + +Signed-off-by: Peter Korsgaard +--- + libaudiofile/modules/IMA.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libaudiofile/modules/IMA.cpp b/libaudiofile/modules/IMA.cpp +index 7476d44..df4aad6 100644 +--- a/libaudiofile/modules/IMA.cpp ++++ b/libaudiofile/modules/IMA.cpp +@@ -169,7 +169,7 @@ int IMA::decodeBlockWAVE(const uint8_t *encoded, int16_t *decoded) + if (encoded[1] & 0x80) + m_adpcmState[c].previousValue -= 0x10000; + +- m_adpcmState[c].index = encoded[2]; ++ m_adpcmState[c].index = clamp(encoded[2], 0, 88); + + *decoded++ = m_adpcmState[c].previousValue; + +@@ -210,7 +210,7 @@ int IMA::decodeBlockQT(const uint8_t *encoded, int16_t *decoded) + predictor -= 0x10000; + + state.previousValue = clamp(predictor, MIN_INT16, MAX_INT16); +- state.index = encoded[1] & 0x7f; ++ state.index = clamp(encoded[1] & 0x7f, 0, 88); + encoded += 2; + + for (int n=0; n Date: Thu, 30 Mar 2017 23:03:33 +0200 Subject: [PATCH 2880/3392] audiofile: add security patch for CVE-2017-6830 / CVE-2017-6834 / CVE-2017-6836 / CVE-2017-6838 CVE-2017-6830: A heap-based buffer overflow in the alaw2linear_buf function in G711.cpp in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (crash) via a crafted file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-alaw2linear_buf-g711-cpp https://github.com/mpruett/audiofile/issues/34 CVE-2017-6834: A heap-based buffer overflow in the ulaw2linear_buf function in G711.cpp in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (crash) via a crafted file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-ulaw2linear_buf-g711-cpp https://github.com/mpruett/audiofile/issues/38 CVE-2017-6836: A heap-based buffer overflow in the Expand3To4Module::run function in libaudiofile/modules/SimpleModule.h in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (crash) via a crafted file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-expand3to4modulerun-simplemodule-h https://github.com/mpruett/audiofile/issues/40 CVE-2017-6838: Integer overflow in sfcommands/sfconvert.c in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (crash) via a crafted file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-multiple-ubsan-crashes/ https://github.com/mpruett/audiofile/issues/41 Signed-off-by: Peter Korsgaard (cherry picked from commit 4a1a8277bba490d227f413e218138e39f1fe1203) Signed-off-by: Peter Korsgaard --- ...multiplication-overflow-in-sfconvert.patch | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 package/audiofile/0005-Check-for-multiplication-overflow-in-sfconvert.patch diff --git a/package/audiofile/0005-Check-for-multiplication-overflow-in-sfconvert.patch b/package/audiofile/0005-Check-for-multiplication-overflow-in-sfconvert.patch new file mode 100644 index 0000000000..c72619030b --- /dev/null +++ b/package/audiofile/0005-Check-for-multiplication-overflow-in-sfconvert.patch @@ -0,0 +1,72 @@ +From 7d65f89defb092b63bcbc5d98349fb222ca73b3c Mon Sep 17 00:00:00 2001 +From: Antonio Larrosa +Date: Mon, 6 Mar 2017 13:54:52 +0100 +Subject: [PATCH] Check for multiplication overflow in sfconvert + +Checks that a multiplication doesn't overflow when +calculating the buffer size, and if it overflows, +reduce the buffer size instead of failing. + +This fixes the 00192-audiofile-signintoverflow-sfconvert case +in #41 + +Signed-off-by: Peter Korsgaard +--- + sfcommands/sfconvert.c | 34 ++++++++++++++++++++++++++++++++-- + 1 file changed, 32 insertions(+), 2 deletions(-) + +diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c +index 80a1bc4..970a3e4 100644 +--- a/sfcommands/sfconvert.c ++++ b/sfcommands/sfconvert.c +@@ -45,6 +45,33 @@ void printusage (void); + void usageerror (void); + bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid); + ++int firstBitSet(int x) ++{ ++ int position=0; ++ while (x!=0) ++ { ++ x>>=1; ++ ++position; ++ } ++ return position; ++} ++ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ ++int multiplyCheckOverflow(int a, int b, int *result) ++{ ++#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) ++ return __builtin_mul_overflow(a, b, result); ++#else ++ if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits ++ return true; ++ *result = a * b; ++ return false; ++#endif ++} ++ + int main (int argc, char **argv) + { + if (argc == 2) +@@ -323,8 +350,11 @@ bool copyaudiodata (AFfilehandle infile, AFfilehandle outfile, int trackid) + { + int frameSize = afGetVirtualFrameSize(infile, trackid, 1); + +- const int kBufferFrameCount = 65536; +- void *buffer = malloc(kBufferFrameCount * frameSize); ++ int kBufferFrameCount = 65536; ++ int bufferSize; ++ while (multiplyCheckOverflow(kBufferFrameCount, frameSize, &bufferSize)) ++ kBufferFrameCount /= 2; ++ void *buffer = malloc(bufferSize); + + AFframecount totalFrames = afGetFrameCount(infile, AF_DEFAULT_TRACK); + AFframecount totalFramesWritten = 0; +-- +2.11.0 + From c9890cfa67a887bf24aea7043d912ee6e8e669c0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 30 Mar 2017 23:03:34 +0200 Subject: [PATCH 2881/3392] audiofile: add security patch for CVE-2017-6831 Heap-based buffer overflow in the decodeBlockWAVE function in IMA.cpp in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (crash) via a crafted file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-imadecodeblockwave-ima-cpp https://github.com/mpruett/audiofile/issues/35 Signed-off-by: Peter Korsgaard (cherry picked from commit bd5f84d301c4e74ca200a9336eca88468ec0e1f3) Signed-off-by: Peter Korsgaard --- ...ail-when-error-occurs-in-parseFormat.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch diff --git a/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch b/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch new file mode 100644 index 0000000000..0c6be2a2c5 --- /dev/null +++ b/package/audiofile/0006-Actually-fail-when-error-occurs-in-parseFormat.patch @@ -0,0 +1,42 @@ +From a2e9eab8ea87c4ffc494d839ebb4ea145eb9f2e6 Mon Sep 17 00:00:00 2001 +From: Antonio Larrosa +Date: Mon, 6 Mar 2017 18:59:26 +0100 +Subject: [PATCH] Actually fail when error occurs in parseFormat + +When there's an unsupported number of bits per sample or an invalid +number of samples per block, don't only print an error message using +the error handler, but actually stop parsing the file. + +This fixes #35 (also reported at +https://bugzilla.opensuse.org/show_bug.cgi?id=1026983 and +https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-imadecodeblockwave-ima-cpp/ +) + +Signed-off-by: Peter Korsgaard +--- + libaudiofile/WAVE.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp +index 0e81cf7..d762249 100644 +--- a/libaudiofile/WAVE.cpp ++++ b/libaudiofile/WAVE.cpp +@@ -326,6 +326,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size) + { + _af_error(AF_BAD_NOT_IMPLEMENTED, + "IMA ADPCM compression supports only 4 bits per sample"); ++ return AF_FAIL; + } + + int bytesPerBlock = (samplesPerBlock + 14) / 8 * 4 * channelCount; +@@ -333,6 +334,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size) + { + _af_error(AF_BAD_CODEC_CONFIG, + "Invalid samples per block for IMA ADPCM compression"); ++ return AF_FAIL; + } + + track->f.sampleWidth = 16; +-- +2.11.0 + From 6338df7dea0dcca5c1ff2689008dd058bce677e8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 30 Mar 2017 23:03:35 +0200 Subject: [PATCH 2882/3392] audiofile: add security patch for CVE-2017-6839 Integer overflow in modules/MSADPCM.cpp in Audio File Library (aka audiofile) 0.3.6 allows remote attackers to cause a denial of service (crash) via a crafted file. https://blogs.gentoo.org/ago/2017/02/20/audiofile-multiple-ubsan-crashes/ https://github.com/mpruett/audiofile/issues/41 Signed-off-by: Peter Korsgaard (cherry picked from commit 844a7c6281eb442881330a5d36d5a0719f2870bf) Signed-off-by: Peter Korsgaard --- ...lication-overflow-in-MSADPCM-decodeS.patch | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch diff --git a/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch b/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch new file mode 100644 index 0000000000..5411f13bb0 --- /dev/null +++ b/package/audiofile/0007-Check-for-multiplication-overflow-in-MSADPCM-decodeS.patch @@ -0,0 +1,122 @@ +From beacc44eb8cdf6d58717ec1a5103c5141f1b37f9 Mon Sep 17 00:00:00 2001 +From: Antonio Larrosa +Date: Mon, 6 Mar 2017 13:43:53 +0100 +Subject: [PATCH] Check for multiplication overflow in MSADPCM decodeSample + +Check for multiplication overflow (using __builtin_mul_overflow +if available) in MSADPCM.cpp decodeSample and return an empty +decoded block if an error occurs. + +This fixes the 00193-audiofile-signintoverflow-MSADPCM case of #41 + +Signed-off-by: Peter Korsgaard +--- + libaudiofile/modules/BlockCodec.cpp | 5 ++-- + libaudiofile/modules/MSADPCM.cpp | 47 +++++++++++++++++++++++++++++++++---- + 2 files changed, 46 insertions(+), 6 deletions(-) + +diff --git a/libaudiofile/modules/BlockCodec.cpp b/libaudiofile/modules/BlockCodec.cpp +index 45925e8..4731be1 100644 +--- a/libaudiofile/modules/BlockCodec.cpp ++++ b/libaudiofile/modules/BlockCodec.cpp +@@ -52,8 +52,9 @@ void BlockCodec::runPull() + // Decompress into m_outChunk. + for (int i=0; i(m_inChunk->buffer) + i * m_bytesPerPacket, +- static_cast(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount); ++ if (decodeBlock(static_cast(m_inChunk->buffer) + i * m_bytesPerPacket, ++ static_cast(m_outChunk->buffer) + i * m_framesPerPacket * m_track->f.channelCount)==0) ++ break; + + framesRead += m_framesPerPacket; + } +diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp +index 8ea3c85..ef9c38c 100644 +--- a/libaudiofile/modules/MSADPCM.cpp ++++ b/libaudiofile/modules/MSADPCM.cpp +@@ -101,24 +101,60 @@ static const int16_t adaptationTable[] = + 768, 614, 512, 409, 307, 230, 230, 230 + }; + ++int firstBitSet(int x) ++{ ++ int position=0; ++ while (x!=0) ++ { ++ x>>=1; ++ ++position; ++ } ++ return position; ++} ++ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ ++int multiplyCheckOverflow(int a, int b, int *result) ++{ ++#if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) ++ return __builtin_mul_overflow(a, b, result); ++#else ++ if (firstBitSet(a)+firstBitSet(b)>31) // int is signed, so we can't use 32 bits ++ return true; ++ *result = a * b; ++ return false; ++#endif ++} ++ ++ + // Compute a linear PCM value from the given differential coded value. + static int16_t decodeSample(ms_adpcm_state &state, +- uint8_t code, const int16_t *coefficient) ++ uint8_t code, const int16_t *coefficient, bool *ok=NULL) + { + int linearSample = (state.sample1 * coefficient[0] + + state.sample2 * coefficient[1]) >> 8; ++ int delta; + + linearSample += ((code & 0x08) ? (code - 0x10) : code) * state.delta; + + linearSample = clamp(linearSample, MIN_INT16, MAX_INT16); + +- int delta = (state.delta * adaptationTable[code]) >> 8; ++ if (multiplyCheckOverflow(state.delta, adaptationTable[code], &delta)) ++ { ++ if (ok) *ok=false; ++ _af_error(AF_BAD_COMPRESSION, "Error decoding sample"); ++ return 0; ++ } ++ delta >>= 8; + if (delta < 16) + delta = 16; + + state.delta = delta; + state.sample2 = state.sample1; + state.sample1 = linearSample; ++ if (ok) *ok=true; + + return static_cast(linearSample); + } +@@ -212,13 +248,16 @@ int MSADPCM::decodeBlock(const uint8_t *encoded, int16_t *decoded) + { + uint8_t code; + int16_t newSample; ++ bool ok; + + code = *encoded >> 4; +- newSample = decodeSample(*state[0], code, coefficient[0]); ++ newSample = decodeSample(*state[0], code, coefficient[0], &ok); ++ if (!ok) return 0; + *decoded++ = newSample; + + code = *encoded & 0x0f; +- newSample = decodeSample(*state[1], code, coefficient[1]); ++ newSample = decodeSample(*state[1], code, coefficient[1], &ok); ++ if (!ok) return 0; + *decoded++ = newSample; + + encoded++; +-- +2.11.0 + From 1a58c4c7b0dade55fae1fd325b5d2a129502467b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 2 Apr 2017 15:15:14 -0300 Subject: [PATCH 2883/3392] linux-headers: bump 4.{4, 9, 10}.x series [Peter: drop 4.10.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 69356afc81cee7a1b1c749274b26db507133b8d6) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7ee1a575cc..fbac6034ca 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.58" if BR2_KERNEL_HEADERS_4_4 + default "4.4.59" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.19" if BR2_KERNEL_HEADERS_4_9 + default "4.9.20" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From eeec31f2a05b72c5616cbdd775b326a481ecdb39 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 3 Apr 2017 10:14:41 +0200 Subject: [PATCH 2884/3392] libsoc: add host-pkgconf dependency Without pkg-config PKG_CHECK_MODULES won't be expanded and ./configure script produces following error message: ./configure: line 12237: syntax error near unexpected token `PYTHON,' ./configure: line 12237: ` PKG_CHECK_MODULES(PYTHON, python-"$PYTHON_VERSION")' Fixes: http://autobuild.buildroot.net/results/86e/86e04bd2b10527130306451e56a7693ed4b4befd Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 8975e9f2c77c6861964906e6b5ebd894cdccf45f) Signed-off-by: Peter Korsgaard --- package/libsoc/libsoc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk index 03bef043d9..9bc2a9b86c 100644 --- a/package/libsoc/libsoc.mk +++ b/package/libsoc/libsoc.mk @@ -10,6 +10,7 @@ LIBSOC_LICENSE = LGPLv2.1 LIBSOC_LICENSE_FILES = LICENCE LIBSOC_AUTORECONF = YES LIBSOC_INSTALL_STAGING = YES +LIBSOC_DEPENDENCIES = host-pkgconf # Install Python 2 bindings ifeq ($(BR2_PACKAGE_PYTHON),y) From c61338a628879610671826f0aa766473023c8219 Mon Sep 17 00:00:00 2001 From: Julien BOIBESSOT Date: Mon, 3 Apr 2017 14:25:43 +0200 Subject: [PATCH 2885/3392] package/tyrian: fixes compilation with static libs Has been tested with: "./support/scripts/test-pkg -c tyrian.cfg -p opentyrian" Fixes: http://autobuild.buildroot.net/results/0e2345db82b33f591958fc0f72ad914adafe0522 and some similar previous build failure. Thanks Thomas for the tip ;-). Signed-off-by: Julien BOIBESSOT Signed-off-by: Thomas Petazzoni (cherry picked from commit dd99f2cb7d10f20568cab22c498a9e1831b5a351) Signed-off-by: Peter Korsgaard --- package/opentyrian/opentyrian.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opentyrian/opentyrian.mk b/package/opentyrian/opentyrian.mk index 6efbe4eeb8..c6b19d2a38 100644 --- a/package/opentyrian/opentyrian.mk +++ b/package/opentyrian/opentyrian.mk @@ -24,7 +24,7 @@ define OPENTYRIAN_BUILD_CMDS CC="$(TARGET_CC)" \ STRIP="/bin/true" \ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ - LDFLAGS="-lm" \ + LDFLAGS="$(TARGET_LDFLAGS) -lm" \ WITH_NETWORK="$(OPENTYRIAN_NETWORK)" \ -C $(@D) release endef From f8d1e5f1ea26f7b125bfbb4338dc24ab97e76120 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 23 Mar 2017 00:04:56 +0100 Subject: [PATCH 2886/3392] gst-ffmpeg: work-around bogus configure logic on SPARC The libav version built into the gst-ffmpeg code produces a bogus binary on SPARC, which causes the following error of the check-bin-arch script: ERROR: architecture for ./usr/lib/gstreamer-0.10/libgstffmpeg.so is Sparc v8+, should be Sparc ERROR: architecture for ./usr/lib/gstreamer-0.10/libgstpostproc.so is Sparc v8+, should be Sparc ERROR: architecture for ./usr/lib/gstreamer-0.10/libgstffmpegscale.so is Sparc v8+, should be Sparc The problem is the following bit of code in gst-lib/ext/libav/configure: elif enabled sparc; then enabled vis && check_asm vis '"pdist %f0, %f0, %f0"' -mcpu=ultrasparc && add_cflags -mcpu=ultrasparc -mtune=ultrasparc I.e, it checks if the architecture supports the pdist instruction... but forces -mcpu to ultrasparc while doing so. So it's like "let's see if this Ultrasparc instruction exists when I force the compiler to think I'm using Ultrasparc", which is non-sensical. This has been fixed later on in libav upstream: https://git.libav.org/?p=libav.git;a=commit;h=6aa93689abe8c095cec9fa828c2dee3131008995 However, this commit cannot be backported as-is since the shell function check_inline_asm did not exist in the old libav version bundled in gst-ffmpeg. Therefore, we take the simpler route of disabling the VIS optimizations on SPARCv8 and Leon3. Fixes: http://autobuild.buildroot.net/results/e82d179c3d4f92ad7423693a4b1d42379a3f5411/ Signed-off-by: Thomas Petazzoni (cherry picked from commit d2b73875c3b8a6ec518c1424eaf92c1257fa40aa) Signed-off-by: Peter Korsgaard --- package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk index b1d8f8bd85..3992fdf3ff 100644 --- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk +++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk @@ -80,6 +80,12 @@ else GST_FFMPEG_CONF_EXTRA_OPTS += --disable-altivec endif +# libav configure script misdetects the VIS optimizations as being +# available, so forcefully disable them. +ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) +GST_FFMPEG_CONF_EXTRA_OPTS += --disable-vis +endif + ifeq ($(BR2_STATIC_LIBS),) GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic endif From c836666c7b89936dbed15e350f4edf7e895c524c Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 3 Apr 2017 21:06:11 -0500 Subject: [PATCH 2887/3392] libselinux: query for python site-packages dir directly With the bump to version 2.6, the following commit needs to be taken into consideration for overloading paths. https://github.com/SELinuxProject/selinux/commit/8162f10e670da963eb65ccf1e7de69ea85aba30d The PYLIBVER is no longer used and the PYTHONLIBDIR is renamed to PYSITEDIR with slightly different pathing. More details can be found in the issue ticket which was marked as a non-issue after analysis that a Buildroot fix was the resolution. https://github.com/SELinuxProject/selinux/issues/51 Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni (cherry picked from commit 6a6ce10eba24d43412aada7df7de2ab78e8ffee2) Signed-off-by: Peter Korsgaard --- package/libselinux/libselinux.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 44120c4d3b..6bf1b4322b 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -46,12 +46,10 @@ HOST_LIBSELINUX_DEPENDENCIES = \ ifeq ($(BR2_PACKAGE_PYTHON3),y) HOST_LIBSELINUX_DEPENDENCIES += host-python3 -HOST_LIBSELINUX_PYTHONLIBDIR = -L$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/ HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) else HOST_LIBSELINUX_DEPENDENCIES += host-python -HOST_LIBSELINUX_PYTHONLIBDIR = -L$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/ HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/ HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) endif @@ -60,8 +58,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \ PYINC="$(HOST_LIBSELINUX_PYINC)" \ - PYTHONLIBDIR="$(HOST_LIBSELINUX_PYTHONLIBDIR)" \ - PYLIBVER="$(HOST_LIBSELINUX_PYLIBVER)" \ + PYSITEDIR="$(HOST_DIR)/usr/lib/$(HOST_LIBSELINUX_PYLIBVER)/site-packages" \ SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/" define HOST_LIBSELINUX_BUILD_CMDS From 476067a78d4fd1ddb141a8cccc63cf3e75cbe7a3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 5 Apr 2017 13:35:15 +0200 Subject: [PATCH 2888/3392] Update for 2017.02.1 Signed-off-by: Peter Korsgaard --- CHANGES | 39 +++++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 5fedca19eb..75163c32d1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,42 @@ +2017.02.1, Released April 4th, 2017 + + Important / security related fixes. + + Fix a variable clashing issue in the mkusers script with + internal bash variables. + + Improve external toolchain version detection. + + Correct permissions for /dev/pts/ptmx when systemd is used + with recent glibc versions. + + Fix python module name clash for graph-depends. + + Fakeroot now links against libacl to fix issues on + distributions using acls. + + Ensure that the git download infrastructure creates GNU format + tar files. + + br2-external: Improve error reporting. + + Updated/fixed packages: acl, apr, audiofile, busybox, cairo, + dbus-cpp, dbus-glib, dbus-triggerd, domoticz, elfutils, + fakeroot, filemq, fmc, gdb, git, gnutls, gst-ffmpeg, + gst1-plygins-bad, harfbuzz, htop, imagemagick, jasper, libcec, + libiio, libplatform, librsvg, libselinux, libsidplay2, libsoc, + libwebsockets, libxkbcommon, linux-firmware, logrotate, + lpt-testsuite, lttng-libust, mariadb, mbedtls, memcached, + mesa3d, mpd, mplayer, nbd, ncftp, ntp, openssh, opentyrian, + pcre, perl-gd, python, qt5base, rpi-userland, rpm, samba4, + skalibs, slang, sngrep, squashfs, syslog-ng, taglib, + tcpreplay, tor, upmpdcli, wget, wireshark, + xdriver_xf86-video-vmware, xlib_libXv, zmqpp + + Issues resolved (http://bugs.buildroot.org): + + #9456: mkusers script bash errors + 2017.02, Released February 28th, 2017 Minor fixes, mainly fixing autobuilder issues. diff --git a/Makefile b/Makefile index 0308f9b538..30e76fa7af 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02 +export BR2_VERSION := 2017.02.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1488315000 +BR2_VERSION_EPOCH = 1491392000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) From 6257bf658806751b3a1357110330f3d57363240e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 Apr 2017 09:03:11 +0200 Subject: [PATCH 2889/3392] libnspr: fix Microblaze patch Due to a mistake, the Microblaze patch was adding another #elif defined(nios2), which doesn't make any sense. This commit gets rid of it. The rest of the noise in the change is due to the use of quilt to generate the patches. Signed-off-by: Thomas Petazzoni (cherry picked from commit 7039c4d456259ca2c2708be16ebea98a82adee3f) Signed-off-by: Peter Korsgaard --- package/libnspr/0002-microblaze.patch | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/package/libnspr/0002-microblaze.patch b/package/libnspr/0002-microblaze.patch index f1416e7e97..7fd650ce78 100644 --- a/package/libnspr/0002-microblaze.patch +++ b/package/libnspr/0002-microblaze.patch @@ -3,9 +3,10 @@ Add Microblaze support [Gustavo: update for nspr 4.10.9] Signed-off-by: Spenser Gilliland -diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.cfg nspr-4.10.9/nspr/pr/include/md/_linux.cfg ---- nspr-4.10.9.orig/nspr/pr/include/md/_linux.cfg 2015-10-03 08:13:11.845414714 -0300 -+++ nspr-4.10.9/nspr/pr/include/md/_linux.cfg 2015-10-03 08:13:20.435708195 -0300 +Index: b/nspr/pr/include/md/_linux.cfg +=================================================================== +--- a/nspr/pr/include/md/_linux.cfg ++++ b/nspr/pr/include/md/_linux.cfg @@ -1062,6 +1062,56 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 @@ -63,10 +64,11 @@ diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.cfg nspr-4.10.9/nspr/pr/in #else #error "Unknown CPU architecture" -diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.h nspr-4.10.9/nspr/pr/include/md/_linux.h ---- nspr-4.10.9.orig/nspr/pr/include/md/_linux.h 2015-10-03 08:13:11.845414714 -0300 -+++ nspr-4.10.9/nspr/pr/include/md/_linux.h 2015-10-03 08:14:53.351882603 -0300 -@@ -57,8 +57,11 @@ +Index: b/nspr/pr/include/md/_linux.h +=================================================================== +--- a/nspr/pr/include/md/_linux.h ++++ b/nspr/pr/include/md/_linux.h +@@ -57,6 +57,8 @@ #define _PR_SI_ARCHITECTURE "m32r" #elif defined(__or1k__) #define _PR_SI_ARCHITECTURE "or1k" @@ -74,7 +76,4 @@ diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.h nspr-4.10.9/nspr/pr/incl +#define _PR_SI_ARCHITECTURE "microblaze" #elif defined(nios2) #define _PR_SI_ARCHITECTURE "nios2" -+#elif defined(nios2) #else - #error "Unknown CPU architecture" - #endif From 9d302e43c944408064259b85165deadad2bfe5ff Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 Apr 2017 09:25:36 +0200 Subject: [PATCH 2890/3392] libnspr: use __nios2__ instead of nios2 Our patch adding nios2 support to libnspr uses the built-in compiler define "nios2". However, this doesn't work with C++11, where only the __nios2__ define is available. Since __nios2__ is always available, use that instead: $ ./output/host/usr/bin/nios2-linux-gcc -dM -E - < /dev/null | grep -E "( nios2 | __nios2__ )" $ ./output/host/usr/bin/nios2-linux-gcc -std=c++11 -x c++ -dM -E - < /dev/null | grep -E "( nios2 | __nios2__ )" Patch 0001-nios2.patch is therefore changed to use __nios2__ (the rest of the change noise is due to using quilt to format the patch). Patch 0002-microblaze.patch is simply updated to apply correctly on top of the modified 0001-nios2.patch. This fixes the build of the poppler library on nios2. It is built with -std=c++11, and includes nspr headers (through nss), causing a build issue. Fixes: http://autobuild.buildroot.net/results/9fee58076157d814616fa0da51afde8da21a8973/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 9a521546ed553d2be23740bbf1a7aa05bce9eb09) Signed-off-by: Peter Korsgaard --- package/libnspr/0001-nios2.patch | 18 ++++++++++-------- package/libnspr/0002-microblaze.patch | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/libnspr/0001-nios2.patch b/package/libnspr/0001-nios2.patch index 22cacd72a1..e10e7e9a66 100644 --- a/package/libnspr/0001-nios2.patch +++ b/package/libnspr/0001-nios2.patch @@ -3,14 +3,15 @@ Add Nios-II support [Gustavo: update for nspr 4.10.9] Signed-off-by: Ezequiel Garcia -diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.cfg nspr-4.10.9/nspr/pr/include/md/_linux.cfg ---- nspr-4.10.9.orig/nspr/pr/include/md/_linux.cfg 2015-10-03 08:11:43.229387215 -0300 -+++ nspr-4.10.9/nspr/pr/include/md/_linux.cfg 2015-10-03 08:11:55.277798841 -0300 +Index: b/nspr/pr/include/md/_linux.cfg +=================================================================== +--- a/nspr/pr/include/md/_linux.cfg ++++ b/nspr/pr/include/md/_linux.cfg @@ -1017,6 +1017,51 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 -+#elif defined(nios2) ++#elif defined(__nios2__) + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN @@ -58,14 +59,15 @@ diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.cfg nspr-4.10.9/nspr/pr/in #else #error "Unknown CPU architecture" -diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.h nspr-4.10.9/nspr/pr/include/md/_linux.h ---- nspr-4.10.9.orig/nspr/pr/include/md/_linux.h 2015-10-03 08:11:43.229387215 -0300 -+++ nspr-4.10.9/nspr/pr/include/md/_linux.h 2015-10-03 08:12:22.474728003 -0300 +Index: b/nspr/pr/include/md/_linux.h +=================================================================== +--- a/nspr/pr/include/md/_linux.h ++++ b/nspr/pr/include/md/_linux.h @@ -57,6 +57,8 @@ #define _PR_SI_ARCHITECTURE "m32r" #elif defined(__or1k__) #define _PR_SI_ARCHITECTURE "or1k" -+#elif defined(nios2) ++#elif defined(__nios2__) +#define _PR_SI_ARCHITECTURE "nios2" #else #error "Unknown CPU architecture" diff --git a/package/libnspr/0002-microblaze.patch b/package/libnspr/0002-microblaze.patch index 7fd650ce78..7cf1f0dfac 100644 --- a/package/libnspr/0002-microblaze.patch +++ b/package/libnspr/0002-microblaze.patch @@ -74,6 +74,6 @@ Index: b/nspr/pr/include/md/_linux.h #define _PR_SI_ARCHITECTURE "or1k" +#elif defined(__microblaze__) +#define _PR_SI_ARCHITECTURE "microblaze" - #elif defined(nios2) + #elif defined(__nios2__) #define _PR_SI_ARCHITECTURE "nios2" #else From bd00633729534a138c5114f56869d1d808d25eab Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Tue, 4 Apr 2017 19:50:18 -0300 Subject: [PATCH 2891/3392] gst1-plugins-base: remove legacy freetype handling In 2010 commit 32d319e6f "gst-plugins-base: ensure is used" introduced a typo (missing backslash) that made the code ineffective. In 2013 commit f8e7fdcd3 "gst1-plugins-base: add gstreamer1 base plugins" copied the code. It can be confirmed by looking at the output of: $ make printvars | grep '^GST1_PLUGINS_BASE_CONF_ENV\|^FT2_CONFIG' FT2_CONFIG=/bin/false ac_cv_header_stdint_t="stdint.h" GST1_PLUGINS_BASE_CONF_ENV= Direct use of freetype was dropped in version 1.7.2 by upstream [1], so remove the code instead of fixing it. Found using [2]: check-package --include-only Indent $(find * -type f) and manually removed. [1] https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031 [2] http://patchwork.ozlabs.org/patch/729669/ Signed-off-by: Ricardo Martincoski Signed-off-by: Thomas Petazzoni (cherry picked from commit 80e2a5465880965b93d3647ca96f4af5f55252c4) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 6ab63a3512..cb5da04bd1 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -11,13 +11,6 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB GST1_PLUGINS_BASE_LICENSE = LGPLv2+, LGPLv2.1+ -# freetype is only used by examples, but if it is not found -# and the host has a freetype-config script, then the host -# include dirs are added to the search path causing trouble -GST1_PLUGINS_BASE_CONF_ENV = - FT2_CONFIG=/bin/false \ - ac_cv_header_stdint_t="stdint.h" - # gio_unix_2_0 is only used for tests GST1_PLUGINS_BASE_CONF_OPTS = \ --disable-examples \ From ab8fb2d9f3822215e1b6d79f919ad14547b74f7a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 7 Apr 2017 16:28:58 +0200 Subject: [PATCH 2892/3392] freetype: legal-info: include docs/LICENSE.TXT LICENSE.TXT gives an overview and explains in detail that freetype is dual licensed under the FTL and GPLv2+, so also include it in the license files. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 2843b970e749db28eb06d0c5968a60bc006c9747) Signed-off-by: Peter Korsgaard --- package/freetype/freetype.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 9484758700..fce94d2712 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -10,7 +10,7 @@ FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" FREETYPE_LICENSE = Dual FTL/GPLv2+ -FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT +FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT FREETYPE_DEPENDENCIES = host-pkgconf FREETYPE_CONFIG_SCRIPTS = freetype-config From eda38d300b33789985e0259cd5042dbc68971211 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 7 Apr 2017 16:28:59 +0200 Subject: [PATCH 2893/3392] icu: legal-info: refer to the real license file License.html now just contains the string: The ICU license is now in plain text format, see LICENSE. Update links and software appropriately. So refer directly to that file instead. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit d2ea2479e5061c9d48b7ee544271828563e83da8) Signed-off-by: Peter Korsgaard --- package/icu/icu.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index b9e42de94b..a435e471ad 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -8,7 +8,7 @@ ICU_VERSION = 58.2 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION) ICU_LICENSE = ICU License -ICU_LICENSE_FILES = license.html +ICU_LICENSE_FILES = LICENSE ICU_DEPENDENCIES = host-icu ICU_INSTALL_STAGING = YES From 1e9e1f3561abc2e4841f7b62d1c8cef543e4d0d0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 8 Apr 2017 11:01:04 +0200 Subject: [PATCH 2894/3392] package/linux-headers: bump 3.2.x and 4.{4, 9, 10}.x series [Peter: drop 4.10.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a1953d0ee2eb2ebb9c00288322e20f69aedb9d63) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fbac6034ca..0698d06edd 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -214,7 +214,7 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.87" if BR2_KERNEL_HEADERS_3_2 + default "3.2.88" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 default "3.12.72" if BR2_KERNEL_HEADERS_3_12 @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.59" if BR2_KERNEL_HEADERS_4_4 + default "4.4.60" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.20" if BR2_KERNEL_HEADERS_4_9 + default "4.9.21" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 57120d614ede3ab51ce0721758e283d9f698b7ea Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 6 Apr 2017 20:46:08 +0200 Subject: [PATCH 2895/3392] pkg-python: ignore user site-packages directory According to PEP 370 Python will also search for the packages in the user site-packages directory. This can affect build reproducibility. The solution is to use PYTHONNOUSERSITE=1 for all Python packages, i.e. both host and target variants. Fixes bug #9791. Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit f5da1951ad1e81cc8641f2c90e96fe36d08ec6f9) Signed-off-by: Peter Korsgaard --- package/pkg-python.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 38bc45ffa3..52c33f8752 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -28,6 +28,7 @@ PKG_PYTHON_DISTUTILS_ENV = \ LDFLAGS="$(TARGET_LDFLAGS)" \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONNOUSERSITE=1 \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ _python_exec_prefix=/usr @@ -43,7 +44,8 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ # Host distutils-based packages HOST_PKG_PYTHON_DISTUTILS_ENV = \ - PATH=$(BR_PATH) + PATH=$(BR_PATH) \ + PYTHONNOUSERSITE=1 HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --prefix=$(HOST_DIR)/usr @@ -52,6 +54,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ PKG_PYTHON_SETUPTOOLS_ENV = \ PATH=$(BR_PATH) \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ + PYTHONNOUSERSITE=1 \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ _python_exec_prefix=/usr @@ -70,7 +73,8 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - PATH=$(BR_PATH) + PATH=$(BR_PATH) \ + PYTHONNOUSERSITE=1 HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --prefix=$(HOST_DIR)/usr From d16d3afdf3f9bb97ac2afaf59536edfdc551c350 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 5 Apr 2017 22:06:06 +0200 Subject: [PATCH 2896/3392] syslinux: use Git formatted patches In preparation for the addition of more patches to the syslinux package, reformat the two existing patches as proper Git formatted patches. Signed-off-by: Thomas Petazzoni (cherry picked from commit 34da6a65adae8463149a28c560926f3349142c2a) Signed-off-by: Peter Korsgaard --- ...ios-Fix-alignment-change-with-gcc-5.patch} | 30 +++++++++++-------- ...-Disable-PIE-to-avoid-FTBFS-on-amd64.patch | 30 +++++++++++++++++++ boot/syslinux/0002-disable-pie.patch | 22 -------------- 3 files changed, 48 insertions(+), 34 deletions(-) rename boot/syslinux/{0001-Fix-gcc-5-ALIGN-causing-Boot-error.patch => 0001-bios-Fix-alignment-change-with-gcc-5.patch} (66%) create mode 100644 boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch delete mode 100644 boot/syslinux/0002-disable-pie.patch diff --git a/boot/syslinux/0001-Fix-gcc-5-ALIGN-causing-Boot-error.patch b/boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch similarity index 66% rename from boot/syslinux/0001-Fix-gcc-5-ALIGN-causing-Boot-error.patch rename to boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch index 2df6766557..633d996ed1 100644 --- a/boot/syslinux/0001-Fix-gcc-5-ALIGN-causing-Boot-error.patch +++ b/boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch @@ -1,16 +1,19 @@ -commit e5f2b577ded109291c9632dacb6eaa621d8a59fe -Author: Sylvain Gault -Date: Tue Sep 29 02:38:25 2015 +0200 +From da5cbd1a3b248f2d32281a1766a3d1414c0e8e03 Mon Sep 17 00:00:00 2001 +From: Sylvain Gault +Date: Tue, 29 Sep 2015 02:38:25 +0200 +Subject: [PATCH] bios: Fix alignment change with gcc 5 - bios: Fix alignment change with gcc 5 - - The section aligment specified in the ld scripts have to be greater or - equal to those in the .o files generated by gcc. - - Signed-off-by: Sylvain Gault - Tested-by: poma - Signed-off-by: Paulo Alcantara - Signed-off-by: Frank Hunleth +The section aligment specified in the ld scripts have to be greater or +equal to those in the .o files generated by gcc. + +Signed-off-by: Sylvain Gault +Tested-by: poma +Signed-off-by: Paulo Alcantara +Signed-off-by: Frank Hunleth +--- + core/i386/syslinux.ld | 6 +++--- + core/x86_64/syslinux.ld | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld index 7b4e012..7390451 100644 @@ -74,3 +77,6 @@ index 1057112..bf815c4 100644 __bss_vma = .; __bss_lma = .; /* Dummy */ .bss (NOLOAD) : AT (__bss_lma) { +-- +2.7.4 + diff --git a/boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch b/boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch new file mode 100644 index 0000000000..64a08b8575 --- /dev/null +++ b/boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch @@ -0,0 +1,30 @@ +From 250bf2c921713434627dc7bc8b0918fa0841f9b7 Mon Sep 17 00:00:00 2001 +From: Graham Inggs +Date: Wed, 5 Apr 2017 22:03:12 +0200 +Subject: [PATCH] Disable PIE to avoid FTBFS on amd64 + +gcc 6.x has PIE support enabled by default, which causes a build issue +with syslinux. This patch disables PIE support in the relevant +syslinux Makefile. + +Signed-off-by: Ryan Coe +--- + gpxe/src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gpxe/src/Makefile b/gpxe/src/Makefile +index cc91d78..077af64 100644 +--- a/gpxe/src/Makefile ++++ b/gpxe/src/Makefile +@@ -4,7 +4,7 @@ + # + + CLEANUP := +-CFLAGS := ++CFLAGS := -fno-PIE + ASFLAGS := + LDFLAGS := + MAKEDEPS := Makefile +-- +2.7.4 + diff --git a/boot/syslinux/0002-disable-pie.patch b/boot/syslinux/0002-disable-pie.patch deleted file mode 100644 index b31b622c41..0000000000 --- a/boot/syslinux/0002-disable-pie.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Disable PIE to avoid FTBFS on amd64 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1579023 -Author: Graham Inggs -Last-Update: 2016-05-06 - -gcc 6.x has PIE support enabled by default, which causes a build issue -with syslinux. This patch disables PIE support in the relevant -syslinux Makefile. - -Signed-off-by: Ryan Coe - ---- a/gpxe/src/Makefile -+++ b/gpxe/src/Makefile -@@ -4,7 +4,7 @@ - # - - CLEANUP := --CFLAGS := -+CFLAGS := -fno-PIE - ASFLAGS := - LDFLAGS := - MAKEDEPS := Makefile From 18fc71357b6a05ca769d119c59a790703292d9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Allard?= Date: Fri, 7 Apr 2017 11:05:13 +0200 Subject: [PATCH 2897/3392] syslinux: build with the target toolchain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Until now, the host toolchain was used to build syslinux, as it was not possible to build a 32-bit syslinux with a x86-64 toolchain. However, syslinux requires gnu-efi, and gnu-efi is built using the target toolchain. Mixing different toolchains doesn't work well, so this commit changes the syslinux package to use the target toolchain for syslinux as well. This is made possible by patches 0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch and 0004-memdisk-Force-ld-output-format-to-32-bits.patch. Since syslinux also contains some utilities that have to run on the host, those have to continue being built with the host toolchain, which requires patch 0005-utils-Use-the-host-toolchain-to-build.patch. Patch 0006-lzo-Use-the-host-toolchain-for-prepcore.patch is about building prepcore, another utility with the host toolchain as it is required at build-time. This was tested using a Buildroot's built x86_64 toolchain, and checked that the output binaries are 32-bits. It was tested as well if they actually boot on hardware. Signed-off-by: Benoît Allard Signed-off-by: Thomas Petazzoni (cherry picked from commit 6e432d5ecb46959f3c27dbbca48e41512bb40a70) Signed-off-by: Peter Korsgaard --- ...Not-enough-room-for-program-headers-.patch | 35 +++++++++++ ...sk-Force-ld-output-format-to-32-bits.patch | 32 ++++++++++ ...tils-Use-the-host-toolchain-to-build.patch | 60 +++++++++++++++++++ ...-Use-the-host-toolchain-for-prepcore.patch | 44 ++++++++++++++ boot/syslinux/Config.in | 3 +- boot/syslinux/syslinux.mk | 29 ++++++--- 6 files changed, 195 insertions(+), 8 deletions(-) create mode 100644 boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch create mode 100644 boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch create mode 100644 boot/syslinux/0005-utils-Use-the-host-toolchain-to-build.patch create mode 100644 boot/syslinux/0006-lzo-Use-the-host-toolchain-for-prepcore.patch diff --git a/boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch b/boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch new file mode 100644 index 0000000000..83a87ee071 --- /dev/null +++ b/boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch @@ -0,0 +1,35 @@ +From 61de7762389d460da7ffdd644f50c60175cce23b Mon Sep 17 00:00:00 2001 +From: Steve McIntyre <93sam@debian.org> +Date: Wed, 5 Apr 2017 22:09:37 +0200 +Subject: [PATCH] Fix 'ldlinux.elf: Not enough room for program headers, try + linking with -N' +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix for https://bugs.debian.org/846679: syslinux: FTBFS: ld: +ldlinux.elf: Not enough room for program headers, try linking with -N + +https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=846679;filename=syslinux_6.03%2Bdfsg-14.1.debdiff;msg=10 + +Signed-off-by: Benoît Allard +--- + core/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/Makefile b/core/Makefile +index ad0acb5..58a3545 100644 +--- a/core/Makefile ++++ b/core/Makefile +@@ -165,7 +165,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld + + %.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS) + $(LD) $(LDFLAGS) -Bsymbolic $(LD_PIE) -E --hash-style=gnu -T $(LDSCRIPT) -M -o $@ $< \ +- --start-group $(LIBS) $(subst $(*F).elf,lib$(*F).a,$@) --end-group \ ++ --start-group $(LIBS) $(subst $(*F).elf,lib$(*F).a,$@) --end-group --no-dynamic-linker \ + > $(@:.elf=.map) + $(OBJDUMP) -h $@ > $(@:.elf=.sec) + $(PERL) $(SRC)/lstadjust.pl $(@:.elf=.lsr) $(@:.elf=.sec) $(@:.elf=.lst) +-- +2.7.4 + diff --git a/boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch b/boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch new file mode 100644 index 0000000000..4eedf4973e --- /dev/null +++ b/boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch @@ -0,0 +1,32 @@ +From c0287594239d5af2082cac20817f8e8b11a4b1b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Beno=C3=AEt=20Allard?= +Date: Wed, 5 Apr 2017 14:18:09 +0200 +Subject: [PATCH] memdisk: Force ld output format to 32-bits +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On toolchains where the default output is x86_64, we need to be +consistent with the other .o files + +Signed-off-by: Benoît Allard +--- + memdisk/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/memdisk/Makefile b/memdisk/Makefile +index e6557d8..06613ff 100644 +--- a/memdisk/Makefile ++++ b/memdisk/Makefile +@@ -78,7 +78,7 @@ memdisk16.o: memdisk16.asm + $(NASM) -f bin $(NASMOPT) $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $< + + memdisk_%.o: memdisk_%.bin +- $(LD) -r -b binary -o $@ $< ++ $(LD) --oformat elf32-i386 -r -b binary -o $@ $< + + memdisk16.elf: $(OBJS16) + $(LD) -Ttext 0 -o $@ $^ +-- +2.7.4 + diff --git a/boot/syslinux/0005-utils-Use-the-host-toolchain-to-build.patch b/boot/syslinux/0005-utils-Use-the-host-toolchain-to-build.patch new file mode 100644 index 0000000000..e091a3a89d --- /dev/null +++ b/boot/syslinux/0005-utils-Use-the-host-toolchain-to-build.patch @@ -0,0 +1,60 @@ +From e000251144056c99e390a2a4449d06cbd2a19c0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Beno=C3=AEt=20Allard?= +Date: Wed, 5 Apr 2017 14:25:02 +0200 +Subject: [PATCH] utils: Use the host toolchain to build. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The utilities are meant to run on the host machine, hence must be built using +the host toolchain. + +Signed-off-by: Benoît Allard +--- + utils/Makefile | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/utils/Makefile b/utils/Makefile +index dfe6259..ac91aaa 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -17,8 +17,8 @@ + VPATH = $(SRC) + include $(MAKEDIR)/syslinux.mk + +-CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I$(SRC) +-LDFLAGS = -O2 ++CFLAGS = $(CFLAGS_FOR_BUILD) $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I$(SRC) ++LDFLAGS = $(LDFLAGS_FOR_BUILD) -O2 + + C_TARGETS = isohybrid gethostip memdiskfind + SCRIPT_TARGETS = mkdiskimage +@@ -35,7 +35,7 @@ ISOHDPFX = $(addprefix $(OBJ)/,../mbr/isohdpfx.bin ../mbr/isohdpfx_f.bin \ + all: $(TARGETS) + + %.o: %.c +- $(CC) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $< ++ $(CC_FOR_BUILD) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $< + + mkdiskimage: mkdiskimage.in ../mbr/mbr.bin bin2hex.pl + $(PERL) $(SRC)/bin2hex.pl < $(OBJ)/../mbr/mbr.bin | cat $(SRC)/mkdiskimage.in - > $@ +@@ -51,13 +51,13 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl + $(PERL) $(SRC)/isohdpfxarray.pl $(ISOHDPFX) > $@ + + isohybrid: isohybrid.o isohdpfx.o +- $(CC) $(LDFLAGS) -o $@ $^ -luuid ++ $(CC_FOR_BUILD) $(LDFLAGS) -o $@ $^ -luuid + + gethostip: gethostip.o +- $(CC) $(LDFLAGS) -o $@ $^ ++ $(CC_FOR_BUILD) $(LDFLAGS) -o $@ $^ + + memdiskfind: memdiskfind.o +- $(CC) $(LDFLAGS) -o $@ $^ ++ $(CC_FOR_BUILD) $(LDFLAGS) -o $@ $^ + + tidy dist: + rm -f *.o .*.d isohdpfx.c +-- +2.1.4 + diff --git a/boot/syslinux/0006-lzo-Use-the-host-toolchain-for-prepcore.patch b/boot/syslinux/0006-lzo-Use-the-host-toolchain-for-prepcore.patch new file mode 100644 index 0000000000..c6fa7febf7 --- /dev/null +++ b/boot/syslinux/0006-lzo-Use-the-host-toolchain-for-prepcore.patch @@ -0,0 +1,44 @@ +From 83e1f00990c25554723609bb549e18b987034317 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Beno=C3=AEt=20Allard?= +Date: Thu, 6 Apr 2017 09:43:46 +0200 +Subject: [PATCH] lzo: Use the host toolchain for prepcore +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Benoît Allard +--- + lzo/Makefile | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/lzo/Makefile b/lzo/Makefile +index 29f1fa6..c016e5a 100644 +--- a/lzo/Makefile ++++ b/lzo/Makefile +@@ -11,10 +11,13 @@ + ## ----------------------------------------------------------------------- + + VPATH = $(SRC) +-include $(MAKEDIR)/build.mk ++include $(MAKEDIR)/syslinux.mk + + INCLUDES += -I$(SRC)/include + ++%.o: %.c ++ $(CC_FOR_BUILD) $(UMAKEDEPS) $(CFLAGS_FOR_BUILD) $(INCLUDES) -c -o $@ $< ++ + LIBOBJS = $(patsubst %.c,%.o,$(subst $(SRC)/,,$(wildcard $(SRC)/src/*.c))) + LIB = lzo.a + BINS = prepcore +@@ -30,7 +33,7 @@ $(LIB) : $(LIBOBJS) + $(RANLIB) $@ + + prepcore : prepcore.o $(LIB) +- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) ++ $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $^ $(LIBS) + + tidy dist clean spotless: + rm -f $(BINS) +-- +2.1.4 + diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in index 6067e9ceb3..299a559fdf 100644 --- a/boot/syslinux/Config.in +++ b/boot/syslinux/Config.in @@ -1,12 +1,13 @@ config BR2_TARGET_SYSLINUX bool "syslinux" depends on BR2_i386 || BR2_x86_64 - select BR2_HOSTARCH_NEEDS_IA32_COMPILER # Make sure at least one of the flavors is installed select BR2_TARGET_SYSLINUX_ISOLINUX \ if !BR2_TARGET_SYSLINUX_PXELINUX && \ !BR2_TARGET_SYSLINUX_MBR && \ !BR2_TARGET_SYSLINUX_EFI + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help The syslinux bootloader for x86 systems. This includes: syslinux, pxelinux, extlinux. diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index 82890c5dc9..a88885bcbd 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -13,7 +13,7 @@ SYSLINUX_LICENSE_FILES = COPYING SYSLINUX_INSTALL_IMAGES = YES -SYSLINUX_DEPENDENCIES = host-nasm host-util-linux host-upx +SYSLINUX_DEPENDENCIES = host-nasm host-upx util-linux ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y) SYSLINUX_TARGET += bios @@ -51,21 +51,36 @@ SYSLINUX_POST_PATCH_HOOKS += SYSLINUX_CLEANUP # and the internal zlib should take precedence so -I shouldn't # be used. define SYSLINUX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" \ - AR="$(HOSTAR)" $(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET) + $(TARGET_MAKE_ENV) $(MAKE1) \ + CC="$(TARGET_CC)" \ + LD="$(TARGET_LD)" \ + NASM="$(HOST_DIR)/usr/bin/nasm" \ + CC_FOR_BUILD="$(HOSTCC)" \ + CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ + LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ + $(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET) endef # While the actual bootloader is compiled for the target, several # utilities for installing the bootloader are meant for the host. # Repeat the target, otherwise syslinux will try to build everything -# Repeat CC and AR, since syslinux really wants to check them at -# install time +# Repeat LD (and CC) as it happens that some binaries are linked at +# install-time. define SYSLINUX_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" \ - AR="$(HOSTAR)" $(SYSLINUX_EFI_ARGS) INSTALLROOT=$(HOST_DIR) \ + $(TARGET_MAKE_ENV) $(MAKE1) $(SYSLINUX_EFI_ARGS) INSTALLROOT=$(HOST_DIR) \ + CC="$(TARGET_CC)" \ + LD="$(TARGET_LD)" \ -C $(@D) $(SYSLINUX_TARGET) install endef +# That 'syslinux' binary is an installer actually built for the target. +# However, buildroot makes no usage of it, so better delete it than have it +# installed at the wrong place +define SYSLINUX_POST_INSTALL_CLEANUP + rm -rf $(HOST_DIR)/usr/bin/syslinux +endef +SYSLINUX_POST_INSTALL_TARGET_HOOKS += SYSLINUX_POST_INSTALL_CLEANUP + SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += bios/core/isolinux.bin SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += bios/core/pxelinux.bin SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_MBR) += bios/mbr/mbr.bin From 761533084bce35751335eeecab16c6e44104b804 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sun, 9 Apr 2017 14:04:14 +0530 Subject: [PATCH 2898/3392] python-pyyaml: correct license name LICENSE file contains MIT license text and README file clearly mentions pyyaml is released under MIT license. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni (cherry picked from commit 27fdc59e467e55bff1d5910c64e5381ca2814f5f) Signed-off-by: Peter Korsgaard --- package/python-pyyaml/python-pyyaml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 0509a7adb0..beeaf88e96 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -8,7 +8,7 @@ PYTHON_PYYAML_VERSION = 3.12 PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz PYTHON_PYYAML_SITE = https://pypi.python.org/packages/4a/85/db5a2df477072b2902b0eb892feb37d88ac635d36245a72a6a69b23b383a PYTHON_PYYAML_SETUP_TYPE = distutils -PYTHON_PYYAML_LICENSE = Python software foundation license v2 +PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE PYTHON_PYYAML_DEPENDENCIES = libyaml From b937e29052b8a8519e62d96a5d787c003bb32b6c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 6 Mar 2017 20:35:11 +0100 Subject: [PATCH 2899/3392] package/dovecot: bump version to 2.2.28 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 87b60b2586b44f81ada7e57768ca5dded612ffdc) Signed-off-by: Peter Korsgaard --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index e7b9c3375e..b52ea8dc01 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,2 +1,2 @@ # Locally computed after checking signature -sha256 897f92a87cda4b27b243f8149ce0ba7b7e71a2be8fb7994eb0a025e54cde18e9 dovecot-2.2.27.tar.gz +sha256 e0288f59e326ab87cb3881fdabadafe542f4dc7ab9996db13863a439ebbc1f25 dovecot-2.2.28.tar.gz diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index fe0afa5064..caa6bbaeef 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.2 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).27 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).28 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPLv2.1 From 5a339aac731992d433facfee35cdf2dca1a27309 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 12 Apr 2017 16:56:47 +0100 Subject: [PATCH 2900/3392] dovecot: bump version to 2.2.29.1 (security) Security fix: passdb/userdb dict: Don't double-expand %variables in keys. If dict was used as the authentication passdb, using specially crafted %variables in the username could be used to cause DoS (CVE-2017-2669) Full ChangeLog 2.2.29 (including CVE fix): https://www.dovecot.org/list/dovecot-news/2017-April/000341.html Full ChangeLog 2.2.29.1 (some fixes forgotten in the 2.2.29 release): https://www.dovecot.org/list/dovecot-news/2017-April/000344.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit a1a1f484a9a47f121c071d345fae4472b56bac81) Signed-off-by: Peter Korsgaard --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index b52ea8dc01..46e7c5aa8a 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,2 +1,2 @@ # Locally computed after checking signature -sha256 e0288f59e326ab87cb3881fdabadafe542f4dc7ab9996db13863a439ebbc1f25 dovecot-2.2.28.tar.gz +sha256 ccfa9ffb7eb91e9e87c21c108324b911250c9ffa838bffb64b1caafadcb0f388 dovecot-2.2.29.1.tar.gz diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index caa6bbaeef..36a6494895 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.2 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).28 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).29.1 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPLv2.1 From eda721ef82db3d44cfcc8084ca7f1c8cb70c6380 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 12 Apr 2017 15:20:21 +0100 Subject: [PATCH 2901/3392] linux-headers: bump 4.{4, 9, 10}.x series [Peter: drop 4.10.x bump] Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 9d893df454517e7cb3d667cd872bb2e30ff04321) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 0698d06edd..a414fe0ceb 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.60" if BR2_KERNEL_HEADERS_4_4 + default "4.4.61" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.21" if BR2_KERNEL_HEADERS_4_9 + default "4.9.22" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 97f7a8b3372e546698c9a319dff3e4b1693a3099 Mon Sep 17 00:00:00 2001 From: Ricardo Martincoski Date: Tue, 11 Apr 2017 19:59:13 -0300 Subject: [PATCH 2902/3392] gst-plugins-base: fix handling of freetype In 2010 commit 32d319e6f "gst-plugins-base: ensure is used" introduced a typo (missing backslash) that made the code ineffective. It can be confirmed by looking at the output of: $ make printvars | grep '^GST_PLUGINS_BASE_CONF_ENV\|^FT2_CONFIG' FT2_CONFIG=/bin/false ac_cv_header_stdint_t="stdint.h" GST_PLUGINS_BASE_CONF_ENV= Add the missing backslash to fix the code. While at it, fix the indentation to use one tab instead of two. The (end of the) diff of config.log confirms the code is still needed when the host has freetype-config installed: @@ -1674,10 +1674,8 @@ configure:21882: checking for emmintrin.h configure:21882: result: no configure:21894: checking for stdint types -configure:21917: /tmp/gst/output/host/usr/bin/i686-pc-linux-gnu-gcc -std=gnu99 -c conftest.c >&5 -configure:21917: $? = 0 configure:21961: result: stdint.h (shortcircuit) -configure:22348: result: make use of stdint.h in _stdint.h (assuming C99 compatible system) +configure:22348: result: make use of stdint.h in _stdint.h configure:22359: checking for localtime_r configure:22359: /tmp/gst/output/host/usr/bin/i686-pc-linux-gnu-gcc -std=gnu99 -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 configure:22359: $? = 0 @@ -2468,8 +2466,7 @@ Package 'freetype2', required by 'world', not found configure:31257: result: no configure:31298: checking for freetype-config -configure:31316: found /usr/bin/freetype-config -configure:31329: result: /usr/bin/freetype-config +configure:31329: result: /bin/false configure:31339: checking for FreeType - version >= 2.0.9 configure:31427: result: yes configure:32250: creating ./config.status @@ -2789,7 +2786,7 @@ ac_cv_objext='o' ac_cv_path_EGREP='/bin/grep -E' ac_cv_path_FGREP='/bin/grep -F' -ac_cv_path_FT2_CONFIG='/usr/bin/freetype-config' +ac_cv_path_FT2_CONFIG='/bin/false' ac_cv_path_GMSGFMT='/tmp/gst/output/host/usr/bin/msgfmt' ac_cv_path_GREP='/bin/grep' ac_cv_path_MSGFMT='/tmp/gst/output/host/usr/bin/msgfmt' @@ -2818,7 +2815,6 @@ ac_cv_prog_cxx_g='yes' ac_cv_prog_make_make_set='yes' ac_cv_stdint_message='using gnu compiler i686-pc-linux-gnu-gcc (Sourcery CodeBench Lite 2012.09-62) 4.7.2' -ac_cv_stdint_result='(assuming C99 compatible system)' ac_cv_sys_file_offset_bits='no' ac_cv_sys_largefile_CC='no' ac_cv_sys_largefile_source='no' @@ -2965,9 +2961,9 @@ EXEEXT='' FFLAGS=' -Os ' FGREP='/bin/grep -F' -FT2_CFLAGS='-I/usr/include/freetype2' -FT2_CONFIG='/usr/bin/freetype-config' -FT2_LIBS='-lfreetype' +FT2_CFLAGS='' +FT2_CONFIG='/bin/false' +FT2_LIBS='' GCOV='' GCOV_CFLAGS='' GCOV_LIBS='' Detected by check-package. Signed-off-by: Ricardo Martincoski Cc: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit c07a46b0ceef9e909b5274f08d00064a5d3410a4) Signed-off-by: Peter Korsgaard --- package/gstreamer/gst-plugins-base/gst-plugins-base.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk index 51c22a90bb..1c2f9acd57 100644 --- a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk +++ b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk @@ -14,9 +14,9 @@ GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB # freetype is only used by examples, but if it is not found # and the host has a freetype-config script, then the host # include dirs are added to the search path causing trouble -GST_PLUGINS_BASE_CONF_ENV = - FT2_CONFIG=/bin/false \ - ac_cv_header_stdint_t="stdint.h" +GST_PLUGINS_BASE_CONF_ENV = \ + FT2_CONFIG=/bin/false \ + ac_cv_header_stdint_t="stdint.h" GST_PLUGINS_BASE_CONF_OPTS = \ --disable-examples \ From 1d57b8ae51c9221cc00b208d5756947d5cf3a926 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 12 Apr 2017 08:42:49 -0300 Subject: [PATCH 2903/3392] systemd: select fsck wrapper from util-linux Select the fsck required by systemd provided by util-linux. This prevents ending up with fsck from busybox, which is incompatible with systemd. Signed-off-by: Carlos Santos Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit 3fddb73ffd17f8a8f701f780e3c28a0f70f45da4) Signed-off-by: Peter Korsgaard --- package/systemd/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index aaed7dc020..ac8175c337 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -22,6 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_NOLOGIN + select BR2_PACKAGE_UTIL_LINUX_FSCK select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools select BR2_PACKAGE_KMOD_TOOLS @@ -61,6 +62,11 @@ menuconfig BR2_PACKAGE_SYSTEMD - libgcrypt package will add support for journal sealing and DNSSEC verification in resolved. + Notice that systemd selects the fsck wrapper from util-linux + but no particular fsck. is selected. You must choose + the apropriate ones (e.g. e2fsck, from the e2fsprogs package) + according to the system configuration. + http://freedesktop.org/wiki/Software/systemd if BR2_PACKAGE_SYSTEMD From 56938a2feb5c8159ee4569c1b0699dfb8628f4bd Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 10 Mar 2017 17:17:22 +0000 Subject: [PATCH 2904/3392] libcurl: bump version to 7.53.1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 07db6fa6e83560a6901a74685024d45872da68d7) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 2 +- package/libcurl/libcurl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 72cae81c0e..9c521e9501 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 b2345a8bef87b4c229dedf637cb203b5e21db05e20277c8e1094f0d4da180801 curl-7.53.0.tar.bz2 +sha256 1c7207c06d75e9136a944a2e0528337ce76f15b9ec9ae4bb30d703b59bf530e8 curl-7.53.1.tar.bz2 diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index b5dcb377b5..0249f5c53d 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.53.0 +LIBCURL_VERSION = 7.53.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 578d192c3cf56712ec8548d4fa61bb61ddb818c3 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 11 Apr 2017 20:56:12 +0300 Subject: [PATCH 2905/3392] libcurl: apply upstream security patch CVE-2017-7407: --write-out out of buffer read https://curl.haxx.se/docs/adv_20170403.html Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 08bf26bb34f87b6820e07b2858bb4fe49eef9048) Signed-off-by: Peter Korsgaard --- package/libcurl/0001-CVE-2017-7407.patch | 61 ++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 package/libcurl/0001-CVE-2017-7407.patch diff --git a/package/libcurl/0001-CVE-2017-7407.patch b/package/libcurl/0001-CVE-2017-7407.patch new file mode 100644 index 0000000000..3a9fa487a8 --- /dev/null +++ b/package/libcurl/0001-CVE-2017-7407.patch @@ -0,0 +1,61 @@ +From 6019f1795b4e3b72507b84b0e02dc8c32024f562 Mon Sep 17 00:00:00 2001 +From: Dan Fandrich +Date: Sat, 11 Mar 2017 10:59:34 +0100 +Subject: [PATCH] CVE-2017-7407: fixed + +Bug: https://curl.haxx.se/docs/adv_20170403.html + +Reported-by: Brian Carpenter +[baruch: remove tests] +Signed-off-by: Baruch Siach +--- +Patch status: based on upstream suggested patch[1] that combines commits +1890d59905414ab and 8e65877870c1. + +[1] https://curl.haxx.se/CVE-2017-7407.patch + +diff --git a/src/tool_writeout.c b/src/tool_writeout.c +index 2fb77742a..5d92bd278 100644 +--- a/src/tool_writeout.c ++++ b/src/tool_writeout.c +@@ -3,11 +3,11 @@ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * +- * Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. ++ * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * +@@ -111,11 +111,11 @@ void ourWriteOut(CURL *curl, struct OutStruct *outs, const char *writeinfo) + char *stringp = NULL; + long longinfo; + double doubleinfo; + + while(ptr && *ptr) { +- if('%' == *ptr) { ++ if('%' == *ptr && ptr[1]) { + if('%' == ptr[1]) { + /* an escaped %-letter */ + fputc('%', stream); + ptr += 2; + } +@@ -339,11 +339,11 @@ void ourWriteOut(CURL *curl, struct OutStruct *outs, const char *writeinfo) + fputc(ptr[1], stream); + ptr += 2; + } + } + } +- else if('\\' == *ptr) { ++ else if('\\' == *ptr && ptr[1]) { + switch(ptr[1]) { + case 'r': + fputc('\r', stream); + break; + case 'n': +-- 2.11.0 + From 4ff4b574a5e13611c06f3c84c0471791a9ad2885 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 12 Apr 2017 00:26:30 +0200 Subject: [PATCH 2906/3392] package/hiredis: fix installation logic of library While testing minetest with libhiredis library, the game crached due to missing libhiredis.so.0.13 library. The hiredis.mk doesn't use "make install" because "make install" depends on building both the shared and static libraries, which fails in static-only scenarios. However, the installation logic in hiredis.mk is bogus: it installs the library as libhiredis.so, while its SONAME is libhiredis.so.0.13. We fix this by using the same logic as the one done by the package "make install" process: install the library as libhiredis.so.0.13, and create libhiredis.so as a symbolic link to it. While at it: - Install the library 0755, this is more common. - Do not create $(TARGET_DIR)/usr/lib, since $(INSTALL) -D will create the necessary directories for the destination path. Signed-off-by: Romain Naour Cc: Fabrice Fontaine [Thomas: rework to use the same installation logic as the one from hiredis "make install".] Signed-off-by: Thomas Petazzoni (cherry picked from commit 96daacb720cffe1f83259462bef9d3da92925cd9) Signed-off-by: Peter Korsgaard --- package/hiredis/hiredis.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index cd406f1439..e485b42b24 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -4,7 +4,8 @@ # ################################################################################ -HIREDIS_VERSION = v0.13.3 +HIREDIS_VERSION_MAJOR = 0.13 +HIREDIS_VERSION = v$(HIREDIS_VERSION_MAJOR).3 HIREDIS_SITE = $(call github,redis,hiredis,$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3c HIREDIS_LICENSE_FILES = COPYING @@ -37,12 +38,15 @@ define HIREDIS_INSTALL_STAGING_CMDS $(@D)/adapters $(HIREDIS_INCLUDE_DIR) $(INSTALL) -D -m 0644 $(@D)/hiredis.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc - $(INSTALL) -m 0644 -t $(STAGING_DIR)/usr/lib $(@D)/libhiredis* + $(INSTALL) -D -m 0755 $(@D)/libhiredis.so \ + $(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) + ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(STAGING_DIR)/usr/lib/libhiredis.so endef define HIREDIS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - $(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/lib $(@D)/libhiredis* + $(INSTALL) -D -m 0755 $(@D)/libhiredis.so \ + $(TARGET_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) + ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(TARGET_DIR)/usr/lib/libhiredis.so endef $(eval $(generic-package)) From be1ab94c9eb66bd3c77bb73ddfd3a7813237d793 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 10 Apr 2017 16:02:46 +0100 Subject: [PATCH 2907/3392] granite: fix md5 hash Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 04d8d5961566f8ba80b16defdf1fc10542158537) Signed-off-by: Peter Korsgaard --- package/granite/granite.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/granite/granite.hash b/package/granite/granite.hash index 3c89685155..e073307d11 100644 --- a/package/granite/granite.hash +++ b/package/granite/granite.hash @@ -1,4 +1,4 @@ # From https://launchpad.net/granite/0.4/0.4.0.1/+download/granite-0.4.0.1.tar.xz/+md5 -md5 db41150ca6e77162392362686e848086 granite-0.3.1.tar.xz +md5 db41150ca6e77162392362686e848086 granite-0.4.0.1.tar.xz # Calculated based on the hash above sha256 95a142a8befeedc35a089d638e759b657905508dc3007036d6c1fa3efe94c4dd granite-0.4.0.1.tar.xz From d482d1297e4512a586e7d3d45a8f02198dca94b2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 10 Apr 2017 22:41:18 +0200 Subject: [PATCH 2908/3392] package/mplayer: fix musl build error Fixes http://autobuild.buildroot.net/results/08e/08ed316677f519c8005928366aea89570527a033/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 2184f48c4545d2629b1706112e7c9f380aac8d2b) Signed-off-by: Peter Korsgaard --- package/mplayer/0006-musl-ldt.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 package/mplayer/0006-musl-ldt.patch diff --git a/package/mplayer/0006-musl-ldt.patch b/package/mplayer/0006-musl-ldt.patch new file mode 100644 index 0000000000..8165f6f56a --- /dev/null +++ b/package/mplayer/0006-musl-ldt.patch @@ -0,0 +1,22 @@ +Fixes musl build error + +loader/ldt_keeper.o: In function `Setup_LDT_Keeper': +ldt_keeper.c:(.text+0xab): undefined reference to `modify_ldt' + +Downloaded from +https://github.com/dimkr/rlsd2/blob/master/rules/mplayer/musl.patch + +Signed-off-by: Bernd Kuhls + +diff -rup MPlayer-1.1.1-orig/loader/ldt_keeper.c MPlayer-1.1.1/loader/ldt_keeper.c +--- MPlayer-1.1.1-orig/loader/ldt_keeper.c 2015-04-23 15:07:09.580805888 +0300 ++++ MPlayer-1.1.1/loader/ldt_keeper.c 2015-04-23 15:08:07.736807270 +0300 +@@ -47,7 +47,7 @@ + #if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0)) + _syscall3( int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount ); + #else +-int modify_ldt(int func, void *ptr, unsigned long bytecount); ++#define modify_ldt(func, ptr, bytecount) syscall(__NR_modify_ldt, func, ptr, bytecount) + #endif + #else + #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) From 27ff183a9caa836aa89743657a7d1d4b05443bfb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 10 Apr 2017 22:41:19 +0200 Subject: [PATCH 2909/3392] package/mplayer: mmxext requires sse MPlayer contains mmxext code for which a SSE-enabled CPU is required, for details see https://bugs.funtoo.org/browse/FL-2202 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 0d202de1dd3c801a3b5486605bc7b927a13439ed) Signed-off-by: Peter Korsgaard --- package/mplayer/mplayer.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk index 8288dcb1ec..38452abdb0 100644 --- a/package/mplayer/mplayer.mk +++ b/package/mplayer/mplayer.mk @@ -303,9 +303,9 @@ MPLAYER_CONF_OPTS += \ endif ifeq ($(BR2_X86_CPU_HAS_SSE),y) -MPLAYER_CONF_OPTS += --enable-sse +MPLAYER_CONF_OPTS += --enable-mmxext --enable-sse else -MPLAYER_CONF_OPTS += --disable-sse +MPLAYER_CONF_OPTS += --disable-mmxext --disable-sse endif ifeq ($(BR2_X86_CPU_HAS_SSE2),y) From 023919520fb74330ba477bed033fafcf790dbd0a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 10 Apr 2017 22:41:20 +0200 Subject: [PATCH 2910/3392] package/mplayer: fix compilation failure with MMX in libmpcodecs/vf_fspp.c Compile error found while fixing http://autobuild.buildroot.net/results/642/6422adeef19ec547c7bc3f8ad3b0d51702015240/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit eabf4102ce07168988a826b79c6eb0c34d685e09) Signed-off-by: Peter Korsgaard --- package/mplayer/0007-fixmmx.patch | 77 +++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 package/mplayer/0007-fixmmx.patch diff --git a/package/mplayer/0007-fixmmx.patch b/package/mplayer/0007-fixmmx.patch new file mode 100644 index 0000000000..9634a3b667 --- /dev/null +++ b/package/mplayer/0007-fixmmx.patch @@ -0,0 +1,77 @@ +fix compilation failure with MMX + +Fixes +libmpcodecs/vf_fspp.c: In function 'column_fidct_c': +libmpcodecs/vf_fspp.c:750:5: error: unknown type name 'int_simd16_t' +libmpcodecs/vf_fspp.c:751:5: error: unknown type name 'int_simd16_t' +libmpcodecs/vf_fspp.c:752:5: error: unknown type name 'int_simd16_t' +libmpcodecs/vf_fspp.c:753:5: error: unknown type name 'int_simd16_t' +libmpcodecs/vf_fspp.c:789:18: error: 'FIX_0_707106781' undeclared (first use in this function) +libmpcodecs/vf_fspp.c:789:18: note: each undeclared identifier is reported only once for each function it appears in +libmpcodecs/vf_fspp.c:804:21: error: 'FIX_1_414213562_A' undeclared (first use in this function) +libmpcodecs/vf_fspp.c:817:18: error: 'FIX_0_382683433' undeclared (first use in this function) +libmpcodecs/vf_fspp.c:818:18: error: 'FIX_0_541196100' undeclared (first use in this function) +libmpcodecs/vf_fspp.c:819:18: error: 'FIX_1_306562965' undeclared (first use in this function) +libmpcodecs/vf_fspp.c:844:21: error: 'FIX_1_414213562' undeclared (first use in this function) +libmpcodecs/vf_fspp.c:845:21: error: 'FIX_1_847759065' undeclared (first use in this function) +libmpcodecs/vf_fspp.c:846:21: error: 'FIX_1_082392200' undeclared (first use in this function) +libmpcodecs/vf_fspp.c:847:21: error: 'FIX_2_613125930' undeclared (first use in this function) + +found using this defconfig after fixing the original bug: +http://autobuild.buildroot.net/results/642/6422adeef19ec547c7bc3f8ad3b0d51702015240/ + +Downloaded from upstream mailinglist: +http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-May/073488.html + +Signed-off-by: Bernd Kuhls + +diff -uNr MPlayer-1.3.0.org/libmpcodecs/vf_fspp.c MPlayer-1.3.0/libmpcodecs/vf_fspp.c +--- MPlayer-1.3.0.org/libmpcodecs/vf_fspp.c 2015-10-17 21:44:31.000000000 +0200 ++++ MPlayer-1.3.0/libmpcodecs/vf_fspp.c 2017-04-10 21:26:57.771819064 +0200 +@@ -173,7 +173,6 @@ + #define store_slice_s store_slice_c + #define store_slice2_s store_slice2_c + #define mul_thrmat_s mul_thrmat_c +-#define column_fidct_s column_fidct_c + #define row_idct_s row_idct_c + #define row_fdct_s row_fdct_c + +@@ -393,7 +392,6 @@ + ); + } + +-static void column_fidct_mmx(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); + static void row_idct_mmx(int16_t* workspace, + int16_t* output_adr, int output_stride, int cnt); + static void row_fdct_mmx(int16_t *data, const uint8_t *pixels, int line_size, int cnt); +@@ -401,11 +399,18 @@ + #define store_slice_s store_slice_mmx + #define store_slice2_s store_slice2_mmx + #define mul_thrmat_s mul_thrmat_mmx +-#define column_fidct_s column_fidct_mmx + #define row_idct_s row_idct_mmx + #define row_fdct_s row_fdct_mmx + #endif // HAVE_MMX_INLINE + ++#if !HAVE_MMXEXT_INLINE ++static void column_fidct_c(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); ++#define column_fidct_s column_fidct_c ++#else ++static void column_fidct_mmx(int16_t* thr_adr, int16_t *data, int16_t *output, int cnt); ++#define column_fidct_s column_fidct_mmx ++#endif ++ + static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, + int dst_stride, int src_stride, + int width, int height, +@@ -728,7 +733,9 @@ + DECLARE_ASM_CONST(8, uint64_t, MM_DESCALE_RND)=C64(4); + DECLARE_ASM_CONST(8, uint64_t, MM_2)=C64(2); + +-#else /* !HAVE_MMXEXT_INLINE */ ++#endif /* !HAVE_MMX_INLINE */ ++ ++#if !HAVE_MMX_INLINE || !HAVE_MMXEXT_INLINE + + typedef int32_t int_simd16_t; + static const int16_t FIX_0_382683433=FIX(0.382683433, 14); From 97e5325375c1af7cc97e181fce11af387a2f5c45 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 13 Apr 2017 08:07:26 +0300 Subject: [PATCH 2911/3392] trinity: fix glibc/kernel headers conflict Add upstream patch that fixes conflicting definitions of ax25 related structs. Fixes: http://autobuild.buildroot.net/results/b40/b40d045f41dc4dbc66d5092ea5e9e045cd825e31/ http://autobuild.buildroot.net/results/367/367199b6071c450159aa2ea74d6d1b4b7cb89a88/ http://autobuild.buildroot.net/results/35e/35e97e51a6f7184d7b708c62a726ab91a0f546b2/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 110eb42854578001838fccab4a388b3fa8269f82) Signed-off-by: Peter Korsgaard --- package/trinity/trinity.hash | 1 + package/trinity/trinity.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/trinity/trinity.hash b/package/trinity/trinity.hash index e290a40920..5bf9992dca 100644 --- a/package/trinity/trinity.hash +++ b/package/trinity/trinity.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 3ef7ae05dba14f8bb626121983a08bb09d1d51a19de38bd9a8e0f29b11d9e3c9 trinity-v1.6.tar.gz +sha256 5601474b10973b99f6f4ecc67c8ac54000754d7110553cc81c7648bd7e73c810 b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk index 7596e92ba8..ee00d78279 100644 --- a/package/trinity/trinity.mk +++ b/package/trinity/trinity.mk @@ -9,6 +9,8 @@ TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION)) TRINITY_LICENSE = GPLv2 TRINITY_LICENSE_FILES = COPYING +TRINITY_PATCH = https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch + define TRINITY_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.sh) endef From ae5cfc15f511e27e3b406546a0b67136ae151ae0 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 13 Apr 2017 14:32:09 +0100 Subject: [PATCH 2912/3392] bind: bump version to 9.11.0-P5 (security) Security Fixes: - rndc "" could trigger an assertion failure in named. This flaw is disclosed in (CVE-2017-3138). [RT #44924] - Some chaining (i.e., type CNAME or DNAME) responses to upstream queries could trigger assertion failures. This flaw is disclosed in CVE-2017-3137. [RT #44734] - dns64 with break-dnssec yes; can result in an assertion failure. This flaw is disclosed in CVE-2017-3136. [RT #44653] - If a server is configured with a response policy zone (RPZ) that rewrites an answer with local data, and is also configured for DNS64 address mapping, a NULL pointer can be read triggering a server crash. This flaw is disclosed in CVE-2017-3135. [RT #44434] - A coding error in the nxdomain-redirect feature could lead to an assertion failure if the redirection namespace was served from a local authoritative data source such as a local zone or a DLZ instead of via recursive lookup. This flaw is disclosed in CVE-2016-9778. [RT #43837] - named could mishandle authority sections with missing RRSIGs, triggering an assertion failure. This flaw is disclosed in CVE-2016-9444. [RT #43632] - named mishandled some responses where covering RRSIG records were returned without the requested data, resulting in an assertion failure. This flaw is disclosed in CVE-2016-9147. [RT #43548] - named incorrectly tried to cache TKEY records which could trigger an assertion failure when there was a class mismatch. This flaw is disclosed in CVE-2016-9131. [RT #43522] - It was possible to trigger assertions when processing responses containing answers of type DNAME. This flaw is disclosed in CVE-2016-8864. [RT #43465] Full release notes: ftp://ftp.isc.org/isc/bind9/9.11.0-P5/RELEASE-NOTES-bind-9.11.0-P5.html Also, remove --enable-rrl configure option from bind.mk as it doesn't exist anymore. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 1727ea972bb8202ba15247e53bc54b47fa76c69e) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 780e43b9a0..8d44d99646 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,2 +1,2 @@ -# Verified from http://ftp.isc.org/isc/bind9/9.11.0-P3/bind-9.11.0-P3.tar.gz.sha256.asc -sha256 0feee0374bcbdee73a9d4277f3c5007622279572d520d7c27a4b64015d8ca9e9 bind-9.11.0-P3.tar.gz +# Verified from http://ftp.isc.org/isc/bind9/9.11.0-P5/bind-9.11.0-P5.tar.gz.sha256.asc +sha256 1e283f0567b484687dfd7b936e26c9af4f64043daf73cbd8f3eb1122c9fb71f5 bind-9.11.0-P5.tar.gz diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 860ee9d5e8..2903a31635 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.0-P3 +BIND_VERSION = 9.11.0-P5 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) @@ -29,7 +29,6 @@ BIND_CONF_OPTS = \ --enable-epoll \ --with-libtool \ --with-gssapi=no \ - --enable-rrl \ --enable-filter-aaaa ifeq ($(BR2_PACKAGE_ZLIB),y) From a29fa4bb774c4d0a192248e0369f9b31c8b23e9d Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 13 Apr 2017 14:37:20 +0100 Subject: [PATCH 2913/3392] wireshark: bump version to 2.2.6 (security) Security fixes: - wnpa-sec-2017-12 IMAP dissector crash (Bug 13466) CVE-2017-7703 - wnpa-sec-2017-13 WBMXL dissector infinite loop (Bug 13477) CVE-2017-7702 - wnpa-sec-2017-14 NetScaler file parser infinite loop (Bug 13478) CVE-2017-7700 - wnpa-sec-2017-15 RPCoRDMA dissector infinite loop (Bug 13558) CVE-2017-7705 - wnpa-sec-2017-16 BGP dissector infinite loop (Bug 13557) CVE-2017-7701 - wnpa-sec-2017-17 DOF dissector infinite loop (Bug 13453) CVE-2017-7704 - wnpa-sec-2017-18 PacketBB dissector crash (Bug 13559) - wnpa-sec-2017-19 SLSK dissector long loop (Bug 13576) - wnpa-sec-2017-20 SIGCOMP dissector infinite loop (Bug 13578) - wnpa-sec-2017-21 WSP dissector infinite loop (Bug 13581) Full release notes: https://www.wireshark.org/docs/relnotes/wireshark-2.2.6.html Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 156e31e5b32bff6e3e0684fc8aa182c97da3e651) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 3d1f7af4f3..09f6573a16 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,2 +1,2 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.5.txt -sha256 75dd88d3d6336559e5b0b72077d8a772a988197d571f00029986225fef609ac8 wireshark-2.2.5.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.6.txt +sha256 f627d51eda85f5ae5f5c8c9fc1f6539ffc2a270dd7500dc7f67490a8534ca849 wireshark-2.2.6.tar.bz2 diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 14c29431fc..fee6a81739 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.5 +WIRESHARK_VERSION = 2.2.6 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 9d1e422788ec408fc9e2ed3fb679aade57490468 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 13 Apr 2017 07:07:32 +0200 Subject: [PATCH 2914/3392] glibc: add patches to fix sh4 compile issue Fixes: https://bugs.busybox.net/show_bug.cgi?id=9756 [Peter: drop 2.25.x patch] Signed-off-by: Waldemar Brodkorb [Thomas: rework patches as Git formatted patches, fix numbering.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 5f2cff973a8a64411d85ccb9d5c9a40962d67552) Signed-off-by: Peter Korsgaard --- .../0005-sh-Fix-building-with-gcc5-6.patch | 56 +++++++++++++++++++ .../0001-sh-Fix-building-with-gcc5-6.patch | 56 +++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 package/glibc/2.23/0005-sh-Fix-building-with-gcc5-6.patch create mode 100644 package/glibc/2.24/0001-sh-Fix-building-with-gcc5-6.patch diff --git a/package/glibc/2.23/0005-sh-Fix-building-with-gcc5-6.patch b/package/glibc/2.23/0005-sh-Fix-building-with-gcc5-6.patch new file mode 100644 index 0000000000..fa43add339 --- /dev/null +++ b/package/glibc/2.23/0005-sh-Fix-building-with-gcc5-6.patch @@ -0,0 +1,56 @@ +From dbb9ecfaac8db022292791936733e0841a0aa447 Mon Sep 17 00:00:00 2001 +From: Alexey Neyman +Date: Wed, 8 Feb 2017 16:00:57 -0200 +Subject: [PATCH] sh: Fix building with gcc5/6 + +Build glibc for sh4-unknown-linux-gnu currently fails if one's +using GCC5/6: in dl-conflict.c, the elf_machine_rela() function +is called with NULL as its 3rd argument, sym. The implementation +of that function in sysdeps/sh/dl-machine.h dereferences that pointer: + +const Elf32_Sym *const refsym = sym; +... +if (map == &GL(dl_rtld_map)) + value -= map->l_addr + refsym->st_value + reloc->r_addend; + +GCC discovers a null pointer dereference, and in accordance with +-fdelete-null-pointer-checks (which is enabled in -O2) replaces this +code with a trap - which, as SH does not implement a trap pattern in +GCC, evaluates to an abort() call. This abort() call pulls many more +objects from libc_nonshared.a, eventually resulting in link failure +due to multiple definitions for a number of symbols. + +As far as I see, the conditional before this code is always false in +rtld: _dl_resolve_conflicts() is called with main_map as the first +argument, not GL(_dl_rtld_map), but since that call is in yet another +compilation unit, GCC does not know about it. Patch that wraps this +conditional into !defined RESOLVE_CONFLICT_FIND_MAP attached. + + * sysdeps/sh/dl-machine.h (elf_machine_rela): The condition + in R_SH_DIR32 case is always false when inlined from + dl-conflict.c. Ifdef out to prevent GCC from insertin an + abort() call. + +[Waldemar: backport of +https://sourceware.org/git/?p=glibc.git;a=commit;h=d40dbe722f004f999b589de776f7e57e564dda01.] +Signed-off-by: Waldemar Brodkorb +--- + sysdeps/sh/dl-machine.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h +index 5bb37d0..6509055 100644 +--- a/sysdeps/sh/dl-machine.h ++++ b/sysdeps/sh/dl-machine.h +@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, + break; + case R_SH_DIR32: + { +-#ifndef RTLD_BOOTSTRAP ++#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP + /* This is defined in rtld.c, but nowhere in the static + libc.a; make the reference weak so static programs can + still link. This declaration cannot be done when +-- +2.7.4 + diff --git a/package/glibc/2.24/0001-sh-Fix-building-with-gcc5-6.patch b/package/glibc/2.24/0001-sh-Fix-building-with-gcc5-6.patch new file mode 100644 index 0000000000..821f2c65f9 --- /dev/null +++ b/package/glibc/2.24/0001-sh-Fix-building-with-gcc5-6.patch @@ -0,0 +1,56 @@ +From 98cadd4b9fa8e32d1d0dea8e46b5ba829af4e8a2 Mon Sep 17 00:00:00 2001 +From: Alexey Neyman +Date: Wed, 8 Feb 2017 16:00:57 -0200 +Subject: [PATCH] sh: Fix building with gcc5/6 + +Build glibc for sh4-unknown-linux-gnu currently fails if one's +using GCC5/6: in dl-conflict.c, the elf_machine_rela() function +is called with NULL as its 3rd argument, sym. The implementation +of that function in sysdeps/sh/dl-machine.h dereferences that pointer: + +const Elf32_Sym *const refsym = sym; +... +if (map == &GL(dl_rtld_map)) + value -= map->l_addr + refsym->st_value + reloc->r_addend; + +GCC discovers a null pointer dereference, and in accordance with +-fdelete-null-pointer-checks (which is enabled in -O2) replaces this +code with a trap - which, as SH does not implement a trap pattern in +GCC, evaluates to an abort() call. This abort() call pulls many more +objects from libc_nonshared.a, eventually resulting in link failure +due to multiple definitions for a number of symbols. + +As far as I see, the conditional before this code is always false in +rtld: _dl_resolve_conflicts() is called with main_map as the first +argument, not GL(_dl_rtld_map), but since that call is in yet another +compilation unit, GCC does not know about it. Patch that wraps this +conditional into !defined RESOLVE_CONFLICT_FIND_MAP attached. + + * sysdeps/sh/dl-machine.h (elf_machine_rela): The condition + in R_SH_DIR32 case is always false when inlined from + dl-conflict.c. Ifdef out to prevent GCC from insertin an + abort() call. + +[Waldemar: backport of +https://sourceware.org/git/?p=glibc.git;a=commit;h=d40dbe722f004f999b589de776f7e57e564dda01.] +Signed-off-by: Waldemar Brodkorb +--- + sysdeps/sh/dl-machine.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h +index 5bb37d0..6509055 100644 +--- a/sysdeps/sh/dl-machine.h ++++ b/sysdeps/sh/dl-machine.h +@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, + break; + case R_SH_DIR32: + { +-#ifndef RTLD_BOOTSTRAP ++#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP + /* This is defined in rtld.c, but nowhere in the static + libc.a; make the reference weak so static programs can + still link. This declaration cannot be done when +-- +2.7.4 + From 2de0f39ed6ddbcde9fc20f9abe19f426cd3d11b1 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 13 Apr 2017 22:20:47 -0500 Subject: [PATCH 2915/3392] busybox: preserve ncurses progs/tools The ncurses package installs a full version of clear and reset(tset) tools. Preserve these by disabling the options in the busybox config file. This removes the need for ncurses to depend on busybox for solely ordering of target install. This commit resolves the following python circular dependency with python. busybox -> libselinux -> python3 -> ncurses -> busybox Fixes: http://autobuild.buildroot.net/results/db1/db1e6f3054092fc5576ccab8e04a3b9d74ca9a8c/ Signed-off-by: Matthew Weber [Thomas: minor tweaks.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 33c72344a8686a136c1da6a056ed6c0945bbf8b7) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 12 ++++++++++++ package/ncurses/ncurses.mk | 5 ----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 577f2f2470..7cc559c3c3 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -148,6 +148,17 @@ define BUSYBOX_MUSL_TWEAKS endef endif +ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PROGS),y) +# Ncurses package overlaps: +# /usr/bin/clear +# /usr/bin/reset -> /usr/bin/tset (symlink) +# +define BUSYBOX_DISABLE_NCURSES_PROGS + $(call KCONFIG_DISABLE_OPT,CONFIG_CLEAR,$(BUSYBOX_BUILD_CONFIG)) + $(call KCONFIG_DISABLE_OPT,CONFIG_RESET,$(BUSYBOX_BUILD_CONFIG)) +endef +endif + define BUSYBOX_INSTALL_UDHCPC_SCRIPT if grep -q CONFIG_UDHCPC=y $(@D)/.config; then \ $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \ @@ -229,6 +240,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_WATCHDOG) $(BUSYBOX_SET_SELINUX) $(BUSYBOX_MUSL_TWEAKS) + $(BUSYBOX_DISABLE_NCURSES_PROGS) endef define BUSYBOX_CONFIGURE_CMDS diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 9d1b75d641..bc0ea290b5 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -28,11 +28,6 @@ NCURSES_CONF_OPTS = \ $(if $(BR2_PACKAGE_NCURSES_TARGET_PROGS),,--without-progs) \ --without-manpages -# Install after busybox for the full-blown versions -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -NCURSES_DEPENDENCIES += busybox -endif - ifeq ($(BR2_STATIC_LIBS),y) NCURSES_CONF_OPTS += --without-shared --with-normal else ifeq ($(BR2_SHARED_LIBS),y) From bac22a6f553267146b9454cb32ad19b6ae1f8483 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 14 Apr 2017 15:02:25 +0200 Subject: [PATCH 2916/3392] package/hiredis: fix install step for static build only The previous patch [1] didn't take into acount the static build only scenario. It tries to unconditionally install a shared library. Handle the install step like for bzip2 package: install the shared library only if BR2_SHARED_LIBS or BR2_SHARED_STATIC_LIBS is set and install the static library only if BR2_STATIC_LIBS or BR2_SHARED_STATIC_LIBS is set. [1] 96daacb720cffe1f83259462bef9d3da92925cd9 Fixes: http://autobuild.buildroot.net/results/6be/6be8024dd664af83fcf49ede29c8ad59a37f73d1 Signed-off-by: Romain Naour Cc: Fabrice Fontaine Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni (cherry picked from commit 10ffe1f65ce2975eb7fad426c466a5d80e3a82ba) Signed-off-by: Peter Korsgaard --- package/hiredis/hiredis.mk | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index e485b42b24..598e0147d3 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -31,6 +31,26 @@ endef HIREDIS_INCLUDE_DIR = $(STAGING_DIR)/usr/include/hiredis +ifeq ($(BR2_SHARED_LIBS),) +define HIREDIS_INSTALL_STAGING_STATIC_LIB + $(INSTALL) -D -m 0755 $(@D)/libhiredis.a \ + $(STAGING_DIR)/usr/lib/libhiredis.a +endef +endif + +ifeq ($(BR2_STATIC_LIBS),) +define HIREDIS_INSTALL_STAGING_SHARED_LIB + $(INSTALL) -D -m 0755 $(@D)/libhiredis.so \ + $(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) + ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(STAGING_DIR)/usr/lib/libhiredis.so +endef +define HIREDIS_INSTALL_TARGET_SHARED_LIB + $(INSTALL) -D -m 0755 $(@D)/libhiredis.so \ + $(TARGET_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) + ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(TARGET_DIR)/usr/lib/libhiredis.so +endef +endif + # Do not call make install as this target will build shared and static libraries define HIREDIS_INSTALL_STAGING_CMDS mkdir -p $(HIREDIS_INCLUDE_DIR) @@ -38,15 +58,12 @@ define HIREDIS_INSTALL_STAGING_CMDS $(@D)/adapters $(HIREDIS_INCLUDE_DIR) $(INSTALL) -D -m 0644 $(@D)/hiredis.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc - $(INSTALL) -D -m 0755 $(@D)/libhiredis.so \ - $(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) - ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(STAGING_DIR)/usr/lib/libhiredis.so + $(HIREDIS_INSTALL_STAGING_STATIC_LIB) + $(HIREDIS_INSTALL_STAGING_SHARED_LIB) endef define HIREDIS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/libhiredis.so \ - $(TARGET_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) - ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(TARGET_DIR)/usr/lib/libhiredis.so + $(HIREDIS_INSTALL_TARGET_SHARED_LIB) endef $(eval $(generic-package)) From 7e48857917e746bad70ce08464461d6843ed1ac8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Apr 2017 14:12:36 +0200 Subject: [PATCH 2917/3392] package/mpv: disable cuda support mpv wrongly detects cuda being available: Checking for CUDA hwaccel : yes leading to build errors. Fixes http://autobuild.buildroot.net/results/e89/e892a537265ad7259024403a0bb3ca5da85ed096/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 030bebd7f137ffc9c41d4911c7957f720ed971c6) Signed-off-by: Peter Korsgaard --- package/mpv/mpv.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index 5b83b6d942..25b54e5e8e 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -23,6 +23,7 @@ MPV_CONF_OPTS = \ --disable-cdda \ --disable-cocoa \ --disable-coreaudio \ + --disable-cuda-hwaccel \ --disable-libv4l2 \ --disable-opensles \ --disable-rpi \ From de2534bb545d7f656e1a33b75ab873acb12056ea Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Mon, 17 Apr 2017 14:57:10 +0530 Subject: [PATCH 2918/3392] which: update homepage URL Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni (cherry picked from commit 8e9a990ae96c2da7f6d237223674d6215ddd5e34) Signed-off-by: Peter Korsgaard --- package/which/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/which/Config.in b/package/which/Config.in index db090ea87a..0dc31b223a 100644 --- a/package/which/Config.in +++ b/package/which/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_WHICH help The standard 'which' utility. - http://www.xs4all.nl/~carlo17/which/ + http://carlowood.github.io/which/index.html From 892e908120cebbc4ef2a8af7aa1a41d12d1280e3 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 16 Apr 2017 21:49:06 +0200 Subject: [PATCH 2919/3392] package/libunwind: disable for x86 with uClibc toolchain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libunwind use sigreturn() while building for x86 [1] but this function is not available with uClibc-ng. This throw a warning during libunwind build: In file included from x86/Los-linux.c:4:0: x86/Gos-linux.c: In function ‘_ULx86_local_resume’: x86/Gos-linux.c:298:7: warning: implicit declaration of function ‘sigreturn’ [-Wimplicit-function-declaration] sigreturn (sc); ^ But any program trying to link against libunwind-generic.so fail to build: [...]usr/lib/libunwind-generic.so: undefined reference to `sigreturn' collect2: error: ld returned 1 exit status Disable libunwind for x86 target when uClibc-ng is used. Fixes: http://autobuild.buildroot.net/results/54a/54afac8148cff5f3c17e83f80917fd9006948fe0//build-end.log [1] http://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=blob;f=src/x86/Gos-linux.c;h=17aebc2974af50eb0bf8292689b2ed22a4c97866;hb=HEAD#l299 Signed-off-by: Romain Naour Tested-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit c5b56b0a20b2be24878d8bae66fbe665e8fea698) Signed-off-by: Peter Korsgaard --- package/libunwind/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in index 5527a2bc21..9007ce51c2 100644 --- a/package/libunwind/Config.in +++ b/package/libunwind/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS BR2_mips64el || BR2_powerpc || BR2_sh || BR2_i386 || BR2_x86_64) default y if BR2_TOOLCHAIN_USES_UCLIBC && \ (((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \ - BR2_i386 || BR2_mips || BR2_mipsel || \ + BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el || BR2_x86_64) default y if BR2_TOOLCHAIN_USES_MUSL && \ (((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \ From bce9b77e0434aff0016bf67a85a2e2d2e5dcde4f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 18 Apr 2017 15:54:29 +0200 Subject: [PATCH 2920/3392] package/linux-headers: bump 3.12.x and 4.{4, 9, 10}.x series [Peter: drop 4.10.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a96a8435d572a76b7529435a243654ab48bc6370) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a414fe0ceb..f4a8430619 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -217,12 +217,12 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.88" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 - default "3.12.72" if BR2_KERNEL_HEADERS_3_12 + default "3.12.73" if BR2_KERNEL_HEADERS_3_12 default "3.18.48" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.61" if BR2_KERNEL_HEADERS_4_4 + default "4.4.62" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.22" if BR2_KERNEL_HEADERS_4_9 + default "4.9.23" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 6736d2f604ef037ecb07d073e97062c637bed674 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 20 Apr 2017 20:34:28 +0300 Subject: [PATCH 2921/3392] libnspr: bump to version 4.14 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 7e1f3171ac98dd25d5e656a888bcff046353087d) Signed-off-by: Peter Korsgaard --- 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 a4b19b7f9c..9111a32c86 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.13.1/src/SHA256SUMS -sha256 5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab nspr-4.13.1.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.14/src/SHA256SUMS +sha256 64fc18826257403a9132240aa3c45193d577a84b08e96f7e7770a97c074d17d5 nspr-4.14.tar.gz diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index d95f970988..f891bb3bfb 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.13.1 +LIBNSPR_VERSION = 4.14 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 bb64a4f87e959d07ac7dd325d05c6afd1f2592ee Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 20 Apr 2017 20:34:29 +0300 Subject: [PATCH 2922/3392] libnss: security bump to version 3.30.2 CVE-2017-5461 - Out-of-bounds write in Base64 encoding in NSS. Might cause remote arbitrary code execution (https://access.redhat.com/errata/RHSA-2017:1100). CVE-2017-5462 - DRBG flaw in NSS Drop 0001-cross-compile.patch and TARGET* variables. Upstream Makefile now allows override of CC, so use TARGET_CONFIGURE_OPTS instead. Drop upstream 0003-it-uninitialized-fix.patch. Renumber the remaining patch. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 09b8e1079ec97d9843430930414a95ac8450a652) Signed-off-by: Peter Korsgaard --- package/libnss/0001-cross-compile.patch | 48 ------------------- .../{0002-uclibc.patch => 0001-uclibc.patch} | 0 .../libnss/0003-it-uninitialized-fix.patch | 24 ---------- package/libnss/libnss.hash | 4 +- package/libnss/libnss.mk | 12 ++--- 5 files changed, 6 insertions(+), 82 deletions(-) delete mode 100644 package/libnss/0001-cross-compile.patch rename package/libnss/{0002-uclibc.patch => 0001-uclibc.patch} (100%) delete mode 100644 package/libnss/0003-it-uninitialized-fix.patch diff --git a/package/libnss/0001-cross-compile.patch b/package/libnss/0001-cross-compile.patch deleted file mode 100644 index 31de71bc5a..0000000000 --- a/package/libnss/0001-cross-compile.patch +++ /dev/null @@ -1,48 +0,0 @@ -This patch allows us to set a value for the cross compiler via TARGETCC without -setting CC on the command line. CC is used for host tools as well as cross -compiled code so we cannot define it on the command line without breaking -the host tools build. - -[Gustavo: update for nss 3.16.1] -[baruch: add OPTIMIZER handling] -Signed-off-by: Will Newton - -diff -Nuar nss-3.16.1-orig/nss/coreconf/Linux.mk nss-3.16.1/nss/coreconf/Linux.mk ---- nss-3.16.1-orig/nss/coreconf/Linux.mk 2014-05-02 06:27:18.000000000 +0300 -+++ nss-3.16.1/nss/coreconf/Linux.mk 2014-07-01 02:38:18.701480512 +0300 -@@ -16,9 +16,13 @@ - IMPL_STRATEGY = _PTH - endif - --CC = gcc --CCC = g++ --RANLIB = ranlib -+TARGETCC = gcc -+TARGETCCC = g++ -+TARGETRANLIB = ranlib -+ -+CC = $(TARGETCC) -+CCC = $(TARGETCCC) -+RANLIB = $(TARGETRANLIB) - - DEFAULT_COMPILER = gcc - -@@ -125,6 +129,7 @@ - endif - endif - -+OPTIMIZER = $(TARGET_OPTIMIZER) - - ifeq ($(USE_PTHREADS),1) - OS_PTHREAD = -lpthread -diff -Nuar nss-3.16.1-orig/nss/coreconf/nsinstall/Makefile nss-3.16.1/nss/coreconf/nsinstall/Makefile ---- nss-3.16.1-orig/nss/coreconf/nsinstall/Makefile 2014-05-02 06:27:18.000000000 +0300 -+++ nss-3.16.1/nss/coreconf/nsinstall/Makefile 2014-07-01 02:38:48.102185011 +0300 -@@ -31,6 +31,7 @@ - - ifdef NATIVE_FLAGS - OS_CFLAGS=$(NATIVE_FLAGS) -+OPTIMIZER= - endif - - include $(DEPTH)/coreconf/rules.mk diff --git a/package/libnss/0002-uclibc.patch b/package/libnss/0001-uclibc.patch similarity index 100% rename from package/libnss/0002-uclibc.patch rename to package/libnss/0001-uclibc.patch diff --git a/package/libnss/0003-it-uninitialized-fix.patch b/package/libnss/0003-it-uninitialized-fix.patch deleted file mode 100644 index 7736c6a939..0000000000 --- a/package/libnss/0003-it-uninitialized-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -# HG changeset patch -# User catdesk -# Date 1477710600 -7200 -# Sat Oct 29 05:10:00 2016 +0200 -# Node ID b9ef971b94ab110302d49255339077bc1b4aed7f -# Parent eb8c96563cd70aa69d48b01516085f7d2fb46178 -Bug 1313846 - Declare 'it = NULL' earlier. r=franziskus - -[Thomas: patch taken from upstream mercurial repository, revision -12791.] -Signed-off-by: Thomas Petazzoni - -diff -r eb8c96563cd7 -r b9ef971b94ab lib/jar/jarfile.c ---- a/nss/lib/jar/jarfile.c Mon Oct 31 17:31:20 2016 +0100 -+++ b/nss/lib/jar/jarfile.c Sat Oct 29 05:10:00 2016 +0200 -@@ -657,7 +657,7 @@ - jar_listzip(JAR *jar, JAR_FILE fp) - { - ZZLink *ent; -- JAR_Item *it; -+ JAR_Item *it = NULL; - JAR_Physical *phy = NULL; - struct ZipLocal *Local = PORT_ZNew(struct ZipLocal); - struct ZipCentral *Central = PORT_ZNew(struct ZipCentral); diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 975e52d238..7be7e48a69 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_27_2_RTM/src/SHA256SUMS -sha256 dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524 nss-3.27.2.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_30_2_RTM/src/SHA256SUMS +sha256 0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24 nss-3.30.2.tar.gz diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 76532e8117..3c38bb0c16 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.27.2 +LIBNSS_VERSION = 3.30.2 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 @@ -33,9 +33,6 @@ LIBNSS_BUILD_VARS = \ NSS_USE_SYSTEM_SQLITE=1 \ NSS_ENABLE_ECC=1 \ NATIVE_CC="$(HOSTCC)" \ - TARGETCC="$(TARGET_CC)" \ - TARGETCCC="$(TARGET_CXX)" \ - TARGETRANLIB="$(TARGET_RANLIB)" \ OS_ARCH="Linux" \ OS_RELEASE="2.6" \ OS_TEST="$(ARCH)" @@ -55,17 +52,16 @@ endif endif define LIBNSS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/nss coreconf \ + $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/nss coreconf \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ $(LIBNSS_BUILD_VARS) - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/nss lib/dbm all \ + $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/nss lib/dbm all \ SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ - $(LIBNSS_BUILD_VARS) TARGET_OPTIMIZER="$(TARGET_CFLAGS)" \ - NATIVE_FLAGS="$(HOST_CFLAGS)" + $(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS)" endef define LIBNSS_INSTALL_STAGING_CMDS From 86a16f169d36825d49b1780d8b90a51b1b3e4924 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 19 Apr 2017 10:07:42 +0100 Subject: [PATCH 2923/3392] libcurl: bump version to 7.54.0 (security) Security fixes: - CVE-2017-7468: switch off SSL session id when client cert is used Full changelog: https://curl.haxx.se/changes.html Removing 0001-CVE-2017-7407.patch. It's included in this release: https://github.com/curl/curl/commit/1890d59905414ab84a35892b2e45833654aa5c13 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 034e95e51e7dbe97a11d708c7762ff64861ec705) Signed-off-by: Peter Korsgaard --- package/libcurl/0001-CVE-2017-7407.patch | 61 ------------------------ package/libcurl/libcurl.hash | 2 +- package/libcurl/libcurl.mk | 2 +- 3 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 package/libcurl/0001-CVE-2017-7407.patch diff --git a/package/libcurl/0001-CVE-2017-7407.patch b/package/libcurl/0001-CVE-2017-7407.patch deleted file mode 100644 index 3a9fa487a8..0000000000 --- a/package/libcurl/0001-CVE-2017-7407.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6019f1795b4e3b72507b84b0e02dc8c32024f562 Mon Sep 17 00:00:00 2001 -From: Dan Fandrich -Date: Sat, 11 Mar 2017 10:59:34 +0100 -Subject: [PATCH] CVE-2017-7407: fixed - -Bug: https://curl.haxx.se/docs/adv_20170403.html - -Reported-by: Brian Carpenter -[baruch: remove tests] -Signed-off-by: Baruch Siach ---- -Patch status: based on upstream suggested patch[1] that combines commits -1890d59905414ab and 8e65877870c1. - -[1] https://curl.haxx.se/CVE-2017-7407.patch - -diff --git a/src/tool_writeout.c b/src/tool_writeout.c -index 2fb77742a..5d92bd278 100644 ---- a/src/tool_writeout.c -+++ b/src/tool_writeout.c -@@ -3,11 +3,11 @@ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * -- * Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. -+ * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at https://curl.haxx.se/docs/copyright.html. - * -@@ -111,11 +111,11 @@ void ourWriteOut(CURL *curl, struct OutStruct *outs, const char *writeinfo) - char *stringp = NULL; - long longinfo; - double doubleinfo; - - while(ptr && *ptr) { -- if('%' == *ptr) { -+ if('%' == *ptr && ptr[1]) { - if('%' == ptr[1]) { - /* an escaped %-letter */ - fputc('%', stream); - ptr += 2; - } -@@ -339,11 +339,11 @@ void ourWriteOut(CURL *curl, struct OutStruct *outs, const char *writeinfo) - fputc(ptr[1], stream); - ptr += 2; - } - } - } -- else if('\\' == *ptr) { -+ else if('\\' == *ptr && ptr[1]) { - switch(ptr[1]) { - case 'r': - fputc('\r', stream); - break; - case 'n': --- 2.11.0 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 9c521e9501..f8885e0488 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 1c7207c06d75e9136a944a2e0528337ce76f15b9ec9ae4bb30d703b59bf530e8 curl-7.53.1.tar.bz2 +sha256 f50ebaf43c507fa7cc32be4b8108fa8bbd0f5022e90794388f3c7694a302ff06 curl-7.54.0.tar.bz2 diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 0249f5c53d..6f4803e0c1 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.53.1 +LIBCURL_VERSION = 7.54.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 24d80453afd77e2d8b1c3384ae023b6dfe8ee38d Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 21 Apr 2017 15:57:07 -0400 Subject: [PATCH 2924/3392] uboot: fix target uboot defconfig warning The warning currently reads: No board defconfig name specified, check your BR2_TARGET_UBOOT_DEFCONFIG setting. It should read: No board defconfig name specified, check your BR2_TARGET_UBOOT_BOARD_DEFCONFIG setting. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit b7f095920a147c58f07b18f1b68553a1af03ae75) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 6b9d544546..782609a5f8 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -293,7 +293,7 @@ endif # UBOOT_BOARD_NAME else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y) ifeq ($(BR2_TARGET_UBOOT_USE_DEFCONFIG),y) ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_BOARD_DEFCONFIG)),) -$(error No board defconfig name specified, check your BR2_TARGET_UBOOT_DEFCONFIG setting) +$(error No board defconfig name specified, check your BR2_TARGET_UBOOT_BOARD_DEFCONFIG setting) endif # qstrip BR2_TARGET_UBOOT_BOARD_DEFCONFIG endif # BR2_TARGET_UBOOT_USE_DEFCONFIG ifeq ($(BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG),y) From 48447b9efcd5b03a4dd87a375e29f8f783293f56 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 25 Apr 2017 08:53:28 +0200 Subject: [PATCH 2925/3392] linux-headers: bump 3.18.x series to 3.18.50 Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f4a8430619..7e246b962b 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,7 +218,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 default "3.12.73" if BR2_KERNEL_HEADERS_3_12 - default "3.18.48" if BR2_KERNEL_HEADERS_3_18 + default "3.18.50" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 From 039f7d0d2faf172f1a3a709c5d7fe193b2f094b4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 24 Apr 2017 22:24:40 +0200 Subject: [PATCH 2926/3392] nodejs: bump 6.x version to 6.10.2 6.10.2 is the latest release in the LTS series, fixing a number of issues: https://nodejs.org/en/blog/release/v6.10.2/ Signed-off-by: Peter Korsgaard --- package/nodejs/Config.in | 2 +- package/nodejs/nodejs.hash | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index b8c45f5dcd..ad5ca050b2 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_PACKAGE_NODEJS_VERSION_STRING string - default "6.9.4" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS + default "6.10.2" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS default "0.10.48" config BR2_PACKAGE_NODEJS_NPM diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 8c8c5a3c23..4c63f58943 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ # From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt sha256 365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e node-v0.10.48.tar.xz -# From upstream URL: http://nodejs.org/dist/v6.9.4/SHASUMS256.txt -sha256 c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35 node-v6.9.4.tar.xz +# From upstream URL: http://nodejs.org/dist/v6.10.2/SHASUMS256.txt +sha256 80aa11333da99813973a99646e2113c6be5b63f665c0731ed14ecb94cbe846b6 node-v6.10.2.tar.xz From 392b4a6670dfd103887de7f7565ce8e2ffb23d08 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 24 Apr 2017 23:29:42 +0200 Subject: [PATCH 2927/3392] xen: security bump to version 4.7.2 The 4.7.2 release brings a number of bugfixes and improvements: https://www.xenproject.org/downloads/xen-archives/xen-project-47-series/xen-472.html Including fixes for the following security issues: XSA-191: x86 null segments not always treated as unusable (CVE-2016-9386) XSA-192: x86 task switch to VM86 mode mis-handled (CVE-2016-9382) XSA-193: x86 segment base write emulation lacking canonical address checks (CVE-2016-9385) XSA-194: guest 32-bit ELF symbol table load leaking host data (CVE-2016-9384) XSA-195: x86 64-bit bit test instruction emulation broken (CVE-2016-9383) XSA-196: x86 software interrupt injection mis-handled (CVE-2016-9377 CVE-2016-9378) XSA-197: qemu incautious about shared ring processing (CVE-2016-9381) XSA-198: delimiter injection vulnerabilities in pygrub (CVE-2016-9379 CVE-2016-9380) XSA-199: qemu ioport array overflow (CVE-2016-9637) XSA-200: x86 CMPXCHG8B emulation fails to ignore operand size override Files (CVE-2016-9932) XSA-201: ARM guests may induce host asynchronous abort (CVE-2016-9815 CVE-2016-9816 CVE-2016-9817 CVE-2016-9818) XSA-202: x86 PV guests may be able to mask interrupts (CVE-2016-10024) XSA-203: x86: missing NULL pointer check in VMFUNC emulation (CVE-2016-10025) XSA-204: x86: Mishandling of SYSCALL singlestep during emulation (CVE-2016-10013) XSA-207: memory leak when destroying guest without PT devices XSA-208: oob access in cirrus bitblt copy (CVE-2017-2615) XSA-209: cirrus_bitblt_cputovideo does not check if memory region is safe (CVE-2017-2620) Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index c3df2431e8..2143f4661d 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe xen-4.7.1.tar.gz +sha256 61494a56d9251e2108080f95b0dc8e3d175f1ba4da34603fc07b91cfebf358d5 xen-4.7.2.tar.gz diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 7d32e52702..9ff1b40225 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.7.1 +XEN_VERSION = 4.7.2 XEN_SITE = http://bits.xensource.com/oss-xen/release/$(XEN_VERSION) XEN_LICENSE = GPLv2 XEN_LICENSE_FILES = COPYING From 35f735cd5a2f23d297f1b6d9f09bf4273104a082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 16 Mar 2017 15:32:01 +0100 Subject: [PATCH 2928/3392] libsamplerate: security bump to version 0.1.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libsamplerate is relicensed under the 2 clause BSD license. Fixes CVE-2017-7697 - In libsamplerate before 0.1.9, a buffer over-read occurs in the calc_output_single function in src_sinc.c via a crafted audio file. For more details, see: https://blogs.gentoo.org/ago/2017/04/11/libsamplerate-global-buffer-overflow-in-calc_output_single-src_sinc-c/ [Peter: add CVE info] Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard (cherry picked from commit bcdaf4ca8482f0ecb02ee828ce0d3b16f724e9eb) Signed-off-by: Peter Korsgaard --- package/libsamplerate/libsamplerate.hash | 2 +- package/libsamplerate/libsamplerate.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsamplerate/libsamplerate.hash b/package/libsamplerate/libsamplerate.hash index a495108d3a..a303f0bcf8 100644 --- a/package/libsamplerate/libsamplerate.hash +++ b/package/libsamplerate/libsamplerate.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06 libsamplerate-0.1.8.tar.gz +sha256 0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1 libsamplerate-0.1.9.tar.gz diff --git a/package/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk index 28fd644fa3..802b5b14a9 100644 --- a/package/libsamplerate/libsamplerate.mk +++ b/package/libsamplerate/libsamplerate.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBSAMPLERATE_VERSION = 0.1.8 +LIBSAMPLERATE_VERSION = 0.1.9 LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC LIBSAMPLERATE_INSTALL_STAGING = YES LIBSAMPLERATE_DEPENDENCIES = host-pkgconf LIBSAMPLERATE_CONF_OPTS = --disable-fftw --program-transform-name='' -LIBSAMPLERATE_LICENSE = Dual GPLv2+ / libsamplerate commercial use license +LIBSAMPLERATE_LICENSE = BSD-2c LIBSAMPLERATE_LICENSE_FILES = COPYING ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) From 6b671fa3b63d80ca0226ad297af64e77064aaeec Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 21 Apr 2017 10:07:45 +0100 Subject: [PATCH 2929/3392] linux-headers: bump 4.{4,9,10}.x series [Peter: drop 4.10.x bump] Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit 37159734b01b2246272f1d419110b750df40cad5) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7e246b962b..747f24dd87 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.62" if BR2_KERNEL_HEADERS_4_4 + default "4.4.63" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.23" if BR2_KERNEL_HEADERS_4_9 + default "4.9.24" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From cf113c76dfd262dd8ba17e4eb19e7d3deed437bc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 25 Apr 2017 13:44:34 +0200 Subject: [PATCH 2930/3392] minicom: security bump to version 2.7.1 Fixes CVE-2017-7467 - minicom and prl-vzvncserver vt100.c escparms[] buffer overflow. For more details about the issue, see the nice writeup on oss-security: http://www.openwall.com/lists/oss-security/2017/04/18/5 Signed-off-by: Peter Korsgaard (cherry picked from commit 027a0d5b61326da318fb916ff52324b9f238d768) Signed-off-by: Peter Korsgaard --- package/minicom/minicom.hash | 2 +- package/minicom/minicom.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/minicom/minicom.hash b/package/minicom/minicom.hash index 33ba4ef10c..ca3087160b 100644 --- a/package/minicom/minicom.hash +++ b/package/minicom/minicom.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626a904f4 minicom-2.7.tar.gz +sha256 532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1 minicom-2.7.1.tar.gz diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk index 94a4628659..3aa11ed9f5 100644 --- a/package/minicom/minicom.mk +++ b/package/minicom/minicom.mk @@ -4,8 +4,8 @@ # ################################################################################ -MINICOM_VERSION = 2.7 -MINICOM_SITE = https://alioth.debian.org/frs/download.php/file/3977 +MINICOM_VERSION = 2.7.1 +MINICOM_SITE = https://alioth.debian.org/frs/download.php/file/4215 MINICOM_LICENSE = GPLv2+ MINICOM_LICENSE_FILES = COPYING From 32e514709f9955a29fea8f307b8907ec6f955ba9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 25 Apr 2017 15:44:23 +0200 Subject: [PATCH 2931/3392] python-web2py: security bump to version 2.14.6 CVE-2016-4806 - Web2py versions 2.14.5 and below was affected by Local File Inclusion vulnerability, which allows a malicious intended user to read/access web server sensitive files. CVE-2016-4807 - Web2py versions 2.14.5 and below was affected by Reflected XSS vulnerability, which allows an attacker to perform an XSS attack on logged in user (admin). CVE-2016-4808 - Web2py versions 2.14.5 and below was affected by CSRF (Cross Site Request Forgery) vulnerability, which allows an attacker to trick a logged in user to perform some unwanted actions i.e An attacker can trick an victim to disable the installed application just by sending a URL to victim. CVE-2016-10321 - web2py before 2.14.6 does not properly check if a host is denied before verifying passwords, allowing a remote attacker to perform brute-force attacks. Signed-off-by: Peter Korsgaard (cherry picked from commit a534030c6e67ff0319f8af2b55fe977a06f17dfd) Signed-off-by: Peter Korsgaard --- package/python-web2py/python-web2py.hash | 2 +- package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index 3de8dbf4de..9c1de904cb 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 7e22a5624d8d2909e165110f0bec6b43ee36ff6834d689f4027e06dece662031 python-web2py-R-2.12.3.tar.gz +sha256 6079aeaa352ec51e0da5e6abc71fa74cdb3a781e06a311b5826618624362a7b2 python-web2py-R-2.14.6.tar.gz diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 38faabc55d..af13e69c9b 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = R-2.12.3 +PYTHON_WEB2PY_VERSION = R-2.14.6 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPLv3 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From 0cef3aad7be515594e887b03e9cde15accb1b16d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 25 Apr 2017 16:16:59 +0200 Subject: [PATCH 2932/3392] libcroco: add upstream security fixes These have been added to upstream git after 0.6.12 was released. CVE-2017-7960 - The cr_input_new_from_uri function in cr-input.c in libcroco 0.6.11 and 0.6.12 allows remote attackers to cause a denial of service (heap-based buffer over-read) via a crafted CSS file. CVE-2017-7961 - The cr_tknzr_parse_rgb function in cr-tknzr.c in libcroco 0.6.11 and 0.6.12 has an "outside the range of representable values of type long" undefined behavior issue, which might allow remote attackers to cause a denial of service (application crash) or possibly have unspecified other impact via a crafted CSS file. For more details, see: https://blogs.gentoo.org/ago/2017/04/17/libcroco-heap-overflow-and-undefined-behavior/ Signed-off-by: Peter Korsgaard (cherry picked from commit 52bfb4b1ce25d870f9bab72d285f326ec7d0ad77) Signed-off-by: Peter Korsgaard --- ...k-end-of-input-before-reading-a-byte.patch | 62 +++++++++++++++++++ ...nzr-support-only-max-long-rgb-values.patch | 46 ++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 package/libcroco/0001-input-check-end-of-input-before-reading-a-byte.patch create mode 100644 package/libcroco/0002-tknzr-support-only-max-long-rgb-values.patch diff --git a/package/libcroco/0001-input-check-end-of-input-before-reading-a-byte.patch b/package/libcroco/0001-input-check-end-of-input-before-reading-a-byte.patch new file mode 100644 index 0000000000..831b1a7454 --- /dev/null +++ b/package/libcroco/0001-input-check-end-of-input-before-reading-a-byte.patch @@ -0,0 +1,62 @@ +From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Sun, 16 Apr 2017 13:13:43 +0200 +Subject: [PATCH] input: check end of input before reading a byte + +Fixes CVE-2017-7960 + +When reading bytes we weren't check that the index wasn't +out of bound and this could produce an invalid read which +could deal to a security bug. + +Signed-off-by: Peter Korsgaard +--- + src/cr-input.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/cr-input.c b/src/cr-input.c +index 49000b1..3b63a88 100644 +--- a/src/cr-input.c ++++ b/src/cr-input.c +@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc) + *we should free buf here because it's own by CRInput. + *(see the last parameter of cr_input_new_from_buf(). + */ +- buf = NULL ; ++ buf = NULL; + } + + cleanup: +@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this) + enum CRStatus + cr_input_read_byte (CRInput * a_this, guchar * a_byte) + { ++ gulong nb_bytes_left = 0; ++ + g_return_val_if_fail (a_this && PRIVATE (a_this) + && a_byte, CR_BAD_PARAM_ERROR); + +@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte) + if (PRIVATE (a_this)->end_of_input == TRUE) + return CR_END_OF_INPUT_ERROR; + ++ nb_bytes_left = cr_input_get_nb_bytes_left (a_this); ++ ++ if (nb_bytes_left < 1) { ++ return CR_END_OF_INPUT_ERROR; ++ } ++ + *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index]; + + if (PRIVATE (a_this)->nb_bytes - +@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char) + if (*a_char == '\n') { + PRIVATE (a_this)->end_of_line = TRUE; + } +- + } + + return status; +-- +2.11.0 + diff --git a/package/libcroco/0002-tknzr-support-only-max-long-rgb-values.patch b/package/libcroco/0002-tknzr-support-only-max-long-rgb-values.patch new file mode 100644 index 0000000000..1a9bcd947a --- /dev/null +++ b/package/libcroco/0002-tknzr-support-only-max-long-rgb-values.patch @@ -0,0 +1,46 @@ +From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Sun, 16 Apr 2017 13:56:09 +0200 +Subject: [PATCH] tknzr: support only max long rgb values + +Fixes CVE-2017-7961 + +This fixes a possible out of bound when reading rgbs which +are longer than the support MAXLONG + +Signed-off-by: Peter Korsgaard +--- + src/cr-tknzr.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c +index 1a7cfeb..1548c35 100644 +--- a/src/cr-tknzr.c ++++ b/src/cr-tknzr.c +@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) + status = cr_tknzr_parse_num (a_this, &num); + ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); + ++ if (num->val > G_MAXLONG) { ++ status = CR_PARSING_ERROR; ++ goto error; ++ } ++ + red = num->val; + cr_num_destroy (num); + num = NULL; +@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) + status = cr_tknzr_parse_num (a_this, &num); + ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); + ++ if (num->val > G_MAXLONG) { ++ status = CR_PARSING_ERROR; ++ goto error; ++ } ++ + PEEK_BYTE (a_this, 1, &next_bytes[0]); + if (next_bytes[0] == '%') { + SKIP_CHARS (a_this, 1); +-- +2.11.0 + From 33adae56f9abc36791040b7c9bbde7714ac31beb Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 13 Mar 2017 11:34:23 +0000 Subject: [PATCH 2933/3392] imagemagick: bump version to 7.0.5-2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 22562f7f056623ce8ca6a90e89fb2b2cbd35ff19) 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 75bc9a9a25..5a281cfebf 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 7362805eaa9f9b90cdb67a1f8762782bef4a42ca44939629aecad3c40305bf4c ImageMagick-7.0.5-0.tar.xz +sha256 a7c55f0fd5203cbff12bf4a8d9158c002fab8d4290859a8087c3d329013b1af8 ImageMagick-7.0.5-2.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index d1cd608b18..ac10cd6eed 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-0 +IMAGEMAGICK_VERSION = 7.0.5-2 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From 83e50860e77ee2ec0703524d73a09802dc17805b Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 22 Mar 2017 13:36:52 +0000 Subject: [PATCH 2934/3392] imagemagick: bump version to 7.0.5-3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 84bc1fb5320568a9475aaca03d24196ecad48ec0) 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 5a281cfebf..3f9f84e92c 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 a7c55f0fd5203cbff12bf4a8d9158c002fab8d4290859a8087c3d329013b1af8 ImageMagick-7.0.5-2.tar.xz +sha256 dbc0a1cc0e4e3d4e3c772724fcbfe24a00ff4434c8b12c513c447a5fb422ffa6 ImageMagick-7.0.5-3.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index ac10cd6eed..d6923f5adf 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-2 +IMAGEMAGICK_VERSION = 7.0.5-3 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From 1b8f4d29ed1e33d02f3bc566dc933ab6162a7927 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 28 Mar 2017 12:56:58 +0100 Subject: [PATCH 2935/3392] imagemagick: bump version to 7.0.5-4 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 49a3ed0feee3ce58563fdec94b3d64112f41696b) 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 3f9f84e92c..ff7b24a9ab 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 dbc0a1cc0e4e3d4e3c772724fcbfe24a00ff4434c8b12c513c447a5fb422ffa6 ImageMagick-7.0.5-3.tar.xz +sha256 4a1dde5bdfec0fc549955a051be25b7ff96dfb192060997699e43c7ce0f06ab2 ImageMagick-7.0.5-4.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index d6923f5adf..9bef6f7815 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-3 +IMAGEMAGICK_VERSION = 7.0.5-4 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From a1b9e5cb32329fd1af070ab8f7e77f9952f4336a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 25 Apr 2017 17:35:54 +0200 Subject: [PATCH 2936/3392] imagemagick: add upstream security fix for CVE-2017-7606 This is not yet part of any release. coders/rle.c in ImageMagick 7.0.5-4 has an "outside the range of representable values of type unsigned char" undefined behavior issue, which might allow remote attackers to cause a denial of service (application crash) or possibly have unspecified other impact via a crafted image. For more details, see: https://blogs.gentoo.org/ago/2017/04/02/imagemagick-undefined-behavior-in-codersrle-c/ Signed-off-by: Peter Korsgaard (cherry picked from commit 665560856edfcdd18b2053e26bc8a44754dffca2) Signed-off-by: Peter Korsgaard --- ...m-ImageMagick-ImageMagick-issues-415.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch diff --git a/package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch b/package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch new file mode 100644 index 0000000000..943679eda3 --- /dev/null +++ b/package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch @@ -0,0 +1,52 @@ +From b218117cad34d39b9ffb587b45c71c5a49b12bde Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Fri, 31 Mar 2017 15:24:33 -0400 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/415 + +Fixes CVE-2017-7606 + +Signed-off-by: Peter Korsgaard +--- + coders/pnm.c | 2 +- + coders/rle.c | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/coders/pnm.c b/coders/pnm.c +index 9a1221d79..c525ebb8f 100644 +--- a/coders/pnm.c ++++ b/coders/pnm.c +@@ -1979,7 +1979,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, + pixel=ScaleQuantumToChar(GetPixelRed(image,p)); + else + pixel=ScaleQuantumToAny(GetPixelRed(image,p), +- max_value); ++ max_value); + } + q=PopCharPixel((unsigned char) pixel,q); + p+=GetPixelChannels(image); +diff --git a/coders/rle.c b/coders/rle.c +index 2318901ec..ec071dc7b 100644 +--- a/coders/rle.c ++++ b/coders/rle.c +@@ -271,7 +271,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) + p=colormap; + for (i=0; i < (ssize_t) number_colormaps; i++) + for (x=0; x < (ssize_t) map_length; x++) +- *p++=(unsigned char) ScaleShortToQuantum(ReadBlobLSBShort(image)); ++ *p++=(unsigned char) ScaleQuantumToChar(ScaleShortToQuantum( ++ ReadBlobLSBShort(image))); + } + if ((flags & 0x08) != 0) + { +@@ -476,7 +477,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) + for (x=0; x < (ssize_t) number_planes; x++) + { + ValidateColormapValue(image,(size_t) (x*map_length+ +- (*p & mask)),&index,exception); ++ (*p & mask)),&index,exception); + *p=colormap[(ssize_t) index]; + p++; + } +-- +2.11.0 + From bc633d98add5dbf147b28bea397fde6a9bd3bf4e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 26 Apr 2017 13:52:14 +0200 Subject: [PATCH 2937/3392] libsndfile: security bump to version 1.0.28 Fixes: CVE-2017-7585 - In libsndfile before 1.0.28, an error in the "flac_buffer_copy()" function (flac.c) can be exploited to cause a stack-based buffer overflow via a specially crafted FLAC file. CVE-2017-7586 - In libsndfile before 1.0.28, an error in the "header_read()" function (common.c) when handling ID3 tags can be exploited to cause a stack-based buffer overflow via a specially crafted FLAC file. CVE-2017-7741 - In libsndfile before 1.0.28, an error in the "flac_buffer_copy()" function (flac.c) can be exploited to cause a segmentation violation (with write memory access) via a specially crafted FLAC file during a resample attempt, a similar issue to CVE-2017-7585. CVE-2017-7742 - In libsndfile before 1.0.28, an error in the "flac_buffer_copy()" function (flac.c) can be exploited to cause a segmentation violation (with read memory access) via a specially crafted FLAC file during a resample attempt, a similar issue to CVE-2017-7585. Dop undocumented patch adjusting SUBDIRS in Makefile.in as it no longer applies. Instead pass --disable-full-suite to disable man pages, documentation and programs, as that was presumably the reason for the patch. Signed-off-by: Peter Korsgaard (cherry picked from commit c363e070d8ee036052fbcadd153d8c39ce0db55b) Signed-off-by: Peter Korsgaard --- package/libsndfile/0001-srconly.patch | 17 ----------------- package/libsndfile/libsndfile.hash | 2 +- package/libsndfile/libsndfile.mk | 5 +++-- 3 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 package/libsndfile/0001-srconly.patch diff --git a/package/libsndfile/0001-srconly.patch b/package/libsndfile/0001-srconly.patch deleted file mode 100644 index 417e34072a..0000000000 --- a/package/libsndfile/0001-srconly.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libsndfile-1.0.18/Makefile.in -=================================================================== ---- libsndfile-1.0.18.orig/Makefile.in -+++ libsndfile-1.0.18/Makefile.in -@@ -260,7 +260,7 @@ - top_srcdir = @top_srcdir@ - DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror - @BUILD_OCTAVE_MOD_TRUE@octave_dir = Octave --SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs -+SUBDIRS = src - DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs - EXTRA_DIST = libsndfile.spec.in sndfile.pc.in Mingw-make-dist.sh - pkgconfigdir = $(libdir)/pkgconfig diff --git a/package/libsndfile/libsndfile.hash b/package/libsndfile/libsndfile.hash index a87b7c3085..31500cd970 100644 --- a/package/libsndfile/libsndfile.hash +++ b/package/libsndfile/libsndfile.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 a391952f27f4a92ceb2b4c06493ac107896ed6c76be9a613a4731f076d30fac0 libsndfile-1.0.27.tar.gz +sha256 1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9 libsndfile-1.0.28.tar.gz diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index c5cd1de10f..0d152a7b0f 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSNDFILE_VERSION = 1.0.27 +LIBSNDFILE_VERSION = 1.0.28 LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPLv2.1+ @@ -13,6 +13,7 @@ LIBSNDFILE_LICENSE_FILES = COPYING LIBSNDFILE_CONF_OPTS = \ --disable-sqlite \ --disable-alsa \ - --disable-external-libs + --disable-external-libs \ + --disable-full-suite $(eval $(autotools-package)) From 6a404f824533bf228ae7165fe121f9fe271b4659 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 26 Apr 2017 14:57:13 +0200 Subject: [PATCH 2938/3392] icu: add upstream security fix for utf-8 handling Fixes: CVE-2017-7867 - International Components for Unicode (ICU) for C/C++ before 2017-02-13 has an out-of-bounds write caused by a heap-based buffer overflow related to the utf8TextAccess function in common/utext.cpp and the utext_setNativeIndex* function. CVE-2017-7868 - International Components for Unicode (ICU) for C/C++ before 2017-02-13 has an out-of-bounds write caused by a heap-based buffer overflow related to the utf8TextAccess function in common/utext.cpp and the utext_moveIndex32* function. Upstream: http://bugs.icu-project.org/trac/changeset/39671 Signed-off-by: Peter Korsgaard (cherry picked from commit 0135204868e4888cf162755a90087b10b40093ed) Signed-off-by: Peter Korsgaard --- ...t-problems-with-handling-of-bad-utf8.patch | 173 ++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 package/icu/0006-utext-problems-with-handling-of-bad-utf8.patch diff --git a/package/icu/0006-utext-problems-with-handling-of-bad-utf8.patch b/package/icu/0006-utext-problems-with-handling-of-bad-utf8.patch new file mode 100644 index 0000000000..a4e51aef08 --- /dev/null +++ b/package/icu/0006-utext-problems-with-handling-of-bad-utf8.patch @@ -0,0 +1,173 @@ +ticket:12888 UText, problems with handling of bad UTF-8 + +Fixes: + +CVE-2017-7867 - International Components for Unicode (ICU) for C/C++ before +2017-02-13 has an out-of-bounds write caused by a heap-based buffer overflow +related to the utf8TextAccess function in common/utext.cpp and the +utext_setNativeIndex* function. + +CVE-2017-7868 - International Components for Unicode (ICU) for C/C++ before +2017-02-13 has an out-of-bounds write caused by a heap-based buffer overflow +related to the utf8TextAccess function in common/utext.cpp and the +utext_moveIndex32* function. + +Upstream: http://bugs.icu-project.org/trac/changeset/39671 + +Signed-off-by: Peter Korsgaard + +Index: /trunk/icu4c/source/common/utext.cpp +=================================================================== +--- icu4c/source/common/utext.cpp (revision 39670) ++++ icu4c/source/common/utext.cpp (revision 39671) +@@ -848,7 +848,13 @@ + + // Chunk size. +-// Must be less than 85, because of byte mapping from UChar indexes to native indexes. +-// Worst case is three native bytes to one UChar. (Supplemenaries are 4 native bytes +-// to two UChars.) ++// Must be less than 42 (256/6), because of byte mapping from UChar indexes to native indexes. ++// Worst case there are six UTF-8 bytes per UChar. ++// obsolete 6 byte form fd + 5 trails maps to fffd ++// obsolete 5 byte form fc + 4 trails maps to fffd ++// non-shortest 4 byte forms maps to fffd ++// normal supplementaries map to a pair of utf-16, two utf8 bytes per utf-16 unit ++// mapToUChars array size must allow for the worst case, 6. ++// This could be brought down to 4, by treating fd and fc as pure illegal, ++// rather than obsolete lead bytes. But that is not compatible with the utf-8 access macros. + // + enum { UTF8_TEXT_CHUNK_SIZE=32 }; +@@ -890,5 +896,5 @@ + // one for a supplementary starting in the last normal position, + // and one for an entry for the buffer limit position. +- uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*3+6]; // Map native offset from bufNativeStart to ++ uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*6+6]; // Map native offset from bufNativeStart to + // correspoding offset in filled part of buf. + int32_t align; +@@ -1033,4 +1039,5 @@ + u8b = (UTF8Buf *)ut->p; // the current buffer + mapIndex = ix - u8b->toUCharsMapStart; ++ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars)); + ut->chunkOffset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx; + return TRUE; +@@ -1299,4 +1306,8 @@ + // If index is at the end, there is no character there to look at. + if (ix != ut->b) { ++ // Note: this function will only move the index back if it is on a trail byte ++ // and there is a preceding lead byte and the sequence from the lead ++ // through this trail could be part of a valid UTF-8 sequence ++ // Otherwise the index remains unchanged. + U8_SET_CP_START(s8, 0, ix); + } +@@ -1312,5 +1323,8 @@ + uint8_t *mapToNative = u8b->mapToNative; + uint8_t *mapToUChars = u8b->mapToUChars; +- int32_t toUCharsMapStart = ix - (UTF8_TEXT_CHUNK_SIZE*3 + 1); ++ int32_t toUCharsMapStart = ix - sizeof(UTF8Buf::mapToUChars) + 1; ++ // Note that toUCharsMapStart can be negative. Happens when the remaining ++ // text from current position to the beginning is less than the buffer size. ++ // + 1 because mapToUChars must have a slot at the end for the bufNativeLimit entry. + int32_t destIx = UTF8_TEXT_CHUNK_SIZE+2; // Start in the overflow region + // at end of buffer to leave room +@@ -1339,4 +1353,5 @@ + // Special case ASCII range for speed. + buf[destIx] = (UChar)c; ++ U_ASSERT(toUCharsMapStart <= srcIx); + mapToUChars[srcIx - toUCharsMapStart] = (uint8_t)destIx; + mapToNative[destIx] = (uint8_t)(srcIx - toUCharsMapStart); +@@ -1368,4 +1383,5 @@ + mapToUChars[sIx-- - toUCharsMapStart] = (uint8_t)destIx; + } while (sIx >= srcIx); ++ U_ASSERT(toUCharsMapStart <= (srcIx+1)); + + // Set native indexing limit to be the current position. +@@ -1542,4 +1558,5 @@ + U_ASSERT(index<=ut->chunkNativeLimit); + int32_t mapIndex = index - u8b->toUCharsMapStart; ++ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars)); + int32_t offset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx; + U_ASSERT(offset>=0 && offset<=ut->chunkLength); +Index: /trunk/icu4c/source/test/intltest/utxttest.cpp +=================================================================== +--- icu4c/source/test/intltest/utxttest.cpp (revision 39670) ++++ icu4c/source/test/intltest/utxttest.cpp (revision 39671) +@@ -68,4 +68,6 @@ + case 7: name = "Ticket12130"; + if (exec) Ticket12130(); break; ++ case 8: name = "Ticket12888"; ++ if (exec) Ticket12888(); break; + default: name = ""; break; + } +@@ -1584,2 +1586,62 @@ + utext_close(&ut); + } ++ ++// Ticket 12888: bad handling of illegal utf-8 containing many instances of the archaic, now illegal, ++// six byte utf-8 forms. Original implementation had an assumption that ++// there would be at most three utf-8 bytes per UTF-16 code unit. ++// The five and six byte sequences map to a single replacement character. ++ ++void UTextTest::Ticket12888() { ++ const char *badString = ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80" ++ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"; ++ ++ UErrorCode status = U_ZERO_ERROR; ++ LocalUTextPointer ut(utext_openUTF8(NULL, badString, -1, &status)); ++ TEST_SUCCESS(status); ++ for (;;) { ++ UChar32 c = utext_next32(ut.getAlias()); ++ if (c == U_SENTINEL) { ++ break; ++ } ++ } ++ int32_t endIdx = utext_getNativeIndex(ut.getAlias()); ++ if (endIdx != (int32_t)strlen(badString)) { ++ errln("%s:%d expected=%d, actual=%d", __FILE__, __LINE__, strlen(badString), endIdx); ++ return; ++ } ++ ++ for (int32_t prevIndex = endIdx; prevIndex>0;) { ++ UChar32 c = utext_previous32(ut.getAlias()); ++ int32_t currentIndex = utext_getNativeIndex(ut.getAlias()); ++ if (c != 0xfffd) { ++ errln("%s:%d (expected, actual, index) = (%d, %d, %d)\n", ++ __FILE__, __LINE__, 0xfffd, c, currentIndex); ++ break; ++ } ++ if (currentIndex != prevIndex - 6) { ++ errln("%s:%d: wrong index. Expected, actual = %d, %d", ++ __FILE__, __LINE__, prevIndex - 6, currentIndex); ++ break; ++ } ++ prevIndex = currentIndex; ++ } ++} +Index: /trunk/icu4c/source/test/intltest/utxttest.h +=================================================================== +--- icu4c/source/test/intltest/utxttest.h (revision 39670) ++++ icu4c/source/test/intltest/utxttest.h (revision 39671) +@@ -39,4 +39,5 @@ + void Ticket10983(); + void Ticket12130(); ++ void Ticket12888(); + + private: From 89300b00976435090f5a3cc04dee8c979dd1d811 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 26 Apr 2017 23:58:14 +0200 Subject: [PATCH 2939/3392] tiff: add upstream security fixes Add upstream post-4.0.7 commits (except for ChangeLog modifications) fixing the following security issues: CVE-2016-10266 - LibTIFF 4.0.7 allows remote attackers to cause a denial of service (divide-by-zero error and application crash) via a crafted TIFF image, related to libtiff/tif_read.c:351:22. CVE-2016-10267 - LibTIFF 4.0.7 allows remote attackers to cause a denial of service (divide-by-zero error and application crash) via a crafted TIFF image, related to libtiff/tif_ojpeg.c:816:8. CVE-2016-10269 - LibTIFF 4.0.7 allows remote attackers to cause a denial of service (heap-based buffer over-read) or possibly have unspecified other impact via a crafted TIFF image, related to "READ of size 512" and libtiff/tif_unix.c:340:2. CVE-2016-10270 - LibTIFF 4.0.7 allows remote attackers to cause a denial of service (heap-based buffer over-read) or possibly have unspecified other impact via a crafted TIFF image, related to "READ of size 8" and libtiff/tif_read.c:523:22. CVE-2017-5225 - LibTIFF version 4.0.7 is vulnerable to a heap buffer overflow in the tools/tiffcp resulting in DoS or code execution via a crafted BitsPerSample value. CVE-2017-7592 - The putagreytile function in tif_getimage.c in LibTIFF 4.0.7 has a left-shift undefined behavior issue, which might allow remote attackers to cause a denial of service (application crash) or possibly have unspecified other impact via a crafted image. CVE-2017-7593 - tif_read.c in LibTIFF 4.0.7 does not ensure that tif_rawdata is properly initialized, which might allow remote attackers to obtain sensitive information from process memory via a crafted image. CVE-2017-7594 - The OJPEGReadHeaderInfoSecTablesDcTable function in tif_ojpeg.c in LibTIFF 4.0.7 allows remote attackers to cause a denial of service (memory leak) via a crafted image. CVE-2017-7595 - The JPEGSetupEncode function in tiff_jpeg.c in LibTIFF 4.0.7 allows remote attackers to cause a denial of service (divide-by-zero error and application crash) via a crafted image. CVE-2017-7598 - tif_dirread.c in LibTIFF 4.0.7 might allow remote attackers to cause a denial of service (divide-by-zero error and application crash) via a crafted image. CVE-2017-7601 - LibTIFF 4.0.7 has a "shift exponent too large for 64-bit type long" undefined behavior issue, which might allow remote attackers to cause a denial of service (application crash) or possibly have unspecified other impact via a crafted image. CVE-2017-7602 - LibTIFF 4.0.7 has a signed integer overflow, which might allow remote attackers to cause a denial of service (application crash) or possibly have unspecified other impact via a crafted image. Signed-off-by: Peter Korsgaard (cherry picked from commit 030fe340af365b834c15142f862e0de6d5f95737) Signed-off-by: Peter Korsgaard --- ....c-libtiff-tiffiop.h-fix-uint32-over.patch | 46 ++++++++ ...g.c-make-OJPEGDecode-early-exit-in-c.patch | 53 +++++++++ ...rlog.c-libtiff-tif_luv.c-fix-heap-ba.patch | 110 ++++++++++++++++++ ...ead.c-modify-ChopUpSingleUncompresse.patch | 107 +++++++++++++++++ ...rror-out-cleanly-in-cpContig2Separat.patch | 74 ++++++++++++ ...mage.c-add-explicit-uint32-cast-in-p.patch | 31 +++++ ...h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch | 88 ++++++++++++++ ...g.c-fix-leak-in-OJPEGReadHeaderInfoS.patch | 43 +++++++ ...g.c-fix-leak-in-OJPEGReadHeaderInfoS.patch | 36 ++++++ ....c-avoid-integer-division-by-zero-in.patch | 35 ++++++ ...ead.c-avoid-division-by-floating-poi.patch | 47 ++++++++ ....c-validate-BitsPerSample-in-JPEGSet.patch | 35 ++++++ ....c-avoid-potential-undefined-behavio.patch | 56 +++++++++ 13 files changed, 761 insertions(+) create mode 100644 package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch create mode 100644 package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch create mode 100644 package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch create mode 100644 package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch create mode 100644 package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch create mode 100644 package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch create mode 100644 package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch create mode 100644 package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch create mode 100644 package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch create mode 100644 package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch create mode 100644 package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch create mode 100644 package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch create mode 100644 package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch diff --git a/package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch b/package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch new file mode 100644 index 0000000000..9df4577e14 --- /dev/null +++ b/package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch @@ -0,0 +1,46 @@ +From 438274f938e046d33cb0e1230b41da32ffe223e1 Mon Sep 17 00:00:00 2001 +From: erouault +Date: Fri, 2 Dec 2016 21:56:56 +0000 +Subject: [PATCH] * libtiff/tif_read.c, libtiff/tiffiop.h: fix uint32 overflow + in TIFFReadEncodedStrip() that caused an integer division by zero. Reported + by Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2596 + +Fixes CVE-2016-10266 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_read.c | 2 +- + libtiff/tiffiop.h | 4 ++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c +index c26c55f4..52bbf507 100644 +--- a/libtiff/tif_read.c ++++ b/libtiff/tif_read.c +@@ -346,7 +346,7 @@ TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size) + rowsperstrip=td->td_rowsperstrip; + if (rowsperstrip>td->td_imagelength) + rowsperstrip=td->td_imagelength; +- stripsperplane=((td->td_imagelength+rowsperstrip-1)/rowsperstrip); ++ stripsperplane= TIFFhowmany_32_maxuint_compat(td->td_imagelength, rowsperstrip); + stripinplane=(strip%stripsperplane); + plane=(uint16)(strip/stripsperplane); + rows=td->td_imagelength-stripinplane*rowsperstrip; +diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h +index ffbb647b..cb59460a 100644 +--- a/libtiff/tiffiop.h ++++ b/libtiff/tiffiop.h +@@ -250,6 +250,10 @@ struct tiff { + #define TIFFhowmany_32(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \ + ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \ + 0U) ++/* Variant of TIFFhowmany_32() that doesn't return 0 if x close to MAXUINT. */ ++/* Caution: TIFFhowmany_32_maxuint_compat(x,y)*y might overflow */ ++#define TIFFhowmany_32_maxuint_compat(x, y) \ ++ (((uint32)(x) / (uint32)(y)) + ((((uint32)(x) % (uint32)(y)) != 0) ? 1 : 0)) + #define TIFFhowmany8_32(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3) + #define TIFFroundup_32(x, y) (TIFFhowmany_32(x,y)*(y)) + #define TIFFhowmany_64(x, y) ((((uint64)(x))+(((uint64)(y))-1))/((uint64)(y))) +-- +2.11.0 + diff --git a/package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch b/package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch new file mode 100644 index 0000000000..d99b9007e8 --- /dev/null +++ b/package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch @@ -0,0 +1,53 @@ +From 43bc256d8ae44b92d2734a3c5bc73957a4d7c1ec Mon Sep 17 00:00:00 2001 +From: erouault +Date: Sat, 3 Dec 2016 11:15:18 +0000 +Subject: [PATCH] * libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case + of failure in OJPEGPreDecode(). This will avoid a divide by zero, and + potential other issues. Reported by Agostino Sarubbo. Fixes + http://bugzilla.maptools.org/show_bug.cgi?id=2611 + +Fixes CVE-2016-10267 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_ojpeg.c | 8 ++++++++ + 1 files changed, 15 insertions(+) + +diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c +index 1ccc3f9b..f19e8fd0 100644 +--- a/libtiff/tif_ojpeg.c ++++ b/libtiff/tif_ojpeg.c +@@ -244,6 +244,7 @@ typedef enum { + + typedef struct { + TIFF* tif; ++ int decoder_ok; + #ifndef LIBJPEG_ENCAP_EXTERNAL + JMP_BUF exit_jmpbuf; + #endif +@@ -722,6 +723,7 @@ OJPEGPreDecode(TIFF* tif, uint16 s) + } + sp->write_curstrile++; + } ++ sp->decoder_ok = 1; + return(1); + } + +@@ -784,8 +786,14 @@ OJPEGPreDecodeSkipScanlines(TIFF* tif) + static int + OJPEGDecode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s) + { ++ static const char module[]="OJPEGDecode"; + OJPEGState* sp=(OJPEGState*)tif->tif_data; + (void)s; ++ if( !sp->decoder_ok ) ++ { ++ TIFFErrorExt(tif->tif_clientdata,module,"Cannot decode: decoder not correctly initialized"); ++ return 0; ++ } + if (sp->libjpeg_jpeg_query_style==0) + { + if (OJPEGDecodeRaw(tif,buf,cc)==0) +-- +2.11.0 + diff --git a/package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch b/package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch new file mode 100644 index 0000000000..290834ec05 --- /dev/null +++ b/package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch @@ -0,0 +1,110 @@ +From 1044b43637fa7f70fb19b93593777b78bd20da86 Mon Sep 17 00:00:00 2001 +From: erouault +Date: Fri, 2 Dec 2016 23:05:51 +0000 +Subject: [PATCH] * libtiff/tif_pixarlog.c, libtiff/tif_luv.c: fix heap-based + buffer overflow on generation of PixarLog / LUV compressed files, with + ColorMap, TransferFunction attached and nasty plays with bitspersample. The + fix for LUV has not been tested, but suffers from the same kind of issue of + PixarLog. Reported by Agostino Sarubbo. Fixes + http://bugzilla.maptools.org/show_bug.cgi?id=2604 + +Fixes CVE-2016-10269 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_luv.c | 18 ++++++++++++++---- + libtiff/tif_pixarlog.c | 17 +++++++++++++++-- + 2 files changed, 39 insertions(+), 6 deletions(-) + +diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c +index f68a9b13..e6783db5 100644 +--- a/libtiff/tif_luv.c ++++ b/libtiff/tif_luv.c +@@ -158,6 +158,7 @@ + typedef struct logLuvState LogLuvState; + + struct logLuvState { ++ int encoder_state; /* 1 if encoder correctly initialized */ + int user_datafmt; /* user data format */ + int encode_meth; /* encoding method */ + int pixel_size; /* bytes per pixel */ +@@ -1552,6 +1553,7 @@ LogLuvSetupEncode(TIFF* tif) + td->td_photometric, "must be either LogLUV or LogL"); + break; + } ++ sp->encoder_state = 1; + return (1); + notsupported: + TIFFErrorExt(tif->tif_clientdata, module, +@@ -1563,19 +1565,27 @@ notsupported: + static void + LogLuvClose(TIFF* tif) + { ++ LogLuvState* sp = (LogLuvState*) tif->tif_data; + TIFFDirectory *td = &tif->tif_dir; + ++ assert(sp != 0); + /* + * For consistency, we always want to write out the same + * bitspersample and sampleformat for our TIFF file, + * regardless of the data format being used by the application. + * Since this routine is called after tags have been set but + * before they have been recorded in the file, we reset them here. ++ * Note: this is really a nasty approach. See PixarLogClose + */ +- td->td_samplesperpixel = +- (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; +- td->td_bitspersample = 16; +- td->td_sampleformat = SAMPLEFORMAT_INT; ++ if( sp->encoder_state ) ++ { ++ /* See PixarLogClose. Might avoid issues with tags whose size depends ++ * on those below, but not completely sure this is enough. */ ++ td->td_samplesperpixel = ++ (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; ++ td->td_bitspersample = 16; ++ td->td_sampleformat = SAMPLEFORMAT_INT; ++ } + } + + static void +diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c +index d1246c3d..aa99bc92 100644 +--- a/libtiff/tif_pixarlog.c ++++ b/libtiff/tif_pixarlog.c +@@ -1233,8 +1233,10 @@ PixarLogPostEncode(TIFF* tif) + static void + PixarLogClose(TIFF* tif) + { ++ PixarLogState* sp = (PixarLogState*) tif->tif_data; + TIFFDirectory *td = &tif->tif_dir; + ++ assert(sp != 0); + /* In a really sneaky (and really incorrect, and untruthful, and + * troublesome, and error-prone) maneuver that completely goes against + * the spirit of TIFF, and breaks TIFF, on close, we covertly +@@ -1243,8 +1245,19 @@ PixarLogClose(TIFF* tif) + * readers that don't know about PixarLog, or how to set + * the PIXARLOGDATFMT pseudo-tag. + */ +- td->td_bitspersample = 8; +- td->td_sampleformat = SAMPLEFORMAT_UINT; ++ ++ if (sp->state&PLSTATE_INIT) { ++ /* We test the state to avoid an issue such as in ++ * http://bugzilla.maptools.org/show_bug.cgi?id=2604 ++ * What appends in that case is that the bitspersample is 1 and ++ * a TransferFunction is set. The size of the TransferFunction ++ * depends on 1<td_bitspersample = 8; ++ td->td_sampleformat = SAMPLEFORMAT_UINT; ++ } + } + + static void +-- +2.11.0 + diff --git a/package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch b/package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch new file mode 100644 index 0000000000..a24d5d8487 --- /dev/null +++ b/package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch @@ -0,0 +1,107 @@ +From 9a72a69e035ee70ff5c41541c8c61cd97990d018 Mon Sep 17 00:00:00 2001 +From: erouault +Date: Sat, 3 Dec 2016 11:02:15 +0000 +Subject: [PATCH] * libtiff/tif_dirread.c: modify + ChopUpSingleUncompressedStrip() to instanciate compute ntrips as + TIFFhowmany_32(td->td_imagelength, rowsperstrip), instead of a logic based on + the total size of data. Which is faulty is the total size of data is not + sufficient to fill the whole image, and thus results in reading outside of + the StripByCounts/StripOffsets arrays when using TIFFReadScanline(). Reported + by Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2608. + +* libtiff/tif_strip.c: revert the change in TIFFNumberOfStrips() done +for http://bugzilla.maptools.org/show_bug.cgi?id=2587 / CVE-2016-9273 since +the above change is a better fix that makes it unnecessary. + +Fixes CVE-2016-10270 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_dirread.c | 22 ++++++++++------------ + libtiff/tif_strip.c | 9 --------- + 2 files changed, 25 insertions(+), 21 deletions(-) + +diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c +index 3eec79c9..570d0c32 100644 +--- a/libtiff/tif_dirread.c ++++ b/libtiff/tif_dirread.c +@@ -5502,8 +5502,7 @@ ChopUpSingleUncompressedStrip(TIFF* tif) + uint64 rowblockbytes; + uint64 stripbytes; + uint32 strip; +- uint64 nstrips64; +- uint32 nstrips32; ++ uint32 nstrips; + uint32 rowsperstrip; + uint64* newcounts; + uint64* newoffsets; +@@ -5534,18 +5533,17 @@ ChopUpSingleUncompressedStrip(TIFF* tif) + return; + + /* +- * never increase the number of strips in an image ++ * never increase the number of rows per strip + */ + if (rowsperstrip >= td->td_rowsperstrip) + return; +- nstrips64 = TIFFhowmany_64(bytecount, stripbytes); +- if ((nstrips64==0)||(nstrips64>0xFFFFFFFF)) /* something is wonky, do nothing. */ +- return; +- nstrips32 = (uint32)nstrips64; ++ nstrips = TIFFhowmany_32(td->td_imagelength, rowsperstrip); ++ if( nstrips == 0 ) ++ return; + +- newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), ++ newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), + "for chopped \"StripByteCounts\" array"); +- newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), ++ newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), + "for chopped \"StripOffsets\" array"); + if (newcounts == NULL || newoffsets == NULL) { + /* +@@ -5562,18 +5560,18 @@ ChopUpSingleUncompressedStrip(TIFF* tif) + * Fill the strip information arrays with new bytecounts and offsets + * that reflect the broken-up format. + */ +- for (strip = 0; strip < nstrips32; strip++) { ++ for (strip = 0; strip < nstrips; strip++) { + if (stripbytes > bytecount) + stripbytes = bytecount; + newcounts[strip] = stripbytes; +- newoffsets[strip] = offset; ++ newoffsets[strip] = stripbytes ? offset : 0; + offset += stripbytes; + bytecount -= stripbytes; + } + /* + * Replace old single strip info with multi-strip info. + */ +- td->td_stripsperimage = td->td_nstrips = nstrips32; ++ td->td_stripsperimage = td->td_nstrips = nstrips; + TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip); + + _TIFFfree(td->td_stripbytecount); +diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c +index 4c46ecf5..1676e47d 100644 +--- a/libtiff/tif_strip.c ++++ b/libtiff/tif_strip.c +@@ -63,15 +63,6 @@ TIFFNumberOfStrips(TIFF* tif) + TIFFDirectory *td = &tif->tif_dir; + uint32 nstrips; + +- /* If the value was already computed and store in td_nstrips, then return it, +- since ChopUpSingleUncompressedStrip might have altered and resized the +- since the td_stripbytecount and td_stripoffset arrays to the new value +- after the initial affectation of td_nstrips = TIFFNumberOfStrips() in +- tif_dirread.c ~line 3612. +- See http://bugzilla.maptools.org/show_bug.cgi?id=2587 */ +- if( td->td_nstrips ) +- return td->td_nstrips; +- + nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 : + TIFFhowmany_32(td->td_imagelength, td->td_rowsperstrip)); + if (td->td_planarconfig == PLANARCONFIG_SEPARATE) +-- +2.11.0 + diff --git a/package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch b/package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch new file mode 100644 index 0000000000..c93be89e7d --- /dev/null +++ b/package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch @@ -0,0 +1,74 @@ +From 5c080298d59efa53264d7248bbe3a04660db6ef7 Mon Sep 17 00:00:00 2001 +From: erouault +Date: Wed, 11 Jan 2017 19:25:44 +0000 +Subject: [PATCH] * tools/tiffcp.c: error out cleanly in cpContig2SeparateByRow + and cpSeparate2ContigByRow if BitsPerSample != 8 to avoid heap based + overflow. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2656 and + http://bugzilla.maptools.org/show_bug.cgi?id=2657 + +Fixes CVE-2017-5225 + +Signed-off-by: Peter Korsgaard +--- + tools/tiffcp.c | 24 ++++++++++++++++++++++-- + 1 file changed, 29 insertions(+), 2 deletions(-) + +diff --git a/tools/tiffcp.c b/tools/tiffcp.c +index bdf754c3..8bbcd52f 100644 +--- a/tools/tiffcp.c ++++ b/tools/tiffcp.c +@@ -591,7 +591,7 @@ static copyFunc pickCopyFunc(TIFF*, TIFF*, uint16, uint16); + static int + tiffcp(TIFF* in, TIFF* out) + { +- uint16 bitspersample, samplesperpixel = 1; ++ uint16 bitspersample = 1, samplesperpixel = 1; + uint16 input_compression, input_photometric = PHOTOMETRIC_MINISBLACK; + copyFunc cf; + uint32 width, length; +@@ -1067,6 +1067,16 @@ DECLAREcpFunc(cpContig2SeparateByRow) + register uint32 n; + uint32 row; + tsample_t s; ++ uint16 bps = 0; ++ ++ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps); ++ if( bps != 8 ) ++ { ++ TIFFError(TIFFFileName(in), ++ "Error, can only handle BitsPerSample=8 in %s", ++ "cpContig2SeparateByRow"); ++ return 0; ++ } + + inbuf = _TIFFmalloc(scanlinesizein); + outbuf = _TIFFmalloc(scanlinesizeout); +@@ -1120,6 +1130,16 @@ DECLAREcpFunc(cpSeparate2ContigByRow) + register uint32 n; + uint32 row; + tsample_t s; ++ uint16 bps = 0; ++ ++ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps); ++ if( bps != 8 ) ++ { ++ TIFFError(TIFFFileName(in), ++ "Error, can only handle BitsPerSample=8 in %s", ++ "cpSeparate2ContigByRow"); ++ return 0; ++ } + + inbuf = _TIFFmalloc(scanlinesizein); + outbuf = _TIFFmalloc(scanlinesizeout); +@@ -1784,7 +1804,7 @@ pickCopyFunc(TIFF* in, TIFF* out, uint16 bitspersample, uint16 samplesperpixel) + uint32 w, l, tw, tl; + int bychunk; + +- (void) TIFFGetField(in, TIFFTAG_PLANARCONFIG, &shortv); ++ (void) TIFFGetFieldDefaulted(in, TIFFTAG_PLANARCONFIG, &shortv); + if (shortv != config && bitspersample != 8 && samplesperpixel > 1) { + fprintf(stderr, + "%s: Cannot handle different planar configuration w/ bits/sample != 8\n", +-- +2.11.0 + diff --git a/package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch b/package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch new file mode 100644 index 0000000000..b3d8a40bba --- /dev/null +++ b/package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch @@ -0,0 +1,31 @@ +From 48780b4fcc425cddc4ef8ffdf536f96a0d1b313b Mon Sep 17 00:00:00 2001 +From: erouault +Date: Wed, 11 Jan 2017 16:38:26 +0000 +Subject: [PATCH] libtiff/tif_getimage.c: add explicit uint32 cast in putagreytile to + avoid UndefinedBehaviorSanitizer warning. + Patch by Nicolás Peña. + Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2658 + +Fixes CVE-2017-7592 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_getimage.c | 2 +- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c +index fed31f1f..2fa1775c 100644 +--- a/libtiff/tif_getimage.c ++++ b/libtiff/tif_getimage.c +@@ -1302,7 +1302,7 @@ DECLAREContigPutFunc(putagreytile) + while (h-- > 0) { + for (x = w; x-- > 0;) + { +- *cp++ = BWmap[*pp][0] & (*(pp+1) << 24 | ~A1); ++ *cp++ = BWmap[*pp][0] & ((uint32)*(pp+1) << 24 | ~A1); + pp += samplesperpixel; + } + cp += toskew; +-- +2.11.0 + diff --git a/package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch b/package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch new file mode 100644 index 0000000000..ec45bbe1fc --- /dev/null +++ b/package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch @@ -0,0 +1,88 @@ +From d60332057b9575ada4f264489582b13e30137be1 Mon Sep 17 00:00:00 2001 +From: erouault +Date: Wed, 11 Jan 2017 19:02:49 +0000 +Subject: [PATCH] * libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add + _TIFFcalloc() + +* libtiff/tif_read.c: TIFFReadBufferSetup(): use _TIFFcalloc() to zero +initialize tif_rawdata. +Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2651 + +Fixes CVE-2017-7593 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_read.c | 4 +++- + libtiff/tif_unix.c | 8 ++++++++ + libtiff/tif_win32.c | 8 ++++++++ + libtiff/tiffio.h | 1 + + 4 files changed, 36 insertions(+), 1 deletion(-) + +diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c +index 277fdd69..4535ccb3 100644 +--- a/libtiff/tif_read.c ++++ b/libtiff/tif_read.c +@@ -985,7 +985,9 @@ TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size) + "Invalid buffer size"); + return (0); + } +- tif->tif_rawdata = (uint8*) _TIFFmalloc(tif->tif_rawdatasize); ++ /* Initialize to zero to avoid uninitialized buffers in case of */ ++ /* short reads (http://bugzilla.maptools.org/show_bug.cgi?id=2651) */ ++ tif->tif_rawdata = (uint8*) _TIFFcalloc(1, tif->tif_rawdatasize); + tif->tif_flags |= TIFF_MYBUFFER; + } + if (tif->tif_rawdata == NULL) { +diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c +index 7c7bc961..89dd32e8 100644 +--- a/libtiff/tif_unix.c ++++ b/libtiff/tif_unix.c +@@ -316,6 +316,14 @@ _TIFFmalloc(tmsize_t s) + return (malloc((size_t) s)); + } + ++void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) ++{ ++ if( nmemb == 0 || siz == 0 ) ++ return ((void *) NULL); ++ ++ return calloc((size_t) nmemb, (size_t)siz); ++} ++ + void + _TIFFfree(void* p) + { +diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c +index d730b3ab..3e9001b7 100644 +--- a/libtiff/tif_win32.c ++++ b/libtiff/tif_win32.c +@@ -360,6 +360,14 @@ _TIFFmalloc(tmsize_t s) + return (malloc((size_t) s)); + } + ++void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) ++{ ++ if( nmemb == 0 || siz == 0 ) ++ return ((void *) NULL); ++ ++ return calloc((size_t) nmemb, (size_t)siz); ++} ++ + void + _TIFFfree(void* p) + { +diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h +index 732da17f..fbd9171f 100644 +--- a/libtiff/tiffio.h ++++ b/libtiff/tiffio.h +@@ -293,6 +293,7 @@ extern TIFFCodec* TIFFGetConfiguredCODECs(void); + */ + + extern void* _TIFFmalloc(tmsize_t s); ++extern void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz); + extern void* _TIFFrealloc(void* p, tmsize_t s); + extern void _TIFFmemset(void* p, int v, tmsize_t c); + extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c); +-- +2.11.0 + diff --git a/package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch b/package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch new file mode 100644 index 0000000000..418a3d6980 --- /dev/null +++ b/package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch @@ -0,0 +1,43 @@ +From 2ea32f7372b65c24b2816f11c04bf59b5090d05b Mon Sep 17 00:00:00 2001 +From: erouault +Date: Thu, 12 Jan 2017 19:23:20 +0000 +Subject: [PATCH] * libtiff/tif_ojpeg.c: fix leak in + OJPEGReadHeaderInfoSecTablesQTable, OJPEGReadHeaderInfoSecTablesDcTable and + OJPEGReadHeaderInfoSecTablesAcTable + +Fixes CVE-2017-7594 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_ojpeg.c | 6 ++++++ + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c +index b92f0ebd..5f6c684c 100644 +--- a/libtiff/tif_ojpeg.c ++++ b/libtiff/tif_ojpeg.c +@@ -1790,7 +1790,10 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif) + TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET); + p=(uint32)TIFFReadFile(tif,&ob[sizeof(uint32)+5],64); + if (p!=64) ++ { ++ _TIFFfree(ob); + return(0); ++ } + sp->qtable[m]=ob; + sp->sof_tq[m]=m; + } +@@ -1854,7 +1857,10 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif) + rb[sizeof(uint32)+5+n]=o[n]; + p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); + if (p!=q) ++ { ++ _TIFFfree(rb); + return(0); ++ } + sp->dctable[m]=rb; + sp->sos_tda[m]=(m<<4); + } +-- +2.11.0 + diff --git a/package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch b/package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch new file mode 100644 index 0000000000..a1aae2dced --- /dev/null +++ b/package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch @@ -0,0 +1,36 @@ +From 8283e4d1b7e53340684d12932880cbcbaf23a8c1 Mon Sep 17 00:00:00 2001 +From: erouault +Date: Thu, 12 Jan 2017 17:43:25 +0000 +Subject: [PATCH] libtiff/tif_ojpeg.c: fix leak in + OJPEGReadHeaderInfoSecTablesAcTable when read fails. + Patch by Nicolás Peña. + Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2659 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes CVE-2017-7594 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_ojpeg.c | 3 +++ + 1 file changed, 10 insertions(+) + +diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c +index f19e8fd0..b92f0ebd 100644 +--- a/libtiff/tif_ojpeg.c ++++ b/libtiff/tif_ojpeg.c +@@ -1918,7 +1918,10 @@ OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif) + rb[sizeof(uint32)+5+n]=o[n]; + p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); + if (p!=q) ++ { ++ _TIFFfree(rb); + return(0); ++ } + sp->actable[m]=rb; + sp->sos_tda[m]=(sp->sos_tda[m]|m); + } +-- +2.11.0 + diff --git a/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch b/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch new file mode 100644 index 0000000000..862aae2a5a --- /dev/null +++ b/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch @@ -0,0 +1,35 @@ +From 47f2fb61a3a64667bce1a8398a8fcb1b348ff122 Mon Sep 17 00:00:00 2001 +From: erouault +Date: Wed, 11 Jan 2017 12:15:01 +0000 +Subject: [PATCH] * libtiff/tif_jpeg.c: avoid integer division by zero in + JPEGSetupEncode() when horizontal or vertical sampling is set to 0. Fixes + http://bugzilla.maptools.org/show_bug.cgi?id=2653 + +Fixes CVE-2017-7595 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_jpeg.c | 7 +++++++ + 1 file changed, 13 insertions(+) + +diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c +index 38595f98..6c17c388 100644 +--- a/libtiff/tif_jpeg.c ++++ b/libtiff/tif_jpeg.c +@@ -1626,6 +1626,13 @@ JPEGSetupEncode(TIFF* tif) + case PHOTOMETRIC_YCBCR: + sp->h_sampling = td->td_ycbcrsubsampling[0]; + sp->v_sampling = td->td_ycbcrsubsampling[1]; ++ if( sp->h_sampling == 0 || sp->v_sampling == 0 ) ++ { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Invalig horizontal/vertical sampling value"); ++ return (0); ++ } ++ + /* + * A ReferenceBlackWhite field *must* be present since the + * default value is inappropriate for YCbCr. Fill in the +-- +2.11.0 + diff --git a/package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch b/package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch new file mode 100644 index 0000000000..c0c94291a8 --- /dev/null +++ b/package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch @@ -0,0 +1,47 @@ +From 3cfd62d77c2a7e147a05bd678524c345fa9c2bb8 Mon Sep 17 00:00:00 2001 +From: erouault +Date: Wed, 11 Jan 2017 13:28:01 +0000 +Subject: [PATCH] * libtiff/tif_dirread.c: avoid division by floating point 0 + in TIFFReadDirEntryCheckedRational() and TIFFReadDirEntryCheckedSrational(), + and return 0 in that case (instead of infinity as before presumably) + Apparently some sanitizers do not like those divisions by zero. Fixes + http://bugzilla.maptools.org/show_bug.cgi?id=2644 + +Fixes CVE-2017-7598 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_dirread.c | 10 ++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c +index 570d0c32..8a1e42aa 100644 +--- a/libtiff/tif_dirread.c ++++ b/libtiff/tif_dirread.c +@@ -2872,7 +2872,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedRational(TIFF* tif, TIFFD + m.l = direntry->tdir_offset.toff_long8; + if (tif->tif_flags&TIFF_SWAB) + TIFFSwabArrayOfLong(m.i,2); +- if (m.i[0]==0) ++ /* Not completely sure what we should do when m.i[1]==0, but some */ ++ /* sanitizers do not like division by 0.0: */ ++ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */ ++ if (m.i[0]==0 || m.i[1]==0) + *value=0.0; + else + *value=(double)m.i[0]/(double)m.i[1]; +@@ -2900,7 +2903,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedSrational(TIFF* tif, TIFF + m.l=direntry->tdir_offset.toff_long8; + if (tif->tif_flags&TIFF_SWAB) + TIFFSwabArrayOfLong(m.i,2); +- if ((int32)m.i[0]==0) ++ /* Not completely sure what we should do when m.i[1]==0, but some */ ++ /* sanitizers do not like division by 0.0: */ ++ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */ ++ if ((int32)m.i[0]==0 || m.i[1]==0) + *value=0.0; + else + *value=(double)((int32)m.i[0])/(double)m.i[1]; +-- +2.11.0 + diff --git a/package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch b/package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch new file mode 100644 index 0000000000..4f46d9bb08 --- /dev/null +++ b/package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch @@ -0,0 +1,35 @@ +From 0a76a8c765c7b8327c59646284fa78c3c27e5490 Mon Sep 17 00:00:00 2001 +From: erouault +Date: Wed, 11 Jan 2017 16:13:50 +0000 +Subject: [PATCH] * libtiff/tif_jpeg.c: validate BitsPerSample in + JPEGSetupEncode() to avoid undefined behaviour caused by invalid shift + exponent. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2648 + +Fixes CVE-2017-7601 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_jpeg.c | 7 +++++++ + 1 file changed, 13 insertions(+) + +diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c +index 6c17c388..192989a9 100644 +--- a/libtiff/tif_jpeg.c ++++ b/libtiff/tif_jpeg.c +@@ -1632,6 +1632,13 @@ JPEGSetupEncode(TIFF* tif) + "Invalig horizontal/vertical sampling value"); + return (0); + } ++ if( td->td_bitspersample > 16 ) ++ { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "BitsPerSample %d not allowed for JPEG", ++ td->td_bitspersample); ++ return (0); ++ } + + /* + * A ReferenceBlackWhite field *must* be present since the +-- +2.11.0 + diff --git a/package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch b/package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch new file mode 100644 index 0000000000..d049b130cb --- /dev/null +++ b/package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch @@ -0,0 +1,56 @@ +From 66e7bd59520996740e4df5495a830b42fae48bc4 Mon Sep 17 00:00:00 2001 +From: erouault +Date: Wed, 11 Jan 2017 16:33:34 +0000 +Subject: [PATCH] * libtiff/tif_read.c: avoid potential undefined behaviour on + signed integer addition in TIFFReadRawStrip1() in isMapped() case. Fixes + http://bugzilla.maptools.org/show_bug.cgi?id=2650 + +Fixes CVE-2017-7602 + +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_read.c | 27 ++++++++++++++++++--------- + 1 file changed, 24 insertions(+), 9 deletions(-) + +diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c +index 52bbf507..b7aacbda 100644 +--- a/libtiff/tif_read.c ++++ b/libtiff/tif_read.c +@@ -420,16 +420,25 @@ TIFFReadRawStrip1(TIFF* tif, uint32 strip, void* buf, tmsize_t size, + return ((tmsize_t)(-1)); + } + } else { +- tmsize_t ma,mb; ++ tmsize_t ma; + tmsize_t n; +- ma=(tmsize_t)td->td_stripoffset[strip]; +- mb=ma+size; +- if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||(ma>tif->tif_size)) +- n=0; +- else if ((mbtif->tif_size)) +- n=tif->tif_size-ma; +- else +- n=size; ++ if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)|| ++ ((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size)) ++ { ++ n=0; ++ } ++ else if( ma > TIFF_TMSIZE_T_MAX - size ) ++ { ++ n=0; ++ } ++ else ++ { ++ tmsize_t mb=ma+size; ++ if (mb>tif->tif_size) ++ n=tif->tif_size-ma; ++ else ++ n=size; ++ } + if (n!=size) { + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFErrorExt(tif->tif_clientdata, module, +-- +2.11.0 + From e63c2c35665e17e9b63e53bc6620a20d6e748571 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 27 Apr 2017 13:50:58 +0300 Subject: [PATCH 2940/3392] libnl: add upstream security fix CVE-2017-0553: An elevation of privilege vulnerability in libnl could enable a local malicious application to execute arbitrary code within the context of the Wi-Fi service https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1511855.html Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 5efbd573c0a4df751e038a927c09af5aac1a233e) Signed-off-by: Peter Korsgaard --- package/libnl/libnl.hash | 1 + package/libnl/libnl.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/libnl/libnl.hash b/package/libnl/libnl.hash index 2f1a3cb1b3..eafba4a390 100644 --- a/package/libnl/libnl.hash +++ b/package/libnl/libnl.hash @@ -1,2 +1,3 @@ # From https://github.com/thom311/libnl/releases/download/libnl3_2_27/libnl-3.2.27.tar.gz.sha256sum sha256 4bbbf92b3c78a90f423cf96260bf419a28b75db8cced47051217a56795f58ec6 libnl-3.2.27.tar.gz +sha256 b7bb929194eefc56c786a7e1ae5176b54713f9013ccec63760f232742ae80361 3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index 85c0db86f6..af28382dda 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -11,6 +11,8 @@ LIBNL_LICENSE_FILES = COPYING LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison host-flex +LIBNL_PATCH = https://github.com/thom311/libnl/commit/3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch + ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y) LIBNL_CONF_OPTS += --enable-cli else From 75c7c53e880efcb00675b97f4a20adca29cf4510 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 27 Apr 2017 14:43:28 +0100 Subject: [PATCH 2941/3392] linux-headers: bump 4.{4,9,10}.x series [Peter: drop 4.10.x bump] Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit 431bd936a154c16cab8dcf18563641949eed1cb1) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 747f24dd87..46a889d6fc 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.63" if BR2_KERNEL_HEADERS_4_4 + default "4.4.64" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.24" if BR2_KERNEL_HEADERS_4_9 + default "4.9.25" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 60e7c1075f6c3878a38a217c34d5212af1a19633 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 27 Apr 2017 09:37:18 +0200 Subject: [PATCH 2942/3392] python-django: security bump to version 1.10.7 Fixes the following security issues: Since 1.10.3: CVE-2016-9013 - User with hardcoded password created when running tests on Oracle Marti Raudsepp reported that a user with a hardcoded password is created when running tests with an Oracle database. CVE-2016-9014 - DNS rebinding vulnerability when DEBUG=True Aymeric Augustin discovered that Django does not properly validate the Host header against settings.ALLOWED_HOSTS when the debug setting is enabled. A remote attacker can take advantage of this flaw to perform DNS rebinding attacks. Since 1.10.7: CVE-2017-7233 - Open redirect and possible XSS attack via user-supplied numeric redirect URLs It was discovered that is_safe_url() does not properly handle certain numeric URLs as safe. A remote attacker can take advantage of this flaw to perform XSS attacks or to use a Django server as an open redirect. CVE-2017-7234 - Open redirect vulnerability in django.views.static.serve() Phithon from Chaitin Tech discovered an open redirect vulnerability in the django.views.static.serve() view. Note that this view is not intended for production use. Cc: Oli Vogt Signed-off-by: Peter Korsgaard (cherry picked from commit 3a66a81b7a9db8e45f15fa63cc0670d158003d5a) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 38b303bbf6..09be18440b 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/django/json, sha256 locally computed -md5 5342e77374b2acd2eafa86d2bb68f8c9 Django-1.10.2.tar.gz -sha256 e127f12a0bfb34843b6e8c82f91e26fff6445a7ca91d222c0794174cf97cbce1 Django-1.10.2.tar.gz +md5 693dfeabad62c561cb205900d32c2a98 Django-1.10.7.tar.gz +sha256 593d779dbc2350a245c4f76d26bdcad58a39895e87304fe6d725bbdf84b5b0b8 Django-1.10.7.tar.gz diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 2a502314c6..5bb765560c 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 1.10.2 +PYTHON_DJANGO_VERSION = 1.10.7 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://pypi.python.org/packages/57/9e/59444485f092b6ed4f1931e7d2e13b67fdab967c041d02f58a0d1dab8c23 +PYTHON_DJANGO_SITE = https://pypi.python.org/packages/15/b4/d4bb7313e02386bd23a60e1eb5670321313fb67289c6f36ec43bce747aff PYTHON_DJANGO_LICENSE = BSD-3c PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_SETUP_TYPE = setuptools From 8879b99a50c3d6977222e289124d8d85765e8632 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 28 Apr 2017 09:49:30 +0200 Subject: [PATCH 2943/3392] ghostscript: add upstream security fixes for CVE-2017-8291 CVE-2017-8291 - Artifex Ghostscript through 2017-04-26 allows -dSAFER bypass and remote command execution via a "/OutputFile (%pipe%" substring in a crafted .eps document that is an input to the gs program, as exploited in the wild in April 2017. For more details, see https://bugzilla.suse.com/show_bug.cgi?id=1036453 Signed-off-by: Peter Korsgaard (cherry picked from commit 874becfd019bc8f4e126684d08c4164e984b11c3) Signed-off-by: Peter Korsgaard --- ...99-have-.eqproc-check-its-parameters.patch | 33 ++++++++++ ...have-.rsdparams-check-its-parameters.patch | 62 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 package/ghostscript/0003-Bug-697799-have-.eqproc-check-its-parameters.patch create mode 100644 package/ghostscript/0004-Bug-697799-have-.rsdparams-check-its-parameters.patch diff --git a/package/ghostscript/0003-Bug-697799-have-.eqproc-check-its-parameters.patch b/package/ghostscript/0003-Bug-697799-have-.eqproc-check-its-parameters.patch new file mode 100644 index 0000000000..becdc66054 --- /dev/null +++ b/package/ghostscript/0003-Bug-697799-have-.eqproc-check-its-parameters.patch @@ -0,0 +1,33 @@ +From 4f83478c88c2e05d6e8d79ca4557eb039354d2f3 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Thu, 27 Apr 2017 13:03:33 +0100 +Subject: [PATCH] Bug 697799: have .eqproc check its parameters + +The Ghostscript custom operator .eqproc was not check the number or type of +the parameters it was given. + +Signed-off-by: Peter Korsgaard +--- + psi/zmisc3.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/psi/zmisc3.c b/psi/zmisc3.c +index 54b304246..37293ff4b 100644 +--- a/psi/zmisc3.c ++++ b/psi/zmisc3.c +@@ -56,6 +56,12 @@ zeqproc(i_ctx_t *i_ctx_p) + ref2_t stack[MAX_DEPTH + 1]; + ref2_t *top = stack; + ++ if (ref_stack_count(&o_stack) < 2) ++ return_error(gs_error_stackunderflow); ++ if (!r_is_array(op - 1) || !r_is_array(op)) { ++ return_error(gs_error_typecheck); ++ } ++ + make_array(&stack[0].proc1, 0, 1, op - 1); + make_array(&stack[0].proc2, 0, 1, op); + for (;;) { +-- +2.11.0 + diff --git a/package/ghostscript/0004-Bug-697799-have-.rsdparams-check-its-parameters.patch b/package/ghostscript/0004-Bug-697799-have-.rsdparams-check-its-parameters.patch new file mode 100644 index 0000000000..9ba170b316 --- /dev/null +++ b/package/ghostscript/0004-Bug-697799-have-.rsdparams-check-its-parameters.patch @@ -0,0 +1,62 @@ +From 04b37bbce174eed24edec7ad5b920eb93db4d47d Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Thu, 27 Apr 2017 13:21:31 +0100 +Subject: [PATCH] Bug 697799: have .rsdparams check its parameters + +The Ghostscript internal operator .rsdparams wasn't checking the number or +type of the operands it was being passed. Do so. + +Signed-off-by: Peter Korsgaard +--- + psi/zfrsd.c | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) + +diff --git a/psi/zfrsd.c b/psi/zfrsd.c +index 191107d8a..950588d69 100644 +--- a/psi/zfrsd.c ++++ b/psi/zfrsd.c +@@ -49,13 +49,20 @@ zrsdparams(i_ctx_t *i_ctx_p) + ref *pFilter; + ref *pDecodeParms; + int Intent = 0; +- bool AsyncRead; ++ bool AsyncRead = false; + ref empty_array, filter1_array, parms1_array; + uint i; +- int code; ++ int code = 0; ++ ++ if (ref_stack_count(&o_stack) < 1) ++ return_error(gs_error_stackunderflow); ++ if (!r_has_type(op, t_dictionary) && !r_has_type(op, t_null)) { ++ return_error(gs_error_typecheck); ++ } + + make_empty_array(&empty_array, a_readonly); +- if (dict_find_string(op, "Filter", &pFilter) > 0) { ++ if (r_has_type(op, t_dictionary) ++ && dict_find_string(op, "Filter", &pFilter) > 0) { + if (!r_is_array(pFilter)) { + if (!r_has_type(pFilter, t_name)) + return_error(gs_error_typecheck); +@@ -94,12 +101,13 @@ zrsdparams(i_ctx_t *i_ctx_p) + return_error(gs_error_typecheck); + } + } +- code = dict_int_param(op, "Intent", 0, 3, 0, &Intent); ++ if (r_has_type(op, t_dictionary)) ++ code = dict_int_param(op, "Intent", 0, 3, 0, &Intent); + if (code < 0 && code != gs_error_rangecheck) /* out-of-range int is ok, use 0 */ + return code; +- if ((code = dict_bool_param(op, "AsyncRead", false, &AsyncRead)) < 0 +- ) +- return code; ++ if (r_has_type(op, t_dictionary)) ++ if ((code = dict_bool_param(op, "AsyncRead", false, &AsyncRead)) < 0) ++ return code; + push(1); + op[-1] = *pFilter; + if (pDecodeParms) +-- +2.11.0 + From eac5d8c01d2e338ecc46f2da692365800033ce4c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 29 Apr 2017 16:02:07 +0200 Subject: [PATCH 2944/3392] package/samba4: bump version to 4.5.8 Version bump includes a regression fix: https://www.samba.org/samba/history/samba-4.5.8.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 67c25f897dd61802ea97c83619ca5dace8ba7c27) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 2 +- package/samba4/samba4.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 71d24f7feb..0a2a548a15 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ac70f09af80639d8189e1b9bc0a554841ee44df2b1ef58e7e682ad5400fd9400 samba-4.5.7.tar.gz +sha256 f63b656d8823a280c50c9dbd6b692816cd7a88adfe9b47997ce697fd75bf81f0 samba-4.5.8.tar.gz diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index aa7cb576d2..741fb41342 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.5.7 +SAMBA4_VERSION = 4.5.8 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 84e3e5a9f0a6028d230c757fbac8e8895e31dcc3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 30 Apr 2017 21:36:02 +0200 Subject: [PATCH 2945/3392] freetype: add upstream security fixes for CVE-2017-8105 and CVE-2017-8287 Add upstream post-2.7.1 commits (except for ChangeLog modifications) fixing the following security issues: CVE-2017-8105 - FreeType 2 before 2017-03-24 has an out-of-bounds write caused by a heap-based buffer overflow related to the t1_decoder_parse_charstrings function in psaux/t1decode.c. CVE-2017-8287 - FreeType 2 before 2017-03-26 has an out-of-bounds write caused by a heap-based buffer overflow related to the t1_builder_close_contour function in psaux/psobjs.c. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 6d557ac0133618fe4fe1d417bf584e21ef208871) Signed-off-by: Peter Korsgaard --- ...1-psaux-Better-protect-flex-handling.patch | 47 +++++++++++++++++++ ....c-t1_builder_close_contour-Add-safe.patch | 35 ++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 package/freetype/0001-psaux-Better-protect-flex-handling.patch create mode 100644 package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch diff --git a/package/freetype/0001-psaux-Better-protect-flex-handling.patch b/package/freetype/0001-psaux-Better-protect-flex-handling.patch new file mode 100644 index 0000000000..a59f5b34f1 --- /dev/null +++ b/package/freetype/0001-psaux-Better-protect-flex-handling.patch @@ -0,0 +1,47 @@ +From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001 +From: Werner Lemberg +Date: Fri, 24 Mar 2017 09:15:10 +0100 +Subject: [PATCH] [psaux] Better protect `flex' handling. + +Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935 + +* src/psaux/t1decode.c (t1_decoder_parse_charstrings) +: Since there is not a single flex operator but a +series of subroutine calls, malformed fonts can call arbitrary other +operators after the start of a flex, possibly adding points. For +this reason we have to check the available number of points before +inserting a point. + +Fixes CVE-2017-8105 + +Signed-off-by: Peter Korsgaard +--- +diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c +index af7b465e..7dd45135 100644 +--- a/src/psaux/t1decode.c ++++ b/src/psaux/t1decode.c +@@ -780,10 +780,19 @@ + /* point without adding any point to the outline */ + idx = decoder->num_flex_vectors++; + if ( idx > 0 && idx < 7 ) ++ { ++ /* in malformed fonts it is possible to have other */ ++ /* opcodes in the middle of a flex (which don't */ ++ /* increase `num_flex_vectors'); we thus have to */ ++ /* check whether we can add a point */ ++ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) ) ++ goto Syntax_Error; ++ + t1_builder_add_point( builder, + x, + y, + (FT_Byte)( idx == 3 || idx == 6 ) ); ++ } + } + break; + +-- +2.11.0 + diff --git a/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch b/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch new file mode 100644 index 0000000000..1b9d90a7d3 --- /dev/null +++ b/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch @@ -0,0 +1,35 @@ +From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001 +From: Werner Lemberg +Date: Sun, 26 Mar 2017 08:32:09 +0200 +Subject: [PATCH] * src/psaux/psobjs.c (t1_builder_close_contour): Add safety + guard. + +Reported as + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941 + +Fixes CVE-2017-8287 + +Signed-off-by: Peter Korsgaard +diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c +index d18e821a..0baf8368 100644 +--- a/src/psaux/psobjs.c ++++ b/src/psaux/psobjs.c +@@ -1718,6 +1718,14 @@ + first = outline->n_contours <= 1 + ? 0 : outline->contours[outline->n_contours - 2] + 1; + ++ /* in malformed fonts it can happen that a contour was started */ ++ /* but no points were added */ ++ if ( outline->n_contours && first == outline->n_points ) ++ { ++ outline->n_contours--; ++ return; ++ } ++ + /* We must not include the last point in the path if it */ + /* is located on the first point. */ + if ( outline->n_points > 1 ) +-- +2.11.0 + From bc224445b2b79be9e286124c389c8a758d7f6ef2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 30 Apr 2017 21:51:39 +0200 Subject: [PATCH 2946/3392] toolchain-external: CodeSourcery NIOSII update upstream URL The current URL returns error 403: Forbidden, so switch to https. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit d647b23e2e0127fc98012f15a57fceb873500bad) Signed-off-by: Peter Korsgaard --- .../toolchain-external-codesourcery-niosII.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk index 7381061cec..dcca94f071 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk @@ -6,7 +6,7 @@ TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2016.11-32 -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SOURCE = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_ACTUAL_SOURCE_TARBALL = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 From 0bc84f9612d9ccfa3bf8c03ec8299ae45887be94 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 30 Apr 2017 22:20:46 +0200 Subject: [PATCH 2947/3392] toolchain-external: CodeSourcery aarch64 update upstream URL The current URL returns error 403: Forbidden, so switch to https. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 3e069f41bfd62cbb034ccd7f531b976564bda121) Signed-off-by: Peter Korsgaard --- .../toolchain-external-codesourcery-aarch64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk index bc58c44c71..e320d3d37d 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION = 2014.11-95 TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SOURCE = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_ACTUAL_SOURCE_TARBALL = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 From 35db9f3ab98c2fa0cc166c5f45a3d8f82fef93fe Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 30 Apr 2017 22:20:47 +0200 Subject: [PATCH 2948/3392] toolchain-external: CodeSourcery ARM update upstream URL The current URL returns error 403: Forbidden, so switch to https. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit bcf1d93a89a21cab98e15775f0d705cc7805741b) Signed-off-by: Peter Korsgaard --- .../toolchain-external-codesourcery-arm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk index f96a0e0b6e..f15a50c43e 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk @@ -6,7 +6,7 @@ TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION = 2014.05-29 -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SOURCE = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_ACTUAL_SOURCE_TARBALL = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 From 296ffa677072dd2e0cdf1c2afa8134ed0bafe0cb Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 30 Apr 2017 22:20:48 +0200 Subject: [PATCH 2949/3392] toolchain-external: CodeSourcery MIPS update upstream URL The current URL returns error 403: Forbidden, so switch to https. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 25902b111a93e562e3c1991f65c03649c88802c4) Signed-off-by: Peter Korsgaard --- .../toolchain-external-codesourcery-mips.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk index 5117d475cb..94fbbff591 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.mk @@ -6,7 +6,7 @@ TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_VERSION = 2016.05-8 -TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) +TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_SOURCE = mips-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_ACTUAL_SOURCE_TARBALL = mips-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 From 7ac7be5f87017c6d81f23b532054e21be11aedbd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 1 May 2017 20:58:08 +0200 Subject: [PATCH 2950/3392] linux-headers: bump 3.18.x series to 3.18.51 Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 46a889d6fc..5c49abe27a 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,7 +218,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 default "3.12.73" if BR2_KERNEL_HEADERS_3_12 - default "3.18.50" if BR2_KERNEL_HEADERS_3_18 + default "3.18.51" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 From b706f46e97629f922ab0ab333b490b72ef9e625c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 1 May 2017 20:57:08 +0200 Subject: [PATCH 2951/3392] linux-headers: bump 4.4.x series to 4.4.65 Signed-off-by: Peter Korsgaard (cherry picked from commit 0d18d1d9c0dd8173eee918b30761548c19b6bfdc) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 5c49abe27a..fc3108ba85 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.64" if BR2_KERNEL_HEADERS_4_4 + default "4.4.65" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 default "4.9.25" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From abfcc5624b0bd01a8c8c3c01b4d9b91f9ddeda31 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 24 Apr 2017 22:13:23 +0200 Subject: [PATCH 2952/3392] busybox: no need to disable clear and reset Removing clear and reset from the busybox config when the ncurses tools are enabled is not really needed. Since commit 802bff9c42, the busybox install will not overwrite existing programs. Therefore, the tools will be installed correctly regardless of the order of the build: - if busybox is built first, the clear and reset apps are installed, but they will be overwritten by ncurses; - if ncurses is built first, it will install the clear and reset apps, and busybox will no longer install them. We prefer not to modify the busybox configuration when not strictly necessary, because it is surprising for the user that his configuration is not applied. Clearly, it's not ideal that busybox is configured with redundant apps, but if the user wants to shrink it, it's possible to provide a custom config. This partially reverts commit 33c72344a8686a136c1da6a056ed6c0945bbf8b7. Cc: Matthew Weber Cc: Danomi Manchego Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Matt Weber Signed-off-by: Peter Korsgaard (cherry picked from commit 200282e2070ec0405184378c3cfb4e04ab26c5d8) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 7cc559c3c3..577f2f2470 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -148,17 +148,6 @@ define BUSYBOX_MUSL_TWEAKS endef endif -ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PROGS),y) -# Ncurses package overlaps: -# /usr/bin/clear -# /usr/bin/reset -> /usr/bin/tset (symlink) -# -define BUSYBOX_DISABLE_NCURSES_PROGS - $(call KCONFIG_DISABLE_OPT,CONFIG_CLEAR,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_RESET,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - define BUSYBOX_INSTALL_UDHCPC_SCRIPT if grep -q CONFIG_UDHCPC=y $(@D)/.config; then \ $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \ @@ -240,7 +229,6 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_WATCHDOG) $(BUSYBOX_SET_SELINUX) $(BUSYBOX_MUSL_TWEAKS) - $(BUSYBOX_DISABLE_NCURSES_PROGS) endef define BUSYBOX_CONFIGURE_CMDS From 799aed7a181e82a6446403b7abe77119622a6779 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 2 May 2017 00:05:42 +0200 Subject: [PATCH 2953/3392] Update for 2017.02.2 Signed-off-by: Peter Korsgaard --- CHANGES | 19 +++++++++++++++++++ Makefile | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 75163c32d1..f26077a882 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,22 @@ +2017.02.2, Released May 1st, 2017 + + Important / security related fixes. + + Use HTTPS for the Codesourcery external toolchains as the HTTP + URLs no longer work. + + Updated/fixed packages: bind, busybox, dovecot, freetype, + ghostscript, glibc, granite, hiredis, icu, imagemagick, + gst-plugins-base, gst1-plugins-base, libcroco, libcurl, libnl, + libnspr, libnss, libsamplerate, libsndfile, libunwind, + minicom, mplayer, mpv, nodejs, python-django, python-pyyaml, + python-web2py, samba4, syslinux, systemd, tiff, trinity, + uboot, wireshark, xen + + Issues resolved (http://bugs.buildroot.org): + + #9791: Python searches for packages in the user site directory + 2017.02.1, Released April 4th, 2017 Important / security related fixes. diff --git a/Makefile b/Makefile index 30e76fa7af..92ecdf1907 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02.1 +export BR2_VERSION := 2017.02.2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1491392000 +BR2_VERSION_EPOCH = 1493676000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) From 4a33076ffb68b9d90e6a918d4cb86f2740c2c824 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 3 May 2017 15:46:35 +0300 Subject: [PATCH 2954/3392] picocom: force target LDFLAGS This allows a static build of picocom when BR2_STATIC_LIBS=y but the toolchain provides static and shared libraries. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit add51b89bfb5ebe7b533e14714088a4d3912c9a0) Signed-off-by: Peter Korsgaard --- package/picocom/picocom.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk index 59a749fba1..e0e817eab1 100644 --- a/package/picocom/picocom.mk +++ b/package/picocom/picocom.mk @@ -10,7 +10,8 @@ PICOCOM_LICENSE = GPLv2+ PICOCOM_LICENSE_FILES = LICENSE.txt define PICOCOM_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ + LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) endef define PICOCOM_INSTALL_TARGET_CMDS From f7d6bf3dda7982aa4fc9213bb763481915cc451b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 3 May 2017 21:36:29 +0200 Subject: [PATCH 2955/3392] linux-headers: bump 4.{4,9,10}.x series [Peter: drop 4.10.x bump] Signed-off-by: Peter Korsgaard (cherry picked from commit 15a31470b0381fc0a77cafbc5ed63c8578a163ff) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fc3108ba85..205806a1f1 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.65" if BR2_KERNEL_HEADERS_4_4 + default "4.4.66" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.25" if BR2_KERNEL_HEADERS_4_9 + default "4.9.26" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 09fd512c8a15f157ee38597c67488e21f10d1117 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 4 May 2017 23:13:12 +0200 Subject: [PATCH 2956/3392] nvidia-driver: use http:// instead of ftp:// Fixes the download, which currently times out on ftp://. Signed-off-by: Thomas Petazzoni (cherry picked from commit 2068c7c6a810cdaf55240faf15c226ce3b308f1b) Signed-off-by: Peter Korsgaard --- package/nvidia-driver/nvidia-driver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index cb9b7faeca..20beec8936 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -6,7 +6,7 @@ NVIDIA_DRIVER_VERSION = 375.20 NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) -NVIDIA_DRIVER_SITE = ftp://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) +NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run NVIDIA_DRIVER_LICENSE = NVIDIA Software License NVIDIA_DRIVER_LICENSE_FILES = LICENSE From 6df3dc343fd908f246c319782442282b71be89c0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 5 May 2017 21:08:26 +0200 Subject: [PATCH 2957/3392] package/kyua: fix unmet dependencies lutok is a lua module, so it depends on ! static libs. However, the dependency is implicit, being done because the lua modules are sourced globally under an if-block, and thus it is not easy to find that dependency. Propagate that dependency to kyua, which was missing it (because it is not a lua module, so was missing the dependency). [Peter: also update toolchain comment] Signed-off-by: "Yann E. MORIN" Cc: Sebastien Bourdelin Signed-off-by: Peter Korsgaard (cherry picked from commit a65da16f630cea87fd0527ce73df0b529b73946c) Signed-off-by: Peter Korsgaard --- package/kyua/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/kyua/Config.in b/package/kyua/Config.in index 4f887b0e0a..4fc5e098ad 100644 --- a/package/kyua/Config.in +++ b/package/kyua/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_KYUA depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_HAS_LUAINTERPRETER # lutok depends on !BR2_PACKAGE_LUAJIT # lutok + depends on !BR2_STATIC_LIBS # lutok depends on BR2_USE_MMU # atf select BR2_PACKAGE_ATF select BR2_PACKAGE_LUTOK @@ -16,7 +17,7 @@ config BR2_PACKAGE_KYUA https://github.com/jmmv/kyua -comment "kyua needs a toolchain w/ C++ and full Lua" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_LUAJIT +comment "kyua needs a toolchain w/ C++, dynamic library and full Lua" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_LUAJIT || BR2_STATIC_LIBS depends on BR2_PACKAGE_HAS_LUAINTERPRETER depends on BR2_USE_MMU From 3858b49e9302789bf70b7e49a69982a4c4a61162 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Fri, 5 May 2017 20:51:18 -0400 Subject: [PATCH 2958/3392] dbus: fix dbus symlink removal There was already a post-build hook to delete the /var/lib/dbus symlink created by buildroot after the package's own installation, to prevent a dbus installation error during "make dbus-rebuild". However, this misses the case for when one might delete the .stamp_target_installed file manually, outside of dbus-rebuild. This can be fixed by changing the post-build hook to a pre-install hook. This seems appropriate, since it is really addressing an installation issue, not a build issue. Signed-off-by: Danomi Manchego Signed-off-by: Peter Korsgaard (cherry picked from commit c2d6c4ac3277e545ef27b3d4f3e6d94e50d76256) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 2d1583e550..66b90bca81 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -82,7 +82,7 @@ define DBUS_REMOVE_VAR_LIB_DBUS rm -rf $(TARGET_DIR)/var/lib/dbus endef -DBUS_POST_BUILD_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS +DBUS_PRE_INSTALL_TARGET_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS define DBUS_REMOVE_DEVFILES rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 From f1d4f33bab7a6780b19f48482f53e8619b399799 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 6 May 2017 22:26:10 +0200 Subject: [PATCH 2959/3392] package/libubox: fix lua module install path The LUAPATH variable is only used when installing the lua module, and cmake knows very well how to do out-of-tree isntalls, so there is no reason to include the staging path in LUAPATH, which will cause our post-install sanity checks to kick in and whine: libubox: installs files in /home/lhk/workspace/orangepi/host/usr/a rm-buildroot-linux-gnueabihf/sysroot//home/lhk/workspace/orangepi As for libuci, just pass the runtime LUAPATH. Fixes #9856 Reported-by: linhuikui@gmail.com Signed-off-by: "Yann E. MORIN" Cc: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit be3645a58ad1ee3961c4da1b2f72f5835629303a) Signed-off-by: Peter Korsgaard --- package/libubox/libubox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk index 00392c3112..2bde25f4ca 100644 --- a/package/libubox/libubox.mk +++ b/package/libubox/libubox.mk @@ -13,7 +13,7 @@ LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c) ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy) LIBUBOX_DEPENDENCIES += lua LIBUBOX_CONF_OPTS += -DBUILD_LUA=ON \ - -DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \ + -DLUAPATH=/usr/lib/lua/5.1 \ -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include else LIBUBOX_CONF_OPTS += -DBUILD_LUA=OFF From 21724ff539da1be1788171fe7df216d300b6d228 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 7 May 2017 14:23:24 +0200 Subject: [PATCH 2960/3392] package/ltp-testsuite: needs threads NPTL Fixes: http://autobuild.buildroot.net/results/3e0/3e0bbf41e339e62422463773bf07945f048a9501 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 362d185b309a1634901d4cb35bc1778d58e2015a) Signed-off-by: Peter Korsgaard --- package/ltp-testsuite/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in index 274b03e423..60e1922834 100644 --- a/package/ltp-testsuite/Config.in +++ b/package/ltp-testsuite/Config.in @@ -5,7 +5,7 @@ comment "ltp-testsuite needs specific uClibc options, see help" config BR2_PACKAGE_LTP_TESTSUITE bool "ltp-testsuite" depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC # does not build, cachectl.h issue @@ -22,7 +22,7 @@ config BR2_PACKAGE_LTP_TESTSUITE http://linux-test-project.github.io -comment "ltp-testsuite needs a glibc or uClibc toolchain w/ threads" +comment "ltp-testsuite needs a glibc or uClibc toolchain w/ NPTL" depends on !BR2_nios2 depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_TOOLCHAIN_USES_MUSL From ff1e2c2c0d3a9e5b806308325585994f43f2c858 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 27 Apr 2017 23:01:50 +0200 Subject: [PATCH 2961/3392] qt5base: fix examples compile with disabled gui module Fixes [1]: Project ERROR: Could not find feature opengl. [1] http://autobuild.buildroot.net/results/040/040ab283dbbec623fe5ff4eaece754d9701fafc5 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 4860e05a63bf01156466a1a8007de38e2839501a) Signed-off-by: Peter Korsgaard --- ...mples-fix-compile-without-gui-module.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch diff --git a/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch b/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch new file mode 100644 index 0000000000..148ced8004 --- /dev/null +++ b/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch @@ -0,0 +1,42 @@ +From fe8a9bacf781fcf290e04a08f2b8e37d881d58bb Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 27 Apr 2017 22:41:28 +0200 +Subject: [PATCH] examples: fix compile without gui module + +Fixes: + + Project ERROR: Could not find feature opengl. + +Signed-off-by: Peter Seiderer +--- + examples/gui/gui.pro | 2 +- + examples/widgets/widgets.pro | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro +index a4d960d3f5..b8080c2075 100644 +--- a/examples/gui/gui.pro ++++ b/examples/gui/gui.pro +@@ -6,5 +6,5 @@ CONFIG += no_docs_target + + SUBDIRS += analogclock + SUBDIRS += rasterwindow +-qtConfig(opengl): \ ++qtHaveModule(gui):qtConfig(opengl): \ + SUBDIRS += openglwindow +diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro +index 513ddc91f2..cef4936d32 100644 +--- a/examples/widgets/widgets.pro ++++ b/examples/widgets/widgets.pro +@@ -22,7 +22,7 @@ SUBDIRS = \ + tutorials \ + widgets + +-qtConfig(opengl): \ ++qtHaveModule(gui):qtConfig(opengl): \ + SUBDIRS += windowcontainer + + contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows +-- +2.11.0 + From 8f3915ef79a161e24fe47c2ad83d0ab761fa7eab Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 11 May 2017 09:46:40 +0200 Subject: [PATCH 2962/3392] efibootmgr: backport upstream patch to fix build with gcc 6.x efibootmgr was built with -fshort-wchar, which causes gcc to use 2-byte wchar_t instead of the normal 4-byte wchar_t. But this doesn't work anymore with gcc 6.x, as it causes a build failure: /home/test/autobuild/run/instance-3/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/6.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: warning: efibootmgr.o uses 2-byte wchar_t yet the output is to use 4-byte wchar_t; use of wchar_t values across objects may fail /home/test/autobuild/run/instance-3/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/6.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: warning: efi.o uses 2-byte wchar_t yet the output is to use 4-byte wchar_t; use of wchar_t values across objects may fail /home/test/autobuild/run/instance-3/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/6.3.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: warning: unparse_path.o uses 2-byte wchar_t yet the output is to use 4-byte wchar_t; use of wchar_t values across objects may fail Upstream solution was do simply drop -fshort-wchar: https://github.com/rhinstaller/efibootmgr/commit/3466fd05c8c6f1052e0426d64eed40f8a88fd78f So this commit simply backports this upstream patch. Fixes: http://autobuild.buildroot.net/results/87c3ff2427331eb9ab31c9eb685fe80954a0a98f/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 3e254b82c77f5b91907ee96e9cb053ac65cca00b) Signed-off-by: Peter Korsgaard --- package/efibootmgr/efibootmgr.hash | 1 + package/efibootmgr/efibootmgr.mk | 3 +++ 2 files changed, 4 insertions(+) diff --git a/package/efibootmgr/efibootmgr.hash b/package/efibootmgr/efibootmgr.hash index f71dced53f..3f934bad08 100644 --- a/package/efibootmgr/efibootmgr.hash +++ b/package/efibootmgr/efibootmgr.hash @@ -1,2 +1,3 @@ # locally computed hash sha256 3f260491e2c62e93cb6347ea6f21aaa5f93152e9e7f0269d314623769d82e473 efibootmgr-14.tar.gz +sha256 8e91f16927d296ffebd4f7fafda2f84c0f6201aba089a35e8090abd5aacdc58e 3466fd05c8c6f1052e0426d64eed40f8a88fd78f.patch diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk index 487c8ca666..7f5f4940c3 100644 --- a/package/efibootmgr/efibootmgr.mk +++ b/package/efibootmgr/efibootmgr.mk @@ -6,6 +6,9 @@ EFIBOOTMGR_VERSION = 14 EFIBOOTMGR_SITE = $(call github,rhinstaller,efibootmgr,$(EFIBOOTMGR_VERSION)) +# Patch fixes the build with gcc 6.x. +EFIBOOTMGR_PATCH = \ + https://github.com/rhinstaller/efibootmgr/commit/3466fd05c8c6f1052e0426d64eed40f8a88fd78f.patch EFIBOOTMGR_LICENSE = GPLv2+ EFIBOOTMGR_LICENSE_FILES = COPYING EFIBOOTMGR_DEPENDENCIES = efivar $(if $(BR2_NEEDS_GETTEXT),gettext) From fe43fddcfc91b5d9e4f4463930ae424bb48281e3 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 11 May 2017 14:00:40 +0100 Subject: [PATCH 2963/3392] sudo: fix static linking with openldap having openssl support If we are building sudo statically and openldap was linked with openssl, then when we link sudo with openldap we need to specify the openssl libs, otherwise it will fail with "undefined reference" errors. Fixes: http://autobuild.buildroot.net/results/ebb/ebbb4c3138b5023a0c8bd938db1932a25ba5b6fb/ http://autobuild.buildroot.net/results/58e/58ee4fddea85f0c79b26582b04a573258e27eb47/ http://autobuild.buildroot.net/results/051/05151c4ef7f0b3702a6cd5e6df4888d826a37431/ http://autobuild.buildroot.net/results/b1d/b1dfae81985daee106700191fcb82387833c2e3f/ http://autobuild.buildroot.net/results/5b4/5b42e8505856156389d480d0da19f6982cf120d8/ http://autobuild.buildroot.net/results/30a/30a76190428f902f03bcf54ba9f1f4f4377c6fc9/ http://autobuild.buildroot.net/results/e8c/e8c6bdc314b9a8d5de303633a3abd7b7e44beb2e/ http://autobuild.buildroot.net/results/483/4830c69cc6a62080e1516f0d9009c2ba619c23c1/ Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit bf899e50d89439b1a1bdf22bc933075958ffc108) Signed-off-by: Peter Korsgaard --- package/sudo/sudo.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index bb0a2b5e69..7f0b132500 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -40,6 +40,13 @@ endif ifeq ($(BR2_PACKAGE_OPENLDAP),y) SUDO_DEPENDENCIES += openldap SUDO_CONF_OPTS += --with-ldap +# If we are building sudo statically and openldap was linked with openssl, then +# when we link sudo with openldap we need to specify the openssl libs, otherwise +# it will fail with "undefined reference" errors. +ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_OPENSSL),yy) +SUDO_DEPENDENCIES += host-pkgconf +SUDO_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" +endif else SUDO_CONF_OPTS += --without-ldap endif From 5149066e594a7c7f1f0bbe195f371309c0c5bc07 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 13 Mar 2017 11:52:13 +0000 Subject: [PATCH 2964/3392] postgresql: bump version to 9.6.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit cd3d6c32ca515d5fb8dcc47cb17b2677fd480948) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 900a55a7ad..1524a342ab 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,2 +1,2 @@ -# From https://ftp.postgresql.org/pub/source/v9.6.1/postgresql-9.6.1.tar.bz2.sha256 -sha256 e5101e0a49141fc12a7018c6dad594694d3a3325f5ab71e93e0e51bd94e51fcd postgresql-9.6.1.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v9.6.2/postgresql-9.6.2.tar.bz2.sha256 +sha256 0187b5184be1c09034e74e44761505e52357248451b0c854dddec6c231fe50c9 postgresql-9.6.2.tar.bz2 diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index bc2bf47ee7..e07afc94a8 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 9.6.1 +POSTGRESQL_VERSION = 9.6.2 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 2fb0ed2be293acf6a6b3fc657fca9d039cc82a22 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 11 May 2017 15:20:14 +0100 Subject: [PATCH 2965/3392] postgresql: bump version to 9.6.3 (security) Three security vulnerabilities have been closed by this release: CVE-2017-7484: selectivity estimators bypass SELECT privilege checks CVE-2017-7485: libpq ignores PGREQUIRESSL environment variable CVE-2017-7486: pg_user_mappings view discloses foreign server passwords More details: https://www.postgresql.org/about/news/1746/ Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit e2bb446ff50c3bd346beca07d5e7f3dc11591a1c) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 1524a342ab..c65edf71da 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,2 +1,2 @@ -# From https://ftp.postgresql.org/pub/source/v9.6.2/postgresql-9.6.2.tar.bz2.sha256 -sha256 0187b5184be1c09034e74e44761505e52357248451b0c854dddec6c231fe50c9 postgresql-9.6.2.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v9.6.3/postgresql-9.6.3.tar.bz2.sha256 +sha256 1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6 postgresql-9.6.3.tar.bz2 diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index e07afc94a8..62b41cbeaa 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 9.6.2 +POSTGRESQL_VERSION = 9.6.3 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 40645cc665dd812ce034bc1472e52bc84ef760cf Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Thu, 11 May 2017 15:46:57 +0200 Subject: [PATCH 2966/3392] qwt: fix build when BR2_STATIC_LIBS=y By default, qwt build a shared library, but when BR2_STATIC_LIBS is set compilation failed with errors like : __uClibc_main.c:(.text+0x164): undefined reference to `__fini_array_end' __uClibc_main.c:(.text+0x168): undefined reference to `__fini_array_start' __uClibc_main.c:(.text+0x16c): undefined reference to `__fini_array_start' This patch disable QwtDll to build a static library when BR2_STATIC_LIBS=y. fix: http://autobuild.buildroot.net/results/739/739406bb8073d1861933872a47802954d9767634/ Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni (cherry picked from commit 11c619058e8b9de99d4ee227aaf41de1518395f8) Signed-off-by: Peter Korsgaard --- package/qwt/qwt.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index d1bb5245b1..043bc3f38f 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -41,6 +41,12 @@ else QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtOpenGL.*$$/\# QWT_CONFIG += QwtOpenGL/' endif +ifeq ($(BR2_STATIC_LIBS),y) +QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDll.*$$/\# QWT_CONFIG += QwtDll/' +else +QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDll.*$$/QWT_CONFIG += QwtDll/' +endif + define QWT_CONFIGURE_CMDS $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri (cd $(@D); $(TARGET_MAKE_ENV) $(QWT_QMAKE)) From ebe3a0265627e9172a8101cf2e0c9cf75ae734b9 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 23 Mar 2017 17:37:50 +0000 Subject: [PATCH 2967/3392] openvpn: bump version to 2.4.1 --disable-eurephia configure option doesn't exist, so remove it. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 9ecbe727aa2e5a47bf23687c82afad806d882bb2) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 600c25073f..a03345eb43 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 6f23ba49a1dbeb658f49c7ae17d9ea979de6d92c7357de3d55cd4525e1b2f87e openvpn-2.4.0.tar.xz +sha256 fde9e22c6df7a335d2d58c6a4d5967be76df173c766a5c51ece57fd044c76ee5 openvpn-2.4.1.tar.xz diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 5e3df59f30..a2e21f9dd4 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.4.0 +OPENVPN_VERSION = 2.4.1 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl @@ -22,8 +22,7 @@ OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \ ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y) OPENVPN_CONF_OPTS += \ --enable-small \ - --disable-plugins \ - --disable-eurephia + --disable-plugins endif # BusyBox 1.21+ places the ip applet in the "correct" place From 655ff05b9f42160d25fbe0001dd80f74bdf66beb Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Fri, 24 Mar 2017 08:12:03 +0100 Subject: [PATCH 2968/3392] openvpn: Add explicit support for external lz4 2.4.0 added lz4 support. Make that choice explicit or the bundled compat-lz4 "stub" will be used. Signed-off-by: Jeroen Roovers Signed-off-by: Thomas Petazzoni (cherry picked from commit 65e6f6ff2adc21f2fea4c0c8bc4dcd9e3b865264) Signed-off-by: Peter Korsgaard --- package/openvpn/Config.in | 7 +++++++ package/openvpn/openvpn.mk | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in index 5fa191d97b..0a1675573a 100644 --- a/package/openvpn/Config.in +++ b/package/openvpn/Config.in @@ -14,6 +14,13 @@ config BR2_PACKAGE_OPENVPN if BR2_PACKAGE_OPENVPN +config BR2_PACKAGE_OPENVPN_LZ4 + bool "LZ4 compression" + default y + select BR2_PACKAGE_LZ4 + help + Enable LZ4 compression. + config BR2_PACKAGE_OPENVPN_LZO bool "LZO compression" default y diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index a2e21f9dd4..6581a4edd4 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -35,6 +35,12 @@ else OPENVPN_CONF_ENV += IPROUTE=/sbin/ip endif +ifeq ($(BR2_PACKAGE_OPENVPN_LZ4),y) +OPENVPN_DEPENDENCIES += lz4 +else +OPENVPN_CONF_OPTS += --disable-lz4 +endif + ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) OPENVPN_DEPENDENCIES += lzo else From ab268515e081d7f0f90d8cb270b13aa7eab71ded Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 May 2017 18:53:33 +0200 Subject: [PATCH 2969/3392] package/openvpn: security bump to 2.4.2 Fixes CVE-2017-7478 & CVE-2017-7479: https://community.openvpn.net/openvpn/wiki/QuarkslabAndCryptographyEngineerAudits Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a4e5ee245e9d19a8e1c95b26bd17f2b6d95e9263) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index a03345eb43..fe054e9618 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 fde9e22c6df7a335d2d58c6a4d5967be76df173c766a5c51ece57fd044c76ee5 openvpn-2.4.1.tar.xz +sha256 df5c4f384b7df6b08a2f6fa8a84b9fd382baf59c2cef1836f82e2a7f62f1bff9 openvpn-2.4.2.tar.xz diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 6581a4edd4..34b0e4bef1 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.4.1 +OPENVPN_VERSION = 2.4.2 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl From 4c12eab4e75ec7c9f6c1c279e0e3b1ffbf9c701b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 11 May 2017 19:00:42 +0200 Subject: [PATCH 2970/3392] package/linux-headers: bump 3.12.x and 4.{4, 9, 10}.x series [Peter: drop 4.10.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit d48436c2bf7ca5a6e3d38ce5c2f3ba0ddd6d7386) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 205806a1f1..0fd5f68e36 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -217,12 +217,12 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.2.88" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 - default "3.12.73" if BR2_KERNEL_HEADERS_3_12 + default "3.12.74" if BR2_KERNEL_HEADERS_3_12 default "3.18.51" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.66" if BR2_KERNEL_HEADERS_4_4 + default "4.4.67" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.26" if BR2_KERNEL_HEADERS_4_9 + default "4.9.27" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 0a360e132b457d49722ea7bfc63306f787da3178 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 11 May 2017 14:22:11 +0300 Subject: [PATCH 2971/3392] strongswan: fix crypt() redefinition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add patch from upstream pending pull request (#72) to fix crypt() definition conflict. Fixes: http://autobuild.buildroot.net/results/612/6120add5ad6e7f5d575fc2a2442cd7fe5302eb46/ http://autobuild.buildroot.net/results/ba1/ba1298e71ef28857654ae8d4593d09e4fe8cdda0/ http://autobuild.buildroot.net/results/6b9/6b928e2a6a35bfb21c792fca083bc4cbdaef9304/ Cc: Jérôme Pouiller Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit dd24d95a76d19378b50e1d8a26ff0a00860671c6) Signed-off-by: Peter Korsgaard --- ...af_alg-fix-crypt-definition-conflict.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch diff --git a/package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch b/package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch new file mode 100644 index 0000000000..442e53eb9e --- /dev/null +++ b/package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch @@ -0,0 +1,55 @@ +From 0b906cb025a506be1b73e5b485179585d1a90be2 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 11 May 2017 14:04:47 +0300 +Subject: [PATCH] af_alg: fix crypt() definition conflict + +Rename the crypt() method to avoid conflict with POSIX crypt(). Fixes the +following build failure with musl libc: + +In file included from ../../../../src/libstrongswan/utils/utils.h:53:0, + from ../../../../src/libstrongswan/library.h:101, + from af_alg_ops.h:24, + from af_alg_ops.c:16: +af_alg_ops.c:110:22: error: conflicting types for 'crypt' + METHOD(af_alg_ops_t, crypt, bool, + ^ +../../../../src/libstrongswan/utils/utils/object.h:99:13: note: in definition of macro 'METHOD' + static ret name(union {iface *_public; this;} \ + ^ +In file included from af_alg_ops.c:18:0: +.../host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/unistd.h:144:7: note: previous declaration of 'crypt' was here + char *crypt(const char *, const char *); + ^ + +Signed-off-by: Baruch Siach +--- +Upstream status: https://github.com/strongswan/strongswan/pull/72 + + src/libstrongswan/plugins/af_alg/af_alg_ops.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libstrongswan/plugins/af_alg/af_alg_ops.c b/src/libstrongswan/plugins/af_alg/af_alg_ops.c +index 331d1e8010aa..452cd1ac30c9 100644 +--- a/src/libstrongswan/plugins/af_alg/af_alg_ops.c ++++ b/src/libstrongswan/plugins/af_alg/af_alg_ops.c +@@ -107,7 +107,7 @@ METHOD(af_alg_ops_t, hash, bool, + return TRUE; + } + +-METHOD(af_alg_ops_t, crypt, bool, ++METHOD(af_alg_ops_t, crypt_, bool, + private_af_alg_ops_t *this, u_int32_t type, chunk_t iv, chunk_t data, + char *out) + { +@@ -224,7 +224,7 @@ af_alg_ops_t *af_alg_ops_create(char *type, char *alg) + .public = { + .hash = _hash, + .reset = _reset, +- .crypt = _crypt, ++ .crypt = _crypt_, + .set_key = _set_key, + .destroy = _destroy, + }, +-- +2.11.0 + From d21206802b8bf1cad26543b93fe72ef867fde1b9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 8 May 2017 23:11:49 +0200 Subject: [PATCH 2972/3392] package/efl: fix unmet dependencies EFL's elput selects libinput but forgot to propagate its dependencies. Which requires they be propagated further to a second sub-option, then to a third one. Signed-off-by: "Yann E. MORIN" Cc: Romain Naour [Thomas: fix typoes.] [Peter: fix more typoes] Signed-off-by: Thomas Petazzoni (cherry picked from commit 31bd2b46a83f6009518935e11b4136668bd4d330) Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 5e89af602c..a91609d5f5 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -179,12 +179,14 @@ config BR2_PACKAGE_EFL_WAYLAND depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine depends on BR2_PACKAGE_EFL_EEZE # efl drm depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only + depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- libinput select BR2_PACKAGE_EFL_DRM -comment "Wayland support needs udev /dev management (eeze) and OpenGL ES w/ EGL, threads" +comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" depends on BR2_PACKAGE_WAYLAND depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ + || !BR2_ENABLE_LOCALE choice bool "OpenGL support" @@ -216,6 +218,7 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_ELPUT bool "Elput" + depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON @@ -225,23 +228,24 @@ config BR2_PACKAGE_EFL_ELPUT ecore_drm, etc) to handle interfacing with libinput without having to duplicate the code in each subsystem. -comment "Elput support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE +comment "Elput support needs udev /dev management (eeze), locales" + depends on !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" depends on BR2_PACKAGE_EFL_EEZE depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d + depends on BR2_ENABLE_LOCALE # efl-elput <- libinput select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. -comment "Evas DRM Engine needs udev /dev management (eeze) and mesa3d w/ EGL support, threads" +comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads, locales" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE + || !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE comment "libevas loaders" From 893da5eb467192f1d95141461be1bf9fc6404f1a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 8 May 2017 17:28:26 +0300 Subject: [PATCH 2973/3392] lua: use target LDFLAGS This adds '-static' to the link command when BR2_STATIC_LIBS=y, making the lua binary really static. Cc: Francois Perrad Signed-off-by: Baruch Siach Acked-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit 7e48c824309641c9eec41ee3dd7292a579888965) Signed-off-by: Peter Korsgaard --- package/lua/lua.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 5ef61e039e..bc0a9d456b 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -70,6 +70,7 @@ define LUA_BUILD_CMDS CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \ CFLAGS="$(TARGET_CFLAGS) $(LUA_CFLAGS)" \ MYLIBS="$(LUA_MYLIBS)" AR="$(TARGET_CROSS)ar rcu" \ + MYLDFLAGS="$(TARGET_LDFLAGS)" \ BUILDMODE=$(LUA_BUILDMODE) \ PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all endef From 521274cd60300ed6cf4143012495960853d80a39 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 8 May 2017 22:41:43 +0200 Subject: [PATCH 2974/3392] kvm-unit-tests: fix build on x86-64 with specific gcc versions kvm-unit-tests uses the following code on x86/x86-64: static inline u64 scale_delta(u64 delta, u64 mul_frac) { u64 product, unused; __asm__ ( "mul %3" : "=d" (product), "=a" (unused) : "1" (delta), "rm" ((u64)mul_frac) ); return product; } The "mul" instruction does not have a suffix that indicates the width of the data being multiplied. When the data is passed in a register, there is no need to specify the width, but with some gcc versions, the data is passed as a memory reference, and therefore the assembler does not know the width of the data to be multiplied. It causes the following build failure: x86/hyperv_clock.c: Assembler messages: x86/hyperv_clock.c:21: Error: no instruction mnemonic suffix given and no register operands; can't size instruction Since the data being multiplied is 64 bit, we explicitly specify the instruction as being "mulq". Fixes: http://autobuild.buildroot.net/results/a4a65d01f049db83a93de92660f228dd18532625/ Signed-off-by: Thomas Petazzoni (cherry picked from commit bdadcf593d5308fcc1c8e767b7c2af8ae5aa9144) Signed-off-by: Peter Korsgaard --- ...-be-explicit-about-mul-instruction-d.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/kvm-unit-tests/0001-x86-hyperv_clock-be-explicit-about-mul-instruction-d.patch diff --git a/package/kvm-unit-tests/0001-x86-hyperv_clock-be-explicit-about-mul-instruction-d.patch b/package/kvm-unit-tests/0001-x86-hyperv_clock-be-explicit-about-mul-instruction-d.patch new file mode 100644 index 0000000000..c8ee6b1ac4 --- /dev/null +++ b/package/kvm-unit-tests/0001-x86-hyperv_clock-be-explicit-about-mul-instruction-d.patch @@ -0,0 +1,35 @@ +From 022ae220d6e7b5bd064bc8698c271dca4dac7d8c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 8 May 2017 22:27:25 +0200 +Subject: [PATCH] x86/hyperv_clock: be explicit about mul instruction data size + +With gcc 4.7.2, the build fails with: + +x86/hyperv_clock.c: Assembler messages: +x86/hyperv_clock.c:21: Error: no instruction mnemonic suffix given and no register operands; can't size instruction + +In order to avoid this, make the mul instruction data size explicit by +adding the appropriate suffix. It operates on 64-bit data, so use +"mulq". + +Signed-off-by: Thomas Petazzoni +--- + x86/hyperv_clock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/x86/hyperv_clock.c b/x86/hyperv_clock.c +index 8b1deba..6c4dd56 100644 +--- a/x86/hyperv_clock.c ++++ b/x86/hyperv_clock.c +@@ -19,7 +19,7 @@ static inline u64 scale_delta(u64 delta, u64 mul_frac) + u64 product, unused; + + __asm__ ( +- "mul %3" ++ "mulq %3" + : "=d" (product), "=a" (unused) : "1" (delta), "rm" ((u64)mul_frac) ); + + return product; +-- +2.7.4 + From 5b58f1ee7268e528b024ec57f32823ee2615dbba Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 May 2017 12:52:50 +0200 Subject: [PATCH 2975/3392] package/vlc: security bump to version 2.2.5.1 This release contains "various security improvements in demuxers and decoders". Release notes: http://www.videolan.org/vlc/releases/2.2.5.html Added all hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c04fa8fad0e7d6631b00e8e0766244cc04a8364b) Signed-off-by: Peter Korsgaard --- package/vlc/vlc.hash | 8 ++++++-- package/vlc/vlc.mk | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index efd4e27e74..0f1b6dccd7 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,2 +1,6 @@ -# From http://download.videolan.org/pub/videolan/vlc/2.2.3/vlc-2.2.3.tar.xz.sha256 -sha256 1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be vlc-2.2.4.tar.xz +# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.md5 +md5 7ab63964ffec4c92a54deb018f23318b vlc-2.2.5.1.tar.xz +# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.sha1 +sha1 042962dba68e1414aa563883b0172ee121cf9555 vlc-2.2.5.1.tar.xz +# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.sha256 +sha256 b28b8a28f578c0c6cb1ebed293aca2a3cd368906cf777d1ab599e2784ddda1cc vlc-2.2.5.1.tar.xz diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 583edf3659..7f0c4f5978 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 2.2.4 +VLC_VERSION = 2.2.5.1 VLC_SITE = http://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPLv2+, LGPLv2.1+ From 6c729c63e032a81897f19ccc7a468b003e608092 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 13 May 2017 10:27:36 +0200 Subject: [PATCH 2976/3392] package/gpsd: do not interact with systemd on install When building on a systemd-based host for a systemd-based target, gpsd's buildsystem will try to tell systemd to reload the its configuration and recreate the entire dependency tree of services. Of course, this can not work when run as a user: >>> gpsd 3.16 Installing to target ==== AUTHENTICATING FOR org.freedesktop.systemd1.reload-daemon === Authentication is required to reload the systemd state. Authenticating as: root Password: In fact, this does not even mean anything in cross-compilation. Fortunately, upstream has already fixed their sin, so we backport it (tweaked to apply onto 3.16). Signed-off-by: "Yann E. MORIN" Cc: Gustavo Zacarias Signed-off-by: Thomas Petazzoni (cherry picked from commit 0d0fcfa443754ed33ab81b52dd22c5e89ea45c24) Signed-off-by: Peter Korsgaard --- ...-with-systemctl-when-cross-compiling.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/gpsd/0001-do-not-interact-with-systemctl-when-cross-compiling.patch diff --git a/package/gpsd/0001-do-not-interact-with-systemctl-when-cross-compiling.patch b/package/gpsd/0001-do-not-interact-with-systemctl-when-cross-compiling.patch new file mode 100644 index 0000000000..9e91a02ef3 --- /dev/null +++ b/package/gpsd/0001-do-not-interact-with-systemctl-when-cross-compiling.patch @@ -0,0 +1,41 @@ +From 777cb3737ae85b13642fff48eabb601c4d40f527 Mon Sep 17 00:00:00 2001 +From: James Knight +Date: Tue, 16 Feb 2016 23:51:08 -0500 +Subject: [PATCH] do not interact with systemctl when cross-compiling + +The installation process for GPSd on a systemd environment will attempt +to reload systemd's manager configuration (systemctl daemon-reload). +This is to allow the system to take advantage of the newly installed +GPSd services. When cross-compiling, the installation process should not +attempt to interact with the build environment's systemd instance (if +any). The following change checks if the build is not cross compiling +(via 'not env["sysroot"]') before attempting to do a systemd reload. + +Signed-off-by: James Knight +[yann.morin.1998@free.fr: tweak to apply on 3.16] +Signed-off-by: "Yann E. MORIN" +--- + SConstruct | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index c3bfd0d1..97c1b3a9 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1909,10 +1909,12 @@ udev_install = Utility('udev-install', 'install', [ + ] + hotplug_wrapper_install) + + if env['systemd']: ++ env.Requires(udev_install, systemd_install) ++ ++if env['systemd'] and not env["sysroot"]: + systemctl_daemon_reload = Utility('systemctl-daemon-reload', '', [ 'systemctl daemon-reload || true']) + env.AlwaysBuild(systemctl_daemon_reload) + env.Precious(systemctl_daemon_reload) +- env.Requires(udev_install, systemd_install) + env.Requires(systemctl_daemon_reload, systemd_install) + env.Requires(udev_install, systemctl_daemon_reload) + +-- +2.11.0 + From f99117fd8b83fdfb3842140e0053b14cc2c12424 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 12 May 2017 17:54:29 +0200 Subject: [PATCH 2977/3392] core/download: fix source check for git method Running foo-source-check on packages retrieved from git fails. This is because there is no associated stamp file, so we do not have a rule-assignment that sets PKG for foo-source-check. But it does not make sense to have a stamp file at all, because source-check is not supposed to change anything: the status after is exactly the same as before; nothing is downlaoded, so there is no progress (whatsoever) to memorise. Fix that by just defining PKG in the source-check rule definition. Fixes #9796. Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni (cherry picked from commit 4c0aacbc317d298397cede593f74ece26d0a89f0) Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index e8a8021e3c..fd8c217958 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -683,6 +683,7 @@ $(1)-legal-source: $$($(2)_TARGET_ACTUAL_SOURCE) endif # actual sources != sources endif # actual sources != "" +$(1)-source-check: PKG=$(2) $(1)-source-check: $$(foreach p,$$($(2)_ALL_DOWNLOADS),$$(call SOURCE_CHECK,$$(p))$$(sep)) From af6daa4cbf5db69dc7c88751b407b99ed3b03d26 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 May 2017 16:09:53 +0200 Subject: [PATCH 2978/3392] openblas: SPARC support is for Sparc v9 Makefile.sparc in the openblas source code passes -mcpu=v9, i.e it assumes a SPARCv9 CPU. Therefore, this commit adjusts openblas Config.in file so that SPARC is only used for BR2_sparc_v9. Fixes: http://autobuild.buildroot.net/results/805087e87b8bb7d11adb49d9eca3959a37aca3a2/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 6714d79a22b4c0ad7651659c8009f93574bbd59d) Signed-off-by: Peter Korsgaard --- package/openblas/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/openblas/Config.in b/package/openblas/Config.in index de26ab3b73..bc628960f5 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -31,7 +31,8 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "SICORTEX" if BR2_MIPS_CPU_MIPS64 # I6400 is built with MSA support which is only available in Codescape toolchains default "I6400" if BR2_mips_i6400 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - default "SPARC" if BR2_sparc + # OpenBLAS assumes SPARC=Sparc v9 + default "SPARC" if BR2_sparc_v9 # Cortex-A15 always have a VFPv4 default "CORTEXA15" if (BR2_cortex_a15 && BR2_ARM_EABIHF) # Cortex-A9 have an optional VFPv3, so we need to make sure it From 38314e4cbed69a050082ef1e1121bf0a86eb1de8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 13 May 2017 19:10:07 +0200 Subject: [PATCH 2979/3392] package/bluez_utils: add missing host-pkgconf dependency The configure script use pkg-config. Signed-off-by: Romain Naour Cc: Yegor Yefremov Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit d5fec33bd5e4a928d60bdc8693ca2917b3e91a43) Signed-off-by: Peter Korsgaard --- package/bluez_utils/bluez_utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk index 1c93f2e5f5..9761dc2522 100644 --- a/package/bluez_utils/bluez_utils.mk +++ b/package/bluez_utils/bluez_utils.mk @@ -8,7 +8,7 @@ BLUEZ_UTILS_VERSION = 4.101 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ_UTILS_INSTALL_STAGING = YES -BLUEZ_UTILS_DEPENDENCIES = dbus libglib2 +BLUEZ_UTILS_DEPENDENCIES = host-pkgconf dbus libglib2 BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools BLUEZ_UTILS_AUTORECONF = YES BLUEZ_UTILS_LICENSE = GPLv2+, LGPLv2.1+ From 597cc20156e73f954a648f66638302ae15e9e48d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 13 May 2017 19:10:08 +0200 Subject: [PATCH 2980/3392] package/bluez_utils: add missing check dependency for test program Tests are enabled since this has been introduced [1], so keep them for now. bluez_utils needs check tool and check if it's available [2]. [1] 06c3e2159686a886e52b2522a47e60c300cfb7f7 [2] https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/configure.ac?h=4.101#n51 Signed-off-by: Romain Naour Cc: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 8554be9f82301282161cf6310bacdb6067fefb16) Signed-off-by: Peter Korsgaard --- package/bluez_utils/bluez_utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk index 9761dc2522..bd12cd559e 100644 --- a/package/bluez_utils/bluez_utils.mk +++ b/package/bluez_utils/bluez_utils.mk @@ -8,7 +8,7 @@ BLUEZ_UTILS_VERSION = 4.101 BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ_UTILS_INSTALL_STAGING = YES -BLUEZ_UTILS_DEPENDENCIES = host-pkgconf dbus libglib2 +BLUEZ_UTILS_DEPENDENCIES = host-pkgconf check dbus libglib2 BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools BLUEZ_UTILS_AUTORECONF = YES BLUEZ_UTILS_LICENSE = GPLv2+, LGPLv2.1+ From 353ffb24975b3c7ae0f073749838d3ca3422de7a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 13 May 2017 19:10:09 +0200 Subject: [PATCH 2981/3392] package/bluez_utils: fix test build issues with musl Add one missing header and avoid encrypt redefinition. Fixes: http://autobuild.buildroot.net/results/06c/06c930d9c5299b79500d018ac3fb2861ce834c7c/ Signed-off-by: Romain Naour Cc: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit d09d3a7fa00585ca570a75fee59b9cb3ac983d98) Signed-off-by: Peter Korsgaard --- .../0004-test-add-missing-header.patch | 34 ++++++ ...avoid-conflict-with-encrypt-function.patch | 107 ++++++++++++++++++ 2 files changed, 141 insertions(+) create mode 100644 package/bluez_utils/0004-test-add-missing-header.patch create mode 100644 package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch diff --git a/package/bluez_utils/0004-test-add-missing-header.patch b/package/bluez_utils/0004-test-add-missing-header.patch new file mode 100644 index 0000000000..c74afb8304 --- /dev/null +++ b/package/bluez_utils/0004-test-add-missing-header.patch @@ -0,0 +1,34 @@ +From d3c098c2fde55ddf0c7d56eae56925103d35da73 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 13 May 2017 18:56:51 +0200 +Subject: [PATCH] test: add missing header + +test/attest.c: In function 'at_command': +test/attest.c:43:2: error: unknown type name 'fd_set' + fd_set rfds; + ^ + +Fixes: +http://autobuild.buildroot.net/results/06c/06c930d9c5299b79500d018ac3fb2861ce834c7c/ + +Signed-off-by: Romain Naour +--- + test/attest.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/attest.c b/test/attest.c +index 12ba682..2626cf1 100644 +--- a/test/attest.c ++++ b/test/attest.c +@@ -35,6 +35,8 @@ + #include + #include + ++#include ++ + #include + #include + +-- +2.9.3 + diff --git a/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch b/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch new file mode 100644 index 0000000000..438da97cb1 --- /dev/null +++ b/package/bluez_utils/0005-test-avoid-conflict-with-encrypt-function.patch @@ -0,0 +1,107 @@ +From d8056252d0c99bfb2482f0a420dcf9a36019ddf8 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 13 May 2017 18:58:51 +0200 +Subject: [PATCH] test: avoid conflict with encrypt function +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With a musl based toolchain: + +test/l2test.c:110:12: error: ‘encrypt’ redeclared as different kind of symbol + static int encrypt = 0; + ^ +In file included from test/l2test.c:34:0: +[...]/sysroot/usr/include/unistd.h:145:6: note: previous declaration of ‘encrypt’ was here + void encrypt(char *, int); + ^ + +Signed-off-by: Romain Naour +--- + test/l2test.c | 8 ++++---- + test/rctest.c | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/test/l2test.c b/test/l2test.c +index f66486d..9ef6faf 100644 +--- a/test/l2test.c ++++ b/test/l2test.c +@@ -107,7 +107,7 @@ static char *filename = NULL; + static int rfcmode = 0; + static int master = 0; + static int auth = 0; +-static int encrypt = 0; ++static int _encrypt = 0; + static int secure = 0; + static int socktype = SOCK_SEQPACKET; + static int linger = 0; +@@ -340,7 +340,7 @@ static int do_connect(char *svr) + opt |= L2CAP_LM_MASTER; + if (auth) + opt |= L2CAP_LM_AUTH; +- if (encrypt) ++ if (_encrypt) + opt |= L2CAP_LM_ENCRYPT; + if (secure) + opt |= L2CAP_LM_SECURE; +@@ -475,7 +475,7 @@ static void do_listen(void (*handler)(int sk)) + opt |= L2CAP_LM_MASTER; + if (auth) + opt |= L2CAP_LM_AUTH; +- if (encrypt) ++ if (_encrypt) + opt |= L2CAP_LM_ENCRYPT; + if (secure) + opt |= L2CAP_LM_SECURE; +@@ -1407,7 +1407,7 @@ int main(int argc, char *argv[]) + break; + + case 'E': +- encrypt = 1; ++ _encrypt = 1; + break; + + case 'S': +diff --git a/test/rctest.c b/test/rctest.c +index 4d7c90a..7ad5a0b 100644 +--- a/test/rctest.c ++++ b/test/rctest.c +@@ -79,7 +79,7 @@ static char *filename = NULL; + + static int master = 0; + static int auth = 0; +-static int encrypt = 0; ++static int _encrypt = 0; + static int secure = 0; + static int socktype = SOCK_STREAM; + static int linger = 0; +@@ -200,7 +200,7 @@ static int do_connect(const char *svr) + opt |= RFCOMM_LM_MASTER; + if (auth) + opt |= RFCOMM_LM_AUTH; +- if (encrypt) ++ if (_encrypt) + opt |= RFCOMM_LM_ENCRYPT; + if (secure) + opt |= RFCOMM_LM_SECURE; +@@ -291,7 +291,7 @@ static void do_listen(void (*handler)(int sk)) + opt |= RFCOMM_LM_MASTER; + if (auth) + opt |= RFCOMM_LM_AUTH; +- if (encrypt) ++ if (_encrypt) + opt |= RFCOMM_LM_ENCRYPT; + if (secure) + opt |= RFCOMM_LM_SECURE; +@@ -701,7 +701,7 @@ int main(int argc, char *argv[]) + break; + + case 'E': +- encrypt = 1; ++ _encrypt = 1; + break; + + case 'S': +-- +2.9.3 + From fbd7120c8ac119604341f52c445f7256eb2d96b4 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 14 May 2017 21:55:18 +0200 Subject: [PATCH 2982/3392] package/bluez_utils: select BR2_PACKAGE_CHECK Commit [1] added check package to bluez_utils dependencies without selecting it at Kconfig level. Fixes: Makefile:535: *** check is in the dependency chain of bluez_utils that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. [1] 8554be9f82301282161cf6310bacdb6067fefb16 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 00f6de5fc77e38ae80c6ef1a0f0a74b57373344b) Signed-off-by: Peter Korsgaard --- package/bluez_utils/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in index 3848162697..86c9085ec4 100644 --- a/package/bluez_utils/Config.in +++ b/package/bluez_utils/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_BLUEZ_UTILS depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 depends on BR2_USE_MMU # dbus, libglib2 + select BR2_PACKAGE_CHECK select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 help From b1b2912c0bb98042469bb552e3f1cb63fa64842b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 17 May 2017 22:22:42 +0200 Subject: [PATCH 2983/3392] linux-headers: bump 3.18.x version to 3.18.53 Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 0fd5f68e36..8159e411cd 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,7 +218,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "3.18.51" if BR2_KERNEL_HEADERS_3_18 + default "3.18.53" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 From 594b4174b22901f311d22234fd830676f04dfdd7 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 15 May 2017 12:36:11 +0100 Subject: [PATCH 2984/3392] linux-headers: bump 4.{4, 9, 10, 11}.x series [Peter: drop 4.10.x / 4.11.x bump] Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit 5879cc71dd048472d2da85b7cbafd884f275bcc4) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8159e411cd..6c18220af7 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.67" if BR2_KERNEL_HEADERS_4_4 + default "4.4.68" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.27" if BR2_KERNEL_HEADERS_4_9 + default "4.9.28" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 8f0c43a9a640309cbdeb01b0a8d1e7adfca5d730 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 14 May 2017 23:26:43 +0200 Subject: [PATCH 2985/3392] package/faketime: fix build with gcc >= 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream added -Wno-nonnull-compare to disable this error [1]. Fixes: libfaketime.c:513:7: error : nonnull argument « buf » compared to NULL [-Werror=nonnull-compare] if (buf != NULL) ^ [1] https://github.com/wolfcw/libfaketime/commit/47e958b753fc15098a2b7d0e9ef26b83ee255874 [Peter: add upstream git commit id to patch] Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 2a1401fa923e65de2efd78bbb4e66f73291a3fe2) Signed-off-by: Peter Korsgaard --- ...e-the-non-null-compare-warning-error.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/faketime/0001-Disable-the-non-null-compare-warning-error.patch diff --git a/package/faketime/0001-Disable-the-non-null-compare-warning-error.patch b/package/faketime/0001-Disable-the-non-null-compare-warning-error.patch new file mode 100644 index 0000000000..f8c7484452 --- /dev/null +++ b/package/faketime/0001-Disable-the-non-null-compare-warning-error.patch @@ -0,0 +1,32 @@ +From e85a157b51b1276c91c736d8624d9f3e876e9189 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold +Date: Tue, 20 Dec 2016 19:25:32 +0100 +Subject: [PATCH] Disable the non-null compare warning/error. + +We rely on the provided local library definitions for the hooked +functions which in some cases (GCC >6) carry a non-null-attribute flag +which causes compile errors on `!= NULL` checks. + +[Romain: rebase on 0.9.6] +(cherry picked from commit 47e958b753fc15098a2b7d0e9ef26b83ee255874) +Signed-off-by: Romain Naour +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 51634b0..bbbd476 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -67,7 +67,7 @@ INSTALL ?= install + PREFIX ?= /usr/local + LIBDIRNAME ?= /lib/faketime + +-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' ++CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' + LIB_LDFLAGS += -shared + LDFLAGS += -Wl,--version-script=libfaketime.map -lpthread + LDADD += -ldl -lm -lrt +-- +2.9.3 + From e8a44eb7e5745d094830b1ed8b5cc785fb33a33b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 15 May 2017 23:01:24 +0200 Subject: [PATCH 2986/3392] rpcbind: add upstream security fix for CVE-2017-8779 CVE-2017-8779: rpcbind through 0.2.4, LIBTIRPC through 1.0.1 and 1.0.2-rc through 1.0.2-rc3, and NTIRPC through 1.4.3 do not consider the maximum RPC data size during memory allocation for XDR strings, which allows remote attackers to cause a denial of service (memory consumption with no subsequent free) via a crafted UDP packet to port 111, aka rpcbomb. For more details, see: https://guidovranken.wordpress.com/2017/05/03/rpcbomb-remote-rpcbind-denial-of-service-patches/ Backport upstream fix to version 0.2.3 and unconditionally include syslog.h to fix a build issue when RPCBIND_DEBUG is disabled (which it is in Buildroot). Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 954509fb84cfbcf50a2f3020d817a118f7357d3a) Signed-off-by: Peter Korsgaard --- ...-svc_getargs-calls-with-svc_freeargs.patch | 231 ++++++++++++++++++ 1 file changed, 231 insertions(+) create mode 100644 package/rpcbind/0004-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch diff --git a/package/rpcbind/0004-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch b/package/rpcbind/0004-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch new file mode 100644 index 0000000000..130e5d77c3 --- /dev/null +++ b/package/rpcbind/0004-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch @@ -0,0 +1,231 @@ +From 093bf65c79af417cffa09d6475f58923540eebcc Mon Sep 17 00:00:00 2001 +From: Doran Moppert +Date: Thu, 11 May 2017 11:42:54 -0400 +Subject: [PATCH] rpcbind: pair all svc_getargs() calls with svc_freeargs() to + avoid memory leak + +This patch is to address CVE-2017-8779 "rpcbomb" in rpcbind, discussed +at [1], [2], [3]. The last link suggests this issue is actually a bug +in rpcbind, which led me here. + +The leak caused by the reproducer at [4] appears to come from +rpcb_service_4(), in the case where svc_getargs() returns false and the +function had an early return, rather than passing through the cleanup +path at done:, as would otherwise occur. + +It also addresses a couple of other locations where the same fault seems +to exist, though I haven't been able to exercise those. I hope someone +more intimate with rpc(3) can confirm my understanding is correct, and +that I haven't introduced any new bugs. + +Without this patch, using the reproducer (and variants) repeatedly +against rpcbind with a numBytes argument of 1_000_000_000, /proc/$(pidof +rpcbind)/status reports VmSize increase of 976564 kB each call, and +VmRSS increase of around 260 kB every 33 calls - the specific numbers +are probably an artifact of my rhel/glibc version. With the patch, +there is a small (~50 kB) VmSize increase with the first message, but +thereafter both VmSize and VmRSS remain steady. + +[1]: http://seclists.org/oss-sec/2017/q2/209 +[2]: https://bugzilla.redhat.com/show_bug.cgi?id=1448124 +[3]: https://sourceware.org/ml/libc-alpha/2017-05/msg00129.html +[4]: https://github.com/guidovranken/rpcbomb/ + +Signed-off-by: Doran Moppert +Signed-off-by: Steve Dickson +(cherry picked from commit 7ea36eeece56b59f98e469934e4c20b4da043346) +[Peter: unconditionally include syslog.h for LOG_DEBUG] +Signed-off-by: Peter Korsgaard +--- + src/pmap_svc.c | 58 ++++++++++++++++++++++++++++++++++++++++++++---------- + src/rpcb_svc.c | 2 +- + src/rpcb_svc_4.c | 2 +- + src/rpcb_svc_com.c | 8 ++++++++ + 4 files changed, 58 insertions(+), 12 deletions(-) + +diff --git a/src/pmap_svc.c b/src/pmap_svc.c +index ad28b93..f730bed 100644 +--- a/src/pmap_svc.c ++++ b/src/pmap_svc.c +@@ -53,8 +53,8 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro"; + #include + #include + #include +-#ifdef RPCBIND_DEBUG + #include ++#ifdef RPCBIND_DEBUG + #include + #endif + #include "rpcbind.h" +@@ -175,6 +175,7 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long + long ans; + uid_t uid; + char uidbuf[32]; ++ int rc = TRUE; + + /* + * Can't use getpwnam here. We might end up calling ourselves +@@ -194,7 +195,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long + + if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) { + svcerr_decode(xprt); +- return (FALSE); ++ rc = FALSE; ++ goto done; + } + #ifdef RPCBIND_DEBUG + if (debugging) +@@ -205,7 +207,8 @@ pmapproc_change(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt, unsigned long + + if (!check_access(xprt, op, reg.pm_prog, PMAPVERS)) { + svcerr_weakauth(xprt); +- return (FALSE); ++ rc = (FALSE); ++ goto done; + } + + rpcbreg.r_prog = reg.pm_prog; +@@ -258,7 +261,16 @@ done_change: + rpcbs_set(RPCBVERS_2_STAT, ans); + else + rpcbs_unset(RPCBVERS_2_STAT, ans); +- return (TRUE); ++done: ++ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) { ++ if (debugging) { ++ (void) xlog(LOG_DEBUG, "unable to free arguments\n"); ++ if (doabort) { ++ rpcbind_abort(); ++ } ++ } ++ } ++ return (rc); + } + + /* ARGSUSED */ +@@ -272,15 +284,18 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) + #ifdef RPCBIND_DEBUG + char *uaddr; + #endif ++ int rc = TRUE; + + if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) { + svcerr_decode(xprt); +- return (FALSE); ++ rc = FALSE; ++ goto done; + } + + if (!check_access(xprt, PMAPPROC_GETPORT, reg.pm_prog, PMAPVERS)) { + svcerr_weakauth(xprt); +- return FALSE; ++ rc = FALSE; ++ goto done; + } + + #ifdef RPCBIND_DEBUG +@@ -330,21 +345,34 @@ pmapproc_getport(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) + pmap_ipprot2netid(reg.pm_prot) ?: "", + port ? udptrans : ""); + +- return (TRUE); ++done: ++ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)®)) { ++ if (debugging) { ++ (void) xlog(LOG_DEBUG, "unable to free arguments\n"); ++ if (doabort) { ++ rpcbind_abort(); ++ } ++ } ++ } ++ return (rc); + } + + /* ARGSUSED */ + static bool_t + pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) + { ++ int rc = TRUE; ++ + if (!svc_getargs(xprt, (xdrproc_t)xdr_void, NULL)) { + svcerr_decode(xprt); +- return (FALSE); ++ rc = FALSE; ++ goto done; + } + + if (!check_access(xprt, PMAPPROC_DUMP, 0, PMAPVERS)) { + svcerr_weakauth(xprt); +- return FALSE; ++ rc = FALSE; ++ goto done; + } + + if ((!svc_sendreply(xprt, (xdrproc_t) xdr_pmaplist_ptr, +@@ -354,7 +382,17 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt) + rpcbind_abort(); + } + } +- return (TRUE); ++ ++done: ++ if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)NULL)) { ++ if (debugging) { ++ (void) xlog(LOG_DEBUG, "unable to free arguments\n"); ++ if (doabort) { ++ rpcbind_abort(); ++ } ++ } ++ } ++ return (rc); + } + + int pmap_netid2ipprot(const char *netid) +diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c +index bd92201..0c22a9d 100644 +--- a/src/rpcb_svc.c ++++ b/src/rpcb_svc.c +@@ -166,7 +166,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp) + svcerr_decode(transp); + if (debugging) + (void) xlog(LOG_DEBUG, "rpcbind: could not decode"); +- return; ++ goto done; + } + + if (rqstp->rq_proc == RPCBPROC_SET +diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c +index b673452..3e37b54 100644 +--- a/src/rpcb_svc_4.c ++++ b/src/rpcb_svc_4.c +@@ -220,7 +220,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp) + svcerr_decode(transp); + if (debugging) + (void) xlog(LOG_DEBUG, "rpcbind: could not decode\n"); +- return; ++ goto done; + } + + if (rqstp->rq_proc == RPCBPROC_SET +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index ff9ce6b..98ede61 100644 +--- a/src/rpcb_svc_com.c ++++ b/src/rpcb_svc_com.c +@@ -931,6 +931,14 @@ error: + if (call_msg.rm_xid != 0) + (void) free_slot_by_xid(call_msg.rm_xid); + out: ++ if (!svc_freeargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) { ++ if (debugging) { ++ (void) xlog(LOG_DEBUG, "unable to free arguments\n"); ++ if (doabort) { ++ rpcbind_abort(); ++ } ++ } ++ } + if (local_uaddr) + free(local_uaddr); + if (buf_alloc) +-- +2.11.0 + From 9737f2b9fa15a71c6cd26b2db81471edc27b34bf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 15 May 2017 17:32:29 +0200 Subject: [PATCH 2987/3392] rtmpdump: security bump to current HEAD Fixes: - CVE-2015-8271: The AMF3CD_AddProp function in amf.c in RTMPDump 2.4 allows remote RTMP Media servers to execute arbitrary code https://www.talosintelligence.com/reports/TALOS-2016-0067/ - CVE-2015-8272: RTMPDump 2.4 allows remote attackers to trigger a denial of service (NULL pointer dereference and process crash). https://www.talosintelligence.com/reports/TALOS-2016-0068/ Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 4ebd2fa277fdffecca146d07c78954653517eff4) Signed-off-by: Peter Korsgaard --- package/rtmpdump/rtmpdump.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rtmpdump/rtmpdump.mk b/package/rtmpdump/rtmpdump.mk index 2e3428f15e..eb2d8107f8 100644 --- a/package/rtmpdump/rtmpdump.mk +++ b/package/rtmpdump/rtmpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTMPDUMP_VERSION = a107cef9b392616dff54fabfd37f985ee2190a6f +RTMPDUMP_VERSION = fa8646daeb19dfd12c181f7d19de708d623704c0 RTMPDUMP_SITE = git://git.ffmpeg.org/rtmpdump RTMPDUMP_INSTALL_STAGING = YES # Note that rtmpdump is GPLv2 but librtmp has its own license and since we only From 6217600a81311a28fa81487db83f0d6a3009ceb4 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 10 Mar 2017 15:36:46 +0000 Subject: [PATCH 2988/3392] git: bump version to 2.12.0 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 941dc2ac8c277d9213ed74deda683dbe9c560560) Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 07ed47bd03..71e340ebd1 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415 git-2.11.1.tar.xz +sha256 1821766479062d052cc1897d0ded95212e81e5c7f1039786bc4aec2225a32027 git-2.12.0.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 960e4ba03a..75d5140e0c 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.11.1 +GIT_VERSION = 2.12.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2, LGPLv2.1+ From 3e0057455967846a8c75e125587a0616d15774c8 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 21 Mar 2017 14:18:21 +0000 Subject: [PATCH 2989/3392] git: bump version to 2.12.1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit cbb23d5d053710da7667d9b77fc4665b2194d2af) Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 71e340ebd1..e79e8b1e03 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 1821766479062d052cc1897d0ded95212e81e5c7f1039786bc4aec2225a32027 git-2.12.0.tar.xz +sha256 db11674364b764e101966d829a2e271c9b9d2a8bd4d8ecb4221a1dcdc9a3ada2 git-2.12.1.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 75d5140e0c..e7ea98d817 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.12.0 +GIT_VERSION = 2.12.1 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2, LGPLv2.1+ From 9f69fa3ade8bb699879ba0b4ffa809595d1ce228 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 28 Mar 2017 12:55:59 +0100 Subject: [PATCH 2990/3392] git: bump version to 2.12.2 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 3967abfc891b69415891ee30945326e6135969f0) Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index e79e8b1e03..9af360ee2b 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 db11674364b764e101966d829a2e271c9b9d2a8bd4d8ecb4221a1dcdc9a3ada2 git-2.12.1.tar.xz +sha256 d21a9e23506e618d561fb25a8a7bd6134f927b86147930103487117a7a678c4a git-2.12.2.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index e7ea98d817..b49ddd5a89 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.12.1 +GIT_VERSION = 2.12.2 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2, LGPLv2.1+ From c554c84ec1c0fab86eef41af63b990ac52b812fb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 15 May 2017 16:44:47 +0200 Subject: [PATCH 2991/3392] git: security bump to version 2.12.3 Fixes CVE-2017-8386 - Git Shell Bypass By Abusing Less For more details, see: https://insinuator.net/2017/05/git-shell-bypass-by-abusing-less-cve-2017-8386/ http://www.mail-archive.com/git@vger.kernel.org/msg120982.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 4a146b933e7ab9c6d1b353f61a610c69bc95bc55) Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 9af360ee2b..4782dcbefb 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 d21a9e23506e618d561fb25a8a7bd6134f927b86147930103487117a7a678c4a git-2.12.2.tar.xz +sha256 016124c54ce2db7a4c2bd26b0de21fbf8f6bcaee04842aa221c7243141df4e42 git-2.12.3.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index b49ddd5a89..04cd577825 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.12.2 +GIT_VERSION = 2.12.3 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2, LGPLv2.1+ From fdd9db2fae1bdecd14661a3234e1821efcf4fa2a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 14 May 2017 23:22:42 +0200 Subject: [PATCH 2992/3392] rabbitmq-c: openssl/popt sub-options don't work in static linking rabbitmq-c currently fails to build in a number of static linking situations, due to two issues: - CMake FindOpenSSL module is buggy. Even though it uses pkg-config, it doesn't use the information returned by pkg-config, and therefore doesn't know about second order libraries that need be part of the link for static linking to succeed. Due to this, -lz is not passed, and therefore rabbitmq-c fails when linking against libssl/libcrypto. This issue has been reported to upstream CMake at https://gitlab.kitware.com/cmake/cmake/issues/16885. - popt might use libintl, but CMake doesn't know about that. For autotools based packages, we typically work around this by passing LIBS=, but CMake apparently has no equivalent to LIBS=. To workaround this, we only use the OpenSSL and Popt optional dependencies in dynamic linking situations. Fixes: http://autobuild.buildroot.net/results/798dbe5e5fd0463bb2066cb115656795144c327f/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit beb6524225f12549a216183abc07745f8d36e764) Signed-off-by: Peter Korsgaard --- package/rabbitmq-c/rabbitmq-c.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/rabbitmq-c/rabbitmq-c.mk b/package/rabbitmq-c/rabbitmq-c.mk index 1ca35ad00c..eef09ec0b3 100644 --- a/package/rabbitmq-c/rabbitmq-c.mk +++ b/package/rabbitmq-c/rabbitmq-c.mk @@ -21,14 +21,20 @@ else ifeq ($(BR2_SHARED_LIBS),y) RABBITMQ_C_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) +# CMake OpenSSL detection is buggy, and doesn't properly use +# pkg-config, so it fails when statically linking. See +# https://gitlab.kitware.com/cmake/cmake/issues/16885. +ifeq ($(BR2_PACKAGE_OPENSSL):$(BR2_STATIC_LIBS),y:) RABBITMQ_C_CONF_OPTS += -DENABLE_SSL_SUPPORT=ON RABBITMQ_C_DEPENDENCIES += openssl else RABBITMQ_C_CONF_OPTS += -DENABLE_SSL_SUPPORT=OFF endif -ifeq ($(BR2_PACKAGE_POPT), y) +# Popt is sometimes linked against libintl, but CMake doesn't know +# about that, and there's no way to tell manually CMake to link +# against an additional library. +ifeq ($(BR2_PACKAGE_POPT):$(BR2_STATIC_LIBS),y:) RABBITMQ_C_CONF_OPTS += -DBUILD_TOOLS=ON RABBITMQ_C_DEPENDENCIES += popt else From 731997c0e1f6392ced5df9c9f7d1cc4641c32e53 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Wed, 17 May 2017 12:10:00 +0200 Subject: [PATCH 2993/3392] package/pulseview: fix a build issue Backport an upstream patch fixing the build issue related to boost math definitions. Fixes: http://autobuild.buildroot.net/results/e9f/e9f3f175e203529c44ecf92a34b82a0b3a473e34/ Signed-off-by: Bartosz Golaszewski Signed-off-by: Peter Korsgaard (cherry picked from commit f884abe4de72b942406ca16c4f54e02a0c57cce4) Signed-off-by: Peter Korsgaard --- ...void-fext-numeric-literals-not-suppo.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch diff --git a/package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch b/package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch new file mode 100644 index 0000000000..89137f2ad8 --- /dev/null +++ b/package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch @@ -0,0 +1,28 @@ +From 6ad4d7a6f17edecc3523a7ab3d627f9a70dbacc1 Mon Sep 17 00:00:00 2001 +From: Uwe Hermann +Date: Wed, 17 May 2017 11:00:44 +0200 +Subject: [PATCH] CMakeLists.txt: Avoid -fext-numeric-literals, (not supported + by clang). + +This (re-)fixes bug #863. + +Signed-off-by: Bartosz Golaszewski +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e8bc79f..e7e4432 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -395,6 +395,7 @@ add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS) + add_definitions(-D__STDC_LIMIT_MACROS) + add_definitions(-Wall -Wextra) + add_definitions(-std=c++11) ++add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1) + + if(ENABLE_DECODE) + add_definitions(-DENABLE_DECODE) +-- +2.9.3 + From 4ff1bf944f5b38df75a09b6e991e0d2291ce99e1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 17 May 2017 21:45:04 +0200 Subject: [PATCH 2994/3392] ntp: add patch to fix -fPIC issue This commit adds a patch that fixes the build on AArch64 and MIPS of the ntp package, which was caused by some parts of ntp being built without -fPIC. Fixes: [aarch64] http://autobuild.buildroot.net/results/866b1d28595efd8b6becf83d0a64b596538d58b0 [mips] http://autobuild.buildroot.net/results/c2a945855172970736a8ffea9c564f029a023344 Thanks to Romain Naour for the initial analysis. Signed-off-by: Thomas Petazzoni (cherry picked from commit 7fde83cdf0da338937dae13144eea2923e5c2730) Signed-off-by: Peter Korsgaard --- package/ntp/0003-ntpq-fpic.patch | 23 +++++++++++++++++++++++ package/ntp/ntp.mk | 1 + 2 files changed, 24 insertions(+) create mode 100644 package/ntp/0003-ntpq-fpic.patch diff --git a/package/ntp/0003-ntpq-fpic.patch b/package/ntp/0003-ntpq-fpic.patch new file mode 100644 index 0000000000..6e05a677c5 --- /dev/null +++ b/package/ntp/0003-ntpq-fpic.patch @@ -0,0 +1,23 @@ +ntpq/Makefile.am: add NTP_HARD_CFLAGS + +Pass NTP_HARD_CFLAGS when building ntpq, like in all other ntp +modules, to make sure -fPIC is passed. + +Originally taken from +https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=494143c3b4921a5c8b8596d58f2c8b98296bf688. + +Signed-off-by: Thomas Petazzoni + +Index: b/ntpq/Makefile.am +=================================================================== +--- a/ntpq/Makefile.am ++++ b/ntpq/Makefile.am +@@ -23,7 +23,7 @@ + ntpq_LDADD += $(LDADD_NTP) + noinst_HEADERS= ntpq.h + noinst_LIBRARIES= libntpq.a +-libntpq_a_CFLAGS= -DNO_MAIN_ALLOWED -DBUILD_AS_LIB ++libntpq_a_CFLAGS= $(NTP_HARD_CFLAGS) -DNO_MAIN_ALLOWED -DBUILD_AS_LIB + CLEANFILES= + DISTCLEANFILES= .version version.c config.log $(man_MANS) + ETAGS_ARGS= Makefile.am diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index e3e53a803f..24403cf4f9 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -21,6 +21,7 @@ NTP_CONF_OPTS = \ --with-crypto # 0002-ntp-syscalls-fallback.patch +# 0003-ntpq-fpic.patch NTP_AUTORECONF = YES ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) From e75f4d6f636af65750486ff746f49d7c26946488 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 17 May 2017 16:52:51 +0200 Subject: [PATCH 2995/3392] fbgrab: explicitly build fbgrab target to workaround gzip issue Fixes #9871 gzip reads default command line options from the environment variable GZIP. The fbgrab Makefile internally also uses a GZIP make variable to know what command to use to compress the manpage. Unfortunaly make will export the value of this make variable to the environment if GZIP is already present in the enviroment, confusing gzip (as 'gzip' isn't a valid command line argument). This can either be triggered by users having GZIP set in their environment (E.G. for custom options), or by enabling BR2_REPRODUCIBLE, where we use this feature to force the -n option (to not store name/timestamp) to gzip. We don't really need to compress the manpage as it isn't installed anyway, so work around the issue by only building the fbgrab application. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit be8d1efd1e5b8c4ceed34e8144d2cac075ab364e) Signed-off-by: Peter Korsgaard --- package/fbgrab/fbgrab.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk index 4455423126..5cdf0282b0 100644 --- a/package/fbgrab/fbgrab.mk +++ b/package/fbgrab/fbgrab.mk @@ -11,7 +11,7 @@ FBGRAB_LICENSE = GPLv2 FBGRAB_LICENSE_FILES = COPYING define FBGRAB_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) fbgrab endef define FBGRAB_INSTALL_TARGET_CMDS From d526cd57c0d7ce1a1eb3e0f6b28370110b64df3e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 16 Mar 2017 23:27:18 +0100 Subject: [PATCH 2996/3392] package/gdb: fix gnulib issue with musl and uClibc toolchains (finally) The previous fix [1] reinroduced the issue fixed by [2]. So keep gl_cv_func_gettimeofday_clobber=no in GDB_CONF_ENV and GDB_MAKE_ENV. Fixes: http://autobuild.buildroot.net/results/ec6/ec60d436bd34a4f37b664e4124d7f0c96e90a1be [1] faf38b78aee613a732f96d5022a2894efd024a25 [2] 560334bb2a46a77081a3944d092df7732dfca432 Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni (cherry picked from commit 2530fe810ee7ece8da30e246af522e2e0be8e83f) Signed-off-by: Peter Korsgaard --- package/gdb/gdb.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index ccfed4c5fe..d8299900ec 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -84,9 +84,11 @@ GDB_CONF_ENV = \ # not when cross-compiling with uClibc or musl as C libraries. So use # gl_cv_func_gettimeofday_clobber=no to not use rpl_gettimeofday, # assuming musl and uClibc have a properly working gettimeofday -# implementation. It needs to be passed to GDB_MAKE_ENV and not -# GDB_CONF_ENV, because otherwise it does not get passed to the -# configure script of nested packages. +# implementation. It needs to be passed to GDB_CONF_ENV to build +# gdbserver only but also to GDB_MAKE_ENV, because otherwise it does +# not get passed to the configure script of nested packages while +# building gdbserver with full debugger. +GDB_CONF_ENV += gl_cv_func_gettimeofday_clobber=no GDB_MAKE_ENV = gl_cv_func_gettimeofday_clobber=no # The shared only build is not supported by gdb, so enable static build for From 6acc39ae87ecfaf40d6dc58bf55ebff73f60ae2b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 17 May 2017 22:24:14 +0200 Subject: [PATCH 2997/3392] oracle-mysql: add patch to fix gcc 6.x build issue Fixes: http://autobuild.buildroot.net/results/61074b69b81cd5c17a7f74dc1f7b31f3fc35fd8a/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 19e78e509e5e729437d2188b28aee7655340c67d) Signed-off-by: Peter Korsgaard --- .../0008-fix-type-conversion.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 package/oracle-mysql/0008-fix-type-conversion.patch diff --git a/package/oracle-mysql/0008-fix-type-conversion.patch b/package/oracle-mysql/0008-fix-type-conversion.patch new file mode 100644 index 0000000000..65babf4f20 --- /dev/null +++ b/package/oracle-mysql/0008-fix-type-conversion.patch @@ -0,0 +1,22 @@ +Fix type conversion + +Fixes the following build error with gcc 6.x: + +protocol.cc:27:40: error: narrowing conversion of ''\37777777776'' from 'char' to 'uchar {aka unsigned char}' inside { } [-Wnarrowing] + static uchar eof_buff[1]= { (char) 254 }; /* Marker for end of fields */ + +Signed-off-by: Thomas Petazzoni + +Index: b/server-tools/instance-manager/protocol.cc +=================================================================== +--- a/server-tools/instance-manager/protocol.cc ++++ b/server-tools/instance-manager/protocol.cc +@@ -24,7 +24,7 @@ + #include + + +-static uchar eof_buff[1]= { (char) 254 }; /* Marker for end of fields */ ++static uchar eof_buff[1]= { (uchar) 254 }; /* Marker for end of fields */ + static const char ERROR_PACKET_CODE= (char) 255; + + From 5e44457add4d3b48b6c389ea8f84d49da754ec89 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 17 May 2017 23:53:21 +0200 Subject: [PATCH 2998/3392] cppcms: fix build on machines with libgpg-error installed In configuration where target architecture == host architecture, and libgpg-error is installed system-wide with development files, the build of cppcms fails with: /home/test/buildroot/output/host/usr/bin/x86_64-amd-linux-gnu-g++ --sysroot=/home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -Wall -Wextra -DNDEBUG CMakeFiles/base64_test.dir/tests/base64_test.cpp.o -o base64_test -L/home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib -Wl,-rpath,/home/test/buildroot/output/build/cppcms-1.0.5:/home/test/buildroot/output/build/cppcms-1.0.5/booster:/usr/lib -rdynamic libcppcms.so.1.0.5 booster/libbooster.so.0.0.3 -lpthread /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libpcre.so /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libgcrypt.so /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libdl.so /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libz.so /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libgcrypt.so: undefined reference to `gpg_err_set_errno@GPG_ERROR_1.0' /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libgcrypt.so: undefined reference to `gpgrt_lock_init@GPG_ERROR_1.0' /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libgcrypt.so: undefined reference to `gpgrt_lock_destroy@GPG_ERROR_1.0' /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libgcrypt.so: undefined reference to `gpg_err_code_from_syserror@GPG_ERROR_1.0' /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libgcrypt.so: undefined reference to `gpg_err_code_from_errno@GPG_ERROR_1.0' /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libgcrypt.so: undefined reference to `gpgrt_lock_unlock@GPG_ERROR_1.0' /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libgcrypt.so: undefined reference to `gpg_strerror@GPG_ERROR_1.0' /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libgcrypt.so: undefined reference to `gpg_strsource@GPG_ERROR_1.0' /home/test/buildroot/output/host/usr/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libgcrypt.so: undefined reference to `gpgrt_lock_lock@GPG_ERROR_1.0' The problem comes from the "-Wl,-rpath,/home/test/buildroot/output/build/cppcms-1.0.5:/home/test/buildroot/output/build/cppcms-1.0.5/booster:/usr/lib" option, which tells the linker to search for libraries in /usr/lib. This commit fixes that by asking CMake to not add any rpath when building cppcms. Fixes: http://autobuild.buildroot.net/results/a7eb1ede552ae14f409cfd7bd877bcf25ca69a74/ Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 15423bd46e925b1aed12aac8eddeaf249b4bd999) Signed-off-by: Peter Korsgaard --- package/cppcms/cppcms.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk index 611020c588..d908d7ba95 100644 --- a/package/cppcms/cppcms.mk +++ b/package/cppcms/cppcms.mk @@ -11,6 +11,10 @@ CPPCMS_LICENSE_FILES = COPYING.TXT CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION) CPPCMS_INSTALL_STAGING = YES +# disable rpath to avoid getting /usr/lib added to the link search +# path +CPPCMS_CONF_OPTS = -DCMAKE_SKIP_RPATH=ON + CPPCMS_DEPENDENCIES = zlib pcre libgcrypt ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y) From 9ebf2c4848a49f402a977469fd2a7d99dc65bf94 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 19 May 2017 07:20:37 +0300 Subject: [PATCH 2999/3392] toolchain: limit musl workaround to kernel headers 3.12+ The libc-compat.h first appeared in kernel version 3.12. Trying to build a musl toolchain using earlier headers leads to the following failure: /bin/sed: can't read .../output/host/usr/arm-buildroot-linux-musleabi/sysroot/usr/include/linux/libc-compat.h: No such file or directory package/pkg-generic.mk:266: recipe for target '.../output/build/toolchain/.stamp_staging_installed' failed Don't apply the sed patch to older headers. Reported-by: Florent Jacquet Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 4d1c2c82e8945a5847d636458f3825c55529835b) Signed-off-by: Peter Korsgaard --- toolchain/toolchain/toolchain.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index b16db01501..68babc3d19 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -21,8 +21,10 @@ TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO # IFF_DORMANT and IFF_ECHO, add another macro to suppress them in the # kernel header, and avoid macro/enum conflict. # +# Kernel version 3.12 introduced the libc-compat.h header. +# # [1] http://www.openwall.com/lists/musl/2015/10/08/2 -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12),yy) define TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK $(SED) 's/^#if defined(__GLIBC__)$$/#if 1/' \ $(STAGING_DIR)/usr/include/linux/libc-compat.h From 4f0203891aa40aa30d75be05635153d83b49f4e4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 20 May 2017 17:10:06 +0200 Subject: [PATCH 3000/3392] linux-headers: bump 4.{4, 9, 10, 11}.x series [Peter: drop 4.10.x / 4.11.x bump] Signed-off-by: Peter Korsgaard (cherry picked from commit daf1c350251ac1872ee3849a6b79476d1d026c2f) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6c18220af7..d84313bf0d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.68" if BR2_KERNEL_HEADERS_4_4 + default "4.4.69" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.28" if BR2_KERNEL_HEADERS_4_9 + default "4.9.29" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From bdf7dc37a225131d7d855ceb1ecbd5a38ea9b8fc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 20 May 2017 17:15:48 +0200 Subject: [PATCH 3001/3392] dropbear: security bump to version 2017.75 Fixes: - CVE-2017-9078: A double-free in the server could be triggered by an authenticated user if dropbear is running with -a (Allow connections to forwarded ports from any host) This could potentially allow arbitrary code execution as root by an authenticated user. Affects versions 2013.56 to 2016.74. Thanks to Mark Shepard for reporting the crash. - CVE-2017-9079: Dropbear parsed authorized_keys as root, even if it were a symlink. The fix is to switch to user permissions when opening authorized_keys. A user could symlink their ~/.ssh/authorized_keys to a root-owned file they couldn't normally read. If they managed to get that file to contain valid authorized_keys with command= options it might be possible to read other contents of that file. This information disclosure is to an already authenticated user. Thanks to Jann Horn of Google Project Zero for reporting this. Signed-off-by: Peter Korsgaard (cherry picked from commit 8644a83bd806d1e6efdfd972908798e8e00f7006) Signed-off-by: Peter Korsgaard --- package/dropbear/dropbear.hash | 2 +- package/dropbear/dropbear.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index 88f3e6ed5d..98776e7179 100644 --- a/package/dropbear/dropbear.hash +++ b/package/dropbear/dropbear.hash @@ -1,2 +1,2 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 2720ea54ed009af812701bcc290a2a601d5c107d12993e5d92c0f5f81f718891 dropbear-2016.74.tar.bz2 +sha256 6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c dropbear-2017.75.tar.bz2 diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 743d52479e..144619f24a 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2016.74 +DROPBEAR_VERSION = 2017.75 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c From 68abab0fcf0593292ad122ed925cdca9fcced2ab Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Mon, 8 May 2017 08:37:16 -0700 Subject: [PATCH 3002/3392] mariadb: security bump to version 10.1.23 Fixes: CVE-2017-3302 - Crash in libmysqlclient.so in Oracle MySQL before 5.6.21 and 5.7.x before 5.7.5 and MariaDB through 5.5.54, 10.0.x through 10.0.29, 10.1.x through 10.1.21, and 10.2.x through 10.2.3. CVE-2017-3313 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: MyISAM). Supported versions that are affected are 5.5.53 and earlier, 5.6.34 and earlier and 5.7.16 and earlier. Difficult to exploit vulnerability allows low privileged attacker with logon to the infrastructure where MySQL Server executes to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized access to critical data or complete access to all MySQL Server accessible data. CVE-2017-3308 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: DML). Supported versions that are affected are 5.5.54 and earlier, 5.6.35 and earlier and 5.7.17 and earlier. Easily "exploitable" vulnerability allows low privileged attacker with network access via multiple protocols to compromise MySQL Server. While the vulnerability is in MySQL Server, attacks may significantly impact additional products. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2017-3309 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: Optimizer). Supported versions that are affected are 5.5.54 and earlier, 5.6.35 and earlier and 5.7.17 and earlier. Easily "exploitable" vulnerability allows low privileged attacker with network access via multiple protocols to compromise MySQL Server. While the vulnerability is in MySQL Server, attacks may significantly impact additional products. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2017-3453 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: Optimizer). Supported versions that are affected are 5.5.54 and earlier, 5.6.35 and earlier and 5.7.17 and earlier. Easily "exploitable" vulnerability allows low privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2017-3456 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: DML). Supported versions that are affected are 5.5.54 and earlier, 5.6.35 and earlier and 5.7.17 and earlier. Easily "exploitable" vulnerability allows high privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2017-3464 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: DDL). Supported versions that are affected are 5.5.54 and earlier, 5.6.35 and earlier and 5.7.17 and earlier. Easily "exploitable" vulnerability allows low privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized update, insert or delete access to some of MySQL Server accessible data. And a number of important, but non-security related fixes: MDEV-12602: Fixed some race conditions in InnoDB encryption MariaDB Backup alpha introduced Galera wsrep library updated to 25.3.20 For details, see the release notes: https://mariadb.com/kb/en/mariadb/mariadb-10123-release-notes/ [Peter: drop COPYING.LESSER and add a reference to the bugtracker issue explaining why] Signed-off-by: Ryan Coe Signed-off-by: Peter Korsgaard (cherry picked from commit e6213e8ee68cbb637997ff02abe7945ec1cc168c) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 4 ++-- package/mariadb/mariadb.mk | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index afcf37803d..580fe987d9 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,2 +1,2 @@ -# From https://downloads.mariadb.org/mariadb/10.1.22/ -sha256 bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce mariadb-10.1.22.tar.gz +# From https://downloads.mariadb.org/mariadb/10.1.23/ +sha256 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf mariadb-10.1.23.tar.gz diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 8c7375a3ae..e171e0ef09 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,10 +4,12 @@ # ################################################################################ -MARIADB_VERSION = 10.1.22 +MARIADB_VERSION = 10.1.23 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library) -MARIADB_LICENSE_FILES = README COPYING COPYING.LESSER +# Tarball no longer contains LGPL license text +# https://jira.mariadb.org/browse/MDEV-12297 +MARIADB_LICENSE_FILES = README COPYING MARIADB_INSTALL_STAGING = YES MARIADB_PROVIDES = mysql From f459be48e0e98a4ed3cc0ef17121f2f1f145d00d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 19 May 2017 15:48:02 +0200 Subject: [PATCH 3003/3392] libminiupnpc: add upstream security fix for CVE-2017-8798 CVE-2017-8798: Integer signedness error in MiniUPnP MiniUPnPc v1.4.20101221 through v2.0 allows remote attackers to cause a denial of service or possibly have unspecified other impact. For more details including a PoC, see: https://github.com/tintinweb/pub/tree/master/pocs/cve-2017-8798 Signed-off-by: Peter Korsgaard (cherry picked from commit a0c4cf0f9698ed109b97cb1e33f4070f505e3988) Signed-off-by: Peter Korsgaard --- .../0001-miniupnpc-Fix-CVE-2017-8798.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/libminiupnpc/0001-miniupnpc-Fix-CVE-2017-8798.patch diff --git a/package/libminiupnpc/0001-miniupnpc-Fix-CVE-2017-8798.patch b/package/libminiupnpc/0001-miniupnpc-Fix-CVE-2017-8798.patch new file mode 100644 index 0000000000..25591fc4a4 --- /dev/null +++ b/package/libminiupnpc/0001-miniupnpc-Fix-CVE-2017-8798.patch @@ -0,0 +1,59 @@ +From f0f1f4b22d6a98536377a1bb07e7c20e4703d229 Mon Sep 17 00:00:00 2001 +From: Thomas Bernard +Date: Tue, 9 May 2017 12:00:47 +0200 +Subject: [PATCH] miniupnpc: Fix CVE-2017-8798 + +Thanks to tin/Team OSTStrom + +[Peter: drop Changelog.txt modification, convert to -p1 format] +Signed-off-by: Peter Korsgaard +--- + miniupnpc/miniwget.c | 12 +++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/miniwget.c b/miniwget.c +index 37cb47b7..1eda57c5 100644 +--- a/miniwget.c ++++ b/miniwget.c +@@ -284,11 +284,12 @@ getHTTPResponse(int s, int * size, int * status_code) + goto end_of_stream; + } + } +- bytestocopy = ((int)chunksize < (n - i))?chunksize:(unsigned int)(n - i); ++ /* it is guaranteed that (n >= i) */ ++ bytestocopy = (chunksize < (unsigned int)(n - i))?chunksize:(unsigned int)(n - i); + if((content_buf_used + bytestocopy) > content_buf_len) + { + char * tmp; +- if(content_length >= (int)(content_buf_used + bytestocopy)) { ++ if((content_length >= 0) && ((unsigned int)content_length >= (content_buf_used + bytestocopy))) { + content_buf_len = content_length; + } else { + content_buf_len = content_buf_used + bytestocopy; +@@ -313,14 +314,15 @@ getHTTPResponse(int s, int * size, int * status_code) + { + /* not chunked */ + if(content_length > 0 +- && (int)(content_buf_used + n) > content_length) { ++ && (content_buf_used + n) > (unsigned int)content_length) { + /* skipping additional bytes */ + n = content_length - content_buf_used; + } + if(content_buf_used + n > content_buf_len) + { + char * tmp; +- if(content_length >= (int)(content_buf_used + n)) { ++ if(content_length >= 0 ++ && (unsigned int)content_length >= (content_buf_used + n)) { + content_buf_len = content_length; + } else { + content_buf_len = content_buf_used + n; +@@ -340,7 +342,7 @@ getHTTPResponse(int s, int * size, int * status_code) + } + } + /* use the Content-Length header value if available */ +- if(content_length > 0 && (int)content_buf_used >= content_length) ++ if(content_length > 0 && content_buf_used >= (unsigned int)content_length) + { + #ifdef DEBUG + printf("End of HTTP content\n"); From ca4feb41937139de5d742502ecb428930205f777 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 23 May 2017 01:07:09 +0300 Subject: [PATCH 3004/3392] toolchain: disable PIE for static build with musl As mentioned in commit 3c93901bcd2 (toolchain: add hidden symbol for PIE support), support for static PIE using musl requires a gcc patch[1]. Buildroot doesn't carry this patch. Don't enable BR2_TOOLCHAIN_SUPPORTS_PIE in static build with musl. Fixes: http://autobuild.buildroot.net/results/d19/d19bcfcfb33cc5f5b082b97bbd5852d479823b97/ http://autobuild.buildroot.net/results/91f/91f7c6954c337b03f5ac141050d9b1bee1623376/ http://autobuild.buildroot.net/results/996/996116da9241686110b9525eed08cc5acfd379a6/ [1] https://github.com/richfelker/musl-cross-make/blob/b854a42fc1ea19b8c4ec7104848f9d1a6d7995f0/patches/gcc-6.3.0/0010-static-pie-support.diff Acked-by: Waldemar Brodkorb Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit fa397537bb64536bb58663df886b1a2c8886961c) Signed-off-by: Peter Korsgaard --- toolchain/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index de01585670..92a492630c 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -28,7 +28,7 @@ config BR2_TOOLCHAIN_USES_MUSL select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_SUPPORTS_PIE + select BR2_TOOLCHAIN_SUPPORTS_PIE if !BR2_STATIC_LIBS choice prompt "Toolchain type" From ae353794f00a5297e1d8f57f06bee6de40367536 Mon Sep 17 00:00:00 2001 From: Dustin Johnson Date: Tue, 14 Mar 2017 21:55:07 -0400 Subject: [PATCH 3005/3392] mono: remove nonexistent configure options The .mk file for the mono package contains out of date configuration options. The --disable-gtk-doc option is no longer available in configure. Moonlight is no longer supported in Mono and the --with-moonlight=no option is no longer required. Signed-off-by: Dustin Johnson Signed-off-by: Thomas Petazzoni (cherry picked from commit 2ba4fee836b9dec5f30a039fe2a03ad889b7cac1) Signed-off-by: Peter Korsgaard --- package/mono/mono.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 20b9205683..866bff23fb 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -18,9 +18,7 @@ MONO_INSTALL_STAGING = YES MONO_AUTORECONF = YES # Disable managed code (mcs folder) from building -MONO_CONF_OPTS = --disable-gtk-doc \ - --with-mcs-docs=no \ - --with-moonlight=no \ +MONO_CONF_OPTS = --with-mcs-docs=no \ --with-ikvm-native=no \ --enable-minimal=profiler,debug \ --disable-mcs-build \ @@ -44,9 +42,7 @@ MONO_DEPENDENCIES += host-mono ## Mono managed -HOST_MONO_CONF_OPTS = --disable-gtk-doc \ - --with-mcs-docs=no \ - --with-moonlight=no \ +HOST_MONO_CONF_OPTS = --with-mcs-docs=no \ --disable-libraries \ --with-ikvm-native=no \ --enable-minimal=profiler,debug \ From 60dc5bd64f387d7936327f291c410cc665f8f8f9 Mon Sep 17 00:00:00 2001 From: Dustin Johnson Date: Tue, 14 Mar 2017 22:24:58 -0400 Subject: [PATCH 3006/3392] mono: remove copy of host etc files on install When the mono package is installed, the autotools installer installs the /etc/mono files to the target. A post_install hook then copies over the mono libraries to the target as well as the host /etc/mono files which overrides the target files. The target specific mono configuration file (/etc/mono/config) is overridden with the host settings. This causes mono on the target to be unable to locate target specific .so files as it overrides the changes enacted by the patches for the package. Signed-off-by: Dustin Johnson Tested-by: Angelo Compagnucci Reviewed-by: Angelo Compagnucci Acked-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni (cherry picked from commit 675101b0fe3e751b447818d8ce8d0d009bd39b25) Signed-off-by: Peter Korsgaard --- package/mono/mono.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 866bff23fb..4f39c0fd32 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -29,7 +29,6 @@ MONO_CONF_OPTS = --with-mcs-docs=no \ define MONO_INSTALL_LIBS rsync -av --exclude=*.so --exclude=*.mdb \ $(HOST_DIR)/usr/lib/mono $(TARGET_DIR)/usr/lib/ - rsync -av $(HOST_DIR)/etc/mono $(TARGET_DIR)/etc endef MONO_POST_INSTALL_TARGET_HOOKS += MONO_INSTALL_LIBS From 0528344f31acb9c330c1eff4863897fb5f32ed8e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 May 2017 19:44:11 +0200 Subject: [PATCH 3007/3392] linux-headers: bump 4.{4, 9, 11}.x series [Peter: drop 4.10.x / 4.11.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f19a4433d4560b087b4890b17e2baaa21b3e6871) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index d84313bf0d..a94d83d3ed 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.39" if BR2_KERNEL_HEADERS_4_1 - default "4.4.69" if BR2_KERNEL_HEADERS_4_4 + default "4.4.70" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.29" if BR2_KERNEL_HEADERS_4_9 + default "4.9.30" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 2b8cdf212d3f641866679ec32ba2d2006da0638b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 May 2017 10:19:52 +0200 Subject: [PATCH 3008/3392] package/popt: fix libiconv dependency Make sure that libiconv is built before popt when needed. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit da5816561b4a660e1562a7cea5b079d776e206a3) Signed-off-by: Peter Korsgaard --- package/popt/popt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/popt/popt.mk b/package/popt/popt.mk index 863a47a658..3ab53880d5 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -21,6 +21,7 @@ POPT_CONF_ENV = ac_cv_va_copy=yes ifeq ($(BR2_PACKAGE_LIBICONV),y) POPT_CONF_ENV += am_cv_lib_iconv=yes POPT_CONF_OPTS += --with-libiconv-prefix=$(STAGING_DIR)/usr +POPT_DEPENDENCIES += libiconv endif $(eval $(autotools-package)) From 664322444df630d07cd943f567a2eb6e3561232d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 27 May 2017 00:13:47 +0200 Subject: [PATCH 3009/3392] package/dhcp: create tmpfiles.d directory dhcp.mk tries to create dhcp.conf in a non-existant directory. Fixes: http://autobuild.buildroot.net/results/40e/40e48f74b586ce380766cf31473932e43090671e Signed-off-by: Romain Naour Tested-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 6ddab6c28ec1cae2718928505f96705cf8e08e83) Signed-off-by: Peter Korsgaard --- package/dhcp/dhcp.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 4d2cb06352..45cae087aa 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -102,6 +102,7 @@ define DHCP_INSTALL_INIT_SYSTEMD ln -sf ../../../../usr/lib/systemd/system/dhcpd.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dhcpd.service + mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d echo "d /var/lib/dhcp 0755 - - - -" > \ $(TARGET_DIR)/usr/lib/tmpfiles.d/dhcpd.conf echo "f /var/lib/dhcp/dhcpd.leases - - - - -" >> \ From ff08ec1982e0dd8432047555c95a3f28ff530362 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 May 2017 17:44:26 +0200 Subject: [PATCH 3010/3392] package/audiofile: add security fix Fixes CVE-2015-7747 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a2ad9cf71da39efc4ab942578cdbceb5c30a4025) Signed-off-by: Peter Korsgaard --- package/audiofile/0008-CVE-2015-7747.patch | 161 +++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 package/audiofile/0008-CVE-2015-7747.patch diff --git a/package/audiofile/0008-CVE-2015-7747.patch b/package/audiofile/0008-CVE-2015-7747.patch new file mode 100644 index 0000000000..13256123c4 --- /dev/null +++ b/package/audiofile/0008-CVE-2015-7747.patch @@ -0,0 +1,161 @@ +Description: fix buffer overflow when changing both sample format and + number of channels +Origin: https://github.com/mpruett/audiofile/pull/25 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audiofile/+bug/1502721 +Bug-Debian: https://bugs.debian.org/801102 + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch + +Signed-off-by: Bernd Kuhls + +--- a/libaudiofile/modules/ModuleState.cpp ++++ b/libaudiofile/modules/ModuleState.cpp +@@ -402,7 +402,7 @@ status ModuleState::arrange(AFfilehandle + addModule(new Transform(outfc, in.pcm, out.pcm)); + + if (in.channelCount != out.channelCount) +- addModule(new ApplyChannelMatrix(infc, isReading, ++ addModule(new ApplyChannelMatrix(outfc, isReading, + in.channelCount, out.channelCount, + in.pcm.minClip, in.pcm.maxClip, + track->channelMatrix)); +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -26,6 +26,7 @@ TESTS = \ + VirtualFile \ + floatto24 \ + query2 \ ++ sixteen-stereo-to-eight-mono \ + sixteen-to-eight \ + testchannelmatrix \ + testdouble \ +@@ -139,6 +140,7 @@ printmarkers_SOURCES = printmarkers.c + printmarkers_LDADD = $(LIBAUDIOFILE) -lm + + sixteen_to_eight_SOURCES = sixteen-to-eight.c TestUtilities.cpp TestUtilities.h ++sixteen_stereo_to_eight_mono_SOURCES = sixteen-stereo-to-eight-mono.c TestUtilities.cpp TestUtilities.h + + testchannelmatrix_SOURCES = testchannelmatrix.c TestUtilities.cpp TestUtilities.h + +--- /dev/null ++++ b/test/sixteen-stereo-to-eight-mono.c +@@ -0,0 +1,118 @@ ++/* ++ Audio File Library ++ ++ Copyright 2000, Silicon Graphics, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++*/ ++ ++/* ++ sixteen-stereo-to-eight-mono.c ++ ++ This program tests the conversion from 2-channel 16-bit integers to ++ 1-channel 8-bit integers. ++*/ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "TestUtilities.h" ++ ++int main (int argc, char **argv) ++{ ++ AFfilehandle file; ++ AFfilesetup setup; ++ int16_t frames16[] = {14298, 392, 3923, -683, 958, -1921}; ++ int8_t frames8[] = {28, 6, -2}; ++ int i, frameCount = 3; ++ int8_t byte; ++ AFframecount result; ++ ++ setup = afNewFileSetup(); ++ ++ afInitFileFormat(setup, AF_FILE_WAVE); ++ ++ afInitSampleFormat(setup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16); ++ afInitChannels(setup, AF_DEFAULT_TRACK, 2); ++ ++ char *testFileName; ++ if (!createTemporaryFile("sixteen-to-eight", &testFileName)) ++ { ++ fprintf(stderr, "Could not create temporary file.\n"); ++ exit(EXIT_FAILURE); ++ } ++ ++ file = afOpenFile(testFileName, "w", setup); ++ if (file == AF_NULL_FILEHANDLE) ++ { ++ fprintf(stderr, "could not open file for writing\n"); ++ exit(EXIT_FAILURE); ++ } ++ ++ afFreeFileSetup(setup); ++ ++ afWriteFrames(file, AF_DEFAULT_TRACK, frames16, frameCount); ++ ++ afCloseFile(file); ++ ++ file = afOpenFile(testFileName, "r", AF_NULL_FILESETUP); ++ if (file == AF_NULL_FILEHANDLE) ++ { ++ fprintf(stderr, "could not open file for reading\n"); ++ exit(EXIT_FAILURE); ++ } ++ ++ afSetVirtualSampleFormat(file, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 8); ++ afSetVirtualChannels(file, AF_DEFAULT_TRACK, 1); ++ ++ for (i=0; i Date: Sat, 27 May 2017 18:04:46 +0200 Subject: [PATCH 3011/3392] package/audiofile: Fix static linking with libsndfile Fixes mpd: http://autobuild.buildroot.net/results/799/7997ccd698f03885f98d00bd150dc3a578e4b161/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a7777eecd4eaebd65b28e26fb1075b8609ac8f7c) Signed-off-by: Peter Korsgaard --- ...9-Fix-static-linking-with-libsndfile.patch | 193 ++++++++++++++++++ 1 file changed, 193 insertions(+) create mode 100644 package/audiofile/0009-Fix-static-linking-with-libsndfile.patch diff --git a/package/audiofile/0009-Fix-static-linking-with-libsndfile.patch b/package/audiofile/0009-Fix-static-linking-with-libsndfile.patch new file mode 100644 index 0000000000..c48e664a3e --- /dev/null +++ b/package/audiofile/0009-Fix-static-linking-with-libsndfile.patch @@ -0,0 +1,193 @@ +From d89a938f48e97b5770509d53c5478c5c3008d6e8 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 27 May 2017 17:53:33 +0200 +Subject: [PATCH 1/1] Fix static linking with libsndfile + +libsndfile and audiofile both contain mixXX functions in their alac +code which lead to symbol name clashes when apps like mpd try to +statically link to both audiofile and libsndfile at the same time. + +This patch renames these functions to avoid the problem which was +detected by the buildroot autobuilders: +http://autobuild.buildroot.net/results/799/7997ccd698f03885f98d00bd150dc3a578e4b161/ + +Patch sent upstream: https://github.com/mpruett/audiofile/pull/45 + +Signed-off-by: Bernd Kuhls +--- + libaudiofile/alac/ALACEncoder.cpp | 28 ++++++++++++++-------------- + libaudiofile/alac/matrix_enc.c | 8 ++++---- + libaudiofile/alac/matrixlib.h | 8 ++++---- + 3 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/libaudiofile/alac/ALACEncoder.cpp b/libaudiofile/alac/ALACEncoder.cpp +index da922c2..3d088cc 100644 +--- a/libaudiofile/alac/ALACEncoder.cpp ++++ b/libaudiofile/alac/ALACEncoder.cpp +@@ -332,19 +332,19 @@ int32_t ALACEncoder::EncodeStereo( BitBuffer * bitstream, void * inputBuffer, ui + switch ( mBitDepth ) + { + case 16: +- mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, mixBits, mixRes ); ++ audiofile_alac_mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, mixBits, mixRes ); + break; + case 20: +- mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, mixBits, mixRes ); ++ audiofile_alac_mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, mixBits, mixRes ); + break; + case 24: + // includes extraction of shifted-off bytes +- mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, ++ audiofile_alac_mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, + mixBits, mixRes, mShiftBufferUV, bytesShifted ); + break; + case 32: + // includes extraction of shifted-off bytes +- mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, ++ audiofile_alac_mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, + mixBits, mixRes, mShiftBufferUV, bytesShifted ); + break; + } +@@ -379,19 +379,19 @@ int32_t ALACEncoder::EncodeStereo( BitBuffer * bitstream, void * inputBuffer, ui + switch ( mBitDepth ) + { + case 16: +- mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); ++ audiofile_alac_mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); + break; + case 20: +- mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); ++ audiofile_alac_mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); + break; + case 24: + // also extracts the shifted off bytes into the shift buffers +- mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, ++ audiofile_alac_mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, + mixBits, mixRes, mShiftBufferUV, bytesShifted ); + break; + case 32: + // also extracts the shifted off bytes into the shift buffers +- mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, ++ audiofile_alac_mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, + mixBits, mixRes, mShiftBufferUV, bytesShifted ); + break; + } +@@ -605,19 +605,19 @@ int32_t ALACEncoder::EncodeStereoFast( BitBuffer * bitstream, void * inputBuffer + switch ( mBitDepth ) + { + case 16: +- mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); ++ audiofile_alac_mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); + break; + case 20: +- mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); ++ audiofile_alac_mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes ); + break; + case 24: + // also extracts the shifted off bytes into the shift buffers +- mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, ++ audiofile_alac_mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, + mixBits, mixRes, mShiftBufferUV, bytesShifted ); + break; + case 32: + // also extracts the shifted off bytes into the shift buffers +- mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, ++ audiofile_alac_mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, + mixBits, mixRes, mShiftBufferUV, bytesShifted ); + break; + } +@@ -756,7 +756,7 @@ int32_t ALACEncoder::EncodeStereoEscape( BitBuffer * bitstream, void * inputBuff + break; + case 20: + // mix20() with mixres param = 0 means de-interleave so use it to simplify things +- mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, 0, 0 ); ++ audiofile_alac_mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, 0, 0 ); + for ( index = 0; index < numSamples; index++ ) + { + BitBufferWrite( bitstream, mMixBufferU[index], 20 ); +@@ -765,7 +765,7 @@ int32_t ALACEncoder::EncodeStereoEscape( BitBuffer * bitstream, void * inputBuff + break; + case 24: + // mix24() with mixres param = 0 means de-interleave so use it to simplify things +- mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, 0, 0, mShiftBufferUV, 0 ); ++ audiofile_alac_mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, 0, 0, mShiftBufferUV, 0 ); + for ( index = 0; index < numSamples; index++ ) + { + BitBufferWrite( bitstream, mMixBufferU[index], 24 ); +diff --git a/libaudiofile/alac/matrix_enc.c b/libaudiofile/alac/matrix_enc.c +index e194330..8abd556 100644 +--- a/libaudiofile/alac/matrix_enc.c ++++ b/libaudiofile/alac/matrix_enc.c +@@ -57,7 +57,7 @@ + + // 16-bit routines + +-void mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ) ++void audiofile_alac_mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ) + { + int16_t * ip = in; + int32_t j; +@@ -95,7 +95,7 @@ void mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t num + // 20-bit routines + // - the 20 bits of data are left-justified in 3 bytes of storage but right-aligned for input/output predictor buffers + +-void mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ) ++void audiofile_alac_mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ) + { + int32_t l, r; + uint8_t * ip = in; +@@ -140,7 +140,7 @@ void mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t num + // 24-bit routines + // - the 24 bits of data are right-justified in the input/output predictor buffers + +-void mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, ++void audiofile_alac_mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ) + { + int32_t l, r; +@@ -240,7 +240,7 @@ void mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t num + // - otherwise, the calculations might overflow into the 33rd bit and be lost + // - therefore, these routines deal with the specified "unused lower" bytes in the "shift" buffers + +-void mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, ++void audiofile_alac_mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ) + { + int32_t * ip = in; +diff --git a/libaudiofile/alac/matrixlib.h b/libaudiofile/alac/matrixlib.h +index 0a4f371..5728b6d 100644 +--- a/libaudiofile/alac/matrixlib.h ++++ b/libaudiofile/alac/matrixlib.h +@@ -38,17 +38,17 @@ extern "C" { + #endif + + // 16-bit routines +-void mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ); ++void audiofile_alac_mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ); + void unmix16( int32_t * u, int32_t * v, int16_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres ); + + // 20-bit routines +-void mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ); ++void audiofile_alac_mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres ); + void unmix20( int32_t * u, int32_t * v, uint8_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres ); + + // 24-bit routines + // - 24-bit data sometimes compresses better by shifting off the bottom byte so these routines deal with + // the specified "unused lower bytes" in the combined "shift" buffer +-void mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, ++void audiofile_alac_mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ); + void unmix24( int32_t * u, int32_t * v, uint8_t * out, uint32_t stride, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ); +@@ -57,7 +57,7 @@ void unmix24( int32_t * u, int32_t * v, uint8_t * out, uint32_t stride, int32_t + // - note that these really expect the internal data width to be < 32-bit but the arrays are 32-bit + // - otherwise, the calculations might overflow into the 33rd bit and be lost + // - therefore, these routines deal with the specified "unused lower" bytes in the combined "shift" buffer +-void mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, ++void audiofile_alac_mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ); + void unmix32( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples, + int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted ); +-- +2.11.0 + From 567d01e0dc994b218bb18f84d5702dadbde1490c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 May 2017 15:56:11 +0200 Subject: [PATCH 3012/3392] package/flashrom: security bump to version 0.9.9 Fixes buffer overflow: https://mail.coreboot.org/pipermail/flashrom/2016-March/014523.html Removed patch 0002-sys-io.h.patch, not needed anymore, hwaccess.h now contains a similar fix: elif defined(__linux__) || defined(__GLIBC__) Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit db55de2b42a54ca715a7aa3ed6e388ea6f557092) Signed-off-by: Peter Korsgaard --- package/flashrom/0002-sys-io.h.patch | 27 --------------------------- package/flashrom/flashrom.hash | 2 +- package/flashrom/flashrom.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/flashrom/0002-sys-io.h.patch diff --git a/package/flashrom/0002-sys-io.h.patch b/package/flashrom/0002-sys-io.h.patch deleted file mode 100644 index 8d990c6f91..0000000000 --- a/package/flashrom/0002-sys-io.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -hwaccess: sys/io.h is not specific to glibc - -Under Linux, sys/io.h provides inb and outb, so we really need it. -However, its inclusion is conditional to the _GLIBC_ define. This is -usually OK under Linux, since both glibc and uClibc define it (uclibc -fakes being glibc). - -But the musl C library does not impersonate glibc, so we're missing -including sys/io.h in this case. - -Change the include from checking _GLIBC_ to checking whether this is -Linux, looking for the __linux__ define. - -Signed-off-by: "Yann E. MORIN" - -diff -durN flashrom-0.9.8.orig/hwaccess.h flashrom-0.9.8/hwaccess.h ---- flashrom-0.9.8.orig/hwaccess.h 2015-02-10 09:03:10.000000000 +0100 -+++ flashrom-0.9.8/hwaccess.h 2015-10-28 20:01:54.259202484 +0100 -@@ -27,7 +27,7 @@ - #include "platform.h" - - #if IS_X86 --#if defined(__GLIBC__) -+#if defined(__linux__) - #include - #endif - #endif diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index a2168699f3..64b67b99cf 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 13dc7c895e583111ecca370363a3527d237d178a134a94b20db7df177c05f934 flashrom-0.9.8.tar.bz2 +sha256 cb3156b0f63eb192024b76c0814135930297aac41f80761a5d293de769783c45 flashrom-0.9.9.tar.bz2 diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 7e0fcf27b3..7ebda338f4 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 0.9.8 +FLASHROM_VERSION = 0.9.9 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = http://download.flashrom.org/releases FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf From 667c418a244f022e54f92f8946a91d50cee61ebc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 May 2017 09:19:34 +0200 Subject: [PATCH 3013/3392] package/redis: fix static linking with libatomic Fixes http://autobuild.buildroot.net/results/7f1/7f1ecccbfdb6bd95824d9c884f1577e71e0e1e09/ http://autobuild.buildroot.net/results/c0b/c0b1bdcc5fbddf8b996b923015184d753882d4b8/ Signed-off-by: Bernd Kuhls [Thomas: - improve comment to explain the fix - remove useless LDFLAGS related code] Signed-off-by: Thomas Petazzoni (cherry picked from commit 019ad605670670a51055fb5d27a2a1f374a33289) Signed-off-by: Peter Korsgaard --- package/redis/redis.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 8ab6e726e3..c16bd238dc 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -13,17 +13,22 @@ define REDIS_USERS redis -1 redis -1 * /var/lib/redis /bin/false - Redis Server endef -# Uses __atomic_fetch_add_4 +# Uses __atomic_fetch_add_4. Adding -latomic to LDFLAGS does not work, +# because LDFLAGS is used before the list of object files. We need to +# add -latomic to FINAL_LIBS to provide -latomic at the correct place +# in the linking command. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -REDIS_LIBATOMIC = -latomic +define REDIS_FIX_MAKEFILE + $(SED) 's/FINAL_LIBS=-lm/FINAL_LIBS=-lm -latomic/' $(@D)/src/Makefile +endef +REDIS_POST_PATCH_HOOKS = REDIS_FIX_MAKEFILE endif # Redis doesn't support DESTDIR (yet, see # https://github.com/antirez/redis/pull/609). We set PREFIX # instead. REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ - LDFLAGS="$(TARGET_LDFLAGS) $(REDIS_LIBATOMIC)" \ - PREFIX=$(TARGET_DIR)/usr MALLOC=libc \ + PREFIX=$(TARGET_DIR)/usr MALLOC=libc define REDIS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) From 5d0dc5fc6b081c99b0d1f0de5db791d64c5fbd1f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 29 May 2017 18:59:45 +0200 Subject: [PATCH 3014/3392] package/libmicrohttpd: security bump version to 0.9.55 For details refer to release notes: http://lists.gnu.org/archive/html/info-gnu/2017-05/msg00014.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 8225042e0e8add24d698cba7232484481016f0a0) 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 5c15b9dfde..a1460fd724 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 54797f6e763d417627f89f60e4ae0a431dab0523f92f83def23ea02d0defafea libmicrohttpd-0.9.52.tar.gz +sha256 0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8 libmicrohttpd-0.9.55.tar.gz diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 83791b34f7..8828eb54a0 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.52 +LIBMICROHTTPD_VERSION = 0.9.55 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES From a40c4d70ed0765a9aeb918458a6d66e4c9e4de05 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 May 2017 23:37:38 +0200 Subject: [PATCH 3015/3392] package/mxml: fix download URL The project moved to github, the current download URL is broken: $ wget -q http://www.msweet.org/files/project3/mxml-2.10.tar.gz $ file mxml-2.10.tar.gz mxml-2.10.tar.gz: HTML document, UTF-8 Unicode text, with very long lines Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit eca61c93d5e6061a0749c94f7a4b5da73e332777) Signed-off-by: Peter Korsgaard --- package/mxml/mxml.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk index f36c75cabb..1ed5eb97cb 100644 --- a/package/mxml/mxml.mk +++ b/package/mxml/mxml.mk @@ -5,7 +5,7 @@ ################################################################################ MXML_VERSION = 2.10 -MXML_SITE = http://www.msweet.org/files/project3 +MXML_SITE = https://github.com/michaelrsweet/mxml/releases/download/release-$(MXML_VERSION) MXML_LICENSE = LGPLv2+ with exceptions MXML_LICENSE_FILES = COPYING MXML_INSTALL_STAGING = YES From 9af8504a4d036e84f3fbcf9af33744d4b361b13d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 May 2017 22:40:57 +0200 Subject: [PATCH 3016/3392] package/libev: fix download URL Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3f0cdaad8b0b797f5727a35737a0badd97cb3ddc) Signed-off-by: Peter Korsgaard --- package/libev/libev.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 02bc72cba2..8925a626ad 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -5,7 +5,7 @@ ################################################################################ LIBEV_VERSION = 4.22 -LIBEV_SITE = http://dist.schmorp.de/libev +LIBEV_SITE = http://dist.schmorp.de/libev/Attic LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2c or GPLv2+ LIBEV_LICENSE_FILES = LICENSE From d9ed7236ff5cd877e1ffa84d3700a20b8cd4d413 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 May 2017 22:35:52 +0200 Subject: [PATCH 3017/3392] package/armadillo: fix download URL Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 96f3ae6c24e5517014666a0e22b050773188392e) Signed-off-by: Peter Korsgaard --- package/armadillo/armadillo.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/armadillo/armadillo.mk b/package/armadillo/armadillo.mk index 813a41bdc7..00ba08a1f9 100644 --- a/package/armadillo/armadillo.mk +++ b/package/armadillo/armadillo.mk @@ -5,7 +5,9 @@ ################################################################################ ARMADILLO_VERSION = 6.500.4 -ARMADILLO_SITE = http://downloads.sourceforge.net/project/arma +# upstream removed tarball from +# http://downloads.sourceforge.net/project/arma +ARMADILLO_SITE = https://ftp.fau.de/macports/distfiles/armadillo ARMADILLO_DEPENDENCIES = clapack ARMADILLO_INSTALL_STAGING = YES ARMADILLO_LICENSE = MPLv2.0 From bfb0dda700f4d0f47312ace9ad1de588c03d2c44 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 May 2017 16:31:35 +0200 Subject: [PATCH 3018/3392] package/ftop: Fix broken download URL Also use bz2 tarball and provide md5 & sha256 hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit d35b447f09b5bd766a7627b596869b8f8b3f91ba) Signed-off-by: Peter Korsgaard --- package/ftop/Config.in | 2 +- package/ftop/ftop.hash | 7 +++++-- package/ftop/ftop.mk | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/ftop/Config.in b/package/ftop/Config.in index 1f5ebbbbfa..aefe4f5151 100644 --- a/package/ftop/Config.in +++ b/package/ftop/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_FTOP Ftop is to files what top is to processes. The progress of all open files and file systems can be monitored. - https://code.google.com/p/ftop/ + https://sourceforge.net/projects/ftop/ diff --git a/package/ftop/ftop.hash b/package/ftop/ftop.hash index 06f2fb1f40..ca8dc827ef 100644 --- a/package/ftop/ftop.hash +++ b/package/ftop/ftop.hash @@ -1,2 +1,5 @@ -# From https://code.google.com/p/ftop/downloads/detail?name=ftop-1.0.tar.gz&can=2&q= -sha1 a0523862dd63ed3bec14846b6e05afcfdebb15c2 ftop-1.0.tar.gz +# From https://sourceforge.net/projects/ftop/files/ftop/1.0/ +md5 57c68b6e7431f4219d9eddaebcb395da ftop-1.0.tar.bz2 +sha1 d3ef1b74825f50c7c442d299b29d23c2478f199b ftop-1.0.tar.bz2 +# Locally computed +sha256 3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82 ftop-1.0.tar.bz2 diff --git a/package/ftop/ftop.mk b/package/ftop/ftop.mk index c8d0f93b92..a75156094d 100644 --- a/package/ftop/ftop.mk +++ b/package/ftop/ftop.mk @@ -5,7 +5,8 @@ ################################################################################ FTOP_VERSION = 1.0 -FTOP_SITE = http://ftop.googlecode.com/files +FTOP_SOURCE = ftop-$(FTOP_VERSION).tar.bz2 +FTOP_SITE = https://sourceforge.net/projects/ftop/files/ftop/$(FTOP_VERSION) FTOP_DEPENDENCIES = ncurses FTOP_LICENSE = GPLv3+ FTOP_LICENSE_FILES = COPYING From f287506b13d36adf777f82ac77b9c5c5d5d877bf Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 29 May 2017 22:13:29 +0200 Subject: [PATCH 3019/3392] package/google-breakpad: use PRE_CONFIGURE hooks to copy linux_syscall_support.h As reported by Bernd [1], using POST_EXTRACT to copy linux_syscall_support.h break the legal-info target when google-breakpad package is selected: /usr/bin/install: cannot stat '/home/bernd/buildroot/buildroot/output/ost/usr/i586-buildroot-linux-uclibc/sysroot/usr/include/linux_syscall_support.h': No such file or directory This is because linux_syscall_support.h is installed by a dependency of google-breakpad, and dependencies are only guaranteed to be available for the configure step of a package. To fix this, we use a PRE_CONFIGURE hook instead of POST_EXTRACT hook. [1] http://lists.busybox.net/pipermail/buildroot/2017-May/192844.html Reported-by: Bernd Kuhls Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 557f8d649d9a959e810a3c92774020a434d567a8) Signed-off-by: Peter Korsgaard --- package/google-breakpad/google-breakpad.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/google-breakpad/google-breakpad.mk b/package/google-breakpad/google-breakpad.mk index 7a11c72cf5..68ff853a7e 100644 --- a/package/google-breakpad/google-breakpad.mk +++ b/package/google-breakpad/google-breakpad.mk @@ -23,14 +23,14 @@ define HOST_GOOGLE_BREAKPAD_LSS $(HOST_DIR)/usr/include/linux_syscall_support.h \ $(@D)/src/third_party/lss/linux_syscall_support.h endef -HOST_GOOGLE_BREAKPAD_POST_EXTRACT_HOOKS += HOST_GOOGLE_BREAKPAD_LSS +HOST_GOOGLE_BREAKPAD_PRE_CONFIGURE_HOOKS += HOST_GOOGLE_BREAKPAD_LSS define GOOGLE_BREAKPAD_LSS $(INSTALL) -D -m 0644 \ $(STAGING_DIR)/usr/include/linux_syscall_support.h \ $(@D)/src/third_party/lss/linux_syscall_support.h endef -GOOGLE_BREAKPAD_POST_EXTRACT_HOOKS += GOOGLE_BREAKPAD_LSS +GOOGLE_BREAKPAD_PRE_CONFIGURE_HOOKS += GOOGLE_BREAKPAD_LSS define GOOGLE_BREAKPAD_EXTRACT_SYMBOLS $(EXTRA_ENV) package/google-breakpad/gen-syms.sh $(STAGING_DIR) \ From bac5ca752b8f31a0a4569051d2156de6bf2d55a6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 24 May 2017 23:06:11 +0200 Subject: [PATCH 3020/3392] package/samba4: security bump to version 4.5.10 Fixes CVE-2017-7494: https://www.samba.org/samba/history/samba-4.5.10.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 12687c5c76f8f82da0815b6ff1607494ee7180b8) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 2 +- package/samba4/samba4.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 0a2a548a15..a16d834700 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f63b656d8823a280c50c9dbd6b692816cd7a88adfe9b47997ce697fd75bf81f0 samba-4.5.8.tar.gz +sha256 7cb753f5f6d5527ef40d4c1f47dacafb7c876cb304b4906ccb390c6a18477714 samba-4.5.10.tar.gz diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 741fb41342..0ad4b64f58 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.5.8 +SAMBA4_VERSION = 4.5.10 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From f4fc3fdc4d96991fc1702db4d3772637f64525bc Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 29 May 2017 23:53:23 +0300 Subject: [PATCH 3021/3392] elfutils: security bump to version 0.169 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a number of security issues: CVE-2017-7607, CVE-2017-7608, CVE-2017-7609, CVE-2017-7610, CVE-2017-7611, CVE-2017-7612, CVE-2017-7613. Rebase patches, and convert to git format. Remove --disable-werror; unrecognized configure option. Use upstream provided hash. Cc: Stefan Fröberg Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 27e0626e99e79655b949e13a16ebdda28c0faca2) Signed-off-by: Peter Korsgaard --- package/elfutils/0002-disable-progs.patch | 52 +++++++---- package/elfutils/0003-fts.patch | 91 ++++++++++++------- ...e-werror-conditional-to-build-werror.patch | 22 +++-- package/elfutils/elfutils.hash | 4 +- package/elfutils/elfutils.mk | 4 +- 5 files changed, 109 insertions(+), 64 deletions(-) diff --git a/package/elfutils/0002-disable-progs.patch b/package/elfutils/0002-disable-progs.patch index ea6b934dfc..3f80fe60df 100644 --- a/package/elfutils/0002-disable-progs.patch +++ b/package/elfutils/0002-disable-progs.patch @@ -1,4 +1,7 @@ -Add a --{enable,disable}-progs configure option +From dfea82b761b2ea4708fbf9370a5467ae4be525ca Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 29 May 2017 23:03:48 +0300 +Subject: [PATCH] Add a --{enable,disable}-progs configure option Add a --{enable,disable}-progs configuration option to elfutils. This allows to selectively disable the compilation of the elfutils programs @@ -13,26 +16,15 @@ Based on the former patch by Thomas Petazzoni. Signed-off-by: Thomas Petazzoni Signed-off-by: Vicente Olivert Riera +--- + Makefile.am | 6 +++++- + configure.ac | 6 ++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) -diff -rup a/configure.ac b/configure.ac ---- a/configure.ac 2016-03-31 09:48:08.000000000 +0100 -+++ b/configure.ac 2016-06-17 14:47:03.561704498 +0100 -@@ -253,6 +253,12 @@ AC_SUBST([LIBEBL_SUBDIR]) - AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR") - AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.]) - -+AC_ARG_ENABLE([progs], -+ AS_HELP_STRING([--enable-progs], [enable progs]), -+ enable_progs=$enableval, -+ enable_progs=yes) -+AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) -+ - dnl zlib is mandatory. - save_LIBS="$LIBS" - LIBS= -diff -rup a/Makefile.am b/Makefile.am ---- a/Makefile.am 2016-01-12 12:49:19.000000000 +0000 -+++ b/Makefile.am 2016-06-17 14:48:02.585861468 +0100 +diff --git a/Makefile.am b/Makefile.am +index 2ff444e7bf1d..70443abb4fb6 100644 +--- a/Makefile.am ++++ b/Makefile.am @@ -26,9 +26,13 @@ AM_MAKEFLAGS = --no-print-directory pkginclude_HEADERS = version.h @@ -48,3 +40,23 @@ diff -rup a/Makefile.am b/Makefile.am EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ COPYING COPYING-GPLV2 COPYING-LGPLV3 +diff --git a/configure.ac b/configure.ac +index c2c1d90b2133..7b4c38381cca 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -259,6 +259,12 @@ AC_SUBST([LIBEBL_SUBDIR]) + AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR") + AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.]) + ++AC_ARG_ENABLE([progs], ++ AS_HELP_STRING([--enable-progs], [enable progs]), ++ enable_progs=$enableval, ++ enable_progs=yes) ++AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) ++ + dnl zlib is mandatory. + save_LIBS="$LIBS" + LIBS= +-- +2.11.0 + diff --git a/package/elfutils/0003-fts.patch b/package/elfutils/0003-fts.patch index 0131b750f8..cf5ba25c82 100644 --- a/package/elfutils/0003-fts.patch +++ b/package/elfutils/0003-fts.patch @@ -1,4 +1,7 @@ -Add an implementation of the fts_*() functions +From 098760f7eac1fb86b3f6871d5bb10f9f44468f2d Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 29 May 2017 23:08:05 +0300 +Subject: [PATCH] Add an implementation of the fts_*() functions The fts_*() functions are optional in uClibc, and not compiled in our default configuration. The best option would be to migrate this @@ -28,11 +31,21 @@ Based on the former patch by Thomas Petazzoni. Signed-off-by: Thomas Petazzoni Signed-off-by: Vicente Olivert Riera +--- + configure.ac | 4 + + libdwfl/Makefile.am | 3 + + libdwfl/fts.c | 1095 ++++++++++++++++++++++++++++++++++++++++ + libdwfl/fts_.h | 131 +++++ + libdwfl/linux-kernel-modules.c | 4 + + 5 files changed, 1237 insertions(+) + create mode 100644 libdwfl/fts.c + create mode 100644 libdwfl/fts_.h -diff -Nrup a/configure.ac b/configure.ac ---- a/configure.ac 2016-06-17 14:47:03.561704498 +0100 -+++ b/configure.ac 2016-06-17 14:52:35.038200412 +0100 -@@ -259,6 +259,10 @@ AC_ARG_ENABLE([progs], +diff --git a/configure.ac b/configure.ac +index 7b4c38381cca..bcebb05fa532 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -265,6 +265,10 @@ AC_ARG_ENABLE([progs], enable_progs=yes) AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) @@ -43,9 +56,25 @@ diff -Nrup a/configure.ac b/configure.ac dnl zlib is mandatory. save_LIBS="$LIBS" LIBS= -diff -Nrup a/libdwfl/fts.c b/libdwfl/fts.c ---- a/libdwfl/fts.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/libdwfl/fts.c 2016-06-17 14:57:26.649912084 +0100 +diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am +index 89ca92ed8110..a5a5615c5f94 100644 +--- a/libdwfl/Makefile.am ++++ b/libdwfl/Makefile.am +@@ -77,6 +77,9 @@ endif + if LZMA + libdwfl_a_SOURCES += lzma.c + endif ++if !HAVE_FTS ++libdwfl_a_SOURCES += fts.c ++endif + + libdwfl = $(libdw) + libdw = ../libdw/libdw.so +diff --git a/libdwfl/fts.c b/libdwfl/fts.c +new file mode 100644 +index 000000000000..f34cc03bd963 +--- /dev/null ++++ b/libdwfl/fts.c @@ -0,0 +1,1095 @@ +/*- + * Copyright (c) 1990, 1993, 1994 @@ -1142,9 +1171,11 @@ diff -Nrup a/libdwfl/fts.c b/libdwfl/fts.c + errno = oerrno; + return (ret); +} -diff -Nrup a/libdwfl/fts_.h b/libdwfl/fts_.h ---- a/libdwfl/fts_.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/libdwfl/fts_.h 2016-06-17 14:58:42.003387566 +0100 +diff --git a/libdwfl/fts_.h b/libdwfl/fts_.h +new file mode 100644 +index 000000000000..0a070ba8dce5 +--- /dev/null ++++ b/libdwfl/fts_.h @@ -0,0 +1,131 @@ +/* + * Copyright (c) 1989, 1993 @@ -1277,31 +1308,25 @@ diff -Nrup a/libdwfl/fts_.h b/libdwfl/fts_.h +__END_DECLS + +#endif /* fts.h */ -diff -Nrup a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c ---- a/libdwfl/linux-kernel-modules.c 2016-03-02 16:25:38.000000000 +0000 -+++ b/libdwfl/linux-kernel-modules.c 2016-06-17 14:59:50.267724089 +0100 -@@ -29,7 +29,11 @@ - /* We include this before config.h because it can't handle _FILE_OFFSET_BITS. - Everything we need here is fine if its declarations just come first. */ - +diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c +index 9d0fef2cf260..47f0e3892294 100644 +--- a/libdwfl/linux-kernel-modules.c ++++ b/libdwfl/linux-kernel-modules.c +@@ -31,10 +31,14 @@ + Everything we need here is fine if its declarations just come first. + Also, include sys/types.h before fts. On some systems fts.h is not self + contained. */ +#ifdef HAVE_FTS_H - #include + #ifdef BAD_FTS + #include + #include + #endif +#else +#include +#endif #include - -diff -Nrup a/libdwfl/Makefile.am b/libdwfl/Makefile.am ---- a/libdwfl/Makefile.am 2016-01-12 12:49:19.000000000 +0000 -+++ b/libdwfl/Makefile.am 2016-06-17 15:01:03.492157569 +0100 -@@ -77,6 +77,9 @@ endif - if LZMA - libdwfl_a_SOURCES += lzma.c - endif -+if !HAVE_FTS -+libdwfl_a_SOURCES += fts.c -+endif - - libdwfl = $(libdw) - libdw = ../libdw/libdw.so + #include +-- +2.11.0 + diff --git a/package/elfutils/0005-really-make-werror-conditional-to-build-werror.patch b/package/elfutils/0005-really-make-werror-conditional-to-build-werror.patch index aa4d12d6a2..a7017d6e88 100644 --- a/package/elfutils/0005-really-make-werror-conditional-to-build-werror.patch +++ b/package/elfutils/0005-really-make-werror-conditional-to-build-werror.patch @@ -1,4 +1,7 @@ -Really make -Werror conditional to BUILD_WERROR +From 1d8f27d73df6369b19ddd6732960df0d4fdec338 Mon Sep 17 00:00:00 2001 +From: Vicente Olivert Riera +Date: Mon, 29 May 2017 23:24:42 +0300 +Subject: [PATCH] Really make -Werror conditional to BUILD_WERROR Otherwise it will fail with an error message like this one: @@ -12,15 +15,22 @@ cc1: all warnings being treated as errors Signed-off-by: "Yann E. MORIN" Signed-off-by: Vicente Olivert Riera +--- + config/eu.am | 1 - + 1 file changed, 1 deletion(-) -diff -rup a/config/eu.am b/config/eu.am ---- a/config/eu.am 2016-03-02 16:25:38.000000000 +0000 -+++ b/config/eu.am 2016-06-17 15:05:08.270974835 +0100 -@@ -65,7 +65,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -W +diff --git a/config/eu.am b/config/eu.am +index 8fe1e259f9e2..c5a6209a4e04 100644 +--- a/config/eu.am ++++ b/config/eu.am +@@ -71,7 +71,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ -Wold-style-definition -Wstrict-prototypes \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ - $(NULL_DEREFERENCE_WARNING) \ + $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ - $(if $($(*F)_no_Werror),,-Werror) \ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ $($(*F)_CFLAGS) +-- +2.11.0 + diff --git a/package/elfutils/elfutils.hash b/package/elfutils/elfutils.hash index 9fa9403f3f..76b6dc6458 100644 --- a/package/elfutils/elfutils.hash +++ b/package/elfutils/elfutils.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 3c056914c8a438b210be0d790463b960fc79d234c3f05ce707cbff80e94cba30 elfutils-0.166.tar.bz2 +# From https://sourceware.org/elfutils/ftp/0.169/sha512.sum +sha512 0a81a20bb2aff533d035d6b76f1403437b2e11bce390db57e34b8c26e4b9b3150346d83dddcbfbbdc58063f046ca3223508dba35c6ce88e375d201e7a777a8b9 elfutils-0.169.tar.bz2 diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 0bf105e528..ed5cf7727e 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELFUTILS_VERSION = 0.166 +ELFUTILS_VERSION = 0.169 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES @@ -20,11 +20,9 @@ HOST_ELFUTILS_AUTORECONF = YES # Pass a custom program prefix to avoid a naming conflict between # elfutils binaries and binutils binaries. ELFUTILS_CONF_OPTS += \ - --disable-werror \ --program-prefix="eu-" HOST_ELFUTILS_CONF_OPTS = \ - --disable-werror \ --with-bzlib \ --with-lzma \ --disable-progs From 79e3be0f66ea40e81186d3cc221c6c0aeff11bec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 4 Apr 2017 21:37:29 +0200 Subject: [PATCH 3022/3392] mosquitto: bump to version 1.4.11 - This version requires a patch (sent upstream) to remove -lanl from all Linux builds as this library is only needed for adns support - sha512 must be computed locally as eclipse.org does not give it for this version Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit d098e18d14551062937bf987a9e1cac3696a9b53) Signed-off-by: Peter Korsgaard --- ...-Remove-lanl-when-WITH_ADNS-is-unset.patch | 32 +++++++++++++++++++ package/mosquitto/mosquitto.hash | 4 +-- package/mosquitto/mosquitto.mk | 2 +- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch diff --git a/package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch b/package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch new file mode 100644 index 0000000000..f9b1b273d1 --- /dev/null +++ b/package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch @@ -0,0 +1,32 @@ +From 0de640dd834b6c01c4904e11d51f3a1406c89469 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 3 Apr 2017 20:34:07 +0200 +Subject: [PATCH] Remove -lanl when WITH_ADNS is unset + +Do not add -lanl to BROKER_LIBS for all Linux builds. +Indeed, -lanl is only needed for getaddrinfo_a which is only used in +_mosquitto_try_connect_step1 when WITH_ADNS is set + +Signed-off-by: Fabrice Fontaine +--- + config.mk | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/config.mk b/config.mk +index 6e369c2..44639d2 100644 +--- a/config.mk ++++ b/config.mk +@@ -159,10 +159,6 @@ ifeq ($(UNAME),QNX) + LIB_LIBS:=$(LIB_LIBS) -lsocket + endif + +-ifeq ($(UNAME),Linux) +- BROKER_LIBS:=$(BROKER_LIBS) -lanl +-endif +- + ifeq ($(WITH_WRAP),yes) + BROKER_LIBS:=$(BROKER_LIBS) -lwrap + BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WRAP +-- +2.5.0 + diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index b0b860f98c..5514c2118d 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,2 +1,2 @@ -# From https://www.eclipse.org/downloads/download.php?file=/mosquitto/source/mosquitto-1.4.10.tar.gz -sha512 fe5d6d7196a137a496ba6881c77d852396baefb4f0b83ccd9a22175fc05b09e48a09ea249e30ec7db966e11de134ebcc4e2e9b1fd40b31dc59fb0fa2f60b75a1 mosquitto-1.4.10.tar.gz +# Locally computed: +sha512 c05ca8679b9a6f540868f4ccf701257fcabc114d5450ac0bbbe80b91bb7cd4fc52668773e945506760c7a5bd8a494e0a56100714112e5d2713d57bfab8951587 mosquitto-1.4.11.tar.gz diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 96607f32e3..e79a042b8a 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.4.10 +MOSQUITTO_VERSION = 1.4.11 MOSQUITTO_SITE = http://mosquitto.org/files/source MOSQUITTO_LICENSE = EPLv1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 From 3f7bfc36b3752c1db45925df38a7d7a6e710098e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 4 Apr 2017 21:37:30 +0200 Subject: [PATCH 3023/3392] mosquitto: enable WITH_ADNS for glibc builds WITH_ADNS option has been added in version 1.4.11 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit f78b2c13d1a5b4a7903186cf6cc53299791d0da5) Signed-off-by: Peter Korsgaard --- package/mosquitto/mosquitto.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index e79a042b8a..8918128d16 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -17,6 +17,13 @@ MOSQUITTO_MAKE_OPTS = \ WITH_WRAP=no \ WITH_DOCS=no +# adns uses getaddrinfo_a +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) +MOSQUITTO_MAKE_OPTS += WITH_ADNS=yes +else +MOSQUITTO_MAKE_OPTS += WITH_ADNS=no +endif + ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) MOSQUITTO_MAKE_OPTS += WITH_THREADING=yes else From 5ee60e23e360ba7585970a70e523d842b191c78d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 29 May 2017 23:19:59 +0200 Subject: [PATCH 3024/3392] mosquitto: security bump to version 1.4.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes CVE-2017-7650: Pattern based ACLs can be bypassed by clients that set their username/client id to ‘#’ or ‘+’. This allows locally or remotely connected clients to access MQTT topics that they do have the rights to. The same issue may be present in third party authentication/access control plugins for Mosquitto. For more details, see: https://mosquitto.org/2017/05/security-advisory-cve-2017-7650/ Remove 0001-Remove-lanl-when-WITH_ADNS-is-unset.patch as that patch is now upstream. Signed-off-by: Peter Korsgaard (cherry picked from commit 9e9dee25346f861f3276a4c2ab21c98b8caf88a7) Signed-off-by: Peter Korsgaard --- ...-Remove-lanl-when-WITH_ADNS-is-unset.patch | 32 ------------------- package/mosquitto/mosquitto.hash | 2 +- package/mosquitto/mosquitto.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch diff --git a/package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch b/package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch deleted file mode 100644 index f9b1b273d1..0000000000 --- a/package/mosquitto/0001-Remove-lanl-when-WITH_ADNS-is-unset.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0de640dd834b6c01c4904e11d51f3a1406c89469 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Apr 2017 20:34:07 +0200 -Subject: [PATCH] Remove -lanl when WITH_ADNS is unset - -Do not add -lanl to BROKER_LIBS for all Linux builds. -Indeed, -lanl is only needed for getaddrinfo_a which is only used in -_mosquitto_try_connect_step1 when WITH_ADNS is set - -Signed-off-by: Fabrice Fontaine ---- - config.mk | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/config.mk b/config.mk -index 6e369c2..44639d2 100644 ---- a/config.mk -+++ b/config.mk -@@ -159,10 +159,6 @@ ifeq ($(UNAME),QNX) - LIB_LIBS:=$(LIB_LIBS) -lsocket - endif - --ifeq ($(UNAME),Linux) -- BROKER_LIBS:=$(BROKER_LIBS) -lanl --endif -- - ifeq ($(WITH_WRAP),yes) - BROKER_LIBS:=$(BROKER_LIBS) -lwrap - BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WRAP --- -2.5.0 - diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 5514c2118d..6c102ebaa5 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,2 +1,2 @@ # Locally computed: -sha512 c05ca8679b9a6f540868f4ccf701257fcabc114d5450ac0bbbe80b91bb7cd4fc52668773e945506760c7a5bd8a494e0a56100714112e5d2713d57bfab8951587 mosquitto-1.4.11.tar.gz +sha512 75e6105498869ab13265df7a0bea6052c014d59d0c0efb61162d8257d34c0153fce32130e84c28e99fd494f374949aac5e01c19f7439c2eea575b52ef1179c3c mosquitto-1.4.12.tar.gz diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 8918128d16..985354938b 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.4.11 +MOSQUITTO_VERSION = 1.4.12 MOSQUITTO_SITE = http://mosquitto.org/files/source MOSQUITTO_LICENSE = EPLv1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 From 4174cdd16fc3bbadfdd90c9f6a270eccdbf60e39 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 29 May 2017 23:54:48 +0200 Subject: [PATCH 3025/3392] libtasn1: security bump to version 4.12 Fixes CVE-2017-7650: Two errors in the "asn1_find_node()" function (lib/parser_aux.c) within GnuTLS libtasn1 version 4.10 can be exploited to cause a stacked-based buffer overflow by tricking a user into processing a specially crafted assignments file via the e.g. asn1Coding utility. For more details, see: https://secuniaresearch.flexerasoftware.com/secunia_research/2017-11/ Or the 1.4.11 release mail (no mail about 1.4.12, but identical to 1.4.11 + a soname fix): https://lists.gnu.org/archive/html/help-libtasn1/2017-05/msg00003.html Remove 0001-configure-don-t-add-Werror-to-build-flags.patch and autoreconf as that patch is now upstream. Signed-off-by: Peter Korsgaard (cherry picked from commit 2fb7cbeb743e343fcc4aa37d6015b0a523c8b16f) Signed-off-by: Peter Korsgaard --- ...gure-don-t-add-Werror-to-build-flags.patch | 28 ------------------- package/libtasn1/libtasn1.hash | 2 +- package/libtasn1/libtasn1.mk | 4 +-- 3 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 package/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch diff --git a/package/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch b/package/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch deleted file mode 100644 index 387ba7aa3b..0000000000 --- a/package/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dd091c8af163213e12aa92f61bc4916e0f102633 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Tue, 26 Jul 2016 08:45:33 +0200 -Subject: [PATCH] configure: don't add -Werror to build flags - -Signed-off-by: Gustavo Zacarias ---- -Patch status: upstream - - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7a14e04..066f5fe 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -70,8 +70,6 @@ AC_ARG_ENABLE([gcc-warnings], - ) - - if test "$gl_gcc_warnings" = yes; then -- gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) -- - nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings - nw="$nw -Wc++-compat" # We don't care strongly about C++ compilers - nw="$nw -Wtraditional" # Warns on #elif which we use often --- -2.7.3 - diff --git a/package/libtasn1/libtasn1.hash b/package/libtasn1/libtasn1.hash index 5b2100e87d..699c14050a 100644 --- a/package/libtasn1/libtasn1.hash +++ b/package/libtasn1/libtasn1.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 4f6f7a8fd691ac2b8307c8ca365bad711db607d4ad5966f6938a9d2ecd65c920 libtasn1-4.9.tar.gz +sha256 6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753 libtasn1-4.12.tar.gz diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk index ac99868a21..8d3daca15f 100644 --- a/package/libtasn1/libtasn1.mk +++ b/package/libtasn1/libtasn1.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTASN1_VERSION = 4.9 +LIBTASN1_VERSION = 4.12 LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1 LIBTASN1_DEPENDENCIES = host-bison LIBTASN1_LICENSE = GPLv3+ (tests, tools), LGPLv2.1+ (library) @@ -12,7 +12,5 @@ LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB LIBTASN1_INSTALL_STAGING = YES # 'missing' fallback logic botched so disable it completely LIBTASN1_CONF_ENV = MAKEINFO="true" -# For 0001-configure-don-t-add-Werror-to-build-flags.patch -LIBTASN1_AUTORECONF = YES $(eval $(autotools-package)) From 48a2866ba3367fbe158b12bf2d3b7baa5b7a4d3a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 30 May 2017 11:34:17 +0200 Subject: [PATCH 3026/3392] toolchain-external: adjust musl dynamic linker symlink for mips-sf The external toolchain code has some logic to calculate the correct name for the dynamic linker symbolic link that needs to be created when the musl C library is being used. There was already some handling for the mipsel+soft-float case, but not for the mips+soft-float case. Due to this, the symbolic link was incorrectly named, and programs were referencing an non-existing file. Reported-by: Florent Jacquet Signed-off-by: Thomas Petazzoni (cherry picked from commit a6a4a8b2ef1fa747fdc79bc7bae0518417910f5d) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-external/pkg-toolchain-external.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 11a1bf5e24..653ec87a45 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -480,6 +480,8 @@ ifeq ($(BR2_i386),y) MUSL_ARCH = i386 else ifeq ($(BR2_ARM_EABIHF),y) MUSL_ARCH = armhf +else ifeq ($(BR2_mips):$(BR2_SOFT_FLOAT),y:y) +MUSL_ARCH = mips-sf else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:y) MUSL_ARCH = mipsel-sf else ifeq ($(BR2_sh),y) From 9bc38c800d776060be2140dfc811146c8d56de8a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 30 May 2017 16:53:17 +0200 Subject: [PATCH 3027/3392] package/madplay: add custom libtool patch madplay use a libtool script in version 1.5.2 but the libtool patch "buildroot-libtool-v1.5.patch.patch" doesn't apply. From [1]: "It's libtool dropping -static. That's because madplay has a weird version of libtool, on which our libtool patch doesn't apply so we have MADPLAY_LIBTOOL_PATCH = NO. Therefore, the hack we have that makes libtool -static behave like -all-static isn't applied, causing this build failure." Fixes: http://autobuild.buildroot.net/results/60def1b15ea61d3cb5f50e9de3f354dd2e17d270 [1] http://lists.busybox.net/pipermail/buildroot/2017-May/192959.html Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 2fcb07fbe3c2a861cd6c988d6d13d11be22a3683) Signed-off-by: Peter Korsgaard --- .../0002-buildroot-libtool-v1.5.patch.patch | 109 ++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 package/madplay/0002-buildroot-libtool-v1.5.patch.patch diff --git a/package/madplay/0002-buildroot-libtool-v1.5.patch.patch b/package/madplay/0002-buildroot-libtool-v1.5.patch.patch new file mode 100644 index 0000000000..2be336384b --- /dev/null +++ b/package/madplay/0002-buildroot-libtool-v1.5.patch.patch @@ -0,0 +1,109 @@ +From ce661985c098635965573aac8fc983a72f60d396 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 30 May 2017 16:42:34 +0200 +Subject: [PATCH] buildroot-libtool-v1.5.patch + +Apply buildroot-libtool-v1.5.patch rebased on libtool 1.5.2 used +in madplay and fixing all conflicts. + +Signed-off-by: Romain Naour +--- + ltmain.sh | 40 ++++++++++++++++++++++++++++++---------- + 1 file changed, 30 insertions(+), 10 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 4b9f940..0b71220 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -164,6 +164,11 @@ do + arg="$1" + shift + ++ # Make -static behave as -all-static ++ case $arg in ++ -static) arg="-all-static" ;; ++ esac ++ + case $arg in + -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; +@@ -549,8 +554,9 @@ if test -z "$show_help"; then + # line option must be used. + if test -z "$tagname"; then + $echo "$modename: unable to infer tagged configuration" +- $echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit 1 ++ $echo "$modename: defaulting to \`CC'" ++ $echo "$modename: if this is not correct, specify a tag with \`--tag'" ++# exit 1 + # else + # $echo "$modename: using $tagname tagged configuration" + fi +@@ -1228,7 +1234,8 @@ EOF + prevarg="$arg" + + case $arg in +- -all-static) ++ # Make -static behave like -all-static ++ -all-static | -static) + if test -n "$link_static_flag"; then + compile_command="$compile_command $link_static_flag" + finalize_command="$finalize_command $link_static_flag" +@@ -2135,8 +2142,14 @@ EOF + absdir="$abs_ladir" + libdir="$abs_ladir" + else +- dir="$libdir" +- absdir="$libdir" ++ # Adding 'libdir' from the .la file to our library search paths ++ # breaks crosscompilation horribly. We cheat here and don't add ++ # it, instead adding the path where we found the .la. -CL ++ dir="$abs_ladir" ++ absdir="$abs_ladir" ++ libdir="$abs_ladir" ++ #dir="$libdir" ++ #absdir="$libdir" + fi + else + dir="$ladir/$objdir" +@@ -2261,7 +2274,7 @@ EOF + { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + if test "$installed" = no; then + notinst_deplibs="$notinst_deplibs $lib" +- need_relink=yes ++ need_relink=no + fi + # This is a shared library + +@@ -5146,6 +5159,10 @@ fi\ + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do ++ # Replacing uninstalled with installed can easily break crosscompilation, ++ # since the installed path is generally the wrong architecture. -CL ++ newdependency_libs="$newdependency_libs $deplib" ++ continue + case $deplib in + *.la) + name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` +@@ -5464,10 +5481,13 @@ relink_command=\"$relink_command\"" + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. +- if test "$inst_prefix_dir" = "$destdir"; then +- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 +- exit 1 +- fi ++ # ++ # This breaks install into our staging area. -PB ++ # ++ # if test "$inst_prefix_dir" = "$destdir"; then ++ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 ++ # exit 1 ++ # fi + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. +-- +2.9.4 + From 8bba6f823ea063d3c0247c35251b54f7687c6f69 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 30 May 2017 15:03:24 +0200 Subject: [PATCH 3028/3392] strongswan: add upstream security patches Fixes: CVE-2017-9022 - RSA public keys passed to the gmp plugin aren't validated sufficiently before attempting signature verification, so that invalid input might lead to a floating point exception and crash of the process. A certificate with an appropriately prepared public key sent by a peer could be used for a denial-of-service attack. https://www.strongswan.org/blog/2017/05/30/strongswan-vulnerability-%28cve-2017-9022%29.html CVE-2017-9023 - ASN.1 CHOICE types are not correctly handled by the ASN.1 parser when parsing X.509 certificates with extensions that use such types. This could lead to infinite looping of the thread parsing a specifically crafted certificate. https://www.strongswan.org/blog/2017/05/30/strongswan-vulnerability-%28cve-2017-9023%29.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit e43efb9b654ae19e9e47ae5828d9e99b044f37c9) Signed-off-by: Peter Korsgaard --- package/strongswan/strongswan.hash | 3 +++ package/strongswan/strongswan.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index 97fb1998e4..cbc4e3857a 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -2,3 +2,6 @@ md5 9d7c77b0da9b69f859624897e5e9ebbf strongswan-5.4.0.tar.bz2 # Calculated based on the hash above sha256 f8288faaea6a9cd8a7d413c0b76b7922be5da3dfcd01fd05cb30d2c55d3bbe89 strongswan-5.4.0.tar.bz2 +# Locally calculated +sha256 f5ba7f46cf7ae81dd81bc86f9e4cfa0c5c7c6987149b3bc9c0b8bf08598a1063 strongswan-4.4.0-5.5.2_gmp_mpz_powm_sec.patch +sha256 03db8c7a4133e877e8992e155c046dd27ec4810d50f239abf55595f0280caf31 strongswan-5.0.0-5.5.2_asn1_choice.patch diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 36b5148535..99862fd2bc 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -7,6 +7,9 @@ STRONGSWAN_VERSION = 5.4.0 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org +STRONGSWAN_PATCH = \ + $(STRONGSWAN_SITE)/patches/21_gmp_mpz_powm_sec_patch/strongswan-4.4.0-5.5.2_gmp_mpz_powm_sec.patch \ + $(STRONGSWAN_SITE)/patches/22_asn1_choice_patch/strongswan-5.0.0-5.5.2_asn1_choice.patch STRONGSWAN_LICENSE = GPLv2+ STRONGSWAN_LICENSE_FILES = COPYING LICENSE STRONGSWAN_DEPENDENCIES = host-pkgconf From e73a40c41c79c44e7bf29b021d4feb6905bbd991 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 31 May 2017 07:52:08 +0200 Subject: [PATCH 3029/3392] linux-headers: bump 4.1.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 8e0cb0c12dcbb0625b42481d7057b17d7bf4ad3d) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a94d83d3ed..89f7a84f24 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -221,7 +221,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.18.53" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.39" if BR2_KERNEL_HEADERS_4_1 + default "4.1.40" if BR2_KERNEL_HEADERS_4_1 default "4.4.70" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 default "4.9.30" if BR2_KERNEL_HEADERS_4_9 From e67d4c0c3f554d1a7f9e622bfb971886ac0935a5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 31 May 2017 08:47:18 +0200 Subject: [PATCH 3030/3392] sudo: add upstream security patch for CVE-2017-1000367 CVE-2017-1000367 - Potential overwrite of arbitrary files on Linux On Linux systems, sudo parses the /proc/[pid]/stat file to determine the device number of the process's tty (field 7). The fields in the file are space-delimited, but it is possible for the command name (field 2) to include spaces, which sudo does not account for. A user with sudo privileges can cause sudo to use a device number of the user's choosing by creating a symbolic link from the sudo binary to a name that contains a space, followed by a number. If SELinux is enabled on the system and sudo was built with SELinux support, a user with sudo privileges may be able to to overwrite an arbitrary file. This can be escalated to full root access by rewriting a trusted file such as /etc/shadow or even /etc/sudoers. For more details, see: https://www.sudo.ws/alerts/linux_tty.html Signed-off-by: Peter Korsgaard (cherry picked from commit fddb760946a4f4ca366528a673989793be65a678) Signed-off-by: Peter Korsgaard --- package/sudo/0001-fix-CVE-2017-1000367.patch | 264 +++++++++++++++++++ 1 file changed, 264 insertions(+) create mode 100644 package/sudo/0001-fix-CVE-2017-1000367.patch diff --git a/package/sudo/0001-fix-CVE-2017-1000367.patch b/package/sudo/0001-fix-CVE-2017-1000367.patch new file mode 100644 index 0000000000..6e44399c05 --- /dev/null +++ b/package/sudo/0001-fix-CVE-2017-1000367.patch @@ -0,0 +1,264 @@ +Downloaded from upstream: https://www.sudo.ws/repos/sudo/raw-rev/b5460cbbb11b + +# HG changeset patch +# User Todd C. Miller +# Date 1496089973 21600 +# Node ID b5460cbbb11bbf9d92ffcc6798a686cf4125efd3 +# Parent c303e6eecc7841e2f891d70613e80fcf27fa6e86 +Fix for CVE-2017-1000367, parsing of /proc/pid/stat on Linux when +the process name contains spaces. Since the user has control over +the command name this could be used by a user with sudo access to +overwrite an arbitrary file. +Thanks to Qualys for investigating and reporting this bug. + +Also stop performing a breadth-first traversal of /dev when looking +for the device. Only the directories specified in search_devs[] +are checked. + +Signed-off-by: Peter Korsgaard +diff -r c303e6eecc78 -r b5460cbbb11b src/ttyname.c +--- a/src/ttyname.c Tue May 23 13:26:54 2017 -0600 ++++ b/src/ttyname.c Mon May 29 14:32:53 2017 -0600 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2012-2016 Todd C. Miller ++ * Copyright (c) 2012-2017 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above +@@ -145,20 +145,22 @@ + } + #elif defined(HAVE_STRUCT_PSINFO_PR_TTYDEV) || defined(HAVE_PSTAT_GETPROC) || defined(__linux__) + /* +- * Devices to search before doing a breadth-first scan. ++ * Device nodes and directories to search before searching all of /dev + */ + static char *search_devs[] = { + "/dev/console", +- "/dev/wscons", +- "/dev/pts/", +- "/dev/vt/", +- "/dev/term/", +- "/dev/zcons/", ++ "/dev/pts/", /* POSIX pty */ ++ "/dev/vt/", /* Solaris virtual console */ ++ "/dev/term/", /* Solaris serial ports */ ++ "/dev/zcons/", /* Solaris zone console */ ++ "/dev/pty/", /* HP-UX old-style pty */ + NULL + }; + ++/* ++ * Device nodes to ignore when searching all of /dev ++ */ + static char *ignore_devs[] = { +- "/dev/fd/", + "/dev/stdin", + "/dev/stdout", + "/dev/stderr", +@@ -166,16 +168,18 @@ + }; + + /* +- * Do a breadth-first scan of dir looking for the specified device. ++ * Do a scan of a directory looking for the specified device. ++ * Does not descend into subdirectories. + * Returns name on success and NULL on failure, setting errno. + */ + static char * +-sudo_ttyname_scan(const char *dir, dev_t rdev, bool builtin, char *name, size_t namelen) ++sudo_ttyname_scan(const char *dir, dev_t rdev, char *name, size_t namelen) + { +- size_t sdlen, num_subdirs = 0, max_subdirs = 0; +- char pathbuf[PATH_MAX], **subdirs = NULL; ++ size_t sdlen; ++ char pathbuf[PATH_MAX]; + char *ret = NULL; + struct dirent *dp; ++ struct stat sb; + unsigned int i; + DIR *d = NULL; + debug_decl(sudo_ttyname_scan, SUDO_DEBUG_UTIL) +@@ -187,6 +191,18 @@ + if ((d = opendir(dir)) == NULL) + goto done; + ++ if (fstat(dirfd(d), &sb) == -1) { ++ sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, ++ "unable to fstat %s", dir); ++ goto done; ++ } ++ if ((sb.st_mode & S_IWOTH) != 0) { ++ sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, ++ "ignoring world-writable directory %s", dir); ++ errno = ENOENT; ++ goto done; ++ } ++ + sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO, + "scanning for dev %u in %s", (unsigned int)rdev, dir); + +@@ -224,18 +240,6 @@ + } + if (ignore_devs[i] != NULL) + continue; +- if (!builtin) { +- /* Skip entries in search_devs; we already checked them. */ +- for (i = 0; search_devs[i] != NULL; i++) { +- len = strlen(search_devs[i]); +- if (search_devs[i][len - 1] == '/') +- len--; +- if (d_len == len && strncmp(pathbuf, search_devs[i], len) == 0) +- break; +- } +- if (search_devs[i] != NULL) +- continue; +- } + # if defined(HAVE_STRUCT_DIRENT_D_TYPE) && defined(DTTOIF) + /* + * Avoid excessive stat() calls by checking dp->d_type. +@@ -248,39 +252,14 @@ + if (stat(pathbuf, &sb) == -1) + continue; + break; +- case DT_DIR: +- /* Directory, no need to stat() it. */ +- sb.st_mode = DTTOIF(dp->d_type); +- sb.st_rdev = 0; /* quiet ccc-analyzer false positive */ +- break; + default: +- /* Not a character device, link or directory, skip it. */ ++ /* Not a character device or link, skip it. */ + continue; + } + # else + if (stat(pathbuf, &sb) == -1) + continue; + # endif +- if (S_ISDIR(sb.st_mode)) { +- if (!builtin) { +- /* Add to list of subdirs to search. */ +- if (num_subdirs + 1 > max_subdirs) { +- char **new_subdirs; +- +- new_subdirs = reallocarray(subdirs, max_subdirs + 64, +- sizeof(char *)); +- if (new_subdirs == NULL) +- goto done; +- subdirs = new_subdirs; +- max_subdirs += 64; +- } +- subdirs[num_subdirs] = strdup(pathbuf); +- if (subdirs[num_subdirs] == NULL) +- goto done; +- num_subdirs++; +- } +- continue; +- } + if (S_ISCHR(sb.st_mode) && sb.st_rdev == rdev) { + sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO, + "resolved dev %u as %s", (unsigned int)rdev, pathbuf); +@@ -296,16 +275,9 @@ + } + } + +- /* Search subdirs if we didn't find it in the root level. */ +- for (i = 0; ret == NULL && i < num_subdirs; i++) +- ret = sudo_ttyname_scan(subdirs[i], rdev, false, name, namelen); +- + done: + if (d != NULL) + closedir(d); +- for (i = 0; i < num_subdirs; i++) +- free(subdirs[i]); +- free(subdirs); + debug_return_str(ret); + } + +@@ -324,7 +296,7 @@ + debug_decl(sudo_ttyname_dev, SUDO_DEBUG_UTIL) + + /* +- * First check search_devs for common tty devices. ++ * First check search_devs[] for common tty devices. + */ + for (sd = search_devs; (devname = *sd) != NULL; sd++) { + len = strlen(devname); +@@ -349,7 +321,7 @@ + "comparing dev %u to %s: no", (unsigned int)rdev, buf); + } else { + /* Traverse directory */ +- ret = sudo_ttyname_scan(devname, rdev, true, name, namelen); ++ ret = sudo_ttyname_scan(devname, rdev, name, namelen); + if (ret != NULL || errno == ENOMEM) + goto done; + } +@@ -367,9 +339,9 @@ + } + + /* +- * Not found? Do a breadth-first traversal of /dev/. ++ * Not found? Check all device nodes in /dev. + */ +- ret = sudo_ttyname_scan(_PATH_DEV, rdev, false, name, namelen); ++ ret = sudo_ttyname_scan(_PATH_DEV, rdev, name, namelen); + + done: + debug_return_str(ret); +@@ -493,28 +465,35 @@ + len = getline(&line, &linesize, fp); + fclose(fp); + if (len != -1) { +- /* Field 7 is the tty dev (0 if no tty) */ +- char *cp = line; +- char *ep = line; +- const char *errstr; +- int field = 0; +- while (*++ep != '\0') { +- if (*ep == ' ') { +- *ep = '\0'; +- if (++field == 7) { +- dev_t tdev = strtonum(cp, INT_MIN, INT_MAX, &errstr); +- if (errstr) { +- sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, +- "%s: tty device %s: %s", path, cp, errstr); ++ /* ++ * Field 7 is the tty dev (0 if no tty). ++ * Since the process name at field 2 "(comm)" may include spaces, ++ * start at the last ')' found. ++ */ ++ char *cp = strrchr(line, ')'); ++ if (cp != NULL) { ++ char *ep = cp; ++ const char *errstr; ++ int field = 1; ++ ++ while (*++ep != '\0') { ++ if (*ep == ' ') { ++ *ep = '\0'; ++ if (++field == 7) { ++ dev_t tdev = strtonum(cp, INT_MIN, INT_MAX, &errstr); ++ if (errstr) { ++ sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, ++ "%s: tty device %s: %s", path, cp, errstr); ++ } ++ if (tdev > 0) { ++ errno = serrno; ++ ret = sudo_ttyname_dev(tdev, name, namelen); ++ goto done; ++ } ++ break; + } +- if (tdev > 0) { +- errno = serrno; +- ret = sudo_ttyname_dev(tdev, name, namelen); +- goto done; +- } +- break; ++ cp = ep + 1; + } +- cp = ep + 1; + } + } + } + From 15391f30f7b302b2cf8263d9f132814cfb56f563 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 31 May 2017 21:12:49 +0200 Subject: [PATCH 3031/3392] package/hans: fix build failures with high 'make -j' values The top-level doesn't handle correctly the build dependencies between .o files. Since hans doesn't take too many time to build, just use MAKE1. Fixes: http://autobuild.buildroot.net/results/d14/d142f4a439d4d5fcc89865abde3e593c45ad5d96 http://autobuild.buildroot.net/results/28e/28ed230e40cc154db9274f9765085cd7f0eee85a http://autobuild.buildroot.net/results/900/9008c3be3bcf46f0fc21a34f48e3cf9da1397d9a Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 17aa47fa2cf1cd60809aa70500e8611b6f3abebf) Signed-off-by: Peter Korsgaard --- package/hans/hans.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hans/hans.mk b/package/hans/hans.mk index 5111d46be5..c10ae654ef 100644 --- a/package/hans/hans.mk +++ b/package/hans/hans.mk @@ -10,7 +10,7 @@ HANS_LICENSE = GPLv3+ HANS_LICENSE_FILES = LICENSE define HANS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) GCC="$(TARGET_CC)" GPP="$(TARGET_CXX)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE1) GCC="$(TARGET_CC)" GPP="$(TARGET_CXX)" -C $(@D) endef define HANS_INSTALL_TARGET_CMDS From a3f1167c5d908a3ed477645047306bd01b7f5a65 Mon Sep 17 00:00:00 2001 From: Daniel Sabogal Date: Tue, 23 May 2017 13:19:31 -0400 Subject: [PATCH 3032/3392] bash: disable bash malloc by default Bash's malloc relies on sbrk which is implemented as a fail-only stub in musl. Presently, it is disabled when configured for static libs. Instead, default to using libc malloc. Fixes: # bash bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated) Signed-off-by: Daniel Sabogal Signed-off-by: Thomas Petazzoni (cherry picked from commit 43552504c8aacda2a163c933203a3b77146409c1) Signed-off-by: Peter Korsgaard --- package/bash/bash.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 090cf5224c..0f42fd16f7 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -9,7 +9,7 @@ BASH_SITE = $(BR2_GNU_MIRROR)/bash # Build after since bash is better than busybox shells BASH_DEPENDENCIES = ncurses readline host-bison \ $(if $(BR2_PACKAGE_BUSYBOX),busybox) -BASH_CONF_OPTS = --with-installed-readline +BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc BASH_LICENSE = GPLv3+ BASH_LICENSE_FILES = COPYING @@ -24,7 +24,7 @@ BASH_CONF_ENV += \ # The static build needs some trickery ifeq ($(BR2_STATIC_LIBS),y) -BASH_CONF_OPTS += --enable-static-link --without-bash-malloc +BASH_CONF_OPTS += --enable-static-link # bash wants to redefine the getenv() function. To check whether this is # possible, AC_TRY_RUN is used which is not possible in # cross-compilation. From c936931493df282220e890867d755c4cd38a04ce Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 1 Jun 2017 16:45:17 +0200 Subject: [PATCH 3033/3392] linux-headers: bump 3.18.x version Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 89f7a84f24..3d77846645 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,7 +218,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "3.18.53" if BR2_KERNEL_HEADERS_3_18 + default "3.18.55" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.40" if BR2_KERNEL_HEADERS_4_1 From cae46d7b8d010392a91a5b5a87b57b72542df154 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Jun 2017 11:08:48 +0200 Subject: [PATCH 3034/3392] Update for 2017.02.3 Signed-off-by: Peter Korsgaard --- CHANGES | 24 ++++++++++++++++++++++++ Makefile | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index f26077a882..d8b369fe8d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,27 @@ +2017.02.3, Released June 2nd, 2017 + + Important / security related fixes. + + Download: -source-check fixed for packages from git. + + External toolchain: musl dynamic linker symlink for mips-sf + corrected. + + Updated/fixed packages: armadillo, audiofile, bash, + bluez_utils, cppcms, dbus, dhcp, dropbear, efibootmgr, efl, + elfutils, faketime, fbgrab, flashrom, ftop, gdb, git, + google-breakpad, gpsd, hans, kvm-unit-tests, kyua, libev, + libmicrohttpd, libminiupnpc, libtasn1, libubox, ltp-testsuite, + lua, madplay, mariadb, mono, mosquitto, mxml, ntp, + nvidia-driver, openblas, openvpn, oracle-mysql, picocom, popt, + postgresql, pulseview, qt5base, qwt, rabbitmq-c, redis, + rpcbind, rtmpdump, samba4, strongswan, sudo, vlc + + Issues resolved (http://bugs.buildroot.org): + + #9796: source-check broken for Git downloads + #9871: fbgrab 1.3 won't build with BR2_REPRODUCIBLE set + 2017.02.2, Released May 1st, 2017 Important / security related fixes. diff --git a/Makefile b/Makefile index 92ecdf1907..f74d59b3a4 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02.2 +export BR2_VERSION := 2017.02.3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1493676000 +BR2_VERSION_EPOCH = 1496390000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) From 4571754b5ea722cedf9950433327acde75061954 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 2 Jun 2017 17:00:12 -0700 Subject: [PATCH 3035/3392] ncurses: Copy terminfo for 'dumb' terminal Definition of 'dumb' terminal is required to be able to call 'top -b' from 'procps-ng'. Signed-off-by: Andrey Smirnov Signed-off-by: Thomas Petazzoni (cherry picked from commit f6d80896a795307270a0d9b0cca234134e93a845) Signed-off-by: Peter Korsgaard --- package/ncurses/ncurses.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index bc0ea290b5..f8ed4fc8a7 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -46,6 +46,7 @@ endif NCURSES_TERMINFO_FILES = \ a/ansi \ + d/dumb \ l/linux \ p/putty \ p/putty-vt100 \ From 397bac28d7e2af2744908b0cca1c12a2e01395ce Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 2 Jun 2017 17:00:13 -0700 Subject: [PATCH 3036/3392] ncurses: Copy terminfo for 'screen-256color' terminal Tmux uses 256 color version of 'screen' terminfo by default, so copy corresponding file to support that usecase. Signed-off-by: Andrey Smirnov Signed-off-by: Thomas Petazzoni (cherry picked from commit 6bd29da2b3cbf560a045334b27305486b0484a99) Signed-off-by: Peter Korsgaard --- package/ncurses/ncurses.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index f8ed4fc8a7..b0f172474e 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -51,6 +51,7 @@ NCURSES_TERMINFO_FILES = \ p/putty \ p/putty-vt100 \ s/screen \ + s/screen-256color \ v/vt100 \ v/vt100-putty \ v/vt102 \ From 11a3e7ce6efc8f1f59b981671b3b3feba17458b5 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 4 Jun 2017 21:24:34 +0300 Subject: [PATCH 3037/3392] systemd: add upstream security fix Fixes CVE-2017-9217: remote DoS (daemon crash) via a crafted DNS response with an empty question section. Cc: Maxime Hadjinlian Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit dabd28a4be71e6d8f5a33d4fa34a3515e5fad177) Signed-off-by: Peter Korsgaard --- package/systemd/systemd.hash | 1 + package/systemd/systemd.mk | 3 +++ 2 files changed, 4 insertions(+) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 0acaa3cdcd..2b7820795e 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,2 +1,3 @@ # sha256 locally computed sha256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 systemd-232.tar.gz +sha256 eed8fef0045876e9efa0ba6725ed9ea93654bf24d67bb5aad467a341ad375883 a924f43f30f9c4acaf70618dd2a055f8b0f166be.patch diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index fce5d8411c..f1ddfaf440 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,6 +19,9 @@ SYSTEMD_DEPENDENCIES = \ SYSTEMD_PROVIDES = udev SYSTEMD_AUTORECONF = YES +SYSTEMD_PATCH = \ + https://github.com/systemd/systemd/commit/a924f43f30f9c4acaf70618dd2a055f8b0f166be.patch + # Make sure that systemd will always be built after busybox so that we have # a consistent init setup between two builds ifeq ($(BR2_PACKAGE_BUSYBOX),y) From 72ae6885d5903f9ada9d32b689559c8c31b86bb3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Jun 2017 19:41:50 +0200 Subject: [PATCH 3038/3392] package/gesftpserver: security bump to version 0.2.2 For details refer to http://www.chiark.greenend.org.uk/pipermail/sgo-software-announce/2016/000035.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 6da0a996173306a31c263df2ccd1f6ead3d1a81e) Signed-off-by: Peter Korsgaard --- package/gesftpserver/gesftpserver.hash | 2 +- package/gesftpserver/gesftpserver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gesftpserver/gesftpserver.hash b/package/gesftpserver/gesftpserver.hash index b4c9fdf52c..1a8a5f3492 100644 --- a/package/gesftpserver/gesftpserver.hash +++ b/package/gesftpserver/gesftpserver.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5f744c38df9bb82f5ab500858a0fb4767ac3ee2254301da03cbcf8e6c587cbf5 sftpserver-0.2.1.tar.gz +sha256 8ac1938d0f62a05799b2aeab489d6ce098c3fe53280a9b66c0957b1fdcbcbab9 sftpserver-0.2.2.tar.gz diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 25c947a78b..2fadfe5c90 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -GESFTPSERVER_VERSION = 0.2.1 +GESFTPSERVER_VERSION = 0.2.2 GESFTPSERVER_SOURCE = sftpserver-$(GESFTPSERVER_VERSION).tar.gz GESFTPSERVER_SITE = http://www.greenend.org.uk/rjk/sftpserver GESFTPSERVER_LICENSE = GPLv2+ From 883e4c2ceb950b7d9eea8b63c25a7c6e9d4a91dd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Jun 2017 11:47:31 +0200 Subject: [PATCH 3039/3392] package/ipsec-tools: add security patch to fix CVE-2015-4047 Cherry-picked from master branch: https://git.buildroot.net/buildroot/commit/?id=ff97e66c56512644577e8e86019f92bf935ed29e and renumbered patch. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/ipsec-tools/0002-CVE-2015-4047.patch | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/ipsec-tools/0002-CVE-2015-4047.patch diff --git a/package/ipsec-tools/0002-CVE-2015-4047.patch b/package/ipsec-tools/0002-CVE-2015-4047.patch new file mode 100644 index 0000000000..f53fe5cc11 --- /dev/null +++ b/package/ipsec-tools/0002-CVE-2015-4047.patch @@ -0,0 +1,26 @@ +ipsec-tools: CVE-2015-4047: null pointer dereference crash in racoon + +See: https://bugs.gentoo.org/show_bug.cgi?id=550118 + +Downloaded from +https://gitweb.gentoo.org/repo/gentoo.git/tree/net-vpn/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch + +See also +https://sources.debian.net/src/ipsec-tools/1:0.8.2%2B20140711-8/debian/patches/bug785778-null-pointer-deref.patch/ + +Signed-off-by: Bernd Kuhls + +--- ./src/racoon/gssapi.c 9 Sep 2006 16:22:09 -0000 1.4 ++++ ./src/racoon/gssapi.c 19 May 2015 15:16:00 -0000 1.6 +@@ -192,6 +192,11 @@ + gss_name_t princ, canon_princ; + OM_uint32 maj_stat, min_stat; + ++ if (iph1->rmconf == NULL) { ++ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n"); ++ return -1; ++ } ++ + gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state)); + if (gps == NULL) { + plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n"); From bc00cd601b60efc930d89247c607cc835680277a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 1 Jun 2017 09:37:58 +0200 Subject: [PATCH 3040/3392] gcc: add upstream patch to fix build of GCC6 with GCC7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building host-gcc-initial with GCC7 on the host fails due to the comparison of a pointer to an integer in ubsan_use_new_style_p, which is forbidden by ISO C++: ubsan.c:1474:23: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] || xloc.file == '\0' || xloc.file[0] == '\xff' Backported from: https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=239971 Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni (cherry picked from commit 2d57ad29b15628b01cdca37e8f05ac1dd376602c) Signed-off-by: Peter Korsgaard --- .../942-ubsan-fix-check-empty-string.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/gcc/6.3.0/942-ubsan-fix-check-empty-string.patch diff --git a/package/gcc/6.3.0/942-ubsan-fix-check-empty-string.patch b/package/gcc/6.3.0/942-ubsan-fix-check-empty-string.patch new file mode 100644 index 0000000000..98e627053b --- /dev/null +++ b/package/gcc/6.3.0/942-ubsan-fix-check-empty-string.patch @@ -0,0 +1,40 @@ +From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001 +From: kyukhin +Date: Sat, 3 Sep 2016 10:57:05 +0000 +Subject: [PATCH] gcc/ubsan.c: Fix check for empty string + +Building host-gcc-initial with GCC7 on the host fails due to the +comparison of a pointer to an integer in ubsan_use_new_style_p, which +is forbidden by ISO C++: + +ubsan.c:1474:23: error: ISO C++ forbids comparison between pointer and +integer [-fpermissive] + || xloc.file == '\0' || xloc.file[0] == '\xff' + +Backport the fix from upstream GCC to enable the build with GCC 7. + +Backported from: +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=239971 + +Signed-off-by: Joshua Lock +[Add commit log from [1]] +Signed-off-by: Jörg Krause + +[1] https://patchwork.openembedded.org/patch/138884/ +--- + gcc/ubsan.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +Index: gcc-6.3.0/gcc/ubsan.c +=================================================================== +--- gcc-6.3.0.orig/gcc/ubsan.c ++++ gcc-6.3.0/gcc/ubsan.c +@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc) + + expanded_location xloc = expand_location (loc); + if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0 +- || xloc.file == '\0' || xloc.file[0] == '\xff' ++ || xloc.file[0] == '\0' || xloc.file[0] == '\xff' + || xloc.file[1] == '\xff') + return false; + From 85f58389cdfc0a63ae43f6ca6976176ce5a422b9 Mon Sep 17 00:00:00 2001 From: Tobias Blass Date: Tue, 6 Jun 2017 16:29:11 +0200 Subject: [PATCH 3041/3392] botan: disable AltiVec if the CPU does not support it Botan compiles all PowerPC code with AltiVec support and only determines at runtime whether the CPU even supports it. If the target CPU uses the older SPE extensions, though, this is too late; since SPE and AltiVec are incompatible, gcc aborts the compilation. This patch explicitly disables AltiVec support unless BR2_POWERPC_CPU_HAS_ALTIVEC is defined Signed-off-by: Tobias Blass Signed-off-by: Thomas Petazzoni (cherry picked from commit e654839f9e2cc6d2780916d0288941cb3d4555dd) Signed-off-by: Peter Korsgaard --- package/botan/botan.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 94f1edd2c8..fc8fa698e4 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -43,6 +43,12 @@ BOTAN_DEPENDENCIES += zlib BOTAN_CONF_OPTS += --with-zlib endif +ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) +BOTAN_CONF_OPTS += --enable-altivec +else +BOTAN_CONF_OPTS += --disable-altivec +endif + define BOTAN_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure.py $(BOTAN_CONF_OPTS)) endef From ff09b865317acd37ecb8a06f56beda964c0da613 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Jun 2017 20:00:44 +0200 Subject: [PATCH 3042/3392] package/x11r7/xserver_xorg-server: fix gcc5+ build with version 1.14.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes sdksyms.c:311:15: error: expected expression before »,« token (void *) &, /* ../../include/os.h:96 */ by backporting an upstream patch, sdksyms.c is generated by hw/xfree86/sdksyms.sh which is broken when used with gcc5+. Problem was found while testing http://patchwork.ozlabs.org/patch/762102/ using this defconfig BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14=y BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB=y Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 99058b25865ef901005d1c1b5c066bd0a816b2a8) Signed-off-by: Peter Korsgaard --- .../1.14.7/0001-sdksyms-gcc5.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch diff --git a/package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch b/package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch new file mode 100644 index 0000000000..ad544aa30c --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch @@ -0,0 +1,50 @@ +From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001 +From: Egbert Eich +Date: Tue, 3 Mar 2015 16:27:05 +0100 +Subject: symbols: Fix sdksyms.sh to cope with gcc5 + +Gcc5 adds additional lines stating line numbers before and +after __attribute__() which need to be skipped. + +Downloaded from upstream commit +https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/sdksyms.sh?id=21b896939c5bb242f3aacc37baf12379e43254b6 + +Signed-off-by: Bernd Kuhls +Signed-off-by: Egbert Eich +Tested-by: Daniel Stone +Signed-off-by: Peter Hutterer + +diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh +index 2305073..05ac410 100755 +--- a/hw/xfree86/sdksyms.sh ++++ b/hw/xfree86/sdksyms.sh +@@ -350,13 +350,25 @@ BEGIN { + if (sdk) { + n = 3; + ++ # skip line numbers GCC 5 adds before __attribute__ ++ while ($n == "" || $0 ~ /^# [0-9]+ "/) { ++ getline; ++ n = 1; ++ } ++ + # skip attribute, if any + while ($n ~ /^(__attribute__|__global)/ || + # skip modifiers, if any + $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ || + # skip pointer +- $n ~ /^[a-zA-Z0-9_]*\*$/) ++ $n ~ /^[a-zA-Z0-9_]*\*$/) { + n++; ++ # skip line numbers GCC 5 adds after __attribute__ ++ while ($n == "" || $0 ~ /^# [0-9]+ "/) { ++ getline; ++ n = 1; ++ } ++ } + + # type specifier may not be set, as in + # extern _X_EXPORT unsigned name(...) +-- +cgit v0.10.2 + From 097f9d17c1eb2fe4fbba5e94fad75f82a2f4bfcd Mon Sep 17 00:00:00 2001 From: Alexandre Esse Date: Wed, 31 May 2017 23:40:45 +0200 Subject: [PATCH 3043/3392] imx-uuc: fix start-stop-daemon stop failure The daemon service script associated with imx-uuc failed to stop the daemon since the PID of the process wasn't stored at start time. Adding -m option allowed to create the uuc.pid file as expected. Signed-off-by: Alexandre Esse Reviewed-by: Gary Bisson Signed-off-by: Thomas Petazzoni (cherry picked from commit 41e86cd5cad853d7778231be8ce7c6fdb87e3da4) Signed-off-by: Peter Korsgaard --- package/freescale-imx/imx-uuc/S80imx-uuc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/imx-uuc/S80imx-uuc b/package/freescale-imx/imx-uuc/S80imx-uuc index 8a02f88e50..9a92c98383 100644 --- a/package/freescale-imx/imx-uuc/S80imx-uuc +++ b/package/freescale-imx/imx-uuc/S80imx-uuc @@ -6,7 +6,7 @@ DAEMON=/usr/bin/$NAME case "$1" in start) printf "Starting $NAME: " - start-stop-daemon -S -q -b -p /var/run/${NAME}.pid -x $DAEMON + start-stop-daemon -S -q -b -m -p /var/run/${NAME}.pid -x $DAEMON [ $? = 0 ] && echo "OK" || echo "FAIL" ;; stop) From 02ca37998b251aa746beb2a716361f20fbc6d009 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 5 Jun 2017 23:26:04 +0300 Subject: [PATCH 3044/3392] libgcrypt: security bump to version 1.7.7 Fix possible timing attack on EdDSA session key. https://lists.gnupg.org/pipermail/gnupg-announce/2017q2/000406.html Add upstream provided SHA1 hash. Switch to https download for better corporate firewall compatibility. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 869c8dfd7bd37bd11a903cadf065a1963fb8f887) Signed-off-by: Peter Korsgaard --- package/libgcrypt/libgcrypt.hash | 4 +++- package/libgcrypt/libgcrypt.mk | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 48bbd6af54..5a833d59e6 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,2 +1,4 @@ +# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q2/000406.html +sha1 ea4ae1a4dba51f15095319419d7b42a0bf160384 libgcrypt-1.7.7.tar.bz2 # Locally calculated -sha256 626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc libgcrypt-1.7.6.tar.bz2 +sha256 b9b85eba0793ea3e6e66b896eb031fa05e1a4517277cc9ab10816b359254cd9a libgcrypt-1.7.7.tar.bz2 diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index a034358b3d..c92ac77941 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.7.6 +LIBGCRYPT_VERSION = 1.7.7 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPLv2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB -LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt +LIBGCRYPT_SITE = https://gnupg.org/ftp/gcrypt/libgcrypt LIBGCRYPT_INSTALL_STAGING = YES LIBGCRYPT_DEPENDENCIES = libgpg-error LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config From b68f9b145533672257ff75b42184f76c9f55f40d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Jun 2017 22:17:42 +0200 Subject: [PATCH 3045/3392] nodejs: re-add 6.x patches Commit 039f7d0d2f (nodejs: bump 6.x version to 6.10.2) bumped the 6.x version but forgot to rename the patch directory, so the patches were no longer used. Signed-off-by: Peter Korsgaard --- .../0001-gyp-force-link-command-to-use-CXX.patch | 0 .../0002-inspector-don-t-build-when-ssl-support-is-disabled.patch | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename package/nodejs/{6.9.4 => 6.10.2}/0001-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{6.9.4 => 6.10.2}/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch (100%) diff --git a/package/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.10.2/0001-gyp-force-link-command-to-use-CXX.patch similarity index 100% rename from package/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch rename to package/nodejs/6.10.2/0001-gyp-force-link-command-to-use-CXX.patch diff --git a/package/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.10.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch similarity index 100% rename from package/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch rename to package/nodejs/6.10.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch From d995250f05561955e6afc6696e11be4b16f2812f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Jun 2017 22:17:43 +0200 Subject: [PATCH 3046/3392] nodejs: bump 6.x version to 6.10.3 6.10.3 is the latest release in the LTS series, fixing a number of issues: https://nodejs.org/en/blog/release/v6.10.3/ Signed-off-by: Peter Korsgaard --- .../0001-gyp-force-link-command-to-use-CXX.patch | 0 ...2-inspector-don-t-build-when-ssl-support-is-disabled.patch | 0 package/nodejs/Config.in | 2 +- package/nodejs/nodejs.hash | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename package/nodejs/{6.10.2 => 6.10.3}/0001-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{6.10.2 => 6.10.3}/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch (100%) diff --git a/package/nodejs/6.10.2/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.10.3/0001-gyp-force-link-command-to-use-CXX.patch similarity index 100% rename from package/nodejs/6.10.2/0001-gyp-force-link-command-to-use-CXX.patch rename to package/nodejs/6.10.3/0001-gyp-force-link-command-to-use-CXX.patch diff --git a/package/nodejs/6.10.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.10.3/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch similarity index 100% rename from package/nodejs/6.10.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch rename to package/nodejs/6.10.3/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index ad5ca050b2..5fafa8f476 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_PACKAGE_NODEJS_VERSION_STRING string - default "6.10.2" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS + default "6.10.3" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS default "0.10.48" config BR2_PACKAGE_NODEJS_NPM diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 4c63f58943..8cc6927ab2 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ # From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt sha256 365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e node-v0.10.48.tar.xz -# From upstream URL: http://nodejs.org/dist/v6.10.2/SHASUMS256.txt -sha256 80aa11333da99813973a99646e2113c6be5b63f665c0731ed14ecb94cbe846b6 node-v6.10.2.tar.xz +# From upstream URL: http://nodejs.org/dist/v6.10.3/SHASUMS256.txt +sha256 82262a703e61164e09170a14d88b1726720651b0c7ee87a277654247b21b5388 node-v6.10.3.tar.xz From c66bb46dec515f716a6be7482bb36a9e57d5e5f3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Jun 2017 06:45:40 +0200 Subject: [PATCH 3047/3392] linux-headers: bump 3.2.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit efda13af190d36086be4eb8f482838e27ecbdd0c) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3d77846645..dd4dd7da90 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -214,7 +214,7 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.88" if BR2_KERNEL_HEADERS_3_2 + default "3.2.89" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 From 14097c56d33a4964d7f77ef9fea22442381f0207 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 4 Jun 2017 11:48:39 +0200 Subject: [PATCH 3048/3392] linux: fix name of config variable In 4c10eedc1 (systemd: enable required kernel features), we added setting a few required kernel features to ensure systemd works. However, there was a typo for one of the variables: CONFIG_TMPFS_XATTR was written as CONFIG_TMPFS_POSIX_XATTR, which does not exist (and never ever existed, at least not since 2.6.12)... Reported-by: Michael Heinemann Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian Cc: Eric Le Bihan Cc: Michael Heinemann Signed-off-by: Peter Korsgaard (cherry picked from commit b0fc65a11b2ac11dc492146ec50168739810c2f8) Signed-off-by: Peter Korsgaard --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 7f4432e7b1..131489ac9f 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -274,7 +274,7 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_FHANDLE,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_AUTOFS4_FS,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_ACL,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_POSIX_XATTR,$(@D)/.config)) + $(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS_XATTR,$(@D)/.config)) $(if $(BR2_PACKAGE_SMACK), $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY,$(@D)/.config) $(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SMACK,$(@D)/.config) From 1a9b9eb342fa5f6b51b68c0bb2311f35ed82ce3a Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 6 Jun 2017 15:04:03 -0700 Subject: [PATCH 3049/3392] package/socat: Fix TABDLY, CSIZE and CRDLY shifts for PowerPC As can be seen in linux/arch/powerpc/include/uapi/asm/termbits.h are defined as (note that those are octal numbers): \#define TABDLY 00006000 \#define CSIZE 00001400 \#define CRDLY 00030000 which gives shifts of 10, 8 and 12. Adjust socat.mk accordingly to reflect that difference. Signed-off-by: Mark Hinds Signed-off-by: Andrey Smirnov Signed-off-by: Thomas Petazzoni (cherry picked from commit a52896f755a55d0fa30f6ba5092c69edaa73724d) Signed-off-by: Peter Korsgaard --- package/socat/socat.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 754b210b6c..b44b8e61a0 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -9,11 +9,20 @@ SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPLv2 SOCAT_LICENSE_FILES = COPYING -SOCAT_CONF_ENV = \ - sc_cv_termios_ispeed=no \ + +SOCAT_CONF_ENV = sc_cv_termios_ispeed=no + +ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) +SOCAT_CONF_ENV += \ + sc_cv_sys_crdly_shift=12 \ + sc_cv_sys_tabdly_shift=10 \ + sc_cv_sys_csize_shift=8 +else +SOCAT_CONF_ENV += \ sc_cv_sys_crdly_shift=9 \ sc_cv_sys_tabdly_shift=11 \ sc_cv_sys_csize_shift=4 +endif # We need to run autoconf to regenerate the configure script, in order # to ensure that the test checking linux/ext2_fs.h works From 3315e7b041d0eb0c6c8c42779ce8e661f8e67601 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 17 May 2017 23:15:28 +0200 Subject: [PATCH 3050/3392] package/qt5base: install arch-specific configuration For some architectures, it is necessary to link with additional libraries, such as -latomic for sparc. Add a bit of support to make that easy; actual use will be introduced in the following patch. Signed-off-by: "Yann E. MORIN" Cc: Julien Corjon Cc: Peter Seiderer Tested-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a3fd13804fc801fc948d27f9fe932fce7201655a) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qmake.conf | 3 +++ package/qt5/qt5base/qt5base.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf index 49cf898316..8b6debe583 100644 --- a/package/qt5/qt5base/qmake.conf +++ b/package/qt5/qt5base/qmake.conf @@ -21,5 +21,8 @@ CONFIG += nostrip QMAKE_LIBS += -lrt -lpthread -ldl QMAKE_CFLAGS_ISYSTEM = +# Architecturespecific configuration +include(arch.conf) + include(../common/linux_device_post.conf) load(qt_config) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 1020348909..b37f3da29e 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -219,12 +219,15 @@ define QT5BASE_CONFIGURE_CONFIG_FILE endef endif +QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf define QT5BASE_CONFIGURE_CMDS $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h $(QT5BASE_CONFIGURE_CONFIG_FILE) + touch $(QT5BASE_ARCH_CONFIG_FILE) + $(QT5BASE_CONFIGURE_ARCH_CONFIG) (cd $(@D); \ $(TARGET_MAKE_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ From 6f95166d0d4ca1586fbe91a56897d386a1ae928d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 17 May 2017 23:15:29 +0200 Subject: [PATCH 3051/3392] package/qt5base: link with -latomic when needed Qt 5.8 needs atomic operations, which are provided in libatomic when it exists, like on sparc with gcc >= 4.8. Fixes: http://autobuild.buildroot.org/results/49b/49bc9345b9849c9c3c53ace290c534ff7bb98683/ http://autobuild.buildroot.org/results/9f2/9f213406954be51dfcad76ebdce8b73850842180/ Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Julien Corjon Cc: Peter Seiderer Tested-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7d286be4f96cfb731e184c3e8cfea27a031bde3c) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index b37f3da29e..e879474ef5 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -220,6 +220,13 @@ endef endif QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy) +# Qt 5.8 needs atomics, which on various architectures are in -latomic +define QT5BASE_CONFIGURE_ARCH_CONFIG + printf 'LIBS += -latomic\n' >$(QT5BASE_ARCH_CONFIG_FILE) +endef +endif + define QT5BASE_CONFIGURE_CMDS $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf From 42bf45423a107bee0face991f6e3d10a666c5fb2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 11 Jun 2017 23:00:33 +0200 Subject: [PATCH 3052/3392] tor: security bump to version 0.2.9.11 Fixes CVE-2017-0376: Fix a remotely triggerable assertion failure caused by receiving a BEGIN_DIR cell on a hidden service rendezvous circuit. Signed-off-by: Peter Korsgaard (cherry picked from commit 9bf22d3e80bba37efbec5d2a0b020c0a9062e83c) Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index d14db040e7..d42c534985 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 d611283e1fb284b5f884f8c07e7d3151016851848304f56cfdf3be2a88bd1341 tor-0.2.9.10.tar.gz +sha256 c1959bebff9a546a54cbedb58c8289a42441991af417d2d16f7b336be8903221 tor-0.2.9.11.tar.gz diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 9ccde799da..7bbd2f3430 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.2.9.10 +TOR_VERSION = 0.2.9.11 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3c TOR_LICENSE_FILES = LICENSE From bc5d56d55fb826cb46339e683fc30ee111fa69c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Thu, 8 Jun 2017 09:03:44 +0200 Subject: [PATCH 3053/3392] intltool: add patch to fix compatibility with Perl 5.26 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When Perl 5.26 is installed on the host, building some packages like avahi fail, because of intltool-update: ``` Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at $BUILDROOT/host/usr/bin/intltool-update line 1065. ``` Apparently, this has been a warning before Perl 5.26, but now it is an error. Fetch from: https://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch Reported upstream: https://bugs.launchpad.net/intltool/+bug/1696658 Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni (cherry picked from commit 9426d7edf0702d6ce46db45943ae9023a60cc1be) Signed-off-by: Peter Korsgaard --- .../0001-perl-5.26-compatibility.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/intltool/0001-perl-5.26-compatibility.patch diff --git a/package/intltool/0001-perl-5.26-compatibility.patch b/package/intltool/0001-perl-5.26-compatibility.patch new file mode 100644 index 0000000000..a2a7aef1d6 --- /dev/null +++ b/package/intltool/0001-perl-5.26-compatibility.patch @@ -0,0 +1,55 @@ +Fix regex errors thrown by Perl 5.26: + +Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at $BUILDROOT/host/usr/bin/intltool-update line 1065. + +Fetched from: +https://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch + +Reported upstream: +https://bugs.launchpad.net/intltool/+bug/1696658 + +Signed-off-by: Jörg Krause + +--- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 ++++ intltool-0.51.0.orig/intltool-update.in 2015-06-19 01:52:07.171228154 +0200 +@@ -1062,7 +1062,7 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; +@@ -1190,10 +1190,10 @@ + $name =~ s/\(+$//g; + $version =~ s/\(+$//g; + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11 +1219,11 @@ + $version =~ s/\(+$//g; + $bugurl =~ s/\(+$//g if (defined $bugurl); + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); +- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); ++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); + } + + # \s makes this not work, why? From aaa641f775831eb5b8c966ecd4016b08e40cc9ca Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 9 Jun 2017 21:03:47 +0200 Subject: [PATCH 3054/3392] package/systemd: fix paths to runtime utilities systemd's configure is looking in $PATH to find utilities that will be needed at runtime. Usually, those utilties, when installed on the host, will be found in the same path they would be present on the target. For example, /usr/bin/mount on the host would also be /usr/bin/mount on the target, and all is find. Except when we need to install a host variant of util-linux, which will install mount in $(HOST_DIR), in which case systemd's configure would find that one. Of course, it is also very well possible that those utilities are not installed on the host in the same location they would be on the target, in case a user has manually installed some of those (e.g. in /usr/local/ or in /opt/) Forcibly set the path to those utilities, as they are expected to be on the target. For kexec, we can set it even though we do not depend on it (yet). systemd will appropriately test it at runtime. For quota, we point to non-existing files, so as to catch errors at runtime. It is to be noted that quotacheck is optional, while quotaon does not seem to be (a service file is always installed, that uses it). Note: utilties listed in the order they appear in configure.ac Reported-by: Adam Duskett Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian Cc: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 68986ea30146bb00660e802c438a73ee58072365) Signed-off-by: Peter Korsgaard --- package/systemd/systemd.mk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index f1ddfaf440..ce2e9ffba4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -46,10 +46,16 @@ SYSTEMD_CONF_OPTS += \ SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-lto -# Override path to kmod, used in kmod-static-nodes.service +# Override paths to a few utilities needed at runtime, to +# avoid finding those we would install in $(HOST_DIR). SYSTEMD_CONF_ENV = \ CFLAGS="$(SYSTEMD_CFLAGS)" \ - ac_cv_path_KMOD=/usr/bin/kmod + ac_cv_path_KILL=/usr/bin/kill \ + ac_cv_path_KMOD=/usr/bin/kmod \ + ac_cv_path_KEXEC=/usr/sbin/kexec \ + ac_cv_path_SULOGIN=/usr/sbin/sulogin \ + ac_cv_path_MOUNT_PATH=/usr/bin/mount \ + ac_cv_path_UMOUNT_PATH=/usr/bin/umount define SYSTEMD_RUN_INTLTOOLIZE cd $(@D) && $(HOST_DIR)/usr/bin/intltoolize --force --automake @@ -182,8 +188,14 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_QUOTACHECK),y) SYSTEMD_CONF_OPTS += --enable-quotacheck +SYSTEMD_CONF_ENV += \ + ac_cv_path_QUOTAON=/usr/sbin/quotaon \ + ac_cv_path_QUOTACHECK=/usr/sbin/quotacheck else SYSTEMD_CONF_OPTS += --disable-quotacheck +SYSTEMD_CONF_ENV += \ + ac_cv_path_QUOTAON=/.missing \ + ac_cv_path_QUOTACHECK=/.missing endif ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) From 1d237d4b07bae0065b6ff0964ae761ba84d95030 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 7 Jun 2017 12:50:15 -0300 Subject: [PATCH 3055/3392] linux-headers: bump 4.{4, 9, 11}.x series [Peter: drop 4.11.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 13a6a126fcfbfe63690955f0fb0c3118358049cc) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index dd4dd7da90..7c06c672c7 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.40" if BR2_KERNEL_HEADERS_4_1 - default "4.4.70" if BR2_KERNEL_HEADERS_4_4 + default "4.4.71" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.30" if BR2_KERNEL_HEADERS_4_9 + default "4.9.31" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 6031bceb4fe902cb6b0a9dbb4520564f51619e7a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 14 Jun 2017 14:34:57 -0300 Subject: [PATCH 3056/3392] linux-headers: bump 4.{4, 9, 11}.x series [Peter: drop 4.11.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 762e25a29e1325a9a2d406f079bc22e34ce585c4) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7c06c672c7..eca3af6ab4 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.40" if BR2_KERNEL_HEADERS_4_1 - default "4.4.71" if BR2_KERNEL_HEADERS_4_4 + default "4.4.72" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.31" if BR2_KERNEL_HEADERS_4_9 + default "4.9.32" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From e3b3059f7a0cc875694f0996c06a8812b6f14a8e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 14 Jun 2017 21:22:54 +0200 Subject: [PATCH 3057/3392] linux-headers: bump 3.18.x version to 3.18.57 Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index eca3af6ab4..603f6ee052 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,7 +218,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.105" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "3.18.55" if BR2_KERNEL_HEADERS_3_18 + default "3.18.57" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.40" if BR2_KERNEL_HEADERS_4_1 From aefd28447c055c2e5cfa3b7207b99a49ce793c8b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 17 May 2017 15:03:11 +0200 Subject: [PATCH 3058/3392] gnutls: bump version to 3.5.12 For details, see the release notes: https://lists.gnupg.org/pipermail/gnutls-devel/2017-May/008427.html https://lists.gnupg.org/pipermail/gnutls-devel/2017-April/008393.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit f8e1fdbe972b5b82b35b118e2fd7fce5e31d0de9) Signed-off-by: Peter Korsgaard --- 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 64b86d7599..8e2469a5bd 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 af443e86ba538d4d3e37c4732c00101a492fe4b56a55f4112ff0ab39dbe6579d gnutls-3.5.10.tar.xz +sha256 63cb39a5eaa029381df2e49a74cfb7be89fc4a592445191818ffe1e66bde57cb gnutls-3.5.12.tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index be1cf00e06..e4937f1690 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.5 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).10 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).12 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library) From c510f4be9e0bfed0b98aeba3339d4877ad1b6600 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 14 Jun 2017 21:18:34 +0300 Subject: [PATCH 3059/3392] gnutls: security bump to version 3.5.13 Fixes CVE-2017-7507: decoding a status request TLS extension that has a non-empty responder IDs list could lead to a crash due to a null pointer dereference. https://lists.gnupg.org/pipermail/gnutls-devel/2017-June/008446.html Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 5cbf8baaa89b7ea9db855c9a9f96a4966e1e44a1) Signed-off-by: Peter Korsgaard --- 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 8e2469a5bd..f699716801 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 63cb39a5eaa029381df2e49a74cfb7be89fc4a592445191818ffe1e66bde57cb gnutls-3.5.12.tar.xz +sha256 79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096 gnutls-3.5.13.tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index e4937f1690..11232d97b3 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,7 +5,7 @@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.5 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).12 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).13 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library) From 0b468a0c5d015f2cb8f498b809f51c1965e41b14 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 14 Jun 2017 21:18:35 +0300 Subject: [PATCH 3060/3392] gnutls: switch to https download location HTTPS works better behind certain corporate firewalls. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 9289b2427585279d706a6a75219108d3cd0fdaba) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 11232d97b3..4d8981ae7c 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -7,7 +7,7 @@ GNUTLS_VERSION_MAJOR = 3.5 GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).13 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz -GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) +GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library) GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre From 2882d39a312eb92e0d851c414c432a66b49238f3 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 14 Jun 2017 16:15:29 +0200 Subject: [PATCH 3061/3392] scancpan: update with MetaCPAN API v1 The API v0 is shutdown. see https://bugs.busybox.net/show_bug.cgi?id=9951 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit 8710996bb7d69bd4fbbf59cd3c186a428334c187) Signed-off-by: Peter Korsgaard --- support/scripts/scancpan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/scripts/scancpan b/support/scripts/scancpan index b6123de02d..32908f317e 100755 --- a/support/scripts/scancpan +++ b/support/scripts/scancpan @@ -521,7 +521,7 @@ my %deps_runtime; # name -> list of target dependencies my %deps_optional; # name -> list of optional target dependencies my %license_files; # name -> list of license files my %checksum; # author -> list of checksum -my $mcpan = MetaCPAN::API::Tiny->new(); +my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'http://fastapi.metacpan.org/v1'); my $ua = HTTP::Tiny->new(); sub get_checksum { @@ -538,7 +538,7 @@ sub get_checksum { sub get_manifest { my ($author, $distname, $version) = @_; - my $url = qq{http://api.metacpan.org/source/${author}/${distname}-${version}/MANIFEST}; + my $url = qq{http://fastapi.metacpan.org/source/${author}/${distname}-${version}/MANIFEST}; my $response = $ua->get($url); return $response->{content}; } From f1bbfaa4eb7041d59135dbeb43ab5739b992d8c0 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 17 Jun 2017 10:47:44 -0300 Subject: [PATCH 3062/3392] linux-headers: bump 4.{1, 4, 9, 11}.x series [Peter: drop 4.11.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 859764ac39c18c6aaabbb6a1a47f2fa2e5793044) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 603f6ee052..0d67d9281f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -221,8 +221,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.18.57" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.40" if BR2_KERNEL_HEADERS_4_1 - default "4.4.72" if BR2_KERNEL_HEADERS_4_4 + default "4.1.41" if BR2_KERNEL_HEADERS_4_1 + default "4.4.73" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.32" if BR2_KERNEL_HEADERS_4_9 + default "4.9.33" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From ac1bb15f779fb3e797c646282a3f7c53d5ac7e1b Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Mon, 19 Jun 2017 18:26:05 +0200 Subject: [PATCH 3063/3392] fcgiwrap: disable -Werror in CFLAGS fcgiwrap's configure script appends -Werror to AM_CFLAGS, then use it to build the package. This is an issue when Buildroot supports a new compiler version and this version makes some warnings appear. Luckily, one can provide CFLAGS=-Wno-error to the configure script so it appends -Wno-error to AM_CFLAGS. Fixes: http://autobuild.buildroot.net/results/8e04bf5a85ecd7f120bc9dedeedc891def6c46c1/ Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni (cherry picked from commit 6a20a98f4b5e576b7c3dc844951b0153963b739a) Signed-off-by: Peter Korsgaard --- package/fcgiwrap/fcgiwrap.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/fcgiwrap/fcgiwrap.mk b/package/fcgiwrap/fcgiwrap.mk index dd74c1ef72..62c4c1369d 100644 --- a/package/fcgiwrap/fcgiwrap.mk +++ b/package/fcgiwrap/fcgiwrap.mk @@ -10,6 +10,7 @@ FCGIWRAP_DEPENDENCIES = host-pkgconf libfcgi FCGIWRAP_LICENSE = MIT FCGIWRAP_LICENSE_FILES = COPYING FCGIWRAP_AUTORECONF = YES +FCGIWRAP_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -Wno-error" ifeq ($(BR2_PACKAGE_SYSTEMD),y) FCGIWRAP_DEPENDENCIES += systemd From 29e46157f70678f0a5b5c545e029beb54b4ef9ff Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 19 Jun 2017 17:00:08 +0100 Subject: [PATCH 3064/3392] gdb: fix full gdb build for MIPS musl Currently building full gdb for MIPS musl fails because it's trying to include which is provided by glibc and uClibc, but not by musl. However, the kernel headers provide which has the same definitions, so we can use that one instead. Backporting a patch that has been sent upstream. Taken from here: https://sourceware.org/bugzilla/show_bug.cgi?id=21070 [Peter: drop 7.12.1 / 8.0 patches] Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 1874fe15224007308a7bf4e9765506a3b4bc1b27) Signed-off-by: Peter Korsgaard --- .../gdb/7.10.1/0011-use-asm-sgidefs.h.patch | 41 +++++++++++++++++++ .../gdb/7.11.1/0006-use-asm-sgidefs.h.patch | 40 ++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 package/gdb/7.10.1/0011-use-asm-sgidefs.h.patch create mode 100644 package/gdb/7.11.1/0006-use-asm-sgidefs.h.patch diff --git a/package/gdb/7.10.1/0011-use-asm-sgidefs.h.patch b/package/gdb/7.10.1/0011-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..fdc56793fb --- /dev/null +++ b/package/gdb/7.10.1/0011-use-asm-sgidefs.h.patch @@ -0,0 +1,41 @@ +From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use + +Build fix for MIPS with musl libc + +The MIPS specific header is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide + which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from https://sourceware.org/bugzilla/show_bug.cgi?id=21070 +Patch has been adapted to apply on 7.10.1.] + +Signed-off-by: Andre McCurdy +Signed-off-by: Khem Raj +Signed-off-by: Vicente Olivert Riera +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index 9f6d697..8f57bb2 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -31,7 +31,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include ++#include + #include + #include + +-- +2.13.1 + diff --git a/package/gdb/7.11.1/0006-use-asm-sgidefs.h.patch b/package/gdb/7.11.1/0006-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..d30336904f --- /dev/null +++ b/package/gdb/7.11.1/0006-use-asm-sgidefs.h.patch @@ -0,0 +1,40 @@ +From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Sat, 30 Apr 2016 15:29:06 -0700 +Subject: [PATCH] use + +Build fix for MIPS with musl libc + +The MIPS specific header is provided by glibc and uclibc +but not by musl. Regardless of the libc, the kernel headers provide + which provides the same definitions, so use that +instead. + +Upstream-Status: Pending + +[Vincent: +Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] + +Signed-off-by: Andre McCurdy +Signed-off-by: Khem Raj +Signed-off-by: Vicente Olivert Riera +--- + gdb/mips-linux-nat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c +index f2df1b9907..d24664cb56 100644 +--- a/gdb/mips-linux-nat.c ++++ b/gdb/mips-linux-nat.c +@@ -31,7 +31,7 @@ + #include "gdb_proc_service.h" + #include "gregset.h" + +-#include ++#include + #include "nat/gdb_ptrace.h" + #include + #include "inf-ptrace.h" +-- +2.13.1 + From ab5db57cc3449a38623c4e0797dcf2515443fbdd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 18 Jun 2017 23:20:04 +0200 Subject: [PATCH 3065/3392] expat: security bump to version 2.2.1 Fixes: - CVE-2017-9233 - External entity infinite loop DoS. See: https://libexpat.github.io/doc/cve-2017-9233/ - CVE-2016-9063 -- Detect integer overflow And further more: - Fix regression from fix to CVE-2016-0718 cutting off longer tag names. - Extend fix for CVE-2016-5300 (use getrandom() if available). - Extend fix for CVE-2012-0876 (Change hash algorithm to William Ahern's version of SipHash). Also add an upstream patch to fix detection of getrandom(). Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit c0ad6ded018ffbc33f7f52a4bbcc6f08a14bfbd6) Signed-off-by: Peter Korsgaard --- ...-mis-detection-of-getrandom-on-Debia.patch | 29 +++++++++++++++++++ package/expat/expat.hash | 8 ++--- package/expat/expat.mk | 4 ++- 3 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch diff --git a/package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch b/package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch new file mode 100644 index 0000000000..a3025531e5 --- /dev/null +++ b/package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch @@ -0,0 +1,29 @@ +From 602e6c78ca750c082b72f8cdf4a38839b312959f Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Sun, 18 Jun 2017 18:55:10 +0200 +Subject: [PATCH] configure.ac: Fix mis-detection of getrandom on Debian + GNU/kFreeBSD (#50) + +There is no such thing but we need to link (not just compile) to realize. + +Signed-off-by: Peter Korsgaard +--- + expat/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/expat/configure.ac b/expat/configure.ac +index 1357c9a..444c002 100644 +--- a/expat/configure.ac ++++ b/expat/configure.ac +@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ + + + AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)]) +-AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include /* for NULL */ + #include + int main() { +-- +2.11.0 + diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 371abdec91..595597b6fd 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.2.0/ -md5 2f47841c829facb346eb6e3fab5212e2 expat-2.2.0.tar.bz2 -sha1 8453bc52324be4c796fd38742ec48470eef358b3 expat-2.2.0.tar.bz2 +# From https://sourceforge.net/projects/expat/files/expat/2.2.1/ +md5 d9c3baeab58774cefc2f04faf29f2cf8 expat-2.2.1.tar.bz2 +sha1 f45eb724f182776a9cacec9ed70d549e87198987 expat-2.2.1.tar.bz2 # Calculated based on the hashes above -sha256 d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff expat-2.2.0.tar.bz2 +sha256 1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885 expat-2.2.1.tar.bz2 diff --git a/package/expat/expat.mk b/package/expat/expat.mk index e7bb74a966..bb6e627e5b 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.2.0 +EXPAT_VERSION = 2.2.1 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2 EXPAT_INSTALL_STAGING = YES @@ -14,6 +14,8 @@ EXPAT_DEPENDENCIES = host-pkgconf HOST_EXPAT_DEPENDENCIES = host-pkgconf EXPAT_LICENSE = MIT EXPAT_LICENSE_FILES = COPYING +# for 0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch +EXPAT_AUTORECONF = YES $(eval $(autotools-package)) $(eval $(host-autotools-package)) From b2a355e8bebecd8240fcc764c2fc7347ad48f2f0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 20 Jun 2017 07:40:25 +0200 Subject: [PATCH 3066/3392] expat: fix patch that doesn't apply properly Fixes: http://autobuild.buildroot.net/results/23f799009ae10c5de2b06a7747a28804818204c2/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 1940a66114bb6962dfdcee928e5c5fa5f29c0be7) Signed-off-by: Peter Korsgaard --- ...nfigure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch b/package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch index a3025531e5..44f43e1cb4 100644 --- a/package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch +++ b/package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch @@ -11,10 +11,10 @@ Signed-off-by: Peter Korsgaard expat/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/expat/configure.ac b/expat/configure.ac +diff --git a/configure.ac b/configure.ac index 1357c9a..444c002 100644 ---- a/expat/configure.ac -+++ b/expat/configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ From 5702de427f2e42bd06961e5c399d2ddbf979efcb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 14 Mar 2017 16:00:39 +0100 Subject: [PATCH 3067/3392] irssi: bump version to version 1.0.2 Notice that this fixes a security issue: CWE-416 (use after free condition during netjoin processing). No CVE assigned yet: https://irssi.org/security/irssi_sa_2017_03.txt But the 0.8.x series is not believed to be vulnerable to this specific issue. From the advisory: Affected versions ----------------- Irssi up to and including 1.0.1 We believe Irssi 0.8.21 and prior are not affected since a different code path causes the netjoins to be flushed prior to reaching the use after free condition. Openssl is no longer optional, so select it and drop the enable/disable handling. Signed-off-by: Peter Korsgaard (cherry picked from commit d1e2d290d9fd4cc8b12bcae72725ebad1cac8edc) Signed-off-by: Peter Korsgaard --- package/irssi/Config.in | 1 + package/irssi/irssi.hash | 2 +- package/irssi/irssi.mk | 11 ++--------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/package/irssi/Config.in b/package/irssi/Config.in index 7d29201789..2cdd06c87c 100644 --- a/package/irssi/Config.in +++ b/package/irssi/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_IRSSI bool "irssi" select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_OPENSSL depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # fork() diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index b1048bf8f5..f1472e04bf 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 e433063b8714dcf17438126902c9a9d5c97944b3185ecd0fc5ae25c4959bf35a irssi-0.8.21.tar.xz +sha256 5c1c3cc2caf103aad073fadeb000e0f8cb3b416833a7f43ceb8bd9fcf275fbe9 irssi-1.0.2.tar.xz diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index e467f89890..7df7bbc445 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,27 +4,20 @@ # ################################################################################ -IRSSI_VERSION = 0.8.21 +IRSSI_VERSION = 1.0.2 IRSSI_SOURCE = irssi-$(IRSSI_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. IRSSI_SITE = https://github.com/irssi/irssi/releases/download/$(IRSSI_VERSION) IRSSI_LICENSE = GPLv2+ IRSSI_LICENSE_FILES = COPYING -IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses +IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses openssl IRSSI_CONF_OPTS = \ --disable-glibtest \ --with-ncurses=$(STAGING_DIR)/usr \ --without-perl -ifeq ($(BR2_PACKAGE_OPENSSL),y) -IRSSI_CONF_OPTS += --enable-ssl -IRSSI_DEPENDENCIES += openssl -else -IRSSI_CONF_OPTS += --disable-ssl -endif - ifeq ($(BR2_PACKAGE_IRSSI_PROXY),y) IRSSI_CONF_OPTS += --with-proxy # If shared libs are disabled, 'proxy' has to go in the list of built-in From 0b188e6baf8b578196a5de0fc4365f45745a6782 Mon Sep 17 00:00:00 2001 From: Rodrigo Rebello Date: Tue, 21 Mar 2017 00:45:53 -0300 Subject: [PATCH 3068/3392] irssi: add patch to fix static linking An upstream change which removed the option to build Irssi without SSL support (v1.0.0 and later) also eliminated the use of PKG_CHECK_MODULES to find the OpenSSL library, relying only on a test with AC_CHECK_LIB for that purpose. This unfortunately broke static linking since the flag to link with zlib, used by OpenSSL, is missed completely. The newly added patch therefore adds PKG_CHECK_MODULES back into the configure script. Fixes: http://autobuild.buildroot.net/results/e8b51f65525246d1205a26859d418393aaebf48c/ http://autobuild.buildroot.net/results/35d952b3b36e295723bf8ed1badb4c9439201822/ http://autobuild.buildroot.net/results/ea8af1458edf3ce0e2b1c444d2ae29ac1e5d2fbf/ [...] Signed-off-by: Rodrigo Rebello Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit fc741ba9b3c8b5cd602a01f53798ca577a4975dd) Signed-off-by: Peter Korsgaard --- ...sing-pkg-config-to-check-for-OpenSSL.patch | 77 +++++++++++++++++++ package/irssi/irssi.mk | 3 + 2 files changed, 80 insertions(+) create mode 100644 package/irssi/0001-Get-back-to-using-pkg-config-to-check-for-OpenSSL.patch diff --git a/package/irssi/0001-Get-back-to-using-pkg-config-to-check-for-OpenSSL.patch b/package/irssi/0001-Get-back-to-using-pkg-config-to-check-for-OpenSSL.patch new file mode 100644 index 0000000000..0ce44f9354 --- /dev/null +++ b/package/irssi/0001-Get-back-to-using-pkg-config-to-check-for-OpenSSL.patch @@ -0,0 +1,77 @@ +From ed0c2c1b9504a99a6dcc3c0f5de3b3a1c0232758 Mon Sep 17 00:00:00 2001 +From: Rodrigo Rebello +Date: Mon, 20 Mar 2017 13:17:42 -0300 +Subject: [PATCH] Get back to using pkg-config to check for OpenSSL + +Commit 6300dfec7 removed the option to disable SSL support from the +configure script since it became a requirement, but it also removed the +use of pkg-config for finding the OpenSSL library and its dependencies. + +This had the unfortunate consequence of breaking the correct detection +of library flags in many static linking scenarios. In some cases, for +example, OpenSSL might have been built with zlib, which requires `-lz` +to be passed to the linker when doing a static link of the irssi +executable. Thus, pkg-config becomes an invaluable tool in such +situations, since no guessing work is needed as the OpenSSL .pc file +provides all the necessary flags. + +So, this patch re-inserts the PKG_CHECK_MODULES macro in the configure +script when looking for OpenSSL. The test using AC_CHECK_LIB remains, +but only as a last resort in case the one using pkg-config fails. + +Also, because the macro AM_PATH_GLIB_2_0 contains an unconditional call +to PKG_PROG_PKG_CONFIG, the OpenSSL checks are moved so that they come +after the Glib ones in order to avoid doubly checking for the pkg-config +binary (PKG_CHECK_MODULES skips that check if it has been performed +before, but PKG_PROG_PKG_CONFIG does not). + +Upstream status: submitted +https://github.com/irssi/irssi/pull/677 + +Signed-off-by: Rodrigo Rebello +--- + configure.ac | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 02b33497..9f191d3f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -231,11 +231,6 @@ if test "x$want_socks" = "xyes"; then + fi + + dnl ** +-dnl ** OpenSSL checks +-dnl ** +-AC_CHECK_LIB([ssl], [SSL_library_init]) +- +-dnl ** + dnl ** fe-text checks + dnl ** + +@@ -276,7 +271,21 @@ if test -z "$GLIB_LIBS"; then + AC_ERROR([GLIB is required to build irssi.]) + fi + +-LIBS="$LIBS $GLIB_LIBS -lssl -lcrypto" ++LIBS="$LIBS $GLIB_LIBS" ++ ++dnl ** ++dnl ** OpenSSL checks ++dnl ** ++PKG_CHECK_MODULES([OPENSSL], [openssl], [ ++ CFLAGS="$CFLAGS $OPENSSL_CFLAGS" ++ LIBS="$LIBS $OPENSSL_LIBS" ++], [ ++ AC_CHECK_LIB([ssl], [SSL_library_init], [ ++ LIBS="$LIBS -lssl -lcrypto" ++ ], [ ++ AC_MSG_ERROR([The OpenSSL library was not found]) ++ ]) ++]) + + dnl ** + dnl ** curses checks +-- +2.11.0 + diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index 7df7bbc445..dfb1e28780 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -13,6 +13,9 @@ IRSSI_LICENSE = GPLv2+ IRSSI_LICENSE_FILES = COPYING IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses openssl +# We're patching configure.ac, so we need to autoreconf +IRSSI_AUTORECONF = YES + IRSSI_CONF_OPTS = \ --disable-glibtest \ --with-ncurses=$(STAGING_DIR)/usr \ From 379ac93539963f5f2e79b5089dc3951359266c00 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 18 Jun 2017 23:35:02 +0200 Subject: [PATCH 3069/3392] irssi: security bump to version 1.0.3 Fixes: CVE-2017-9468 - Joseph Bisch discovered that Irssi does not properly handle DCC messages without source nick/host. A malicious IRC server can take advantage of this flaw to cause Irssi to crash, resulting in a denial of service. CVE-2017-9469 - Joseph Bisch discovered that Irssi does not properly handle receiving incorrectly quoted DCC files. A remote attacker can take advantage of this flaw to cause Irssi to crash, resulting in a denial of service. See https://irssi.org/security/irssi_sa_2017_06.txt for more details. Remove 0001-Get-back-to-using-pkg-config-to-check-for-OpenSSL.patch as it applied upstream and drop autoreconf as configure.ac is no longer patched. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 2e19525f2f4904424caee7bc13be24163fd54216) Signed-off-by: Peter Korsgaard --- ...sing-pkg-config-to-check-for-OpenSSL.patch | 77 ------------------- package/irssi/irssi.hash | 2 +- package/irssi/irssi.mk | 5 +- 3 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 package/irssi/0001-Get-back-to-using-pkg-config-to-check-for-OpenSSL.patch diff --git a/package/irssi/0001-Get-back-to-using-pkg-config-to-check-for-OpenSSL.patch b/package/irssi/0001-Get-back-to-using-pkg-config-to-check-for-OpenSSL.patch deleted file mode 100644 index 0ce44f9354..0000000000 --- a/package/irssi/0001-Get-back-to-using-pkg-config-to-check-for-OpenSSL.patch +++ /dev/null @@ -1,77 +0,0 @@ -From ed0c2c1b9504a99a6dcc3c0f5de3b3a1c0232758 Mon Sep 17 00:00:00 2001 -From: Rodrigo Rebello -Date: Mon, 20 Mar 2017 13:17:42 -0300 -Subject: [PATCH] Get back to using pkg-config to check for OpenSSL - -Commit 6300dfec7 removed the option to disable SSL support from the -configure script since it became a requirement, but it also removed the -use of pkg-config for finding the OpenSSL library and its dependencies. - -This had the unfortunate consequence of breaking the correct detection -of library flags in many static linking scenarios. In some cases, for -example, OpenSSL might have been built with zlib, which requires `-lz` -to be passed to the linker when doing a static link of the irssi -executable. Thus, pkg-config becomes an invaluable tool in such -situations, since no guessing work is needed as the OpenSSL .pc file -provides all the necessary flags. - -So, this patch re-inserts the PKG_CHECK_MODULES macro in the configure -script when looking for OpenSSL. The test using AC_CHECK_LIB remains, -but only as a last resort in case the one using pkg-config fails. - -Also, because the macro AM_PATH_GLIB_2_0 contains an unconditional call -to PKG_PROG_PKG_CONFIG, the OpenSSL checks are moved so that they come -after the Glib ones in order to avoid doubly checking for the pkg-config -binary (PKG_CHECK_MODULES skips that check if it has been performed -before, but PKG_PROG_PKG_CONFIG does not). - -Upstream status: submitted -https://github.com/irssi/irssi/pull/677 - -Signed-off-by: Rodrigo Rebello ---- - configure.ac | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 02b33497..9f191d3f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -231,11 +231,6 @@ if test "x$want_socks" = "xyes"; then - fi - - dnl ** --dnl ** OpenSSL checks --dnl ** --AC_CHECK_LIB([ssl], [SSL_library_init]) -- --dnl ** - dnl ** fe-text checks - dnl ** - -@@ -276,7 +271,21 @@ if test -z "$GLIB_LIBS"; then - AC_ERROR([GLIB is required to build irssi.]) - fi - --LIBS="$LIBS $GLIB_LIBS -lssl -lcrypto" -+LIBS="$LIBS $GLIB_LIBS" -+ -+dnl ** -+dnl ** OpenSSL checks -+dnl ** -+PKG_CHECK_MODULES([OPENSSL], [openssl], [ -+ CFLAGS="$CFLAGS $OPENSSL_CFLAGS" -+ LIBS="$LIBS $OPENSSL_LIBS" -+], [ -+ AC_CHECK_LIB([ssl], [SSL_library_init], [ -+ LIBS="$LIBS -lssl -lcrypto" -+ ], [ -+ AC_MSG_ERROR([The OpenSSL library was not found]) -+ ]) -+]) - - dnl ** - dnl ** curses checks --- -2.11.0 - diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index f1472e04bf..abb421998c 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 5c1c3cc2caf103aad073fadeb000e0f8cb3b416833a7f43ceb8bd9fcf275fbe9 irssi-1.0.2.tar.xz +sha256 838220297dcbe7c8c42d01005059779a82f5b7b7e7043db37ad13f5966aff581 irssi-1.0.3.tar.xz diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index dfb1e28780..12ab57bbc1 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 1.0.2 +IRSSI_VERSION = 1.0.3 IRSSI_SOURCE = irssi-$(IRSSI_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. @@ -13,9 +13,6 @@ IRSSI_LICENSE = GPLv2+ IRSSI_LICENSE_FILES = COPYING IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses openssl -# We're patching configure.ac, so we need to autoreconf -IRSSI_AUTORECONF = YES - IRSSI_CONF_OPTS = \ --disable-glibtest \ --with-ncurses=$(STAGING_DIR)/usr \ From 354c0beb99d9a66b8ac318e864230c93e9289179 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 19 Jun 2017 15:33:25 +0100 Subject: [PATCH 3070/3392] ntp: enable/disable sntp support depending on BR2_PACKAGE_NTP_SNTP We already have an option for selecting sntp support in ntp that can be chosen from the menuconfig, and ntp's configure script has a --with-sntp option (with its --without counterpart) which can be used for disabling sntp support in ntp. However, we are not using it. This patch will make use of it. Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 79ee9b7e692824886bc19b21f55ac25e36e238f1) Signed-off-by: Peter Korsgaard --- package/ntp/ntp.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 24403cf4f9..6afdd8d461 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -65,6 +65,12 @@ else NTP_CONF_OPTS += --disable-SHM endif +ifeq ($(BR2_PACKAGE_NTP_SNTP),y) +NTP_CONF_OPTS += --with-sntp +else +NTP_CONF_OPTS += --without-sntp +endif + NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTP_KEYGEN) += util/ntp-keygen NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTP_WAIT) += scripts/ntp-wait/ntp-wait NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPDATE) += ntpdate/ntpdate From e0d637c5a957947969d5f7755d69db3d4299b9b2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Jun 2017 18:22:37 +0200 Subject: [PATCH 3071/3392] package/x264: disable optional ffmpeg support In buildroot ffmpeg uses x264 as optional dependency if BR2_PACKAGE_FFMPEG_GPL is enabled at the same time. If BR2_PACKAGE_FFMPEG_GPL is disabled and ffmpeg is built without x264 support before x264 itself is build, x264 picks up certain ffmpeg libs as optional dependency leading to build errors because x264 does not correctly link statically against ffmpeg. To avoid a circular dependency and to avoid teaching x264 how to correctly link statically with ffmpeg we just disable all ffmpeg- related options. Fixes http://autobuild.buildroot.net/results/36a/36abb5b8f3aab57fb7b63056b216b4a58143ee3e/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 310e4f07f8cdb3e3272aaed236142d58cfaa44e6) Signed-off-by: Peter Korsgaard --- package/x264/x264.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x264/x264.mk b/package/x264/x264.mk index 80437c408c..307bf6c2a0 100644 --- a/package/x264/x264.mk +++ b/package/x264/x264.mk @@ -10,7 +10,7 @@ X264_LICENSE = GPLv2+ X264_DEPENDENCIES = host-pkgconf X264_LICENSE_FILES = COPYING X264_INSTALL_STAGING = YES -X264_CONF_OPTS = --disable-avs +X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale ifeq ($(BR2_i386)$(BR2_x86_64),y) # yasm needed for assembly files From e06ef6269f4ac2d143dfb13d51c29908634550f5 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 20 Apr 2017 13:32:19 +0100 Subject: [PATCH 3072/3392] bind: bump version to 9.11.1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit b9e147dd5e2098ed4e3a772ca3ababb624e4aae6) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 8d44d99646..9a7fb446e1 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,2 +1,2 @@ -# Verified from http://ftp.isc.org/isc/bind9/9.11.0-P5/bind-9.11.0-P5.tar.gz.sha256.asc -sha256 1e283f0567b484687dfd7b936e26c9af4f64043daf73cbd8f3eb1122c9fb71f5 bind-9.11.0-P5.tar.gz +# Verified from http://ftp.isc.org/isc/bind9/9.11.1/bind-9.11.1.tar.gz.sha256.asc +sha256 22050095f5c82a1385cc4174190ac60392670bbc5d63d592ecae52a214bc10b2 bind-9.11.1.tar.gz diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 2903a31635..e52384b321 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.0-P5 +BIND_VERSION = 9.11.1 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) From 0fb37b8a3f494ddb2bf85b5155abd4e763943408 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 20 Jun 2017 22:55:34 +0200 Subject: [PATCH 3073/3392] bind: security bump to version 9.11-P1 Fixes the following security issues: CVE-2017-3140 is a denial-of-service vulnerability affecting 9.9.10, 9.10.5, 9.11.0->9.11.1, 9.9.10-S1, and 9.10.5-S1 when configured with Response Policy Zones (RPZ) utilizing NSIP or NSDNAME rules. https://kb.isc.org/article/AA-01495/74/CVE-2017-3140 CVE-2017-3141 is a Windows privilege escalation vector affecting 9.2.6-P2+, 9.3.2-P1+, 9.4.x, 9.5.x, 9.6.x, 9.7.x, 9.8.x, 9.9.0->9.9.10, 9.10.0->9.10.5, 9.11.0->9.11.1, 9.9.3-S1->9.9.10-S1, and 9.10.5-S1. The BIND Windows installer failed to properly quote the service paths, possibly allowing a local user to achieve privilege escalation, if allowed by file system permissions. https://kb.isc.org/article/AA-01496/74/CVE-2017-3141 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit e14d89d5e08c47e4e93074cd85cb412af9eafa5e) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 9a7fb446e1..3f0dda531a 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,2 +1,2 @@ -# Verified from http://ftp.isc.org/isc/bind9/9.11.1/bind-9.11.1.tar.gz.sha256.asc -sha256 22050095f5c82a1385cc4174190ac60392670bbc5d63d592ecae52a214bc10b2 bind-9.11.1.tar.gz +# Verified from http://ftp.isc.org/isc/bind9/9.11.1-P1/bind-9.11.1-P1.tar.gz.sha256.asc +sha256 6b1b3e88d51b8471bd6aee24a8cea70817e850a5901315dc506f9dde275ca638 bind-9.11.1-P1.tar.gz diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e52384b321..31c338807c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.1 +BIND_VERSION = 9.11.1-P1 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) From 26c51528773722c756f65909c9ea147afb7fa6c6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 20 Jun 2017 23:13:45 +0200 Subject: [PATCH 3074/3392] apache: security bump to version 2.4.26 Fixes the following security issues: CVE-2017-3167: In Apache httpd 2.2.x before 2.2.33 and 2.4.x before 2.4.26, use of the ap_get_basic_auth_pw() by third-party modules outside of the authentication phase may lead to authentication requirements being bypassed. CVE-2017-3169: In Apache httpd 2.2.x before 2.2.33 and 2.4.x before 2.4.26, mod_ssl may dereference a NULL pointer when third-party modules call ap_hook_process_connection() during an HTTP request to an HTTPS port. CVE-2017-7659: A maliciously constructed HTTP/2 request could cause mod_http2 to dereference a NULL pointer and crash the server process. CVE-2017-7668: The HTTP strict parsing changes added in Apache httpd 2.2.32 and 2.4.24 introduced a bug in token list parsing, which allows ap_find_token() to search past the end of its input string. By maliciously crafting a sequence of request headers, an attacker may be able to cause a segmentation fault, or to force ap_find_token() to return an incorrect value. CVE-2017-7679: In Apache httpd 2.2.x before 2.2.33 and 2.4.x before 2.4.26, mod_mime can read one byte past the end of a buffer when sending a malicious Content-Type response header. While we're at it, use the upstream sha256 checksum instead of sha1. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit e8a15fd693261306c6e9a0733569a89d5b795295) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 4 ++-- package/apache/apache.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 38fd883f82..fe7174a4d2 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,2 +1,2 @@ -# From http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2.sha1 -sha1 bd6d138c31c109297da2346c6e7b93b9283993d2 httpd-2.4.25.tar.bz2 +# From http://www.apache.org/dist/httpd/httpd-2.4.26.tar.bz2.sha256 +sha256 a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387 httpd-2.4.26.tar.bz2 diff --git a/package/apache/apache.mk b/package/apache/apache.mk index ae629bd2ca..b276b8d493 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.25 +APACHE_VERSION = 2.4.26 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 From 6e0efd193d279216a6c46b2f75159119a347c396 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 20 Jun 2017 23:24:21 +0200 Subject: [PATCH 3075/3392] c-ares: security bump to version 1.13.0 Fixes the following security issues: CVE-2017-1000381: The c-ares function `ares_parse_naptr_reply()`, which is used for parsing NAPTR responses, could be triggered to read memory outside of the given input buffer if the passed in DNS response packet was crafted in a particular way. https://c-ares.haxx.se/adv_20170620.html Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit d1481fe47493546171ff8f9949e95299c5359d8e) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index f46ef02aba..79928ae843 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 8692f9403cdcdf936130e045c84021665118ee9bfea905d1a76f04d4e6f365fb c-ares-1.12.0.tar.gz +sha256 03f708f1b14a26ab26c38abd51137640cb444d3ec72380b21b20f1a8d2861da7 c-ares-1.13.0.tar.gz diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index e817d4add5..72019a0425 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.12.0 +C_ARES_VERSION = 1.13.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From bb0d5044be8b7d9adc935aea22c4fdc2ac3efe1e Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Wed, 21 Jun 2017 06:06:58 +0200 Subject: [PATCH 3076/3392] iperf: fix tarball hashes changed upstream Upstream uploaded a new tarball with the same version number 2016-09-08, some time after the update to v2.0.9 in buildroot. Someone noticed, but upstream set the ticket to wontfix, and promised to do better in the future: https://sourceforge.net/p/iperf2/tickets/20/ Signed-off-by: Alexander Dahl Signed-off-by: Thomas Petazzoni (cherry picked from commit 62cf881a768c50e4c10c3dfce5b88f48beb6a26f) Signed-off-by: Peter Korsgaard --- package/iperf/iperf.hash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iperf/iperf.hash b/package/iperf/iperf.hash index 3dd491a2c0..3e961435b6 100644 --- a/package/iperf/iperf.hash +++ b/package/iperf/iperf.hash @@ -1,4 +1,4 @@ # From https://sourceforge.net/projects/iperf2/files/ -sha1 9e215f6af8edd97f947f2b0207ff5487845d83d4 iperf-2.0.9.tar.gz +sha1 59820895df9106ba189ccfdc5677077535ad50e7 iperf-2.0.9.tar.gz # Locally computed: -sha256 a5350777b191e910334d3a107b5e5219b72ffa393da4186da1e0a4552aeeded6 iperf-2.0.9.tar.gz +sha256 db02911f35686e808ed247160dfa766e08ae3f59d1e7dcedef0ffb2a6643f0bf iperf-2.0.9.tar.gz From 67542de53f18bc95cd5afc94df8cca2d82214d4a Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 20 Jun 2017 17:15:19 +0100 Subject: [PATCH 3077/3392] openssh: fix sshd for MIPS64 n32 This patch backports two patches that have been sent upstream as a pull request in order to fix sshd for MIPS64 n32. The first patch adds support for detecting the MIPS ABI during the configure phase. The second patch sets the right value to seccomp_audit_arch taking into account the MIPS64 ABI. Currently seccomp_audit_arch is set to AUDIT_ARCH_MIPS64 or AUDIT_ARCH_MIPSEL64 (depending on the endinness) when openssh is built for MIPS64. However, that's only valid for n64 ABI. The right macros for n32 ABI defined in seccomp.h are AUDIT_ARCH_MIPS64N32 and AUDIT_ARCH_MIPSEL64N32, for big and little endian respectively. Because of that an sshd built for MIPS64 n32 rejects connection attempts and the output of strace reveals that the problem is related to seccomp audit: [pid 194] prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, {len=57, filter=0x555d5da0}) = 0 [pid 194] write(7, "\0\0\0]\0\0\0\5\0\0\0Ulist_hostkey_types: "..., 97) = ? [pid 193] <... poll resumed> ) = 2 ([{fd=5, revents=POLLIN|POLLHUP}, {fd=6, revents=POLLHUP}]) [pid 194] +++ killed by SIGSYS +++ Pull request: https://github.com/openssh/openssh-portable/pull/71 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 6da373798426e0080e2f910132a8e281b892d435) Signed-off-by: Peter Korsgaard --- package/openssh/openssh.hash | 2 ++ package/openssh/openssh.mk | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 3685bc0dbf..ed628fa98b 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,2 +1,4 @@ # From http://www.openssh.com/txt/release-7.5 (base64 encoded) sha256 9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 openssh-7.5p1.tar.gz +sha256 310860606c4175cdfd095e724f624df27340c89a916f7a09300bcb7988d5cfbf afc3e31b637db9dae106d4fad78f7b481c8c24e3.patch +sha256 395aa1006967713b599555440e09f898781a5559e496223587401768ece10904 f4fcd8c788a4854d4ebae400cf55e3957f906835.patch diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ba48770afc..dea7b472f0 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -8,6 +8,12 @@ OPENSSH_VERSION = 7.5p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3c, BSD-2c, Public Domain OPENSSH_LICENSE_FILES = LICENCE +# Autoreconf needed due to the following patches modifying configure.ac: +# f4fcd8c788a4854d4ebae400cf55e3957f906835.patch +# afc3e31b637db9dae106d4fad78f7b481c8c24e3.patch +OPENSSH_AUTORECONF = YES +OPENSSH_PATCH = https://github.com/openssh/openssh-portable/commit/f4fcd8c788a4854d4ebae400cf55e3957f906835.patch \ + https://github.com/openssh/openssh-portable/commit/afc3e31b637db9dae106d4fad78f7b481c8c24e3.patch OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)" OPENSSH_CONF_OPTS = \ --sysconfdir=/etc/ssh \ From e02c52c47b7f51ec54d4ecb756af3640638905d8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 22 Jun 2017 00:07:41 +0200 Subject: [PATCH 3078/3392] spice: bump to version 0.12.5 Tunneling support is gone upstream, so drop the patch and add Config.in.legacy handling for the option. Celt051 is no longer a hard dependency, and opus is a new optional dependency, so adjust the dependencies to match. Python / pyparsing are not needed as the tarball contains the generated files (this should presumably have been host-python in the first place as these are used at build time), but we need a small workaround to convince configure that they really aren't needed. Alsa-lib is only needed for client support, and the configure script checks for X11/Xext/Xrender, so adjust the dependencies to match. A user manual is now generated by default if asciidoc is available, so explicitly disable that. Signed-off-by: Peter Korsgaard Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard (cherry picked from commit 6f2c02202308bdae91ce19965e664300e30b2224) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 ++++ ...fix-missing-monitor_latency-argument.patch | 28 ------------ package/spice/Config.in | 19 ++------ package/spice/spice.hash | 2 +- package/spice/spice.mk | 45 +++++++++++++------ 5 files changed, 44 insertions(+), 58 deletions(-) delete mode 100644 package/spice/0001-fix-missing-monitor_latency-argument.patch diff --git a/Config.in.legacy b/Config.in.legacy index 20445b8a17..51b0cfab49 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -143,8 +143,16 @@ comment "----------------------------------------------------" endif ############################################################################### + comment "Legacy options removed in 2017.02" +config BR2_PACKAGE_SPICE_TUNNEL + bool "spice network redirection removed" + select BR2_LEGACY + help + Spice network redirection, aka tunnelling has been removed + upstream. + config BR2_PACKAGE_PERL_DB_FILE bool "perl-db-file removed" select BR2_LEGACY diff --git a/package/spice/0001-fix-missing-monitor_latency-argument.patch b/package/spice/0001-fix-missing-monitor_latency-argument.patch deleted file mode 100644 index e14dd2ce37..0000000000 --- a/package/spice/0001-fix-missing-monitor_latency-argument.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0d3767853ca179ce04a9b312d7a30d33d1266a3b Mon Sep 17 00:00:00 2001 -From: Axel Lin -Date: Thu, 10 Oct 2013 12:36:40 +0800 -Subject: [PATCH] red_tunnel_worker: Fix build error due to missing monitor_latency argument - -Fix missing monitor_latency argument in red_channel_client_create call. - -Signed-off-by: Axel Lin ---- - server/red_tunnel_worker.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/server/red_tunnel_worker.c b/server/red_tunnel_worker.c -index 97dcafd..6781d73 100644 ---- a/server/red_tunnel_worker.c -+++ b/server/red_tunnel_worker.c -@@ -3417,7 +3417,7 @@ static void handle_tunnel_channel_link(RedChannel *channel, RedClient *client, - } - - tcc = (TunnelChannelClient*)red_channel_client_create(sizeof(TunnelChannelClient), -- channel, client, stream, -+ channel, client, stream, FALSE, - 0, NULL, 0, NULL); - if (!tcc) { - return; --- -1.8.1.2 - diff --git a/package/spice/Config.in b/package/spice/Config.in index bde3a92859..220f9994da 100644 --- a/package/spice/Config.in +++ b/package/spice/Config.in @@ -2,23 +2,15 @@ comment "spice server needs a toolchain w/ wchar, threads" depends on BR2_i386 || BR2_x86_64 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS -comment "spice server depends on python (for pyparsing)" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_PYTHON - config BR2_PACKAGE_SPICE bool "spice server" depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_PYTHON depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_CELT051 select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PIXMAN - select BR2_PACKAGE_PYTHON_PYPARSING select BR2_PACKAGE_SPICE_PROTOCOL help The Spice project aims to provide a complete open source @@ -43,6 +35,10 @@ config BR2_PACKAGE_SPICE_CLIENT depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_XLIB_LIBXFIXES select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXRENDER + select BR2_PACKAGE_ALSA_LIB comment "client needs a toolchain w/ threads, C++" depends on BR2_PACKAGE_XORG7 @@ -60,11 +56,4 @@ config BR2_PACKAGE_SPICE_GUI comment "gui needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -config BR2_PACKAGE_SPICE_TUNNEL - bool "Enable network redirection" - select BR2_PACKAGE_SLIRP - help - Say 'y' here to enable network redirection, aka tunnelling - through a SLIP/SLIRP session. - endif # BR2_PACKAGE_SPICE diff --git a/package/spice/spice.hash b/package/spice/spice.hash index c4d63198fb..0a943f0332 100644 --- a/package/spice/spice.hash +++ b/package/spice/spice.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 cf063e7df42e331a835529d2f613d8a01f8cb2963e8edaadf73a8d65c46fb387 spice-0.12.4.tar.bz2 +sha256 4209a20d8f67cb99a8a6ac499cfe79a18d4ca226360457954a223d6795c2f581 spice-0.12.5.tar.bz2 diff --git a/package/spice/spice.mk b/package/spice/spice.mk index 61a977225e..9403b8a18e 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -4,21 +4,18 @@ # ################################################################################ -SPICE_VERSION = 0.12.4 +SPICE_VERSION = 0.12.5 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases SPICE_LICENSE = LGPLv2.1+ SPICE_LICENSE_FILES = COPYING SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ - alsa-lib \ - celt051 \ jpeg \ libglib2 \ openssl \ pixman \ - python-pyparsing \ - spice-protocol \ + spice-protocol # We disable everything for now, because the dependency tree can become # quite deep if we try to enable some features, and I have not tested that. @@ -27,12 +24,31 @@ SPICE_CONF_OPTS = \ --disable-smartcard \ --disable-automated-tests \ --without-sasl \ + --disable-manual SPICE_DEPENDENCIES += host-pkgconf +ifeq ($(BR2_PACKAGE_CELT051),y) +SPICE_CONF_OPTS += --enable-celt051 +SPICE_DEPENDENCIES += celt051 +else +SPICE_CONF_OPTS += --disable-celt051 +endif + +# no enable/disable, detected using pkg-config +ifeq ($(BR2_PACKAGE_OPUS),y) +SPICE_DEPENDENCIES += opus +endif + ifeq ($(BR2_PACKAGE_SPICE_CLIENT),y) SPICE_CONF_OPTS += --enable-client -SPICE_DEPENDENCIES += xlib_libXfixes xlib_libXrandr +SPICE_DEPENDENCIES += \ + xlib_libXfixes \ + xlib_libXrandr \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXrender \ + alsa-lib else SPICE_CONF_OPTS += --disable-client endif @@ -44,15 +60,16 @@ else SPICE_CONF_OPTS += --disable-gui endif -ifeq ($(BR2_PACKAGE_SPICE_TUNNEL),y) -SPICE_CONF_OPTS += --enable-tunnel -SPICE_DEPENDENCIES += slirp -else -SPICE_CONF_OPTS += --disable-tunnel -endif +# spice uses a number of source files that are generated with python / pyparsing. +# The generated files are part of the tarball, so python / pyparsing isn't needed +# when building from the tarball, but the configure script gets confused and looks +# for the wrong file name to know if it needs to check for python / pyparsing, +# so convince it they aren't needed +define SPICE_NO_PYTHON_PYPARSING + touch $(@D)/client/generated_marshallers.cpp +endef -SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages +SPICE_PRE_CONFIGURE_HOOKS += SPICE_NO_PYTHON_PYPARSING # We need to tweak spice.pc because it /forgets/ (for static linking) that # it should link against libz and libjpeg. libz is pkg-config-aware, while From 09830fa832891f97e24339691ba792fc6af2ec73 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 22 Jun 2017 00:07:42 +0200 Subject: [PATCH 3079/3392] spice: security bump to version 0.12.6 Fixes the following security issues: CVE-2015-3247: Race condition in the worker_update_monitors_config function in SPICE 0.12.4 allows a remote authenticated guest user to cause a denial of service (heap-based memory corruption and QEMU-KVM crash) or possibly execute arbitrary code on the host via unspecified vectors. CVE-2015-5260: Heap-based buffer overflow in SPICE before 0.12.6 allows guest OS users to cause a denial of service (heap-based memory corruption and QEMU-KVM crash) or possibly execute arbitrary code on the host via QXL commands related to the surface_id parameter. CVE-2015-5261: Heap-based buffer overflow in SPICE before 0.12.6 allows guest OS users to read and write to arbitrary memory locations on the host via guest QXL commands related to surface creation. Client/gui support is gone upstream (moved to spice-gtk / virt-viewer), so add Config.in.legacy handling for them. Lz4 is a new optional dependency, so handle it. The spice protocol definition is no longer included and instead used from spice-protocol. The build system uses pkg-config --variable=codegendir to find the build time path of this, which doesn't take our STAGING_DIR prefix into consideration, so it needs some help. The installed protocol definition will likewise be newer than the generated files, so we need to workaround that to ensure they are not regenerated (which needs host python / pyparsing). Signed-off-by: Peter Korsgaard Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard (cherry picked from commit 622ff3d6ea63ca7c7aab7e5609cfb1e4190eff8a) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 16 ++++++++++++++++ package/spice/Config.in | 35 ----------------------------------- package/spice/spice.hash | 2 +- package/spice/spice.mk | 40 +++++++++++++++++++--------------------- 4 files changed, 36 insertions(+), 57 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 51b0cfab49..7decb91331 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,22 @@ endif comment "Legacy options removed in 2017.02" +config BR2_PACKAGE_SPICE_CLIENT + bool "spice client support removed" + select BR2_LEGACY + help + Spice client support has been removed upstream. The + functionality now lives in the spice-gtk widget and + virt-viewer. + +config BR2_PACKAGE_SPICE_GUI + bool "spice gui support removed" + select BR2_LEGACY + help + Spice gui support has been removed upstream. The + functionality now lives in the spice-gtk widget and + virt-viewer. + config BR2_PACKAGE_SPICE_TUNNEL bool "spice network redirection removed" select BR2_LEGACY diff --git a/package/spice/Config.in b/package/spice/Config.in index 220f9994da..2241b55b3d 100644 --- a/package/spice/Config.in +++ b/package/spice/Config.in @@ -22,38 +22,3 @@ config BR2_PACKAGE_SPICE This package implements the server-part of Spice. http://www.spice-space.org/ - -if BR2_PACKAGE_SPICE - -comment "client depends on X.org" - depends on !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_SPICE_CLIENT - bool "Enable client" - depends on BR2_PACKAGE_XORG7 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_ALSA_LIB - -comment "client needs a toolchain w/ threads, C++" - depends on BR2_PACKAGE_XORG7 - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_SPICE_GUI - bool "Enable GUI" - depends on BR2_PACKAGE_SPICE_CLIENT - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_CEGUI06 - help - Say 'y' here to enable the Graphical User Interface (GUI) - start dialog. - -comment "gui needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -endif # BR2_PACKAGE_SPICE diff --git a/package/spice/spice.hash b/package/spice/spice.hash index 0a943f0332..04bd516689 100644 --- a/package/spice/spice.hash +++ b/package/spice/spice.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 4209a20d8f67cb99a8a6ac499cfe79a18d4ca226360457954a223d6795c2f581 spice-0.12.5.tar.bz2 +sha256 f148ea30135bf80a4f465ce723a1cd6d4ccb34c098b6298a020b378ace8569b6 spice-0.12.6.tar.bz2 diff --git a/package/spice/spice.mk b/package/spice/spice.mk index 9403b8a18e..45f4030463 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPICE_VERSION = 0.12.5 +SPICE_VERSION = 0.12.6 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases SPICE_LICENSE = LGPLv2.1+ @@ -35,38 +35,36 @@ else SPICE_CONF_OPTS += --disable-celt051 endif +ifeq ($(BR2_PACKAGE_LZ4),y) +SPICE_CONF_OPTS += --enable-lz4 +SPICE_DEPENDENCIES += lz4 +else +SPICE_CONF_OPTS += --disable-lz4 +endif + # no enable/disable, detected using pkg-config ifeq ($(BR2_PACKAGE_OPUS),y) SPICE_DEPENDENCIES += opus endif -ifeq ($(BR2_PACKAGE_SPICE_CLIENT),y) -SPICE_CONF_OPTS += --enable-client -SPICE_DEPENDENCIES += \ - xlib_libXfixes \ - xlib_libXrandr \ - xlib_libX11 \ - xlib_libXext \ - xlib_libXrender \ - alsa-lib -else -SPICE_CONF_OPTS += --disable-client -endif - -ifeq ($(BR2_PACKAGE_SPICE_GUI),y) -SPICE_CONF_OPTS += --enable-gui -SPICE_DEPENDENCIES += cegui06 -else -SPICE_CONF_OPTS += --disable-gui -endif +# build system uses pkg-config --variable=codegendir spice-protocol which +# returns the runtime path rather than build time, so it needs some help +SPICE_MAKE_OPTS = CODE_GENERATOR_BASEDIR=$(STAGING_DIR)/usr/lib/spice-protocol +SPICE_INSTALL_STAGING_OPTS = $(SPICE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install +SPICE_INSTALL_TARGET_OPTS = $(SPICE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install # spice uses a number of source files that are generated with python / pyparsing. # The generated files are part of the tarball, so python / pyparsing isn't needed # when building from the tarball, but the configure script gets confused and looks # for the wrong file name to know if it needs to check for python / pyparsing, -# so convince it they aren't needed +# so convince it they aren't needed. +# It will also regenerate these files if the spice-protocol protocol definition +# is newer than the generated files (which it will be when spice-protocol +# installs it to staging), so ensure their timestamp is updated to skip this. define SPICE_NO_PYTHON_PYPARSING + mkdir -p $(@D)/client touch $(@D)/client/generated_marshallers.cpp + touch $(@D)/spice-common/common/generated_* endef SPICE_PRE_CONFIGURE_HOOKS += SPICE_NO_PYTHON_PYPARSING From 9d47edc29c2d0ec73fcd46f1787ee65c3d8da53e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 22 Jun 2017 00:07:43 +0200 Subject: [PATCH 3080/3392] spice: security bump to version 0.12.8 Fixes the following security issues: CVE-2016-0749: The smartcard interaction in SPICE allows remote attackers to cause a denial of service (QEMU-KVM process crash) or possibly execute arbitrary code via vectors related to connecting to a guest VM, which triggers a heap-based buffer overflow. CVE-2016-2150: SPICE allows local guest OS users to read from or write to arbitrary host memory locations via crafted primary surface parameters, a similar issue to CVE-2015-5261. The pyparsing check has been dropped from configure, and the spice protocol definition is again included, so the workarounds can be removed. Signed-off-by: Peter Korsgaard Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard (cherry picked from commit 75057fe76742188455a5218b47cdf4116d84c268) Signed-off-by: Peter Korsgaard --- package/spice/spice.hash | 2 +- package/spice/spice.mk | 24 +----------------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/package/spice/spice.hash b/package/spice/spice.hash index 04bd516689..c9b591f41d 100644 --- a/package/spice/spice.hash +++ b/package/spice/spice.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f148ea30135bf80a4f465ce723a1cd6d4ccb34c098b6298a020b378ace8569b6 spice-0.12.6.tar.bz2 +sha256 f901a5c5873d61acac84642f9eea5c4d6386fc3e525c2b68792322794e1c407d spice-0.12.8.tar.bz2 diff --git a/package/spice/spice.mk b/package/spice/spice.mk index 45f4030463..6ac209ed4d 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPICE_VERSION = 0.12.6 +SPICE_VERSION = 0.12.8 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases SPICE_LICENSE = LGPLv2.1+ @@ -47,28 +47,6 @@ ifeq ($(BR2_PACKAGE_OPUS),y) SPICE_DEPENDENCIES += opus endif -# build system uses pkg-config --variable=codegendir spice-protocol which -# returns the runtime path rather than build time, so it needs some help -SPICE_MAKE_OPTS = CODE_GENERATOR_BASEDIR=$(STAGING_DIR)/usr/lib/spice-protocol -SPICE_INSTALL_STAGING_OPTS = $(SPICE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -SPICE_INSTALL_TARGET_OPTS = $(SPICE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install - -# spice uses a number of source files that are generated with python / pyparsing. -# The generated files are part of the tarball, so python / pyparsing isn't needed -# when building from the tarball, but the configure script gets confused and looks -# for the wrong file name to know if it needs to check for python / pyparsing, -# so convince it they aren't needed. -# It will also regenerate these files if the spice-protocol protocol definition -# is newer than the generated files (which it will be when spice-protocol -# installs it to staging), so ensure their timestamp is updated to skip this. -define SPICE_NO_PYTHON_PYPARSING - mkdir -p $(@D)/client - touch $(@D)/client/generated_marshallers.cpp - touch $(@D)/spice-common/common/generated_* -endef - -SPICE_PRE_CONFIGURE_HOOKS += SPICE_NO_PYTHON_PYPARSING - # We need to tweak spice.pc because it /forgets/ (for static linking) that # it should link against libz and libjpeg. libz is pkg-config-aware, while # libjpeg isn't, hence the two-line tweak From 070fbefd4711fcd2b30695f1f67890134fbef4ee Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 22 Jun 2017 00:07:44 +0200 Subject: [PATCH 3081/3392] spice: add post-0.12.8 upstream security fixes Fixes the following security issues: CVE-2016-9577 Frediano Ziglio of Red Hat discovered a buffer overflow vulnerability in the main_channel_alloc_msg_rcv_buf function. An authenticated attacker can take advantage of this flaw to cause a denial of service (spice server crash), or possibly, execute arbitrary code. CVE-2016-9578 Frediano Ziglio of Red Hat discovered that spice does not properly validate incoming messages. An attacker able to connect to the spice server could send crafted messages which would cause the process to crash. Signed-off-by: Peter Korsgaard Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard (cherry picked from commit 087e70498ab25c76cd8542100361f79af7580eb7) Signed-off-by: Peter Korsgaard --- ...-DoS-attempts-during-protocol-handsh.patch | 60 +++++++++++++++++++ ...teger-overflows-in-capability-checks.patch | 43 +++++++++++++ ...vent-overflow-reading-messages-from-.patch | 33 ++++++++++ 3 files changed, 136 insertions(+) create mode 100644 package/spice/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch create mode 100644 package/spice/0002-Prevent-integer-overflows-in-capability-checks.patch create mode 100644 package/spice/0003-main-channel-Prevent-overflow-reading-messages-from-.patch diff --git a/package/spice/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch b/package/spice/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch new file mode 100644 index 0000000000..57a64d96b7 --- /dev/null +++ b/package/spice/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch @@ -0,0 +1,60 @@ +From 1c6517973095a67c8cb57f3550fc1298404ab556 Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Tue, 13 Dec 2016 14:39:48 +0000 +Subject: [PATCH] Prevent possible DoS attempts during protocol handshake + +The limit for link message is specified using a 32 bit unsigned integer. +This could cause possible DoS due to excessive memory allocations and +some possible crashes. +For instance a value >= 2^31 causes a spice_assert to be triggered in +async_read_handler (reds-stream.c) due to an integer overflow at this +line: + + int n = async->end - async->now; + +This could be easily triggered with a program like + + #!/usr/bin/env python + + import socket + import time + from struct import pack + + server = '127.0.0.1' + port = 5900 + + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect((server, port)) + data = pack('<4sIII', 'REDQ', 2, 2, 0xaaaaaaaa) + s.send(data) + + time.sleep(1) + +without requiring any authentication (the same can be done +with TLS). + +[Peter: fixes CVE-2016-9578] +Signed-off-by: Frediano Ziglio +Acked-by: Christophe Fergeau +Signed-off-by: Peter Korsgaard +--- + server/reds.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/server/reds.c b/server/reds.c +index f40b65c1..86a33d53 100644 +--- a/server/reds.c ++++ b/server/reds.c +@@ -2202,7 +2202,8 @@ static void reds_handle_read_header_done(void *opaque) + + reds->peer_minor_version = header->minor_version; + +- if (header->size < sizeof(SpiceLinkMess)) { ++ /* the check for 4096 is to avoid clients to cause arbitrary big memory allocations */ ++ if (header->size < sizeof(SpiceLinkMess) || header->size > 4096) { + reds_send_link_error(link, SPICE_LINK_ERR_INVALID_DATA); + spice_warning("bad size %u", header->size); + reds_link_free(link); +-- +2.11.0 + diff --git a/package/spice/0002-Prevent-integer-overflows-in-capability-checks.patch b/package/spice/0002-Prevent-integer-overflows-in-capability-checks.patch new file mode 100644 index 0000000000..5bf9b89d17 --- /dev/null +++ b/package/spice/0002-Prevent-integer-overflows-in-capability-checks.patch @@ -0,0 +1,43 @@ +From f66dc643635518e53dfbe5262f814a64eec54e4a Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Tue, 13 Dec 2016 14:40:10 +0000 +Subject: [PATCH] Prevent integer overflows in capability checks + +The limits for capabilities are specified using 32 bit unsigned integers. +This could cause possible integer overflows causing buffer overflows. +For instance the sum of num_common_caps and num_caps can be 0 avoiding +additional checks. +As the link message is now capped to 4096 and the capabilities are +contained in the link message limit the capabilities to 1024 +(capabilities are expressed in number of uint32_t items). + +[Peter: fixes CVE-2016-9578] +Signed-off-by: Frediano Ziglio +Acked-by: Christophe Fergeau +Signed-off-by: Peter Korsgaard +--- + server/reds.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/server/reds.c b/server/reds.c +index 86a33d53..91504544 100644 +--- a/server/reds.c ++++ b/server/reds.c +@@ -2110,6 +2110,14 @@ static void reds_handle_read_link_done(void *opaque) + link_mess->num_channel_caps = GUINT32_FROM_LE(link_mess->num_channel_caps); + link_mess->num_common_caps = GUINT32_FROM_LE(link_mess->num_common_caps); + ++ /* Prevent DoS. Currently we defined only 13 capabilities, ++ * I expect 1024 to be valid for quite a lot time */ ++ if (link_mess->num_channel_caps > 1024 || link_mess->num_common_caps > 1024) { ++ reds_send_link_error(link, SPICE_LINK_ERR_INVALID_DATA); ++ reds_link_free(link); ++ return; ++ } ++ + num_caps = link_mess->num_common_caps + link_mess->num_channel_caps; + caps = (uint32_t *)((uint8_t *)link_mess + link_mess->caps_offset); + +-- +2.11.0 + diff --git a/package/spice/0003-main-channel-Prevent-overflow-reading-messages-from-.patch b/package/spice/0003-main-channel-Prevent-overflow-reading-messages-from-.patch new file mode 100644 index 0000000000..f602d5f3b1 --- /dev/null +++ b/package/spice/0003-main-channel-Prevent-overflow-reading-messages-from-.patch @@ -0,0 +1,33 @@ +From 5f96b596353d73bdf4bb3cd2de61e48a7fd5b4c3 Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Tue, 29 Nov 2016 16:46:56 +0000 +Subject: [PATCH] main-channel: Prevent overflow reading messages from client + +Caller is supposed the function return a buffer able to store +size bytes. + +[Peter: fixes CVE-2016-9577] +Signed-off-by: Frediano Ziglio +Acked-by: Christophe Fergeau +Signed-off-by: Peter Korsgaard +--- + server/main_channel.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/server/main_channel.c b/server/main_channel.c +index 0ecc9df8..1fc39155 100644 +--- a/server/main_channel.c ++++ b/server/main_channel.c +@@ -1026,6 +1026,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc, + + if (type == SPICE_MSGC_MAIN_AGENT_DATA) { + return reds_get_agent_data_buffer(mcc, size); ++ } else if (size > sizeof(main_chan->recv_buf)) { ++ /* message too large, caller will log a message and close the connection */ ++ return NULL; + } else { + return main_chan->recv_buf; + } +-- +2.11.0 + From fdd420350ab77bb576476f5526d523cfc5d47816 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 22 Jun 2017 20:54:57 +0300 Subject: [PATCH 3082/3392] openvpn: security bump to version 2.4.3 Fixes: CVE-2017-7508 - Remotely-triggerable ASSERT() on malformed IPv6 packet CVE-2017-7520 - Pre-authentication remote crash/information disclosure for clients CVE-2017-7521 - Potential double-free in --x509-alt-username CVE-2017-7521 - Remote-triggerable memory leaks CVE-2017-7522 - Post-authentication remote DoS when using the --x509-track option Details at https://community.openvpn.net/openvpn/wiki/VulnerabilitiesFixedInOpenVPN243 Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 24f2eb1e157e2c0b08579939c293aa7c1d3d0c28) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 4 ++-- package/openvpn/openvpn.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index fe054e9618..1db3a31e1d 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 df5c4f384b7df6b08a2f6fa8a84b9fd382baf59c2cef1836f82e2a7f62f1bff9 openvpn-2.4.2.tar.xz +# Locally calculated after checking signature +sha256 15e15fc97f189b52aee7c90ec8355aa77469c773125110b4c2f089abecde36fb openvpn-2.4.3.tar.xz diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 34b0e4bef1..31b6e00ae3 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.4.2 +OPENVPN_VERSION = 2.4.3 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl From c4dffa19c156f16b9df6e071398a89b967f85854 Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Mon, 12 Jun 2017 15:35:54 +0200 Subject: [PATCH 3083/3392] support/scripts: allow /etc/shadow to be symlinked This commit fixes a problem where it was not possible to replace /etc/shadow with a symlink to a e.g. a user partition where the shadow file is placed. This is required, e.g. for systems where the rootfs is mounted read-only but users should still be able to be added. Thus, if within an filesystem overlay setup a user tries to replace /etc/shadow with a symlink to the real file on a user partition a buildroot build stops with an error message because sed is called on the symlink instead of following the symlink. This commit fixes this shortcoming. Signed-off-by: Jens Maus Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit 82f64203a8f017d50b754323194694374f92add5) Signed-off-by: Peter Korsgaard --- support/scripts/mkusers | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 2ac76f9863..5bbec3e10f 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -219,12 +219,12 @@ add_one_group() { fi # Remove any previous instance of this group, and re-add the new one - sed -i -e '/^'"${group}"':.*/d;' "${GROUP}" + sed -i --follow-symlinks -e '/^'"${group}"':.*/d;' "${GROUP}" printf "%s:x:%d:\n" "${group}" "${gid}" >>"${GROUP}" # Ditto for /etc/gshadow if it exists if [ -f "${GSHADOW}" ]; then - sed -i -e '/^'"${group}"':.*/d;' "${GSHADOW}" + sed -i --follow-symlinks -e '/^'"${group}"':.*/d;' "${GSHADOW}" printf "%s:*::\n" "${group}" >>"${GSHADOW}" fi } @@ -263,7 +263,8 @@ add_user_to_group() { for _f in "${GROUP}" "${GSHADOW}"; do [ -f "${_f}" ] || continue - sed -r -i -e 's/^('"${group}"':.*:)(([^:]+,)?)'"${username}"'(,[^:]+*)?$/\1\2\4/;' \ + sed -r -i --follow-symlinks \ + -e 's/^('"${group}"':.*:)(([^:]+,)?)'"${username}"'(,[^:]+*)?$/\1\2\4/;' \ -e 's/^('"${group}"':.*)$/\1,'"${username}"'/;' \ -e 's/,+/,/' \ -e 's/:,/:/' \ @@ -303,7 +304,7 @@ add_one_user() { # Remove any previous instance of this user for _f in "${PASSWD}" "${SHADOW}"; do - sed -r -i -e '/^'"${username}"':.*/d;' "${_f}" + sed -r -i --follow-symlinks -e '/^'"${username}"':.*/d;' "${_f}" done _gid="$( get_gid "${group}" )" From f7cf42743c42bf8738d513cf69c42fdef309c420 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 24 Jun 2017 16:39:52 -0300 Subject: [PATCH 3084/3392] linux-headers: bump 3.10.x and 4.{9, 11}.x series [Peter: drop 4.11.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 2ad8f6643d9cc0a5d39656e119237e31adaf2c69) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 0d67d9281f..40e8587c4d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -216,7 +216,7 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "3.2.89" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 - default "3.10.105" if BR2_KERNEL_HEADERS_3_10 + default "3.10.106" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 default "3.18.57" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 @@ -224,5 +224,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.1.41" if BR2_KERNEL_HEADERS_4_1 default "4.4.73" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.33" if BR2_KERNEL_HEADERS_4_9 + default "4.9.34" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 7619166e755c71fec9f48a212db9d4be51a920ea Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 26 Jun 2017 22:19:11 +0200 Subject: [PATCH 3085/3392] linux-headers: bump 3.18.x version to 3.18.58 Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 40e8587c4d..11100a8e3f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,7 +218,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.106" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "3.18.57" if BR2_KERNEL_HEADERS_3_18 + default "3.18.58" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.41" if BR2_KERNEL_HEADERS_4_1 From 5550b35c9f91a948db9d2a7e1d0219d744ab7555 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 27 May 2017 00:13:48 +0200 Subject: [PATCH 3086/3392] package/dhcp: dhcp server: select systemd tmpfile support when systemd is used tmpfile support is optional in systemd but the dhcp server install it's config file in $(TARGET_DIR)/usr/lib/tmpfiles.d directory when systemd is used as init system. So it seems that dhcp server require tmpfile support for systemd based system. Signed-off-by: Romain Naour Cc: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 51a24f8d71afef70ef42ab3e062277f2d602a278) Signed-off-by: Peter Korsgaard --- package/dhcp/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in index 4a3049584d..398b975459 100644 --- a/package/dhcp/Config.in +++ b/package/dhcp/Config.in @@ -12,6 +12,7 @@ if BR2_PACKAGE_DHCP config BR2_PACKAGE_DHCP_SERVER bool "dhcp server" + select BR2_PACKAGE_SYSTEMD_TMPFILES if BR2_PACKAGE_SYSTEMD help DHCP server from the ISC DHCP distribution. From 359c0c6e501b9bda81bc9531e42c35d8eb1ab178 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 26 Jun 2017 16:35:57 -0300 Subject: [PATCH 3087/3392] linux-headers: bump 4.4.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit 13e4c459140adf621f0ed3f29efbde718918b048) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 11100a8e3f..148e1f27f2 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.41" if BR2_KERNEL_HEADERS_4_1 - default "4.4.73" if BR2_KERNEL_HEADERS_4_4 + default "4.4.74" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 default "4.9.34" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 25368f9bcc845f0cf8c15b5c0c3f12cf45364d91 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 27 Jun 2017 20:58:48 +0200 Subject: [PATCH 3088/3392] nodejs: bump 6.x version to 6.11.0 6.11.0 is the latest release in the LTS series, fixing a number of issues: https://nodejs.org/en/blog/release/v6.11.0/ Building without openssl is broken in 6.11.0, so add an upstream patch to fix that. Signed-off-by: Peter Korsgaard --- ...01-gyp-force-link-command-to-use-CXX.patch | 0 ...t-build-when-ssl-support-is-disabled.patch | 0 ..._OPENSSL-directive-to-openssl_config.patch | 49 +++++++++++++++++++ package/nodejs/Config.in | 2 +- package/nodejs/nodejs.hash | 4 +- 5 files changed, 52 insertions(+), 3 deletions(-) rename package/nodejs/{6.10.3 => 6.11.0}/0001-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{6.10.3 => 6.11.0}/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch (100%) create mode 100644 package/nodejs/6.11.0/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch diff --git a/package/nodejs/6.10.3/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.11.0/0001-gyp-force-link-command-to-use-CXX.patch similarity index 100% rename from package/nodejs/6.10.3/0001-gyp-force-link-command-to-use-CXX.patch rename to package/nodejs/6.11.0/0001-gyp-force-link-command-to-use-CXX.patch diff --git a/package/nodejs/6.10.3/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.11.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch similarity index 100% rename from package/nodejs/6.10.3/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch rename to package/nodejs/6.11.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch diff --git a/package/nodejs/6.11.0/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch b/package/nodejs/6.11.0/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch new file mode 100644 index 0000000000..f07fdc2455 --- /dev/null +++ b/package/nodejs/6.11.0/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch @@ -0,0 +1,49 @@ +From e1d8899c28997613505d288d22bfb95470d606a1 Mon Sep 17 00:00:00 2001 +From: Daniel Bevenius +Date: Tue, 28 Feb 2017 20:04:12 +0100 +Subject: [PATCH] src: add HAVE_OPENSSL directive to openssl_config + +Currently when building with the following configuration options: +$ ./configure --without-ssl && make + +The following link error is reported: + +Undefined symbols for architecture x86_64: + "node::openssl_config", referenced from: + node::Init(int*, char const**, int*, char const***) in node.o +ld: symbol(s) not found for architecture x86_64 +clang: error: linker command failed with exit code 1 (use -v to see +invocation) + +Adding an HAVE_OPENSSL directive around this code allows the build to +pass. + +PR-URL: https://github.com/nodejs/node/pull/11618 +Reviewed-By: Anna Henningsen +Reviewed-By: James M Snell +Reviewed-By: Colin Ihrig +Reviewed-By: Ben Noordhuis +Reviewed-By: Sam Roberts +Signed-off-by: Peter Korsgaard +--- + src/node.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/node.cc b/src/node.cc +index 57415bba41..ec78339d89 100644 +--- a/src/node.cc ++++ b/src/node.cc +@@ -4233,8 +4233,10 @@ void Init(int* argc, + if (config_warning_file.empty()) + SafeGetenv("NODE_REDIRECT_WARNINGS", &config_warning_file); + ++#if HAVE_OPENSSL + if (openssl_config.empty()) + SafeGetenv("OPENSSL_CONF", &openssl_config); ++#endif + + // Parse a few arguments which are specific to Node. + int v8_argc; +-- +2.11.0 + diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 5fafa8f476..be20af56d6 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_PACKAGE_NODEJS_VERSION_STRING string - default "6.10.3" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS + default "6.11.0" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS default "0.10.48" config BR2_PACKAGE_NODEJS_NPM diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 8cc6927ab2..ac010ab6d6 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ # From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt sha256 365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e node-v0.10.48.tar.xz -# From upstream URL: http://nodejs.org/dist/v6.10.3/SHASUMS256.txt -sha256 82262a703e61164e09170a14d88b1726720651b0c7ee87a277654247b21b5388 node-v6.10.3.tar.xz +# From upstream URL: http://nodejs.org/dist/v6.11.0/SHASUMS256.txt +sha256 02ba35391edea2b294c736489af01954ce6e6c39d318f4423ae6617c69ef0a51 node-v6.11.0.tar.xz From 0156e0541c6fb2a657314d1034520e436cc9ba50 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 28 Jun 2017 17:17:56 +0200 Subject: [PATCH 3089/3392] package/rtl8821au: fix license file name Fixes #9976. Reported-by: Nick Wright Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard (cherry picked from commit 54778b7d7e84863c4bc3036e69f959ed52b7953b) Signed-off-by: Peter Korsgaard --- package/rtl8821au/rtl8821au.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/rtl8821au/rtl8821au.mk b/package/rtl8821au/rtl8821au.mk index 9ba43ef146..36454dc74c 100644 --- a/package/rtl8821au/rtl8821au.mk +++ b/package/rtl8821au/rtl8821au.mk @@ -7,7 +7,7 @@ RTL8821AU_VERSION = c33ddb05a77741d2a9c9b974ad0cf0fa26d17b6e RTL8821AU_SITE = $(call github,abperiasamy,rtl8812AU_8821AU_linux,$(RTL8821AU_VERSION)) RTL8821AU_LICENSE = GPLv2 -RTL8821AU_LICENSE_FILES = COPYING +RTL8821AU_LICENSE_FILES = LICENSE RTL8821AU_MODULE_MAKE_OPTS = \ CONFIG_RTL8812AU_8821AU=m \ From a632152084a9db7e87fd4fcf4af54d5c8c691de6 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 28 Jun 2017 21:44:31 +0300 Subject: [PATCH 3090/3392] systemd: add security fix Add a fix for CVE-2017-9445: In systemd through 233, certain sizes passed to dns_packet_new in systemd-resolved can cause it to allocate a buffer that's too small. A malicious DNS server can exploit this via a response with a specially crafted TCP payload to trick systemd-resolved into allocating a buffer that's too small, and subsequently write arbitrary data beyond the end of it. The other patch fixes an issue with the security fix. [Peter: use CVE description from MITRE] Cc: Maxime Hadjinlian Cc: Yann E. MORIN Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 6da327adb21d1cb0f1962b2cadae256ba217972a) Signed-off-by: Peter Korsgaard --- package/systemd/systemd.hash | 2 ++ package/systemd/systemd.mk | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 2b7820795e..4417fb3f9f 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,3 +1,5 @@ # sha256 locally computed sha256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 systemd-232.tar.gz sha256 eed8fef0045876e9efa0ba6725ed9ea93654bf24d67bb5aad467a341ad375883 a924f43f30f9c4acaf70618dd2a055f8b0f166be.patch +sha256 43c75bd161a8ef0de5db607aaceed77220f2ba4903cf44e7e9db544980420a5e db848813bae4d28c524b3b6a7dad135e426659ce.patch +sha256 451f7c09332479ebe4ac01612f5f034df4524e16b5bc5d1c8ddcda14e9f3cd69 88795538726a5bbfd9efc13d441cb05e1d7fc139.patch diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index ce2e9ffba4..99827b6f02 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -20,7 +20,9 @@ SYSTEMD_PROVIDES = udev SYSTEMD_AUTORECONF = YES SYSTEMD_PATCH = \ - https://github.com/systemd/systemd/commit/a924f43f30f9c4acaf70618dd2a055f8b0f166be.patch + https://github.com/systemd/systemd/commit/a924f43f30f9c4acaf70618dd2a055f8b0f166be.patch \ + https://github.com/systemd/systemd/commit/db848813bae4d28c524b3b6a7dad135e426659ce.patch \ + https://github.com/systemd/systemd/commit/88795538726a5bbfd9efc13d441cb05e1d7fc139.patch # Make sure that systemd will always be built after busybox so that we have # a consistent init setup between two builds From aacfdcfa76de863361179e8393c98163974148a7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 28 Jun 2017 12:44:20 +0200 Subject: [PATCH 3091/3392] mosquitto: add upstream security fix Fixes CVE-2017-9868: In Mosquitto through 1.4.12, mosquitto.db (aka the persistence file) is world readable, which allows local users to obtain sensitive MQTT topic information. Signed-off-by: Peter Korsgaard (cherry picked from commit e51d69a3b11ae971d2aa65d6d0a6f0bb7730e0ab) Signed-off-by: Peter Korsgaard --- package/mosquitto/mosquitto.hash | 1 + package/mosquitto/mosquitto.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 6c102ebaa5..82bf5c6da7 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,2 +1,3 @@ # Locally computed: sha512 75e6105498869ab13265df7a0bea6052c014d59d0c0efb61162d8257d34c0153fce32130e84c28e99fd494f374949aac5e01c19f7439c2eea575b52ef1179c3c mosquitto-1.4.12.tar.gz +sha256 06abd1206e548ac2378dd96f5434cb3e40ed77cecb6a9c37fbabab0b0f1360e5 mosquitto-1.4.x_cve-2017-9868.patch diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 985354938b..bc693d5264 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -9,6 +9,8 @@ MOSQUITTO_SITE = http://mosquitto.org/files/source MOSQUITTO_LICENSE = EPLv1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 MOSQUITTO_INSTALL_STAGING = YES +MOSQUITTO_PATCH = \ + https://mosquitto.org/files/cve/2017-9868/mosquitto-1.4.x_cve-2017-9868.patch MOSQUITTO_MAKE_OPTS = \ UNAME=Linux \ From 62949d4cedcb1d9c9ec840e3ba50e72fa332e9ca Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 27 Jun 2017 08:42:09 +0200 Subject: [PATCH 3092/3392] glibc: add upstream security patches fixing CVE-2017-1000366 (stack clash) glibc contains a vulnerability that allows specially crafted LD_LIBRARY_PATH values to manipulate the heap/stack, causing them to alias, potentially resulting in arbitrary code execution. Please note that additional hardening changes have been made to glibc to prevent manipulation of stack and heap memory but these issues are not directly exploitable, as such they have not been given a CVE. https://www.qualys.com/2017/06/19/stack-clash/stack-clash.txt Patches are identical to upstream, except that the ChangeLog modifications have been stripped. Signed-off-by: Peter Korsgaard (cherry picked from commit c87fdfb6059b16c04aea77030816fd120e26d267) Signed-off-by: Peter Korsgaard --- ...-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch | 35 +++ ...overly-long-LD_PRELOAD-path-elements.patch | 122 +++++++++++ ...t-overly-long-LD_AUDIT-path-elements.patch | 204 ++++++++++++++++++ ...-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch | 35 +++ ...overly-long-LD_PRELOAD-path-elements.patch | 122 +++++++++++ ...t-overly-long-LD_AUDIT-path-elements.patch | 204 ++++++++++++++++++ ...-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch | 35 +++ ...overly-long-LD_PRELOAD-path-elements.patch | 122 +++++++++++ ...t-overly-long-LD_AUDIT-path-elements.patch | 204 ++++++++++++++++++ ...-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch | 35 +++ ...overly-long-LD_PRELOAD-path-elements.patch | 122 +++++++++++ ...t-overly-long-LD_AUDIT-path-elements.patch | 204 ++++++++++++++++++ 12 files changed, 1444 insertions(+) create mode 100644 package/glibc/2.22/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch create mode 100644 package/glibc/2.22/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch create mode 100644 package/glibc/2.22/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch create mode 100644 package/glibc/2.23/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch create mode 100644 package/glibc/2.23/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch create mode 100644 package/glibc/2.23/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch create mode 100644 package/glibc/2.24/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch create mode 100644 package/glibc/2.24/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch create mode 100644 package/glibc/2.24/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch create mode 100644 package/glibc/2.25/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch create mode 100644 package/glibc/2.25/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch create mode 100644 package/glibc/2.25/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch diff --git a/package/glibc/2.22/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch b/package/glibc/2.22/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch new file mode 100644 index 0000000000..d701294deb --- /dev/null +++ b/package/glibc/2.22/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch @@ -0,0 +1,35 @@ +From f6110a8fee2ca36f8e2d2abecf3cba9fa7b8ea7d Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 17:09:55 +0200 +Subject: [PATCH] CVE-2017-1000366: Ignore LD_LIBRARY_PATH for AT_SECURE=1 + programs [BZ #21624] + +LD_LIBRARY_PATH can only be used to reorder system search paths, which +is not useful functionality. + +This makes an exploitable unbounded alloca in _dl_init_paths unreachable +for AT_SECURE=1 programs. + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 3 ++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 2446a87680..2269dbec81 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2422,7 +2422,8 @@ process_envvars (enum mode *modep) + + case 12: + /* The library search path. */ +- if (memcmp (envline, "LIBRARY_PATH", 12) == 0) ++ if (!__libc_enable_secure ++ && memcmp (envline, "LIBRARY_PATH", 12) == 0) + { + library_path = &envline[13]; + break; +-- +2.11.0 + diff --git a/package/glibc/2.22/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch b/package/glibc/2.22/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch new file mode 100644 index 0000000000..df410931da --- /dev/null +++ b/package/glibc/2.22/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch @@ -0,0 +1,122 @@ +From 6d0ba622891bed9d8394eef1935add53003b12e8 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 22:31:04 +0200 +Subject: [PATCH] ld.so: Reject overly long LD_PRELOAD path elements + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 72 insertions(+), 16 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 2269dbec81..86ae20c83f 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -99,6 +99,35 @@ uintptr_t __pointer_chk_guard_local + strong_alias (__pointer_chk_guard_local, __pointer_chk_guard) + #endif + ++/* Length limits for names and paths, to protect the dynamic linker, ++ particularly when __libc_enable_secure is active. */ ++#ifdef NAME_MAX ++# define SECURE_NAME_LIMIT NAME_MAX ++#else ++# define SECURE_NAME_LIMIT 255 ++#endif ++#ifdef PATH_MAX ++# define SECURE_PATH_LIMIT PATH_MAX ++#else ++# define SECURE_PATH_LIMIT 1024 ++#endif ++ ++/* Check that AT_SECURE=0, or that the passed name does not contain ++ directories and is not overly long. Reject empty names ++ unconditionally. */ ++static bool ++dso_name_valid_for_suid (const char *p) ++{ ++ if (__glibc_unlikely (__libc_enable_secure)) ++ { ++ /* Ignore pathnames with directories for AT_SECURE=1 ++ programs, and also skip overlong names. */ ++ size_t len = strlen (p); ++ if (len >= SECURE_NAME_LIMIT || memchr (p, '/', len) != NULL) ++ return false; ++ } ++ return *p != '\0'; ++} + + /* List of auditing DSOs. */ + static struct audit_list +@@ -718,6 +747,42 @@ static const char *preloadlist attribute_relro; + /* Nonzero if information about versions has to be printed. */ + static int version_info attribute_relro; + ++/* The LD_PRELOAD environment variable gives list of libraries ++ separated by white space or colons that are loaded before the ++ executable's dependencies and prepended to the global scope list. ++ (If the binary is running setuid all elements containing a '/' are ++ ignored since it is insecure.) Return the number of preloads ++ performed. */ ++unsigned int ++handle_ld_preload (const char *preloadlist, struct link_map *main_map) ++{ ++ unsigned int npreloads = 0; ++ const char *p = preloadlist; ++ char fname[SECURE_PATH_LIMIT]; ++ ++ while (*p != '\0') ++ { ++ /* Split preload list at space/colon. */ ++ size_t len = strcspn (p, " :"); ++ if (len > 0 && len < sizeof (fname)) ++ { ++ memcpy (fname, p, len); ++ fname[len] = '\0'; ++ } ++ else ++ fname[0] = '\0'; ++ ++ /* Skip over the substring and the following delimiter. */ ++ p += len; ++ if (*p != '\0') ++ ++p; ++ ++ if (dso_name_valid_for_suid (fname)) ++ npreloads += do_preload (fname, main_map, "LD_PRELOAD"); ++ } ++ return npreloads; ++} ++ + static void + dl_main (const ElfW(Phdr) *phdr, + ElfW(Word) phnum, +@@ -1464,23 +1529,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + + if (__glibc_unlikely (preloadlist != NULL)) + { +- /* The LD_PRELOAD environment variable gives list of libraries +- separated by white space or colons that are loaded before the +- executable's dependencies and prepended to the global scope +- list. If the binary is running setuid all elements +- containing a '/' are ignored since it is insecure. */ +- char *list = strdupa (preloadlist); +- char *p; +- + HP_TIMING_NOW (start); +- +- /* Prevent optimizing strsep. Speed is not important here. */ +- while ((p = (strsep) (&list, " :")) != NULL) +- if (p[0] != '\0' +- && (__builtin_expect (! __libc_enable_secure, 1) +- || strchr (p, '/') == NULL)) +- npreloads += do_preload (p, main_map, "LD_PRELOAD"); +- ++ npreloads += handle_ld_preload (preloadlist, main_map); + HP_TIMING_NOW (stop); + HP_TIMING_DIFF (diff, start, stop); + HP_TIMING_ACCUM_NT (load_time, diff); +-- +2.11.0 + diff --git a/package/glibc/2.22/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch b/package/glibc/2.22/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch new file mode 100644 index 0000000000..25e937bd10 --- /dev/null +++ b/package/glibc/2.22/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch @@ -0,0 +1,204 @@ +From 81b82fb966ffbd94353f793ad17116c6088dedd9 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 22:32:12 +0200 +Subject: [PATCH] ld.so: Reject overly long LD_AUDIT path elements + +Also only process the last LD_AUDIT entry. + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 105 insertions(+), 15 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 86ae20c83f..65647fb1c8 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -129,13 +129,91 @@ dso_name_valid_for_suid (const char *p) + return *p != '\0'; + } + +-/* List of auditing DSOs. */ ++/* LD_AUDIT variable contents. Must be processed before the ++ audit_list below. */ ++const char *audit_list_string; ++ ++/* Cyclic list of auditing DSOs. audit_list->next is the first ++ element. */ + static struct audit_list + { + const char *name; + struct audit_list *next; + } *audit_list; + ++/* Iterator for audit_list_string followed by audit_list. */ ++struct audit_list_iter ++{ ++ /* Tail of audit_list_string still needing processing, or NULL. */ ++ const char *audit_list_tail; ++ ++ /* The list element returned in the previous iteration. NULL before ++ the first element. */ ++ struct audit_list *previous; ++ ++ /* Scratch buffer for returning a name which is part of ++ audit_list_string. */ ++ char fname[SECURE_NAME_LIMIT]; ++}; ++ ++/* Initialize an audit list iterator. */ ++static void ++audit_list_iter_init (struct audit_list_iter *iter) ++{ ++ iter->audit_list_tail = audit_list_string; ++ iter->previous = NULL; ++} ++ ++/* Iterate through both audit_list_string and audit_list. */ ++static const char * ++audit_list_iter_next (struct audit_list_iter *iter) ++{ ++ if (iter->audit_list_tail != NULL) ++ { ++ /* First iterate over audit_list_string. */ ++ while (*iter->audit_list_tail != '\0') ++ { ++ /* Split audit list at colon. */ ++ size_t len = strcspn (iter->audit_list_tail, ":"); ++ if (len > 0 && len < sizeof (iter->fname)) ++ { ++ memcpy (iter->fname, iter->audit_list_tail, len); ++ iter->fname[len] = '\0'; ++ } ++ else ++ /* Do not return this name to the caller. */ ++ iter->fname[0] = '\0'; ++ ++ /* Skip over the substring and the following delimiter. */ ++ iter->audit_list_tail += len; ++ if (*iter->audit_list_tail == ':') ++ ++iter->audit_list_tail; ++ ++ /* If the name is valid, return it. */ ++ if (dso_name_valid_for_suid (iter->fname)) ++ return iter->fname; ++ /* Otherwise, wrap around and try the next name. */ ++ } ++ /* Fall through to the procesing of audit_list. */ ++ } ++ ++ if (iter->previous == NULL) ++ { ++ if (audit_list == NULL) ++ /* No pre-parsed audit list. */ ++ return NULL; ++ /* Start of audit list. The first list element is at ++ audit_list->next (cyclic list). */ ++ iter->previous = audit_list->next; ++ return iter->previous->name; ++ } ++ if (iter->previous == audit_list) ++ /* Cyclic list wrap-around. */ ++ return NULL; ++ iter->previous = iter->previous->next; ++ return iter->previous->name; ++} ++ + #ifndef HAVE_INLINED_SYSCALLS + /* Set nonzero during loading and initialization of executable and + libraries, cleared before the executable's entry point runs. This +@@ -1305,11 +1383,13 @@ of this helper program; chances are you did not intend to run this program.\n\ + GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid (); + + /* If we have auditing DSOs to load, do it now. */ +- if (__glibc_unlikely (audit_list != NULL)) ++ bool need_security_init = true; ++ if (__glibc_unlikely (audit_list != NULL) ++ || __glibc_unlikely (audit_list_string != NULL)) + { +- /* Iterate over all entries in the list. The order is important. */ + struct audit_ifaces *last_audit = NULL; +- struct audit_list *al = audit_list->next; ++ struct audit_list_iter al_iter; ++ audit_list_iter_init (&al_iter); + + /* Since we start using the auditing DSOs right away we need to + initialize the data structures now. */ +@@ -1320,9 +1400,14 @@ of this helper program; chances are you did not intend to run this program.\n\ + use different values (especially the pointer guard) and will + fail later on. */ + security_init (); ++ need_security_init = false; + +- do ++ while (true) + { ++ const char *name = audit_list_iter_next (&al_iter); ++ if (name == NULL) ++ break; ++ + int tls_idx = GL(dl_tls_max_dtv_idx); + + /* Now it is time to determine the layout of the static TLS +@@ -1331,7 +1416,7 @@ of this helper program; chances are you did not intend to run this program.\n\ + no DF_STATIC_TLS bit is set. The reason is that we know + glibc will use the static model. */ + struct dlmopen_args dlmargs; +- dlmargs.fname = al->name; ++ dlmargs.fname = name; + dlmargs.map = NULL; + + const char *objname; +@@ -1344,7 +1429,7 @@ of this helper program; chances are you did not intend to run this program.\n\ + not_loaded: + _dl_error_printf ("\ + ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +- al->name, err_str); ++ name, err_str); + if (malloced) + free ((char *) err_str); + } +@@ -1448,10 +1533,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + goto not_loaded; + } + } +- +- al = al->next; + } +- while (al != audit_list->next); + + /* If we have any auditing modules, announce that we already + have two objects loaded. */ +@@ -1715,7 +1797,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + if (tcbp == NULL) + tcbp = init_tls (); + +- if (__glibc_likely (audit_list == NULL)) ++ if (__glibc_likely (need_security_init)) + /* Initialize security features. But only if we have not done it + earlier. */ + security_init (); +@@ -2346,9 +2428,7 @@ process_dl_audit (char *str) + char *p; + + while ((p = (strsep) (&str, ":")) != NULL) +- if (p[0] != '\0' +- && (__builtin_expect (! __libc_enable_secure, 1) +- || strchr (p, '/') == NULL)) ++ if (dso_name_valid_for_suid (p)) + { + /* This is using the local malloc, not the system malloc. The + memory can never be freed. */ +@@ -2412,7 +2492,7 @@ process_envvars (enum mode *modep) + break; + } + if (memcmp (envline, "AUDIT", 5) == 0) +- process_dl_audit (&envline[6]); ++ audit_list_string = &envline[6]; + break; + + case 7: +-- +2.11.0 + diff --git a/package/glibc/2.23/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch b/package/glibc/2.23/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch new file mode 100644 index 0000000000..d701294deb --- /dev/null +++ b/package/glibc/2.23/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch @@ -0,0 +1,35 @@ +From f6110a8fee2ca36f8e2d2abecf3cba9fa7b8ea7d Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 17:09:55 +0200 +Subject: [PATCH] CVE-2017-1000366: Ignore LD_LIBRARY_PATH for AT_SECURE=1 + programs [BZ #21624] + +LD_LIBRARY_PATH can only be used to reorder system search paths, which +is not useful functionality. + +This makes an exploitable unbounded alloca in _dl_init_paths unreachable +for AT_SECURE=1 programs. + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 3 ++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 2446a87680..2269dbec81 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2422,7 +2422,8 @@ process_envvars (enum mode *modep) + + case 12: + /* The library search path. */ +- if (memcmp (envline, "LIBRARY_PATH", 12) == 0) ++ if (!__libc_enable_secure ++ && memcmp (envline, "LIBRARY_PATH", 12) == 0) + { + library_path = &envline[13]; + break; +-- +2.11.0 + diff --git a/package/glibc/2.23/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch b/package/glibc/2.23/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch new file mode 100644 index 0000000000..df410931da --- /dev/null +++ b/package/glibc/2.23/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch @@ -0,0 +1,122 @@ +From 6d0ba622891bed9d8394eef1935add53003b12e8 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 22:31:04 +0200 +Subject: [PATCH] ld.so: Reject overly long LD_PRELOAD path elements + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 72 insertions(+), 16 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 2269dbec81..86ae20c83f 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -99,6 +99,35 @@ uintptr_t __pointer_chk_guard_local + strong_alias (__pointer_chk_guard_local, __pointer_chk_guard) + #endif + ++/* Length limits for names and paths, to protect the dynamic linker, ++ particularly when __libc_enable_secure is active. */ ++#ifdef NAME_MAX ++# define SECURE_NAME_LIMIT NAME_MAX ++#else ++# define SECURE_NAME_LIMIT 255 ++#endif ++#ifdef PATH_MAX ++# define SECURE_PATH_LIMIT PATH_MAX ++#else ++# define SECURE_PATH_LIMIT 1024 ++#endif ++ ++/* Check that AT_SECURE=0, or that the passed name does not contain ++ directories and is not overly long. Reject empty names ++ unconditionally. */ ++static bool ++dso_name_valid_for_suid (const char *p) ++{ ++ if (__glibc_unlikely (__libc_enable_secure)) ++ { ++ /* Ignore pathnames with directories for AT_SECURE=1 ++ programs, and also skip overlong names. */ ++ size_t len = strlen (p); ++ if (len >= SECURE_NAME_LIMIT || memchr (p, '/', len) != NULL) ++ return false; ++ } ++ return *p != '\0'; ++} + + /* List of auditing DSOs. */ + static struct audit_list +@@ -718,6 +747,42 @@ static const char *preloadlist attribute_relro; + /* Nonzero if information about versions has to be printed. */ + static int version_info attribute_relro; + ++/* The LD_PRELOAD environment variable gives list of libraries ++ separated by white space or colons that are loaded before the ++ executable's dependencies and prepended to the global scope list. ++ (If the binary is running setuid all elements containing a '/' are ++ ignored since it is insecure.) Return the number of preloads ++ performed. */ ++unsigned int ++handle_ld_preload (const char *preloadlist, struct link_map *main_map) ++{ ++ unsigned int npreloads = 0; ++ const char *p = preloadlist; ++ char fname[SECURE_PATH_LIMIT]; ++ ++ while (*p != '\0') ++ { ++ /* Split preload list at space/colon. */ ++ size_t len = strcspn (p, " :"); ++ if (len > 0 && len < sizeof (fname)) ++ { ++ memcpy (fname, p, len); ++ fname[len] = '\0'; ++ } ++ else ++ fname[0] = '\0'; ++ ++ /* Skip over the substring and the following delimiter. */ ++ p += len; ++ if (*p != '\0') ++ ++p; ++ ++ if (dso_name_valid_for_suid (fname)) ++ npreloads += do_preload (fname, main_map, "LD_PRELOAD"); ++ } ++ return npreloads; ++} ++ + static void + dl_main (const ElfW(Phdr) *phdr, + ElfW(Word) phnum, +@@ -1464,23 +1529,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + + if (__glibc_unlikely (preloadlist != NULL)) + { +- /* The LD_PRELOAD environment variable gives list of libraries +- separated by white space or colons that are loaded before the +- executable's dependencies and prepended to the global scope +- list. If the binary is running setuid all elements +- containing a '/' are ignored since it is insecure. */ +- char *list = strdupa (preloadlist); +- char *p; +- + HP_TIMING_NOW (start); +- +- /* Prevent optimizing strsep. Speed is not important here. */ +- while ((p = (strsep) (&list, " :")) != NULL) +- if (p[0] != '\0' +- && (__builtin_expect (! __libc_enable_secure, 1) +- || strchr (p, '/') == NULL)) +- npreloads += do_preload (p, main_map, "LD_PRELOAD"); +- ++ npreloads += handle_ld_preload (preloadlist, main_map); + HP_TIMING_NOW (stop); + HP_TIMING_DIFF (diff, start, stop); + HP_TIMING_ACCUM_NT (load_time, diff); +-- +2.11.0 + diff --git a/package/glibc/2.23/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch b/package/glibc/2.23/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch new file mode 100644 index 0000000000..25e937bd10 --- /dev/null +++ b/package/glibc/2.23/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch @@ -0,0 +1,204 @@ +From 81b82fb966ffbd94353f793ad17116c6088dedd9 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 22:32:12 +0200 +Subject: [PATCH] ld.so: Reject overly long LD_AUDIT path elements + +Also only process the last LD_AUDIT entry. + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 105 insertions(+), 15 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 86ae20c83f..65647fb1c8 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -129,13 +129,91 @@ dso_name_valid_for_suid (const char *p) + return *p != '\0'; + } + +-/* List of auditing DSOs. */ ++/* LD_AUDIT variable contents. Must be processed before the ++ audit_list below. */ ++const char *audit_list_string; ++ ++/* Cyclic list of auditing DSOs. audit_list->next is the first ++ element. */ + static struct audit_list + { + const char *name; + struct audit_list *next; + } *audit_list; + ++/* Iterator for audit_list_string followed by audit_list. */ ++struct audit_list_iter ++{ ++ /* Tail of audit_list_string still needing processing, or NULL. */ ++ const char *audit_list_tail; ++ ++ /* The list element returned in the previous iteration. NULL before ++ the first element. */ ++ struct audit_list *previous; ++ ++ /* Scratch buffer for returning a name which is part of ++ audit_list_string. */ ++ char fname[SECURE_NAME_LIMIT]; ++}; ++ ++/* Initialize an audit list iterator. */ ++static void ++audit_list_iter_init (struct audit_list_iter *iter) ++{ ++ iter->audit_list_tail = audit_list_string; ++ iter->previous = NULL; ++} ++ ++/* Iterate through both audit_list_string and audit_list. */ ++static const char * ++audit_list_iter_next (struct audit_list_iter *iter) ++{ ++ if (iter->audit_list_tail != NULL) ++ { ++ /* First iterate over audit_list_string. */ ++ while (*iter->audit_list_tail != '\0') ++ { ++ /* Split audit list at colon. */ ++ size_t len = strcspn (iter->audit_list_tail, ":"); ++ if (len > 0 && len < sizeof (iter->fname)) ++ { ++ memcpy (iter->fname, iter->audit_list_tail, len); ++ iter->fname[len] = '\0'; ++ } ++ else ++ /* Do not return this name to the caller. */ ++ iter->fname[0] = '\0'; ++ ++ /* Skip over the substring and the following delimiter. */ ++ iter->audit_list_tail += len; ++ if (*iter->audit_list_tail == ':') ++ ++iter->audit_list_tail; ++ ++ /* If the name is valid, return it. */ ++ if (dso_name_valid_for_suid (iter->fname)) ++ return iter->fname; ++ /* Otherwise, wrap around and try the next name. */ ++ } ++ /* Fall through to the procesing of audit_list. */ ++ } ++ ++ if (iter->previous == NULL) ++ { ++ if (audit_list == NULL) ++ /* No pre-parsed audit list. */ ++ return NULL; ++ /* Start of audit list. The first list element is at ++ audit_list->next (cyclic list). */ ++ iter->previous = audit_list->next; ++ return iter->previous->name; ++ } ++ if (iter->previous == audit_list) ++ /* Cyclic list wrap-around. */ ++ return NULL; ++ iter->previous = iter->previous->next; ++ return iter->previous->name; ++} ++ + #ifndef HAVE_INLINED_SYSCALLS + /* Set nonzero during loading and initialization of executable and + libraries, cleared before the executable's entry point runs. This +@@ -1305,11 +1383,13 @@ of this helper program; chances are you did not intend to run this program.\n\ + GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid (); + + /* If we have auditing DSOs to load, do it now. */ +- if (__glibc_unlikely (audit_list != NULL)) ++ bool need_security_init = true; ++ if (__glibc_unlikely (audit_list != NULL) ++ || __glibc_unlikely (audit_list_string != NULL)) + { +- /* Iterate over all entries in the list. The order is important. */ + struct audit_ifaces *last_audit = NULL; +- struct audit_list *al = audit_list->next; ++ struct audit_list_iter al_iter; ++ audit_list_iter_init (&al_iter); + + /* Since we start using the auditing DSOs right away we need to + initialize the data structures now. */ +@@ -1320,9 +1400,14 @@ of this helper program; chances are you did not intend to run this program.\n\ + use different values (especially the pointer guard) and will + fail later on. */ + security_init (); ++ need_security_init = false; + +- do ++ while (true) + { ++ const char *name = audit_list_iter_next (&al_iter); ++ if (name == NULL) ++ break; ++ + int tls_idx = GL(dl_tls_max_dtv_idx); + + /* Now it is time to determine the layout of the static TLS +@@ -1331,7 +1416,7 @@ of this helper program; chances are you did not intend to run this program.\n\ + no DF_STATIC_TLS bit is set. The reason is that we know + glibc will use the static model. */ + struct dlmopen_args dlmargs; +- dlmargs.fname = al->name; ++ dlmargs.fname = name; + dlmargs.map = NULL; + + const char *objname; +@@ -1344,7 +1429,7 @@ of this helper program; chances are you did not intend to run this program.\n\ + not_loaded: + _dl_error_printf ("\ + ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +- al->name, err_str); ++ name, err_str); + if (malloced) + free ((char *) err_str); + } +@@ -1448,10 +1533,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + goto not_loaded; + } + } +- +- al = al->next; + } +- while (al != audit_list->next); + + /* If we have any auditing modules, announce that we already + have two objects loaded. */ +@@ -1715,7 +1797,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + if (tcbp == NULL) + tcbp = init_tls (); + +- if (__glibc_likely (audit_list == NULL)) ++ if (__glibc_likely (need_security_init)) + /* Initialize security features. But only if we have not done it + earlier. */ + security_init (); +@@ -2346,9 +2428,7 @@ process_dl_audit (char *str) + char *p; + + while ((p = (strsep) (&str, ":")) != NULL) +- if (p[0] != '\0' +- && (__builtin_expect (! __libc_enable_secure, 1) +- || strchr (p, '/') == NULL)) ++ if (dso_name_valid_for_suid (p)) + { + /* This is using the local malloc, not the system malloc. The + memory can never be freed. */ +@@ -2412,7 +2492,7 @@ process_envvars (enum mode *modep) + break; + } + if (memcmp (envline, "AUDIT", 5) == 0) +- process_dl_audit (&envline[6]); ++ audit_list_string = &envline[6]; + break; + + case 7: +-- +2.11.0 + diff --git a/package/glibc/2.24/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch b/package/glibc/2.24/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch new file mode 100644 index 0000000000..d701294deb --- /dev/null +++ b/package/glibc/2.24/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch @@ -0,0 +1,35 @@ +From f6110a8fee2ca36f8e2d2abecf3cba9fa7b8ea7d Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 17:09:55 +0200 +Subject: [PATCH] CVE-2017-1000366: Ignore LD_LIBRARY_PATH for AT_SECURE=1 + programs [BZ #21624] + +LD_LIBRARY_PATH can only be used to reorder system search paths, which +is not useful functionality. + +This makes an exploitable unbounded alloca in _dl_init_paths unreachable +for AT_SECURE=1 programs. + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 3 ++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 2446a87680..2269dbec81 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2422,7 +2422,8 @@ process_envvars (enum mode *modep) + + case 12: + /* The library search path. */ +- if (memcmp (envline, "LIBRARY_PATH", 12) == 0) ++ if (!__libc_enable_secure ++ && memcmp (envline, "LIBRARY_PATH", 12) == 0) + { + library_path = &envline[13]; + break; +-- +2.11.0 + diff --git a/package/glibc/2.24/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch b/package/glibc/2.24/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch new file mode 100644 index 0000000000..df410931da --- /dev/null +++ b/package/glibc/2.24/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch @@ -0,0 +1,122 @@ +From 6d0ba622891bed9d8394eef1935add53003b12e8 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 22:31:04 +0200 +Subject: [PATCH] ld.so: Reject overly long LD_PRELOAD path elements + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 72 insertions(+), 16 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 2269dbec81..86ae20c83f 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -99,6 +99,35 @@ uintptr_t __pointer_chk_guard_local + strong_alias (__pointer_chk_guard_local, __pointer_chk_guard) + #endif + ++/* Length limits for names and paths, to protect the dynamic linker, ++ particularly when __libc_enable_secure is active. */ ++#ifdef NAME_MAX ++# define SECURE_NAME_LIMIT NAME_MAX ++#else ++# define SECURE_NAME_LIMIT 255 ++#endif ++#ifdef PATH_MAX ++# define SECURE_PATH_LIMIT PATH_MAX ++#else ++# define SECURE_PATH_LIMIT 1024 ++#endif ++ ++/* Check that AT_SECURE=0, or that the passed name does not contain ++ directories and is not overly long. Reject empty names ++ unconditionally. */ ++static bool ++dso_name_valid_for_suid (const char *p) ++{ ++ if (__glibc_unlikely (__libc_enable_secure)) ++ { ++ /* Ignore pathnames with directories for AT_SECURE=1 ++ programs, and also skip overlong names. */ ++ size_t len = strlen (p); ++ if (len >= SECURE_NAME_LIMIT || memchr (p, '/', len) != NULL) ++ return false; ++ } ++ return *p != '\0'; ++} + + /* List of auditing DSOs. */ + static struct audit_list +@@ -718,6 +747,42 @@ static const char *preloadlist attribute_relro; + /* Nonzero if information about versions has to be printed. */ + static int version_info attribute_relro; + ++/* The LD_PRELOAD environment variable gives list of libraries ++ separated by white space or colons that are loaded before the ++ executable's dependencies and prepended to the global scope list. ++ (If the binary is running setuid all elements containing a '/' are ++ ignored since it is insecure.) Return the number of preloads ++ performed. */ ++unsigned int ++handle_ld_preload (const char *preloadlist, struct link_map *main_map) ++{ ++ unsigned int npreloads = 0; ++ const char *p = preloadlist; ++ char fname[SECURE_PATH_LIMIT]; ++ ++ while (*p != '\0') ++ { ++ /* Split preload list at space/colon. */ ++ size_t len = strcspn (p, " :"); ++ if (len > 0 && len < sizeof (fname)) ++ { ++ memcpy (fname, p, len); ++ fname[len] = '\0'; ++ } ++ else ++ fname[0] = '\0'; ++ ++ /* Skip over the substring and the following delimiter. */ ++ p += len; ++ if (*p != '\0') ++ ++p; ++ ++ if (dso_name_valid_for_suid (fname)) ++ npreloads += do_preload (fname, main_map, "LD_PRELOAD"); ++ } ++ return npreloads; ++} ++ + static void + dl_main (const ElfW(Phdr) *phdr, + ElfW(Word) phnum, +@@ -1464,23 +1529,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + + if (__glibc_unlikely (preloadlist != NULL)) + { +- /* The LD_PRELOAD environment variable gives list of libraries +- separated by white space or colons that are loaded before the +- executable's dependencies and prepended to the global scope +- list. If the binary is running setuid all elements +- containing a '/' are ignored since it is insecure. */ +- char *list = strdupa (preloadlist); +- char *p; +- + HP_TIMING_NOW (start); +- +- /* Prevent optimizing strsep. Speed is not important here. */ +- while ((p = (strsep) (&list, " :")) != NULL) +- if (p[0] != '\0' +- && (__builtin_expect (! __libc_enable_secure, 1) +- || strchr (p, '/') == NULL)) +- npreloads += do_preload (p, main_map, "LD_PRELOAD"); +- ++ npreloads += handle_ld_preload (preloadlist, main_map); + HP_TIMING_NOW (stop); + HP_TIMING_DIFF (diff, start, stop); + HP_TIMING_ACCUM_NT (load_time, diff); +-- +2.11.0 + diff --git a/package/glibc/2.24/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch b/package/glibc/2.24/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch new file mode 100644 index 0000000000..25e937bd10 --- /dev/null +++ b/package/glibc/2.24/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch @@ -0,0 +1,204 @@ +From 81b82fb966ffbd94353f793ad17116c6088dedd9 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 22:32:12 +0200 +Subject: [PATCH] ld.so: Reject overly long LD_AUDIT path elements + +Also only process the last LD_AUDIT entry. + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 105 insertions(+), 15 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 86ae20c83f..65647fb1c8 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -129,13 +129,91 @@ dso_name_valid_for_suid (const char *p) + return *p != '\0'; + } + +-/* List of auditing DSOs. */ ++/* LD_AUDIT variable contents. Must be processed before the ++ audit_list below. */ ++const char *audit_list_string; ++ ++/* Cyclic list of auditing DSOs. audit_list->next is the first ++ element. */ + static struct audit_list + { + const char *name; + struct audit_list *next; + } *audit_list; + ++/* Iterator for audit_list_string followed by audit_list. */ ++struct audit_list_iter ++{ ++ /* Tail of audit_list_string still needing processing, or NULL. */ ++ const char *audit_list_tail; ++ ++ /* The list element returned in the previous iteration. NULL before ++ the first element. */ ++ struct audit_list *previous; ++ ++ /* Scratch buffer for returning a name which is part of ++ audit_list_string. */ ++ char fname[SECURE_NAME_LIMIT]; ++}; ++ ++/* Initialize an audit list iterator. */ ++static void ++audit_list_iter_init (struct audit_list_iter *iter) ++{ ++ iter->audit_list_tail = audit_list_string; ++ iter->previous = NULL; ++} ++ ++/* Iterate through both audit_list_string and audit_list. */ ++static const char * ++audit_list_iter_next (struct audit_list_iter *iter) ++{ ++ if (iter->audit_list_tail != NULL) ++ { ++ /* First iterate over audit_list_string. */ ++ while (*iter->audit_list_tail != '\0') ++ { ++ /* Split audit list at colon. */ ++ size_t len = strcspn (iter->audit_list_tail, ":"); ++ if (len > 0 && len < sizeof (iter->fname)) ++ { ++ memcpy (iter->fname, iter->audit_list_tail, len); ++ iter->fname[len] = '\0'; ++ } ++ else ++ /* Do not return this name to the caller. */ ++ iter->fname[0] = '\0'; ++ ++ /* Skip over the substring and the following delimiter. */ ++ iter->audit_list_tail += len; ++ if (*iter->audit_list_tail == ':') ++ ++iter->audit_list_tail; ++ ++ /* If the name is valid, return it. */ ++ if (dso_name_valid_for_suid (iter->fname)) ++ return iter->fname; ++ /* Otherwise, wrap around and try the next name. */ ++ } ++ /* Fall through to the procesing of audit_list. */ ++ } ++ ++ if (iter->previous == NULL) ++ { ++ if (audit_list == NULL) ++ /* No pre-parsed audit list. */ ++ return NULL; ++ /* Start of audit list. The first list element is at ++ audit_list->next (cyclic list). */ ++ iter->previous = audit_list->next; ++ return iter->previous->name; ++ } ++ if (iter->previous == audit_list) ++ /* Cyclic list wrap-around. */ ++ return NULL; ++ iter->previous = iter->previous->next; ++ return iter->previous->name; ++} ++ + #ifndef HAVE_INLINED_SYSCALLS + /* Set nonzero during loading and initialization of executable and + libraries, cleared before the executable's entry point runs. This +@@ -1305,11 +1383,13 @@ of this helper program; chances are you did not intend to run this program.\n\ + GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid (); + + /* If we have auditing DSOs to load, do it now. */ +- if (__glibc_unlikely (audit_list != NULL)) ++ bool need_security_init = true; ++ if (__glibc_unlikely (audit_list != NULL) ++ || __glibc_unlikely (audit_list_string != NULL)) + { +- /* Iterate over all entries in the list. The order is important. */ + struct audit_ifaces *last_audit = NULL; +- struct audit_list *al = audit_list->next; ++ struct audit_list_iter al_iter; ++ audit_list_iter_init (&al_iter); + + /* Since we start using the auditing DSOs right away we need to + initialize the data structures now. */ +@@ -1320,9 +1400,14 @@ of this helper program; chances are you did not intend to run this program.\n\ + use different values (especially the pointer guard) and will + fail later on. */ + security_init (); ++ need_security_init = false; + +- do ++ while (true) + { ++ const char *name = audit_list_iter_next (&al_iter); ++ if (name == NULL) ++ break; ++ + int tls_idx = GL(dl_tls_max_dtv_idx); + + /* Now it is time to determine the layout of the static TLS +@@ -1331,7 +1416,7 @@ of this helper program; chances are you did not intend to run this program.\n\ + no DF_STATIC_TLS bit is set. The reason is that we know + glibc will use the static model. */ + struct dlmopen_args dlmargs; +- dlmargs.fname = al->name; ++ dlmargs.fname = name; + dlmargs.map = NULL; + + const char *objname; +@@ -1344,7 +1429,7 @@ of this helper program; chances are you did not intend to run this program.\n\ + not_loaded: + _dl_error_printf ("\ + ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +- al->name, err_str); ++ name, err_str); + if (malloced) + free ((char *) err_str); + } +@@ -1448,10 +1533,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + goto not_loaded; + } + } +- +- al = al->next; + } +- while (al != audit_list->next); + + /* If we have any auditing modules, announce that we already + have two objects loaded. */ +@@ -1715,7 +1797,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + if (tcbp == NULL) + tcbp = init_tls (); + +- if (__glibc_likely (audit_list == NULL)) ++ if (__glibc_likely (need_security_init)) + /* Initialize security features. But only if we have not done it + earlier. */ + security_init (); +@@ -2346,9 +2428,7 @@ process_dl_audit (char *str) + char *p; + + while ((p = (strsep) (&str, ":")) != NULL) +- if (p[0] != '\0' +- && (__builtin_expect (! __libc_enable_secure, 1) +- || strchr (p, '/') == NULL)) ++ if (dso_name_valid_for_suid (p)) + { + /* This is using the local malloc, not the system malloc. The + memory can never be freed. */ +@@ -2412,7 +2492,7 @@ process_envvars (enum mode *modep) + break; + } + if (memcmp (envline, "AUDIT", 5) == 0) +- process_dl_audit (&envline[6]); ++ audit_list_string = &envline[6]; + break; + + case 7: +-- +2.11.0 + diff --git a/package/glibc/2.25/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch b/package/glibc/2.25/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch new file mode 100644 index 0000000000..d701294deb --- /dev/null +++ b/package/glibc/2.25/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch @@ -0,0 +1,35 @@ +From f6110a8fee2ca36f8e2d2abecf3cba9fa7b8ea7d Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 17:09:55 +0200 +Subject: [PATCH] CVE-2017-1000366: Ignore LD_LIBRARY_PATH for AT_SECURE=1 + programs [BZ #21624] + +LD_LIBRARY_PATH can only be used to reorder system search paths, which +is not useful functionality. + +This makes an exploitable unbounded alloca in _dl_init_paths unreachable +for AT_SECURE=1 programs. + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 3 ++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 2446a87680..2269dbec81 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2422,7 +2422,8 @@ process_envvars (enum mode *modep) + + case 12: + /* The library search path. */ +- if (memcmp (envline, "LIBRARY_PATH", 12) == 0) ++ if (!__libc_enable_secure ++ && memcmp (envline, "LIBRARY_PATH", 12) == 0) + { + library_path = &envline[13]; + break; +-- +2.11.0 + diff --git a/package/glibc/2.25/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch b/package/glibc/2.25/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch new file mode 100644 index 0000000000..df410931da --- /dev/null +++ b/package/glibc/2.25/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch @@ -0,0 +1,122 @@ +From 6d0ba622891bed9d8394eef1935add53003b12e8 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 22:31:04 +0200 +Subject: [PATCH] ld.so: Reject overly long LD_PRELOAD path elements + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 72 insertions(+), 16 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 2269dbec81..86ae20c83f 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -99,6 +99,35 @@ uintptr_t __pointer_chk_guard_local + strong_alias (__pointer_chk_guard_local, __pointer_chk_guard) + #endif + ++/* Length limits for names and paths, to protect the dynamic linker, ++ particularly when __libc_enable_secure is active. */ ++#ifdef NAME_MAX ++# define SECURE_NAME_LIMIT NAME_MAX ++#else ++# define SECURE_NAME_LIMIT 255 ++#endif ++#ifdef PATH_MAX ++# define SECURE_PATH_LIMIT PATH_MAX ++#else ++# define SECURE_PATH_LIMIT 1024 ++#endif ++ ++/* Check that AT_SECURE=0, or that the passed name does not contain ++ directories and is not overly long. Reject empty names ++ unconditionally. */ ++static bool ++dso_name_valid_for_suid (const char *p) ++{ ++ if (__glibc_unlikely (__libc_enable_secure)) ++ { ++ /* Ignore pathnames with directories for AT_SECURE=1 ++ programs, and also skip overlong names. */ ++ size_t len = strlen (p); ++ if (len >= SECURE_NAME_LIMIT || memchr (p, '/', len) != NULL) ++ return false; ++ } ++ return *p != '\0'; ++} + + /* List of auditing DSOs. */ + static struct audit_list +@@ -718,6 +747,42 @@ static const char *preloadlist attribute_relro; + /* Nonzero if information about versions has to be printed. */ + static int version_info attribute_relro; + ++/* The LD_PRELOAD environment variable gives list of libraries ++ separated by white space or colons that are loaded before the ++ executable's dependencies and prepended to the global scope list. ++ (If the binary is running setuid all elements containing a '/' are ++ ignored since it is insecure.) Return the number of preloads ++ performed. */ ++unsigned int ++handle_ld_preload (const char *preloadlist, struct link_map *main_map) ++{ ++ unsigned int npreloads = 0; ++ const char *p = preloadlist; ++ char fname[SECURE_PATH_LIMIT]; ++ ++ while (*p != '\0') ++ { ++ /* Split preload list at space/colon. */ ++ size_t len = strcspn (p, " :"); ++ if (len > 0 && len < sizeof (fname)) ++ { ++ memcpy (fname, p, len); ++ fname[len] = '\0'; ++ } ++ else ++ fname[0] = '\0'; ++ ++ /* Skip over the substring and the following delimiter. */ ++ p += len; ++ if (*p != '\0') ++ ++p; ++ ++ if (dso_name_valid_for_suid (fname)) ++ npreloads += do_preload (fname, main_map, "LD_PRELOAD"); ++ } ++ return npreloads; ++} ++ + static void + dl_main (const ElfW(Phdr) *phdr, + ElfW(Word) phnum, +@@ -1464,23 +1529,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + + if (__glibc_unlikely (preloadlist != NULL)) + { +- /* The LD_PRELOAD environment variable gives list of libraries +- separated by white space or colons that are loaded before the +- executable's dependencies and prepended to the global scope +- list. If the binary is running setuid all elements +- containing a '/' are ignored since it is insecure. */ +- char *list = strdupa (preloadlist); +- char *p; +- + HP_TIMING_NOW (start); +- +- /* Prevent optimizing strsep. Speed is not important here. */ +- while ((p = (strsep) (&list, " :")) != NULL) +- if (p[0] != '\0' +- && (__builtin_expect (! __libc_enable_secure, 1) +- || strchr (p, '/') == NULL)) +- npreloads += do_preload (p, main_map, "LD_PRELOAD"); +- ++ npreloads += handle_ld_preload (preloadlist, main_map); + HP_TIMING_NOW (stop); + HP_TIMING_DIFF (diff, start, stop); + HP_TIMING_ACCUM_NT (load_time, diff); +-- +2.11.0 + diff --git a/package/glibc/2.25/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch b/package/glibc/2.25/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch new file mode 100644 index 0000000000..25e937bd10 --- /dev/null +++ b/package/glibc/2.25/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch @@ -0,0 +1,204 @@ +From 81b82fb966ffbd94353f793ad17116c6088dedd9 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 19 Jun 2017 22:32:12 +0200 +Subject: [PATCH] ld.so: Reject overly long LD_AUDIT path elements + +Also only process the last LD_AUDIT entry. + +[Peter: Drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 105 insertions(+), 15 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 86ae20c83f..65647fb1c8 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -129,13 +129,91 @@ dso_name_valid_for_suid (const char *p) + return *p != '\0'; + } + +-/* List of auditing DSOs. */ ++/* LD_AUDIT variable contents. Must be processed before the ++ audit_list below. */ ++const char *audit_list_string; ++ ++/* Cyclic list of auditing DSOs. audit_list->next is the first ++ element. */ + static struct audit_list + { + const char *name; + struct audit_list *next; + } *audit_list; + ++/* Iterator for audit_list_string followed by audit_list. */ ++struct audit_list_iter ++{ ++ /* Tail of audit_list_string still needing processing, or NULL. */ ++ const char *audit_list_tail; ++ ++ /* The list element returned in the previous iteration. NULL before ++ the first element. */ ++ struct audit_list *previous; ++ ++ /* Scratch buffer for returning a name which is part of ++ audit_list_string. */ ++ char fname[SECURE_NAME_LIMIT]; ++}; ++ ++/* Initialize an audit list iterator. */ ++static void ++audit_list_iter_init (struct audit_list_iter *iter) ++{ ++ iter->audit_list_tail = audit_list_string; ++ iter->previous = NULL; ++} ++ ++/* Iterate through both audit_list_string and audit_list. */ ++static const char * ++audit_list_iter_next (struct audit_list_iter *iter) ++{ ++ if (iter->audit_list_tail != NULL) ++ { ++ /* First iterate over audit_list_string. */ ++ while (*iter->audit_list_tail != '\0') ++ { ++ /* Split audit list at colon. */ ++ size_t len = strcspn (iter->audit_list_tail, ":"); ++ if (len > 0 && len < sizeof (iter->fname)) ++ { ++ memcpy (iter->fname, iter->audit_list_tail, len); ++ iter->fname[len] = '\0'; ++ } ++ else ++ /* Do not return this name to the caller. */ ++ iter->fname[0] = '\0'; ++ ++ /* Skip over the substring and the following delimiter. */ ++ iter->audit_list_tail += len; ++ if (*iter->audit_list_tail == ':') ++ ++iter->audit_list_tail; ++ ++ /* If the name is valid, return it. */ ++ if (dso_name_valid_for_suid (iter->fname)) ++ return iter->fname; ++ /* Otherwise, wrap around and try the next name. */ ++ } ++ /* Fall through to the procesing of audit_list. */ ++ } ++ ++ if (iter->previous == NULL) ++ { ++ if (audit_list == NULL) ++ /* No pre-parsed audit list. */ ++ return NULL; ++ /* Start of audit list. The first list element is at ++ audit_list->next (cyclic list). */ ++ iter->previous = audit_list->next; ++ return iter->previous->name; ++ } ++ if (iter->previous == audit_list) ++ /* Cyclic list wrap-around. */ ++ return NULL; ++ iter->previous = iter->previous->next; ++ return iter->previous->name; ++} ++ + #ifndef HAVE_INLINED_SYSCALLS + /* Set nonzero during loading and initialization of executable and + libraries, cleared before the executable's entry point runs. This +@@ -1305,11 +1383,13 @@ of this helper program; chances are you did not intend to run this program.\n\ + GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid (); + + /* If we have auditing DSOs to load, do it now. */ +- if (__glibc_unlikely (audit_list != NULL)) ++ bool need_security_init = true; ++ if (__glibc_unlikely (audit_list != NULL) ++ || __glibc_unlikely (audit_list_string != NULL)) + { +- /* Iterate over all entries in the list. The order is important. */ + struct audit_ifaces *last_audit = NULL; +- struct audit_list *al = audit_list->next; ++ struct audit_list_iter al_iter; ++ audit_list_iter_init (&al_iter); + + /* Since we start using the auditing DSOs right away we need to + initialize the data structures now. */ +@@ -1320,9 +1400,14 @@ of this helper program; chances are you did not intend to run this program.\n\ + use different values (especially the pointer guard) and will + fail later on. */ + security_init (); ++ need_security_init = false; + +- do ++ while (true) + { ++ const char *name = audit_list_iter_next (&al_iter); ++ if (name == NULL) ++ break; ++ + int tls_idx = GL(dl_tls_max_dtv_idx); + + /* Now it is time to determine the layout of the static TLS +@@ -1331,7 +1416,7 @@ of this helper program; chances are you did not intend to run this program.\n\ + no DF_STATIC_TLS bit is set. The reason is that we know + glibc will use the static model. */ + struct dlmopen_args dlmargs; +- dlmargs.fname = al->name; ++ dlmargs.fname = name; + dlmargs.map = NULL; + + const char *objname; +@@ -1344,7 +1429,7 @@ of this helper program; chances are you did not intend to run this program.\n\ + not_loaded: + _dl_error_printf ("\ + ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +- al->name, err_str); ++ name, err_str); + if (malloced) + free ((char *) err_str); + } +@@ -1448,10 +1533,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + goto not_loaded; + } + } +- +- al = al->next; + } +- while (al != audit_list->next); + + /* If we have any auditing modules, announce that we already + have two objects loaded. */ +@@ -1715,7 +1797,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + if (tcbp == NULL) + tcbp = init_tls (); + +- if (__glibc_likely (audit_list == NULL)) ++ if (__glibc_likely (need_security_init)) + /* Initialize security features. But only if we have not done it + earlier. */ + security_init (); +@@ -2346,9 +2428,7 @@ process_dl_audit (char *str) + char *p; + + while ((p = (strsep) (&str, ":")) != NULL) +- if (p[0] != '\0' +- && (__builtin_expect (! __libc_enable_secure, 1) +- || strchr (p, '/') == NULL)) ++ if (dso_name_valid_for_suid (p)) + { + /* This is using the local malloc, not the system malloc. The + memory can never be freed. */ +@@ -2412,7 +2492,7 @@ process_envvars (enum mode *modep) + break; + } + if (memcmp (envline, "AUDIT", 5) == 0) +- process_dl_audit (&envline[6]); ++ audit_list_string = &envline[6]; + break; + + case 7: +-- +2.11.0 + From b5659e721c3c5b645673c789246d1b607f1e4b9a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 30 Jun 2017 18:04:54 +0300 Subject: [PATCH 3093/3392] libgcrypt: security bump to version 1.7.8 >From the NEWS file: - Mitigate a flush+reload side-channel attack on RSA secret keys dubbed "Sliding right into disaster". For details see . [CVE-2017-7526] Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 10ce9c6f8d3567c2e423907d3c5b008a97c9cdfa) Signed-off-by: Peter Korsgaard --- package/libgcrypt/libgcrypt.hash | 9 +++++---- package/libgcrypt/libgcrypt.mk | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 5a833d59e6..8ac9f0a92b 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,4 +1,5 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q2/000406.html -sha1 ea4ae1a4dba51f15095319419d7b42a0bf160384 libgcrypt-1.7.7.tar.bz2 -# Locally calculated -sha256 b9b85eba0793ea3e6e66b896eb031fa05e1a4517277cc9ab10816b359254cd9a libgcrypt-1.7.7.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q2/000408.html +sha1 65a4a495aa858483e66868199eaa8238572ca6cd libgcrypt-1.7.8.tar.bz2 +# Locally calculated after checking signature +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.8.tar.bz2.sig +sha256 948276ea47e6ba0244f36a17b51dcdd52cfd1e664b0a1ac3bc82134fb6cec199 libgcrypt-1.7.8.tar.bz2 diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index c92ac77941..c18456eaaf 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.7.7 +LIBGCRYPT_VERSION = 1.7.8 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPLv2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB From 80efa3f1fec11c02d5a631fa46a28307815703cc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 1 Jul 2017 10:14:14 +0200 Subject: [PATCH 3094/3392] linux-headers: bump 4.1.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit e79c574a9e17cd742fc4020545de9e33d8fdef38) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 148e1f27f2..62f40b8569 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -221,7 +221,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.18.58" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.41" if BR2_KERNEL_HEADERS_4_1 + default "4.1.42" if BR2_KERNEL_HEADERS_4_1 default "4.4.74" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 default "4.9.34" if BR2_KERNEL_HEADERS_4_9 From 170d26ae9c295e097e779ada329fbd249153884d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 29 Jun 2017 09:38:06 -0300 Subject: [PATCH 3095/3392] linux-headers: bump 4.{4, 9, 11}.x series [Peter: drop 4.11.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 463e68d0581408caa9199a092c9fe8c000d9ed55) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 62f40b8569..f4ebb723be 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.42" if BR2_KERNEL_HEADERS_4_1 - default "4.4.74" if BR2_KERNEL_HEADERS_4_4 + default "4.4.75" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.34" if BR2_KERNEL_HEADERS_4_9 + default "4.9.33" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 825e5da72e5f73be9d312dc639dbf040b1b2473d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 2 Jul 2017 17:37:09 +0200 Subject: [PATCH 3096/3392] linux-headers: bump 3.18.x version to 3.18.59 Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f4ebb723be..97e8067567 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,7 +218,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.106" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "3.18.58" if BR2_KERNEL_HEADERS_3_18 + default "3.18.59" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.42" if BR2_KERNEL_HEADERS_4_1 From dc5af298046683ebc1cbd4502b9ecc23431093cf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 1 Jul 2017 09:42:05 +0200 Subject: [PATCH 3097/3392] core: always pass full path to strip command In some cases, passing STRIP=true is not sufficient to disable striping altogether, as some (incorrectly generated?) configure scripts will ignore a ${STRIP} that is not a full path. This is the case, for example, for nmap, which ends up using the host strip command when we pass STRIP=true: checking for arm-buildroot-linux-gnueabihf-strip... no checking for strip... /usr/bin/strip configure: WARNING: using cross tools not prefixed with host triplet [--SNIP--] /usr/bin/install -c -c -m 755 nping /home/ymorin/dev/buildroot/O/target/usr/bin/nping /usr/bin/strip -x /home/ymorin/dev/buildroot/O/target/usr/bin/nping /usr/bin/strip: Unable to recognise the format of the input file `/home/ymorin/dev/buildroot/O/target/usr/bin/nping' We fix that by forcing a full path to the strip sommand when it is disabled: STRIP=/bin/true Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni (cherry picked from commit d5dcc76d9e5f9d22e881517ccc805dfd54499a74) Signed-off-by: Peter Korsgaard --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 4a3eb26963..c1dc714331 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -207,7 +207,7 @@ TARGET_STRIP = $(TARGET_CROSS)strip STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note endif ifeq ($(BR2_STRIP_none),y) -TARGET_STRIP = true +TARGET_STRIP = /bin/true STRIPCMD = $(TARGET_STRIP) endif INSTALL := $(shell which install || type -p install) From 9fe48189c2c3fa0128647a31bf80e52b2eb51f64 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Tue, 27 Jun 2017 09:53:08 +0200 Subject: [PATCH 3098/3392] qt5multimedia: conditionally add pulseaudio & libglib2 to dependencies Qt5Multimedia includes support for pulseaudio if it detects libpulse and libpulse-mainloop-glib in the system at build-time. We need to depend on pulseaudio and libglib2 if it is selected. Signed-off-by: Bartosz Golaszewski Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit ac8044fc32bcca612a6105c9f0ca9aef11ebc061) Signed-off-by: Peter Korsgaard --- package/qt5/qt5multimedia/qt5multimedia.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index fccdd5d64b..c1a27cb566 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -31,6 +31,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) QT5MULTIMEDIA_DEPENDENCIES += qt5declarative endif +ifeq ($(BR2_PACKAGE_LIBGLIB2)$(BR2_PACKAGE_PULSEAUDIO),yy) +QT5MULTIMEDIA_DEPENDENCIES += libglib2 pulseaudio +endif + define QT5MULTIMEDIA_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef From f1450e9084b3c43f82497ae8254c7dca2fecc049 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Tue, 27 Jun 2017 09:53:09 +0200 Subject: [PATCH 3099/3392] qt5multimedia: conditionally add alsa-lib to dependencies Qt5Multimedia builds the alsa plugin if it detects libasound in the system. Add alsa-lib to dependencies if BR2_PACKAGE_ALSA_LIB is selected. Signed-off-by: Bartosz Golaszewski Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 8d7dd837e5e2fcc7b785472e7215ffa74b546d9c) Signed-off-by: Peter Korsgaard --- package/qt5/qt5multimedia/qt5multimedia.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index c1a27cb566..4ce98d2207 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -35,6 +35,10 @@ ifeq ($(BR2_PACKAGE_LIBGLIB2)$(BR2_PACKAGE_PULSEAUDIO),yy) QT5MULTIMEDIA_DEPENDENCIES += libglib2 pulseaudio endif +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) +QT5MULTIMEDIA_DEPENDENCIES += alsa-lib +endif + define QT5MULTIMEDIA_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef From 5cbce09b8046696fc3f47ccc36f27ff45cd08953 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 27 Jun 2017 20:57:15 +0300 Subject: [PATCH 3100/3392] toolchain-external: skip ld-musl symlink on static build Static build with external musl toolchain leaves a dangling symlink to libc.so. Don't create that symlink on static build. Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 7cfd40f2d90b7bbea1d6309145542f16ead58986) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 653ec87a45..23b941a887 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -475,7 +475,7 @@ endef # With the musl C library, the libc.so library directly plays the role # of the dynamic library loader. We just need to create a symbolic # link to libc.so with the appropriate name. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL):$(BR2_STATIC_LIBS),y:) ifeq ($(BR2_i386),y) MUSL_ARCH = i386 else ifeq ($(BR2_ARM_EABIHF),y) From 6826e2ee8a2bc09104185c777a4ff57bc6a78872 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jul 2017 00:30:42 +0200 Subject: [PATCH 3101/3392] libnl: don't download patch from Github Patches downloaded from Github are not stable, so bring them in the tree. Signed-off-by: Peter Korsgaard --- ...or-integer-overflow-in-nlmsg_reserve.patch | 38 +++++++++++++++++++ package/libnl/libnl.hash | 1 - package/libnl/libnl.mk | 2 - 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 package/libnl/0001-lib-check-for-integer-overflow-in-nlmsg_reserve.patch diff --git a/package/libnl/0001-lib-check-for-integer-overflow-in-nlmsg_reserve.patch b/package/libnl/0001-lib-check-for-integer-overflow-in-nlmsg_reserve.patch new file mode 100644 index 0000000000..c1a070ca17 --- /dev/null +++ b/package/libnl/0001-lib-check-for-integer-overflow-in-nlmsg_reserve.patch @@ -0,0 +1,38 @@ +From 3e18948f17148e6a3c4255bdeaaf01ef6081ceeb Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Mon, 6 Feb 2017 22:23:52 +0100 +Subject: [PATCH] lib: check for integer-overflow in nlmsg_reserve() + +In general, libnl functions are not robust against calling with +invalid arguments. Thus, never call libnl functions with invalid +arguments. In case of nlmsg_reserve() this means never provide +a @len argument that causes overflow. + +Still, add an additional safeguard to avoid exploiting such bugs. + +Assume that @pad is a trusted, small integer. +Assume that n->nm_size is a valid number of allocated bytes (and thus +much smaller then SIZE_T_MAX). +Assume, that @len may be set to an untrusted value. Then the patch +avoids an integer overflow resulting in reserving too few bytes. + +[Upstream commit: https://github.com/thom311/libnl/commit/3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch] +Signed-off-by: Peter Korsgaard +--- + lib/msg.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/msg.c b/lib/msg.c +index 9af3f3a0..3e27d4e0 100644 +--- a/lib/msg.c ++++ b/lib/msg.c +@@ -411,6 +411,9 @@ void *nlmsg_reserve(struct nl_msg *n, size_t len, int pad) + size_t nlmsg_len = n->nm_nlh->nlmsg_len; + size_t tlen; + ++ if (len > n->nm_size) ++ return NULL; ++ + tlen = pad ? ((len + (pad - 1)) & ~(pad - 1)) : len; + + if ((tlen + nlmsg_len) > n->nm_size) diff --git a/package/libnl/libnl.hash b/package/libnl/libnl.hash index eafba4a390..2f1a3cb1b3 100644 --- a/package/libnl/libnl.hash +++ b/package/libnl/libnl.hash @@ -1,3 +1,2 @@ # From https://github.com/thom311/libnl/releases/download/libnl3_2_27/libnl-3.2.27.tar.gz.sha256sum sha256 4bbbf92b3c78a90f423cf96260bf419a28b75db8cced47051217a56795f58ec6 libnl-3.2.27.tar.gz -sha256 b7bb929194eefc56c786a7e1ae5176b54713f9013ccec63760f232742ae80361 3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index af28382dda..85c0db86f6 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -11,8 +11,6 @@ LIBNL_LICENSE_FILES = COPYING LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison host-flex -LIBNL_PATCH = https://github.com/thom311/libnl/commit/3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch - ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y) LIBNL_CONF_OPTS += --enable-cli else From 053496c6b366d199f70cff81105a83d3ed9886e3 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 6 Mar 2017 08:23:59 -0500 Subject: [PATCH 3102/3392] automake: fix unescaped left brace warning patch Automake currently has a unescaped left brace in it's automake.in folder that generates the warning: "Unescaped left brace in regex is deprecated, passed through in regex;" This patch, which is backported from upstream fixes this warning. Signed-off-by: Adam Duskett [Thomas: format patch using "git format-patch".] Signed-off-by: Thomas Petazzoni (cherry picked from commit 22dbe0035f309c2ea141344ed6a4e0e79881a1fa) Signed-off-by: Peter Korsgaard --- .../0002-port-to-perl-5.22-and-later.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/automake/0002-port-to-perl-5.22-and-later.patch diff --git a/package/automake/0002-port-to-perl-5.22-and-later.patch b/package/automake/0002-port-to-perl-5.22-and-later.patch new file mode 100644 index 0000000000..207039be95 --- /dev/null +++ b/package/automake/0002-port-to-perl-5.22-and-later.patch @@ -0,0 +1,34 @@ +From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 31 Mar 2016 16:35:29 -0700 +Subject: [PATCH] automake: port to Perl 5.22 and later + +Without this change, Perl 5.22 complains "Unescaped left brace in +regex is deprecated" and this is planned to become a hard error in +Perl 5.26. See: +http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern +* bin/automake.in (substitute_ac_subst_variables): Escape left brace. + +[Backported from: + http://git.savannah.gnu.org/cgit/automake.git/commit/?id=13f00eb4493c217269b76614759e452d8302955e] +Signed-off-by: Adam Duskett +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index a3a0aa3..2c8f31e 100644 +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker + sub substitute_ac_subst_variables + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } + +-- +2.7.4 + From 911ed451f3aa4da4cb9b1fc66ee60815edd21c8b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 24 May 2017 23:13:17 +0200 Subject: [PATCH 3103/3392] package/vlc: security bump version to 2.2.6 Fixes CVE-2017-8312: Heap out-of-bound read in ParseJSS in VideoLAN VLC due to missing check of string length allows attackers to read heap uninitialized data via a crafted subtitles file. [Peter: add CVE info] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b2f2f92887df5333772a9d0b75b5c4cb5675dd88) Signed-off-by: Peter Korsgaard --- package/vlc/vlc.hash | 8 ++------ package/vlc/vlc.mk | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index 0f1b6dccd7..628dad74d9 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,6 +1,2 @@ -# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.md5 -md5 7ab63964ffec4c92a54deb018f23318b vlc-2.2.5.1.tar.xz -# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.sha1 -sha1 042962dba68e1414aa563883b0172ee121cf9555 vlc-2.2.5.1.tar.xz -# From http://get.videolan.org/vlc/2.2.5.1/vlc-2.2.5.1.tar.xz.sha256 -sha256 b28b8a28f578c0c6cb1ebed293aca2a3cd368906cf777d1ab599e2784ddda1cc vlc-2.2.5.1.tar.xz +# From http://download.videolan.org/pub/videolan/vlc/2.2.6/vlc-2.2.6.tar.xz.sha256 +sha256 c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8 vlc-2.2.6.tar.xz diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 7f0c4f5978..47fb3e80e4 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 2.2.5.1 +VLC_VERSION = 2.2.6 VLC_SITE = http://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPLv2+, LGPLv2.1+ From 41b87c692c38bdba82d9408f9f427b50440f5d11 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 9 May 2017 10:59:11 +0100 Subject: [PATCH 3104/3392] imagemagick: bump version to 7.0.5-5 0001 patch already included in this release: https://github.com/ImageMagick/ImageMagick/commit/b218117cad34d39b9ffb587b45c71c5a49b12bde Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit f4a385342336e6edefb6727be9234580724ebff4) Signed-off-by: Peter Korsgaard --- ...m-ImageMagick-ImageMagick-issues-415.patch | 52 ------------------- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 3 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch diff --git a/package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch b/package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch deleted file mode 100644 index 943679eda3..0000000000 --- a/package/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-issues-415.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b218117cad34d39b9ffb587b45c71c5a49b12bde Mon Sep 17 00:00:00 2001 -From: Cristy -Date: Fri, 31 Mar 2017 15:24:33 -0400 -Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/415 - -Fixes CVE-2017-7606 - -Signed-off-by: Peter Korsgaard ---- - coders/pnm.c | 2 +- - coders/rle.c | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/coders/pnm.c b/coders/pnm.c -index 9a1221d79..c525ebb8f 100644 ---- a/coders/pnm.c -+++ b/coders/pnm.c -@@ -1979,7 +1979,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, - pixel=ScaleQuantumToChar(GetPixelRed(image,p)); - else - pixel=ScaleQuantumToAny(GetPixelRed(image,p), -- max_value); -+ max_value); - } - q=PopCharPixel((unsigned char) pixel,q); - p+=GetPixelChannels(image); -diff --git a/coders/rle.c b/coders/rle.c -index 2318901ec..ec071dc7b 100644 ---- a/coders/rle.c -+++ b/coders/rle.c -@@ -271,7 +271,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) - p=colormap; - for (i=0; i < (ssize_t) number_colormaps; i++) - for (x=0; x < (ssize_t) map_length; x++) -- *p++=(unsigned char) ScaleShortToQuantum(ReadBlobLSBShort(image)); -+ *p++=(unsigned char) ScaleQuantumToChar(ScaleShortToQuantum( -+ ReadBlobLSBShort(image))); - } - if ((flags & 0x08) != 0) - { -@@ -476,7 +477,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) - for (x=0; x < (ssize_t) number_planes; x++) - { - ValidateColormapValue(image,(size_t) (x*map_length+ -- (*p & mask)),&index,exception); -+ (*p & mask)),&index,exception); - *p=colormap[(ssize_t) index]; - p++; - } --- -2.11.0 - diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index ff7b24a9ab..06a957a897 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 4a1dde5bdfec0fc549955a051be25b7ff96dfb192060997699e43c7ce0f06ab2 ImageMagick-7.0.5-4.tar.xz +sha256 c3644119dce993aa241fa08eced2cb6043fb5345f0eee7a7822a497f1142ebe3 ImageMagick-7.0.5-5.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 9bef6f7815..6b5cd4eaed 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-4 +IMAGEMAGICK_VERSION = 7.0.5-5 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From cc6d39b5d76a86b065d81345667df02d77c063da Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 15 May 2017 13:31:44 +0100 Subject: [PATCH 3105/3392] imagemagick: bump version to 7.0.5-6 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit 9cd8ad2364cb178e7d6c99462b05668dac1485d2) 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 06a957a897..b7be7bc66d 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 c3644119dce993aa241fa08eced2cb6043fb5345f0eee7a7822a497f1142ebe3 ImageMagick-7.0.5-5.tar.xz +sha256 f60c3e3466ccbf9a0e643284ffec3467363edf9611f16a98387f927a974b49ab ImageMagick-7.0.5-6.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 6b5cd4eaed..b1048f5f64 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-5 +IMAGEMAGICK_VERSION = 7.0.5-6 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From 52caa1a1236273dd31debaf1b324df24f431a28f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 22 May 2017 21:23:56 +0200 Subject: [PATCH 3106/3392] package/imagemagick: bump version to 7.0.5-7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3d311a0a3f7c209795ab2c054b40b07629c4e5b0) 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 b7be7bc66d..8f74618205 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 f60c3e3466ccbf9a0e643284ffec3467363edf9611f16a98387f927a974b49ab ImageMagick-7.0.5-6.tar.xz +sha256 f72d089074d6c968bab38d1c18b22bd92c876e7ae23f7261db0b7c3552186586 ImageMagick-7.0.5-7.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index b1048f5f64..46ee404321 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-6 +IMAGEMAGICK_VERSION = 7.0.5-7 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From bdb12a8118757a31d4b456dfceec667fc203adb1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 May 2017 18:19:44 +0200 Subject: [PATCH 3107/3392] package/imagemagick: bump version to 7.0.5-8 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 04588a378d2eb0c10aed3cadbd2fc29c87055f98) 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 8f74618205..ce7e6b8757 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 f72d089074d6c968bab38d1c18b22bd92c876e7ae23f7261db0b7c3552186586 ImageMagick-7.0.5-7.tar.xz +sha256 007648793640b1d33f1285426df7c43fcf412eaef27b0b68fa7977bf29c4d30e ImageMagick-7.0.5-8.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 46ee404321..ae6122c964 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-7 +IMAGEMAGICK_VERSION = 7.0.5-8 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From 5f33fa2f124b9c76913e720952bcce59957828c2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 2 Jun 2017 06:45:35 +0200 Subject: [PATCH 3108/3392] package/imagemagick: bump version to 7.0.5-9 Fixes http://autobuild.buildroot.net/results/8d9/8d94627ccce15ae1f348a7a9f54621b2b5a74321/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ff26b550dec17ec84f0c4db03c70bd56c157d848) 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 ce7e6b8757..c6f427ea68 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 007648793640b1d33f1285426df7c43fcf412eaef27b0b68fa7977bf29c4d30e ImageMagick-7.0.5-8.tar.xz +sha256 b774c3a69fea4432a120a8c0c231bd011710166c71a7b7e0fbb89b108d29ac6c ImageMagick-7.0.5-9.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index ae6122c964..37faf54849 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-8 +IMAGEMAGICK_VERSION = 7.0.5-9 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From a0981a58ca57db3a4f2cec027be727ca3b333ed9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 5 Jun 2017 12:28:25 +0200 Subject: [PATCH 3109/3392] package/imagemagick: bump version to 7.0.5-10 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 44650969234a8f58552e36b3ee248c99661c8bf4) 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 c6f427ea68..173dd415c7 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 b774c3a69fea4432a120a8c0c231bd011710166c71a7b7e0fbb89b108d29ac6c ImageMagick-7.0.5-9.tar.xz +sha256 0058fcde533986334458a5c99600b1b9633182dd9562cbad4ba618c5ccf2a28f ImageMagick-7.0.5-10.tar.xz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 37faf54849..7aade62dad 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-9 +IMAGEMAGICK_VERSION = 7.0.5-10 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases IMAGEMAGICK_LICENSE = Apache-2.0 From 783d9bea4a93261187ad9d1a01cdd0fb7dccd3b2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 2 Jul 2017 17:01:48 +0200 Subject: [PATCH 3110/3392] bind: security bump to version 9.11.1-P2 Fixes the following security issues: CVE-2017-3142: An error in TSIG authentication can permit unauthorized zone transfers An attacker who is able to send and receive messages to an authoritative DNS server and who has knowledge of a valid TSIG key name may be able to circumvent TSIG authentication of AXFR requests via a carefully constructed request packet. A server that relies solely on TSIG keys for protection with no other ACL protection could be manipulated into: * providing an AXFR of a zone to an unauthorized recipient * accepting bogus NOTIFY packets https://kb.isc.org/article/AA-01504/74/CVE-2017-3142 CVE-2017-3041: An error in TSIG authentication can permit unauthorized dynamic updates An attacker who is able to send and receive messages to an authoritative DNS server and who has knowledge of a valid TSIG key name for the zone and service being targeted may be able to manipulate BIND into accepting an unauthorized dynamic update. https://kb.isc.org/article/AA-01503/74/CVE-2017-3143 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit a0c53973f87928ae51ca58926951c386c74fc023) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 3f0dda531a..5dd15cb86b 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,2 +1,2 @@ -# Verified from http://ftp.isc.org/isc/bind9/9.11.1-P1/bind-9.11.1-P1.tar.gz.sha256.asc -sha256 6b1b3e88d51b8471bd6aee24a8cea70817e850a5901315dc506f9dde275ca638 bind-9.11.1-P1.tar.gz +# Verified from http://ftp.isc.org/isc/bind9/9.11.1-P1/bind-9.11.1-P2.tar.gz.sha256.asc +sha256 bf53c6431575ae1612ddef66d18ef9baf2a22d842fa5b0cadc971919fd81fea5 bind-9.11.1-P2.tar.gz diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 31c338807c..ee7621cb54 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.1-P1 +BIND_VERSION = 9.11.1-P2 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) From 1a704805131024f4b0ad8da09a8e493d1cde05f8 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 26 Apr 2017 14:43:11 +0200 Subject: [PATCH 3111/3392] setlocalversion: fix detection of hg revision for untagged versions By default, cut prints the entire line if the specified delimiter is not present at all: $ printf "foo bar" | cut -d' ' -f2 bar $ printf "foobar" | cut -d' ' -f2 foobar In setlocalversion, cut is presented with the output of 'hg id' which has the format: " " If the current revision is not tagged, the output of 'hg id' does not contain the delimiter (space), cut prints the entire string, and setlocalversion thinks the version is the tag. As setlocalversion does not print anything for tagged versions, there is no output overall, and no correct indication of the mercurial revision. Fix by passing the extra cut option '--only-delimited', which suppresses output if no delimiter is found. This problem likely went unnoticed for so long, because the tag 'tip' (i.e. most recent revision of the branch) is treated specially: in this case the mercurial revision _is_ printed, i.e. the situation is treated as 'untagged'. The problem is only seen when you are _not_ at the most recent revision in your branch. Signed-off-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard (cherry picked from commit ec019bcf643de83d502f30d85d56dd4547b0c11b) Signed-off-by: Peter Korsgaard --- support/scripts/setlocalversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/setlocalversion b/support/scripts/setlocalversion index adeeb781e7..33cd605bf3 100755 --- a/support/scripts/setlocalversion +++ b/support/scripts/setlocalversion @@ -54,7 +54,7 @@ fi # Check for mercurial and a mercurial repo. if hgid=`hg id 2>/dev/null`; then - tag=`printf '%s' "$hgid" | cut -d' ' -f2` + tag=`printf '%s' "$hgid" | cut -d' ' -f2 --only-delimited` # Do we have an untagged version? if [ -z "$tag" -o "$tag" = tip ]; then From 984d85972f592c1b09642be09cf15967dca3c307 Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Mon, 3 Jul 2017 09:50:08 +0200 Subject: [PATCH 3112/3392] tslib: use SPDX identifiers for licenses in use [Peter: License is GPL-2.0+ / LGPL-2.1+] Signed-off-by: Martin Kepplinger Signed-off-by: Peter Korsgaard (cherry picked from commit 56ed4a1ef20aea9bbf46c8c17cb275e3173d5acf) Signed-off-by: Peter Korsgaard --- package/tslib/tslib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 08b1d26ac2..3650650203 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -7,7 +7,7 @@ TSLIB_VERSION = 1.5 TSLIB_SITE = https://github.com/kergoth/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz -TSLIB_LICENSE = GPL, LGPL +TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) TSLIB_LICENSE_FILES = COPYING TSLIB_AUTORECONF = YES From 22fbee2912239c74c8168818aede40b6a2404c83 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jul 2017 17:01:40 +0200 Subject: [PATCH 3113/3392] vlc: add upstream security patches fixing CVE-2017-10699 avcodec 2.2.x, as used in VideoLAN VLC media player 2.2.7-x before 2017-06-29, allows out-of-bounds heap memory write due to calling memcpy() with a wrong size, leading to a denial of service (application crash) or possibly code execution. https://trac.videolan.org/vlc/ticket/18467 Signed-off-by: Peter Korsgaard (cherry picked from commit b9153ed9546ab00eb78c30899a62d3e868a7a778) Signed-off-by: Peter Korsgaard --- ...-avcodec-check-avcodec-visible-sizes.patch | 33 +++++++++++++++++++ ...ck-visible-size-when-creating-buffer.patch | 33 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 package/vlc/0013-codec-avcodec-check-avcodec-visible-sizes.patch create mode 100644 package/vlc/0014-decoder-check-visible-size-when-creating-buffer.patch diff --git a/package/vlc/0013-codec-avcodec-check-avcodec-visible-sizes.patch b/package/vlc/0013-codec-avcodec-check-avcodec-visible-sizes.patch new file mode 100644 index 0000000000..41a5e25d38 --- /dev/null +++ b/package/vlc/0013-codec-avcodec-check-avcodec-visible-sizes.patch @@ -0,0 +1,33 @@ +From 6cc73bcad19da2cd2e95671173f2e0d203a57e9b Mon Sep 17 00:00:00 2001 +From: Francois Cartegnie +Date: Thu, 29 Jun 2017 09:45:20 +0200 +Subject: [PATCH] codec: avcodec: check avcodec visible sizes + +refs #18467 + +Signed-off-by: Peter Korsgaard +--- + modules/codec/avcodec/video.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c +index 1bcad21..ce52544 100644 +--- a/modules/codec/avcodec/video.c ++++ b/modules/codec/avcodec/video.c +@@ -137,9 +137,11 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec, + } + + +- if( width == 0 || height == 0 || width > 8192 || height > 8192 ) ++ if( width == 0 || height == 0 || width > 8192 || height > 8192 || ++ width < p_context->width || height < p_context->height ) + { +- msg_Err( p_dec, "Invalid frame size %dx%d.", width, height ); ++ msg_Err( p_dec, "Invalid frame size %dx%d. vsz %dx%d", ++ width, height, p_context->width, p_context->height ); + return NULL; /* invalid display size */ + } + p_dec->fmt_out.video.i_width = width; +-- +2.1.4 + diff --git a/package/vlc/0014-decoder-check-visible-size-when-creating-buffer.patch b/package/vlc/0014-decoder-check-visible-size-when-creating-buffer.patch new file mode 100644 index 0000000000..a16dcf0e97 --- /dev/null +++ b/package/vlc/0014-decoder-check-visible-size-when-creating-buffer.patch @@ -0,0 +1,33 @@ +From a38a85db58c569cc592d9380cc07096757ef3d49 Mon Sep 17 00:00:00 2001 +From: Francois Cartegnie +Date: Thu, 29 Jun 2017 11:09:02 +0200 +Subject: [PATCH] decoder: check visible size when creating buffer + +early reject invalid visible size +mishandled by filters. + +refs #18467 + +Signed-off-by: Peter Korsgaard +--- + src/input/decoder.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/input/decoder.c b/src/input/decoder.c +index 2c0823f..a216165 100644 +--- a/src/input/decoder.c ++++ b/src/input/decoder.c +@@ -2060,7 +2060,9 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) + vout_thread_t *p_vout; + + if( !p_dec->fmt_out.video.i_width || +- !p_dec->fmt_out.video.i_height ) ++ !p_dec->fmt_out.video.i_height || ++ p_dec->fmt_out.video.i_width < p_dec->fmt_out.video.i_visible_width || ++ p_dec->fmt_out.video.i_height < p_dec->fmt_out.video.i_visible_height ) + { + /* Can't create a new vout without display size */ + return NULL; +-- +2.1.4 + From 71f4f03536daf68876da7433c6c1843f4d349d55 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jul 2017 14:43:37 +0200 Subject: [PATCH 3114/3392] mpg123: security bump to version 1.25.1 >From the release notes: - Avoid memset(NULL, 0, 0) to calm down the paranoid. - Fix bug 252, invalid read of size 1 in ID3v2 parser due to forgotten offset from the frame flag bytes (unnoticed in practice for a long time). Fuzzers are in the house again. This one got CVE-2017-10683. https://sourceforge.net/p/mpg123/bugs/252/ - Avoid a mostly harmless conditional jump depending on uninitialised fr->lay in compute_bpf() (mpg123_position()) when track is not ready yet. - Fix undefined shifts on signed long mask in layer3.c (worked in practice, never right in theory). Code might be a bit faster now, even. Thanks to Agostino Sarubbo for reporting. dlopen() is now directly used to load output modules (and the --with-modules-suffix option has been removed), so adjust the modules logic to match. Signed-off-by: Peter Korsgaard (cherry picked from commit b3a0afd47f278ab5dea4f5cbe01da79a2e05ec8c) Signed-off-by: Peter Korsgaard --- package/mpg123/mpg123.hash | 2 +- package/mpg123/mpg123.mk | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/mpg123/mpg123.hash b/package/mpg123/mpg123.hash index fa5580948c..69fbef36c2 100644 --- a/package/mpg123/mpg123.hash +++ b/package/mpg123/mpg123.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 de2303c8ecb65593e39815c0a2f2f2d91f708c43b85a55fdd1934c82e677cf8e mpg123-1.23.8.tar.bz2 +sha256 0fe7270a4071367f97a7c1fb45fb2ef3cfef73509c205124e080ea569217b05f mpg123-1.25.1.tar.bz2 diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index 27c46dcbc7..8eaaa6273a 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPG123_VERSION = 1.23.8 +MPG123_VERSION = 1.25.1 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_CONF_OPTS = --disable-lfs-alias @@ -74,10 +74,11 @@ endif MPG123_CONF_OPTS += --with-audio=$(subst $(space),$(comma),$(MPG123_AUDIO)) -ifeq ($(BR2_PACKAGE_LIBTOOL),y) -MPG123_DEPENDENCIES += libtool -# .la files gets stripped , so directly load .so files rather than .la -MPG123_CONF_OPTS += --with-modules --with-module-suffix=.so +# output modules are loaded with dlopen() +ifeq ($(BR2_STATIC_LIBS),y) +MPG123_CONF_OPTS += --disable-modules +else +MPG123_CONF_OPTS += --enable-modules endif $(eval $(autotools-package)) From 1195d84c71c5849117f40d99189e7ae077cd88fb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 4 Jul 2017 10:11:54 +0200 Subject: [PATCH 3115/3392] gst1-plugins-bad: fix webrtc option When the WebRTC plugin option was introduced in commit ee267886bc090335dd94c97dca1c294addccc090 ("gst1-plugins-bad: enable webrtc plugin"), it was incorrect added as "webrtc", while the actual name of the plugin and corresponding configure option is "webrtcdsp". This commit therefore fixes the .mk file to use the correct name. And also, since we want to keep Buildroot option consistent with the name of the GStreamer plugins, it renames the Config.in option as well, and introduces the necessary Config.in.legacy handling. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 4c06d2490a07f0b88f42c56c7409899fd2f5608a) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 10 ++++++++++ package/gstreamer1/gst1-plugins-bad/Config.in | 6 +++--- .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7decb91331..0f2f95b802 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,16 @@ endif comment "Legacy options removed in 2017.02" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC + bool "gst1-plugins-bad webrtc renamed to webrtcdsp" + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP + select BR2_LEGACY + help + The WebRTC plugin in GStreamer 1.x has always been named + webrtcdsp, but was wrongly introduced in Buildroot under the + name webrtc. Therefore, we have renamed the option to match + the actual name of the GStreamer plugin. + config BR2_PACKAGE_SPICE_CLIENT bool "spice client support removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 1db51877d4..2fe9bb621c 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -698,8 +698,8 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP help Webp image format plugin -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC - bool "webrtc" +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP + bool "webrtcdsp" # All depends from webrtc-audio-processing depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP @@ -710,7 +710,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC help WebRTC echo-cancellation, gain control and noise suppression -comment "webrtc needs a toolchain w/ C++, NPTL, gcc >= 4.8" +comment "webrtcdsp needs a toolchain w/ C++, NPTL, gcc >= 4.8" depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index c6a151a626..9f39bbf9bb 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -813,11 +813,11 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-webp endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtc +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP),y) +GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtcdsp GST1_PLUGINS_BAD_DEPENDENCIES += webrtc-audio-processing else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtc +GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtcdsp endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y) From 9012a319f36a3ac8a9383f854569e04c3a110a35 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 4 Jul 2017 10:42:11 +0200 Subject: [PATCH 3116/3392] libmad: add security patch from debian Fixes: CVE-2017-8372 - The mad_layer_III function in layer3.c in Underbit MAD libmad 0.15.1b, if NDEBUG is omitted, allows remote attackers to cause a denial of service (assertion failure and application exit) via a crafted audio file. CVE-2017-8373 - The mad_layer_III function in layer3.c in Underbit MAD libmad 0.15.1b allows remote attackers to cause a denial of service (heap-based buffer overflow and application crash) or possibly have unspecified other impact via a crafted audio file. CVE-2017-8374 - The mad_bit_skip function in bit.c in Underbit MAD libmad 0.15.1b allows remote attackers to cause a denial of service (heap-based buffer over-read and application crash) via a crafted audio file. Signed-off-by: Peter Korsgaard (cherry picked from commit 6369a06150b9a2991807c0418a7f0a865ef6c084) Signed-off-by: Peter Korsgaard --- package/libmad/libmad.hash | 1 + package/libmad/libmad.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/libmad/libmad.hash b/package/libmad/libmad.hash index 1e555568fe..173399f7ff 100644 --- a/package/libmad/libmad.hash +++ b/package/libmad/libmad.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 libmad-0.15.1b.tar.gz +sha256 0e21f2c6b19337d0b237dacc04f7b90a56be7f359f4c9a2ee0b202d9af0cfa69 frame_length.diff diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 9c152f9721..2200448d3e 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -10,6 +10,8 @@ LIBMAD_INSTALL_STAGING = YES LIBMAD_LIBTOOL_PATCH = NO LIBMAD_LICENSE = GPLv2+ LIBMAD_LICENSE_FILES = COPYING +LIBMAD_PATCH = \ + https://sources.debian.net/data/main/libm/libmad/0.15.1b-8/debian/patches/frame_length.diff define LIBMAD_PREVENT_AUTOMAKE # Prevent automake from running. From 7ea1487c0afbbb44eca7b2f9e8759305195ab2a6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 4 Jul 2017 18:50:41 +0200 Subject: [PATCH 3117/3392] Update for 2017.02.4 Signed-off-by: Peter Korsgaard --- CHANGES | 28 ++++++++++++++++++++++++++++ Makefile | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index d8b369fe8d..90d409f2c6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,31 @@ +2017.02.4, Released July 4th, 2017 + + Important / security related fixes. + + Update support/scripts/scancpan to use METACPAN v1 API as v0 + has been shutdown. + + Update support/scripts/mkusers to handle setups where + /etc/shadow is a symlink. + + External toolchain: Don't create musl dynamic loader symlink + for static builds. + + Setlocalversion: Correct detection of mercurial revisions for + non-tagged versions. + + Updated/fixed packages: apache, automake, bind, botan, c-ares, + dhcp, expat, fcgiwrap, gcc, gdb, gesftpserver, glibc, gnutls, + gst1-plugins-bad, imagemagick, imx-uuc, intltool, iperf, + ipsec-tools, irssi, libgcrypt, libmad, libnl, mosquitto, + mpg123, ncurses, nodejs, ntp, openssh, openvpn, qt5base, + qt5multimedia, rtl8821au, socat, spice, systemd, tor, tslib, + vlc, x264, xserver_xorg-server + + Issues resolved (http://bugs.buildroot.org): + + #9976: License file for package 'rtl8821au' incorrect + 2017.02.3, Released June 2nd, 2017 Important / security related fixes. diff --git a/Makefile b/Makefile index f74d59b3a4..321b307383 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02.3 +export BR2_VERSION := 2017.02.4 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1496390000 +BR2_VERSION_EPOCH = 1499186000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) From e9cdb35efd5e0c41611c7345488d0b4c1d594195 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 5 Jul 2017 13:22:03 +0200 Subject: [PATCH 3118/3392] package/pulseaudio: remove kde files Upstream removed the src/daemon/pulseaudio-kde.desktop.in since the version 6.0 [1]. [1] https://github.com/pulseaudio/pulseaudio/commit/f46799579f438125b695dced4edf8bca05cbe90a Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 90536c3dfc8e375ebac2042ae9741e98b4ebc8f5) Signed-off-by: Peter Korsgaard --- package/pulseaudio/pulseaudio.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 74a028be45..51de6a581c 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -121,8 +121,6 @@ ifneq ($(BR2_ENABLE_LOCALE),y) define PULSEAUDIO_FIXUP_DESKTOP_FILES cp $(@D)/src/daemon/pulseaudio.desktop.in \ $(@D)/src/daemon/pulseaudio.desktop - cp $(@D)/src/daemon/pulseaudio-kde.desktop.in \ - $(@D)/src/daemon/pulseaudio-kde.desktop endef PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FIXUP_DESKTOP_FILES endif From 9c0cab92767659c5c61235848ec73a5179fcf218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20P=C3=A9rez=20de=20Castro?= Date: Wed, 5 Jul 2017 16:06:33 +0300 Subject: [PATCH 3119/3392] Config.in: add BR2_HOST_GCC_AT_LEAST_7 Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 435b4cce0f054dc4f8549d1ab89e2b45039e015b) Signed-off-by: Peter Korsgaard --- Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Config.in b/Config.in index bd8f0d1a10..434935bff0 100644 --- a/Config.in +++ b/Config.in @@ -57,6 +57,11 @@ config BR2_HOST_GCC_AT_LEAST_6 default y if BR2_HOST_GCC_VERSION = "6" select BR2_HOST_GCC_AT_LEAST_5 +config BR2_HOST_GCC_AT_LEAST_7 + bool + default y if BR2_HOST_GCC_VERSION = "7" + select BR2_HOST_GCC_AT_LEAST_6 + # Hidden boolean selected by packages in need of Java in order to build # (example: xbmc) config BR2_NEEDS_HOST_JAVA From 78ec7c6592e2a74a9b510bc0f72fe716bc4811d0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 10 Jul 2017 12:19:43 +0200 Subject: [PATCH 3120/3392] xen: security bump to version 4.7.3 The 4.7.3 release brings a number of bugfixes and improvements: https://www.xenproject.org/downloads/xen-archives/xen-project-47-series/xen-473.html Including fixes for the following security issues: XSA-211: Cirrus VGA Heap overflow via display refresh (CVE-2016-9603) XSA-212: x86: broken check in memory_exchange() permits PV guest breakout (CVE-2017-7228) XSA-213: x86: 64bit PV guest breakout via pagetable use-after-mode-change (CVE-2017-8903) XSA-214: grant transfer allows PV guest to elevate privileges (CVE-2017-8904) XSA-215: possible memory corruption via failsafe callback (CVE-2017-8905) XSA-216: blkif responses leak backend stack data (CVE-2017-10911) XSA-217: page transfer may allow PV guest to elevate privilege (CVE-2017-10912) XSA-218: Races in the grant table unmap code (CVE-2017-10913 CVE-2017-10914) XSA-219: x86: insufficient reference counts during shadow emulation (CVE-2017-10915) XSA-220: x86: PKRU and BND* leakage between vCPU-s (CVE-2017-10916) XSA-221: NULL pointer deref in event channel poll (CVE-2017-10917) XSA-222: stale P2M mappings due to insufficient error checking (CVE-2017-10918) XSA-223: ARM guest disabling interrupt may crash Xen (CVE-2017-10919) XSA-224: grant table operations mishandle reference counts (CVE-2017-10920 CVE-2017-10921 CVE-2017-10922) XSA-225: arm: vgic: Out-of-bound access when sending SGIs (CVE-2017-10923) Also change download location as bits.xensource.com seems to be down. Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 2 +- package/xen/xen.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 2143f4661d..0b14e2966c 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 61494a56d9251e2108080f95b0dc8e3d175f1ba4da34603fc07b91cfebf358d5 xen-4.7.2.tar.gz +sha256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f xen-4.7.3.tar.gz diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 9ff1b40225..a973b408da 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,8 +4,8 @@ # ################################################################################ -XEN_VERSION = 4.7.2 -XEN_SITE = http://bits.xensource.com/oss-xen/release/$(XEN_VERSION) +XEN_VERSION = 4.7.3 +XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPLv2 XEN_LICENSE_FILES = COPYING XEN_DEPENDENCIES = host-python From 3065f3cf3953262301375ebc6e955880a94aecf2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 13 Jul 2017 23:26:31 +0200 Subject: [PATCH 3121/3392] nodejs: security bump to version 6.11.1 Fixes CVE-2017-1000381 - The c-ares function ares_parse_naptr_reply(), which is used for parsing NAPTR responses, could be triggered to read memory outside of the given input buffer if the passed in DNS response packet was crafted in a particular way. This patch checks that there is enough data for the required elements of an NAPTR record (2 int16, 3 bytes for string lengths) before processing a record. Signed-off-by: Peter Korsgaard --- .../0001-gyp-force-link-command-to-use-CXX.patch | 0 ...2-inspector-don-t-build-when-ssl-support-is-disabled.patch | 0 ...003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch | 0 package/nodejs/Config.in | 2 +- package/nodejs/nodejs.hash | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename package/nodejs/{6.11.0 => 6.11.1}/0001-gyp-force-link-command-to-use-CXX.patch (100%) rename package/nodejs/{6.11.0 => 6.11.1}/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch (100%) rename package/nodejs/{6.11.0 => 6.11.1}/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch (100%) diff --git a/package/nodejs/6.11.0/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.11.1/0001-gyp-force-link-command-to-use-CXX.patch similarity index 100% rename from package/nodejs/6.11.0/0001-gyp-force-link-command-to-use-CXX.patch rename to package/nodejs/6.11.1/0001-gyp-force-link-command-to-use-CXX.patch diff --git a/package/nodejs/6.11.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.11.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch similarity index 100% rename from package/nodejs/6.11.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch rename to package/nodejs/6.11.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch diff --git a/package/nodejs/6.11.0/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch b/package/nodejs/6.11.1/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch similarity index 100% rename from package/nodejs/6.11.0/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch rename to package/nodejs/6.11.1/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index be20af56d6..31dcfb67d9 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_PACKAGE_NODEJS_VERSION_STRING string - default "6.11.0" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS + default "6.11.1" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS default "0.10.48" config BR2_PACKAGE_NODEJS_NPM diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index ac010ab6d6..2dbbdc7cc2 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ # From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt sha256 365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e node-v0.10.48.tar.xz -# From upstream URL: http://nodejs.org/dist/v6.11.0/SHASUMS256.txt -sha256 02ba35391edea2b294c736489af01954ce6e6c39d318f4423ae6617c69ef0a51 node-v6.11.0.tar.xz +# From upstream URL: http://nodejs.org/dist/v6.11.1/SHASUMS256.txt +sha256 6f6655b85919aa54cb045a6d69a226849802fcc26491d0db4ce59873e41cc2b8 node-v6.11.1.tar.xz From 771aa02d4d9bb6ffe7854c9ba1d37f6d64b7c53c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 11 Jun 2017 15:21:30 +0200 Subject: [PATCH 3122/3392] syslinux: add missing dependency on host-util-linux If util-linux is not installed system-wide on the host, the build fails with: /usr/bin/gcc -Wp,-MT,isohybrid.o,-MMD,./.isohybrid.o.d -O2 -I/home/thomas/projets/buildroot/output/host/usr/include -W -Wall -Wstrict-prototypes -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I/home/thomas/projets/buildroot/output/build/syslinux-6.03/utils -c -o isohybrid.o /home/thomas/projets/buildroot/output/build/syslinux-6.03/utils/isohybrid.c /home/thomas/projets/buildroot/output/build/syslinux-6.03/utils/isohybrid.c:40:23: fatal error: uuid/uuid.h: No such file or directory #include ^ compilation terminated. Therefore, this commit adds a dependency on host-util-linux, which will ensure that libuuid is available. The resulting isohybrid tool is really installed, and linked with libuuid: $ readelf -d output/host/usr/bin/isohybrid Dynamic section at offset 0x3e00 contains 26 entries: Tag Type Name/Value 0x0000000000000001 (NEEDED) Shared library: [libuuid.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.6] 0x000000000000000f (RPATH) Library rpath: [/home/thomas/projets/buildroot/output/host/usr/lib] Signed-off-by: Thomas Petazzoni (cherry picked from commit d98d7d660eb89ec4e179a5bf54b46fe7bbcb127c) Signed-off-by: Peter Korsgaard --- boot/syslinux/syslinux.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index a88885bcbd..f07e3b97cd 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -13,7 +13,8 @@ SYSLINUX_LICENSE_FILES = COPYING SYSLINUX_INSTALL_IMAGES = YES -SYSLINUX_DEPENDENCIES = host-nasm host-upx util-linux +# host-util-linux needed to provide libuuid when building host tools +SYSLINUX_DEPENDENCIES = host-nasm host-upx util-linux host-util-linux ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y) SYSLINUX_TARGET += bios From 31477ee2799019aa93e28fb4fd50d394afae7a57 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 4 Jul 2017 14:01:09 +0200 Subject: [PATCH 3123/3392] toolchain: CodeSourcery AMD64 affected by PR19615 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 73143ab89472504f70f556550ce2d16d489bfbab) Signed-off-by: Peter Korsgaard --- toolchain/toolchain-common.in | 5 +++++ .../toolchain-external-codesourcery-amd64/Config.in | 1 + 2 files changed, 6 insertions(+) diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 96d5709763..38baaa92db 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -7,6 +7,11 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" +# https://sourceware.org/bugzilla/show_bug.cgi?id=19615 +# Affect toolchains built with binutils 2.26 (fixed in binutils 2.26.1). +config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 + bool + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735 # exception_ptr, nested_exception, and future from libstdc++ are not # available for architectures not supporting always lock-free atomic diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in index 32d79eba1c..101e227af9 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in @@ -11,6 +11,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64 select BR2_HOSTARCH_NEEDS_IA32_LIBS select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 + select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 # based-on binutils-2.26 help Sourcery CodeBench toolchain for the amd64 (x86_64) architectures, from Mentor Graphics. It uses gcc 6.2, From 8d4be770b6919260755f883575d69e9f1de188d0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 4 Jul 2017 14:01:10 +0200 Subject: [PATCH 3124/3392] boot/syslinux: disable syslinux legacy-BIOS for broken toolchains MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since [1] syslinux is built with the target toolchain in order to properly build with gnu-efi package. But toolchains built with binutils 2.26 break the syslinux legacy-BIOS build as reported at [2], due to binutils bug #19615. Thanks to Benoît Allard for the investigation and the link to the binutils bug [3]. [1] 6e432d5ecb46959f3c27dbbca48e41512bb40a70 [2] http://lists.busybox.net/pipermail/buildroot/2017-July/196253.html [3] https://sourceware.org/bugzilla/show_bug.cgi?id=19615 Signed-off-by: Romain Naour Cc: Benoît Allard Signed-off-by: Thomas Petazzoni (cherry picked from commit 42638a1d124faa287bb0ae4e5a5c23df585736d7) Signed-off-by: Peter Korsgaard --- boot/syslinux/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in index 299a559fdf..da035498de 100644 --- a/boot/syslinux/Config.in +++ b/boot/syslinux/Config.in @@ -35,6 +35,7 @@ config BR2_TARGET_SYSLINUX_PXELINUX config BR2_TARGET_SYSLINUX_MBR bool "install mbr" + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19615 select BR2_TARGET_SYSLINUX_LEGACY_BIOS help Install the legacy-BIOS 'mbr' image, to boot off a From ffaaa9cb483c470d1817e05d7b3630d04ec6cfa3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 2 Jul 2017 18:53:39 +0200 Subject: [PATCH 3125/3392] systemd: don't download patches from Github Patches downloaded from Github are not stable, so bring them in the tree. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 7ced54845c80ef7ba2e0a710cfed7858e30da09c) Signed-off-by: Peter Korsgaard --- ...ull-pointer-p-question-dereferencing.patch | 28 ++++++++++ ...lved-simplify-alloc-size-calculation.patch | 51 +++++++++++++++++++ ...t-allocate-packets-with-minimum-size.patch | 48 +++++++++++++++++ ...y-unit.patch => 0004-fix-getty-unit.patch} | 0 ...ys-revert-use-of-ln-relative-option.patch} | 0 ...0006-fix-am-path-libgcrypt-no-found.patch} | 0 package/systemd/systemd.hash | 3 -- package/systemd/systemd.mk | 5 -- 8 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 package/systemd/0001-resolved-bugfix-of-null-pointer-p-question-dereferencing.patch create mode 100644 package/systemd/0002-resolved-simplify-alloc-size-calculation.patch create mode 100644 package/systemd/0003-resolved-do-not-allocate-packets-with-minimum-size.patch rename package/systemd/{0001-fix-getty-unit.patch => 0004-fix-getty-unit.patch} (100%) rename package/systemd/{0002-build-sys-revert-use-of-ln-relative-option.patch => 0005-build-sys-revert-use-of-ln-relative-option.patch} (100%) rename package/systemd/{0003-fix-am-path-libgcrypt-no-found.patch => 0006-fix-am-path-libgcrypt-no-found.patch} (100%) diff --git a/package/systemd/0001-resolved-bugfix-of-null-pointer-p-question-dereferencing.patch b/package/systemd/0001-resolved-bugfix-of-null-pointer-p-question-dereferencing.patch new file mode 100644 index 0000000000..81cecefa39 --- /dev/null +++ b/package/systemd/0001-resolved-bugfix-of-null-pointer-p-question-dereferencing.patch @@ -0,0 +1,28 @@ +From a924f43f30f9c4acaf70618dd2a055f8b0f166be Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin +Date: Wed, 24 May 2017 08:56:48 +0300 +Subject: [PATCH] resolved: bugfix of null pointer p->question dereferencing + (#6020) + +See https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1621396 + +[Upstream commit: https://github.com/systemd/systemd/commit/a924f43f30f9c4acaf70618dd2a055f8b0f166be] +Signed-off-by: Thomas Petazzoni +--- + src/resolve/resolved-dns-packet.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c +index 652970284e..240ee448f4 100644 +--- a/src/resolve/resolved-dns-packet.c ++++ b/src/resolve/resolved-dns-packet.c +@@ -2269,6 +2269,9 @@ int dns_packet_is_reply_for(DnsPacket *p, const DnsResourceKey *key) { + if (r < 0) + return r; + ++ if (!p->question) ++ return 0; ++ + if (p->question->n_keys != 1) + return 0; + diff --git a/package/systemd/0002-resolved-simplify-alloc-size-calculation.patch b/package/systemd/0002-resolved-simplify-alloc-size-calculation.patch new file mode 100644 index 0000000000..5fab905606 --- /dev/null +++ b/package/systemd/0002-resolved-simplify-alloc-size-calculation.patch @@ -0,0 +1,51 @@ +From db848813bae4d28c524b3b6a7dad135e426659ce Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Sun, 18 Jun 2017 16:07:57 -0400 +Subject: [PATCH] resolved: simplify alloc size calculation + +The allocation size was calculated in a complicated way, and for values +close to the page size we would actually allocate less than requested. + +Reported by Chris Coulson . + +CVE-2017-9445 + +[Upstream commit: https://github.com/systemd/systemd/commit/db848813bae4d28c524b3b6a7dad135e426659ce] +Signed-off-by: Thomas Petazzoni +--- + src/resolve/resolved-dns-packet.c | 8 +------- + src/resolve/resolved-dns-packet.h | 2 -- + 2 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c +index 240ee448f4..821b66e266 100644 +--- a/src/resolve/resolved-dns-packet.c ++++ b/src/resolve/resolved-dns-packet.c +@@ -47,13 +47,7 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, size_t mtu) { + + assert(ret); + +- if (mtu <= UDP_PACKET_HEADER_SIZE) +- a = DNS_PACKET_SIZE_START; +- else +- a = mtu - UDP_PACKET_HEADER_SIZE; +- +- if (a < DNS_PACKET_HEADER_SIZE) +- a = DNS_PACKET_HEADER_SIZE; ++ a = MAX(mtu, DNS_PACKET_HEADER_SIZE); + + /* round up to next page size */ + a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - ALIGN(sizeof(DnsPacket)); +diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h +index 2c92392e4d..3abcaf8cf3 100644 +--- a/src/resolve/resolved-dns-packet.h ++++ b/src/resolve/resolved-dns-packet.h +@@ -66,8 +66,6 @@ struct DnsPacketHeader { + /* With EDNS0 we can use larger packets, default to 4096, which is what is commonly used */ + #define DNS_PACKET_UNICAST_SIZE_LARGE_MAX 4096 + +-#define DNS_PACKET_SIZE_START 512 +- + struct DnsPacket { + int n_ref; + DnsProtocol protocol; diff --git a/package/systemd/0003-resolved-do-not-allocate-packets-with-minimum-size.patch b/package/systemd/0003-resolved-do-not-allocate-packets-with-minimum-size.patch new file mode 100644 index 0000000000..750911383c --- /dev/null +++ b/package/systemd/0003-resolved-do-not-allocate-packets-with-minimum-size.patch @@ -0,0 +1,48 @@ +From 88795538726a5bbfd9efc13d441cb05e1d7fc139 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 27 Jun 2017 14:20:00 -0400 +Subject: [PATCH] resolved: do not allocate packets with minimum size + +dns_packet_new() is sometimes called with mtu == 0, and in that case we should +allocate more than the absolute minimum (which is the dns packet header size), +otherwise we have to resize immediately again after appending the first data to +the packet. + +This partially reverts the previous commit. + +[Upstream commit: https://github.com/systemd/systemd/commit/88795538726a5bbfd9efc13d441cb05e1d7fc139] +Signed-off-by: Thomas Petazzoni +--- + src/resolve/resolved-dns-packet.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c +index 821b66e266..d1f0f760a4 100644 +--- a/src/resolve/resolved-dns-packet.c ++++ b/src/resolve/resolved-dns-packet.c +@@ -28,6 +28,9 @@ + + #define EDNS0_OPT_DO (1<<15) + ++#define DNS_PACKET_SIZE_START 512 ++assert_cc(DNS_PACKET_SIZE_START > UDP_PACKET_HEADER_SIZE) ++ + typedef struct DnsPacketRewinder { + DnsPacket *packet; + size_t saved_rindex; +@@ -47,7 +50,14 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, size_t mtu) { + + assert(ret); + +- a = MAX(mtu, DNS_PACKET_HEADER_SIZE); ++ /* When dns_packet_new() is called with mtu == 0, allocate more than the ++ * absolute minimum (which is the dns packet header size), to avoid ++ * resizing immediately again after appending the first data to the packet. ++ */ ++ if (mtu < UDP_PACKET_HEADER_SIZE) ++ a = DNS_PACKET_SIZE_START; ++ else ++ a = MAX(mtu, DNS_PACKET_HEADER_SIZE); + + /* round up to next page size */ + a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - ALIGN(sizeof(DnsPacket)); diff --git a/package/systemd/0001-fix-getty-unit.patch b/package/systemd/0004-fix-getty-unit.patch similarity index 100% rename from package/systemd/0001-fix-getty-unit.patch rename to package/systemd/0004-fix-getty-unit.patch diff --git a/package/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch b/package/systemd/0005-build-sys-revert-use-of-ln-relative-option.patch similarity index 100% rename from package/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch rename to package/systemd/0005-build-sys-revert-use-of-ln-relative-option.patch diff --git a/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch b/package/systemd/0006-fix-am-path-libgcrypt-no-found.patch similarity index 100% rename from package/systemd/0003-fix-am-path-libgcrypt-no-found.patch rename to package/systemd/0006-fix-am-path-libgcrypt-no-found.patch diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 4417fb3f9f..0acaa3cdcd 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,2 @@ # sha256 locally computed sha256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 systemd-232.tar.gz -sha256 eed8fef0045876e9efa0ba6725ed9ea93654bf24d67bb5aad467a341ad375883 a924f43f30f9c4acaf70618dd2a055f8b0f166be.patch -sha256 43c75bd161a8ef0de5db607aaceed77220f2ba4903cf44e7e9db544980420a5e db848813bae4d28c524b3b6a7dad135e426659ce.patch -sha256 451f7c09332479ebe4ac01612f5f034df4524e16b5bc5d1c8ddcda14e9f3cd69 88795538726a5bbfd9efc13d441cb05e1d7fc139.patch diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 99827b6f02..d5806741d4 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,11 +19,6 @@ SYSTEMD_DEPENDENCIES = \ SYSTEMD_PROVIDES = udev SYSTEMD_AUTORECONF = YES -SYSTEMD_PATCH = \ - https://github.com/systemd/systemd/commit/a924f43f30f9c4acaf70618dd2a055f8b0f166be.patch \ - https://github.com/systemd/systemd/commit/db848813bae4d28c524b3b6a7dad135e426659ce.patch \ - https://github.com/systemd/systemd/commit/88795538726a5bbfd9efc13d441cb05e1d7fc139.patch - # Make sure that systemd will always be built after busybox so that we have # a consistent init setup between two builds ifeq ($(BR2_PACKAGE_BUSYBOX),y) From dc0ec5f24f1a04a00ed0bd14e40794ff47a25844 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 4 Jul 2017 13:21:20 +0200 Subject: [PATCH 3126/3392] package/systemd: needs timezone info systemd does not like being booted without any timezone info (especially on a R/O filesystem), so we forcibly enable that. Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian [Thomas: fix alphabetic ordering.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 81597b82e29d5427ac784c8e6e8dcaee469e0332) Signed-off-by: Peter Korsgaard --- package/systemd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index ac8175c337..47d47c6a44 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -26,6 +26,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools select BR2_PACKAGE_KMOD_TOOLS + select BR2_TARGET_TZ_INFO help systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides aggressive parallelization From 840a4f40ed9e128896bdbe2b2483cec156dd5709 Mon Sep 17 00:00:00 2001 From: Matthew Shyu Date: Tue, 4 Jul 2017 11:12:38 +0800 Subject: [PATCH 3127/3392] linux-fusion: fix build issue with Linux >= 4.7 The size parameter from sock_recvmsg() was removed from Linux kernel API since 4.7. This commit adjusts the existing 0004-Port-one-one_udp.c-to-Linux-4.1.patch to fix the build with Linux >= 4.7. Signed-off-by: Matthew Shyu [Thomas: improved commit title/log.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 0ae2cab4167cb978718dcbfe9fa006b126522b65) Signed-off-by: Peter Korsgaard --- ...0004-Port-one-one_udp.c-to-Linux-4.1.patch | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch b/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch index e1bff64f3b..3ee4dac487 100644 --- a/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch +++ b/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch @@ -24,12 +24,20 @@ one/one_udp.c: In function 'ksocket_send_iov': one/one_udp.c:192:13: error: too many arguments to function 'sock_sendmsg' Signed-off-by: Marc Gonzalez + +Kernel commit 2da62906b1e29 dropped the size parameter in sock_recvmsg +since 4.7 + +In function 'ksocket_receive' +one/one_udp.c:235:13: error: too many arguments to function 'sock_recvmsg' + +Signed-off-by: Matthew Shyu --- - one/one_udp.c | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) + one/one_udp.c | 34 +++++++++++++++++++--------------- + 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/one/one_udp.c b/one/one_udp.c -index 26b9e6a1f729..b1daae164cdf 100644 +index 26b9e6a..9b59529 100644 --- a/one/one_udp.c +++ b/one/one_udp.c @@ -161,7 +161,7 @@ ksocket_send_iov( struct socket *sock, @@ -78,7 +86,7 @@ index 26b9e6a1f729..b1daae164cdf 100644 struct iovec iov; mm_segment_t oldfs; int size = 0; -@@ -213,14 +215,12 @@ ksocket_receive(struct socket* sock, struct sockaddr_in* addr, void *buf, int le +@@ -213,18 +215,20 @@ ksocket_receive(struct socket* sock, struct sockaddr_in* addr, void *buf, int le iov.iov_base = buf; iov.iov_len = len; @@ -97,3 +105,14 @@ index 26b9e6a1f729..b1daae164cdf 100644 oldfs = get_fs(); set_fs(KERNEL_DS); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) // commit 2da62906b1e29 + size = sock_recvmsg(sock,&msg,len,msg.msg_flags); ++#else ++ size = sock_recvmsg(sock, &msg,msg.msg_flags); ++#endif + set_fs(oldfs); + + return size; +-- +2.11.0 + From 4ef293dfddbd34b9e6d24f6e63bab876ddf0be45 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 4 Jul 2017 16:47:41 +0200 Subject: [PATCH 3128/3392] libglib2: disable compiler warnings By default, libglib enables some fairly aggressive warnings, treated as errors. In particular, the -Wformat=2 warning triggers a warning due to the return value of the ngettext() macro from uClibc libintl stub not being understood as being potentially a format string. So, before we enable the stub libintl in uClibc, we disable such warnings. A bug will be reported to upstream uClibc to get the actual bug fixed, but disabling compiler warnings treated as errors is anyway a good thing in the context of Buildroot. Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit f2800ac57cde2cd71df295d33441faae1b30dd3e) Signed-off-by: Peter Korsgaard --- package/libglib2/libglib2.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index ddd1f39652..e23c4a2df8 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -113,7 +113,8 @@ HOST_LIBGLIB2_DEPENDENCIES = \ host-zlib LIBGLIB2_CONF_OPTS = \ - --with-pcre=system + --with-pcre=system \ + --disable-compile-warnings ifneq ($(BR2_ENABLE_LOCALE),y) LIBGLIB2_DEPENDENCIES += libiconv From 304750a59dd57fb18604e0942e4b91007446f309 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 5 Jul 2017 11:34:54 +0200 Subject: [PATCH 3129/3392] busybox: disable CONFIG_FEATURE_CLEAN_UP in default configs FEATURE_CLEAN_UP is a configuration feature to get busybox to explicitly call free() on dynamic allocated memory just before exiting so memory leak detectors like valgrind don't get confused. Upstream explicitly recommends to NOT enable this option: config FEATURE_CLEAN_UP bool "Clean up all memory before exiting (usually not needed)" default n help As a size optimization, busybox normally exits without explicitly freeing dynamically allocated memory or closing files. This saves space since the OS will clean up for us, but it can confuse debuggers like valgrind, which report tons of memory and resource leaks. Don't enable this unless you have a really good reason to clean things up manually. Having this option enabled adds a bit of bloat, but more significantly these cleanup code paths don't get tested very often so some times get out of sync with the allocation code which can lead to crashes (or security issues from double frees), so it is safer to disable the option. For people wanting to debug memory leak issues with busybox, the option can still be enabled with a configuration fragment (or a custom config). The size difference isn't huge (br-arm-full-static): -rwxr-xr-x 1 peko peko 886K Jul 5 10:56 output-busybox1/target/bin/busybox -rwxr-xr-x 1 peko peko 882K Jul 5 10:53 output-busybox2/target/bin/busybox Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 15e8e721f6e391c7aa397f3081b7970fe8bbcab9) Signed-off-by: Peter Korsgaard --- package/busybox/busybox-minimal.config | 2 +- package/busybox/busybox.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 2abf458b78..0c8e63e627 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -22,7 +22,7 @@ CONFIG_FEATURE_INSTALLER=y # CONFIG_PAM is not set CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y -CONFIG_FEATURE_CLEAN_UP=y +# CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y # CONFIG_FEATURE_PIDFILE is not set diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index c45de21808..508128d5e3 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -22,7 +22,7 @@ CONFIG_FEATURE_INSTALLER=y # CONFIG_PAM is not set CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y -CONFIG_FEATURE_CLEAN_UP=y +# CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y # CONFIG_FEATURE_PIDFILE is not set From 711a1eb61a7f71b28e0af15acaadf344cf119b2f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 5 Jul 2017 18:37:55 +0200 Subject: [PATCH 3130/3392] linux-headers: bump 4.{4,9,11}.x series [Peter: Drop 4.11.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 00b8764f77c78885f234f980e4b6c49de315349a) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 97e8067567..db4e18f858 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.42" if BR2_KERNEL_HEADERS_4_1 - default "4.4.75" if BR2_KERNEL_HEADERS_4_4 + default "4.4.76" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.33" if BR2_KERNEL_HEADERS_4_9 + default "4.9.36" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From f887589e3ecc92b73a991f5dd52e7bafab302e2c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 5 Jul 2017 22:30:55 +0200 Subject: [PATCH 3131/3392] xvisor: fix build on AArch64 Xvisor was failing to build on AArch64 with: package/xvisor/xvisor.mk:60: *** No Xvisor defconfig name specified, check your BR2_PACKAGE_XVISOR_DEFCONFIG setting. Stop. The first problem is that the Config.in file had a typo: it was using BR2_AARCH64 instead of BR2_aarch64, and therefore the BR2_PACKAGE_XVISOR_DEFCONFIG variable had no value. Once this is fixed, another problem occurs: the ARCH variable needs to be specified as "arm" for XVisor, for both ARM and AArch64. Therefore, a XVISOR_ARCH variable is introduced, which is calculated according to the Buildroot configuration options. Only x86-64, arm and aarch64 are supported by Xvisor currently, so it remains simple. Fixes: http://autobuild.buildroot.net/results/1719a63ff257f13634a06a14327abfb327984101/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 117fd5dfbc756c4f2b4aef97fc2b568528c66df7) Signed-off-by: Peter Korsgaard --- package/xvisor/Config.in | 2 +- package/xvisor/xvisor.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in index 996d37afbe..44bd461c3d 100644 --- a/package/xvisor/Config.in +++ b/package/xvisor/Config.in @@ -36,7 +36,7 @@ config BR2_PACKAGE_XVISOR_DEFCONFIG default "generic-v5" if BR2_ARM_CPU_ARMV5 default "generic-v6" if BR2_ARM_CPU_ARMV6 default "generic-v7" if BR2_ARM_CPU_ARMV7A - default "generic-v8" if BR2_AARCH64 + default "generic-v8" if BR2_aarch64 default "x86_64_generic" if BR2_x86_64 help Name of the Xvisor defconfig file to use, without the diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index a9a5dbfaec..17edc2c482 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -26,8 +26,16 @@ XVISOR_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE)) endif XVISOR_KCONFIG_EDITORS = menuconfig +ifeq ($(BR2_x86_64),y) +XVISOR_ARCH = x86 +else ifeq ($(BR2_arm)$(BR2_aarch64),y) +XVISOR_ARCH = arm +else +$(error "Architecture not supported by XVisor") +endif + XVISOR_MAKE_ENV = \ - ARCH=$(if $(BR2_x86_64),x86,$(BR2_ARCH)) \ + ARCH=$(XVISOR_ARCH) \ CROSS_COMPILE=$(TARGET_CROSS) XVISOR_MAKE_OPTS = $(if $(VERBOSE),VERBOSE=1) From 76bde2fc305630bf5c1d01de6f4e76216e39c2a8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 Jul 2017 11:42:29 +0200 Subject: [PATCH 3132/3392] xvisor: fix bogus check on XVISOR_ARCH The XVISOR_ARCH check added in commit 117fd5dfbc756c4f2b4aef97fc2b568528c66df7 ("xvisor: fix build on AArch64") broke Buildroot entirely on all architectures except ARM, AArch64 and x86-64, because the $(error ...) test was not enclosed inside a condition that made sure the xvisor package was enabled. This commit fixes that, and allows Buildroot to be usable again on all architectures. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 27ce235cdb996dc691c28a95f6acc9c479ef1fb8) Signed-off-by: Peter Korsgaard --- package/xvisor/xvisor.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 17edc2c482..c7afb71f67 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -30,9 +30,13 @@ ifeq ($(BR2_x86_64),y) XVISOR_ARCH = x86 else ifeq ($(BR2_arm)$(BR2_aarch64),y) XVISOR_ARCH = arm -else +endif + +ifeq ($(BR2_PACKAGE_XVISOR)$(BR_BUILDING),yy) +ifeq ($(XVISOR_ARCH),) $(error "Architecture not supported by XVisor") endif +endif XVISOR_MAKE_ENV = \ ARCH=$(XVISOR_ARCH) \ From 33145a32b2aeeb57ffb42b14caa320b6dd434ece Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 6 Jul 2017 10:52:59 +0200 Subject: [PATCH 3133/3392] python-setproctitle: change setup type to setuptools Changing setup type to setuptools avoids installing as zipped .egg Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 37cb6e971c77c376b9329cbda93e3d03aa90ce15) Signed-off-by: Peter Korsgaard --- package/python-setproctitle/python-setproctitle.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-setproctitle/python-setproctitle.mk b/package/python-setproctitle/python-setproctitle.mk index 36cfec3223..c3c6386b60 100644 --- a/package/python-setproctitle/python-setproctitle.mk +++ b/package/python-setproctitle/python-setproctitle.mk @@ -9,6 +9,6 @@ PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz PYTHON_SETPROCTITLE_SITE = https://pypi.python.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3 PYTHON_SETPROCTITLE_LICENSE = BSD-3c PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT -PYTHON_SETPROCTITLE_SETUP_TYPE = distutils +PYTHON_SETPROCTITLE_SETUP_TYPE = setuptools $(eval $(python-package)) From dfcb9416d2da0da4f679ad86d731e0588f992920 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Jul 2017 12:48:41 +0200 Subject: [PATCH 3134/3392] ccache: make default host-ccache cache dir fit for multi-user setups While building I noticed: >>> host-ccache 3.3.4 Building conf.c: In function 'conf_create': conf.c:314:2: warning: too many arguments for format [-Wformat-extra-args] conf->cache_dir = format("/home/peko/.buildroot-ccache", get_home_directory()); ^ As host-ccache gets installed into $(HOST_DIR) and is part of the SDK, hardcoding the build user homedir isn't really nice for the relocatable SDK feature (or simply for a SDK used by multiple users). As the warning shows, CCache replaces "%s" with the current user home directory, so rewrite BR_CACHE_DIR to use this feature if it begins with $HOME. Signed-off-by: Peter Korsgaard (cherry picked from commit bdca0d05816fec8472b1d32301f55df152b86466) Signed-off-by: Peter Korsgaard --- package/ccache/ccache.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index f174a5d01c..55a913259f 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -28,9 +28,13 @@ HOST_CCACHE_CONF_OPTS += --with-bundled-zlib # BR2_CCACHE_DIR. # - Change hard-coded last-ditch default to match path in .config, to avoid # the need to specify BR_CACHE_DIR when invoking ccache directly. +# CCache replaces "%s" with the home directory of the current user, +# So rewrite BR_CACHE_DIR to take that into consideration for SDK purpose +HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,\%s/%,$(BR_CACHE_DIR)) + define HOST_CCACHE_PATCH_CONFIGURATION sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/ccache.c - sed -i 's,"%s/.ccache","$(BR_CACHE_DIR)",' $(@D)/conf.c + sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/conf.c endef HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION From 94660b2a950ec6d6f288090c27302fc89d50542b Mon Sep 17 00:00:00 2001 From: Rodrigo Rebello Date: Mon, 19 Jun 2017 03:02:43 -0300 Subject: [PATCH 3135/3392] irssi: drop obsolete configure option The configure option --with-ncurses has been removed in version 1.0.0 and thus is no longer needed. Signed-off-by: Rodrigo Rebello Signed-off-by: Thomas Petazzoni (cherry picked from commit a97b1e03fe779a67b4ca14f9e08fd4a316e81be5) Signed-off-by: Peter Korsgaard --- package/irssi/irssi.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index 12ab57bbc1..2b3bff4974 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -15,7 +15,6 @@ IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses openssl IRSSI_CONF_OPTS = \ --disable-glibtest \ - --with-ncurses=$(STAGING_DIR)/usr \ --without-perl ifeq ($(BR2_PACKAGE_IRSSI_PROXY),y) From fed880a3c4cbfb059a780253ba1383437c56a69e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 8 Jul 2017 16:34:33 +0200 Subject: [PATCH 3136/3392] irssi: security bump to version 1.0.4 >From the advisory: https://irssi.org/security/irssi_sa_2017_07.txt Two vulnerabilities have been located in Irssi. (a) When receiving messages with invalid time stamps, Irssi would try to dereference a NULL pointer. Found by Brian 'geeknik' Carpenter of Geeknik Labs. (CWE-690) CVE-2017-10965 [2] was assigned to this bug (b) While updating the internal nick list, Irssi may incorrectly use the GHashTable interface and free the nick while updating it. This will then result in use-after-free conditions on each access of the hash table. Found by Brian 'geeknik' Carpenter of Geeknik Labs. (CWE-416 caused by CWE-227) CVE-2017-10966 [3] was assigned to this bug Impact ------ (a) May result in denial of service (remote crash). (b) Undefined behaviour. Signed-off-by: Peter Korsgaard (cherry picked from commit 9bf78446888ed3b98d893e70ce4f5e4679fd2ebb) Signed-off-by: Peter Korsgaard --- package/irssi/irssi.hash | 2 +- package/irssi/irssi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index abb421998c..7b019025d8 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 838220297dcbe7c8c42d01005059779a82f5b7b7e7043db37ad13f5966aff581 irssi-1.0.3.tar.xz +sha256 b85c07dbafe178213eccdc69f5f8f0ac024dea01c67244668f91ec1c06b986ca irssi-1.0.4.tar.xz diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index 2b3bff4974..4fef1125b1 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 1.0.3 +IRSSI_VERSION = 1.0.4 IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz # Do not use the github helper here. The generated tarball is *NOT* the # same as the one uploaded by upstream for the release. From 03c2027e17ad1e4a9f98aff117d5b86a011125c5 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 8 Jul 2017 22:15:07 +0200 Subject: [PATCH 3137/3392] manual: patches are not applied for SITE_METHOD = local We had several remarks on the mailing list of users that were surprised that patches were not applied for packages whose SITE_METHOD is local. So document this. Note that for OVERRIDE_SRCDIR itself it is already documented: When Buildroot finds that for a given package, an _OVERRIDE_SRCDIR has been defined, it will no longer attempt to download, extract and patch the package. Instead, it will directly use the source code available in in the specified directory. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit 0611045c42373f0049a5f95bcbea91bbb22b0e27) Signed-off-by: Peter Korsgaard --- docs/manual/adding-packages-generic.txt | 5 ++++- docs/manual/adding-packages-hooks.txt | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index a08283c5a3..e5f165d9b5 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -315,7 +315,10 @@ information is (assuming the package name is +libfoo+) : ** +local+ for a local source code directory. One should use this when +LIBFOO_SITE+ specifies a local directory path containing the package source code. Buildroot copies the contents of the - source directory into the package's build directory. + source directory into the package's build directory. Note that + for +local+ packages, no patches are applied. If you need to + still patch the source code, use +LIBFOO_POST_RSYNC_HOOKS+, see + xref:hooks-rsync[]. * +LIBFOO_GIT_SUBMODULES+ can be set to +YES+ to create an archive with the git submodules in the repository. This is only available diff --git a/docs/manual/adding-packages-hooks.txt b/docs/manual/adding-packages-hooks.txt index d25092ac25..0ce79f8907 100644 --- a/docs/manual/adding-packages-hooks.txt +++ b/docs/manual/adding-packages-hooks.txt @@ -59,6 +59,7 @@ endef LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP ---------------------- +[[hooks-rsync]] ==== Using the +POST_RSYNC+ hook The +POST_RSYNC+ hook is run only for packages that use a local source, either through the +local+ site method or the +OVERRIDE_SRCDIR+ From b9e3b8778465993f7002cfcf26c69d4563b99b5c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 10 Jul 2017 23:54:15 +0300 Subject: [PATCH 3138/3392] efivar: fix build with gcc 7 Add upstream patch fixing a warning that breaks the build because of -Werror. Fixes: http://autobuild.buildroot.net/results/33a/33adc3ef139d6814aef4c92ae0bcc4c810ab0b86/ http://autobuild.buildroot.net/results/e7d/e7d80e823e13edc6698148244553bd90367bcd03/ http://autobuild.buildroot.net/results/3b6/3b61246f8b04a332d1c61732f0eb6e50ea8ca366/ Cc: Erico Nunes Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 0ca30170345a81f5f21e4ef4424b1f186cde1988) Signed-off-by: Peter Korsgaard --- ...extra-const-that-gcc-complains-about.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/efivar/0003-Remove-some-extra-const-that-gcc-complains-about.patch diff --git a/package/efivar/0003-Remove-some-extra-const-that-gcc-complains-about.patch b/package/efivar/0003-Remove-some-extra-const-that-gcc-complains-about.patch new file mode 100644 index 0000000000..6b9f77eb8b --- /dev/null +++ b/package/efivar/0003-Remove-some-extra-const-that-gcc-complains-about.patch @@ -0,0 +1,47 @@ +From 1c7c0f71c9d22efda4156881eb187b8c69d1cca7 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 6 Feb 2017 14:28:19 -0500 +Subject: [PATCH] Remove some extra "const" that gcc complains about. + +One of these days I'll get these right. + +Signed-off-by: Peter Jones +Signed-off-by: Baruch Siach +--- +Upstream commit 1c7c0f71c9d22e. + + src/include/efivar/efiboot-loadopt.h | 4 ++-- + src/loadopt.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/include/efivar/efiboot-loadopt.h b/src/include/efivar/efiboot-loadopt.h +index 07db5c4c53e3..efc29c69d47e 100644 +--- a/src/include/efivar/efiboot-loadopt.h ++++ b/src/include/efivar/efiboot-loadopt.h +@@ -32,8 +32,8 @@ extern ssize_t efi_loadopt_create(uint8_t *buf, ssize_t size, + + extern efidp efi_loadopt_path(efi_load_option *opt, ssize_t limit) + __attribute__((__nonnull__ (1))); +-extern const unsigned char const * efi_loadopt_desc(efi_load_option *opt, +- ssize_t limit) ++extern const unsigned char * efi_loadopt_desc(efi_load_option *opt, ++ ssize_t limit) + __attribute__((__visibility__ ("default"))) + __attribute__((__nonnull__ (1))); + extern uint32_t efi_loadopt_attrs(efi_load_option *opt) +diff --git a/src/loadopt.c b/src/loadopt.c +index a63ca792d2dc..ce889867fd29 100644 +--- a/src/loadopt.c ++++ b/src/loadopt.c +@@ -357,7 +357,7 @@ teardown(void) + + __attribute__((__nonnull__ (1))) + __attribute__((__visibility__ ("default"))) +-const unsigned char const * ++const unsigned char * + efi_loadopt_desc(efi_load_option *opt, ssize_t limit) + { + if (last_desc) { +-- +2.13.2 + From feb4548bd850a7cf56b449c86e031659c674c6c9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 10 Jul 2017 09:07:52 +0200 Subject: [PATCH 3139/3392] xserver_xorg-server: add upstream security fixes for CVE-2017-10971 / 10972 Add upstream patches fixing the following security issues: CVE-2017-10971: The endianess handling for X Events assumed a fixed size of X Event structures and had a specific 32 byte stack buffer for that. However "GenericEvents" can have any size, so if the events were sent in the wrong endianess, this stack buffer could be overflowed easily. So authenticated X users could overflow the stack in the X Server and with the X server usually running as root gaining root prileveges. CVE-2017-10972: An information leak out of the X server due to an uninitialized stack area when swapping event endianess. For more details, see the advisory: http://www.openwall.com/lists/oss-security/2017/07/06/6 [Apply 1.19.x patches to 1.19.1 instead of 1.19.3] Signed-off-by: Peter Korsgaard (cherry picked from commit 2015d83dd5dbc6832df9d1082a58b7cc0b9fb0ab) Signed-off-by: Peter Korsgaard --- ...t-buffer-in-SProcXSendExtensionEvent.patch | 39 ++++++++++ ...ow-GenericEvent-in-SendEvent-request.patch | 71 +++++++++++++++++++ ...ll-events-in-ProcXSendExtensionEvent.patch | 50 +++++++++++++ ...5-Xi-Do-not-try-to-swap-GenericEvent.patch | 45 ++++++++++++ ...t-buffer-in-SProcXSendExtensionEvent.patch | 39 ++++++++++ ...ow-GenericEvent-in-SendEvent-request.patch | 71 +++++++++++++++++++ ...ll-events-in-ProcXSendExtensionEvent.patch | 50 +++++++++++++ ...5-Xi-Do-not-try-to-swap-GenericEvent.patch | 45 ++++++++++++ ...t-buffer-in-SProcXSendExtensionEvent.patch | 39 ++++++++++ ...ow-GenericEvent-in-SendEvent-request.patch | 71 +++++++++++++++++++ ...ll-events-in-ProcXSendExtensionEvent.patch | 50 +++++++++++++ ...7-Xi-Do-not-try-to-swap-GenericEvent.patch | 45 ++++++++++++ 12 files changed, 615 insertions(+) create mode 100644 package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch create mode 100644 package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch create mode 100644 package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch create mode 100644 package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch create mode 100644 package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch create mode 100644 package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch create mode 100644 package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch create mode 100644 package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch create mode 100644 package/x11r7/xserver_xorg-server/1.19.1/0004-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch create mode 100644 package/x11r7/xserver_xorg-server/1.19.1/0005-dix-Disallow-GenericEvent-in-SendEvent-request.patch create mode 100644 package/x11r7/xserver_xorg-server/1.19.1/0006-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch create mode 100644 package/x11r7/xserver_xorg-server/1.19.1/0007-Xi-Do-not-try-to-swap-GenericEvent.patch diff --git a/package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch b/package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch new file mode 100644 index 0000000000..c15dc9f50c --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.14.7/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch @@ -0,0 +1,39 @@ +From 05442de962d3dc624f79fc1a00eca3ffc5489ced Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:39 +0300 +Subject: [PATCH] Xi: Zero target buffer in SProcXSendExtensionEvent. + +Make sure that the xEvent eventT is initialized with zeros, the same way as +in SProcSendEvent. + +Some event swapping functions do not overwrite all 32 bytes of xEvent +structure, for example XSecurityAuthorizationRevoked. Two cooperating +clients, one swapped and the other not, can send +XSecurityAuthorizationRevoked event to each other to retrieve old stack data +from X server. This can be potentialy misused to go around ASLR or +stack-protector. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + Xi/sendexev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 11d82029f..1cf118ab6 100644 +--- a/Xi/sendexev.c ++++ b/Xi/sendexev.c +@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr client) + { + CARD32 *p; + int i; +- xEvent eventT; ++ xEvent eventT = { .u.u.type = 0 }; + xEvent *eventP; + EventSwapPtr proc; + +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch b/package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch new file mode 100644 index 0000000000..12da5f5cba --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.14.7/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch @@ -0,0 +1,71 @@ +From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:40 +0300 +Subject: [PATCH] dix: Disallow GenericEvent in SendEvent request. + +The SendEvent request holds xEvent which is exactly 32 bytes long, no more, +no less. Both ProcSendEvent and SProcSendEvent verify that the received data +exactly match the request size. However nothing stops the client from passing +in event with xEvent::type = GenericEvent and any value of +xGenericEvent::length. + +In the case of ProcSendEvent, the event will be eventually passed to +WriteEventsToClient which will see that it is Generic event and copy the +arbitrary length from the receive buffer (and possibly past it) and send it to +the other client. This allows clients to copy unitialized heap memory out of X +server or to crash it. + +In case of SProcSendEvent, it will attempt to swap the incoming event by +calling a swapping function from the EventSwapVector array. The swapped event +is written to target buffer, which in this case is local xEvent variable. The +xEvent variable is 32 bytes long, but the swapping functions for GenericEvents +expect that the target buffer has size matching the size of the source +GenericEvent. This allows clients to cause stack buffer overflows. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + dix/events.c | 6 ++++++ + dix/swapreq.c | 7 +++++++ + 2 files changed, 13 insertions(+) + +diff --git a/dix/events.c b/dix/events.c +index 3e3a01ef9..d3a33ea3f 100644 +--- a/dix/events.c ++++ b/dix/events.c +@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client) + client->errorValue = stuff->event.u.u.type; + return BadValue; + } ++ /* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++ if (stuff->event.u.u.type == GenericEvent) { ++ client->errorValue = stuff->event.u.u.type; ++ return BadValue; ++ } + if (stuff->event.u.u.type == ClientMessage && + stuff->event.u.u.detail != 8 && + stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) { +diff --git a/dix/swapreq.c b/dix/swapreq.c +index 719e9b81c..67850593b 100644 +--- a/dix/swapreq.c ++++ b/dix/swapreq.c +@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client) + swapl(&stuff->destination); + swapl(&stuff->eventMask); + ++ /* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++ if (stuff->event.u.u.type == GenericEvent) { ++ client->errorValue = stuff->event.u.u.type; ++ return BadValue; ++ } ++ + /* Swap event */ + proc = EventSwapVector[stuff->event.u.u.type & 0177]; + if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */ +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch b/package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch new file mode 100644 index 0000000000..2e651006ba --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.14.7/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch @@ -0,0 +1,50 @@ +From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:41 +0300 +Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent. + +The requirement is that events have type in range +EXTENSION_EVENT_BASE..lastEvent, but it was tested +only for first event of all. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + Xi/sendexev.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 1cf118ab6..5e63bfcca 100644 +--- a/Xi/sendexev.c ++++ b/Xi/sendexev.c +@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client) + int + ProcXSendExtensionEvent(ClientPtr client) + { +- int ret; ++ int ret, i; + DeviceIntPtr dev; + xEvent *first; + XEventClass *list; +@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client) + /* The client's event type must be one defined by an extension. */ + + first = ((xEvent *) &stuff[1]); +- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && +- (first->u.u.type < lastEvent))) { +- client->errorValue = first->u.u.type; +- return BadValue; ++ for (i = 0; i < stuff->num_events; i++) { ++ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) && ++ (first[i].u.u.type < lastEvent))) { ++ client->errorValue = first[i].u.u.type; ++ return BadValue; ++ } + } + + list = (XEventClass *) (first + stuff->num_events); +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch b/package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch new file mode 100644 index 0000000000..871e7621ed --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.14.7/0005-Xi-Do-not-try-to-swap-GenericEvent.patch @@ -0,0 +1,45 @@ +From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:42 +0300 +Subject: [PATCH] Xi: Do not try to swap GenericEvent. + +The SProcXSendExtensionEvent must not attempt to swap GenericEvent because +it is assuming that the event has fixed size and gives the swapping function +xEvent-sized buffer. + +A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + Xi/sendexev.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 5e63bfcca..5c2e0fc56 100644 +--- a/Xi/sendexev.c ++++ b/Xi/sendexev.c +@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client) + + eventP = (xEvent *) &stuff[1]; + for (i = 0; i < stuff->num_events; i++, eventP++) { ++ if (eventP->u.u.type == GenericEvent) { ++ client->errorValue = eventP->u.u.type; ++ return BadValue; ++ } ++ + proc = EventSwapVector[eventP->u.u.type & 0177]; +- if (proc == NotImplemented) /* no swapping proc; invalid event type? */ ++ /* no swapping proc; invalid event type? */ ++ if (proc == NotImplemented) { ++ client->errorValue = eventP->u.u.type; + return BadValue; ++ } + (*proc) (eventP, &eventT); + *eventP = eventT; + } +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch b/package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch new file mode 100644 index 0000000000..c15dc9f50c --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.17.4/0002-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch @@ -0,0 +1,39 @@ +From 05442de962d3dc624f79fc1a00eca3ffc5489ced Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:39 +0300 +Subject: [PATCH] Xi: Zero target buffer in SProcXSendExtensionEvent. + +Make sure that the xEvent eventT is initialized with zeros, the same way as +in SProcSendEvent. + +Some event swapping functions do not overwrite all 32 bytes of xEvent +structure, for example XSecurityAuthorizationRevoked. Two cooperating +clients, one swapped and the other not, can send +XSecurityAuthorizationRevoked event to each other to retrieve old stack data +from X server. This can be potentialy misused to go around ASLR or +stack-protector. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + Xi/sendexev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 11d82029f..1cf118ab6 100644 +--- a/Xi/sendexev.c ++++ b/Xi/sendexev.c +@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr client) + { + CARD32 *p; + int i; +- xEvent eventT; ++ xEvent eventT = { .u.u.type = 0 }; + xEvent *eventP; + EventSwapPtr proc; + +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch b/package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch new file mode 100644 index 0000000000..12da5f5cba --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.17.4/0003-dix-Disallow-GenericEvent-in-SendEvent-request.patch @@ -0,0 +1,71 @@ +From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:40 +0300 +Subject: [PATCH] dix: Disallow GenericEvent in SendEvent request. + +The SendEvent request holds xEvent which is exactly 32 bytes long, no more, +no less. Both ProcSendEvent and SProcSendEvent verify that the received data +exactly match the request size. However nothing stops the client from passing +in event with xEvent::type = GenericEvent and any value of +xGenericEvent::length. + +In the case of ProcSendEvent, the event will be eventually passed to +WriteEventsToClient which will see that it is Generic event and copy the +arbitrary length from the receive buffer (and possibly past it) and send it to +the other client. This allows clients to copy unitialized heap memory out of X +server or to crash it. + +In case of SProcSendEvent, it will attempt to swap the incoming event by +calling a swapping function from the EventSwapVector array. The swapped event +is written to target buffer, which in this case is local xEvent variable. The +xEvent variable is 32 bytes long, but the swapping functions for GenericEvents +expect that the target buffer has size matching the size of the source +GenericEvent. This allows clients to cause stack buffer overflows. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + dix/events.c | 6 ++++++ + dix/swapreq.c | 7 +++++++ + 2 files changed, 13 insertions(+) + +diff --git a/dix/events.c b/dix/events.c +index 3e3a01ef9..d3a33ea3f 100644 +--- a/dix/events.c ++++ b/dix/events.c +@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client) + client->errorValue = stuff->event.u.u.type; + return BadValue; + } ++ /* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++ if (stuff->event.u.u.type == GenericEvent) { ++ client->errorValue = stuff->event.u.u.type; ++ return BadValue; ++ } + if (stuff->event.u.u.type == ClientMessage && + stuff->event.u.u.detail != 8 && + stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) { +diff --git a/dix/swapreq.c b/dix/swapreq.c +index 719e9b81c..67850593b 100644 +--- a/dix/swapreq.c ++++ b/dix/swapreq.c +@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client) + swapl(&stuff->destination); + swapl(&stuff->eventMask); + ++ /* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++ if (stuff->event.u.u.type == GenericEvent) { ++ client->errorValue = stuff->event.u.u.type; ++ return BadValue; ++ } ++ + /* Swap event */ + proc = EventSwapVector[stuff->event.u.u.type & 0177]; + if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */ +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch b/package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch new file mode 100644 index 0000000000..2e651006ba --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.17.4/0004-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch @@ -0,0 +1,50 @@ +From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:41 +0300 +Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent. + +The requirement is that events have type in range +EXTENSION_EVENT_BASE..lastEvent, but it was tested +only for first event of all. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + Xi/sendexev.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 1cf118ab6..5e63bfcca 100644 +--- a/Xi/sendexev.c ++++ b/Xi/sendexev.c +@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client) + int + ProcXSendExtensionEvent(ClientPtr client) + { +- int ret; ++ int ret, i; + DeviceIntPtr dev; + xEvent *first; + XEventClass *list; +@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client) + /* The client's event type must be one defined by an extension. */ + + first = ((xEvent *) &stuff[1]); +- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && +- (first->u.u.type < lastEvent))) { +- client->errorValue = first->u.u.type; +- return BadValue; ++ for (i = 0; i < stuff->num_events; i++) { ++ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) && ++ (first[i].u.u.type < lastEvent))) { ++ client->errorValue = first[i].u.u.type; ++ return BadValue; ++ } + } + + list = (XEventClass *) (first + stuff->num_events); +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch b/package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch new file mode 100644 index 0000000000..871e7621ed --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.17.4/0005-Xi-Do-not-try-to-swap-GenericEvent.patch @@ -0,0 +1,45 @@ +From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:42 +0300 +Subject: [PATCH] Xi: Do not try to swap GenericEvent. + +The SProcXSendExtensionEvent must not attempt to swap GenericEvent because +it is assuming that the event has fixed size and gives the swapping function +xEvent-sized buffer. + +A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + Xi/sendexev.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 5e63bfcca..5c2e0fc56 100644 +--- a/Xi/sendexev.c ++++ b/Xi/sendexev.c +@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client) + + eventP = (xEvent *) &stuff[1]; + for (i = 0; i < stuff->num_events; i++, eventP++) { ++ if (eventP->u.u.type == GenericEvent) { ++ client->errorValue = eventP->u.u.type; ++ return BadValue; ++ } ++ + proc = EventSwapVector[eventP->u.u.type & 0177]; +- if (proc == NotImplemented) /* no swapping proc; invalid event type? */ ++ /* no swapping proc; invalid event type? */ ++ if (proc == NotImplemented) { ++ client->errorValue = eventP->u.u.type; + return BadValue; ++ } + (*proc) (eventP, &eventT); + *eventP = eventT; + } +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0004-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch b/package/x11r7/xserver_xorg-server/1.19.1/0004-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch new file mode 100644 index 0000000000..c15dc9f50c --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.19.1/0004-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch @@ -0,0 +1,39 @@ +From 05442de962d3dc624f79fc1a00eca3ffc5489ced Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:39 +0300 +Subject: [PATCH] Xi: Zero target buffer in SProcXSendExtensionEvent. + +Make sure that the xEvent eventT is initialized with zeros, the same way as +in SProcSendEvent. + +Some event swapping functions do not overwrite all 32 bytes of xEvent +structure, for example XSecurityAuthorizationRevoked. Two cooperating +clients, one swapped and the other not, can send +XSecurityAuthorizationRevoked event to each other to retrieve old stack data +from X server. This can be potentialy misused to go around ASLR or +stack-protector. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + Xi/sendexev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 11d82029f..1cf118ab6 100644 +--- a/Xi/sendexev.c ++++ b/Xi/sendexev.c +@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr client) + { + CARD32 *p; + int i; +- xEvent eventT; ++ xEvent eventT = { .u.u.type = 0 }; + xEvent *eventP; + EventSwapPtr proc; + +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0005-dix-Disallow-GenericEvent-in-SendEvent-request.patch b/package/x11r7/xserver_xorg-server/1.19.1/0005-dix-Disallow-GenericEvent-in-SendEvent-request.patch new file mode 100644 index 0000000000..12da5f5cba --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.19.1/0005-dix-Disallow-GenericEvent-in-SendEvent-request.patch @@ -0,0 +1,71 @@ +From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:40 +0300 +Subject: [PATCH] dix: Disallow GenericEvent in SendEvent request. + +The SendEvent request holds xEvent which is exactly 32 bytes long, no more, +no less. Both ProcSendEvent and SProcSendEvent verify that the received data +exactly match the request size. However nothing stops the client from passing +in event with xEvent::type = GenericEvent and any value of +xGenericEvent::length. + +In the case of ProcSendEvent, the event will be eventually passed to +WriteEventsToClient which will see that it is Generic event and copy the +arbitrary length from the receive buffer (and possibly past it) and send it to +the other client. This allows clients to copy unitialized heap memory out of X +server or to crash it. + +In case of SProcSendEvent, it will attempt to swap the incoming event by +calling a swapping function from the EventSwapVector array. The swapped event +is written to target buffer, which in this case is local xEvent variable. The +xEvent variable is 32 bytes long, but the swapping functions for GenericEvents +expect that the target buffer has size matching the size of the source +GenericEvent. This allows clients to cause stack buffer overflows. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + dix/events.c | 6 ++++++ + dix/swapreq.c | 7 +++++++ + 2 files changed, 13 insertions(+) + +diff --git a/dix/events.c b/dix/events.c +index 3e3a01ef9..d3a33ea3f 100644 +--- a/dix/events.c ++++ b/dix/events.c +@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client) + client->errorValue = stuff->event.u.u.type; + return BadValue; + } ++ /* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++ if (stuff->event.u.u.type == GenericEvent) { ++ client->errorValue = stuff->event.u.u.type; ++ return BadValue; ++ } + if (stuff->event.u.u.type == ClientMessage && + stuff->event.u.u.detail != 8 && + stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) { +diff --git a/dix/swapreq.c b/dix/swapreq.c +index 719e9b81c..67850593b 100644 +--- a/dix/swapreq.c ++++ b/dix/swapreq.c +@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client) + swapl(&stuff->destination); + swapl(&stuff->eventMask); + ++ /* Generic events can have variable size, but SendEvent request holds ++ exactly 32B of event data. */ ++ if (stuff->event.u.u.type == GenericEvent) { ++ client->errorValue = stuff->event.u.u.type; ++ return BadValue; ++ } ++ + /* Swap event */ + proc = EventSwapVector[stuff->event.u.u.type & 0177]; + if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */ +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0006-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch b/package/x11r7/xserver_xorg-server/1.19.1/0006-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch new file mode 100644 index 0000000000..2e651006ba --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.19.1/0006-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch @@ -0,0 +1,50 @@ +From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:41 +0300 +Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent. + +The requirement is that events have type in range +EXTENSION_EVENT_BASE..lastEvent, but it was tested +only for first event of all. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + Xi/sendexev.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 1cf118ab6..5e63bfcca 100644 +--- a/Xi/sendexev.c ++++ b/Xi/sendexev.c +@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client) + int + ProcXSendExtensionEvent(ClientPtr client) + { +- int ret; ++ int ret, i; + DeviceIntPtr dev; + xEvent *first; + XEventClass *list; +@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client) + /* The client's event type must be one defined by an extension. */ + + first = ((xEvent *) &stuff[1]); +- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && +- (first->u.u.type < lastEvent))) { +- client->errorValue = first->u.u.type; +- return BadValue; ++ for (i = 0; i < stuff->num_events; i++) { ++ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) && ++ (first[i].u.u.type < lastEvent))) { ++ client->errorValue = first[i].u.u.type; ++ return BadValue; ++ } + } + + list = (XEventClass *) (first + stuff->num_events); +-- +2.11.0 + diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0007-Xi-Do-not-try-to-swap-GenericEvent.patch b/package/x11r7/xserver_xorg-server/1.19.1/0007-Xi-Do-not-try-to-swap-GenericEvent.patch new file mode 100644 index 0000000000..871e7621ed --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.19.1/0007-Xi-Do-not-try-to-swap-GenericEvent.patch @@ -0,0 +1,45 @@ +From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 May 2017 15:54:42 +0300 +Subject: [PATCH] Xi: Do not try to swap GenericEvent. + +The SProcXSendExtensionEvent must not attempt to swap GenericEvent because +it is assuming that the event has fixed size and gives the swapping function +xEvent-sized buffer. + +A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway. + +Signed-off-by: Michal Srb +Reviewed-by: Peter Hutterer +Signed-off-by: Peter Hutterer +Signed-off-by: Peter Korsgaard +--- + Xi/sendexev.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Xi/sendexev.c b/Xi/sendexev.c +index 5e63bfcca..5c2e0fc56 100644 +--- a/Xi/sendexev.c ++++ b/Xi/sendexev.c +@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client) + + eventP = (xEvent *) &stuff[1]; + for (i = 0; i < stuff->num_events; i++, eventP++) { ++ if (eventP->u.u.type == GenericEvent) { ++ client->errorValue = eventP->u.u.type; ++ return BadValue; ++ } ++ + proc = EventSwapVector[eventP->u.u.type & 0177]; +- if (proc == NotImplemented) /* no swapping proc; invalid event type? */ ++ /* no swapping proc; invalid event type? */ ++ if (proc == NotImplemented) { ++ client->errorValue = eventP->u.u.type; + return BadValue; ++ } + (*proc) (eventP, &eventT); + *eventP = eventT; + } +-- +2.11.0 + From 466ab1420af9b4941b3cfcaf64ec5eb38d0de6d5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 10 Mar 2017 13:11:06 +0100 Subject: [PATCH 3140/3392] php: bump to version 7.1.2 7.1.2 is a bugfix release, fixing a number of issues: http://www.php.net/ChangeLog-7.php#7.1.2 Signed-off-by: Peter Korsgaard (cherry picked from commit 34d19a23ad8d46166a83da9cd84910ae1c5b2a43) Signed-off-by: Peter Korsgaard --- 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 9c94b9e4cf..47e99d4800 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 b3565b0c1441064eba204821608df1ec7367abff881286898d900c2c2a5ffe70 php-7.1.1.tar.xz +sha256 d815a0c39fd57bab1434a77ff0610fb507c22f790c66cd6f26e27030c4b3e971 php-7.1.2.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index 1379ad571b..5b113d1b3f 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.1.1 +PHP_VERSION = 7.1.2 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 697945878d83fcfd57bb31209611b293701cd01e Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 16 Mar 2017 15:53:33 +0000 Subject: [PATCH 3141/3392] php: bump version to 7.1.3 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit fca8df85c116a1ee455ba484d102fff4c869df3c) Signed-off-by: Peter Korsgaard --- 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 47e99d4800..0e71c4beac 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 d815a0c39fd57bab1434a77ff0610fb507c22f790c66cd6f26e27030c4b3e971 php-7.1.2.tar.xz +sha256 e4887c2634778e37fd962fbdf5c4a7d32cd708482fe07b448804625570cb0bb0 php-7.1.3.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index 5b113d1b3f..f59a4e8781 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.1.2 +PHP_VERSION = 7.1.3 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From dfce4519e847e598ac49860f8401477a7ccbe550 Mon Sep 17 00:00:00 2001 From: Rahul Bedarkar Date: Sun, 2 Apr 2017 00:36:31 +0530 Subject: [PATCH 3142/3392] php: add version to license string As per LICENSE file, php uses PHP license version 3.01. Signed-off-by: Rahul Bedarkar Signed-off-by: Thomas Petazzoni (cherry picked from commit e066bfa66487f5754ab69a750f49866ace3f4c72) Signed-off-by: Peter Korsgaard --- package/php/php.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/php/php.mk b/package/php/php.mk index f59a4e8781..22eeddd97c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -11,7 +11,7 @@ PHP_INSTALL_STAGING = YES PHP_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install PHP_DEPENDENCIES = host-pkgconf -PHP_LICENSE = PHP +PHP_LICENSE = PHP-3.01 PHP_LICENSE_FILES = LICENSE PHP_CONF_OPTS = \ --mandir=/usr/share/man \ From 4d041d8e4d553c969233be39f43a2e15398a4d2d Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 18 Apr 2017 11:15:21 +0100 Subject: [PATCH 3143/3392] php: bump version to 7.1.4 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 9f6357117b7a2b1ef747183834444030a5298478) Signed-off-by: Peter Korsgaard --- 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 0e71c4beac..35c592556a 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 e4887c2634778e37fd962fbdf5c4a7d32cd708482fe07b448804625570cb0bb0 php-7.1.3.tar.xz +sha256 71514386adf3e963df087c2044a0b3747900b8b1fc8da3a99f0a0ae9180d300b php-7.1.4.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index 22eeddd97c..46f57e4dc5 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.1.3 +PHP_VERSION = 7.1.4 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From fa1e277b51cf2a504d972559249b40d4ac968564 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 12 May 2017 13:45:14 +0100 Subject: [PATCH 3144/3392] php: bump version to 7.1.5 Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit f9aee682f9db9ee367afb4e3876d20c6a7ca4dc3) Signed-off-by: Peter Korsgaard --- 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 35c592556a..d34242fea0 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 71514386adf3e963df087c2044a0b3747900b8b1fc8da3a99f0a0ae9180d300b php-7.1.4.tar.xz +sha256 d149a3c396c45611f5dc6bf14be190f464897145a76a8e5851cf18ff7094f6ac php-7.1.5.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index 46f57e4dc5..cfc6789916 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.1.4 +PHP_VERSION = 7.1.5 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 2ee8d1f7d7fb628b57cf715e141a395433aa5174 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2017 10:24:53 +0200 Subject: [PATCH 3145/3392] package/php: bump version to 7.1.6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 0b5d531e6d6c79d4165d4f8f2d1e1d848bfcf7a6) Signed-off-by: Peter Korsgaard --- 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 d34242fea0..0c8518b13b 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 d149a3c396c45611f5dc6bf14be190f464897145a76a8e5851cf18ff7094f6ac php-7.1.5.tar.xz +sha256 01584dc521ab7ec84b502b61952f573652fe6aa00c18d6d844fb9209f14b245b php-7.1.6.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index cfc6789916..ed12dd354a 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.1.5 +PHP_VERSION = 7.1.6 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 5519f5dcd5be0f343a451861bbd581f6dda13626 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 11 Jul 2017 11:02:20 +0200 Subject: [PATCH 3146/3392] php: security bump to version 7.1.7 Fixes the following security issues: CVE-2017-7890 - Buffer over-read into uninitialized memory. The GIF decoding function gdImageCreateFromGifCtx in gd_gif_in.c (which can be reached with a call to the imagecreatefromstring() function) uses constant-sized color tables of size 3 * 256, but does not zero-out these arrays before use. CVE-2017-9224, CVE-2017-9226, CVE-2017-9227, CVE-2017-9228, CVE-2017-9229 - Out-of-bonds access in oniguruma regexp library. CVE-2017-11144 - In PHP before 5.6.31, 7.x before 7.0.21, and 7.1.x before 7.1.7, the openssl extension PEM sealing code did not check the return value of the OpenSSL sealing function, which could lead to a crash of the PHP interpreter, related to an interpretation conflict for a negative number in ext/openssl/openssl.c, and an OpenSSL documentation omission. CVE-2017-11145 - In PHP before 5.6.31, 7.x before 7.0.21, and 7.1.x before 7.1.7, lack of a bounds check in the date extension's timelib_meridian parsing code could be used by attackers able to supply date strings to leak information from the interpreter, related to an ext/date/lib/parse_date.c out-of-bounds read affecting the php_parse_date function. CVE-2017-11146 - In PHP through 5.6.31, 7.x through 7.0.21, and 7.1.x through 7.1.7, lack of bounds checks in the date extension's timelib_meridian parsing code could be used by attackers able to supply date strings to leak information from the interpreter, related to ext/date/lib/parse_date.c out-of-bounds reads affecting the php_parse_date function. NOTE: this vulnerability exists because of an incomplete fix for CVE-2017-11145. While we're at it, add a hash for the license file. Signed-off-by: Peter Korsgaard (cherry picked from commit 91f4c9d41209a19d16c9b7813facdea2e32e2015) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 5 ++++- package/php/php.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 0c8518b13b..c724f6d8ce 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,5 @@ # From http://php.net/downloads.php -sha256 01584dc521ab7ec84b502b61952f573652fe6aa00c18d6d844fb9209f14b245b php-7.1.6.tar.xz +sha256 0d42089729be7b2bb0308cbe189c2782f9cb4b07078c8a235495be5874fff729 php-7.1.7.tar.xz + +# License file +sha256 a44951f93b10c87c3f7cd9f311d95999c57c95ed950eec32b14c1c7ea6baf25e LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index ed12dd354a..0733bc9a2c 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.1.6 +PHP_VERSION = 7.1.7 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From ad2c4ea2cfd102f8a06342bcc596b615c0ae55ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20P=C3=A9rez=20de=20Castro?= Date: Wed, 5 Jul 2017 17:33:03 +0300 Subject: [PATCH 3147/3392] webkitgtk: bump to version 2.16.5 This simply updates to the latest stable release. WebKitGTK+ versions in the 2.1x series avoid bumping the dependencies in order to allow distributions to provide updates, therefore no new dependencies are needed. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit 23c0872442e025dd2fc6f143c1bbce6a5a7c0964) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index f01c7f0c07..5df4ce8df3 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,4 +1,4 @@ -# From http://www.webkitgtk.org/releases/webkitgtk-2.12.5.tar.xz.sha1 -sha1 2d73fd5b47c68c73aea8b3d7b88acc8e62bdb99c webkitgtk-2.12.5.tar.xz -# Calculated based on the hash above -sha256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 webkitgtk-2.12.5.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.16.5.tar.xz.sums +md5 fce72dc89cd310a663d9eb97133861fe webkitgtk-2.16.5.tar.xz +sha1 8052fda41b1b666f175baaac787c5cba39ed24a0 webkitgtk-2.16.5.tar.xz +sha256 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4 webkitgtk-2.16.5.tar.xz diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 7843373995..e9fb66bbd0 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.12.5 +WEBKITGTK_VERSION = 2.16.5 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From 7c2fbc0c5d14d52214f86c8e4437b15142b72b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20P=C3=A9rez=20de=20Castro?= Date: Wed, 5 Jul 2017 22:46:53 +0300 Subject: [PATCH 3148/3392] webkitgtk: select libgcrypt Libgrcrypt is a direct dependency of WebKitGTK+, and as such it should be selected. Signed-off-by: Adrian Perez de Castro Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [Thomas: add missing dependency on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS.] Signed-off-by: Thomas Petazzoni (cherry picked from commit b61c805fcaf8980a3dbcd23c444660f7f5327ecf) Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 2 ++ package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 25f6fad49c..7b50a13a04 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS # Disabled on SuperH because of segfault depends on BR2_USE_MMU # libglib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS @@ -30,6 +31,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_ICU select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBSECRET select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_LIBXML2 diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index e9fb66bbd0..187885add6 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -13,7 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \ - enchant harfbuzz icu jpeg libgtk3 libsecret libsoup \ + enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libxml2 libxslt sqlite webp WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ From 020c65779156d48c463f94cabbf676767ab57b0d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 11 Jul 2017 12:28:57 +0200 Subject: [PATCH 3149/3392] mpg123: security bump to version 1.25.2 >From the release notes: - Extend pow tables for layer III to properly handle files with i-stereo and 5-bit scalefactors. Never observed them for real, just as fuzzed input to trigger the read overflow. Note: This one goes on record as CVE-2017-11126, calling remote denial of service. While the accesses are out of bounds for the pow tables, they still are safely within libmpg123's memory (other static tables). Just wrong values are used for computation, no actual crash unless you use something like GCC's AddressSanitizer, nor any information disclosure. - Avoid left-shifts of negative integers in layer I decoding. While we're at it, add a hash for the license file. Signed-off-by: Peter Korsgaard (cherry picked from commit 474daa20f8da2a677250146e8ee1652206923ee8) Signed-off-by: Peter Korsgaard --- package/mpg123/mpg123.hash | 5 ++++- package/mpg123/mpg123.mk | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/mpg123/mpg123.hash b/package/mpg123/mpg123.hash index 69fbef36c2..cbab6f3ee9 100644 --- a/package/mpg123/mpg123.hash +++ b/package/mpg123/mpg123.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 0fe7270a4071367f97a7c1fb45fb2ef3cfef73509c205124e080ea569217b05f mpg123-1.25.1.tar.bz2 +sha256 5314b0fb8ad291bfc79ff4c5c321b971916819a65233ec065434358fcf8aee38 mpg123-1.25.2.tar.bz2 + +# License file +sha256 f40e0dd86b27b52e429b693a87b3ca63ae0a98a4d142e77207aa6bdf1db7a295 COPYING diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk index 8eaaa6273a..44218eda7d 100644 --- a/package/mpg123/mpg123.mk +++ b/package/mpg123/mpg123.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPG123_VERSION = 1.25.1 +MPG123_VERSION = 1.25.2 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) MPG123_CONF_OPTS = --disable-lfs-alias From baf5a9d8c751b16e6c8aa4dee6577751c3d53e94 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 Jul 2017 20:25:26 +0200 Subject: [PATCH 3150/3392] package/apache: security bump to version 2.4.27 Fixes the following security issues: CVE-2017-9788 - Uninitialized memory reflection in mod_auth_digest The value placeholder in [Proxy-]Authorization headers of type 'Digest' was not initialized or reset before or between successive key=value assignments. by mod_auth_digest. Providing an initial key with no '=' assignment could reflect the stale value of uninitialized pool memory used by the prior request, leading to leakage of potentially confidential information, and a segfault. CVE-2017-9789 - Read after free in mod_http2 When under stress, closing many connections, the HTTP/2 handling code would sometimes access memory after it has been freed, resulting in potentially erratic behaviour. Announcement: http://www.apache.org/dist/httpd/Announcement2.4.html Release notes: http://www.apache.org/dist/httpd/CHANGES_2.4.27 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit cf9b7cedac14de7cf5650589bf4c37635b5438a9) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 4 ++-- package/apache/apache.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index fe7174a4d2..f29ae45187 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,2 +1,2 @@ -# From http://www.apache.org/dist/httpd/httpd-2.4.26.tar.bz2.sha256 -sha256 a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387 httpd-2.4.26.tar.bz2 +# From http://www.apache.org/dist/httpd/httpd-2.4.27.tar.bz2.sha256 +sha256 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a httpd-2.4.27.tar.bz2 diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b276b8d493..857e538346 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.26 +APACHE_VERSION = 2.4.27 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = http://archive.apache.org/dist/httpd APACHE_LICENSE = Apache-2.0 From 055a6b24aab9ee3b09516c44affb569dd4f9d265 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 12 Jul 2017 12:40:38 -0300 Subject: [PATCH 3151/3392] linux-headers: bump 4.{9,11,12}.x series [Drop 4.11.x/4.12.x change] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 8e95c2e9ca72d39823a0ef72c69590da0ca8b140) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index db4e18f858..eea89094ed 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -224,5 +224,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.1.42" if BR2_KERNEL_HEADERS_4_1 default "4.4.76" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.36" if BR2_KERNEL_HEADERS_4_9 + default "4.9.37" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 4fe48b572e12a2024224a66a53bceac742c55a6d Mon Sep 17 00:00:00 2001 From: Ben Leinweber Date: Tue, 11 Jul 2017 19:46:51 -0700 Subject: [PATCH 3152/3392] libxml-parser-perl: add LICENSE_FILES There is copyright information in the top level README file. Use this file as the license file which will be included by the `legal-info` build rule. Signed-off-by: Ben Leinweber Signed-off-by: Andrey Smirnov Signed-off-by: Thomas Petazzoni (cherry picked from commit 730da52edc45f2b72fc1d522ff184276d20c8b0d) Signed-off-by: Peter Korsgaard --- package/libxml-parser-perl/libxml-parser-perl.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk index e512815e3f..1367a39837 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.mk +++ b/package/libxml-parser-perl/libxml-parser-perl.mk @@ -9,6 +9,7 @@ LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz LIBXML_PARSER_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat LIBXML_PARSER_PERL_LICENSE = Artistic or GPLv1+ +LIBXML_PARSER_PERL_LICENSE_FILES = README LIBXML_PARSER_PERL_RUN_PERL = `which perl` define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS From d8318535f0363dd6ae5e1b5a05a9dc5d456d21e1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 13 Jul 2017 21:39:28 +0200 Subject: [PATCH 3153/3392] package/pcre: security bump to version 8.41 Removed patches 0003 & 0004, applied upstream. Fixes the following security issues: CVE-2017-7244 - The _pcre32_xclass function in pcre_xclass.c in libpcre1 in PCRE 8.40 allows remote attackers to cause a denial of service (invalid memory read) via a crafted file. CVE-2017-7245 - Stack-based buffer overflow in the pcre32_copy_substring function in pcre_get.c in libpcre1 in PCRE 8.40 allows remote attackers to cause a denial of service (WRITE of size 4) or possibly have unspecified other impact via a crafted file. CVE-2017-7246 - Stack-based buffer overflow in the pcre32_copy_substring function in pcre_get.c in libpcre1 in PCRE 8.40 allows remote attackers to cause a denial of service (WRITE of size 268) or possibly have unspecified other impact via a crafted file. [Peter: add CVE info] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit bc6a84bb3d05e0d752ecf59bb35ac827e9b76185) Signed-off-by: Peter Korsgaard --- package/pcre/0003-CVE-2017-6004.patch | 21 ---------- package/pcre/0004-CVE-2017-7186.patch | 60 --------------------------- package/pcre/pcre.hash | 2 +- package/pcre/pcre.mk | 2 +- 4 files changed, 2 insertions(+), 83 deletions(-) delete mode 100644 package/pcre/0003-CVE-2017-6004.patch delete mode 100644 package/pcre/0004-CVE-2017-7186.patch diff --git a/package/pcre/0003-CVE-2017-6004.patch b/package/pcre/0003-CVE-2017-6004.patch deleted file mode 100644 index d0b6d51ba7..0000000000 --- a/package/pcre/0003-CVE-2017-6004.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: CVE-2017-6004: crafted regular expression may cause denial of service -Origin: upstream, https://vcs.pcre.org/pcre/code/trunk/pcre_jit_compile.c?r1=1676&r2=1680&view=patch -Bug: https://bugs.exim.org/show_bug.cgi?id=2035 -Bug-Debian: https://bugs.debian.org/855405 -Forwarded: not-needed -Author: Salvatore Bonaccorso -Last-Update: 2017-02-17 - -Signed-off-by: Baruch Siach - ---- a/pcre_jit_compile.c -+++ b/pcre_jit_compile.c -@@ -8111,7 +8111,7 @@ if (opcode == OP_COND || opcode == OP_SC - - if (*matchingpath == OP_FAIL) - stacksize = 0; -- if (*matchingpath == OP_RREF) -+ else if (*matchingpath == OP_RREF) - { - stacksize = GET2(matchingpath, 1); - if (common->currententry == NULL) diff --git a/package/pcre/0004-CVE-2017-7186.patch b/package/pcre/0004-CVE-2017-7186.patch deleted file mode 100644 index 980923ae4c..0000000000 --- a/package/pcre/0004-CVE-2017-7186.patch +++ /dev/null @@ -1,60 +0,0 @@ -Description: Upstream fix for CVE-2017-7186 (Upstream rev 1688) - Fix Unicode property crash for 32-bit characters greater than 0x10ffff. -Author: Matthew Vernon -X-Dgit-Generated: 2:8.39-3 c4c2c7c4f74d53b263af2471d8e11db88096bd13 - -Signed-off-by: Baruch Siach ---- - ---- pcre3-8.39.orig/pcre_internal.h -+++ pcre3-8.39/pcre_internal.h -@@ -2772,6 +2772,9 @@ extern const pcre_uint8 PRIV(ucd_stage1 - extern const pcre_uint16 PRIV(ucd_stage2)[]; - extern const pcre_uint32 PRIV(ucp_gentype)[]; - extern const pcre_uint32 PRIV(ucp_gbtable)[]; -+#ifdef COMPILE_PCRE32 -+extern const ucd_record PRIV(dummy_ucd_record)[]; -+#endif - #ifdef SUPPORT_JIT - extern const int PRIV(ucp_typerange)[]; - #endif -@@ -2780,9 +2783,15 @@ extern const int PRIV(ucp_typera - /* UCD access macros */ - - #define UCD_BLOCK_SIZE 128 --#define GET_UCD(ch) (PRIV(ucd_records) + \ -+#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ - PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ - UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) -+ -+#ifdef COMPILE_PCRE32 -+#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) -+#else -+#define GET_UCD(ch) REAL_GET_UCD(ch) -+#endif - - #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype - #define UCD_SCRIPT(ch) GET_UCD(ch)->script ---- pcre3-8.39.orig/pcre_ucd.c -+++ pcre3-8.39/pcre_ucd.c -@@ -38,6 +38,20 @@ const pcre_uint16 PRIV(ucd_stage2)[] = { - const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0}; - #else - -+/* If the 32-bit library is run in non-32-bit mode, character values -+greater than 0x10ffff may be encountered. For these we set up a -+special record. */ -+ -+#ifdef COMPILE_PCRE32 -+const ucd_record PRIV(dummy_ucd_record)[] = {{ -+ ucp_Common, /* script */ -+ ucp_Cn, /* type unassigned */ -+ ucp_gbOther, /* grapheme break property */ -+ 0, /* case set */ -+ 0, /* other case */ -+ }}; -+#endif -+ - /* When recompiling tables with a new Unicode version, please check the - types in this structure definition from pcre_internal.h (the actual - field names will be different): diff --git a/package/pcre/pcre.hash b/package/pcre/pcre.hash index 4c3c6c32ea..b36e130178 100644 --- a/package/pcre/pcre.hash +++ b/package/pcre/pcre.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4 pcre-8.40.tar.bz2 +sha256 e62c7eac5ae7c0e7286db61ff82912e1c0b7a0c13706616e94a7dd729321b530 pcre-8.41.tar.bz2 diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index e302ed7d8d..5734fce290 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE_VERSION = 8.40 +PCRE_VERSION = 8.41 PCRE_SITE = https://ftp.pcre.org/pub/pcre PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 PCRE_LICENSE = BSD-3c From ad3d9f8bd6e85f2ddbb03757dddc5b6ac0c6150b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 13 Jul 2017 22:03:48 +0200 Subject: [PATCH 3154/3392] package/samba4: security bump to version 4.5.12 Fixes CVE-2017-11103: All versions of Samba from 4.0.0 onwards using embedded Heimdal Kerberos are vulnerable to a man-in-the-middle attack impersonating a trusted server, who may gain elevated access to the domain by returning malicious replication or authorization data. Samba binaries built against MIT Kerberos are not vulnerable. https://www.samba.org/samba/history/samba-4.5.12.html [Peter: add CVE info] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit f97510659f914ee51c0f32e82664179a69ab17ba) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 2 +- package/samba4/samba4.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index a16d834700..0783b37d06 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7cb753f5f6d5527ef40d4c1f47dacafb7c876cb304b4906ccb390c6a18477714 samba-4.5.10.tar.gz +sha256 f4c17123e3cc852a5ecc7e38884b00deab57632b9519aebc243e2a94b9b5ace4 samba-4.5.12.tar.gz diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 0ad4b64f58..3ffe11e15f 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.5.10 +SAMBA4_VERSION = 4.5.12 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 2dca04ef7e6af2c955248c792f216aa887ff6473 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 14 Jul 2017 16:02:03 +0200 Subject: [PATCH 3155/3392] spice: add upstream security fixes for CVE-2017-7506 Fixes CVE-2017-7506 - Possible buffer overflow via invalid monitor configurations. For more details, see: https://marc.info/?l=oss-security&m=150001782924095 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 31bd29fe093a258755929a23d764b02323fcdc46) Signed-off-by: Peter Korsgaard --- ...when-receiving-overly-big-ClientMoni.patch | 75 +++++++++++++++++++ ...er-overflows-handling-monitor-config.patch | 31 ++++++++ ...r-overflows-handling-monitor-configu.patch | 48 ++++++++++++ 3 files changed, 154 insertions(+) create mode 100644 package/spice/0004-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch create mode 100644 package/spice/0005-reds-Avoid-integer-overflows-handling-monitor-config.patch create mode 100644 package/spice/0006-reds-Avoid-buffer-overflows-handling-monitor-configu.patch diff --git a/package/spice/0004-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch b/package/spice/0004-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch new file mode 100644 index 0000000000..070259f2bb --- /dev/null +++ b/package/spice/0004-reds-Disconnect-when-receiving-overly-big-ClientMoni.patch @@ -0,0 +1,75 @@ +From f1e7ec03e26ab6b8ca9b7ec060846a5b706a963d Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Mon, 15 May 2017 15:57:28 +0100 +Subject: [PATCH] reds: Disconnect when receiving overly big + ClientMonitorsConfig + +Total message size received from the client was unlimited. There is +a 2kiB size check on individual agent messages, but the MonitorsConfig +message can be split in multiple chunks, and the size of the +non-chunked MonitorsConfig message was never checked. This could easily +lead to memory exhaustion on the host. + +Signed-off-by: Frediano Ziglio +Signed-off-by: Peter Korsgaard +--- + server/reds.c | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +diff --git a/server/reds.c b/server/reds.c +index f439a366..7be85fdf 100644 +--- a/server/reds.c ++++ b/server/reds.c +@@ -993,19 +993,34 @@ static void reds_client_monitors_config_cleanup(void) + static void reds_on_main_agent_monitors_config( + MainChannelClient *mcc, void *message, size_t size) + { ++ const unsigned int MAX_MONITORS = 256; ++ const unsigned int MAX_MONITOR_CONFIG_SIZE = ++ sizeof(VDAgentMonitorsConfig) + MAX_MONITORS * sizeof(VDAgentMonConfig); ++ + VDAgentMessage *msg_header; + VDAgentMonitorsConfig *monitors_config; + RedsClientMonitorsConfig *cmc = &reds->client_monitors_config; + ++ // limit size of message sent by the client as this can cause a DoS through ++ // memory exhaustion, or potentially some integer overflows ++ if (sizeof(VDAgentMessage) + MAX_MONITOR_CONFIG_SIZE - cmc->buffer_size < size) { ++ goto overflow; ++ } + cmc->buffer_size += size; + cmc->buffer = realloc(cmc->buffer, cmc->buffer_size); + spice_assert(cmc->buffer); + cmc->mcc = mcc; + memcpy(cmc->buffer + cmc->buffer_pos, message, size); + cmc->buffer_pos += size; ++ if (sizeof(VDAgentMessage) > cmc->buffer_size) { ++ spice_debug("not enough data yet. %d", cmc->buffer_size); ++ return; ++ } + msg_header = (VDAgentMessage *)cmc->buffer; +- if (sizeof(VDAgentMessage) > cmc->buffer_size || +- msg_header->size > cmc->buffer_size - sizeof(VDAgentMessage)) { ++ if (msg_header->size > MAX_MONITOR_CONFIG_SIZE) { ++ goto overflow; ++ } ++ if (msg_header->size > cmc->buffer_size - sizeof(VDAgentMessage)) { + spice_debug("not enough data yet. %d", cmc->buffer_size); + return; + } +@@ -1013,6 +1028,12 @@ static void reds_on_main_agent_monitors_config( + spice_debug("%s: %d", __func__, monitors_config->num_of_monitors); + red_dispatcher_client_monitors_config(monitors_config); + reds_client_monitors_config_cleanup(); ++ return; ++ ++overflow: ++ spice_warning("received invalid MonitorsConfig request from client, disconnecting"); ++ red_channel_client_disconnect(main_channel_client_get_base(mcc)); ++ reds_client_monitors_config_cleanup(); + } + + void reds_on_main_agent_data(MainChannelClient *mcc, void *message, size_t size) +-- +2.11.0 + diff --git a/package/spice/0005-reds-Avoid-integer-overflows-handling-monitor-config.patch b/package/spice/0005-reds-Avoid-integer-overflows-handling-monitor-config.patch new file mode 100644 index 0000000000..98740520c1 --- /dev/null +++ b/package/spice/0005-reds-Avoid-integer-overflows-handling-monitor-config.patch @@ -0,0 +1,31 @@ +From ec6229c79abe05d731953df5f7e9a05ec9f6df79 Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Mon, 15 May 2017 15:57:28 +0100 +Subject: [PATCH] reds: Avoid integer overflows handling monitor + configuration + +Avoid VDAgentMessage::size integer overflows. + +Signed-off-by: Frediano Ziglio +Signed-off-by: Peter Korsgaard +--- + server/reds.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/server/reds.c b/server/reds.c +index 7be85fdf..e1c8c108 100644 +--- a/server/reds.c ++++ b/server/reds.c +@@ -1024,6 +1024,9 @@ static void reds_on_main_agent_monitors_config( + spice_debug("not enough data yet. %d", cmc->buffer_size); + return; + } ++ if (msg_header->size < sizeof(VDAgentMonitorsConfig)) { ++ goto overflow; ++ } + monitors_config = (VDAgentMonitorsConfig *)(cmc->buffer + sizeof(*msg_header)); + spice_debug("%s: %d", __func__, monitors_config->num_of_monitors); + red_dispatcher_client_monitors_config(monitors_config); +-- +2.11.0 + diff --git a/package/spice/0006-reds-Avoid-buffer-overflows-handling-monitor-configu.patch b/package/spice/0006-reds-Avoid-buffer-overflows-handling-monitor-configu.patch new file mode 100644 index 0000000000..212645b44f --- /dev/null +++ b/package/spice/0006-reds-Avoid-buffer-overflows-handling-monitor-configu.patch @@ -0,0 +1,48 @@ +From a957a90baf2c62d31f3547e56bba7d0e812d2331 Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Mon, 15 May 2017 15:57:28 +0100 +Subject: [PATCH] reds: Avoid buffer overflows handling monitor + configuration + +It was also possible for a malicious client to set +VDAgentMonitorsConfig::num_of_monitors to a number larger +than the actual size of VDAgentMOnitorsConfig::monitors. +This would lead to buffer overflows, which could allow the guest to +read part of the host memory. This might cause write overflows in the +host as well, but controlling the content of such buffers seems +complicated. + +Signed-off-by: Frediano Ziglio +Signed-off-by: Peter Korsgaard +--- + server/reds.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/server/reds.c b/server/reds.c +index e1c8c108..3a42c375 100644 +--- a/server/reds.c ++++ b/server/reds.c +@@ -1000,6 +1000,7 @@ static void reds_on_main_agent_monitors_config( + VDAgentMessage *msg_header; + VDAgentMonitorsConfig *monitors_config; + RedsClientMonitorsConfig *cmc = &reds->client_monitors_config; ++ uint32_t max_monitors; + + // limit size of message sent by the client as this can cause a DoS through + // memory exhaustion, or potentially some integer overflows +@@ -1028,6 +1029,12 @@ static void reds_on_main_agent_monitors_config( + goto overflow; + } + monitors_config = (VDAgentMonitorsConfig *)(cmc->buffer + sizeof(*msg_header)); ++ // limit the monitor number to avoid buffer overflows ++ max_monitors = (msg_header->size - sizeof(VDAgentMonitorsConfig)) / ++ sizeof(VDAgentMonConfig); ++ if (monitors_config->num_of_monitors > max_monitors) { ++ goto overflow; ++ } + spice_debug("%s: %d", __func__, monitors_config->num_of_monitors); + red_dispatcher_client_monitors_config(monitors_config); + reds_client_monitors_config_cleanup(); +-- +2.11.0 + From 8b9602ab0b2818c51e692871b94ff63995d20a62 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 22 May 2017 11:13:53 +0100 Subject: [PATCH 3156/3392] tiff: bump version to 4.0.8 Patch 0001 already included in this release: https://github.com/vadz/libtiff/commit/438274f938e046d33cb0e1230b41da32ffe223e1 Patch 0002 already included in this release: https://github.com/vadz/libtiff/commit/43bc256d8ae44b92d2734a3c5bc73957a4d7c1ec Patch 0003 already included in this release: https://github.com/vadz/libtiff/commit/1044b43637fa7f70fb19b93593777b78bd20da86 Patch 0004 already included in this release: https://github.com/vadz/libtiff/commit/9a72a69e035ee70ff5c41541c8c61cd97990d018 Patch 0005 already included in this release: https://github.com/vadz/libtiff/commit/5c080298d59efa53264d7248bbe3a04660db6ef7 Patch 0006 already included in this release: https://github.com/vadz/libtiff/commit/48780b4fcc425cddc4ef8ffdf536f96a0d1b313b Patch 0007 already included in this release: https://github.com/vadz/libtiff/commit/d60332057b9575ada4f264489582b13e30137be1 Patch 0008 already included in this release: https://github.com/vadz/libtiff/commit/2ea32f7372b65c24b2816f11c04bf59b5090d05b Patch 0009 already included in this release: https://github.com/vadz/libtiff/commit/8283e4d1b7e53340684d12932880cbcbaf23a8c1 Patch 0010 already included in this release: https://github.com/vadz/libtiff/commit/47f2fb61a3a64667bce1a8398a8fcb1b348ff122 Patch 0011 already included in this release: https://github.com/vadz/libtiff/commit/3cfd62d77c2a7e147a05bd678524c345fa9c2bb8 Patch 0012 already included in this release: https://github.com/vadz/libtiff/commit/0a76a8c765c7b8327c59646284fa78c3c27e5490 Patch 0013 already included in this release: https://github.com/vadz/libtiff/commit/66e7bd59520996740e4df5495a830b42fae48bc4 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 3301fbb516992db94e3481690074640d2db9773b) Signed-off-by: Peter Korsgaard --- ....c-libtiff-tiffiop.h-fix-uint32-over.patch | 46 -------- ...g.c-make-OJPEGDecode-early-exit-in-c.patch | 53 --------- ...rlog.c-libtiff-tif_luv.c-fix-heap-ba.patch | 110 ------------------ ...ead.c-modify-ChopUpSingleUncompresse.patch | 107 ----------------- ...rror-out-cleanly-in-cpContig2Separat.patch | 74 ------------ ...mage.c-add-explicit-uint32-cast-in-p.patch | 31 ----- ...h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch | 88 -------------- ...g.c-fix-leak-in-OJPEGReadHeaderInfoS.patch | 43 ------- ...g.c-fix-leak-in-OJPEGReadHeaderInfoS.patch | 36 ------ ....c-avoid-integer-division-by-zero-in.patch | 35 ------ ...ead.c-avoid-division-by-floating-poi.patch | 47 -------- ....c-validate-BitsPerSample-in-JPEGSet.patch | 35 ------ ....c-avoid-potential-undefined-behavio.patch | 56 --------- package/tiff/tiff.hash | 2 +- package/tiff/tiff.mk | 2 +- 15 files changed, 2 insertions(+), 763 deletions(-) delete mode 100644 package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch delete mode 100644 package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch delete mode 100644 package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch delete mode 100644 package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch delete mode 100644 package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch delete mode 100644 package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch delete mode 100644 package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch delete mode 100644 package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch delete mode 100644 package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch delete mode 100644 package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch delete mode 100644 package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch delete mode 100644 package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch delete mode 100644 package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch diff --git a/package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch b/package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch deleted file mode 100644 index 9df4577e14..0000000000 --- a/package/tiff/0001-libtiff-tif_read.c-libtiff-tiffiop.h-fix-uint32-over.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 438274f938e046d33cb0e1230b41da32ffe223e1 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Fri, 2 Dec 2016 21:56:56 +0000 -Subject: [PATCH] * libtiff/tif_read.c, libtiff/tiffiop.h: fix uint32 overflow - in TIFFReadEncodedStrip() that caused an integer division by zero. Reported - by Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2596 - -Fixes CVE-2016-10266 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_read.c | 2 +- - libtiff/tiffiop.h | 4 ++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c -index c26c55f4..52bbf507 100644 ---- a/libtiff/tif_read.c -+++ b/libtiff/tif_read.c -@@ -346,7 +346,7 @@ TIFFReadEncodedStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size) - rowsperstrip=td->td_rowsperstrip; - if (rowsperstrip>td->td_imagelength) - rowsperstrip=td->td_imagelength; -- stripsperplane=((td->td_imagelength+rowsperstrip-1)/rowsperstrip); -+ stripsperplane= TIFFhowmany_32_maxuint_compat(td->td_imagelength, rowsperstrip); - stripinplane=(strip%stripsperplane); - plane=(uint16)(strip/stripsperplane); - rows=td->td_imagelength-stripinplane*rowsperstrip; -diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h -index ffbb647b..cb59460a 100644 ---- a/libtiff/tiffiop.h -+++ b/libtiff/tiffiop.h -@@ -250,6 +250,10 @@ struct tiff { - #define TIFFhowmany_32(x, y) (((uint32)x < (0xffffffff - (uint32)(y-1))) ? \ - ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y))) : \ - 0U) -+/* Variant of TIFFhowmany_32() that doesn't return 0 if x close to MAXUINT. */ -+/* Caution: TIFFhowmany_32_maxuint_compat(x,y)*y might overflow */ -+#define TIFFhowmany_32_maxuint_compat(x, y) \ -+ (((uint32)(x) / (uint32)(y)) + ((((uint32)(x) % (uint32)(y)) != 0) ? 1 : 0)) - #define TIFFhowmany8_32(x) (((x)&0x07)?((uint32)(x)>>3)+1:(uint32)(x)>>3) - #define TIFFroundup_32(x, y) (TIFFhowmany_32(x,y)*(y)) - #define TIFFhowmany_64(x, y) ((((uint64)(x))+(((uint64)(y))-1))/((uint64)(y))) --- -2.11.0 - diff --git a/package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch b/package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch deleted file mode 100644 index d99b9007e8..0000000000 --- a/package/tiff/0002-libtiff-tif_ojpeg.c-make-OJPEGDecode-early-exit-in-c.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 43bc256d8ae44b92d2734a3c5bc73957a4d7c1ec Mon Sep 17 00:00:00 2001 -From: erouault -Date: Sat, 3 Dec 2016 11:15:18 +0000 -Subject: [PATCH] * libtiff/tif_ojpeg.c: make OJPEGDecode() early exit in case - of failure in OJPEGPreDecode(). This will avoid a divide by zero, and - potential other issues. Reported by Agostino Sarubbo. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2611 - -Fixes CVE-2016-10267 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_ojpeg.c | 8 ++++++++ - 1 files changed, 15 insertions(+) - -diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c -index 1ccc3f9b..f19e8fd0 100644 ---- a/libtiff/tif_ojpeg.c -+++ b/libtiff/tif_ojpeg.c -@@ -244,6 +244,7 @@ typedef enum { - - typedef struct { - TIFF* tif; -+ int decoder_ok; - #ifndef LIBJPEG_ENCAP_EXTERNAL - JMP_BUF exit_jmpbuf; - #endif -@@ -722,6 +723,7 @@ OJPEGPreDecode(TIFF* tif, uint16 s) - } - sp->write_curstrile++; - } -+ sp->decoder_ok = 1; - return(1); - } - -@@ -784,8 +786,14 @@ OJPEGPreDecodeSkipScanlines(TIFF* tif) - static int - OJPEGDecode(TIFF* tif, uint8* buf, tmsize_t cc, uint16 s) - { -+ static const char module[]="OJPEGDecode"; - OJPEGState* sp=(OJPEGState*)tif->tif_data; - (void)s; -+ if( !sp->decoder_ok ) -+ { -+ TIFFErrorExt(tif->tif_clientdata,module,"Cannot decode: decoder not correctly initialized"); -+ return 0; -+ } - if (sp->libjpeg_jpeg_query_style==0) - { - if (OJPEGDecodeRaw(tif,buf,cc)==0) --- -2.11.0 - diff --git a/package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch b/package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch deleted file mode 100644 index 290834ec05..0000000000 --- a/package/tiff/0003-libtiff-tif_pixarlog.c-libtiff-tif_luv.c-fix-heap-ba.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 1044b43637fa7f70fb19b93593777b78bd20da86 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Fri, 2 Dec 2016 23:05:51 +0000 -Subject: [PATCH] * libtiff/tif_pixarlog.c, libtiff/tif_luv.c: fix heap-based - buffer overflow on generation of PixarLog / LUV compressed files, with - ColorMap, TransferFunction attached and nasty plays with bitspersample. The - fix for LUV has not been tested, but suffers from the same kind of issue of - PixarLog. Reported by Agostino Sarubbo. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2604 - -Fixes CVE-2016-10269 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_luv.c | 18 ++++++++++++++---- - libtiff/tif_pixarlog.c | 17 +++++++++++++++-- - 2 files changed, 39 insertions(+), 6 deletions(-) - -diff --git a/libtiff/tif_luv.c b/libtiff/tif_luv.c -index f68a9b13..e6783db5 100644 ---- a/libtiff/tif_luv.c -+++ b/libtiff/tif_luv.c -@@ -158,6 +158,7 @@ - typedef struct logLuvState LogLuvState; - - struct logLuvState { -+ int encoder_state; /* 1 if encoder correctly initialized */ - int user_datafmt; /* user data format */ - int encode_meth; /* encoding method */ - int pixel_size; /* bytes per pixel */ -@@ -1552,6 +1553,7 @@ LogLuvSetupEncode(TIFF* tif) - td->td_photometric, "must be either LogLUV or LogL"); - break; - } -+ sp->encoder_state = 1; - return (1); - notsupported: - TIFFErrorExt(tif->tif_clientdata, module, -@@ -1563,19 +1565,27 @@ notsupported: - static void - LogLuvClose(TIFF* tif) - { -+ LogLuvState* sp = (LogLuvState*) tif->tif_data; - TIFFDirectory *td = &tif->tif_dir; - -+ assert(sp != 0); - /* - * For consistency, we always want to write out the same - * bitspersample and sampleformat for our TIFF file, - * regardless of the data format being used by the application. - * Since this routine is called after tags have been set but - * before they have been recorded in the file, we reset them here. -+ * Note: this is really a nasty approach. See PixarLogClose - */ -- td->td_samplesperpixel = -- (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; -- td->td_bitspersample = 16; -- td->td_sampleformat = SAMPLEFORMAT_INT; -+ if( sp->encoder_state ) -+ { -+ /* See PixarLogClose. Might avoid issues with tags whose size depends -+ * on those below, but not completely sure this is enough. */ -+ td->td_samplesperpixel = -+ (td->td_photometric == PHOTOMETRIC_LOGL) ? 1 : 3; -+ td->td_bitspersample = 16; -+ td->td_sampleformat = SAMPLEFORMAT_INT; -+ } - } - - static void -diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c -index d1246c3d..aa99bc92 100644 ---- a/libtiff/tif_pixarlog.c -+++ b/libtiff/tif_pixarlog.c -@@ -1233,8 +1233,10 @@ PixarLogPostEncode(TIFF* tif) - static void - PixarLogClose(TIFF* tif) - { -+ PixarLogState* sp = (PixarLogState*) tif->tif_data; - TIFFDirectory *td = &tif->tif_dir; - -+ assert(sp != 0); - /* In a really sneaky (and really incorrect, and untruthful, and - * troublesome, and error-prone) maneuver that completely goes against - * the spirit of TIFF, and breaks TIFF, on close, we covertly -@@ -1243,8 +1245,19 @@ PixarLogClose(TIFF* tif) - * readers that don't know about PixarLog, or how to set - * the PIXARLOGDATFMT pseudo-tag. - */ -- td->td_bitspersample = 8; -- td->td_sampleformat = SAMPLEFORMAT_UINT; -+ -+ if (sp->state&PLSTATE_INIT) { -+ /* We test the state to avoid an issue such as in -+ * http://bugzilla.maptools.org/show_bug.cgi?id=2604 -+ * What appends in that case is that the bitspersample is 1 and -+ * a TransferFunction is set. The size of the TransferFunction -+ * depends on 1<td_bitspersample = 8; -+ td->td_sampleformat = SAMPLEFORMAT_UINT; -+ } - } - - static void --- -2.11.0 - diff --git a/package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch b/package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch deleted file mode 100644 index a24d5d8487..0000000000 --- a/package/tiff/0004-libtiff-tif_dirread.c-modify-ChopUpSingleUncompresse.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 9a72a69e035ee70ff5c41541c8c61cd97990d018 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Sat, 3 Dec 2016 11:02:15 +0000 -Subject: [PATCH] * libtiff/tif_dirread.c: modify - ChopUpSingleUncompressedStrip() to instanciate compute ntrips as - TIFFhowmany_32(td->td_imagelength, rowsperstrip), instead of a logic based on - the total size of data. Which is faulty is the total size of data is not - sufficient to fill the whole image, and thus results in reading outside of - the StripByCounts/StripOffsets arrays when using TIFFReadScanline(). Reported - by Agostino Sarubbo. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2608. - -* libtiff/tif_strip.c: revert the change in TIFFNumberOfStrips() done -for http://bugzilla.maptools.org/show_bug.cgi?id=2587 / CVE-2016-9273 since -the above change is a better fix that makes it unnecessary. - -Fixes CVE-2016-10270 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_dirread.c | 22 ++++++++++------------ - libtiff/tif_strip.c | 9 --------- - 2 files changed, 25 insertions(+), 21 deletions(-) - -diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c -index 3eec79c9..570d0c32 100644 ---- a/libtiff/tif_dirread.c -+++ b/libtiff/tif_dirread.c -@@ -5502,8 +5502,7 @@ ChopUpSingleUncompressedStrip(TIFF* tif) - uint64 rowblockbytes; - uint64 stripbytes; - uint32 strip; -- uint64 nstrips64; -- uint32 nstrips32; -+ uint32 nstrips; - uint32 rowsperstrip; - uint64* newcounts; - uint64* newoffsets; -@@ -5534,18 +5533,17 @@ ChopUpSingleUncompressedStrip(TIFF* tif) - return; - - /* -- * never increase the number of strips in an image -+ * never increase the number of rows per strip - */ - if (rowsperstrip >= td->td_rowsperstrip) - return; -- nstrips64 = TIFFhowmany_64(bytecount, stripbytes); -- if ((nstrips64==0)||(nstrips64>0xFFFFFFFF)) /* something is wonky, do nothing. */ -- return; -- nstrips32 = (uint32)nstrips64; -+ nstrips = TIFFhowmany_32(td->td_imagelength, rowsperstrip); -+ if( nstrips == 0 ) -+ return; - -- newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), -+ newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), - "for chopped \"StripByteCounts\" array"); -- newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips32, sizeof (uint64), -+ newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64), - "for chopped \"StripOffsets\" array"); - if (newcounts == NULL || newoffsets == NULL) { - /* -@@ -5562,18 +5560,18 @@ ChopUpSingleUncompressedStrip(TIFF* tif) - * Fill the strip information arrays with new bytecounts and offsets - * that reflect the broken-up format. - */ -- for (strip = 0; strip < nstrips32; strip++) { -+ for (strip = 0; strip < nstrips; strip++) { - if (stripbytes > bytecount) - stripbytes = bytecount; - newcounts[strip] = stripbytes; -- newoffsets[strip] = offset; -+ newoffsets[strip] = stripbytes ? offset : 0; - offset += stripbytes; - bytecount -= stripbytes; - } - /* - * Replace old single strip info with multi-strip info. - */ -- td->td_stripsperimage = td->td_nstrips = nstrips32; -+ td->td_stripsperimage = td->td_nstrips = nstrips; - TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip); - - _TIFFfree(td->td_stripbytecount); -diff --git a/libtiff/tif_strip.c b/libtiff/tif_strip.c -index 4c46ecf5..1676e47d 100644 ---- a/libtiff/tif_strip.c -+++ b/libtiff/tif_strip.c -@@ -63,15 +63,6 @@ TIFFNumberOfStrips(TIFF* tif) - TIFFDirectory *td = &tif->tif_dir; - uint32 nstrips; - -- /* If the value was already computed and store in td_nstrips, then return it, -- since ChopUpSingleUncompressedStrip might have altered and resized the -- since the td_stripbytecount and td_stripoffset arrays to the new value -- after the initial affectation of td_nstrips = TIFFNumberOfStrips() in -- tif_dirread.c ~line 3612. -- See http://bugzilla.maptools.org/show_bug.cgi?id=2587 */ -- if( td->td_nstrips ) -- return td->td_nstrips; -- - nstrips = (td->td_rowsperstrip == (uint32) -1 ? 1 : - TIFFhowmany_32(td->td_imagelength, td->td_rowsperstrip)); - if (td->td_planarconfig == PLANARCONFIG_SEPARATE) --- -2.11.0 - diff --git a/package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch b/package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch deleted file mode 100644 index c93be89e7d..0000000000 --- a/package/tiff/0005-tools-tiffcp.c-error-out-cleanly-in-cpContig2Separat.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 5c080298d59efa53264d7248bbe3a04660db6ef7 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 19:25:44 +0000 -Subject: [PATCH] * tools/tiffcp.c: error out cleanly in cpContig2SeparateByRow - and cpSeparate2ContigByRow if BitsPerSample != 8 to avoid heap based - overflow. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2656 and - http://bugzilla.maptools.org/show_bug.cgi?id=2657 - -Fixes CVE-2017-5225 - -Signed-off-by: Peter Korsgaard ---- - tools/tiffcp.c | 24 ++++++++++++++++++++++-- - 1 file changed, 29 insertions(+), 2 deletions(-) - -diff --git a/tools/tiffcp.c b/tools/tiffcp.c -index bdf754c3..8bbcd52f 100644 ---- a/tools/tiffcp.c -+++ b/tools/tiffcp.c -@@ -591,7 +591,7 @@ static copyFunc pickCopyFunc(TIFF*, TIFF*, uint16, uint16); - static int - tiffcp(TIFF* in, TIFF* out) - { -- uint16 bitspersample, samplesperpixel = 1; -+ uint16 bitspersample = 1, samplesperpixel = 1; - uint16 input_compression, input_photometric = PHOTOMETRIC_MINISBLACK; - copyFunc cf; - uint32 width, length; -@@ -1067,6 +1067,16 @@ DECLAREcpFunc(cpContig2SeparateByRow) - register uint32 n; - uint32 row; - tsample_t s; -+ uint16 bps = 0; -+ -+ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps); -+ if( bps != 8 ) -+ { -+ TIFFError(TIFFFileName(in), -+ "Error, can only handle BitsPerSample=8 in %s", -+ "cpContig2SeparateByRow"); -+ return 0; -+ } - - inbuf = _TIFFmalloc(scanlinesizein); - outbuf = _TIFFmalloc(scanlinesizeout); -@@ -1120,6 +1130,16 @@ DECLAREcpFunc(cpSeparate2ContigByRow) - register uint32 n; - uint32 row; - tsample_t s; -+ uint16 bps = 0; -+ -+ (void) TIFFGetField(in, TIFFTAG_BITSPERSAMPLE, &bps); -+ if( bps != 8 ) -+ { -+ TIFFError(TIFFFileName(in), -+ "Error, can only handle BitsPerSample=8 in %s", -+ "cpSeparate2ContigByRow"); -+ return 0; -+ } - - inbuf = _TIFFmalloc(scanlinesizein); - outbuf = _TIFFmalloc(scanlinesizeout); -@@ -1784,7 +1804,7 @@ pickCopyFunc(TIFF* in, TIFF* out, uint16 bitspersample, uint16 samplesperpixel) - uint32 w, l, tw, tl; - int bychunk; - -- (void) TIFFGetField(in, TIFFTAG_PLANARCONFIG, &shortv); -+ (void) TIFFGetFieldDefaulted(in, TIFFTAG_PLANARCONFIG, &shortv); - if (shortv != config && bitspersample != 8 && samplesperpixel > 1) { - fprintf(stderr, - "%s: Cannot handle different planar configuration w/ bits/sample != 8\n", --- -2.11.0 - diff --git a/package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch b/package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch deleted file mode 100644 index b3d8a40bba..0000000000 --- a/package/tiff/0006-libtiff-tif_getimage.c-add-explicit-uint32-cast-in-p.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 48780b4fcc425cddc4ef8ffdf536f96a0d1b313b Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 16:38:26 +0000 -Subject: [PATCH] libtiff/tif_getimage.c: add explicit uint32 cast in putagreytile to - avoid UndefinedBehaviorSanitizer warning. - Patch by Nicolás Peña. - Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2658 - -Fixes CVE-2017-7592 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_getimage.c | 2 +- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c -index fed31f1f..2fa1775c 100644 ---- a/libtiff/tif_getimage.c -+++ b/libtiff/tif_getimage.c -@@ -1302,7 +1302,7 @@ DECLAREContigPutFunc(putagreytile) - while (h-- > 0) { - for (x = w; x-- > 0;) - { -- *cp++ = BWmap[*pp][0] & (*(pp+1) << 24 | ~A1); -+ *cp++ = BWmap[*pp][0] & ((uint32)*(pp+1) << 24 | ~A1); - pp += samplesperpixel; - } - cp += toskew; --- -2.11.0 - diff --git a/package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch b/package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch deleted file mode 100644 index ec45bbe1fc..0000000000 --- a/package/tiff/0007-libtiff-tiffiop.h-tif_unix.c-tif_win32.c-tif_vms.c-a.patch +++ /dev/null @@ -1,88 +0,0 @@ -From d60332057b9575ada4f264489582b13e30137be1 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 19:02:49 +0000 -Subject: [PATCH] * libtiff/tiffiop.h, tif_unix.c, tif_win32.c, tif_vms.c: add - _TIFFcalloc() - -* libtiff/tif_read.c: TIFFReadBufferSetup(): use _TIFFcalloc() to zero -initialize tif_rawdata. -Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2651 - -Fixes CVE-2017-7593 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_read.c | 4 +++- - libtiff/tif_unix.c | 8 ++++++++ - libtiff/tif_win32.c | 8 ++++++++ - libtiff/tiffio.h | 1 + - 4 files changed, 36 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c -index 277fdd69..4535ccb3 100644 ---- a/libtiff/tif_read.c -+++ b/libtiff/tif_read.c -@@ -985,7 +985,9 @@ TIFFReadBufferSetup(TIFF* tif, void* bp, tmsize_t size) - "Invalid buffer size"); - return (0); - } -- tif->tif_rawdata = (uint8*) _TIFFmalloc(tif->tif_rawdatasize); -+ /* Initialize to zero to avoid uninitialized buffers in case of */ -+ /* short reads (http://bugzilla.maptools.org/show_bug.cgi?id=2651) */ -+ tif->tif_rawdata = (uint8*) _TIFFcalloc(1, tif->tif_rawdatasize); - tif->tif_flags |= TIFF_MYBUFFER; - } - if (tif->tif_rawdata == NULL) { -diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c -index 7c7bc961..89dd32e8 100644 ---- a/libtiff/tif_unix.c -+++ b/libtiff/tif_unix.c -@@ -316,6 +316,14 @@ _TIFFmalloc(tmsize_t s) - return (malloc((size_t) s)); - } - -+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) -+{ -+ if( nmemb == 0 || siz == 0 ) -+ return ((void *) NULL); -+ -+ return calloc((size_t) nmemb, (size_t)siz); -+} -+ - void - _TIFFfree(void* p) - { -diff --git a/libtiff/tif_win32.c b/libtiff/tif_win32.c -index d730b3ab..3e9001b7 100644 ---- a/libtiff/tif_win32.c -+++ b/libtiff/tif_win32.c -@@ -360,6 +360,14 @@ _TIFFmalloc(tmsize_t s) - return (malloc((size_t) s)); - } - -+void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) -+{ -+ if( nmemb == 0 || siz == 0 ) -+ return ((void *) NULL); -+ -+ return calloc((size_t) nmemb, (size_t)siz); -+} -+ - void - _TIFFfree(void* p) - { -diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h -index 732da17f..fbd9171f 100644 ---- a/libtiff/tiffio.h -+++ b/libtiff/tiffio.h -@@ -293,6 +293,7 @@ extern TIFFCodec* TIFFGetConfiguredCODECs(void); - */ - - extern void* _TIFFmalloc(tmsize_t s); -+extern void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz); - extern void* _TIFFrealloc(void* p, tmsize_t s); - extern void _TIFFmemset(void* p, int v, tmsize_t c); - extern void _TIFFmemcpy(void* d, const void* s, tmsize_t c); --- -2.11.0 - diff --git a/package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch b/package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch deleted file mode 100644 index 418a3d6980..0000000000 --- a/package/tiff/0008-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 2ea32f7372b65c24b2816f11c04bf59b5090d05b Mon Sep 17 00:00:00 2001 -From: erouault -Date: Thu, 12 Jan 2017 19:23:20 +0000 -Subject: [PATCH] * libtiff/tif_ojpeg.c: fix leak in - OJPEGReadHeaderInfoSecTablesQTable, OJPEGReadHeaderInfoSecTablesDcTable and - OJPEGReadHeaderInfoSecTablesAcTable - -Fixes CVE-2017-7594 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_ojpeg.c | 6 ++++++ - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c -index b92f0ebd..5f6c684c 100644 ---- a/libtiff/tif_ojpeg.c -+++ b/libtiff/tif_ojpeg.c -@@ -1790,7 +1790,10 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif) - TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET); - p=(uint32)TIFFReadFile(tif,&ob[sizeof(uint32)+5],64); - if (p!=64) -+ { -+ _TIFFfree(ob); - return(0); -+ } - sp->qtable[m]=ob; - sp->sof_tq[m]=m; - } -@@ -1854,7 +1857,10 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif) - rb[sizeof(uint32)+5+n]=o[n]; - p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); - if (p!=q) -+ { -+ _TIFFfree(rb); - return(0); -+ } - sp->dctable[m]=rb; - sp->sos_tda[m]=(m<<4); - } --- -2.11.0 - diff --git a/package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch b/package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch deleted file mode 100644 index a1aae2dced..0000000000 --- a/package/tiff/0009-libtiff-tif_ojpeg.c-fix-leak-in-OJPEGReadHeaderInfoS.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8283e4d1b7e53340684d12932880cbcbaf23a8c1 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Thu, 12 Jan 2017 17:43:25 +0000 -Subject: [PATCH] libtiff/tif_ojpeg.c: fix leak in - OJPEGReadHeaderInfoSecTablesAcTable when read fails. - Patch by Nicolás Peña. - Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2659 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes CVE-2017-7594 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_ojpeg.c | 3 +++ - 1 file changed, 10 insertions(+) - -diff --git a/libtiff/tif_ojpeg.c b/libtiff/tif_ojpeg.c -index f19e8fd0..b92f0ebd 100644 ---- a/libtiff/tif_ojpeg.c -+++ b/libtiff/tif_ojpeg.c -@@ -1918,7 +1918,10 @@ OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif) - rb[sizeof(uint32)+5+n]=o[n]; - p=(uint32)TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); - if (p!=q) -+ { -+ _TIFFfree(rb); - return(0); -+ } - sp->actable[m]=rb; - sp->sos_tda[m]=(sp->sos_tda[m]|m); - } --- -2.11.0 - diff --git a/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch b/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch deleted file mode 100644 index 862aae2a5a..0000000000 --- a/package/tiff/0010-libtiff-tif_jpeg.c-avoid-integer-division-by-zero-in.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 47f2fb61a3a64667bce1a8398a8fcb1b348ff122 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 12:15:01 +0000 -Subject: [PATCH] * libtiff/tif_jpeg.c: avoid integer division by zero in - JPEGSetupEncode() when horizontal or vertical sampling is set to 0. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2653 - -Fixes CVE-2017-7595 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_jpeg.c | 7 +++++++ - 1 file changed, 13 insertions(+) - -diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c -index 38595f98..6c17c388 100644 ---- a/libtiff/tif_jpeg.c -+++ b/libtiff/tif_jpeg.c -@@ -1626,6 +1626,13 @@ JPEGSetupEncode(TIFF* tif) - case PHOTOMETRIC_YCBCR: - sp->h_sampling = td->td_ycbcrsubsampling[0]; - sp->v_sampling = td->td_ycbcrsubsampling[1]; -+ if( sp->h_sampling == 0 || sp->v_sampling == 0 ) -+ { -+ TIFFErrorExt(tif->tif_clientdata, module, -+ "Invalig horizontal/vertical sampling value"); -+ return (0); -+ } -+ - /* - * A ReferenceBlackWhite field *must* be present since the - * default value is inappropriate for YCbCr. Fill in the --- -2.11.0 - diff --git a/package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch b/package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch deleted file mode 100644 index c0c94291a8..0000000000 --- a/package/tiff/0011-libtiff-tif_dirread.c-avoid-division-by-floating-poi.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3cfd62d77c2a7e147a05bd678524c345fa9c2bb8 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 13:28:01 +0000 -Subject: [PATCH] * libtiff/tif_dirread.c: avoid division by floating point 0 - in TIFFReadDirEntryCheckedRational() and TIFFReadDirEntryCheckedSrational(), - and return 0 in that case (instead of infinity as before presumably) - Apparently some sanitizers do not like those divisions by zero. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2644 - -Fixes CVE-2017-7598 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_dirread.c | 10 ++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c -index 570d0c32..8a1e42aa 100644 ---- a/libtiff/tif_dirread.c -+++ b/libtiff/tif_dirread.c -@@ -2872,7 +2872,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedRational(TIFF* tif, TIFFD - m.l = direntry->tdir_offset.toff_long8; - if (tif->tif_flags&TIFF_SWAB) - TIFFSwabArrayOfLong(m.i,2); -- if (m.i[0]==0) -+ /* Not completely sure what we should do when m.i[1]==0, but some */ -+ /* sanitizers do not like division by 0.0: */ -+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */ -+ if (m.i[0]==0 || m.i[1]==0) - *value=0.0; - else - *value=(double)m.i[0]/(double)m.i[1]; -@@ -2900,7 +2903,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedSrational(TIFF* tif, TIFF - m.l=direntry->tdir_offset.toff_long8; - if (tif->tif_flags&TIFF_SWAB) - TIFFSwabArrayOfLong(m.i,2); -- if ((int32)m.i[0]==0) -+ /* Not completely sure what we should do when m.i[1]==0, but some */ -+ /* sanitizers do not like division by 0.0: */ -+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */ -+ if ((int32)m.i[0]==0 || m.i[1]==0) - *value=0.0; - else - *value=(double)((int32)m.i[0])/(double)m.i[1]; --- -2.11.0 - diff --git a/package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch b/package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch deleted file mode 100644 index 4f46d9bb08..0000000000 --- a/package/tiff/0012-libtiff-tif_jpeg.c-validate-BitsPerSample-in-JPEGSet.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0a76a8c765c7b8327c59646284fa78c3c27e5490 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 16:13:50 +0000 -Subject: [PATCH] * libtiff/tif_jpeg.c: validate BitsPerSample in - JPEGSetupEncode() to avoid undefined behaviour caused by invalid shift - exponent. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2648 - -Fixes CVE-2017-7601 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_jpeg.c | 7 +++++++ - 1 file changed, 13 insertions(+) - -diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c -index 6c17c388..192989a9 100644 ---- a/libtiff/tif_jpeg.c -+++ b/libtiff/tif_jpeg.c -@@ -1632,6 +1632,13 @@ JPEGSetupEncode(TIFF* tif) - "Invalig horizontal/vertical sampling value"); - return (0); - } -+ if( td->td_bitspersample > 16 ) -+ { -+ TIFFErrorExt(tif->tif_clientdata, module, -+ "BitsPerSample %d not allowed for JPEG", -+ td->td_bitspersample); -+ return (0); -+ } - - /* - * A ReferenceBlackWhite field *must* be present since the --- -2.11.0 - diff --git a/package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch b/package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch deleted file mode 100644 index d049b130cb..0000000000 --- a/package/tiff/0013-libtiff-tif_read.c-avoid-potential-undefined-behavio.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 66e7bd59520996740e4df5495a830b42fae48bc4 Mon Sep 17 00:00:00 2001 -From: erouault -Date: Wed, 11 Jan 2017 16:33:34 +0000 -Subject: [PATCH] * libtiff/tif_read.c: avoid potential undefined behaviour on - signed integer addition in TIFFReadRawStrip1() in isMapped() case. Fixes - http://bugzilla.maptools.org/show_bug.cgi?id=2650 - -Fixes CVE-2017-7602 - -Signed-off-by: Peter Korsgaard ---- - libtiff/tif_read.c | 27 ++++++++++++++++++--------- - 1 file changed, 24 insertions(+), 9 deletions(-) - -diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c -index 52bbf507..b7aacbda 100644 ---- a/libtiff/tif_read.c -+++ b/libtiff/tif_read.c -@@ -420,16 +420,25 @@ TIFFReadRawStrip1(TIFF* tif, uint32 strip, void* buf, tmsize_t size, - return ((tmsize_t)(-1)); - } - } else { -- tmsize_t ma,mb; -+ tmsize_t ma; - tmsize_t n; -- ma=(tmsize_t)td->td_stripoffset[strip]; -- mb=ma+size; -- if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||(ma>tif->tif_size)) -- n=0; -- else if ((mbtif->tif_size)) -- n=tif->tif_size-ma; -- else -- n=size; -+ if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)|| -+ ((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size)) -+ { -+ n=0; -+ } -+ else if( ma > TIFF_TMSIZE_T_MAX - size ) -+ { -+ n=0; -+ } -+ else -+ { -+ tmsize_t mb=ma+size; -+ if (mb>tif->tif_size) -+ n=tif->tif_size-ma; -+ else -+ n=size; -+ } - if (n!=size) { - #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) - TIFFErrorExt(tif->tif_clientdata, module, --- -2.11.0 - diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 4439a35f39..516cb06266 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 9f43a2cfb9589e5cecaa66e16bf87f814c945f22df7ba600d63aac4632c4f019 tiff-4.0.7.tar.gz +sha256 59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910 tiff-4.0.8.tar.gz diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index ffb1a425cb..ad85a47a4a 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIFF_VERSION = 4.0.7 +TIFF_VERSION = 4.0.8 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = COPYRIGHT From 6a517afb6c13ebf6b1fbb54b1618f84bb628bc62 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 14 Jul 2017 16:24:26 +0200 Subject: [PATCH 3157/3392] tiff: add upstream security fix for CVE-2017-10688 Fixes CVE-2017-10688 - n LibTIFF 4.0.8, there is a assertion abort in the TIFFWriteDirectoryTagCheckedLong8Array function in tif_dirwrite.c. A crafted input will lead to a remote denial of service attack. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 544ac6bca09edabb587db42ccb3ae51df58a3a56) Signed-off-by: Peter Korsgaard --- ...rite.c-in-TIFFWriteDirectoryTagCheck.patch | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 package/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch diff --git a/package/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch b/package/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch new file mode 100644 index 0000000000..2be989b9e7 --- /dev/null +++ b/package/tiff/0001-libtiff-tif_dirwrite.c-in-TIFFWriteDirectoryTagCheck.patch @@ -0,0 +1,70 @@ +From 6173a57d39e04d68b139f8c1aa499a24dbe74ba1 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Fri, 30 Jun 2017 17:29:44 +0000 +Subject: [PATCH] * libtiff/tif_dirwrite.c: in + TIFFWriteDirectoryTagCheckedXXXX() functions associated with LONG8/SLONG8 + data type, replace assertion that the file is BigTIFF, by a non-fatal error. + Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2712 Reported by team + OWL337 + +[Peter: drop ChangeLog modification] +Signed-off-by: Peter Korsgaard +--- + libtiff/tif_dirwrite.c | 20 ++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c +index 2967da58..8d6686ba 100644 +--- a/libtiff/tif_dirwrite.c ++++ b/libtiff/tif_dirwrite.c +@@ -2111,7 +2111,10 @@ TIFFWriteDirectoryTagCheckedLong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, ui + { + uint64 m; + assert(sizeof(uint64)==8); +- assert(tif->tif_flags&TIFF_BIGTIFF); ++ if( !(tif->tif_flags&TIFF_BIGTIFF) ) { ++ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","LONG8 not allowed for ClassicTIFF"); ++ return(0); ++ } + m=value; + if (tif->tif_flags&TIFF_SWAB) + TIFFSwabLong8(&m); +@@ -2124,7 +2127,10 @@ TIFFWriteDirectoryTagCheckedLong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* di + { + assert(count<0x20000000); + assert(sizeof(uint64)==8); +- assert(tif->tif_flags&TIFF_BIGTIFF); ++ if( !(tif->tif_flags&TIFF_BIGTIFF) ) { ++ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","LONG8 not allowed for ClassicTIFF"); ++ return(0); ++ } + if (tif->tif_flags&TIFF_SWAB) + TIFFSwabArrayOfLong8(value,count); + return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_LONG8,count,count*8,value)); +@@ -2136,7 +2142,10 @@ TIFFWriteDirectoryTagCheckedSlong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, u + { + int64 m; + assert(sizeof(int64)==8); +- assert(tif->tif_flags&TIFF_BIGTIFF); ++ if( !(tif->tif_flags&TIFF_BIGTIFF) ) { ++ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","SLONG8 not allowed for ClassicTIFF"); ++ return(0); ++ } + m=value; + if (tif->tif_flags&TIFF_SWAB) + TIFFSwabLong8((uint64*)(&m)); +@@ -2149,7 +2158,10 @@ TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* d + { + assert(count<0x20000000); + assert(sizeof(int64)==8); +- assert(tif->tif_flags&TIFF_BIGTIFF); ++ if( !(tif->tif_flags&TIFF_BIGTIFF) ) { ++ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","SLONG8 not allowed for ClassicTIFF"); ++ return(0); ++ } + if (tif->tif_flags&TIFF_SWAB) + TIFFSwabArrayOfLong8((uint64*)value,count); + return(TIFFWriteDirectoryTagData(tif,ndir,dir,tag,TIFF_SLONG8,count,count*8,value)); +-- +2.11.0 + From db62aed533c6c31568be7b0e0c818c7b17f78537 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Jul 2017 00:09:36 +0200 Subject: [PATCH 3158/3392] package/rpi-firmware: install missing library The vcdbg utility is linked to a few libraries, which so far were all provided by the rpi-userland package. But a not-so-recent bump of rpi-firmware pulled in a vcdbg that is linked to an additional library, which is not privided by rpi-userland, so we must install it. Reported-by: cluelessperson on #buildroot Signed-off-by: "Yann E. MORIN" Cc: Maxime Hadjinlian Signed-off-by: Thomas Petazzoni (cherry picked from commit a3da7980eb4744248b0f83e07cfdb42ae82ccf6f) Signed-off-by: Peter Korsgaard --- package/rpi-firmware/rpi-firmware.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index d2cd481911..8575e7f21e 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -31,6 +31,8 @@ ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG),y) define RPI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0700 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/bin/vcdbg \ $(TARGET_DIR)/usr/sbin/vcdbg + $(INSTALL) -D -m 0644 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/lib/libelftoolchain.so \ + $(TARGET_DIR)/usr/lib/libelftoolchain.so endef endif # INSTALL_VCDBG From 631f617399b69d0933b65416a28aec7f403407d0 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Thu, 13 Jul 2017 15:00:05 -0500 Subject: [PATCH 3159/3392] gcc: fix build of libsanitizer in gcc 4.9 and 5.x on PowerPC libsanitizer in gcc fails to build on PowerPC with gcc versions 4.9 and 5.x used in conjunction with glibc 2.25, with the following error: ../../../../gcc-host/libsanitizer/asan/asan_linux.cc: In function 'bool __asan::AsanInterceptsSignal(int)': ../../../../gcc-host/libsanitizer/asan/asan_linux.cc:222:20: error: 'SIGSEGV' was not declared in this scope return signum == SIGSEGV && common_flags()->handle_segv; This commit adds a patch that has been submitted to upstream gcc (https://patchwork.ozlabs.org/patch/725596/) but not merged. The patch is no longer needed with gcc 6.x and later because the code has been reworked. Fixes Buildroot bug #10061 Signed-off-by: Matthew Weber [Thomas: rework commit log.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 5c90f6a7b68ebdc43ea72b763ec98a0a300c57a1) Signed-off-by: Peter Korsgaard --- ...42-asan-fix-missing-include-signal-h.patch | 36 +++++++++++++++++++ ...42-asan-fix-missing-include-signal-h.patch | 36 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 package/gcc/4.9.4/942-asan-fix-missing-include-signal-h.patch create mode 100644 package/gcc/5.4.0/942-asan-fix-missing-include-signal-h.patch diff --git a/package/gcc/4.9.4/942-asan-fix-missing-include-signal-h.patch b/package/gcc/4.9.4/942-asan-fix-missing-include-signal-h.patch new file mode 100644 index 0000000000..5f00c04d2b --- /dev/null +++ b/package/gcc/4.9.4/942-asan-fix-missing-include-signal-h.patch @@ -0,0 +1,36 @@ +From 205aa8e97bab553e5e6fe45896325e97962de704 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer +Date: Wed, 8 Feb 2017 11:42:52 +0100 +Subject: [PATCH] asan: fix missing include of signal.h + +This breaks when building gcc 4.9.4 / 5.4.0 with +target_platform=powerpc-unknown-linux-gnu with glibc 2.25: + +../../../../gcc-host/libsanitizer/asan/asan_linux.cc: In function 'bool __asan::AsanInterceptsSignal(int)': +../../../../gcc-host/libsanitizer/asan/asan_linux.cc:222:20: error: 'SIGSEGV' was not declared in this scope + return signum == SIGSEGV && common_flags()->handle_segv; + +This has been verified to apply to at least 4.9.4 and up to 5.4, +the code has been reworked for gcc 6. + +Resolves (Buildroot) Bug: https://bugs.busybox.net/show_bug.cgi?id=10061 + +Upstream: https://patchwork.ozlabs.org/patch/725596/ + +Signed-off-by: Matthew Weber +--- + libsanitizer/asan/asan_linux.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc +index c504168..59087b9 100644 +--- a/libsanitizer/asan/asan_linux.cc ++++ b/libsanitizer/asan/asan_linux.cc +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/package/gcc/5.4.0/942-asan-fix-missing-include-signal-h.patch b/package/gcc/5.4.0/942-asan-fix-missing-include-signal-h.patch new file mode 100644 index 0000000000..5f00c04d2b --- /dev/null +++ b/package/gcc/5.4.0/942-asan-fix-missing-include-signal-h.patch @@ -0,0 +1,36 @@ +From 205aa8e97bab553e5e6fe45896325e97962de704 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer +Date: Wed, 8 Feb 2017 11:42:52 +0100 +Subject: [PATCH] asan: fix missing include of signal.h + +This breaks when building gcc 4.9.4 / 5.4.0 with +target_platform=powerpc-unknown-linux-gnu with glibc 2.25: + +../../../../gcc-host/libsanitizer/asan/asan_linux.cc: In function 'bool __asan::AsanInterceptsSignal(int)': +../../../../gcc-host/libsanitizer/asan/asan_linux.cc:222:20: error: 'SIGSEGV' was not declared in this scope + return signum == SIGSEGV && common_flags()->handle_segv; + +This has been verified to apply to at least 4.9.4 and up to 5.4, +the code has been reworked for gcc 6. + +Resolves (Buildroot) Bug: https://bugs.busybox.net/show_bug.cgi?id=10061 + +Upstream: https://patchwork.ozlabs.org/patch/725596/ + +Signed-off-by: Matthew Weber +--- + libsanitizer/asan/asan_linux.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc +index c504168..59087b9 100644 +--- a/libsanitizer/asan/asan_linux.cc ++++ b/libsanitizer/asan/asan_linux.cc +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + #include From 89c1bd39c780b366063386183d677ab67bc8a3b5 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 14 Jul 2017 19:21:35 +0300 Subject: [PATCH 3160/3392] pulseaudio: add optional dependency on bluez5_utils The pulseaudio configure script autodetects the presence of bluez 4.x and 5.x packages on the system and will exclude the bluetooth-related modules in their absence. This commit ensures that bluez5_utils, if selected, are installed before pulseaudio. The same already happens for bluez_utils (4.x). Signed-off-by: Calin Crisan Signed-off-by: Thomas Petazzoni (cherry picked from commit 9e03dd1cefffd553def74e0f3955839dd2450208) Signed-off-by: Peter Korsgaard --- package/pulseaudio/pulseaudio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 51de6a581c..5960f8a5ba 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -32,6 +32,7 @@ PULSEAUDIO_DEPENDENCIES = \ $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \ $(if $(BR2_PACKAGE_DBUS),dbus) \ $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \ + $(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) \ $(if $(BR2_PACKAGE_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_FFTW),fftw) \ $(if $(BR2_PACKAGE_SYSTEMD),systemd) From 30bf45b8da9be325c826552c25dfd2c0a6517389 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 15 Jul 2017 10:20:54 -0300 Subject: [PATCH 3161/3392] linux-headers: bump 4.{4, 9, 11, 12}.x series [Peter: Drop 4.11.x/4.12.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard (cherry picked from commit a78c0935d90e10d140326b2757471b16ff8462ca) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index eea89094ed..2b82eb5300 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.42" if BR2_KERNEL_HEADERS_4_1 - default "4.4.76" if BR2_KERNEL_HEADERS_4_4 + default "4.4.77" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.37" if BR2_KERNEL_HEADERS_4_9 + default "4.9.38" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 2e71e4d7df2d82d878ae20cb965b7c1c722665db Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 16 Jul 2017 16:23:09 +0200 Subject: [PATCH 3162/3392] libosip2: add upstream security fix Fixes CVE-2016-10324 - In libosip2 in GNU oSIP 4.1.0, a malformed SIP message can lead to a heap buffer overflow in the osip_clrncpy() function defined in osipparser2/osip_port.c. Signed-off-by: Peter Korsgaard (cherry picked from commit d8a806e2b81d6f76fa2636a554cd2fbf2fff38ef) Signed-off-by: Peter Korsgaard --- ...r-109133-Heap-buffer-overflow-in-uti.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch diff --git a/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch b/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch new file mode 100644 index 0000000000..7f2c2d46d2 --- /dev/null +++ b/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch @@ -0,0 +1,30 @@ +From 7e0793e15e21f68337e130c67b031ca38edf055f Mon Sep 17 00:00:00 2001 +From: Aymeric Moizard +Date: Mon, 5 Sep 2016 15:01:53 +0200 +Subject: [PATCH] * fix bug report: sr #109133: Heap buffer overflow in + utility function *osip_clrncpy* https://savannah.gnu.org/support/?109133 + +Signed-off-by: Peter Korsgaard +--- + src/osipparser2/osip_port.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/osipparser2/osip_port.c b/src/osipparser2/osip_port.c +index 0e64147..d8941b0 100644 +--- a/src/osipparser2/osip_port.c ++++ b/src/osipparser2/osip_port.c +@@ -1291,8 +1291,10 @@ osip_clrncpy (char *dst, const char *src, size_t len) + char *p; + size_t spaceless_length; + +- if (src == NULL) ++ if (src == NULL || len == 0) { ++ *dst = '\0'; + return NULL; ++ } + + /* find the start of relevant text */ + pbeg = src; +-- +2.11.0 + From 6d024873942a57aa593797c77b68d4dc32d7ae86 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 16 Jul 2017 01:11:45 +0200 Subject: [PATCH 3163/3392] binutils/2.27: backport patch to enable CRC instructions on supported ARMv8-A CPUs Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit d558ca17138331b1f3a9d780ced07671e0f0a185) Signed-off-by: Peter Korsgaard --- ...able-CRC-instructions-on-supported-A.patch | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 package/binutils/2.27/0907-Automatically-enable-CRC-instructions-on-supported-A.patch diff --git a/package/binutils/2.27/0907-Automatically-enable-CRC-instructions-on-supported-A.patch b/package/binutils/2.27/0907-Automatically-enable-CRC-instructions-on-supported-A.patch new file mode 100644 index 0000000000..3b7fcfc959 --- /dev/null +++ b/package/binutils/2.27/0907-Automatically-enable-CRC-instructions-on-supported-A.patch @@ -0,0 +1,88 @@ +From 29a4659015ca7044c2d425d32a0b828e0fbb5ac1 Mon Sep 17 00:00:00 2001 +From: Richard Earnshaw +Date: Wed, 7 Sep 2016 17:14:54 +0100 +Subject: [PATCH] Automatically enable CRC instructions on supported ARMv8-A + CPUs. + +2016-09-07 Richard Earnshaw + + * opcode/arm.h (ARM_ARCH_V8A_CRC): New architecture. + +2016-09-07 Richard Earnshaw + + * config/tc-arm.c ((arm_cpus): Use ARM_ARCH_V8A_CRC for all + ARMv8-A CPUs except xgene1. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=27e5a270962fb92c07e7d476966ba380fa3bb68e +Signed-off-by: Peter Seiderer +--- + gas/config/tc-arm.c | 18 +++++++++--------- + include/opcode/arm.h | 2 ++ + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c +index 73d05316..7c86184d 100644 +--- a/gas/config/tc-arm.c ++++ b/gas/config/tc-arm.c +@@ -25332,17 +25332,17 @@ static const struct arm_cpu_option_table arm_cpus[] = + "Cortex-A15"), + ARM_CPU_OPT ("cortex-a17", ARM_ARCH_V7VE, FPU_ARCH_NEON_VFP_V4, + "Cortex-A17"), +- ARM_CPU_OPT ("cortex-a32", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, ++ ARM_CPU_OPT ("cortex-a32", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, + "Cortex-A32"), +- ARM_CPU_OPT ("cortex-a35", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, ++ ARM_CPU_OPT ("cortex-a35", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, + "Cortex-A35"), +- ARM_CPU_OPT ("cortex-a53", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, ++ ARM_CPU_OPT ("cortex-a53", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, + "Cortex-A53"), +- ARM_CPU_OPT ("cortex-a57", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, ++ ARM_CPU_OPT ("cortex-a57", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, + "Cortex-A57"), +- ARM_CPU_OPT ("cortex-a72", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, ++ ARM_CPU_OPT ("cortex-a72", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, + "Cortex-A72"), +- ARM_CPU_OPT ("cortex-a73", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, ++ ARM_CPU_OPT ("cortex-a73", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, + "Cortex-A73"), + ARM_CPU_OPT ("cortex-r4", ARM_ARCH_V7R, FPU_NONE, "Cortex-R4"), + ARM_CPU_OPT ("cortex-r4f", ARM_ARCH_V7R, FPU_ARCH_VFP_V3D16, +@@ -25361,10 +25361,10 @@ static const struct arm_cpu_option_table arm_cpus[] = + ARM_CPU_OPT ("cortex-m1", ARM_ARCH_V6SM, FPU_NONE, "Cortex-M1"), + ARM_CPU_OPT ("cortex-m0", ARM_ARCH_V6SM, FPU_NONE, "Cortex-M0"), + ARM_CPU_OPT ("cortex-m0plus", ARM_ARCH_V6SM, FPU_NONE, "Cortex-M0+"), +- ARM_CPU_OPT ("exynos-m1", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, ++ ARM_CPU_OPT ("exynos-m1", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, + "Samsung " \ + "Exynos M1"), +- ARM_CPU_OPT ("qdf24xx", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, ++ ARM_CPU_OPT ("qdf24xx", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, + "Qualcomm " + "QDF24XX"), + +@@ -25389,7 +25389,7 @@ static const struct arm_cpu_option_table arm_cpus[] = + /* APM X-Gene family. */ + ARM_CPU_OPT ("xgene1", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, + "APM X-Gene 1"), +- ARM_CPU_OPT ("xgene2", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, ++ ARM_CPU_OPT ("xgene2", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8, + "APM X-Gene 2"), + + { NULL, 0, ARM_ARCH_NONE, ARM_ARCH_NONE, NULL } +diff --git a/include/opcode/arm.h b/include/opcode/arm.h +index 60715cf8..feace5cd 100644 +--- a/include/opcode/arm.h ++++ b/include/opcode/arm.h +@@ -263,6 +263,8 @@ + #define ARM_ARCH_V7M ARM_FEATURE_CORE (ARM_AEXT_V7M, ARM_EXT2_V6T2_V8M) + #define ARM_ARCH_V7EM ARM_FEATURE_CORE (ARM_AEXT_V7EM, ARM_EXT2_V6T2_V8M) + #define ARM_ARCH_V8A ARM_FEATURE_CORE (ARM_AEXT_V8A, ARM_AEXT2_V8A) ++#define ARM_ARCH_V8A_CRC ARM_FEATURE (ARM_AEXT_V8A, ARM_AEXT2_V8A, \ ++ CRC_EXT_ARMV8) + #define ARM_ARCH_V8_1A ARM_FEATURE (ARM_AEXT_V8A, ARM_AEXT2_V8_1A, \ + CRC_EXT_ARMV8 | FPU_NEON_EXT_RDMA) + #define ARM_ARCH_V8_2A ARM_FEATURE (ARM_AEXT_V8A, ARM_AEXT2_V8_2A, \ +-- +2.11.0 + From 85cfc3a3ac747529df586c77abe281666b419e9a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 16 Jul 2017 01:11:46 +0200 Subject: [PATCH 3164/3392] qt5base: fix qthash error attribute(target("+crc")) is unknown Add patch 0005-Fix-error-attribute-target-crc-is-unknown.patch. Upstream: https://codereview.qt-project.org/200171 Fixes buildroot Bug 9916 ([1]). [1] https://bugs.busybox.net/show_bug.cgi?id=9916 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit a9e053b5a8b4195aaddd97db98b0ba3dcf788638) Signed-off-by: Peter Korsgaard --- ...rror-attribute-target-crc-is-unknown.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch diff --git a/package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch b/package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch new file mode 100644 index 0000000000..92d93a800b --- /dev/null +++ b/package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch @@ -0,0 +1,44 @@ +From f0c02fb22bc277e2015a18e562b551ec7b3eed9e Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 16 Jul 2017 00:05:44 +0200 +Subject: [PATCH] Fix error attribute(target("+crc")) is unknown + +Task-number: QTBUG-61975 +Change-Id: I0b1b55c0737dad485b5ace8e6eb7cb842589453d +--- + src/corelib/tools/qhash.cpp | 2 ++ + src/corelib/tools/qsimd_p.h | 3 +++ + 2 files changed, 5 insertions(+) + +diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp +index 1f9c05c..bbf6efb 100644 +--- a/src/corelib/tools/qhash.cpp ++++ b/src/corelib/tools/qhash.cpp +@@ -144,7 +144,9 @@ static inline bool hasFastCrc32() + } + + template ++#if defined(__aarch64__) + QT_FUNCTION_TARGET(CRC32) ++#endif + static uint crc32(const Char *ptr, size_t len, uint h) + { + // The crc32[whbd] instructions on Aarch64/Aarch32 calculate a 32-bit CRC32 checksum +diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h +index 023a4b0..a85d572 100644 +--- a/src/corelib/tools/qsimd_p.h ++++ b/src/corelib/tools/qsimd_p.h +@@ -326,7 +326,10 @@ + #endif + // AArch64/ARM64 + #if defined(Q_PROCESSOR_ARM_V8) && defined(__ARM_FEATURE_CRC32) ++#if defined(__aarch64__) ++// only available on aarch64 + #define QT_FUNCTION_TARGET_STRING_CRC32 "+crc" ++#endif + # include + #endif + +-- +2.7.4 + From 98ffe962a47d54bcf89b44f852f4d7246c8d37e7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 16 Jul 2017 20:41:45 +0300 Subject: [PATCH 3165/3392] expat: security bump to version 2.2.2 Changes (security fixes): [MOX-006] Fix non-NULL parser parameter validation in XML_Parse; resulted in NULL dereference, previously Drop upstream patch. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit b3eca095003aecde94414fd1f01a831f1af198ec) Signed-off-by: Peter Korsgaard --- ...-mis-detection-of-getrandom-on-Debia.patch | 29 ------------------- package/expat/expat.hash | 8 ++--- package/expat/expat.mk | 4 +-- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch diff --git a/package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch b/package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch deleted file mode 100644 index 44f43e1cb4..0000000000 --- a/package/expat/0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 602e6c78ca750c082b72f8cdf4a38839b312959f Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sun, 18 Jun 2017 18:55:10 +0200 -Subject: [PATCH] configure.ac: Fix mis-detection of getrandom on Debian - GNU/kFreeBSD (#50) - -There is no such thing but we need to link (not just compile) to realize. - -Signed-off-by: Peter Korsgaard ---- - expat/configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1357c9a..444c002 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ - - - AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)]) --AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include /* for NULL */ - #include - int main() { --- -2.11.0 - diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 595597b6fd..f1e19193e9 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.2.1/ -md5 d9c3baeab58774cefc2f04faf29f2cf8 expat-2.2.1.tar.bz2 -sha1 f45eb724f182776a9cacec9ed70d549e87198987 expat-2.2.1.tar.bz2 +# From https://sourceforge.net/projects/expat/files/expat/2.2.2/ +md5 1ede9a41223c78528b8c5d23e69a2667 expat-2.2.2.tar.bz2 +sha1 891cee988b38d5d66953f62f94c3150b8810a70a expat-2.2.2.tar.bz2 # Calculated based on the hashes above -sha256 1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885 expat-2.2.1.tar.bz2 +sha256 4376911fcf81a23ebd821bbabc26fd933f3ac74833f74924342c29aad2c86046 expat-2.2.2.tar.bz2 diff --git a/package/expat/expat.mk b/package/expat/expat.mk index bb6e627e5b..a10f2c974a 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.2.1 +EXPAT_VERSION = 2.2.2 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2 EXPAT_INSTALL_STAGING = YES @@ -14,8 +14,6 @@ EXPAT_DEPENDENCIES = host-pkgconf HOST_EXPAT_DEPENDENCIES = host-pkgconf EXPAT_LICENSE = MIT EXPAT_LICENSE_FILES = COPYING -# for 0001-configure.ac-Fix-mis-detection-of-getrandom-on-Debia.patch -EXPAT_AUTORECONF = YES $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 6114c0b25f090c8928d85c49e6dd74bc943f9ae0 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 17 Jul 2017 07:11:38 +0300 Subject: [PATCH 3166/3392] expat: fix build on and for kernel older than 3.17 The expat build system now fails when the getrandom() system call is not supported. This affect both host and target builds. Define XML_POOR_ENTROPY for target kernels older than 3.17 to fix the build. For the host package define XML_POOR_ENTROPY unconditionally since we have no easy way to know the host kernel version. Note that expat will still use getrandom() on the host when it is available, we don't make security any worse. Fixes (host): http://autobuild.buildroot.net/results/928/928dc2b56d931da84055fdfe78929d1f956de53b/ http://autobuild.buildroot.net/results/ee9/ee90d0a456cbce4c7f22e5f61006612bd9ba30d5/ http://autobuild.buildroot.net/results/dac/dac7231242123ae3dcaa6bbdd65b44fe8d8cb20c/ Fixes (target): http://autobuild.buildroot.net/results/308/308e830219fdfebb5aa6aef51c1dc784254998f6/ http://autobuild.buildroot.net/results/73f/73fa946b0a2205e946ad414079f88e4bdb416f00/ http://autobuild.buildroot.net/results/9d7/9d7bad22ace7fa211b31d752a2255e07cede68be/ [Peter: also use HOST_CPPFLAGS] Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 5242701f3aa8426cdf2cc9a176ef06194db93d5f) Signed-off-by: Peter Korsgaard --- package/expat/expat.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/expat/expat.mk b/package/expat/expat.mk index a10f2c974a..a78d326d71 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -15,5 +15,14 @@ HOST_EXPAT_DEPENDENCIES = host-pkgconf EXPAT_LICENSE = MIT EXPAT_LICENSE_FILES = COPYING +# Kernel versions older than 3.17 do not support getrandom() +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17),) +EXPAT_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DXML_POOR_ENTROPY" +endif + +# Make build succeed on host kernel older than 3.17. getrandom() will still +# be used on newer kernels. +HOST_EXPAT_CONF_ENV += CPPFLAGS="$(HOST_CPPFLAGS) -DXML_POOR_ENTROPY" + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From e3d33a6a19a49d11776a8eff0298882e6d3d0c82 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 9 Jul 2017 11:29:58 +0200 Subject: [PATCH 3167/3392] arch/arm: fix -mcpu default values for AArch64 We have to specify the -mcpu value, even in 64-bit mode. For AArch64, +fp and +simd are the default, so they are totally useless. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 9d06e91df85a2f02dd10dcac6a37a19da11b13aa) Signed-off-by: Peter Korsgaard --- arch/Config.in.arm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 2617976f13..596921dfe7 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -534,15 +534,9 @@ config BR2_GCC_TARGET_CPU default "strongarm" if BR2_strongarm default "xscale" if BR2_xscale default "iwmmxt" if BR2_iwmmxt - default "cortex-a53" if (BR2_cortex_a53 && !BR2_ARCH_IS_64) - default "cortex-a53+fp" if (BR2_cortex_a53 && BR2_ARCH_IS_64 && BR2_ARM_FPU_FP_ARMV8) - default "cortex-a53+fp+simd" if (BR2_cortex_a53 && BR2_ARCH_IS_64 && BR2_ARM_FPU_NEON_FP_ARMV8) - default "cortex-a57" if (BR2_cortex_a57 && !BR2_ARCH_IS_64) - default "cortex-a57+fp" if (BR2_cortex_a57 && BR2_ARCH_IS_64 && BR2_ARM_FPU_FP_ARMV8) - default "cortex-a57+fp+simd" if (BR2_cortex_a57 && BR2_ARCH_IS_64 && BR2_ARM_FPU_NEON_FP_ARMV8) - default "cortex-a72" if (BR2_cortex_a72 && !BR2_ARCH_IS_64) - default "cortex-a72+fp" if (BR2_cortex_a72 && BR2_ARCH_IS_64 && BR2_ARM_FPU_FP_ARMV8) - default "cortex-a72+fp+simd" if (BR2_cortex_a72 && BR2_ARCH_IS_64 && BR2_ARM_FPU_NEON_FP_ARMV8) + default "cortex-a53" if BR2_cortex_a53 + default "cortex-a57" if BR2_cortex_a57 + default "cortex-a72" if BR2_cortex_a72 config BR2_GCC_TARGET_ABI default "aapcs-linux" if BR2_arm || BR2_armeb From 65080e973d686ee34e30644046375d8757c3ba5f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 19 Jul 2017 21:43:49 +0300 Subject: [PATCH 3168/3392] iproute2: correct license Source files license headers include the GPL "or ... any later version" language. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit b1b962274bb363eeba492d3a3f4fc1ff3ea252c1) Signed-off-by: Peter Korsgaard --- package/iproute2/iproute2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 5ea5299bd3..fefd018086 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -9,7 +9,7 @@ IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ $(if $(BR2_PACKAGE_LIBMNL),libmnl) -IPROUTE2_LICENSE = GPLv2 +IPROUTE2_LICENSE = GPLv2+ IPROUTE2_LICENSE_FILES = COPYING # If both iproute2 and busybox are selected, make certain we win From 06eb06ad6deaa60ba87880e37435f2f7cfdcda72 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Jul 2017 08:01:52 +0200 Subject: [PATCH 3169/3392] linux-headers: bump 3.{2, 10, 18}.x series Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 2b82eb5300..6b6b6eae73 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -214,11 +214,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.89" if BR2_KERNEL_HEADERS_3_2 + default "3.2.91" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 - default "3.10.106" if BR2_KERNEL_HEADERS_3_10 + default "3.10.107" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "3.18.59" if BR2_KERNEL_HEADERS_3_18 + default "3.18.61" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.42" if BR2_KERNEL_HEADERS_4_1 From 7ce6884f1178a61b32e5fbc61faeacfb681c6f40 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 21 Jul 2017 01:04:32 +0300 Subject: [PATCH 3170/3392] linux-zigbee: fix build with gcc 7 Disable -Werror to avoid the fatal result of new gcc 7 format string warnings. Fixes: http://autobuild.buildroot.net/results/29c/29c72bc38042305310576be945c721b2fad95894/ http://autobuild.buildroot.net/results/a7d/a7d38d72834b94291eaff159da277b11e2f9d63a/ http://autobuild.buildroot.net/results/cfe/cfed5176075f0cb9e2f56ebef10f5d6c352baf10/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit e1bebe18e54ad634bd6151445f009aa53038d765) Signed-off-by: Peter Korsgaard --- package/linux-zigbee/linux-zigbee.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-zigbee/linux-zigbee.mk b/package/linux-zigbee/linux-zigbee.mk index 1f4197f063..e46b4ee4d7 100644 --- a/package/linux-zigbee/linux-zigbee.mk +++ b/package/linux-zigbee/linux-zigbee.mk @@ -15,6 +15,7 @@ LINUX_ZIGBEE_AUTORECONF = YES LINUX_ZIGBEE_CONF_OPTS = \ --disable-manpages \ + --disable-werror \ --with-leasefile="$(call qstrip,$(BR2_PACKAGE_LINUX_ZIGBEE_LEASEFILE))" ifeq ($(BR2_PACKAGE_LINUX_ZIGBEE_TESTS),y) From b74ed70e46b178eba4a4e174653fcf4c4d2455fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20P=C3=A9rez=20de=20Castro?= Date: Thu, 13 Jul 2017 02:55:28 +0300 Subject: [PATCH 3171/3392] webkitgtk: Remove patch uneeded for the current version Version 2.16.5 of WebKitGTK+ already includes the fix added by the removed patch, which is now unneeded. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 6b2804f396ad27e1d99079a8d1fbe1f51cb4cf5d) Signed-off-by: Peter Korsgaard --- package/webkitgtk/0001-fix-gcc6-builds.patch | 53 -------------------- 1 file changed, 53 deletions(-) delete mode 100644 package/webkitgtk/0001-fix-gcc6-builds.patch diff --git a/package/webkitgtk/0001-fix-gcc6-builds.patch b/package/webkitgtk/0001-fix-gcc6-builds.patch deleted file mode 100644 index 35487ad55a..0000000000 --- a/package/webkitgtk/0001-fix-gcc6-builds.patch +++ /dev/null @@ -1,53 +0,0 @@ -[CMake] Build failure with GCC 6 (fatal error: stdlib.h: No such file or directory) - -https://bugs.webkit.org/show_bug.cgi?id=161697 - -Reviewed by Michael Catanzaro. - -Get the list of system includes from GCC and add it to the CMake -list of implicit includes. This way, CMake will filter any of this -directories from the list of includes when calling the compiler. - -This avoids an issue with GCC 6 that causes build failures when -including the default include path as a system include (-isystem). - -Upstream, from: https://trac.webkit.org/changeset/205672 - -Signed-off-by: Gustavo Zacarias - -Index: trunk/Source/cmake/OptionsCommon.cmake -=================================================================== ---- trunk/Source/cmake/OptionsCommon.cmake (revision 204084) -+++ trunk/Source/cmake/OptionsCommon.cmake (revision 205672) -@@ -36,4 +36,31 @@ - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics") -+endif () -+ -+# Ensure that the default include system directories are added to the list of CMake implicit includes. -+# This workarounds an issue that happens when using GCC 6 and using system includes (-isystem). -+# For more details check: https://bugs.webkit.org/show_bug.cgi?id=161697 -+macro(DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _compiler _flags _result) -+ file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n") -+ separate_arguments(_buildFlags UNIX_COMMAND "${_flags}") -+ execute_process(COMMAND ${_compiler} ${_buildFlags} -v -E -x ${_lang} -dD dummy -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles OUTPUT_QUIET -+ ERROR_VARIABLE _gccOutput) -+ file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy") -+ if ("${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list") -+ set(${_result} ${CMAKE_MATCH_1}) -+ string(REPLACE "\n" " " ${_result} "${${_result}}") -+ separate_arguments(${_result}) -+ endif () -+endmacro() -+ -+if (CMAKE_COMPILER_IS_GNUCC) -+ DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c" "${CMAKE_C_COMPILER}" "${CMAKE_C_FLAGS}" SYSTEM_INCLUDE_DIRS) -+ set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS}) -+endif () -+ -+if (CMAKE_COMPILER_IS_GNUCXX) -+ DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c++" "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_FLAGS}" SYSTEM_INCLUDE_DIRS) -+ set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS}) - endif () - From 85460f118e7ab138f5cda01c30e868d3ea7c6f93 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 21 Jul 2017 11:29:24 -0300 Subject: [PATCH 3172/3392] linux-headers: bump 4.{4, 9, 11, 12}.x series [Peter: Drop 4.11.x/4.12.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 6e97747666a4e9b73fba332437a1b9a3f6472b1b) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6b6b6eae73..99c8b2a4f1 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.42" if BR2_KERNEL_HEADERS_4_1 - default "4.4.77" if BR2_KERNEL_HEADERS_4_4 + default "4.4.78" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.38" if BR2_KERNEL_HEADERS_4_9 + default "4.9.39" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From fbce4d82ff8f4cfe8c6be473e5f854c3177021c6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 21 Jul 2017 23:08:48 +0200 Subject: [PATCH 3173/3392] collectd: fix build with gcc 7.x This commit backports an upstream collectd patch that fixes a build issue with gcc 7.x. Fixes: http://autobuild.buildroot.net/results/2441e2a69d013a6376a90d375e15991e8cb816bd/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 9ac88f318a9cdc4cdc1bcfe6a190b46b650cb3cc) Signed-off-by: Peter Korsgaard --- ...collectdclient-increase-error-buffer.patch | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 package/collectd/0001-libcollectdclient-increase-error-buffer.patch diff --git a/package/collectd/0001-libcollectdclient-increase-error-buffer.patch b/package/collectd/0001-libcollectdclient-increase-error-buffer.patch new file mode 100644 index 0000000000..247d32b592 --- /dev/null +++ b/package/collectd/0001-libcollectdclient-increase-error-buffer.patch @@ -0,0 +1,87 @@ +From e170f3559fcda6d37a012aba187a96b1f42e8f9d Mon Sep 17 00:00:00 2001 +From: Ruben Kerkhof +Date: Sun, 2 Jul 2017 21:52:14 +0200 +Subject: [PATCH] libcollectdclient: increase error buffer +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +make[1]: Entering directory '/home/ruben/src/collectd' + CC src/libcollectdclient/libcollectdclient_la-client.lo +src/libcollectdclient/client.c: In function ‘lcc_getval’: +src/libcollectdclient/client.c:621:23: warning: ‘%s’ directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] + LCC_SET_ERRSTR(c, "Server error: %s", res.message); + ^ ~ +src/libcollectdclient/client.c:94:48: note: in definition of macro ‘LCC_SET_ERRSTR’ + snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ + ^~~~~~~~~~~ +src/libcollectdclient/client.c:94:5: note: ‘snprintf’ output between 15 and 1038 bytes into a destination of size 1024 + snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +src/libcollectdclient/client.c:621:5: note: in expansion of macro ‘LCC_SET_ERRSTR’ + LCC_SET_ERRSTR(c, "Server error: %s", res.message); + ^~~~~~~~~~~~~~ +src/libcollectdclient/client.c: In function ‘lcc_putval’: +src/libcollectdclient/client.c:754:23: warning: ‘%s’ directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] + LCC_SET_ERRSTR(c, "Server error: %s", res.message); + ^ ~ +src/libcollectdclient/client.c:94:48: note: in definition of macro ‘LCC_SET_ERRSTR’ + snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ + ^~~~~~~~~~~ +src/libcollectdclient/client.c:94:5: note: ‘snprintf’ output between 15 and 1038 bytes into a destination of size 1024 + snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +src/libcollectdclient/client.c:754:5: note: in expansion of macro ‘LCC_SET_ERRSTR’ + LCC_SET_ERRSTR(c, "Server error: %s", res.message); + ^~~~~~~~~~~~~~ +src/libcollectdclient/client.c: In function ‘lcc_flush’: +src/libcollectdclient/client.c:802:23: warning: ‘%s’ directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] + LCC_SET_ERRSTR(c, "Server error: %s", res.message); + ^ ~ +src/libcollectdclient/client.c:94:48: note: in definition of macro ‘LCC_SET_ERRSTR’ + snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ + ^~~~~~~~~~~ +src/libcollectdclient/client.c:94:5: note: ‘snprintf’ output between 15 and 1038 bytes into a destination of size 1024 + snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +src/libcollectdclient/client.c:802:5: note: in expansion of macro ‘LCC_SET_ERRSTR’ + LCC_SET_ERRSTR(c, "Server error: %s", res.message); + ^~~~~~~~~~~~~~ +src/libcollectdclient/client.c: In function ‘lcc_listval’: +src/libcollectdclient/client.c:834:23: warning: ‘%s’ directive output may be truncated writing up to 1023 bytes into a region of size 1010 [-Wformat-truncation=] + LCC_SET_ERRSTR(c, "Server error: %s", res.message); + ^ ~ +src/libcollectdclient/client.c:94:48: note: in definition of macro ‘LCC_SET_ERRSTR’ + snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ + ^~~~~~~~~~~ +src/libcollectdclient/client.c:94:5: note: ‘snprintf’ output between 15 and 1038 bytes into a destination of size 1024 + snprintf((c)->errbuf, sizeof((c)->errbuf), __VA_ARGS__); \ + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +src/libcollectdclient/client.c:834:5: note: in expansion of macro ‘LCC_SET_ERRSTR’ + LCC_SET_ERRSTR(c, "Server error: %s", res.message); + ^~~~~~~~~~~~~~ + +Fixes #2200 + +[Upstream commit: https://git.octo.it/?p=collectd.git;a=commitdiff;h=e170f3559fcda6d37a012aba187a96b1f42e8f9d] +Signed-off-by: Thomas Petazzoni +--- + src/libcollectdclient/client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libcollectdclient/client.c b/src/libcollectdclient/client.c +index 51a4ab2..3ae2e71 100644 +--- a/src/libcollectdclient/client.c ++++ b/src/libcollectdclient/client.c +@@ -99,7 +99,7 @@ + */ + struct lcc_connection_s { + FILE *fh; +- char errbuf[1024]; ++ char errbuf[2048]; + }; + + struct lcc_response_s { +-- +1.7.10.4 + From 24c662e6c6c02100cdff88b196a8401c4b4ac6d0 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 21 Jul 2017 23:22:47 +0200 Subject: [PATCH 3174/3392] libmemcached: fix build with gcc 7.x This commit adds a patch to the libmemcached package that fixes the build with gcc 7.x. Since libmemcached is barely maintained upstream, the patch comes from the Fedora packages. Fixes: http://autobuild.buildroot.net/results/872b8e0e6a24cbc96e3ad9e0b8b47acdf6160ce0/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 8786ac28058aa553cfa8adc176952143af630af6) Signed-off-by: Peter Korsgaard --- .../0005-fix-pointer-comparaison.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/libmemcached/0005-fix-pointer-comparaison.patch diff --git a/package/libmemcached/0005-fix-pointer-comparaison.patch b/package/libmemcached/0005-fix-pointer-comparaison.patch new file mode 100644 index 0000000000..c9f8dd19cf --- /dev/null +++ b/package/libmemcached/0005-fix-pointer-comparaison.patch @@ -0,0 +1,30 @@ +Fix pointer comparaison + +opt_servers is a pointer, not a boolean, so testing against false to +know if the pointer is NULL no longer works with the more strict gcc +7.x checks. + +[Taken from http://pkgs.fedoraproject.org/cgit/rpms/libmemcached.git/plain/libmemcached-build.patch.] +Signed-off-by: Thomas Petazzoni + +diff -up ./clients/memflush.cc.old ./clients/memflush.cc +--- ./clients/memflush.cc.old 2017-02-12 10:12:59.615209225 +0100 ++++ ./clients/memflush.cc 2017-02-12 10:13:39.998382783 +0100 +@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) + { + options_parse(argc, argv); + +- if (opt_servers == false) ++ if (!opt_servers) + { + char *temp; + +@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) + opt_servers= strdup(temp); + } + +- if (opt_servers == false) ++ if (!opt_servers) + { + std::cerr << "No Servers provided" << std::endl; + exit(EXIT_FAILURE); From c98eba1ccefe4b594e3bf5e7ea6d8b3a0ddf14cb Mon Sep 17 00:00:00 2001 From: Dmitrii Kolesnichenko Date: Tue, 20 Jun 2017 19:55:31 +0300 Subject: [PATCH 3175/3392] libtirpc: Fix build error due to missing stdint.h inclusion Add patch to fix following error: | ../../libtirpc-1.0.1/src/xdr_sizeof.c:93:13: error: 'uintptr_t' undeclared (first use in this function); did you mean '__intptr_t'? | if (len < (uintptr_t)xdrs->x_base) { | ^~~~~~~~~ This error occurs with the latest glibc master version (during the testing I had glibc commit 92bd70fb85bce57ac47ba5d8af008736832c955a), but doesn't occur with version 2.25. Patch includes stdint.h to provide uintptr_t. It has been submitted upstream: https://sourceforge.net/p/libtirpc/mailman/message/35850276/ Signed-off-by: Dmitrii Kolesnichenko [Thomas: reformat as Git formatted patch.] Signed-off-by: Thomas Petazzoni (cherry picked from commit b3998dc00ff26c4848b4439ba301502faf8f1995) Signed-off-by: Peter Korsgaard --- .../0008-include-stdint.h-for-uintptr_t.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/libtirpc/0008-include-stdint.h-for-uintptr_t.patch diff --git a/package/libtirpc/0008-include-stdint.h-for-uintptr_t.patch b/package/libtirpc/0008-include-stdint.h-for-uintptr_t.patch new file mode 100644 index 0000000000..62031613d6 --- /dev/null +++ b/package/libtirpc/0008-include-stdint.h-for-uintptr_t.patch @@ -0,0 +1,31 @@ +From 18f8a605e176f0362da22fd1203eb7cedb136aaf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 20 Jun 2017 22:06:35 +0200 +Subject: [PATCH] include stdint.h for uintptr_t + +Fixes +| ../../libtirpc-1.0.1/src/xdr_sizeof.c:93:13: error: 'uintptr_t' undeclared (first use in this function); did you mean '__intptr_t'? +| if (len < (uintptr_t)xdrs->x_base) { +| ^~~~~~~~~ + +Signed-off-by: Khem Raj +Signed-off-by: Dmitrii Kolesnichenko +--- + src/xdr_sizeof.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c +index d23fbd1..79d6707 100644 +--- a/src/xdr_sizeof.c ++++ b/src/xdr_sizeof.c +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include "un-namespace.h" + + /* ARGSUSED */ +-- +2.9.4 + From 5fc13e3a2c32f6a987759801be8e49b2032a280e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 Jul 2017 14:12:49 +0200 Subject: [PATCH 3176/3392] package/libtirpc: security bump to version 1.0.2 Fixes CVE-2017-8779: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commitdiff;h=dd9c7cf4f8f375c6d641b760d124650c418c2ce3 Rebased patches 0001, 0002 & 0006. Removed patch 0007, applied upstream: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=4f1503e84b2f7bd229a097335e52fb8203f5bb0b Renumbered patch 0008. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 49a2bb396c95ba9ae66cd11fc175bb687449364c) Signed-off-by: Peter Korsgaard --- ...parts-of-TIRPC-requiring-NIS-support.patch | 6 +- ...t-and-musl-does-not-install-rpcent.h.patch | 4 +- ...Disable-DES-authentification-support.patch | 12 +--- ...sing-rwlock_unlocks-in-xprt_register.patch | 63 ------------------- ...0007-include-stdint.h-for-uintptr_t.patch} | 0 package/libtirpc/libtirpc.hash | 4 +- package/libtirpc/libtirpc.mk | 2 +- 7 files changed, 13 insertions(+), 78 deletions(-) delete mode 100644 package/libtirpc/0007-Add-missing-rwlock_unlocks-in-xprt_register.patch rename package/libtirpc/{0008-include-stdint.h-for-uintptr_t.patch => 0007-include-stdint.h-for-uintptr_t.patch} (100%) 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 e51c5a44b2..eb1bef3dc1 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 @@ -13,6 +13,8 @@ Signed-off-by: "Yann E. MORIN" Signed-off-by: Jörg Krause [peda@axentia.se: update for 1.0.1] Signed-off-by: Peter Rosin +[bernd.kuhls@t-online.de: update for 1.0.2] +Signed-off-by: Bernd Kuhls --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) @@ -25,8 +27,8 @@ index 6cc567a..9834f9a 100644 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 +- auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c ++ auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.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 xdr_sizeof.c diff --git a/package/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch b/package/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch index 643a57ed5a..51229a024d 100644 --- a/package/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch +++ b/package/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch @@ -8,6 +8,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" [joerg.krause@embedded.rocks: musl fix] Signed-off-by: Jörg Krause +[bernd.kuhls@t-online.de: update for 1.0.2] +Signed-off-by: Bernd Kuhls --- tirpc/rpc/rpcent.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) @@ -21,7 +23,7 @@ index 147f909..4a58180 100644 #endif -/* These are defined in /usr/include/rpc/netdb.h */ --#if !defined(__GLIBC__) +-#if !defined(__GLIBC__) || defined(__UCLIBC__) +/* These are defined in /usr/include/rpc/netdb.h, unless we are using + the C library without RPC support. */ +#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__) diff --git a/package/libtirpc/0006-Disable-DES-authentification-support.patch b/package/libtirpc/0006-Disable-DES-authentification-support.patch index 59a77ffc1d..0c65472400 100644 --- a/package/libtirpc/0006-Disable-DES-authentification-support.patch +++ b/package/libtirpc/0006-Disable-DES-authentification-support.patch @@ -11,6 +11,8 @@ 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 +[bernd.kuhls@t-online.de: update for 1.0.2] +Signed-off-by: Bernd Kuhls --- src/Makefile.am | 2 +- src/rpc_soc.c | 32 -------------------------------- @@ -26,7 +28,7 @@ index 960a522..3a88e31 100644 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 +- auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c + debug.c ## XDR @@ -48,14 +50,6 @@ 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 -@@ -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) } diff --git a/package/libtirpc/0007-Add-missing-rwlock_unlocks-in-xprt_register.patch b/package/libtirpc/0007-Add-missing-rwlock_unlocks-in-xprt_register.patch deleted file mode 100644 index 56b5bf8392..0000000000 --- a/package/libtirpc/0007-Add-missing-rwlock_unlocks-in-xprt_register.patch +++ /dev/null @@ -1,63 +0,0 @@ -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/0008-include-stdint.h-for-uintptr_t.patch b/package/libtirpc/0007-include-stdint.h-for-uintptr_t.patch similarity index 100% rename from package/libtirpc/0008-include-stdint.h-for-uintptr_t.patch rename to package/libtirpc/0007-include-stdint.h-for-uintptr_t.patch diff --git a/package/libtirpc/libtirpc.hash b/package/libtirpc/libtirpc.hash index cd65164cb2..35ac6a2278 100644 --- a/package/libtirpc/libtirpc.hash +++ b/package/libtirpc/libtirpc.hash @@ -1,4 +1,4 @@ # From sourceforge's info on download page: -sha1 8da1636f98b5909c0d587e7534bc1e91f5c1a970 libtirpc-1.0.1.tar.bz2 +sha1 2a8dc0e6eecc45be6597c8287b1d8e15cbee46e3 libtirpc-1.0.2.tar.bz2 # Locally computed -sha256 5156974f31be7ccbc8ab1de37c4739af6d9d42c87b1d5caf4835dda75fcbb89e libtirpc-1.0.1.tar.bz2 +sha256 723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5 libtirpc-1.0.2.tar.bz2 diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 70a31ac59f..a11e49a121 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.0.1 +LIBTIRPC_VERSION = 1.0.2 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3c From 05f13baaf3557b3815de329aded5394054bea642 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Jun 2017 22:39:29 +0200 Subject: [PATCH 3177/3392] package/ffmpeg: add optional support for alsa-lib ffmpeg has optional support for alsa as input and/or output device: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=configure;h=23823e3b7012d847b614bd43316fb614676bedb2;hb=refs/heads/release/3.3#l2987 Problem was found while fixing http://autobuild.buildroot.net/results/7ba/7ba485532fcab74928246a8f95dba7e5eea9d4a5/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit ca06ba2d2a673cf750ac92a4e61e7cba037a339e) Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 6540d41c52..4494612879 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -159,12 +159,18 @@ endif ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y) FFMPEG_CONF_OPTS += --enable-indevs +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) +FFMPEG_DEPENDENCIES += alsa-lib +endif else FFMPEG_CONF_OPTS += --disable-indevs endif ifeq ($(BR2_PACKAGE_FFMPEG_OUTDEVS),y) FFMPEG_CONF_OPTS += --enable-outdevs +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) +FFMPEG_DEPENDENCIES += alsa-lib +endif else FFMPEG_CONF_OPTS += --disable-outdevs endif From e5570186a4c4a06757f95f125d28159ad557b5ed Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 Jul 2017 17:13:06 +0200 Subject: [PATCH 3178/3392] package/ffmpeg: disable build of nvidia hardware acceleration support ffmpeg always enables support for nvenc/cuda even if their support libraries are not present: External libraries providing hardware acceleration: cuda cuvid nvenc [...] Enabled hwaccels: h264_cuvid mjpeg_cuvid mpeg2_cuvid vc1_cuvid vp9_cuvid hevc_cuvid mpeg1_cuvid mpeg4_cuvid vp8_cuvid This leads to a crash in freeswitch git master when transcoding video streams on a system without nvidia hardware: 2017-07-22 15:06:27.306760 [INFO] avcodec.c:1077 initializing encoder 352x288 2017-07-22 15:06:27.306760 [NOTICE] avcodec.c:828 NVENC HW CODEC ENABLED This patch disables the support of nvidia hardware acceleration support for now until the needed packages are added to buildroot. For details about this please refer to https://developer.nvidia.com/ffmpeg Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3b6fa452f6ee20f54e47fdc3106620ff258f13b7) Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 4494612879..9c30e8f406 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -44,6 +44,9 @@ FFMPEG_CONF_OPTS = \ --disable-mipsdspr2 \ --disable-msa \ --enable-hwaccels \ + --disable-cuda \ + --disable-cuvid \ + --disable-nvenc \ --disable-avisynth \ --disable-frei0r \ --disable-libopencore-amrnb \ From 3510dfefd686a893d3e85bee56d98e64c884ab16 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 11 Jul 2017 17:59:55 +0200 Subject: [PATCH 3179/3392] efibootmgr: fix build with gcc 7.x Now that the build of efivar with gcc 7.x has been fixed by commit 0ca30170345a81f5f21e4ef4424b1f186cde1988 ("efivar: fix build with gcc 7"), efibootmgr fails similarly with gcc 7.x. This commit backports an upstream patch that fixes this issue. Signed-off-by: Thomas Petazzoni (cherry picked from commit cefdd6546010e160985de2daa2ef70a952d081f6) Signed-off-by: Peter Korsgaard --- ...ra-const-keywords-gcc-7-gripes-about.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/efibootmgr/0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch diff --git a/package/efibootmgr/0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch b/package/efibootmgr/0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch new file mode 100644 index 0000000000..8bc6f01ef4 --- /dev/null +++ b/package/efibootmgr/0003-Remove-extra-const-keywords-gcc-7-gripes-about.patch @@ -0,0 +1,51 @@ +From a542b169003c2ef95ce6c00d40050eb10568b612 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 6 Feb 2017 16:34:54 -0500 +Subject: [PATCH] Remove extra const keywords gcc 7 gripes about. + +Signed-off-by: Peter Jones +[Backported from upstream commit a542b169003c2ef95ce6c00d40050eb10568b612] +Signed-off-by: Thomas Petazzoni +--- + src/efibootdump.c | 2 +- + src/efibootmgr.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/efibootdump.c b/src/efibootdump.c +index 6ff8360..30a1943 100644 +--- a/src/efibootdump.c ++++ b/src/efibootdump.c +@@ -39,7 +39,7 @@ print_boot_entry(efi_load_option *loadopt, size_t data_size) + uint8_t *optional_data = NULL; + size_t optional_data_len = 0; + uint16_t pathlen; +- const unsigned char const *desc; ++ const unsigned char *desc; + char *raw; + size_t raw_len; + +diff --git a/src/efibootmgr.c b/src/efibootmgr.c +index 493f2cf..90a0998 100644 +--- a/src/efibootmgr.c ++++ b/src/efibootmgr.c +@@ -221,7 +221,7 @@ warn_duplicate_name(list_t *var_list) + list_t *pos; + var_entry_t *entry; + efi_load_option *load_option; +- const unsigned char const *desc; ++ const unsigned char *desc; + + list_for_each(pos, var_list) { + entry = list_entry(pos, var_entry_t, list); +@@ -873,7 +873,7 @@ show_vars(const char *prefix) + { + list_t *pos; + var_entry_t *boot; +- const unsigned char const *description; ++ const unsigned char *description; + efi_load_option *load_option; + efidp dp = NULL; + unsigned char *optional_data = NULL; +-- +2.9.4 + From 77604f73362030573ee951639ac71289e95e72a8 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 3 Jul 2017 10:41:06 +0200 Subject: [PATCH 3180/3392] package/Makefile.in: add host-cc-option macro This macro allows to test if HOSTCC supports a specific option. It is needed to pass '-no-pie' on recent Debian, Ubuntu and Gentoo hosts. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit 91a08ecc998ae232ea6f3525540ed129d8176d18) Signed-off-by: Peter Korsgaard --- package/Makefile.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/package/Makefile.in b/package/Makefile.in index c1dc714331..b32ad8e447 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -223,6 +223,27 @@ 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 +# The macros below are taken from linux 4.11 and adapted slightly. +# Copy more when needed. + +# try-run +# Usage: option = $(call try-run, $(CC)...-o "$$TMP",option-ok,otherwise) +# Exit code chooses option. "$$TMP" is can be used as temporary file and +# is automatically cleaned up. +try-run = $(shell set -e; \ + TMP="$$(tempfile)"; \ + if ($(1)) >/dev/null 2>&1; \ + then echo "$(2)"; \ + else echo "$(3)"; \ + fi; \ + rm -f "$$TMP") + +# host-cc-option +# Usage: HOST_FOO_CFLAGS += $(call host-cc-option,-no-pie,) +host-cc-option = $(call try-run,\ + $(HOSTCC) $(HOST_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2)) + + # 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 2573e725ea553927557d01edd5cd8669ca591ea0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Jul 2017 10:41:07 +0200 Subject: [PATCH 3181/3392] package/aespipe: fix host compile Building host-aespipe fails on Debian stretch at linking stage: /usr/bin/gcc -L/home/buildroot/br6/output/host/lib -L/home/buildroot/br6/output/host/usr/lib -Wl,-rpath,/home/buildroot/br6/output/host/usr/lib -o aespipe aespipe.o aes-amd64.o md5-amd64.o md5-2x-amd64.o aes-intel64.o sha512.o rmd160.o /usr/bin/ld: aes-amd64.o: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC The same problem apparently exists on recent Ubuntu and Gentoo. Fix is also used in Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837393 [Peter: add comment explaining why] [Arnout: use host-cc-option to discover if -no-pie is available; cfr. 57b628a932b9b4a3c4bf80f4c82a81da5adcb173] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni (cherry picked from commit 00ecd72c28f103fc7d166f718db81a8b6c4919fa) Signed-off-by: Peter Korsgaard --- package/aespipe/aespipe.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/aespipe/aespipe.mk b/package/aespipe/aespipe.mk index 6a38556ef1..5ef95d5206 100644 --- a/package/aespipe/aespipe.mk +++ b/package/aespipe/aespipe.mk @@ -9,5 +9,15 @@ AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2 AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe AESPIPE_LICENSE = GPL +# Recent Debian, Gentoo and Ubuntu enable -fPIE by default, breaking the build: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837393 +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835148 +# Older gcc versions however don't support the -no-pie flag, so we have to +# check its availability. +HOST_AESPIPE_NO_PIE_FLAG = $(call host-cc-option,-no-pie) +HOST_AESPIPE_CONF_ENV = \ + CFLAGS="$(HOST_CFLAGS) $(HOST_AESPIPE_NO_PIE_FLAG)" \ + LDFLAGS="$(HOST_LDFLAGS) $(HOST_AESPIPE_NO_PIE_FLAG)" + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 26573a3cc7babf6b9584fbcc0bb1ece90c30d28c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 Jul 2017 12:07:36 +0200 Subject: [PATCH 3182/3392] package/heimdal: security bump to version 7.4.0 Fixes security bugs CVE-2017-11103 & CVE-2017-6594 Changed upstream tarball location as noted in the release notes: http://www.h5l.org/releases.html?show=7.4.0 --with-db-type-preference= is needed to fix a build error: CCLD otp ../../lib/otp/.libs/libotp.a(otp_db.o): In function `otp_get_internal': otp_db.c:(.text+0x32): undefined reference to `__roken_dbm_fetch' otp_db.c:(.text+0xd9): undefined reference to `__roken_dbm_store' ../../lib/otp/.libs/libotp.a(otp_db.o): In function `otp_db_open': otp_db.c:(.text+0x1c9): undefined reference to `__roken_dbm_open' ../../lib/otp/.libs/libotp.a(otp_db.o): In function `otp_db_close': otp_db.c:(.text+0x205): undefined reference to `__roken_dbm_close' ../../lib/otp/.libs/libotp.a(otp_db.o): In function `otp_delete': otp_db.c:(.text+0x23e): undefined reference to `__roken_dbm_delete' ../../lib/otp/.libs/libotp.a(otp_db.o): In function `otp_put': otp_db.c:(.text+0x388): undefined reference to `__roken_dbm_store' collect2: error: ld returned 1 exit status Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 02770ce47d6c358c959410e87c5218170d2e08e7) Signed-off-by: Peter Korsgaard --- package/heimdal/heimdal.hash | 4 ++-- package/heimdal/heimdal.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/heimdal/heimdal.hash b/package/heimdal/heimdal.hash index 12770e17ff..a0e0f3f1ba 100644 --- a/package/heimdal/heimdal.hash +++ b/package/heimdal/heimdal.hash @@ -1,2 +1,2 @@ -# Locally calculated after checking pgp signature -sha256 cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d heimdal-7.1.0.tar.gz +# Locally calculated +sha256 3de14ecd36ad21c1694a13da347512b047f4010d176fe412820664cb5d1429ad heimdal-7.4.0.tar.gz diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 5376a6c40e..2d4b826a03 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -4,8 +4,8 @@ # ################################################################################ -HEIMDAL_VERSION = 7.1.0 -HEIMDAL_SITE = http://www.h5l.org/dist/src +HEIMDAL_VERSION = 7.4.0 +HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf HEIMDAL_INSTALL_STAGING = YES HEIMDAL_MAKE = $(MAKE1) @@ -15,6 +15,7 @@ HOST_HEIMDAL_CONF_OPTS = \ --enable-static \ --without-openldap \ --without-capng \ + --with-db-type-preference= \ --without-sqlite3 \ --without-libintl \ --without-openssl \ From de2ffb62a255da7794618b3c0f420ae7e1d95cae Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Jul 2017 22:03:38 +0200 Subject: [PATCH 3183/3392] package/x265: disable altivec on ppc64 Disable altivec support until gcc problems are fixed: https://bitbucket.org/multicoreware/x265/issues/320/fail-to-build-on-power8-le#comment-34076791 Fixes http://autobuild.buildroot.net/results/419/41910d44ff98c60a6bb9fd3b6a10bd4d0b98d646/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 4f3fd7460c7cb004cc4f7f75451d3901098910af) Signed-off-by: Peter Korsgaard --- package/x265/x265.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/x265/x265.mk b/package/x265/x265.mk index 0fbdb01071..8ffec80a4c 100644 --- a/package/x265/x265.mk +++ b/package/x265/x265.mk @@ -16,6 +16,12 @@ ifeq ($(BR2_i386)$(BR2_x86_64),y) X265_DEPENDENCIES += host-yasm endif +# disable altivec, it has build issues +# https://bitbucket.org/multicoreware/x265/issues/320/ +ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) +X265_CONF_OPTS += -DENABLE_ALTIVEC=OFF +endif + ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) X265_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_PIC=ON else From 0964469afb22ead61dc33d34e48a10287e109e75 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 24 Jul 2017 11:16:10 +0200 Subject: [PATCH 3184/3392] bind: bump version to bugfix release 9.11.1-P3 BIND 9.11.1-P3 addresses a TSIG regression introduced in the 9.11.1-P2 security bump: https://lists.isc.org/pipermail/bind-announce/2017-July/001057.html Also add a hash for the license file while we're at it. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit c237f1d1c5447af3b967304d7929cf115ea1aa5d) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 5 +++-- package/bind/bind.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 5dd15cb86b..3a631def65 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,2 +1,3 @@ -# Verified from http://ftp.isc.org/isc/bind9/9.11.1-P1/bind-9.11.1-P2.tar.gz.sha256.asc -sha256 bf53c6431575ae1612ddef66d18ef9baf2a22d842fa5b0cadc971919fd81fea5 bind-9.11.1-P2.tar.gz +# Verified from http://ftp.isc.org/isc/bind9/9.11.1-P3/bind-9.11.1-P3.tar.gz.sha256.asc +sha256 52426e75432e46996dc90f24fca027805a341c38fbbb022b60dc9acd2677ccf4 bind-9.11.1-P3.tar.gz +sha256 d3906dfe153e2c48440d3ca1d5319f5e89b4b820cdfc5d0779c23d7ac2b175e9 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index ee7621cb54..acc09119ce 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.1-P2 +BIND_VERSION = 9.11.1-P3 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) From e680be31ffef5318930017063e4970e5c0ae3569 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 24 Jul 2017 22:14:42 +0200 Subject: [PATCH 3185/3392] orc: update project url The original url http://code.entropywave.com/orc is dead (server not found). Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 036d235ade6a7577493385c97c63c599cdbcb735) Signed-off-by: Peter Korsgaard --- package/orc/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/orc/Config.in b/package/orc/Config.in index 2470d99284..7943ecfbfb 100644 --- a/package/orc/Config.in +++ b/package/orc/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_ORC Orc is a library and set of tools for compiling and executing very simple programs that operate on arrays of data. - http://code.entropywave.com/projects/orc/ + https://gstreamer.freedesktop.org/projects/orc.html comment "orc needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS From 25d4b5cf7894c5a274661dcb907cddecaa7299be Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 26 Jul 2017 10:50:40 +0200 Subject: [PATCH 3186/3392] webkitgtk: security bump to version 2.16.6 Fixes the following security issues: CVE-2017-7018 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. tvOS before 10.2.2 is affected. The issue involves the "WebKit" component. It allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption and application crash) via a crafted web site. CVE-2017-7030 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. tvOS before 10.2.2 is affected. The issue involves the "WebKit" component. It allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption and application crash) via a crafted web site. CVE-2017-7034 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. tvOS before 10.2.2 is affected. The issue involves the "WebKit" component. It allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption and application crash) via a crafted web site. CVE-2017-7037 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. tvOS before 10.2.2 is affected. The issue involves the "WebKit" component. It allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption and application crash) via a crafted web site. CVE-2017-7039 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. tvOS before 10.2.2 is affected. The issue involves the "WebKit" component. It allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption and application crash) via a crafted web site. CVE-2017-7046 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. tvOS before 10.2.2 is affected. The issue involves the "WebKit" component. It allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption and application crash) via a crafted web site. CVE-2017-7048 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. tvOS before 10.2.2 is affected. The issue involves the "WebKit" component. It allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption and application crash) via a crafted web site. CVE-2017-7055 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. tvOS before 10.2.2 is affected. The issue involves the "WebKit" component. It allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption and application crash) via a crafted web site. CVE-2017-7056 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. tvOS before 10.2.2 is affected. The issue involves the "WebKit" component. It allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption and application crash) via a crafted web site. CVE-2017-7061 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. tvOS before 10.2.2 is affected. The issue involves the "WebKit" component. It allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption and application crash) via a crafted web site. CVE-2017-7064 - An issue was discovered in certain Apple products. iOS before 10.3.3 is affected. Safari before 10.1.2 is affected. iCloud before 6.2.2 on Windows is affected. iTunes before 12.6.2 on Windows is affected. The issue involves the "WebKit" component. It allows attackers to bypass intended memory-read restrictions via a crafted app. For more details, see the announcement: https://webkitgtk.org/2017/07/24/webkitgtk2.16.6-released.html Signed-off-by: Peter Korsgaard Reviewed-by: "Adrian Perez de Castro" Signed-off-by: Peter Korsgaard (cherry picked from commit b5582d54a4e0035cf3b9cee57f10906276e8f4d6) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 5df4ce8df3..2c0fc50611 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,4 +1,4 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.16.5.tar.xz.sums -md5 fce72dc89cd310a663d9eb97133861fe webkitgtk-2.16.5.tar.xz -sha1 8052fda41b1b666f175baaac787c5cba39ed24a0 webkitgtk-2.16.5.tar.xz -sha256 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4 webkitgtk-2.16.5.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.16.6.tar.xz.sums +md5 0e2d142a586e4ff79cf0324f4fdbf20c webkitgtk-2.16.6.tar.xz +sha1 f7fca3fbac3dc99e39f353a6df250635e684c922 webkitgtk-2.16.6.tar.xz +sha256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 webkitgtk-2.16.6.tar.xz diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 187885add6..8329d52f9f 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.16.5 +WEBKITGTK_VERSION = 2.16.6 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From ab0cbd3cbc18db5146b9fc7a98cc0315132ce083 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 26 Jul 2017 11:41:04 +0200 Subject: [PATCH 3187/3392] tcpdump: security bump to 4.9.1 Fixes CVE-2017-11108/Fix bounds checking for STP Changelog: http://www.tcpdump.org/tcpdump-changes.txt [Peter: add signature link as suggested by Baruch] Signed-off-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard (cherry picked from commit e58888571416c78eb3fad74e364418e33acbd94e) Signed-off-by: Peter Korsgaard --- package/tcpdump/tcpdump.hash | 4 ++-- package/tcpdump/tcpdump.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index 966db1f3aa..4eedc1c165 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,2 +1,2 @@ -# Locally calculated after checking pgp signature -sha256 eae98121cbb1c9adbedd9a777bf2eae9fa1c1c676424a54740311c8abcee5a5e tcpdump-4.9.0.tar.gz +# Locally calculated after checking pgp signature at http://www.tcpdump.org/release/tcpdump-4.9.1.tar.gz.sig +sha256 f9448cf4deb2049acf713655c736342662e652ef40dbe0a8f6f8d5b9ce5bd8f3 tcpdump-4.9.1.tar.gz diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index e71f9c113f..ac710b8f74 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.9.0 +TCPDUMP_VERSION = 4.9.1 TCPDUMP_SITE = http://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3c TCPDUMP_LICENSE_FILES = LICENSE From a2818c7cfa3b7efef41ed85215db60e23cc0876a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 26 Jul 2017 23:33:09 +0200 Subject: [PATCH 3188/3392] Update for 2017.02.5 Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ Makefile | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 90d409f2c6..73936428e1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,26 @@ +2017.02.5, Released July 27th, 2017 + + Important / security related fixes. + + Webkitgtk bumped to the 2.16.x series, fixing a large number + of security issues. + + host-aespipe compile fix for Debian/Gentoo/Ubuntu toolchains + which default to PIE mode. + + Updated/fixed packages: aespipe, apache, bind, binutils, + ccache, collectd, efibootmgr, efivar, expat, ffmpeg, gcc, + heimdal, iproute2, irssi, libglib2, libmemcached, libosip2, + libtirpc, libxml-parser-perl, linux-fusion, linux-zigbee, + mpg123, nodejs, orc, pcre, php, pulseaudio, + python-setproctitle, qt5base, rpi-firmware, samba4, syslinux, + systemd, spice, tiff, webkitgtk, x265, xen, + xserver_xorg-server, xvisor + + Issues resolved (http://bugs.buildroot.org): + + #10061: gcc5.4 buildroot toolchain for powerpc libsanitizer... + 2017.02.4, Released July 4th, 2017 Important / security related fixes. diff --git a/Makefile b/Makefile index 321b307383..9b517904e6 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02.4 +export BR2_VERSION := 2017.02.5 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1499186000 +BR2_VERSION_EPOCH = 1501100000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) From 21e5d6a6a7486dd34cfc9ef918481b6066841be3 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Tue, 25 Jul 2017 07:02:56 -0700 Subject: [PATCH 3189/3392] mariadb: bump version to 10.1.25 release notes: https://mariadb.com/kb/en/mariadb-10125-release-notes/ changelog: https://mariadb.com/kb/en/mariadb-10125-changelog/ Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni (cherry picked from commit 5ec9bd15f7ef9c9e38e281be85377090d1d4f76e) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 8 ++++++-- package/mariadb/mariadb.mk | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 580fe987d9..4ef3551a36 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,2 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.1.23/ -sha256 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf mariadb-10.1.23.tar.gz +# From https://downloads.mariadb.org/mariadb/10.1.25/ +sha256 7205ecaa6f1bc16335ad88faa5c46be52b3ac628a5e795cb942a3f4335b2a0d6 mariadb-10.1.25.tar.gz + +# Hash for license files +sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a README +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index e171e0ef09..ec4172682e 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.1.23 +MARIADB_VERSION = 10.1.25 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library) # Tarball no longer contains LGPL license text From 0813899c435a41240898b94df73c54e8aa8e94f9 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 28 Jul 2017 06:44:40 -0400 Subject: [PATCH 3190/3392] host-mariadb: compile against bundled yassl On Fedora26, openssl 1.1.x is included by default. This causes build errors when building the host variant of mariadb. Adding -DWITH_SSL=bundled fixes this issue. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6103ce335acabd8f336f8eb7c239da6f1c080e04) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index ec4172682e..d2d55b55b5 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -67,6 +67,8 @@ MARIADB_CONF_OPTS += \ -DMYSQL_DATADIR=/var/lib/mysql \ -DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET) +HOST_MARIADB_CONF_OPTS += -DWITH_SSL=bundled + # Some helpers must be compiled for host in order to crosscompile mariadb for # the target. They are then included by import_executables.cmake which is # generated during the build of the host helpers. It is not necessary to build From e0b2bd6dff25e79043851e26e7c38899ed4c79d0 Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Tue, 22 Aug 2017 07:07:26 -0700 Subject: [PATCH 3191/3392] mariadb: security bump version to 10.1.26 Release notes: https://mariadb.com/kb/en/mariadb-10126-release-notes/ Changelog: https://mariadb.com/kb/en/mariadb-10126-changelog/ Fixes the following security vulnerabilities: CVE-2017-3636 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Client programs). Supported versions that are affected are 5.5.56 and earlier and 5.6.36 and earlier. Easily exploitable vulnerability allows low privileged attacker with logon to the infrastructure where MySQL Server executes to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized update, insert or delete access to some of MySQL Server accessible data as well as unauthorized read access to a subset of MySQL Server accessible data and unauthorized ability to cause a partial denial of service (partial DOS) of MySQL Server. CVE-2017-3641 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: DML). Supported versions that are affected are 5.5.56 and earlier, 5.6.36 and earlier and 5.7.18 and earlier. Easily exploitable vulnerability allows high privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2017-3653 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: DDL). Supported versions that are affected are 5.5.56 and earlier, 5.6.36 and earlier and 5.7.18 and earlier. Difficult to exploit vulnerability allows low privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized update, insert or delete access to some of MySQL Server accessible data. Signed-off-by: Ryan Coe Signed-off-by: Thomas Petazzoni (cherry picked from commit ff0cf723b7cb0aa621aa81f171814be63b179a4b) Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 4 ++-- package/mariadb/mariadb.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 4ef3551a36..fd5625c8e7 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,5 +1,5 @@ -# From https://downloads.mariadb.org/mariadb/10.1.25/ -sha256 7205ecaa6f1bc16335ad88faa5c46be52b3ac628a5e795cb942a3f4335b2a0d6 mariadb-10.1.25.tar.gz +# From https://downloads.mariadb.org/mariadb/10.1.26/ +sha256 ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d mariadb-10.1.26.tar.gz # Hash for license files sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a README diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index d2d55b55b5..86b3a23f59 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.1.25 +MARIADB_VERSION = 10.1.26 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library) # Tarball no longer contains LGPL license text From 0e1d90837684911340f042f7c1ca7a3614af5b45 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 28 Jul 2017 01:02:27 +0200 Subject: [PATCH 3192/3392] package/pkg-kconfig.mk: fix typo in comment Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 412a872e217e1e6569afb65b5113199f30b199ce) Signed-off-by: Peter Korsgaard --- package/pkg-kconfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 215f01b430..0402f81ffe 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -189,7 +189,7 @@ $$($(2)_DIR)/.kconfig_editor_%: $$($(2)_DIR)/.stamp_kconfig_fixup_done # which in turn depends on the (newly-set an non-existent) custom # defconfig file. # -# Instead, we use an PHONY rule that will catch that situation. +# Instead, we use a PHONY rule that will catch that situation. # $(1)-check-configuration-done: @if [ ! -f $$($(2)_DIR)/.stamp_kconfig_fixup_done ]; then \ From ef7ff0f445fe2749267bc8b100b8535bf64e2637 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 27 Jul 2017 10:45:15 +0200 Subject: [PATCH 3193/3392] python-libconfig: fix Python3 build boost_python library is named boost_python3, if boost is built under Python3 environment. The patch fixes setup.py accordingly. Fixes: http://autobuild.buildroot.net/results/975/97533965180436c2f7a99de07fdc360ef57f84b0 http://autobuild.buildroot.net/results/b49/b49de32704f0f7ce5a610cf4363c6dcc2d8bafa1 http://autobuild.buildroot.net/results/e26/e26b4b9b486c582fb55826817a3428569968320f Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 3cd8023c73cef082ccaca86d7bb43ec7ec7ce56e) Signed-off-by: Peter Korsgaard --- ...python-name-depending-on-current-Pyt.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch diff --git a/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch b/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch new file mode 100644 index 0000000000..b30efc124d --- /dev/null +++ b/package/python-libconfig/0001-Determine-boost_python-name-depending-on-current-Pyt.patch @@ -0,0 +1,40 @@ +From 3bc4b9c0d60a735b1d63e52f74492ace39f02824 Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Thu, 27 Jul 2017 09:46:07 +0200 +Subject: [PATCH] Determine boost_python name depending on current Python + version + +Python2 requires boost_python and Python3 requires boost_python3. + +Signed-off-by: Yegor Yefremov +--- + setup.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index fdf5c27..4b38569 100644 +--- a/setup.py ++++ b/setup.py +@@ -3,6 +3,10 @@ + from setuptools import setup, find_packages, Extension + import sys, os + ++boostlib = "boost_python3" ++if sys.version_info < (3, 0): ++ boostlib = "boost_python" ++ + setup( + name = 'pylibconfig', + description = "libconfig bindings for Python", +@@ -19,7 +23,7 @@ setup( + Extension( + "pylibconfig", + ["src/pylibconfig.cc"], +- libraries=["boost_python", "config++"] ++ libraries=[boostlib, "config++"] + #include_dirs=includes, + #extra_link_args=lflags + ) +-- +2.11.0 + From 075494dd3f5f6b4012a77979067fa2f3065a93e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20P=C3=A9rez=20de=20Castro?= Date: Sat, 29 Jul 2017 16:16:39 +0300 Subject: [PATCH 3194/3392] webkitgtk: Add patches which allow building for ARMv8-A The two added patches allow building WebKitGTK+ when the compiler scpecifically targets ARMv8-A, and reports as such be pre-defining __ARCH_ARM_8A__ instead of just __ARCH_ARM_8__. Both patches were pulled from the corresponding upstream bug reports and edited to remove the conflicting parts which edit the ChangeLog files. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 3e4efb30f3bf96cad33e2f8982d469803dded145) Signed-off-by: Peter Korsgaard --- ...uild-when-the-compiler-specifically-.patch | 36 +++++++++++++++++++ ...to-build-when-the-compiler-specifica.patch | 36 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch create mode 100644 package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch diff --git a/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch b/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch new file mode 100644 index 0000000000..017771a07d --- /dev/null +++ b/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch @@ -0,0 +1,36 @@ +From 09d5520d910b63fba67bea1d8c71f5d426f345b7 Mon Sep 17 00:00:00 2001 +From: "aperez@igalia.com" + +Date: Wed, 12 Jul 2017 18:42:29 +0000 +Subject: [PATCH] [WTF] Failure to build when the compiler specifically targets + ARMv8-A / defines __ARM_ARCH_8A__ + https://bugs.webkit.org/show_bug.cgi?id=174425 + +Reviewed by Michael Catanzaro. + +* wtf/Platform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8. + +Signed-off-by: Adrian Perez de Castro + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219415 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WTF/wtf/Platform.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 44d929c333c..7dccb44fcbf 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -238,7 +238,8 @@ + || defined(__ARM_ARCH_7S__) + #define WTF_ARM_ARCH_VERSION 7 + +-#elif defined(__ARM_ARCH_8__) ++#elif defined(__ARM_ARCH_8__) \ ++ || defined(__ARM_ARCH_8A__) + #define WTF_ARM_ARCH_VERSION 8 + + /* MSVC sets _M_ARM */ +-- +2.13.3 + diff --git a/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch b/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch new file mode 100644 index 0000000000..e1623bffa0 --- /dev/null +++ b/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch @@ -0,0 +1,36 @@ +From 07dab7fe552c53e7840e34d3c8bb1cc43a921706 Mon Sep 17 00:00:00 2001 +From: "aperez@igalia.com" + +Date: Wed, 12 Jul 2017 18:43:36 +0000 +Subject: [PATCH] bmalloc: Failure to build when the compiler specifically + targets ARMv8-A / defines __ARM_ARCH_8A__ + https://bugs.webkit.org/show_bug.cgi?id=174424 + +Reviewed by Michael Catanzaro. + +* bmalloc/BPlatform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8. + +Signed-off-by: Adrian Perez de Castro + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219416 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/bmalloc/bmalloc/BPlatform.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Source/bmalloc/bmalloc/BPlatform.h b/Source/bmalloc/bmalloc/BPlatform.h +index 8d768db63fb..400143a63fb 100644 +--- a/Source/bmalloc/bmalloc/BPlatform.h ++++ b/Source/bmalloc/bmalloc/BPlatform.h +@@ -120,7 +120,8 @@ + || defined(__ARM_ARCH_7S__) + #define BARM_ARCH_VERSION 7 + +-#elif defined(__ARM_ARCH_8__) ++#elif defined(__ARM_ARCH_8__) \ ++|| defined(__ARM_ARCH_8A__) + #define BARM_ARCH_VERSION 8 + + /* MSVC sets _M_ARM */ +-- +2.13.3 + From a0658ea000b9adddf40303a44ddfc9a2692890ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20P=C3=A9rez=20de=20Castro?= Date: Sat, 29 Jul 2017 16:18:44 +0300 Subject: [PATCH 3195/3392] webkitgtk: Allow building with BR2_PACKAGE_WEBKITGTK_MULTIMEDIA disabled Explicitly pass "-DENABLE_MEDIA_STREAM=OFF" to CMake, to workaround a missing feature dependency in the WebKitGTK+ build files. Related upstream bug: https://bugs.webkit.org/show_bug.cgi?id=174940 Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 9aceb8bfa8c39167b1c449301b7f00f16e4f816c) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 8329d52f9f..fc51031582 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -40,9 +40,13 @@ WEBKITGTK_CONF_OPTS += \ -DENABLE_WEB_AUDIO=ON WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good else +# ENABLE_MEDIA_STREAM has to be explicitly disabled because there is a missing +# feature dependency in the WebKitGTK+ CMake files. This can be removed once +# https://bugs.webkit.org/show_bug.cgi?id=174940 makes it into a release. WEBKITGTK_CONF_OPTS += \ -DENABLE_VIDEO=OFF \ - -DENABLE_WEB_AUDIO=OFF + -DENABLE_WEB_AUDIO=OFF \ + -DENABLE_MEDIA_STREAM=OFF endif # Only one target platform can be built, assume X11 > Wayland From 6a1fa0809581cf5eb99ab98ee93ecc1ffb0af8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20P=C3=A9rez=20de=20Castro?= Date: Sat, 29 Jul 2017 22:27:05 +0300 Subject: [PATCH 3196/3392] webkitgtk: Add upstream patch needed for builds with ENABLE_VIDEO=OFF This includes a slightly modified version of the patch for bug https://bugs.webkit.org/show_bug.cgi?id=174940 Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit f2b9399c769001d790e4a6ea199e1f36f181db8a) Signed-off-by: Peter Korsgaard --- ...-build-when-ENABLE_VIDEO-is-disabled.patch | 207 ++++++++++++++++++ 1 file changed, 207 insertions(+) create mode 100644 package/webkitgtk/0003-Fix-broken-build-when-ENABLE_VIDEO-is-disabled.patch diff --git a/package/webkitgtk/0003-Fix-broken-build-when-ENABLE_VIDEO-is-disabled.patch b/package/webkitgtk/0003-Fix-broken-build-when-ENABLE_VIDEO-is-disabled.patch new file mode 100644 index 0000000000..b460b0c924 --- /dev/null +++ b/package/webkitgtk/0003-Fix-broken-build-when-ENABLE_VIDEO-is-disabled.patch @@ -0,0 +1,207 @@ +From c054224e551547c3e3593b60ca1226fa4ac41c01 Mon Sep 17 00:00:00 2001 +From: "timothy@hatcher.name" + +Date: Tue, 11 Jul 2017 18:07:24 +0000 +Subject: [PATCH] Fix broken build when ENABLE_VIDEO is disabled. + https://bugs.webkit.org/show_bug.cgi?id=174368 + +Reviewed by Alex Christensen. + +* dom/Document.cpp: +* html/canvas/WebGLRenderingContextBase.cpp: +(WebCore::WebGLRenderingContextBase::texSubImage2D): +(WebCore::WebGLRenderingContextBase::texImage2D): +* html/canvas/WebGLRenderingContextBase.h: +* html/canvas/WebGLRenderingContextBase.idl: +* testing/Internals.cpp: +(WebCore::Internals::mediaResponseSources): +(WebCore::Internals::mediaResponseContentRanges): +* testing/Internals.h: +* testing/Internals.idl: + +Signed-off-by: Adrian Perez de Castro + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219343 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + .../html/canvas/WebGLRenderingContextBase.cpp | 16 +++++++++++---- + .../html/canvas/WebGLRenderingContextBase.h | 12 ++++++++++- + .../html/canvas/WebGLRenderingContextBase.idl | 4 ++++ + Source/WebCore/testing/Internals.cpp | 24 ++++++++++++++++++++++ + Source/WebCore/testing/Internals.h | 2 ++ + Source/WebCore/testing/Internals.idl | 2 ++ + 6 files changed, 55 insertions(+), 5 deletions(-) + +diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp +index f8fd63f7d87..a76a44ff06b 100644 +--- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp ++++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp +@@ -3597,7 +3597,9 @@ ExceptionOr WebGLRenderingContextBase::texSubImage2D(GC3Denum target, GC3D + else + texSubImage2DImpl(target, level, xoffset, yoffset, format, type, canvas->copiedImage(), GraphicsContext3D::HtmlDomCanvas, m_unpackFlipY, m_unpackPremultiplyAlpha); + return { }; +- }, [&](const RefPtr& video) -> ExceptionOr { ++ } ++#if ENABLE(VIDEO) ++ , [&](const RefPtr& video) -> ExceptionOr { + ExceptionCode ec = 0; + if (isContextLostOrPending() || !validateHTMLVideoElement("texSubImage2D", video.get(), ec)) + return ec ? Exception { ec } : ExceptionOr { }; +@@ -3620,7 +3622,9 @@ ExceptionOr WebGLRenderingContextBase::texSubImage2D(GC3Denum target, GC3D + return { }; + texSubImage2DImpl(target, level, xoffset, yoffset, format, type, image.get(), GraphicsContext3D::HtmlDomVideo, m_unpackFlipY, m_unpackPremultiplyAlpha); + return { }; +- }); ++ } ++#endif ++ ); + + return WTF::visit(visitor, source.value()); + } +@@ -4107,7 +4111,9 @@ ExceptionOr WebGLRenderingContextBase::texImage2D(GC3Denum target, GC3Dint + else + texImage2DImpl(target, level, internalformat, format, type, canvas->copiedImage(), GraphicsContext3D::HtmlDomCanvas, m_unpackFlipY, m_unpackPremultiplyAlpha); + return { }; +- }, [&](const RefPtr& video) -> ExceptionOr { ++ } ++#if ENABLE(VIDEO) ++ , [&](const RefPtr& video) -> ExceptionOr { + ExceptionCode ec = 0; + if (isContextLostOrPending() || !validateHTMLVideoElement("texImage2D", video.get(), ec) + || !validateTexFunc("texImage2D", TexImage, SourceHTMLVideoElement, target, level, internalformat, video->videoWidth(), video->videoHeight(), 0, format, type, 0, 0)) +@@ -4137,7 +4143,9 @@ ExceptionOr WebGLRenderingContextBase::texImage2D(GC3Denum target, GC3Dint + return { }; + texImage2DImpl(target, level, internalformat, format, type, image.get(), GraphicsContext3D::HtmlDomVideo, m_unpackFlipY, m_unpackPremultiplyAlpha); + return { }; +- }); ++ } ++#endif ++ ); + + return WTF::visit(visitor, source.value()); + } +diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.h b/Source/WebCore/html/canvas/WebGLRenderingContextBase.h +index 31e5542e612..d4738e834a1 100644 +--- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.h ++++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.h +@@ -57,7 +57,6 @@ class EXTShaderTextureLOD; + class EXTsRGB; + class EXTFragDepth; + class HTMLImageElement; +-class HTMLVideoElement; + class ImageData; + class IntSize; + class OESStandardDerivatives; +@@ -85,6 +84,10 @@ class WebGLSharedObject; + class WebGLShaderPrecisionFormat; + class WebGLUniformLocation; + ++#if ENABLE(VIDEO) ++class HTMLVideoElement; ++#endif ++ + inline void clip1D(GC3Dint start, GC3Dsizei range, GC3Dsizei sourceRange, GC3Dint* clippedStart, GC3Dsizei* clippedRange) + { + ASSERT(clippedStart && clippedRange); +@@ -244,7 +247,12 @@ public: + + void texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, RefPtr&&); + ++#if ENABLE(VIDEO) + using TexImageSource = WTF::Variant, RefPtr, RefPtr, RefPtr>; ++#else ++ using TexImageSource = WTF::Variant, RefPtr, RefPtr>; ++#endif ++ + ExceptionOr texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Denum format, GC3Denum type, std::optional); + + void texParameterf(GC3Denum target, GC3Denum pname, GC3Dfloat param); +@@ -677,7 +685,9 @@ protected: + SourceImageData, + SourceHTMLImageElement, + SourceHTMLCanvasElement, ++#if ENABLE(VIDEO) + SourceHTMLVideoElement, ++#endif + }; + + // Helper function for tex{Sub}Image2D to check if the input format/type/level/target/width/height/border/xoffset/yoffset are valid. +diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl b/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl +index 63b64cdebd2..3111e798a89 100644 +--- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl ++++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl +@@ -42,7 +42,11 @@ typedef (Float32Array or sequence) Float32List; + typedef (Int32Array or sequence) Int32List; + + // FIXME: Should allow ImageBitmap too. ++#ifdef ENABLE_VIDEO + typedef (ImageData or HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) TexImageSource; ++#else ++typedef (ImageData or HTMLImageElement or HTMLCanvasElement) TexImageSource; ++#endif + + [ + Conditional=WEBGL, +diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp +index 6d26d556e33..6d64845fd27 100644 +--- a/Source/WebCore/testing/Internals.cpp ++++ b/Source/WebCore/testing/Internals.cpp +@@ -2765,6 +2765,30 @@ String Internals::getImageSourceURL(Element& element) + + #if ENABLE(VIDEO) + ++Vector Internals::mediaResponseSources(HTMLMediaElement& media) ++{ ++ auto* resourceLoader = media.lastMediaResourceLoaderForTesting(); ++ if (!resourceLoader) ++ return { }; ++ Vector result; ++ auto responses = resourceLoader->responsesForTesting(); ++ for (auto& response : responses) ++ result.append(responseSourceToString(response)); ++ return result; ++} ++ ++Vector Internals::mediaResponseContentRanges(HTMLMediaElement& media) ++{ ++ auto* resourceLoader = media.lastMediaResourceLoaderForTesting(); ++ if (!resourceLoader) ++ return { }; ++ Vector result; ++ auto responses = resourceLoader->responsesForTesting(); ++ for (auto& response : responses) ++ result.append(response.httpHeaderField(HTTPHeaderName::ContentRange)); ++ return result; ++} ++ + void Internals::simulateAudioInterruption(HTMLMediaElement& element) + { + #if USE(GSTREAMER) +diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h +index f5c08a87dfd..d35f651e452 100644 +--- a/Source/WebCore/testing/Internals.h ++++ b/Source/WebCore/testing/Internals.h +@@ -401,6 +401,8 @@ public: + String getImageSourceURL(Element&); + + #if ENABLE(VIDEO) ++ Vector mediaResponseSources(HTMLMediaElement&); ++ Vector mediaResponseContentRanges(HTMLMediaElement&); + void simulateAudioInterruption(HTMLMediaElement&); + ExceptionOr mediaElementHasCharacteristic(HTMLMediaElement&, const String&); + #endif +diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl +index 155b70b4abf..3fe6885d362 100644 +--- a/Source/WebCore/testing/Internals.idl ++++ b/Source/WebCore/testing/Internals.idl +@@ -386,6 +386,8 @@ enum EventThrottlingBehavior { + + void enableAutoSizeMode(boolean enabled, long minimumWidth, long minimumHeight, long maximumWidth, long maximumHeight); + ++ [Conditional=VIDEO] sequence mediaResponseSources(HTMLMediaElement media); ++ [Conditional=VIDEO] sequence mediaResponseContentRanges(HTMLMediaElement media); + [Conditional=VIDEO] void simulateAudioInterruption(HTMLMediaElement element); + [Conditional=VIDEO, MayThrowException] boolean mediaElementHasCharacteristic(HTMLMediaElement element, DOMString characteristic); + +-- +2.13.3 + From 904d5330a34ad46bd03cc6de9606e379edf6740c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20P=C3=A9rez=20de=20Castro?= Date: Thu, 3 Aug 2017 14:31:09 +0300 Subject: [PATCH 3197/3392] webkitgtk: Add patch for properly picking GL flags when building This solves build failures caused by WebKit trying to include X11 headers when support for X11 is disabled in Mesa3D. A common situation is when configuring both GTK+ and WebKitGTK+ only with Wayland support. Once the fix for https://bugs.webkit.org/show_bug.cgi?id=175125 makes it into a release, the patch can be dropped. Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c2da653d085df1015f869bb3c89d43e6973239d8) Signed-off-by: Peter Korsgaard --- ...rom-pkg-config-for-E-GL-are-not-pass.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 package/webkitgtk/0004-GTK-WPE-CFLAGS-from-pkg-config-for-E-GL-are-not-pass.patch diff --git a/package/webkitgtk/0004-GTK-WPE-CFLAGS-from-pkg-config-for-E-GL-are-not-pass.patch b/package/webkitgtk/0004-GTK-WPE-CFLAGS-from-pkg-config-for-E-GL-are-not-pass.patch new file mode 100644 index 0000000000..91c5116a2a --- /dev/null +++ b/package/webkitgtk/0004-GTK-WPE-CFLAGS-from-pkg-config-for-E-GL-are-not-pass.patch @@ -0,0 +1,64 @@ +From 6579c307d85a9b447d3b7f13b25fb0a52177ed09 Mon Sep 17 00:00:00 2001 +From: Carlos Alberto Lopez Perez +Date: Thu, 3 Aug 2017 13:57:14 +0300 +Subject: [PATCH] [GTK][WPE] CFLAGS from pkg-config for (E)GL are not passed to + WebKit https://bugs.webkit.org/show_bug.cgi?id=175125 + +Patch by Carlos Alberto Lopez Perez on 2017-08-03 +Reviewed by NOBODY (OOPS!). + +* CMakeLists.txt: Pass GL-related flags to the WebKit component when + appropriate. + +Signed-off-by: Adrian Perez de Castro + +--- + Source/WebKit2/CMakeLists.txt | 31 +++++++++++++++++++++++++++++++ + Source/WebKit2/ChangeLog | 10 ++++++++++ + 2 files changed, 41 insertions(+) + +diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt +index 2d8215f6a35..b25e9872de2 100644 +--- a/Source/WebKit2/CMakeLists.txt ++++ b/Source/WebKit2/CMakeLists.txt +@@ -88,6 +88,37 @@ set(WebKit2_SYSTEM_INCLUDE_DIRECTORIES + ) + + if (ENABLE_GRAPHICS_CONTEXT_3D) ++ # For platforms that want to use system-provided OpenGL (ES) / EGL headers, ++ # these include directories, libraries or definitions need to be ++ # added before the ANGLE directories. ++ if (USE_OPENGL) ++ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES ++ ${OPENGL_INCLUDE_DIRS} ++ ) ++ list(APPEND WebKit2_LIBRARIES ++ ${OPENGL_LIBRARIES} ++ ) ++ add_definitions(${OPENGL_DEFINITIONS}) ++ elseif (USE_OPENGL_ES_2) ++ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES ++ ${OPENGLES2_INCLUDE_DIRS} ++ ) ++ list(APPEND WebKit2_LIBRARIES ++ ${OPENGLES2_LIBRARIES} ++ ) ++ add_definitions(${OPENGLES2_DEFINITIONS}) ++ endif () ++ ++ if (USE_EGL) ++ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES ++ ${EGL_INCLUDE_DIRS} ++ ) ++ list(APPEND WebKit2_LIBRARIES ++ ${EGL_LIBRARIES} ++ ) ++ add_definitions(${EGL_DEFINITIONS}) ++ endif () ++ + list(APPEND WebKit2_INCLUDE_DIRECTORIES + "${THIRDPARTY_DIR}/ANGLE" + "${THIRDPARTY_DIR}/ANGLE/include/KHR" +-- +2.13.4 + From 66ceb5ba45d1e28179dfc960205b04c8b1378ce8 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 28 Jul 2017 14:46:29 -0300 Subject: [PATCH 3198/3392] linux-headers: bump 4.{4, 9, 12}.x series [Peter: Drop 4.12.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit f43096034b15e0e5f9414dd3162ea28612989d54) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 99c8b2a4f1..4cf466736c 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.42" if BR2_KERNEL_HEADERS_4_1 - default "4.4.78" if BR2_KERNEL_HEADERS_4_4 + default "4.4.79" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.39" if BR2_KERNEL_HEADERS_4_9 + default "4.9.40" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 80c457604f0bee1a11d2fe7113f2c886f7fd99ad Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Wed, 26 Jul 2017 11:59:56 -0700 Subject: [PATCH 3199/3392] package/python-service-identity: the attrs distribution is required Apparently the service identify code requires the python attrs to be availabe: Traceback (most recent call last): File "/opt/exablox/bin/configsrv", line 5, in from pkg_resources import load_entry_point File "/usr/lib/python2.7/site-packages/pkg_resources/__init__.py", line 3138, in @_call_aside File "/usr/lib/python2.7/site-packages/pkg_resources/__init__.py", line 3124, in _call_aside f(*args, **kwargs) File "/usr/lib/python2.7/site-packages/pkg_resources/__init__.py", line 3151, in _initialize_master_working_set working_set = WorkingSet._build_master() File "/usr/lib/python2.7/site-packages/pkg_resources/__init__.py", line 661, in _build_master ws.require(__requires__) File "/usr/lib/python2.7/site-packages/pkg_resources/__init__.py", line 962, in require needed = self.resolve(parse_requirements(requirements)) File "/usr/lib/python2.7/site-packages/pkg_resources/__init__.py", line 849, in resolve raise DistributionNotFound(req, requirers) pkg_resources.DistributionNotFound: The 'attrs' distribution was not found and is required by service-identity Signed-off-by: Charles Hardin Signed-off-by: Thomas Petazzoni (cherry picked from commit 49229b157c30646b8961c64419921af0aa54024b) Signed-off-by: Peter Korsgaard --- package/python-service-identity/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index c9cbb6cca1..73593b0d61 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -1,10 +1,11 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY bool "python-service-identity" + depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-pyasn + select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime select BR2_PACKAGE_PYTHON_PYASN # runtime select BR2_PACKAGE_PYTHON_PYASN_MODULES # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-pyasn help Service identity verification for pyOpenSSL. From b758567fc96830efd2fe3c59f8b86852c6085a1a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 29 Jul 2017 23:19:37 +0300 Subject: [PATCH 3200/3392] librsvg: update homepage link The SF page redirects to gnome.org. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit a81979758dcf6c5e8e41bc4f910049abb38afbd4) Signed-off-by: Peter Korsgaard --- package/librsvg/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 7ce9d063a8..703428dc41 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_LIBRSVG The rsvg library is an efficient renderer for Scalable Vector Graphics (SVG) pictures. - http://librsvg.sourceforge.net/ + https://wiki.gnome.org/Projects/LibRsvg comment "librsvg needs a toolchain w/ wchar, threads, C++" depends on BR2_USE_MMU From 3f9fedb2174a3bb6d670a7eb459455d99d41c2d1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 29 Jul 2017 23:19:38 +0300 Subject: [PATCH 3201/3392] librsvg: security bump to version 2.40.18 http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/librsvg-2.40.18.news CVE-2017-11464 - Fix division-by-zero in the Gaussian blur code. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit b76a15ed14631a97e8cec56363858356a6d595d5) Signed-off-by: Peter Korsgaard --- package/librsvg/librsvg.hash | 4 ++-- package/librsvg/librsvg.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/librsvg/librsvg.hash b/package/librsvg/librsvg.hash index f9844b2362..9ab798120f 100644 --- a/package/librsvg/librsvg.hash +++ b/package/librsvg/librsvg.hash @@ -1,2 +1,2 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/librsvg/2.40/librsvg-2.40.16.sha256sum -sha256 d48bcf6b03fa98f07df10332fb49d8c010786ddca6ab34cbba217684f533ff2e librsvg-2.40.16.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/librsvg-2.40.18.sha256sum +sha256 bfc8c488c89c1e7212c478beb95c41b44701636125a3e6dab41187f1485b564c librsvg-2.40.18.tar.xz diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index db57193482..16375d5205 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -5,7 +5,7 @@ ################################################################################ LIBRSVG_VERSION_MAJOR = 2.40 -LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).16 +LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).18 LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz LIBRSVG_INSTALL_STAGING = YES From 288d26acd5279218308e69a9989dfc20f1febdf5 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 25 Jul 2017 21:28:15 +0300 Subject: [PATCH 3202/3392] squashfs: fix build with gcc 7 gcc 7 with -Os (optimize for size) takes the liberty to remove the code of inline function entirely. This leads to undefined function references at link time. Restore gcc original inline behaviour to fix this issue. Fixes: http://autobuild.buildroot.net/results/3c5/3c5b1d799dce3ba361d618330c242bf4eba76019/ http://autobuild.buildroot.net/results/09f/09f350b62e2486404b78222dce211400bb233000/ http://autobuild.buildroot.net/results/693/693960ed7c01622c756dcc929e83b3b713c16ccc/ Cc: Thomas Petazzoni Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit f308e4420fde3d14d00f8d44f8ca376b232f57cb) Signed-off-by: Peter Korsgaard --- package/squashfs/squashfs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 4f84872319..e8321ed60e 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -59,7 +59,7 @@ HOST_SQUASHFS_MAKE_ARGS = \ define SQUASHFS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) \ CC="$(TARGET_CC)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline" \ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ $(SQUASHFS_MAKE_ARGS) \ -C $(@D)/squashfs-tools/ From 6918f13762e96127189789b9c554600d0001c70b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 30 Jul 2017 16:47:30 +0200 Subject: [PATCH 3203/3392] package/snappy: fix typo Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 662b830dd702f085bc0473a469e893ec9e59149e) Signed-off-by: Peter Korsgaard --- package/snappy/snappy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk index fcbcd1368f..bad0ef0a44 100644 --- a/package/snappy/snappy.mk +++ b/package/snappy/snappy.mk @@ -17,7 +17,7 @@ SNAPPY_INSTALL_STAGING = YES SNAPPY_CONF_OPTS = --disable-gtest # libsnappy links with libstdc++. Some libstdc++/arch variants use -# pthread symbols for internal locking if built with thead +# pthread symbols for internal locking if built with thread # support. libstdc++ does not have a .pc file, and its .la file does # not mention -pthread. So, static linkig to libstdc++ will fail if # -pthread is not explicity linked to. Only do that for static builds. From 2ca9ecd20600d79ace1f777cfdef90dc18f0ebda Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 4 Sep 2017 23:07:17 +0200 Subject: [PATCH 3204/3392] ffmpeg: security bump to version 3.2.7 Fixes the following security issues (https://ffmpeg.org/security.html): 3.2.4: CVE-2017-5024 - FFmpeg in Google Chrome prior to 56.0.2924.76 for Linux, Windows and Mac, failed to perform proper bounds checking, which allowed a remote attacker to potentially exploit heap corruption via a crafted video file. CVE-2017-5025 - FFmpeg in Google Chrome prior to 56.0.2924.76 for Linux, Windows and Mac, failed to perform proper bounds checking, which allowed a remote attacker to potentially exploit heap corruption via a crafted video file. 3.2.5: CVE-2017-9991 - Heap-based buffer overflow in the xwd_decode_frame function in libavcodec/xwddec.c in FFmpeg before 2.8.12, 3.0.x before 3.0.8, 3.1.x before 3.1.8, 3.2.x before 3.2.5, and 3.3.x before 3.3.1 allows remote attackers to cause a denial of service (application crash) or possibly have unspecified other impact via a crafted file. CVE-2017-9992 - Heap-based buffer overflow in the decode_dds1 function in libavcodec/dfa.c in FFmpeg before 2.8.12, 3.0.x before 3.0.8, 3.1.x before 3.1.8, 3.2.x before 3.2.5, and 3.3.x before 3.3.1 allows remote attackers to cause a denial of service (application crash) or possibly have unspecified other impact via a crafted file. CVE-2017-9994 - libavcodec/webp.c in FFmpeg before 2.8.12, 3.0.x before 3.0.8, 3.1.x before 3.1.8, 3.2.x before 3.2.5, and 3.3.x before 3.3.1 does not ensure that pix_fmt is set, which allows remote attackers to cause a denial of service (heap-based buffer overflow and application crash) or possibly have unspecified other impact via a crafted file, related to the vp8_decode_mb_row_no_filter and pred8x8_128_dc_8_c functions. CVE-2017-9996 - The cdxl_decode_frame function in libavcodec/cdxl.c in FFmpeg 2.8.x before 2.8.12, 3.0.x before 3.0.8, 3.1.x before 3.1.8, 3.2.x before 3.2.5, and 3.3.x before 3.3.1 does not exclude the CHUNKY format, which allows remote attackers to cause a denial of service (heap-based buffer overflow and application crash) or possibly have unspecified other impact via a crafted file. 3.2.6: CVE-2017-9608 - NULL pointer exception. CVE-2017-9993 - FFmpeg before 2.8.12, 3.0.x and 3.1.x before 3.1.9, 3.2.x before 3.2.6, and 3.3.x before 3.3.2 does not properly restrict HTTP Live Streaming filename extensions and demuxer names, which allows attackers to read arbitrary files via crafted playlist data. 3.2.7: CVE-2017-11399 - Integer overflow in the ape_decode_frame function in libavcodec/apedec.c in FFmpeg through 3.3.2 allows remote attackers to cause a denial of service (out-of-array access and application crash) or possibly have unspecified other impact via a crafted APE file. CVE-2017-11665 - The ff_amf_get_field_value function in libavformat/rtmppkt.c in FFmpeg 3.3.2 allows remote RTMP servers to cause a denial of service (Segmentation Violation and application crash) via a crafted stream. CVE-2017-11719 - The dnxhd_decode_header function in libavcodec/dnxhddec.c in FFmpeg through 3.3.2 allows remote attackers to cause a denial of service (out-of-array access) or possibly have unspecified other impact via a crafted DNxHD file. 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 6adf7e440a..f4470f9c85 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 54ce502aca10b7e6059f19220ea2f68fa0c9c4c4d255ae13e615f08f0c94dcc5 ffmpeg-3.2.3.tar.xz +sha256 28e75fc32485a88035a7ebf0a956a1e5c7e93b440dd4bbd6bc30c7268cf34fe9 ffmpeg-3.2.7.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 9c30e8f406..00db404593 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.2.3 +FFMPEG_VERSION = 3.2.7 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From 64e480fd7ae7554a95b748448fc92cf369c9940e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 29 Jul 2017 22:06:26 +0200 Subject: [PATCH 3205/3392] gdb: force to use ncurses and not termcap for host-gdb Both our target and host gdb depend on ncurses (host-ncurses for host-gdb, of course). However, while for the target we passs --with-curses, we are not doing this for the host variant. Due to this, host-gdb default to using the termcap library: if such a library is available on the build system, it will be used instead of the host-ncurses we have built. This causes the host gdb binary to depend on a library that we do not provide in $(HOST_DIR), breaking the principle of a standalone SDK (which should only depend on the C library). To solve this, we simply pass --with-curses in HOST_GDB_CONF_OPTS, which forces host-gdb to use the host-ncurses library. Signed-off-by: Thomas Petazzoni Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 8c36c65ab8d4ebbac76799fe956a218d9c382bc1) Signed-off-by: Peter Korsgaard --- package/gdb/gdb.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index d8299900ec..618111dda8 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -189,6 +189,7 @@ HOST_GDB_CONF_OPTS = \ --enable-threads \ --disable-werror \ --without-included-gettext \ + --with-curses \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y) From 85a32431a7b6918282fbd6a1b450791c321a9d37 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Jul 2017 15:36:19 +0200 Subject: [PATCH 3206/3392] package/samba4: add optional dependency to dbus samba4 picks up dbus as dependency if it was built before: Checking for dbus : yes Checking for header dbus/dbus.h : yes Checking for library dbus-1 : yes There is no configure option to control dbus support so we just make sure dbus is built before samba4 to have reproducible builds. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 17f6c26590d22365968e7fd0d246b315b255d204) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 3ffe11e15f..4301393962 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -32,6 +32,10 @@ else SAMBA4_CONF_OPTS += --disable-cups endif +ifeq ($(BR2_PACKAGE_DBUS),y) +SAMBA4_DEPENDENCIES += dbus +endif + ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_AVAHI_DAEMON),yy) SAMBA4_CONF_OPTS += --enable-avahi SAMBA4_DEPENDENCIES += avahi From bb82c24ce005f216e7b7e475a172127e2a55f253 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 4 Sep 2017 23:59:07 +0200 Subject: [PATCH 3207/3392] samba4: bump to version 4.5.13 4.5.13 is a bugfix release, fixing a number of important issues: https://www.samba.org/samba/history/samba-4.5.13.html Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 2 +- package/samba4/samba4.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 0783b37d06..0d8b111082 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 f4c17123e3cc852a5ecc7e38884b00deab57632b9519aebc243e2a94b9b5ace4 samba-4.5.12.tar.gz +sha256 5fc4762d2259469bfb0067c10f77378cb720f2ebdaf2f37b5ca1918dbe84d04d samba-4.5.13.tar.gz diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 4301393962..08fa4008d6 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.5.12 +SAMBA4_VERSION = 4.5.13 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 7e8fa575370141121f5ae2666d4238edef3ec3dc Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Wed, 2 Aug 2017 11:40:20 -0700 Subject: [PATCH 3208/3392] package/binutils: fix crash caused by buggy xtensa overlay In some xtensa configurations there may be system/user registers in xtensa-modules with negative index. ISA initialization for such config may clobber heap and result in program termination. Don't update lookup table entries for register with negative indices. [Peter: drop 2.28.x/2.29.x variants] Signed-off-by: Max Filippov Signed-off-by: Thomas Petazzoni (cherry picked from commit 83f7fb0d5bdbae3c50bac0eb1d4efe1c71692af8) Signed-off-by: Peter Korsgaard --- ...-memory-corruption-by-broken-sysregs.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/binutils/2.27/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch diff --git a/package/binutils/2.27/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch b/package/binutils/2.27/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch new file mode 100644 index 0000000000..30103ee05e --- /dev/null +++ b/package/binutils/2.27/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch @@ -0,0 +1,42 @@ +From 3c8788dbb70b40e737d4b8e30cab81406e5c5091 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Wed, 2 Aug 2017 00:36:05 -0700 +Subject: [PATCH] xtensa: fix memory corruption by broken sysregs + +In some xtensa configurations there may be system/user registers in +xtensa-modules with negative index. ISA initialization for such config +may clobber heap and result in program termination. +Don't update lookup table entries for register with negative indices. +They are not directly accessible via RSR/WSR/XSR or RUR/WUR, so this +change should not affect processing of valid assembly/binary code. + +bfd/ +2017-08-02 Max Filippov + + * xtensa-isa.c (xtensa_isa_init): Don't update lookup table + entries for sysregs with negative indices. + +Signed-off-by: Max Filippov +--- +Backported from: d84ed528d4817b0ff854006b65a9f6ec75f0407a + + bfd/xtensa-isa.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c +index 8da75bea8109..8c6ee88fdeae 100644 +--- a/bfd/xtensa-isa.c ++++ b/bfd/xtensa-isa.c +@@ -292,7 +292,8 @@ xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p) + xtensa_sysreg_internal *sreg = &isa->sysregs[n]; + is_user = sreg->is_user; + +- isa->sysreg_table[is_user][sreg->number] = n; ++ if (sreg->number >= 0) ++ isa->sysreg_table[is_user][sreg->number] = n; + } + + /* Set up the interface lookup table. */ +-- +2.1.4 + From 935b33b25851e56fb9db5d24b0f9d4eaff2a8f47 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 4 Aug 2017 18:58:32 +0200 Subject: [PATCH 3209/3392] dbus: add upstream patch to fix startup hang with with expat >= 2.2.1 After c0ad6ded018ffbc33f7f5 expat: security bump to version 2.2.1 the system can hang on startup under certain circumstances. This happens when: * we use systemd as init system * the random nonblocking pool takes a while to initialize * this apparently doesn't happen on qemu, so this would not have been caught by the runtime testing infrastructure * it also doesn't seem to happen when network booting For a more detailed description of the bug see here: https://bugs.freedesktop.org/show_bug.cgi?id=101858 The patch should be in next dbus version 1.10.24 Set DBUS_AUTORECONF = YES because configure.ac is changed. Signed-off-by: Marcus Hoffmann [Arnout: add upstream commit sha + Marcus's Sob to the patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5a5e76381f8b000baa09c902ca89d45725c47f04) Signed-off-by: Peter Korsgaard --- ...pat-Tell-Expat-not-to-defend-against.patch | 78 +++++++++++++++++++ package/dbus/dbus.mk | 2 + 2 files changed, 80 insertions(+) create mode 100644 package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch diff --git a/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch b/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch new file mode 100644 index 0000000000..fd9e01dad5 --- /dev/null +++ b/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch @@ -0,0 +1,78 @@ +From 1252dc1d1f465b8ab6b36ff7252e395e66a040cf Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Fri, 21 Jul 2017 10:46:39 +0100 +Subject: [PATCH 1/2] config-loader-expat: Tell Expat not to defend against + hash collisions + +By default, Expat uses cryptographic-quality random numbers as a salt for +its hash algorithm, and since 2.2.1 it gets them from the getrandom +syscall on Linux. That syscall refuses to return any entropy until the +kernel's CSPRNG (random pool) has been initialized. Unfortunately, this +can take as long as 40 seconds on embedded devices with few entropy +sources, which is too long: if the system dbus-daemon blocks for that +length of time, important D-Bus clients like systemd and systemd-logind +time out and fail to connect to it. + +We're parsing small configuration files here, and we trust them +completely, so we don't need to defend against hash collisions: nobody +is going to be crafting them to cause pathological performance. + +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101858 +Signed-off-by: Simon McVittie +Tested-by: Christopher Hewitt +Reviewed-by: Philip Withnall + +Upstream commit 1252dc1d1f465b8ab6b36ff7252e395e66a040cf +Signed-off-by: Marcus Hoffmann +--- + bus/config-loader-expat.c | 14 ++++++++++++++ + configure.ac | 8 ++++++++ + 2 files changed, 22 insertions(+) + +diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c +index b571fda3..27cbe2d0 100644 +--- a/bus/config-loader-expat.c ++++ b/bus/config-loader-expat.c +@@ -203,6 +203,20 @@ bus_config_load (const DBusString *file, + goto failed; + } + ++ /* We do not need protection against hash collisions (CVE-2012-0876) ++ * because we are only parsing trusted XML; and if we let Expat block ++ * waiting for the CSPRNG to be initialized, as it does by default to ++ * defeat CVE-2012-0876, it can cause timeouts during early boot on ++ * entropy-starved embedded devices. ++ * ++ * TODO: When Expat gets a more explicit API for this than ++ * XML_SetHashSalt, check for that too, and use it preferentially. ++ * https://github.com/libexpat/libexpat/issues/91 */ ++#if defined(HAVE_XML_SETHASHSALT) ++ /* Any nonzero number will do. https://xkcd.com/221/ */ ++ XML_SetHashSalt (expat, 4); ++#endif ++ + if (!_dbus_string_get_dirname (file, &dirname)) + { + dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); +diff --git a/configure.ac b/configure.ac +index 52da11fb..c4022ed7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -938,6 +938,14 @@ XML_CFLAGS= + AC_SUBST([XML_CFLAGS]) + AC_SUBST([XML_LIBS]) + ++save_cflags="$CFLAGS" ++save_libs="$LIBS" ++CFLAGS="$CFLAGS $XML_CFLAGS" ++LIBS="$LIBS $XML_LIBS" ++AC_CHECK_FUNCS([XML_SetHashSalt]) ++CFLAGS="$save_cflags" ++LIBS="$save_libs" ++ + # Thread lib detection + AC_ARG_VAR([THREAD_LIBS]) + save_libs="$LIBS" +-- +2.11.0 + diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 66b90bca81..09e261e4c8 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -7,6 +7,8 @@ DBUS_VERSION = 1.10.16 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools) +# 0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch +DBUS_AUTORECONF = YES DBUS_LICENSE_FILES = COPYING DBUS_INSTALL_STAGING = YES From f1b0e69d92f137e1b2d7778b1a335005674d655b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 6 Aug 2017 15:28:41 +0200 Subject: [PATCH 3210/3392] linux-headers: bump 4.1.x series Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d38797edee9b3e09492616a33c79c23a46d5a7ec) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4cf466736c..cf2dc07c4c 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -221,7 +221,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.18.61" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.42" if BR2_KERNEL_HEADERS_4_1 + default "4.1.43" if BR2_KERNEL_HEADERS_4_1 default "4.4.79" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 default "4.9.40" if BR2_KERNEL_HEADERS_4_9 From 99c6d668a6c6e893fb12be04099d727b4c482189 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 7 Aug 2017 08:19:02 +0200 Subject: [PATCH 3211/3392] linux-headers: bump 4.{4, 9, 12}.x series [Peter: drop 4.12.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit a4a6c74171d2411fa95d92ce489582b3f10ba705) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cf2dc07c4c..4a3afd4eea 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.43" if BR2_KERNEL_HEADERS_4_1 - default "4.4.79" if BR2_KERNEL_HEADERS_4_4 + default "4.4.80" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.40" if BR2_KERNEL_HEADERS_4_9 + default "4.9.41" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 246df454ff55c463ebee0d446ccd115ab1423dac Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 6 Aug 2017 15:40:11 +0200 Subject: [PATCH 3212/3392] linux-headers: aarch64: Prevent selecting unsupported versions Versions older than Linux v3.7 do not support the aarch64 architecture so disable them, for reference see https://kernelnewbies.org/Linux_3.7 Without this patch these defconfigs fail to build BR2_aarch64=y BR2_KERNEL_HEADERS_3_2=y BR2_aarch64=y BR2_KERNEL_HEADERS_3_4=y with error messages like this: make[1]: Entering directory '/home/buildroot/br5_next/output/build/linux-headers-3.2.89' Makefile:567: /home/buildroot/br5_next/output/build/linux-headers-3.2.89/arch/arm64/Makefile: No such file or directory Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1291528bde602120ab4b60d23d1a362d44cc5e04) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4a3afd4eea..6440dee074 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -28,12 +28,12 @@ choice config BR2_KERNEL_HEADERS_3_2 bool "Linux 3.2.x kernel headers" - depends on !BR2_arc && !BR2_nios2 + depends on !BR2_aarch64 && !BR2_arc && !BR2_nios2 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 config BR2_KERNEL_HEADERS_3_4 bool "Linux 3.4.x kernel headers" - depends on !BR2_arc && !BR2_nios2 + depends on !BR2_aarch64 && !BR2_arc && !BR2_nios2 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 config BR2_KERNEL_HEADERS_3_10 From cbadc716d3f427a0c660a9ed83378fba676b3db4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 2 Jul 2017 18:53:25 +0200 Subject: [PATCH 3213/3392] jack2: don't download patch from Github Patches downloaded from Github are not stable, so bring them in the tree. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit d8e0a2d4ae30e19b80d71777e2e844e966c337e6) Signed-off-by: Peter Korsgaard --- ...1-Fix-initialization-in-test-iodelay.patch | 65 +++++++++++++++++++ ... => 0002-Improve-check-for-ucontext.patch} | 0 ...pport-depends-on-execinfo.h-existen.patch} | 0 ...04-tests-define-__STDC_LIMIT_MACROS.patch} | 0 package/jack2/jack2.hash | 1 - package/jack2/jack2.mk | 1 - 6 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 package/jack2/0001-Fix-initialization-in-test-iodelay.patch rename package/jack2/{0001-Improve-check-for-ucontext.patch => 0002-Improve-check-for-ucontext.patch} (100%) rename package/jack2/{0002-Make-backtrace-support-depends-on-execinfo.h-existen.patch => 0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch} (100%) rename package/jack2/{0003-tests-define-__STDC_LIMIT_MACROS.patch => 0004-tests-define-__STDC_LIMIT_MACROS.patch} (100%) diff --git a/package/jack2/0001-Fix-initialization-in-test-iodelay.patch b/package/jack2/0001-Fix-initialization-in-test-iodelay.patch new file mode 100644 index 0000000000..ee2493886b --- /dev/null +++ b/package/jack2/0001-Fix-initialization-in-test-iodelay.patch @@ -0,0 +1,65 @@ +From ff1ed2c4524095055140370c1008a2d9cccc5645 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth +Date: Sat, 11 Jun 2016 05:35:07 +0200 +Subject: [PATCH] Fix initialization in test/iodelay.cpp + +jack_latency_range_t is + +struct _jack_latency_range { + jack_nframes_t min; + jack_nframes_t max; +}; + +and jack_nframes_t is + +typedef uint32_t jack_nframes_t; + +so it's unsigned. Initialising it with -1 is invalid (at least in C++14). We cannot use {0, 0}, because latency_cb has + + jack_latency_range_t range; + range.min = range.max = 0; + if ((range.min != capture_latency.min) || (range.max != + capture_latency.max)) { + capture_latency = range; + } + +so we must not have {0, 0}, otherwise the condition would never be true. + +Using UINT32_MAX should be equivalent to the previous -1. + +[Upstream commit https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645] +Signed-off-by: Thomas Petazzoni +--- + tests/iodelay.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp +index e1ba63fa..1ef470fd 100644 +--- a/tests/iodelay.cpp ++++ b/tests/iodelay.cpp +@@ -20,6 +20,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -167,8 +168,8 @@ static jack_client_t *jack_handle; + static jack_port_t *jack_capt; + static jack_port_t *jack_play; + +-jack_latency_range_t capture_latency = {-1, -1}; +-jack_latency_range_t playback_latency = {-1, -1}; ++jack_latency_range_t capture_latency = {UINT32_MAX, UINT32_MAX}; ++jack_latency_range_t playback_latency = {UINT32_MAX, UINT32_MAX}; + + void + latency_cb (jack_latency_callback_mode_t mode, void *arg) +@@ -266,4 +267,4 @@ int main (int ac, char *av []) + return 0; + } + +-// -------------------------------------------------------------------------------- +\ No newline at end of file ++// -------------------------------------------------------------------------------- diff --git a/package/jack2/0001-Improve-check-for-ucontext.patch b/package/jack2/0002-Improve-check-for-ucontext.patch similarity index 100% rename from package/jack2/0001-Improve-check-for-ucontext.patch rename to package/jack2/0002-Improve-check-for-ucontext.patch diff --git a/package/jack2/0002-Make-backtrace-support-depends-on-execinfo.h-existen.patch b/package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch similarity index 100% rename from package/jack2/0002-Make-backtrace-support-depends-on-execinfo.h-existen.patch rename to package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch diff --git a/package/jack2/0003-tests-define-__STDC_LIMIT_MACROS.patch b/package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch similarity index 100% rename from package/jack2/0003-tests-define-__STDC_LIMIT_MACROS.patch rename to package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index 1b981a4b83..ab031b9d94 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,3 +1,2 @@ # Locally calculated sha256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d jack2-v1.9.10.tar.gz -sha256 f372c4300e3fb2c1ce053e47829df44f3f8b933feb820759392187723ae8e640 ff1ed2c4524095055140370c1008a2d9cccc5645.patch diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index 23c9723421..7801840b6f 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -9,7 +9,6 @@ JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION)) JACK2_LICENSE = GPLv2+ (jack server), LGPLv2.1+ (jack library) JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python JACK2_INSTALL_STAGING = YES -JACK2_PATCH = https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch JACK2_CONF_OPTS = --alsa From e40be53f7b3d634f1e15ead62bea3c52b4cdb470 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 6 Aug 2017 14:58:40 +0200 Subject: [PATCH 3214/3392] package/jack2: backport two build fixes 0005-gcc7.patch fixes http://autobuild.buildroot.net/results/c06/c0610325d7785dfa51c5d36775623ca8fa517f24/ 0006-fix-ftbfs-with-clang.patch fixes the subsequent build error: common/memops.c.31.o: In function `sample_move_dither_rect_d16_sSs': memops.c:(.text+0x4dc): undefined reference to `fast_rand' Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 50ace0bcc31e375adde289215e2b0c728211f886) Signed-off-by: Peter Korsgaard --- package/jack2/0005-gcc7.patch | 31 +++++++++++++++++++ package/jack2/0006-fix-ftbfs-with-clang.patch | 28 +++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 package/jack2/0005-gcc7.patch create mode 100644 package/jack2/0006-fix-ftbfs-with-clang.patch diff --git a/package/jack2/0005-gcc7.patch b/package/jack2/0005-gcc7.patch new file mode 100644 index 0000000000..dadaf44ed9 --- /dev/null +++ b/package/jack2/0005-gcc7.patch @@ -0,0 +1,31 @@ +From f7bccdca651592cc4082b28fd4a01ed6ef8ab655 Mon Sep 17 00:00:00 2001 +From: Kjetil Matheussen +Date: Sat, 15 Jul 2017 13:21:59 +0200 +Subject: [PATCH] Tests: Fix compilation with gcc7 + +Fixes +../tests/test.cpp: In function ‘int process4(jack_nframes_t, void*)’: +../tests/test.cpp:483:73: error: call of overloaded ‘abs(jack_nframes_t)’ is ambiguous + if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { + +Downloaded from upstream commit +https://github.com/jackaudio/jack2/commit/f7bccdca651592cc4082b28fd4a01ed6ef8ab655 + +Signed-off-by: Bernd Kuhls +--- + tests/test.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test.cpp b/tests/test.cpp +index 8a8a8117..d2ef9a05 100644 +--- a/tests/test.cpp ++++ b/tests/test.cpp +@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg) + jack_nframes_t delta_time = cur_time - last_time; + + Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); +- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { ++ if (delta_time > 0 && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) { + printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance); + } + diff --git a/package/jack2/0006-fix-ftbfs-with-clang.patch b/package/jack2/0006-fix-ftbfs-with-clang.patch new file mode 100644 index 0000000000..a73fe69e15 --- /dev/null +++ b/package/jack2/0006-fix-ftbfs-with-clang.patch @@ -0,0 +1,28 @@ +From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth +Date: Thu, 18 Sep 2014 18:29:23 +0200 +Subject: [PATCH] Fix FTBFS with clang++ + +Forwarded from http://bugs.debian.org/757820 + +Downloaded from upstream commit +https://github.com/jackaudio/jack2/commit/d3c8e2d8d78899fba40a3e677ed4dbe388d82269 + +Signed-off-by: Bernd Kuhls +--- + common/memops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/memops.c b/common/memops.c +index 27f6194a..2d416b64 100644 +--- a/common/memops.c ++++ b/common/memops.c +@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s) + */ + static unsigned int seed = 22222; + +-inline unsigned int fast_rand() { ++static inline unsigned int fast_rand() { + seed = (seed * 96314165) + 907633515; + return seed; + } From da9f101e8000c17b56fa18c538a6f6233e93046c Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 8 Aug 2017 18:57:58 +0200 Subject: [PATCH 3215/3392] bind: fix configure in case lmdb devel files are present on the host Fix configure failure in case lmdb devel files are present on the host by adding --without-lmdb option (reported [1] and fix tested [2],[3] by grunpferd@netscape.net). Fixes: checking for lmdb library... yes checking for library containing mdb_env_create... no configure: error: found lmdb include but not library. [1] http://lists.busybox.net/pipermail/buildroot/2017-August/199945.html [2] http://lists.busybox.net/pipermail/buildroot/2017-August/199963.html [3] http://lists.busybox.net/pipermail/buildroot/2017-August/199964.html Signed-off-by: Peter Seiderer Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit bb95fef1e0bec4ebc0584001f337438b17c4744d) Signed-off-by: Peter Korsgaard --- package/bind/bind.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index acc09119ce..c5208c0f56 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -24,6 +24,7 @@ BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ BUILD_CFLAGS="$(TARGET_CFLAGS)" BIND_CONF_OPTS = \ + --without-lmdb \ --with-libjson=no \ --with-randomdev=/dev/urandom \ --enable-epoll \ From 214343add7a6e6ac5656a06a3d4b8b7ab25c153c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 9 Aug 2017 08:02:02 +0300 Subject: [PATCH 3216/3392] faad2: security bump to version 2.8.1 Fixes: CVE-2017-9218, CVE-2017-9219, CVE-2017-9220, CVE-2017-9221, CVE-2017-9222, CVE-2017-9223, CVE-2017-9253, CVE-2017-9254, CVE-2017-9255, CVE-2017-9256, CVE-2017-9257 http://seclists.org/fulldisclosure/2017/Jun/32 Switch to .tar.bz2 to save some bandwidth. Add autoreconf since unfortunately upstream tarball does not ship the configure script. Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1e2c245bf4f21e9da41a60856cfa50eff5671e19) Signed-off-by: Peter Korsgaard --- package/faad2/faad2.hash | 6 +++--- package/faad2/faad2.mk | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/faad2/faad2.hash b/package/faad2/faad2.hash index 691645b7c0..d298e909a9 100644 --- a/package/faad2/faad2.hash +++ b/package/faad2/faad2.hash @@ -1,4 +1,4 @@ -# From http://sourceforge.net/projects/faac/files/faad2-src/faad2-2.7/ (used by upstream): -sha1 80eaaa5cc576c35dd28863767b795c50cbcc0511 faad2-2.7.tar.gz +# From http://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/ (used by upstream): +sha1 a5caa71cd915acd502d96cba56f38296277f2350 faad2-2.8.1.tar.bz2 # Locally computed -sha256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 faad2-2.7.tar.gz +sha256 f4042496f6b0a60f5ded6acd11093230044ef8a2fd965360c1bbd5b58780933d faad2-2.8.1.tar.bz2 diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index 8c4fc1aae2..67c5293310 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -4,10 +4,14 @@ # ################################################################################ -FAAD2_VERSION = 2.7 -FAAD2_SITE = http://downloads.sourceforge.net/project/faac/faad2-src/faad2-$(FAAD2_VERSION) +FAAD2_VERSION_MAJOR = 2.8 +FAAD2_VERSION = $(FAAD2_VERSION_MAJOR).1 +FAAD2_SITE = http://downloads.sourceforge.net/project/faac/faad2-src/faad2-$(FAAD2_VERSION_MAJOR).0 +FAAD2_SOURCE = faad2-$(FAAD2_VERSION).tar.bz2 FAAD2_LICENSE = GPLv2 FAAD2_LICENSE_FILES = COPYING +# No configure script in upstream tarball +FAAD2_AUTORECONF = YES # frontend/faad calls frexp() FAAD2_CONF_ENV = LIBS=-lm FAAD2_INSTALL_STAGING = YES From c2e4924597bd57c3b1d0cff2a2a38adb94f6c960 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sat, 5 Aug 2017 20:18:53 +0200 Subject: [PATCH 3217/3392] pkg-cmake.mk: set pkg-config env. vars. in the host configure environment This change is fixing the bug reported in [1]. Cmake may run pkg-config to find the dependencies when configuring a package. Because of the value of PATH, and it will use the Buildroot's pkg-config wrapper, which, by default, is configured (via some environment variables) to find the target dependencies. When configuring a host package using cmake, to prevent cmake from wrongly solving dependencies from the target tree (when the *-config.cmake files are using pkg-config) instead of looking for them in the Buildroot's host tree or in the host system itself, we need to set the environment variables altering the pkg-config behavior in the cmake configure environment. So, this change is fixing the cmake host-packages configuration step, by properly setting the pkg-config environment variables to their values for finding host dependencies. Before this patch: make O=/opt/br/abo/cmake-host-find-root-path libxml2 host-mariadb{-dirclean,-configure} && echo $? [...] >>> host-mariadb 10.1.25 Configuring (mkdir -p /opt/br/abo/cmake-host-find-root-path/build/host-mariadb-10.1.25/ && cd /opt/br/abo/cmake-host-find-root-path/build/host-mariadb-10.1.25/ && rm -f CMakeCache.txt && PATH="/opt/br/abo/cmake-host-find-root-path/host/bin:/opt/br/abo/cmake-host-find-root-path/host/sbin:/home/sam/.local/bin:/sbin:/usr/sbin:/bin:/usr/bin" /usr/bin/cmake /opt/br/abo/cmake-host-find-root-path/build/host-mariadb-10.1.25/ -DCMAKE_INSTALL_SO_NO_EXE=0 -DCMAKE_FIND_ROOT_PATH="/opt/br/abo/cmake-host-find-root-path/host" -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="BOTH" -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="BOTH" -DCMAKE_INSTALL_PREFIX="/opt/br/abo/cmake-host-find-root-path/host" -DCMAKE_C_FLAGS="-O2 -I/opt/br/abo/cmake-host-find-root-path/host/include" -DCMAKE_CXX_FLAGS="-O2 -I/opt/br/abo/cmake-host-find-root-path/host/include" -DCMAKE_EXE_LINKER_FLAGS="-L/opt/br/abo/cmake-host-find-root-path/host/lib -Wl,-rpath,/opt/br/abo/cmake-host-find-root-path/host/lib" -DCMAKE_ASM_COMPILER="/usr/bin/as" -DCMAKE_C_COMPILER="/usr/bin/gcc" -DCMAKE_CXX_COMPILER="/usr/bin/g++" -DCMAKE_C_COMPILER_ARG1="" -DCMAKE_CXX_COMPILER_ARG1="" -DCMAKE_COLOR_MAKEFILE=OFF -DBUILD_DOC=OFF -DBUILD_DOCS=OFF -DBUILD_EXAMPLE=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TEST=OFF -DBUILD_TESTS=OFF -DBUILD_TESTING=OFF -DWITH_SSL=bundled ) -- Running cmake version 3.8.2 [...] -- Found PkgConfig: /opt/br/abo/cmake-host-find-root-path/host/bin/pkg-config (found version "0.28") [...] -- Found LibXml2: /opt/br/abo/cmake-host-find-root-path/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libxml2.so (found version "2.9.4") [...] 0 After this patch is applied: make O=/opt/br/abo/cmake-host-find-root-path libxml2 host-mariadb{-dirclean,-configure} && echo $? [...] >>> host-mariadb 10.1.25 Configuring (mkdir -p /opt/br/abo/cmake-host-find-root-path/build/host-mariadb-10.1.25/ && cd /opt/br/abo/cmake-host-find-root-path/build/host-mariadb-10.1.25/ && rm -f CMakeCache.txt && PATH="/opt/br/abo/cmake-host-find-root-path/host/bin:/opt/br/abo/cmake-host-find-root-path/host/sbin:/home/sam/.local/bin:/sbin:/usr/sbin:/bin:/usr/bin" PKG_CONFIG="/opt/br/abo/cmake-host-find-root-path/host/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_LIBDIR="/opt/br/abo/cmake-host-find-root-path/host/lib/pkgconfig:/opt/br/abo/cmake-host-find-root-path/host/share/pkgconfig" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 /usr/bin/cmake /opt/br/abo/cmake-host-find-root-path/build/host-mariadb-10.1.25/ -DCMAKE_INSTALL_SO_NO_EXE=0 -DCMAKE_FIND_ROOT_PATH="/opt/br/abo/cmake-host-find-root-path/host" -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="BOTH" -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="BOTH" -DCMAKE_INSTALL_PREFIX="/opt/br/abo/cmake-host-find-roo t-path/host" -DCMAKE_C_FLAGS="-O2 -I/opt/br/abo/cmake-host-find-root-path/host/include" -DCMAKE_CXX_FLAGS="-O2 -I/opt/br/abo/cmake-host-find-root-path/host/include" -DCMAKE_EXE_LINKER_FLAGS="-L/opt/br/abo/cmake-host-find-root-path/host/lib -Wl,-rpath,/opt/br/abo/cmake-host-find-root-path/host/lib" -DCMAKE_ASM_COMPILER="/usr/bin/as" -DCMAKE_C_COMPILER="/usr/bin/gcc" -DCMAKE_CXX_COMPILER="/usr/bin/g++" -DCMAKE_C_COMPILER_ARG1="" -DCMAKE_CXX_COMPILER_ARG1="" -DCMAKE_COLOR_MAKEFILE=OFF -DBUILD_DOC=OFF -DBUILD_DOCS=OFF -DBUILD_EXAMPLE=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TEST=OFF -DBUILD_TESTS=OFF -DBUILD_TESTING=OFF -DWITH_SSL=bundled ) -- Running cmake version 3.8.2 [...] -- Found PkgConfig: /opt/br/abo/cmake-host-find-root-path/host/bin/pkg-config (found version "0.28") [...] -- Found LibXml2: /usr/lib/libxml2.so (found version "2.9.4") [...] 0 [1] http://lists.busybox.net/pipermail/buildroot/2017-August/199776.html Reported-by: "Sigalas, Antonios (Nokia - GR/Athens)" Cc: "Sigalas, Antonios (Nokia - GR/Athens)" Cc: Thomas Petazzoni Signed-off-by: Samuel Martin Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit c9f9b16a2f37caeeced47cb562b642ec0c166652) Signed-off-by: Peter Korsgaard --- package/pkg-cmake.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index a7c8dc3b34..f1c12b988e 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -109,6 +109,11 @@ define $(2)_CONFIGURE_CMDS cd $$($$(PKG)_BUILDDIR) && \ rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ + PKG_CONFIG="$$(PKG_CONFIG_HOST_BINARY)" \ + PKG_CONFIG_SYSROOT_DIR="/" \ + PKG_CONFIG_LIBDIR="$$(HOST_DIR)/lib/pkgconfig:$$(HOST_DIR)/share/pkgconfig" \ + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ + PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ From e8f6630b1039a6a4e4f1093e764be16fa16e482c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 3 Aug 2017 09:15:48 +0200 Subject: [PATCH 3218/3392] gdb: add fix for gdb 7.12 and gdb 8.0 build on noMMU platforms This adds a patch to gdb 7.12 and gdb 8.x, which fixes the build on noMMU platforms. It is not needed for older versions of gdb, since it's related to the switch of gdb to C++ in the 7.12 release. Fixes: ../nat/linux-ptrace.c: In function 'int linux_fork_to_function(gdb_byte*, int (*)(void*))': ../nat/linux-ptrace.c:273:29: error: invalid conversion from 'void*' to 'gdb_byte* {aka unsigned char*}' [-fpermissive] child_stack = xmalloc (STACK_SIZE * 4); The patch has already been merged upstream, as of commit ffce45d2243e5f52f411e314fc4e1a69f431a81f, and will therefore be part of future gdb releases. [Peter: drop gdb-8.0 patch] Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5c12506f4da21fcc7a4f1514670c4bfd4f23b466) Signed-off-by: Peter Korsgaard --- ...x-ptrace.c-add-missing-gdb_byte-cast.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/gdb/7.12.1/0006-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch diff --git a/package/gdb/7.12.1/0006-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch b/package/gdb/7.12.1/0006-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch new file mode 100644 index 0000000000..4eb72e4084 --- /dev/null +++ b/package/gdb/7.12.1/0006-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch @@ -0,0 +1,41 @@ +From 09a2c3e0164545324a1ddee70f5c9fdee71e2079 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 18 Jun 2017 23:09:43 +0200 +Subject: [PATCH] nat/linux-ptrace.c: add missing gdb_byte* cast + +On noMMU platforms, the following code gets compiled: + + child_stack = xmalloc (STACK_SIZE * 4); + +Where child_stack is a gdb_byte*, and xmalloc() returns a void*. While +the lack of cast is valid in C, it is not in C++, causing the +following build failure: + +../nat/linux-ptrace.c: In function 'int linux_fork_to_function(gdb_byte*, int (*)(void*))': +../nat/linux-ptrace.c:273:29: error: invalid conversion from 'void*' to 'gdb_byte* {aka unsigned char*}' [-fpermissive] + child_stack = xmalloc (STACK_SIZE * 4); + +Therefore, this commit adds the appropriate cast. + +Signed-off-by: Thomas Petazzoni +[Upstream commit: ffce45d2243e5f52f411e314fc4e1a69f431a81f] +--- + gdb/nat/linux-ptrace.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c +index 3447e07..33833e2 100644 +--- a/gdb/nat/linux-ptrace.c ++++ b/gdb/nat/linux-ptrace.c +@@ -270,7 +270,7 @@ linux_fork_to_function (gdb_byte *child_stack, int (*function) (void *)) + #define STACK_SIZE 4096 + + if (child_stack == NULL) +- child_stack = xmalloc (STACK_SIZE * 4); ++ child_stack = (gdb_byte*) xmalloc (STACK_SIZE * 4); + + /* Use CLONE_VM instead of fork, to support uClinux (no MMU). */ + #ifdef __ia64__ +-- +2.9.4 + From 9a11ca9c6d3a062dadcdf0b7faad43ae2d92f35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Mon, 31 Jul 2017 23:17:59 +0200 Subject: [PATCH 3219/3392] lua: fix pkg-config file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When Lua is linked with additional libraries, these libraries should go into the pkg-config file as well. Otherwise, linking swupdate with the lua library fails: ``` /home/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/liblua.so: undefined reference to `dlopen' /home/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/liblua.so: undefined reference to `dlclose' /home/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/liblua.so: undefined reference to `dlerror' /home/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/liblua.so: undefined reference to `dlsym' ``` Fixes http://autobuild.buildroot.net/results/1c3/1c349cc5904868e4def292b9fbfa164828e46156 Signed-off-by: Jörg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8d845683e37640d33c186c0091ccce6ae3ef0777) Signed-off-by: Peter Korsgaard --- package/lua/5.2.4/0004-lua-pc.patch | 4 +++- package/lua/5.3.4/0004-lua-pc.patch | 4 +++- package/lua/lua.mk | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/lua/5.2.4/0004-lua-pc.patch b/package/lua/5.2.4/0004-lua-pc.patch index 62acb201f2..31ff61157a 100644 --- a/package/lua/5.2.4/0004-lua-pc.patch +++ b/package/lua/5.2.4/0004-lua-pc.patch @@ -1,6 +1,8 @@ add lua.pc Signed-off-by: Francois Perrad +[Jörg Krause: add @MYLIBS@] +Signed-off-by: Jörg Krause Index: b/etc/lua.pc =================================================================== @@ -34,7 +36,7 @@ Index: b/etc/lua.pc +Description: An Extensible Extension Language +Version: ${R} +Requires: -+Libs: -L${libdir} -llua -lm ++Libs: -L${libdir} -llua -lm @MYLIBS@ +Cflags: -I${includedir} + +# (end of lua.pc) diff --git a/package/lua/5.3.4/0004-lua-pc.patch b/package/lua/5.3.4/0004-lua-pc.patch index 615a7db8fc..11258329d1 100644 --- a/package/lua/5.3.4/0004-lua-pc.patch +++ b/package/lua/5.3.4/0004-lua-pc.patch @@ -1,6 +1,8 @@ add lua.pc Signed-off-by: Francois Perrad +[Jörg Krause: add @MYLIBS@] +Signed-off-by: Jörg Krause Index: b/etc/lua.pc =================================================================== @@ -34,7 +36,7 @@ Index: b/etc/lua.pc +Description: An Extensible Extension Language +Version: ${R} +Requires: -+Libs: -L${libdir} -llua -lm ++Libs: -L${libdir} -llua -lm @MYLIBS@ +Cflags: -I${includedir} + +# (end of lua.pc) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index bc0a9d456b..3d0796eb8e 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -86,8 +86,8 @@ endef define LUA_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install - $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc + sed -e "s/@MYLIBS@/$(LUA_MYLIBS)/g" $(@D)/etc/lua.pc \ + > $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc endef define LUA_INSTALL_TARGET_CMDS @@ -96,8 +96,8 @@ endef define HOST_LUA_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install - $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ - $(HOST_DIR)/usr/lib/pkgconfig/lua.pc + sed -e "s/@MYLIBS@/$(HOST_LUA_MYLIBS)/g" $(@D)/etc/lua.pc \ + > $(HOST_DIR)/lib/pkgconfig/lua.pc endef $(eval $(generic-package)) From fea005f3c2717e5d8443ac8e41ef8349740a7948 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 21 Jun 2017 16:30:53 -0400 Subject: [PATCH 3220/3392] libcurl: bump version to 7.54.1 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit c52d50336eb6c51eb9d590cebdee72623d76dd51) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 2 +- package/libcurl/libcurl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index f8885e0488..1b8d80fc96 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 f50ebaf43c507fa7cc32be4b8108fa8bbd0f5022e90794388f3c7694a302ff06 curl-7.54.0.tar.bz2 +sha256 fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0 curl-7.54.1.tar.bz2 diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 6f4803e0c1..45bd0802d1 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.54.0 +LIBCURL_VERSION = 7.54.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 9c0d97c701daa0b37263f664ebe91c3095e9eac9 Mon Sep 17 00:00:00 2001 From: Naoki Matsumoto Date: Mon, 26 Jun 2017 10:34:23 +0900 Subject: [PATCH 3221/3392] libcurl: LICENSE value changes to SPDX The curl license is a MIT/X derivative license, but has a distinct identifier in SPDX, so use that: https://spdx.org/licenses/curl.html [Peter: reword commit message] Signed-off-by: Naoki Matsumoto Signed-off-by: Peter Korsgaard (cherry picked from commit d80110a635c23aac17dabf2e58b580470749a2c9) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 45bd0802d1..684844919e 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -11,7 +11,7 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_ZLIB),zlib) \ $(if $(BR2_PACKAGE_LIBIDN),libidn) \ $(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump) -LIBCURL_LICENSE = ISC +LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_INSTALL_STAGING = YES From 57fa6658477f6fbeb7652c3bdac9735ba7f3673d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 10 Aug 2017 20:35:45 +0300 Subject: [PATCH 3222/3392] libcurl: security bump to version 7.55.0 Fixes: glob: do not parse after a strtoul() overflow range (CVE-2017-1000101) tftp: reject file name lengths that don't fit (CVE-2017-1000100) file: output the correct buffer to the user (CVE-2017-1000099) Switch to .tar.xz to save bandwidth. Add reference to tarball signature. Signed-off-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d88c79090add53947dc3290fb61d51f2b630301c) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 3 ++- package/libcurl/libcurl.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 1b8d80fc96..6d49b67428 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature -sha256 fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0 curl-7.54.1.tar.bz2 +# https://curl.haxx.se/download/curl-7.55.0.tar.xz.asc +sha256 cdd58522f8607fd4e871df79d73acb3155075e2134641e5adab12a0962df059d curl-7.55.0.tar.xz diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 684844919e..dd0ccbfa46 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCURL_VERSION = 7.54.1 -LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 +LIBCURL_VERSION = 7.55.0 +LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_ZLIB),zlib) \ From 1bed722b737617fe480742a75d20d04684dfe2de Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 10 Aug 2017 23:51:11 +0200 Subject: [PATCH 3223/3392] package/valgrind: hide comment when arch is not supported MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, the comment that "valgrind needs shared libs" is not hidden when the architecture dependencies are not met, which can confuse some users (as recently seen on IRC). Fix that by introducing the traditional _ARCH_SUPPORTS option, and have the comment and the symbol depend on that. Signed-off-by: "Yann E. MORIN" Cc: Brandon Maier Cc: Jérôme Pouiller Cc: Peter Seiderer Cc: Thomas Petazzoni Cc: Vicente Olivert Riera Reviewed--by: Pedro Ribeiro Tested-by: Pedro Ribeiro [Arnout: put _ARCH_SUPPORTS at the top of the file] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit afb6bc67a6e3a9fa08a61d81e17e0c152ed09f2a) Signed-off-by: Peter Korsgaard --- package/valgrind/Config.in | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in index 40e219d95a..75b779d214 100644 --- a/package/valgrind/Config.in +++ b/package/valgrind/Config.in @@ -1,14 +1,19 @@ +config BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS + bool + default y if BR2_ARM_CPU_ARMV7A + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_i386 || BR2_x86_64 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + depends on !BR2_MIPS_SOFT_FLOAT + comment "valgrind needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS depends on BR2_STATIC_LIBS config BR2_PACKAGE_VALGRIND bool "valgrind" - depends on BR2_ARM_CPU_ARMV7A || BR2_i386 || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_x86_64 + depends on BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS - depends on !BR2_MIPS_SOFT_FLOAT help Tool for debugging and profiling Linux programs. From d0973b7b475f6c0ee6a09594e7834621b432b701 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 11 Aug 2017 20:32:01 +0200 Subject: [PATCH 3224/3392] libcurl: fix build on uncommon architectures Since the bump to 7.55.0, libcurl fails to build on a number of uncommon architectures (ARC, OpenRISC, etc.). This is due to upstream commit 73a2fcea0b4adea6ba342cd7ed1149782c214ae3 ("includes: remove curl/curlbuild.h and curl/curlrules.h"), which makes libcurl rely on more architecture-specific related defines in include/curl/system.h. This commit therefore adds a patch that fixes the 32-bit vs. 64-bit detection for all architecture, using gcc's __SIZEOF_LONG__ definition. It has been tested successfully with test-pkg on all 47 toolchain configurations. Fixes: http://autobuild.buildroot.net/results/bf26c08cf3267214278674472f931603f69951ae/ (and many similar issues) Signed-off-by: Thomas Petazzoni (cherry picked from commit 6361a50e3f813c81d49636ee92a427442b9a2160) Signed-off-by: Peter Korsgaard --- ...-system.h-support-more-architectures.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/libcurl/0001-curl-system.h-support-more-architectures.patch diff --git a/package/libcurl/0001-curl-system.h-support-more-architectures.patch b/package/libcurl/0001-curl-system.h-support-more-architectures.patch new file mode 100644 index 0000000000..94d9a2a11f --- /dev/null +++ b/package/libcurl/0001-curl-system.h-support-more-architectures.patch @@ -0,0 +1,47 @@ +From 7d84bd820ef412d251b643a4faced105668f4ebd Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 11 Aug 2017 18:52:37 +0200 +Subject: [PATCH] curl/system.h: support more architectures + +The long list of architectures in include/curl/system.h is annoying to +maintain, and needs to be extended for each and every architecture to +support. + +Instead, let's rely on the __SIZEOF_LONG__ define of the gcc compiler +(we are in the GNUC condition anyway), which tells us if long is 4 +bytes or 8 bytes. + +This fixes the build of libcurl 7.55.0 on architectures such as +OpenRISC or ARC. + +Signed-off-by: Thomas Petazzoni +--- + include/curl/system.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/include/curl/system.h b/include/curl/system.h +index 79abf8f..0e13075 100644 +--- a/include/curl/system.h ++++ b/include/curl/system.h +@@ -403,7 +403,7 @@ + # if !defined(__LP64__) && (defined(__ILP32__) || \ + defined(__i386__) || defined(__ppc__) || defined(__arm__) || \ + defined(__sparc__) || defined(__mips__) || defined(__sh__) || \ +- defined(__XTENSA__)) ++ defined(__XTENSA__) || (defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 4)) + # define CURL_SIZEOF_LONG 4 + # define CURL_TYPEOF_CURL_OFF_T long long + # define CURL_FORMAT_CURL_OFF_T "lld" +@@ -412,7 +412,8 @@ + # define CURL_SUFFIX_CURL_OFF_T LL + # define CURL_SUFFIX_CURL_OFF_TU ULL + # elif defined(__LP64__) || \ +- defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__) ++ defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__) || \ ++ (defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 8) + # define CURL_SIZEOF_LONG 8 + # define CURL_TYPEOF_CURL_OFF_T long + # define CURL_FORMAT_CURL_OFF_T "ld" +-- +2.9.4 + From 19d178a5cb9599e1899398fe3e191a4ba1e8a09a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 6 Sep 2017 00:08:18 +0200 Subject: [PATCH 3225/3392] package/git: security bump to version 2.12.4 Fixes CVE-2017-1000117: http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1466490.html Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index 4782dcbefb..b657422c8c 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 016124c54ce2db7a4c2bd26b0de21fbf8f6bcaee04842aa221c7243141df4e42 git-2.12.3.tar.xz +sha256 f8b8ac499034e9f6e44e67dd54351bc5654e228e4cd3b55f6f1c8e736c977ce6 git-2.12.4.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 04cd577825..94cf7a797b 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.12.3 +GIT_VERSION = 2.12.4 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2, LGPLv2.1+ From b4dbe2e781c93f425ef82e9c7076f326b90819a7 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 19 Mar 2017 19:22:12 +0200 Subject: [PATCH 3226/3392] sysvinit: adjust help text sysvinit is far from ultimate init implementation these days. Update the help text to match reality. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit e9a2746710eb269cfb29075f3afda58e45627d4a) Signed-off-by: Peter Korsgaard --- package/sysvinit/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/sysvinit/Config.in b/package/sysvinit/Config.in index 94f1612375..7f27a70fcc 100644 --- a/package/sysvinit/Config.in +++ b/package/sysvinit/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_SYSVINIT depends on BR2_INIT_SYSV depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help - /sbin/init - parent of all processes + System V style implementation of /sbin/init, parent of all + processes http://savannah.nongnu.org/projects/sysvinit From cd86df9e0b1a885fe86b2fed23a86f435f39dd32 Mon Sep 17 00:00:00 2001 From: Dagg Stompler Date: Sun, 13 Aug 2017 20:35:59 +0300 Subject: [PATCH 3227/3392] sysvinit: fix compilation error against musl This commit adds a patch to the sysvinit package that fixes various build issues against musl due to missing header includes. Signed-off-by: Dagg Stompler Signed-off-by: Thomas Petazzoni (cherry picked from commit 7ec15db9db138c71133413fbc9f354de9b74e309) Signed-off-by: Peter Korsgaard --- .../0002-musl-fix-compilation-errors.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/sysvinit/0002-musl-fix-compilation-errors.patch diff --git a/package/sysvinit/0002-musl-fix-compilation-errors.patch b/package/sysvinit/0002-musl-fix-compilation-errors.patch new file mode 100644 index 0000000000..5dcdecf72b --- /dev/null +++ b/package/sysvinit/0002-musl-fix-compilation-errors.patch @@ -0,0 +1,38 @@ +Fix various compilation errors when compiling against must libc + +Signed-off-by: Dagg Stompler + +diff -Nupr a/src/init.c b/src/init.c +--- a/src/init.c 2017-08-13 18:44:27.000000000 +0300 ++++ b/src/init.c 2017-08-13 18:34:45.000000000 +0300 +@@ -37,6 +37,7 @@ + #include + #endif + #include ++#include + #include + #include + #include +diff -Nupr a/src/init.h b/src/init.h +--- a/src/init.h 2017-08-13 19:35:46.000000000 +0300 ++++ b/src/init.h 2017-08-13 19:36:01.000000000 +0300 +@@ -22,6 +22,8 @@ + * + */ + ++#include ++ + /* Standard configuration */ + #define CHANGE_WAIT 0 /* Change runlevel while + waiting for a process to exit? */ +diff -Nupr a/src/mountpoint.c b/src/mountpoint.c +--- a/src/mountpoint.c 2017-08-13 20:28:26.000000000 +0300 ++++ b/src/mountpoint.c 2017-08-13 20:28:40.000000000 +0300 +@@ -24,6 +24,7 @@ + */ + + #include ++#include + #include + #include + #include From 75b9ec066cd7e043f0738f94053421063f9c72fa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 14 Aug 2017 22:23:03 +0200 Subject: [PATCH 3228/3392] lua: ensure pkgconfig directory exists before installing files The lua staging and host installation commands generate a file in usr/lib/pkgconfig, without first making sure that this directory exists, which causes build failures if it doesn't. This commit adjusts those installation commands to create this directory if needed. Fixes: http://autobuild.buildroot.net/results/101c89e1d6aee942a0b1c4e4f3daf8ac2414a56c/ Based on investigation and initial (more complicated) fix provided by Francois Perrad . Signed-off-by: Thomas Petazzoni (cherry picked from commit 25a2650086ad9fe0e22e2a2c3d4e64cae396fcf1) Signed-off-by: Peter Korsgaard --- package/lua/lua.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 3d0796eb8e..89636f20f7 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -86,6 +86,7 @@ endef define LUA_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install + mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/ sed -e "s/@MYLIBS@/$(LUA_MYLIBS)/g" $(@D)/etc/lua.pc \ > $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc endef @@ -96,6 +97,7 @@ endef define HOST_LUA_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install + mkdir -p $(HOST_DIR)/usr/lib/pkgconfig/ sed -e "s/@MYLIBS@/$(HOST_LUA_MYLIBS)/g" $(@D)/etc/lua.pc \ > $(HOST_DIR)/lib/pkgconfig/lua.pc endef From 3afb4a1f9cbc25fd9175a9177e045b39ae899088 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 12 Aug 2017 18:22:55 +0200 Subject: [PATCH 3229/3392] e2fsprogs: add patch for recent glibc Recent glibc have deprecated the implicit include of sys/sysmacros.h from sys/types.h. That means that the macros major and minor are no longer defined unless this header is included. This problem was observed for host-e2fsprogs when building on a host with recent glibc. Add an upstream patch that includes sys/sysmacros.h when needed. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Dagg Stompler Cc: Baruch Siach Tested-by: Dagg Stompler Signed-off-by: Thomas Petazzoni (cherry picked from commit ed295ce49b9284eef30dd81f1398b6357a7ee428) Signed-off-by: Peter Korsgaard --- ...02-include-sys-sysmacros.h-as-needed.patch | 129 ++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch diff --git a/package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch b/package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch new file mode 100644 index 0000000000..c58fcb3217 --- /dev/null +++ b/package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch @@ -0,0 +1,129 @@ +From 3fb715b55426875902dfef3056b2cf7335953178 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Fri, 19 May 2017 13:25:59 -0400 +Subject: [PATCH] include sys/sysmacros.h as needed + +The minor/major/makedev macros are not entirely standard. glibc has had +the definitions in sys/sysmacros.h since the start, and wants to move away +from always defining them implicitly via sys/types.h (as this pollutes the +namespace in violation of POSIX). Other C libraries have already dropped +them. Since the configure script already checks for this header, use that +to pull in the header in files that use these macros. + +Signed-off-by: Mike Frysinger +Signed-off-by: Theodore Ts'o + +Upstream commit 3fb715b55426875902dfef3056b2cf7335953178 +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + debugfs/debugfs.c | 3 +++ + lib/blkid/devname.c | 3 +++ + lib/blkid/devno.c | 3 +++ + lib/ext2fs/finddev.c | 3 +++ + lib/ext2fs/ismounted.c | 3 +++ + misc/create_inode.c | 4 ++++ + misc/mk_hugefiles.c | 3 +++ + 7 files changed, 22 insertions(+) + +diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c +index 059ddc39..453f5b52 100644 +--- a/debugfs/debugfs.c ++++ b/debugfs/debugfs.c +@@ -26,6 +26,9 @@ extern char *optarg; + #include + #endif + #include ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #include "debugfs.h" + #include "uuid/uuid.h" +diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c +index 3e2efa9d..671e781f 100644 +--- a/lib/blkid/devname.c ++++ b/lib/blkid/devname.c +@@ -36,6 +36,9 @@ + #if HAVE_SYS_MKDEV_H + #include + #endif ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + #include + + #include "blkidP.h" +diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c +index aa6eb907..480030f2 100644 +--- a/lib/blkid/devno.c ++++ b/lib/blkid/devno.c +@@ -31,6 +31,9 @@ + #if HAVE_SYS_MKDEV_H + #include + #endif ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #include "blkidP.h" + +diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c +index 311608de..62fa0dbe 100644 +--- a/lib/ext2fs/finddev.c ++++ b/lib/ext2fs/finddev.c +@@ -31,6 +31,9 @@ + #if HAVE_SYS_MKDEV_H + #include + #endif ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #include "ext2_fs.h" + #include "ext2fs.h" +diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c +index bcac0f15..7d524715 100644 +--- a/lib/ext2fs/ismounted.c ++++ b/lib/ext2fs/ismounted.c +@@ -49,6 +49,9 @@ + #if HAVE_SYS_TYPES_H + #include + #endif ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + + #include "ext2_fs.h" + #include "ext2fs.h" +diff --git a/misc/create_inode.c b/misc/create_inode.c +index ae22ff6f..8ce3fafa 100644 +--- a/misc/create_inode.c ++++ b/misc/create_inode.c +@@ -22,6 +22,10 @@ + #include + #endif + #include ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif ++ + #include + #include + #include +diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c +index 049c6f41..5882394d 100644 +--- a/misc/mk_hugefiles.c ++++ b/misc/mk_hugefiles.c +@@ -35,6 +35,9 @@ extern int optind; + #include + #include + #include ++#ifdef HAVE_SYS_SYSMACROS_H ++#include ++#endif + #include + #include + #include +-- +2.13.3 + From fdce421a5fab2d1190a20087ba715dd5f12aad0e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Aug 2017 10:59:26 +0200 Subject: [PATCH 3230/3392] gpsd: fix build for microblaze architecture Disable O2 and add O0. The suggested flags in the gcc report are not enough for gcc >= 6. Fixes: http://autobuild.buildroot.net/results/3686cd3f3e7b6aee84f4377bd2dded1115321fb3/ Signed-off-by: Waldemar Brodkorb [Thomas: use Git to format the patch, improve patch description.] Signed-off-by: Thomas Petazzoni (cherry picked from commit e6d0177f5319457588080b7ed111da2c3b628cf8) Signed-off-by: Peter Korsgaard --- ...Construct-do-not-force-O2-by-default.patch | 29 +++++++++++++++++++ package/gpsd/gpsd.mk | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 package/gpsd/0002-SConstruct-do-not-force-O2-by-default.patch diff --git a/package/gpsd/0002-SConstruct-do-not-force-O2-by-default.patch b/package/gpsd/0002-SConstruct-do-not-force-O2-by-default.patch new file mode 100644 index 0000000000..641afa30af --- /dev/null +++ b/package/gpsd/0002-SConstruct-do-not-force-O2-by-default.patch @@ -0,0 +1,29 @@ +From eb7cce5dbb53a64cf55ac0d9a7fa4dcbebd4b173 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Mon, 14 Aug 2017 23:24:38 +0200 +Subject: [PATCH] SConstruct: do not force -O2 by default + +-O2 can cause problems on some architectures, so do not force it by + default. + +Signed-off-by: Waldemar Brodkorb +--- + SConstruct | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/SConstruct b/SConstruct +index fe444a2..93d91a4 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -330,8 +330,6 @@ if not 'CCFLAGS' in os.environ: + # Should we build with optimisation? + if env['debug'] or env['coveraging']: + env.Append(CCFLAGS=['-O0']) +- else: +- env.Append(CCFLAGS=['-O2']) + + # Get a slight speedup by not doing automatic RCS and SCCS fetches. + env.SourceCode('.', None) +-- +2.9.4 + diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 73067d3b15..7c2d37bea2 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -44,7 +44,7 @@ endif # A bug was reported to the gcc bug tracker: # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485 ifeq ($(BR2_microblaze),y) -GPSD_CFLAGS += -fno-expensive-optimizations -fno-schedule-insns +GPSD_CFLAGS += -O0 endif # Enable or disable Qt binding From 7728fc745d292767aae5d5d13e60913ed8c541b9 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 13 Aug 2017 21:34:19 +0300 Subject: [PATCH 3231/3392] whois: bump to version 5.2.17 Fixes serious usability issues (Debian changelog): * Fixed whois referrals for .com, .net, .jobs, .bz, .cc and .tv, broken by an ICANN-mandated output change: https://www.icann.org/resources/pages/rdds-labeling-policy-2017-02-01-en Use snapshot.debian.org for the .dsc reference, since files tend to disappear from the official Debian ftp site over time. Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 978724d8cf487f285c85473e75482ae6a618a2a6) Signed-off-by: Peter Korsgaard --- package/whois/whois.hash | 4 ++-- package/whois/whois.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 6f65074c2c..29623b529f 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,2 +1,2 @@ -# From http://ftp.debian.org/debian/pool/main/w/whois/whois_5.2.14.dsc -sha256 a41daf41abed0fbfa8c9c4b0e4a3f5f22d9876dd6feb9091aac12f8f4c38b0d2 whois_5.2.14.tar.xz +# From http://snapshot.debian.org/archive/debian/20170727T214450Z/pool/main/w/whois/whois_5.2.17.dsc +sha256 257585678f571e18964667b41dc6543fe9da6123ac95743660c9c3ae1eba9664 whois_5.2.17.tar.xz diff --git a/package/whois/whois.mk b/package/whois/whois.mk index 29a18e3e1c..5836e1d7bb 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.2.14 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20161230T032015Z/pool/main/w/whois +WHOIS_VERSION = 5.2.17 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20170727T214450Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz # take precedence over busybox implementation WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox) From ac847623f52c4a3e6c77d6636e19a7681989d270 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 13 Aug 2017 23:48:34 +0200 Subject: [PATCH 3232/3392] package/fakeroot: fix highly parallel uses Although the issue can very well occur with low-paralle builds, or even with non-parallel builds, the conditions are so strict that the ocasion it breaks is extremely rare, to the point where a failure would go unnoticed. Fixes #10141. Reported-by: Clayton Shotwell Signed-off-by: "Yann E. MORIN" Cc: Clayton Shotwell Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit eff989bab851ab01d190f3771558eb6ac30af255) Signed-off-by: Peter Korsgaard --- ...nicate-check-return-status-of-msgrcv.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch diff --git a/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch b/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch new file mode 100644 index 0000000000..3bb4f9701f --- /dev/null +++ b/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch @@ -0,0 +1,46 @@ +From a853f21633693f9eefc4949660253a5328d2d2f3 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 13 Aug 2017 23:21:54 +0200 +Subject: [PATCH 1/1] communicate: check return status of msgrcv() + +msgrcv can return with -1 to indicate an error condition. +One such error is to have been interrupted by a signal. + +Being interrupted by a signal is very rare in this code, except in a +very special condition: a highly-parallel (1000 jobs!) mksquashfs on +a filesystem with extended attributes, where we see errors like (those +are mksquashfs errors): + llistxattr for titi/603/883 failed in read_attrs, because Unknown + error 1716527536 + +See: https://bugs.busybox.net/show_bug.cgi?id=10141 + +In this case, we just have to retry the call to msgrcv(). + +Signed-off-by: "Yann E. MORIN" +--- + communicate.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/communicate.c b/communicate.c +index 293f404..787bb63 100644 +--- a/communicate.c ++++ b/communicate.c +@@ -553,10 +553,13 @@ void send_get_fakem(struct fake_msg *buf) + l=msgrcv(msg_get, + (struct my_msgbuf*)buf, + sizeof(*buf)-sizeof(buf->mtype),0,0); +- while((buf->serial!=serial)||buf->pid!=pid); ++ while(((l==-1)&&(errno==EINTR))||(buf->serial!=serial)||buf->pid!=pid); + + semaphore_down(); + ++ if(l==-1) ++ buf->xattr.flags_rc=errno; ++ + /* + (nah, may be wrong, due to allignment) + +-- +2.11.0 + From 2ff69117fef4f36b6d1daf6883891add9c159546 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 14 Aug 2017 23:18:24 +0200 Subject: [PATCH 3233/3392] fs/iso9660: really create initrd temp dir In case we're using an initrd, we create an empty "root" directory that will contain only the bootloader stuff, not the actual root filesystem, because it is in an initrd (standalone or initramfs). We have to ensure that the directory is empty before assembling the filesystem (to avoid any file lingering from a previous run, like the sequence "make; make"). So we first remove it before we create it, so that on each build (especially not-from-scratch builds) we get the exact expected content without any leftover. However, the macro responsible for that, although defined since 7080eef9, was never called. Fix that by registering it as a pre-gen hook. Note: the directory need not be created, as there are quite a few "install -D" commands that ensure it is created. Yet, we prefer to create it explicitly to avoid any confusion. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 8a26adddde1e924236553584a5623485fdc90c7f) Signed-off-by: Peter Korsgaard --- fs/iso9660/iso9660.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index d1d9cbf1a4..ee98ecfa28 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -40,6 +40,7 @@ define ROOTFS_ISO9660_CREATE_TEMPDIR $(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR) mkdir -p $(ROOTFS_ISO9660_TARGET_DIR) endef +ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_CREATE_TEMPDIR else ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR) endif From ec88eeaea0c25150da0fb0543dcebc18c043dfbb Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 16 Aug 2017 13:53:05 +0300 Subject: [PATCH 3234/3392] faad2: fix build with musl libc The getopt.c code declares the strncmp() routine in a non confirming way under non GNU libc. Patch the code to make the declaration standard conforming. Fixes: http://autobuild.buildroot.net/results/447/4471be349d7ad2e998a4d55afd33aa046a5d1fd2/ http://autobuild.buildroot.net/results/2a9/2a90f4f518884fb50f7ad6ab505dee7565ed869e/ http://autobuild.buildroot.net/results/6b1/6b159b766d791492bab4d897c33ce07845fb7119/ Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 6f6795d77ddddd8a8ff63e13f9d7fe0a907a434d) Signed-off-by: Peter Korsgaard --- .../0001-getopt-fix-strncmp-declaration.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/faad2/0001-getopt-fix-strncmp-declaration.patch diff --git a/package/faad2/0001-getopt-fix-strncmp-declaration.patch b/package/faad2/0001-getopt-fix-strncmp-declaration.patch new file mode 100644 index 0000000000..0e5f27e52a --- /dev/null +++ b/package/faad2/0001-getopt-fix-strncmp-declaration.patch @@ -0,0 +1,40 @@ +From 6787914efad562e4097a153988109c5c7158abf7 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Wed, 16 Aug 2017 13:35:57 +0300 +Subject: [PATCH] getopt: fix strncmp() declaration + +The strncmp() declaration does not conform with the standard as to the +type of the 'n' parameter. Fix this to avoid the following build failure +with musl libc: + +n file included from main.c:61:0: +getopt.c:175:13: error: conflicting types for 'strncmp' + extern int strncmp(const char *s1, const char *s2, unsigned int n); + ^~~~~~~ +In file included from main.c:49:0: +.../host/x86_64-buildroot-linux-musl/sysroot/usr/include/string.h:38:5: note: previous declaration of 'strncmp' was here + int strncmp (const char *, const char *, size_t); + ^~~~~~~ +Signed-off-by: Baruch Siach +--- +Upstream status: https://sourceforge.net/p/faac/bugs/217/ + + frontend/getopt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/frontend/getopt.c b/frontend/getopt.c +index 185d49b804dd..40c7a2242551 100644 +--- a/frontend/getopt.c ++++ b/frontend/getopt.c +@@ -172,7 +172,7 @@ static enum + #if __STDC__ || defined(PROTO) + extern char *getenv(const char *name); + extern int strcmp (const char *s1, const char *s2); +-extern int strncmp(const char *s1, const char *s2, unsigned int n); ++extern int strncmp(const char *s1, const char *s2, size_t n); + + static int my_strlen(const char *s); + static char *my_index (const char *str, int chr); +-- +2.14.1 + From 0b51c59e192a1d8b542c470c5943faf750f18a7d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 18 Aug 2017 06:56:35 +0200 Subject: [PATCH 3235/3392] linux-headers: bump 4.{4, 9, 12}.x series [Peter: drop 4.12.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit ab157dd4d188c42c5b8fa115ab7fab35de2fffcc) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6440dee074..aeb9040fcd 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.43" if BR2_KERNEL_HEADERS_4_1 - default "4.4.80" if BR2_KERNEL_HEADERS_4_4 + default "4.4.83" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.41" if BR2_KERNEL_HEADERS_4_9 + default "4.9.44" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 0190c95a5a6e4441afc7846c1d77de95099ff1f6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 18 Aug 2017 07:50:07 +0200 Subject: [PATCH 3236/3392] package/zmqpp: link with libatomic when needed Fixes http://autobuild.buildroot.net/results/c32/c32b9b8dd00d6f6d3db27fae9d8de758a4f25138/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 55a9d6d55888b04ec6c476399e5b98a2412995f5) Signed-off-by: Peter Korsgaard --- package/zmqpp/zmqpp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk index 3e35fd758a..cf233b95e8 100644 --- a/package/zmqpp/zmqpp.mk +++ b/package/zmqpp/zmqpp.mk @@ -13,6 +13,10 @@ ZMQPP_LICENSE_FILES = LICENSE ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +ZMQPP_LDFLAGS += -latomic +endif + ifeq ($(BR2_PACKAGE_ZMQPP_CLIENT),y) ZMQPP_DEPENDENCIES += boost endif From 3df894d83cc1f1822a320f1676a879e8814d3964 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 23 Aug 2017 16:44:14 -0700 Subject: [PATCH 3237/3392] package/rpcbind: Do not mark .service and .socket files executable Do not mark .service and .socket files executable, otherwise systemd will give us a warning about it. Signed-off-by: Andrey Smirnov Signed-off-by: Thomas Petazzoni (cherry picked from commit 3a41c96a25a267db77455a668dd4c673a2a6fc39) Signed-off-by: Peter Korsgaard --- package/rpcbind/rpcbind.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk index 4360d1f47a..f8f8c418e3 100644 --- a/package/rpcbind/rpcbind.mk +++ b/package/rpcbind/rpcbind.mk @@ -22,9 +22,9 @@ RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no endif define RPCBIND_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0755 -D package/rpcbind/rpcbind.service \ + $(INSTALL) -m 0644 -D package/rpcbind/rpcbind.service \ $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service - $(INSTALL) -m 0755 -D package/rpcbind/rpcbind.socket \ + $(INSTALL) -m 0644 -D package/rpcbind/rpcbind.socket \ $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants ln -fs ../../../../usr/lib/systemd/system/rpcbind.socket \ From 0e60dd830f610ed1f4cb96d1adb8c741747fd804 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 2 Jul 2017 18:53:28 +0200 Subject: [PATCH 3238/3392] mediastreamer: don't download patch from Github Patches downloaded from Github are not stable, so bring them in the tree. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit c0369e05ead0443375f25968b8d48f0b9e279828) Signed-off-by: Peter Korsgaard --- ...mpilation-issue-with-latest-bctoobox.patch | 38 +++++++++++++++++++ package/mediastreamer/mediastreamer.hash | 1 - package/mediastreamer/mediastreamer.mk | 4 -- 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch diff --git a/package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch b/package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch new file mode 100644 index 0000000000..7bc9733c85 --- /dev/null +++ b/package/mediastreamer/0001-fix-compilation-issue-with-latest-bctoobox.patch @@ -0,0 +1,38 @@ +From 26f884bf977977041fe6f98a0af186be1580bf22 Mon Sep 17 00:00:00 2001 +From: Simon Morlat +Date: Thu, 29 Sep 2016 15:26:18 +0200 +Subject: [PATCH] fix compilation issue with latest bctoobox + +[Upstream commit https://github.com/BelledonneCommunications/mediastreamer2/commit/26f884bf977977041fe6f98a0af186be1580bf22] +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 2 +- + src/crypto/dtls_srtp.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7ab20a08f..244d87275 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1116,7 +1116,7 @@ fi + + + dnl check bctoolbox library +-PKG_CHECK_MODULES(BCTOOLBOX, bctoolbox >= 0.0.0, found_bctoolbox=true, found_bctoolbox=false) ++PKG_CHECK_MODULES(BCTOOLBOX, bctoolbox >= 0.4.0, found_bctoolbox=true, found_bctoolbox=false) + if test "$found_bctoolbox" = "true" ; then + LIBS="$LIBS $BCTOOLBOX_LIBS" + CFLAGS="$CFLAGS $BCTOOLBOX_CFLAGS" +diff --git a/src/crypto/dtls_srtp.c b/src/crypto/dtls_srtp.c +index e2c8e1c44..fd37eb5cb 100644 +--- a/src/crypto/dtls_srtp.c ++++ b/src/crypto/dtls_srtp.c +@@ -705,7 +705,7 @@ static int ms_dtls_srtp_initialise_bctbx_dtls_context(DtlsBcToolBoxContext *dtls + bctbx_ssl_config_set_authmode(dtlsContext->ssl_config, BCTBX_SSL_VERIFY_OPTIONAL); + bctbx_ssl_config_set_own_cert( dtlsContext->ssl_config, dtlsContext->crt, dtlsContext->pkey ); + /* This is useless as peer would certainly be a self signed certificate and we won't verify it but avoid runtime warnings */ +- bctbx_ssl_config_set_ca_chain(dtlsContext->ssl_config, dtlsContext->crt, NULL); ++ bctbx_ssl_config_set_ca_chain(dtlsContext->ssl_config, dtlsContext->crt); + + /* we are not ready yet to actually start the ssl context, this will be done by calling bctbx_ssl_setup when stream starts */ + return 0; diff --git a/package/mediastreamer/mediastreamer.hash b/package/mediastreamer/mediastreamer.hash index 0f1ac77ce1..5f26b54bff 100644 --- a/package/mediastreamer/mediastreamer.hash +++ b/package/mediastreamer/mediastreamer.hash @@ -1,3 +1,2 @@ # Locally calculated sha256 1144849c0c96abafb1153adf56109f0f195a9e4a53cf28cb611bbca7a9012c1a mediastreamer-2.14.0.tar.gz -sha256 90091ab0aa7a77381ab1ca5d88cdfa4e7f62505fb452a2bea0f70054d9d1aece 26f884bf977977041fe6f98a0af186be1580bf22.patch diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index b4f0c52c7c..1d99d192d6 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -13,10 +13,6 @@ MEDIASTREAMER_CONF_OPTS = --disable-tests --disable-glx --disable-strict MEDIASTREAMER_LICENSE = GPLv2+ MEDIASTREAMER_LICENSE_FILES = COPYING -# fix compilation issue with latest bctoolbox (touches configure.ac) -MEDIASTREAMER_PATCH = \ - https://github.com/BelledonneCommunications/mediastreamer2/commit/26f884bf977977041fe6f98a0af186be1580bf22.patch - # patching configure.ac MEDIASTREAMER_AUTORECONF = YES From f21b3b83f8c9d3c19105da4a4cecdda6ea63eea5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 21 Aug 2017 22:55:15 +0200 Subject: [PATCH 3239/3392] vim: add host variant Vim contains a tool called xxd, which is needed by mediastreamer on the host as part of its build process. Therefore, this commit introduces a host variant for the vim package, that will be used by mediastreamer. Signed-off-by: Thomas Petazzoni (cherry picked from commit 38d098402e620366d87699a7894d2e7918989156) Signed-off-by: Peter Korsgaard --- package/vim/vim.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/vim/vim.mk b/package/vim/vim.mk index ec494608e7..9ea3fc21f0 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -75,4 +75,7 @@ VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS VIM_POST_INSTALL_TARGET_HOOKS += VIM_REMOVE_DOCS endif +HOST_VIM_DEPENDENCIES = host-ncurses + $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From e72e252af537af079194d8f834a55547a8c191b8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 21 Aug 2017 22:55:16 +0200 Subject: [PATCH 3240/3392] mediastreamer: add dependency on host-vim host-vim is needed to provide the xxd tool, otherwise the build fails with: checking for xxd... no configure: error: "xxd is required (provided by vim package)" This isn't noticed by the autobuilders, presumably because all of them have vim installed locally. Signed-off-by: Thomas Petazzoni (cherry picked from commit 377d10577bb47dbe5da5799646f2a05c36739547) Signed-off-by: Peter Korsgaard --- package/mediastreamer/mediastreamer.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index 1d99d192d6..fa4b163e34 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -7,7 +7,8 @@ MEDIASTREAMER_VERSION = 2.14.0 MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer MEDIASTREAMER_INSTALL_STAGING = YES -MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext +# host-vim needed for the xxd utility +MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext host-vim # tests fail linking on some architectures, so disable them MEDIASTREAMER_CONF_OPTS = --disable-tests --disable-glx --disable-strict MEDIASTREAMER_LICENSE = GPLv2+ From d4451a4c96798ce3b0b4b8580e56e0bd18be740e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 25 Aug 2017 06:57:56 +0200 Subject: [PATCH 3241/3392] linux-headers: bump 4.{4, 9, 12}.x series [Peter: drop 4.12.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 8e291b97ab048a64097ae490d89fe894f2801b81) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index aeb9040fcd..343d2ade86 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.43" if BR2_KERNEL_HEADERS_4_1 - default "4.4.83" if BR2_KERNEL_HEADERS_4_4 + default "4.4.84" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.44" if BR2_KERNEL_HEADERS_4_9 + default "4.9.45" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From ece5e098913d77846908e010fb67711bbb2e500a Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 24 Aug 2017 14:41:50 -0700 Subject: [PATCH 3242/3392] package/minidlna: Do not mark .service file executable Do not mark .service file executable, otherwise systemd will give us a warning about it. Signed-off-by: Andrey Smirnov Signed-off-by: Thomas Petazzoni (cherry picked from commit fb825fbaf9dabce2b22c9a32645802f8f64fca23) Signed-off-by: Peter Korsgaard --- package/minidlna/minidlna.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 0e765e80f7..c67373fd14 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -29,7 +29,7 @@ define MINIDLNA_INSTALL_INIT_SYSV endef define MINIDLNA_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0755 package/minidlna/minidlnad.service \ + $(INSTALL) -D -m 0644 package/minidlna/minidlnad.service \ $(TARGET_DIR)/usr/lib/systemd/system/minidlnad.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants From c565971bd7bfc82a84c5ca8798c4d0795c692b75 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 24 Aug 2017 14:41:51 -0700 Subject: [PATCH 3243/3392] package/transmission: Do not mark .service file executable Do not mark .service file executable, otherwise systemd will give us a warning about it. Signed-off-by: Andrey Smirnov Signed-off-by: Thomas Petazzoni (cherry picked from commit a1c3ae753e7fb069cdb15ad2c194bcd47237123a) Signed-off-by: Peter Korsgaard --- package/transmission/transmission.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index 923ba409d3..f4b0d71a42 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -64,7 +64,7 @@ define TRANSMISSION_INSTALL_INIT_SYSV endef define TRANSMISSION_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0755 $(@D)/daemon/transmission-daemon.service \ + $(INSTALL) -D -m 0644 $(@D)/daemon/transmission-daemon.service \ $(TARGET_DIR)/usr/lib/systemd/system/transmission-daemon.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants ln -fs ../../../../usr/lib/systemd/system/transmission-daemon.service \ From aac336dfd70c50a21098f12784d5236b7d4f0cfb Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 24 Aug 2017 14:41:52 -0700 Subject: [PATCH 3244/3392] package/nss-pam-ldapd: Do not mark .service file executable Do not mark .service file executable, otherwise systemd will give us a warning about it. Signed-off-by: Andrey Smirnov Signed-off-by: Thomas Petazzoni (cherry picked from commit 06cf5c1812e13e9ffd5d4040f2dbaf0f41a8e181) Signed-off-by: Peter Korsgaard --- package/nss-pam-ldapd/nss-pam-ldapd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nss-pam-ldapd/nss-pam-ldapd.mk b/package/nss-pam-ldapd/nss-pam-ldapd.mk index ba250829bb..f588e157bd 100644 --- a/package/nss-pam-ldapd/nss-pam-ldapd.mk +++ b/package/nss-pam-ldapd/nss-pam-ldapd.mk @@ -27,7 +27,7 @@ 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 \ + $(INSTALL) -m 644 -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 \ From af76cb192ae57b1f2e1a01e365a849d271780730 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 29 Aug 2017 21:10:00 +0200 Subject: [PATCH 3245/3392] package/dialog: fix upstream source URL Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 5fdebd3b8aad0407c0eeaeef5998562d17c5e42a) Signed-off-by: Peter Korsgaard --- package/dialog/dialog.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index f207f75704..131877095e 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -6,7 +6,7 @@ DIALOG_VERSION = 1.2-20150125 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz -DIALOG_SITE = ftp://invisible-island.net/dialog +DIALOG_SITE = ftp://ftp.invisible-island.net/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ --disable-rpath-hack DIALOG_DEPENDENCIES = host-pkgconf ncurses From 09549cc322d3989fb439a2da4c4407118e588826 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 29 Aug 2017 21:10:01 +0200 Subject: [PATCH 3246/3392] package/iostat: fix upstream source URL Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3d37cc2c97ddfd89698af121e77e9cebfb085a16) Signed-off-by: Peter Korsgaard --- package/iostat/iostat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk index d591c67dcb..4953c73ec4 100644 --- a/package/iostat/iostat.mk +++ b/package/iostat/iostat.mk @@ -5,7 +5,7 @@ ################################################################################ IOSTAT_VERSION = 2.2 -IOSTAT_SITE = http://www.linuxinsight.com/files +IOSTAT_SITE = http://linuxinsight.com/sites/default/files IOSTAT_LICENSE = GPL IOSTAT_LICENSE_FILES = LICENSE From 0dba28fce17407b64c088b14eee3545b6c846285 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 29 Aug 2017 21:10:02 +0200 Subject: [PATCH 3247/3392] package/iucode-tool: fix upstream source URL Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 9f2369b5f078df99ea32d14e30803f3c46200c07) Signed-off-by: Peter Korsgaard --- package/iucode-tool/iucode-tool.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/iucode-tool/iucode-tool.mk b/package/iucode-tool/iucode-tool.mk index cee0572649..1dfda70293 100644 --- a/package/iucode-tool/iucode-tool.mk +++ b/package/iucode-tool/iucode-tool.mk @@ -6,7 +6,7 @@ IUCODE_TOOL_VERSION = 1.5 IUCODE_TOOL_SOURCE = iucode-tool_$(IUCODE_TOOL_VERSION).tar.xz -IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/latest +IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/master ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) IUCODE_TOOL_CONF_ENV = LIBS="-largp" IUCODE_TOOL_DEPENDENCIES = argp-standalone From ec732da99e44ba76982c97dfd936a5d6419cecd4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 29 Aug 2017 21:10:04 +0200 Subject: [PATCH 3248/3392] package/libphidget: fix upstream source URL Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit dc9cc4d7cfb7dcd4a450e6bafe010b19f4c85e78) Signed-off-by: Peter Korsgaard --- package/libphidget/libphidget.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libphidget/libphidget.mk b/package/libphidget/libphidget.mk index 1b2557d726..cc315b35e6 100644 --- a/package/libphidget/libphidget.mk +++ b/package/libphidget/libphidget.mk @@ -6,7 +6,7 @@ LIBPHIDGET_VERSION = 2.1.8.20140319 LIBPHIDGET_SOURCE = libphidget_$(LIBPHIDGET_VERSION).tar.gz -LIBPHIDGET_SITE = http://www.phidgets.com/downloads/libraries +LIBPHIDGET_SITE = https://www.phidgets.com/downloads/phidget21/libraries/linux/libphidget LIBPHIDGET_DEPENDENCIES = libusb LIBPHIDGET_CONF_OPTS = --disable-ldconfig LIBPHIDGET_INSTALL_STAGING = YES From a6ae588ccc7e2419d9d90db5bb10e6f2fc4ea361 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 29 Aug 2017 22:49:59 +0200 Subject: [PATCH 3249/3392] package/nvidia-driver: install an egl.pc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A lot of packages expect an egl.pc to decide that EGL is available. So, provide one. As suggested by Alexandre, use the one from nvidia-tegra23 as template. Reported-by: Alexandre Maumené Signed-off-by: "Yann E. MORIN" Cc: Alexandre Maumené Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni (cherry picked from commit 05a86bdf1fa9071de9701fba058d47d80a0925bd) Signed-off-by: Peter Korsgaard --- package/nvidia-driver/egl.pc | 10 ++++++++++ package/nvidia-driver/nvidia-driver.mk | 1 + 2 files changed, 11 insertions(+) create mode 100644 package/nvidia-driver/egl.pc diff --git a/package/nvidia-driver/egl.pc b/package/nvidia-driver/egl.pc new file mode 100644 index 0000000000..a5aeace63c --- /dev/null +++ b/package/nvidia-driver/egl.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: egl +Description: Nvidia OpenGL library +Version: 1 +Cflags: -I${includedir} +Libs: -L${libdir} -lEGL diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index 20beec8936..1b85f3db28 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -78,6 +78,7 @@ define NVIDIA_DRIVER_INSTALL_GL_DEV $(SED) 's:__LIBGL_PATH__:/usr/lib:' $(STAGING_DIR)/usr/lib/libGL.la $(SED) 's:-L[^[:space:]]\+::' $(STAGING_DIR)/usr/lib/libGL.la $(INSTALL) -D -m 0644 package/nvidia-driver/gl.pc $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc + $(INSTALL) -D -m 0644 package/nvidia-driver/egl.pc $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc endef # Those libraries are 'private' libraries requiring an agreement with From d672e0c4d71727162c9d9f825507226c1a24b9fd Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sun, 4 Jun 2017 20:53:55 +0100 Subject: [PATCH 3250/3392] package/connman: bump version to 1.34 Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni (cherry picked from commit 579568ce09a94e2f55bf80d57fc2dfac577e8d4f) Signed-off-by: Peter Korsgaard --- package/connman/connman.hash | 2 +- package/connman/connman.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/connman/connman.hash b/package/connman/connman.hash index f27af3deac..e6485b93a6 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0 connman-1.33.tar.xz +sha256 a9a0808c729c1f348fc36d8cecb52d19b72bc34cb411c502608cb0e0190fc71e connman-1.34.tar.xz diff --git a/package/connman/connman.mk b/package/connman/connman.mk index f7c9f2318f..efe08a5c83 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.33 +CONNMAN_VERSION = 1.34 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus iptables From 8d5a92e2b666c25e22ba5959e253269a5774e777 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 28 Aug 2017 21:16:51 +0300 Subject: [PATCH 3251/3392] connman: security bump to version 1.35 Fixes CVE-2017-12865: stack overflow in dns proxy feature. Cc: Martin Bark Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 104879aab0efc9fe0913af5d3877e0e9c6490607) Signed-off-by: Peter Korsgaard --- package/connman/connman.hash | 2 +- package/connman/connman.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/connman/connman.hash b/package/connman/connman.hash index e6485b93a6..c822bb1fe4 100644 --- a/package/connman/connman.hash +++ b/package/connman/connman.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 a9a0808c729c1f348fc36d8cecb52d19b72bc34cb411c502608cb0e0190fc71e connman-1.34.tar.xz +sha256 66d7deb98371545c6e417239a9b3b3e3201c1529d08eedf40afbc859842cf2aa connman-1.35.tar.xz diff --git a/package/connman/connman.mk b/package/connman/connman.mk index efe08a5c83..741da9be73 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.34 +CONNMAN_VERSION = 1.35 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus iptables From 21d7b1e4fc2000ae98b9fa41d635f238e3e43e64 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Aug 2017 15:43:36 +0200 Subject: [PATCH 3252/3392] package/squid: fix typo Fixed typo added by https://git.buildroot.net/buildroot/commit/package/squid?id=d2f7d0d72cd7e00ffbe869011d200f0a4a53e7a5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7c5526c79cd74592cff55f8344216ad0a968119a) Signed-off-by: Peter Korsgaard --- package/squid/squid.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/squid/squid.mk b/package/squid/squid.mk index cf0378a8d2..9abf3cd8e6 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -21,7 +21,7 @@ SQUID_CONF_ENV = \ ac_cv_func___va_copy=yes \ ac_cv_func_strnstr=no \ ac_cv_have_squid=yes \ - BUILXCXX="$(HOSTCXX)" \ + BUILDCXX="$(HOSTCXX)" \ BUILDCXXFLAGS="$(HOST_CXXFLAGS)" SQUID_CONF_OPTS = \ --enable-async-io=8 \ From 1faeae820de660eaddc07244c0d3eae72f7b8bee Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Aug 2017 17:29:26 +0200 Subject: [PATCH 3253/3392] linux-headers: bump 3.{2, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit fec74492eefbf077cfaaefd8d78b6582313dddd8) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 343d2ade86..7462e28549 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -214,7 +214,7 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.91" if BR2_KERNEL_HEADERS_3_2 + default "3.2.92" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.107" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 From 290b6cfdf688afd14e0c2597d9b6bd23dc67fc87 Mon Sep 17 00:00:00 2001 From: Kurt Van Dijck Date: Fri, 25 Aug 2017 23:11:10 +0200 Subject: [PATCH 3254/3392] bcusdk: eibd: drop local clock_gettime in USB backends clock_gettime is defined locally, and calls pth_int_time, which in turn calls clock_gettime. The USB backend shouldn't overrule clock_gettime in the first place. This patch fixes this endless recursion by removing the local defition. Signed-off-by: Kurt Van Dijck Signed-off-by: Thomas Petazzoni (cherry picked from commit bc4f5598dccc191a1e2c6268fdcef1935e2fa212) Signed-off-by: Peter Korsgaard --- ...ss-recursion-when-using-USB-backends.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch diff --git a/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch b/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch new file mode 100644 index 0000000000..3b90289c88 --- /dev/null +++ b/package/bcusdk/0002-eibd-fix-endless-recursion-when-using-USB-backends.patch @@ -0,0 +1,35 @@ +From 6bd1b4958e949d83468e053c34bf6c89d14d687a Mon Sep 17 00:00:00 2001 +From: Kurt Van Dijck +Date: Fri, 25 Aug 2017 23:01:14 +0200 +Subject: [PATCH] eibd: drop local clock_gettime in USB backends + +clock_gettime is defined locally, and calls pth_int_time, which +in turn calls clock_gettime. +The USB backend shouldn't overrule clock_gettime in the first place. +This patch fixes this endless recursion by removing the local defition. + +Signed-off-by: Kurt Van Dijck +--- + eibd/usb/linux_usbfs.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/eibd/usb/linux_usbfs.c b/eibd/usb/linux_usbfs.c +index c3ec410..957b908 100644 +--- a/eibd/usb/linux_usbfs.c ++++ b/eibd/usb/linux_usbfs.c +@@ -52,12 +52,6 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex) + return 0; + } + +-int clock_gettime(clockid_t clk_id, struct timespec *tp) +-{ +- pth_int_time (tp); +- return 0; +-} +- + /* sysfs vs usbfs: + * opening a usbfs node causes the device to be resumed, so we attempt to + * avoid this during enumeration. +-- +1.8.5.rc3 + From 451d115adda2585d86f2b329a0d410d4ab078f4d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 30 Aug 2017 12:47:43 -0300 Subject: [PATCH 3255/3392] linux-headers: bump 4.{4, 9, 12}.x series [Peter: drop 4.12.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 10b1273264ea6a61fe29a8767f2721144f23117f) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7462e28549..d4b40b92b6 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.43" if BR2_KERNEL_HEADERS_4_1 - default "4.4.84" if BR2_KERNEL_HEADERS_4_4 + default "4.4.85" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.45" if BR2_KERNEL_HEADERS_4_9 + default "4.9.46" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 1519ba33f5f85f4e5e49ec8318886468b8ca788f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 30 Aug 2017 15:01:04 +0300 Subject: [PATCH 3256/3392] gnupg: security bump to version 1.4.22 Mitigate a flush+reload side-channel attack on RSA secret keys dubbed "Sliding right into disaster". For details see . [CVE-2017-7526] Switch to https site for better firewall compatibility and security. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 453ca1d6ad6aa3d55f44734ed8479ac5fa909d8a) Signed-off-by: Peter Korsgaard --- package/gnupg/gnupg.hash | 7 +++---- package/gnupg/gnupg.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/gnupg/gnupg.hash b/package/gnupg/gnupg.hash index 8968b00d2b..abd76cde9c 100644 --- a/package/gnupg/gnupg.hash +++ b/package/gnupg/gnupg.hash @@ -1,4 +1,3 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2016-08/msg00008.html -sha1 e3bdb585026f752ae91360f45c28e76e4a15d338 gnupg-1.4.21.tar.bz2 -# Locally computed -sha256 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276 gnupg-1.4.21.tar.bz2 +# Locally computed based on signature +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-1.4.22.tar.bz2.sig +sha256 9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4 gnupg-1.4.22.tar.bz2 diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk index 182abd6709..29c46669e5 100644 --- a/package/gnupg/gnupg.mk +++ b/package/gnupg/gnupg.mk @@ -4,9 +4,9 @@ # ################################################################################ -GNUPG_VERSION = 1.4.21 +GNUPG_VERSION = 1.4.22 GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2 -GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg +GNUPG_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG_LICENSE = GPLv3+ GNUPG_LICENSE_FILES = COPYING GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv) From 6f107edbef07fe5280e690dffe8332923cfd2b7f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 30 Aug 2017 19:07:03 +0300 Subject: [PATCH 3257/3392] libgcrypt: security bump to version 1.7.9 Fixes CVE-2017-0379: Mitigate a local side-channel attack on Curve25519 dubbed "May the Fourth be With You". As we are close to release, don't update to the latest 1.8.1 version, but to a maintenance release from the 1.7 branch. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit cd4514109a6bd248d6ca7713d97e3b257ae91c6f) Signed-off-by: Peter Korsgaard --- package/libgcrypt/libgcrypt.hash | 6 ++---- package/libgcrypt/libgcrypt.mk | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 8ac9f0a92b..56a45c5398 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,5 +1,3 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q2/000408.html -sha1 65a4a495aa858483e66868199eaa8238572ca6cd libgcrypt-1.7.8.tar.bz2 # Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.8.tar.bz2.sig -sha256 948276ea47e6ba0244f36a17b51dcdd52cfd1e664b0a1ac3bc82134fb6cec199 libgcrypt-1.7.8.tar.bz2 +# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.9.tar.bz2.sig +sha256 bfe9bb703c1126c3647da2810fd23039c2f09d46969f71612c2065dc3fa9373b libgcrypt-1.7.9.tar.bz2 diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index c18456eaaf..0e428a78ed 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.7.8 +LIBGCRYPT_VERSION = 1.7.9 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPLv2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB From 6866015b7017c07a782c3eeb14e7ec90fff31ff8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 30 Aug 2017 21:25:41 +0200 Subject: [PATCH 3258/3392] package/linux-tools: gpio does not build in parallel Partially fixes #10276. Reported-by: Ciro Santilli Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Ciro Santilli Signed-off-by: Thomas Petazzoni (cherry picked from commit 4a03d1ac29fbd5d67145a7ee4631fd38163939ae) Signed-off-by: Peter Korsgaard --- package/linux-tools/linux-tool-gpio.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-tools/linux-tool-gpio.mk b/package/linux-tools/linux-tool-gpio.mk index ba75ab4c3f..d5a0dbda38 100644 --- a/package/linux-tools/linux-tool-gpio.mk +++ b/package/linux-tools/linux-tool-gpio.mk @@ -15,13 +15,13 @@ define GPIO_BUILD_CMDS exit 1 ; \ fi - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools \ $(GPIO_MAKE_OPTS) \ gpio endef define GPIO_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools \ $(GPIO_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) \ gpio_install From f9064cb3b1d16cb299db656ef6807dc88cf1bc90 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Wed, 30 Aug 2017 03:47:56 +0200 Subject: [PATCH 3259/3392] grub2: force -fno-stack-protector in CFLAGS grub2 fails to configure when BR2_SSP_ALL is enabled, with the following configure error: checking whether -fno-asynchronous-unwind-tables works... yes checking whether -fno-unwind-tables works... yes checking for target linking format... unknown configure: error: no suitable link format found This can be worked around by enforcing -fno-stack-protector in the package CFLAGS in a way that overrides the SSP flag, as is already done for the valgrind package. Fixes bug #10261. Signed-off-by: Erico Nunes Reported-by: Dr I J Ormshaw Signed-off-by: Thomas Petazzoni (cherry picked from commit 2a27294e9ade6130a12ced9a1f152c51431a870e) Signed-off-by: Peter Korsgaard --- boot/grub2/grub2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index dc4e51ea8e..373bce1cb2 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -53,7 +53,7 @@ GRUB2_CONF_ENV = \ $(HOST_CONFIGURE_OPTS) \ CPP="$(HOSTCC) -E" \ TARGET_CC="$(TARGET_CC)" \ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ + TARGET_CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" \ TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ NM="$(TARGET_NM)" \ From ac5da5e315d2cc7c40ee4644d1aa386e83b35ee8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 10 Jul 2017 19:51:37 +0200 Subject: [PATCH 3260/3392] package/transmission: fix gtk support Gtk support is controlled by ARG_WITH since https://github.com/transmission/transmission/commit/2ccc2bbbfe2e4a26dfeaa13b56c412ea0af4ebe4 Fixes a build error if libgtk2/3 was built before transmission: http://autobuild.buildroot.net/results/6b6/6b6ce352a9edfe3aaba82be143092a878e7715ed/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit e67fbcfa94e58a4d04e081be5e318953233492c8) Signed-off-by: Peter Korsgaard --- package/transmission/transmission.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index f4b0d71a42..6b8e12e465 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -82,10 +82,10 @@ TRANSMISSION_CONF_OPTS += --disable-remote endif ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y) -TRANSMISSION_CONF_OPTS += --enable-gtk +TRANSMISSION_CONF_OPTS += --with-gtk TRANSMISSION_DEPENDENCIES += libgtk2 else -TRANSMISSION_CONF_OPTS += --disable-gtk +TRANSMISSION_CONF_OPTS += --without-gtk endif $(eval $(autotools-package)) From 1aeb48b66ff43e4c6f5015fb6b03bbc0302e2c67 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 2 Sep 2017 00:37:48 +0200 Subject: [PATCH 3261/3392] transmission: gtk option needs libgtk3 Fixes the following configure issue: checking for GTK... no configure: error: Package requirements (gtk+-3.0 >= 3.4.0 glib-2.0 >= 2.32.0 gio-2.0 >= 2.26.0, gmodule-2.0 >= 2.32.0 gthread-2.0 >= 2.32.0) were not met: libgtk2 support was dropped in commit cdd71c642724 ((trunk gtk) #4970 remove deprecated GTK+ API calls, raise GTK+ dependency to 3.2) which was part of transmission-2.61. Signed-off-by: Peter Korsgaard (cherry picked from commit a2935ee28886b5198093c824c4ee4892d02d10c6) Signed-off-by: Peter Korsgaard --- package/transmission/Config.in | 4 ++-- package/transmission/transmission.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/transmission/Config.in b/package/transmission/Config.in index b47c36fdd3..38a459cdbe 100644 --- a/package/transmission/Config.in +++ b/package/transmission/Config.in @@ -39,12 +39,12 @@ config BR2_PACKAGE_TRANSMISSION_REMOTE config BR2_PACKAGE_TRANSMISSION_GTK bool "transmission-gtk" - depends on BR2_PACKAGE_LIBGTK2 && BR2_ENABLE_LOCALE + depends on BR2_PACKAGE_LIBGTK3 && BR2_ENABLE_LOCALE help Install transmission GTK-based GUI interface. comment "transmission-gtk needs a toolchain w/ locale" - depends on BR2_PACKAGE_LIBGTK2 && !BR2_ENABLE_LOCALE + depends on BR2_PACKAGE_LIBGTK3 && !BR2_ENABLE_LOCALE endif comment "transmission needs a toolchain w/ threads" diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk index 6b8e12e465..e4a36805c2 100644 --- a/package/transmission/transmission.mk +++ b/package/transmission/transmission.mk @@ -83,7 +83,7 @@ endif ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y) TRANSMISSION_CONF_OPTS += --with-gtk -TRANSMISSION_DEPENDENCIES += libgtk2 +TRANSMISSION_DEPENDENCIES += libgtk3 else TRANSMISSION_CONF_OPTS += --without-gtk endif From 146c38cfcf5fac67f98abd2e612d2a0a617ccd86 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 2 Sep 2017 15:31:43 +0200 Subject: [PATCH 3262/3392] linux-headers: bump 4.{4, 9}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit fa46a89fe06aa1039274d7fb2408ee76cf137c97) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index d4b40b92b6..67f9570bae 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.43" if BR2_KERNEL_HEADERS_4_1 - default "4.4.85" if BR2_KERNEL_HEADERS_4_4 + default "4.4.86" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.46" if BR2_KERNEL_HEADERS_4_9 + default "4.9.47" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From f16d9637896b79fdfb2a86856d45e60c9d7b9d1d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2017 08:20:08 -0400 Subject: [PATCH 3263/3392] libxml2: security bump to version 2.9.5 Fixes CVE-2017-9049, CVE-2017-9050, CVE-2017-9047, CVE-2017-9048, CVE-2017-5969. Signed-off-by: Adam Duskett [Thomas: improved commit log, from Baruch suggestion.] Signed-off-by: Thomas Petazzoni (cherry picked from commit d8bc440e3a6cd7245374c7d905911361987cb2f8) Signed-off-by: Peter Korsgaard --- ...ointer-paths-beginning-with-range-to.patch | 178 ------------ ...w-namespace-nodes-in-XPointer-ranges.patch | 253 ------------------ package/libxml2/libxml2.hash | 2 +- package/libxml2/libxml2.mk | 2 +- 4 files changed, 2 insertions(+), 433 deletions(-) delete mode 100644 package/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch delete mode 100644 package/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch diff --git a/package/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch b/package/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch deleted file mode 100644 index 42570c6350..0000000000 --- a/package/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 9ab01a277d71f54d3143c2cf333c5c2e9aaedd9e Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Tue, 28 Jun 2016 14:22:23 +0200 -Subject: [PATCH] Fix XPointer paths beginning with range-to - -The old code would invoke the broken xmlXPtrRangeToFunction. range-to -isn't really a function but a special kind of location step. Remove -this function and always handle range-to in the XPath code. - -The old xmlXPtrRangeToFunction could also be abused to trigger a -use-after-free error with the potential for remote code execution. - -Found with afl-fuzz. - -Fixes CVE-2016-5131. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit 9ab01a277d7 - - result/XPath/xptr/vidbase | 13 ++++++++ - test/XPath/xptr/vidbase | 1 + - xpath.c | 7 ++++- - xpointer.c | 76 ++++------------------------------------------- - 4 files changed, 26 insertions(+), 71 deletions(-) - -diff --git a/result/XPath/xptr/vidbase b/result/XPath/xptr/vidbase -index 8b9e92d66d97..f19193e70edb 100644 ---- a/result/XPath/xptr/vidbase -+++ b/result/XPath/xptr/vidbase -@@ -17,3 +17,16 @@ Object is a Location Set: - To node - ELEMENT p - -+ -+======================== -+Expression: xpointer(range-to(id('chapter2'))) -+Object is a Location Set: -+1 : Object is a range : -+ From node -+ / -+ To node -+ ELEMENT chapter -+ ATTRIBUTE id -+ TEXT -+ content=chapter2 -+ -diff --git a/test/XPath/xptr/vidbase b/test/XPath/xptr/vidbase -index b1463830570a..884b1065d7fd 100644 ---- a/test/XPath/xptr/vidbase -+++ b/test/XPath/xptr/vidbase -@@ -1,2 +1,3 @@ - xpointer(id('chapter1')/p) - xpointer(id('chapter1')/p[1]/range-to(following-sibling::p[2])) -+xpointer(range-to(id('chapter2'))) -diff --git a/xpath.c b/xpath.c -index d992841ef0c2..5a01b1b399a2 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -10691,13 +10691,18 @@ xmlXPathCompPathExpr(xmlXPathParserContextPtr ctxt) { - lc = 1; - break; - } else if ((NXT(len) == '(')) { -- /* Note Type or Function */ -+ /* Node Type or Function */ - if (xmlXPathIsNodeType(name)) { - #ifdef DEBUG_STEP - xmlGenericError(xmlGenericErrorContext, - "PathExpr: Type search\n"); - #endif - lc = 1; -+#ifdef LIBXML_XPTR_ENABLED -+ } else if (ctxt->xptr && -+ xmlStrEqual(name, BAD_CAST "range-to")) { -+ lc = 1; -+#endif - } else { - #ifdef DEBUG_STEP - xmlGenericError(xmlGenericErrorContext, -diff --git a/xpointer.c b/xpointer.c -index 676c5105837a..d74174a318f1 100644 ---- a/xpointer.c -+++ b/xpointer.c -@@ -1332,8 +1332,6 @@ xmlXPtrNewContext(xmlDocPtr doc, xmlNodePtr here, xmlNodePtr origin) { - ret->here = here; - ret->origin = origin; - -- xmlXPathRegisterFunc(ret, (xmlChar *)"range-to", -- xmlXPtrRangeToFunction); - xmlXPathRegisterFunc(ret, (xmlChar *)"range", - xmlXPtrRangeFunction); - xmlXPathRegisterFunc(ret, (xmlChar *)"range-inside", -@@ -2243,76 +2241,14 @@ xmlXPtrRangeInsideFunction(xmlXPathParserContextPtr ctxt, int nargs) { - * @nargs: the number of args - * - * Implement the range-to() XPointer function -+ * -+ * Obsolete. range-to is not a real function but a special type of location -+ * step which is handled in xpath.c. - */ - void --xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, int nargs) { -- xmlXPathObjectPtr range; -- const xmlChar *cur; -- xmlXPathObjectPtr res, obj; -- xmlXPathObjectPtr tmp; -- xmlLocationSetPtr newset = NULL; -- xmlNodeSetPtr oldset; -- int i; -- -- if (ctxt == NULL) return; -- CHECK_ARITY(1); -- /* -- * Save the expression pointer since we will have to evaluate -- * it multiple times. Initialize the new set. -- */ -- CHECK_TYPE(XPATH_NODESET); -- obj = valuePop(ctxt); -- oldset = obj->nodesetval; -- ctxt->context->node = NULL; -- -- cur = ctxt->cur; -- newset = xmlXPtrLocationSetCreate(NULL); -- -- for (i = 0; i < oldset->nodeNr; i++) { -- ctxt->cur = cur; -- -- /* -- * Run the evaluation with a node list made of a single item -- * in the nodeset. -- */ -- ctxt->context->node = oldset->nodeTab[i]; -- tmp = xmlXPathNewNodeSet(ctxt->context->node); -- valuePush(ctxt, tmp); -- -- xmlXPathEvalExpr(ctxt); -- CHECK_ERROR; -- -- /* -- * The result of the evaluation need to be tested to -- * decided whether the filter succeeded or not -- */ -- res = valuePop(ctxt); -- range = xmlXPtrNewRangeNodeObject(oldset->nodeTab[i], res); -- if (range != NULL) { -- xmlXPtrLocationSetAdd(newset, range); -- } -- -- /* -- * Cleanup -- */ -- if (res != NULL) -- xmlXPathFreeObject(res); -- if (ctxt->value == tmp) { -- res = valuePop(ctxt); -- xmlXPathFreeObject(res); -- } -- -- ctxt->context->node = NULL; -- } -- -- /* -- * The result is used as the new evaluation set. -- */ -- xmlXPathFreeObject(obj); -- ctxt->context->node = NULL; -- ctxt->context->contextSize = -1; -- ctxt->context->proximityPosition = -1; -- valuePush(ctxt, xmlXPtrWrapLocationSet(newset)); -+xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, -+ int nargs ATTRIBUTE_UNUSED) { -+ XP_ERROR(XPATH_EXPR_ERROR); - } - - /** --- -2.10.2 - diff --git a/package/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch b/package/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch deleted file mode 100644 index 45c1a07ca4..0000000000 --- a/package/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch +++ /dev/null @@ -1,253 +0,0 @@ -From c1d1f7121194036608bf555f08d3062a36fd344b Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Tue, 28 Jun 2016 18:34:52 +0200 -Subject: [PATCH] Disallow namespace nodes in XPointer ranges - -Namespace nodes must be copied to avoid use-after-free errors. -But they don't necessarily have a physical representation in a -document, so simply disallow them in XPointer ranges. - -Found with afl-fuzz. - -Fixes CVE-2016-4658. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit c1d1f712119403 - - xpointer.c | 149 +++++++++++++++++++++++-------------------------------------- - 1 file changed, 56 insertions(+), 93 deletions(-) - -diff --git a/xpointer.c b/xpointer.c -index a7b03fbdae16..694d120e2e0b 100644 ---- a/xpointer.c -+++ b/xpointer.c -@@ -320,6 +320,45 @@ xmlXPtrRangesEqual(xmlXPathObjectPtr range1, xmlXPathObjectPtr range2) { - } - - /** -+ * xmlXPtrNewRangeInternal: -+ * @start: the starting node -+ * @startindex: the start index -+ * @end: the ending point -+ * @endindex: the ending index -+ * -+ * Internal function to create a new xmlXPathObjectPtr of type range -+ * -+ * Returns the newly created object. -+ */ -+static xmlXPathObjectPtr -+xmlXPtrNewRangeInternal(xmlNodePtr start, int startindex, -+ xmlNodePtr end, int endindex) { -+ xmlXPathObjectPtr ret; -+ -+ /* -+ * Namespace nodes must be copied (see xmlXPathNodeSetDupNs). -+ * Disallow them for now. -+ */ -+ if ((start != NULL) && (start->type == XML_NAMESPACE_DECL)) -+ return(NULL); -+ if ((end != NULL) && (end->type == XML_NAMESPACE_DECL)) -+ return(NULL); -+ -+ ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -+ if (ret == NULL) { -+ xmlXPtrErrMemory("allocating range"); -+ return(NULL); -+ } -+ memset(ret, 0, sizeof(xmlXPathObject)); -+ ret->type = XPATH_RANGE; -+ ret->user = start; -+ ret->index = startindex; -+ ret->user2 = end; -+ ret->index2 = endindex; -+ return(ret); -+} -+ -+/** - * xmlXPtrNewRange: - * @start: the starting node - * @startindex: the start index -@@ -344,17 +383,7 @@ xmlXPtrNewRange(xmlNodePtr start, int startindex, - if (endindex < 0) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = startindex; -- ret->user2 = end; -- ret->index2 = endindex; -+ ret = xmlXPtrNewRangeInternal(start, startindex, end, endindex); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -381,17 +410,8 @@ xmlXPtrNewRangePoints(xmlXPathObjectPtr start, xmlXPathObjectPtr end) { - if (end->type != XPATH_POINT) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start->user; -- ret->index = start->index; -- ret->user2 = end->user; -- ret->index2 = end->index; -+ ret = xmlXPtrNewRangeInternal(start->user, start->index, end->user, -+ end->index); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -416,17 +436,7 @@ xmlXPtrNewRangePointNode(xmlXPathObjectPtr start, xmlNodePtr end) { - if (start->type != XPATH_POINT) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start->user; -- ret->index = start->index; -- ret->user2 = end; -- ret->index2 = -1; -+ ret = xmlXPtrNewRangeInternal(start->user, start->index, end, -1); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -453,17 +463,7 @@ xmlXPtrNewRangeNodePoint(xmlNodePtr start, xmlXPathObjectPtr end) { - if (end->type != XPATH_POINT) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- ret->user2 = end->user; -- ret->index2 = end->index; -+ ret = xmlXPtrNewRangeInternal(start, -1, end->user, end->index); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -486,17 +486,7 @@ xmlXPtrNewRangeNodes(xmlNodePtr start, xmlNodePtr end) { - if (end == NULL) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- ret->user2 = end; -- ret->index2 = -1; -+ ret = xmlXPtrNewRangeInternal(start, -1, end, -1); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -516,17 +506,7 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) { - if (start == NULL) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- ret->user2 = NULL; -- ret->index2 = -1; -+ ret = xmlXPtrNewRangeInternal(start, -1, NULL, -1); - return(ret); - } - -@@ -541,6 +521,8 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) { - */ - xmlXPathObjectPtr - xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { -+ xmlNodePtr endNode; -+ int endIndex; - xmlXPathObjectPtr ret; - - if (start == NULL) -@@ -549,7 +531,12 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { - return(NULL); - switch (end->type) { - case XPATH_POINT: -+ endNode = end->user; -+ endIndex = end->index; -+ break; - case XPATH_RANGE: -+ endNode = end->user2; -+ endIndex = end->index2; - break; - case XPATH_NODESET: - /* -@@ -557,39 +544,15 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { - */ - if (end->nodesetval->nodeNr <= 0) - return(NULL); -+ endNode = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; -+ endIndex = -1; - break; - default: - /* TODO */ - return(NULL); - } - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- switch (end->type) { -- case XPATH_POINT: -- ret->user2 = end->user; -- ret->index2 = end->index; -- break; -- case XPATH_RANGE: -- ret->user2 = end->user2; -- ret->index2 = end->index2; -- break; -- case XPATH_NODESET: { -- ret->user2 = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; -- ret->index2 = -1; -- break; -- } -- default: -- STRANGE -- return(NULL); -- } -+ ret = xmlXPtrNewRangeInternal(start, -1, endNode, endIndex); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } --- -2.10.2 - diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 098121e117..7f9e7dbd3f 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c libxml2-2.9.4.tar.gz +sha256 4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38 libxml2-2.9.5.tar.gz diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 2a7153ad17..a6e1c3908b 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXML2_VERSION = 2.9.4 +LIBXML2_VERSION = 2.9.5 LIBXML2_SITE = ftp://xmlsoft.org/libxml2 LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT From 0e3334e25b9b1ef853a83c3ab67822a88ee97842 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Sep 2017 08:20:10 -0400 Subject: [PATCH 3264/3392] postgresql: security bump to version 9.6.5 Fixes the following security issues (9.6.4): CVE-2017-7546: Empty password accepted in some authentication methods CVE-2017-7547: The "pg_user_mappings" catalog view discloses passwords to users lacking server privileges CVE-2017-7548: lo_put() function ignores ACLs For more info, see https://www.postgresql.org/about/news/1772/ [Peter: extend commit message with security fixes info] Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 95e284bd2732390eb34cb72c798032fd7ac8920c) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index c65edf71da..62ce9a7407 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,2 +1,2 @@ -# From https://ftp.postgresql.org/pub/source/v9.6.3/postgresql-9.6.3.tar.bz2.sha256 -sha256 1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6 postgresql-9.6.3.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v9.6.5/postgresql-9.6.5.tar.bz2.sha256 +sha256 06da12a7e3dddeb803962af8309fa06da9d6989f49e22865335f0a14bad0744c postgresql-9.6.5.tar.bz2 diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 62b41cbeaa..7adb957cf0 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 9.6.3 +POSTGRESQL_VERSION = 9.6.5 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From f6a90941032547c102b37add8f6cdfb3835086fb Mon Sep 17 00:00:00 2001 From: Julien Corjon Date: Tue, 5 Sep 2017 11:54:56 +0200 Subject: [PATCH 3265/3392] package/netplug: init script create needed lock directory Init script use /var/lock/subsys/netplugd but directory /var/lock/subsys can be missing. Signed-off-by: Julien Corjon Signed-off-by: Thomas Petazzoni (cherry picked from commit c81c6d8f3d5bdf1825acaa27428c9e25def48593) Signed-off-by: Peter Korsgaard --- package/netplug/S29netplug | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/netplug/S29netplug b/package/netplug/S29netplug index 88f933d556..d3df9ddff5 100755 --- a/package/netplug/S29netplug +++ b/package/netplug/S29netplug @@ -11,6 +11,9 @@ # Copyright 2003 Key Research, Inc. +# Create needed directories +mkdir -p /var/lock/subsys + # Source function library. if [ -f /etc/init.d/functions ]; then . /etc/init.d/functions From a5546941452fedadc01c70d2c6212ba0bfddccc5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 6 Sep 2017 14:54:55 +0200 Subject: [PATCH 3266/3392] linux-headers: bump 3.18.x version to 3.18.69 Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 67f9570bae..986b3b0484 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,7 +218,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.107" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "3.18.61" if BR2_KERNEL_HEADERS_3_18 + default "3.18.69" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.43" if BR2_KERNEL_HEADERS_4_1 From c357dd607b403c2b016e51d8fc4609f854e41fee Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 5 Sep 2017 15:41:29 -0700 Subject: [PATCH 3267/3392] package/binutils: fix crash caused by buggy xtensa overlay In some xtensa configurations there may be system/user registers in xtensa-modules with negative index. ISA initialization for such config may clobber heap and result in program termination. Don't update lookup table entries for register with negative indices. Signed-off-by: Max Filippov Signed-off-by: Peter Korsgaard --- ...-memory-corruption-by-broken-sysregs.patch | 42 +++++++++++++++++++ ...-memory-corruption-by-broken-sysregs.patch | 42 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 package/binutils/2.25.1/131-xtensa-fix-memory-corruption-by-broken-sysregs.patch create mode 100644 package/binutils/2.26.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch diff --git a/package/binutils/2.25.1/131-xtensa-fix-memory-corruption-by-broken-sysregs.patch b/package/binutils/2.25.1/131-xtensa-fix-memory-corruption-by-broken-sysregs.patch new file mode 100644 index 0000000000..30103ee05e --- /dev/null +++ b/package/binutils/2.25.1/131-xtensa-fix-memory-corruption-by-broken-sysregs.patch @@ -0,0 +1,42 @@ +From 3c8788dbb70b40e737d4b8e30cab81406e5c5091 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Wed, 2 Aug 2017 00:36:05 -0700 +Subject: [PATCH] xtensa: fix memory corruption by broken sysregs + +In some xtensa configurations there may be system/user registers in +xtensa-modules with negative index. ISA initialization for such config +may clobber heap and result in program termination. +Don't update lookup table entries for register with negative indices. +They are not directly accessible via RSR/WSR/XSR or RUR/WUR, so this +change should not affect processing of valid assembly/binary code. + +bfd/ +2017-08-02 Max Filippov + + * xtensa-isa.c (xtensa_isa_init): Don't update lookup table + entries for sysregs with negative indices. + +Signed-off-by: Max Filippov +--- +Backported from: d84ed528d4817b0ff854006b65a9f6ec75f0407a + + bfd/xtensa-isa.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c +index 8da75bea8109..8c6ee88fdeae 100644 +--- a/bfd/xtensa-isa.c ++++ b/bfd/xtensa-isa.c +@@ -292,7 +292,8 @@ xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p) + xtensa_sysreg_internal *sreg = &isa->sysregs[n]; + is_user = sreg->is_user; + +- isa->sysreg_table[is_user][sreg->number] = n; ++ if (sreg->number >= 0) ++ isa->sysreg_table[is_user][sreg->number] = n; + } + + /* Set up the interface lookup table. */ +-- +2.1.4 + diff --git a/package/binutils/2.26.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch b/package/binutils/2.26.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch new file mode 100644 index 0000000000..30103ee05e --- /dev/null +++ b/package/binutils/2.26.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch @@ -0,0 +1,42 @@ +From 3c8788dbb70b40e737d4b8e30cab81406e5c5091 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Wed, 2 Aug 2017 00:36:05 -0700 +Subject: [PATCH] xtensa: fix memory corruption by broken sysregs + +In some xtensa configurations there may be system/user registers in +xtensa-modules with negative index. ISA initialization for such config +may clobber heap and result in program termination. +Don't update lookup table entries for register with negative indices. +They are not directly accessible via RSR/WSR/XSR or RUR/WUR, so this +change should not affect processing of valid assembly/binary code. + +bfd/ +2017-08-02 Max Filippov + + * xtensa-isa.c (xtensa_isa_init): Don't update lookup table + entries for sysregs with negative indices. + +Signed-off-by: Max Filippov +--- +Backported from: d84ed528d4817b0ff854006b65a9f6ec75f0407a + + bfd/xtensa-isa.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c +index 8da75bea8109..8c6ee88fdeae 100644 +--- a/bfd/xtensa-isa.c ++++ b/bfd/xtensa-isa.c +@@ -292,7 +292,8 @@ xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p) + xtensa_sysreg_internal *sreg = &isa->sysregs[n]; + is_user = sreg->is_user; + +- isa->sysreg_table[is_user][sreg->number] = n; ++ if (sreg->number >= 0) ++ isa->sysreg_table[is_user][sreg->number] = n; + } + + /* Set up the interface lookup table. */ +-- +2.1.4 + From 51be260e88916aedef39893c0388375850a4f07c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 15 Feb 2017 15:09:41 -0300 Subject: [PATCH 3268/3392] file: bump to version 5.30 Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni (cherry picked from commit ac82e0ebada7efef4d7fbc4ce3de4748808c00b4) Signed-off-by: Peter Korsgaard --- package/file/file.hash | 2 +- package/file/file.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/file/file.hash b/package/file/file.hash index 9a4c9f1197..3fafff8e7b 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0 file-5.29.tar.gz +sha256 694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214 file-5.30.tar.gz diff --git a/package/file/file.mk b/package/file/file.mk index 39d1781ff0..2fa6804fbf 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.29 +FILE_VERSION = 5.30 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib From fae25a1d216b5b4c1d48c7e6c06f8b87abbc547a Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 25 May 2017 10:33:24 +0100 Subject: [PATCH 3269/3392] file: bump version to 5.31 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit e173bbe958ef7ef51400fe0c0d9b2deb7d89f7aa) Signed-off-by: Peter Korsgaard --- package/file/file.hash | 2 +- package/file/file.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/file/file.hash b/package/file/file.hash index 3fafff8e7b..dcf96ecb27 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214 file-5.30.tar.gz +sha256 09c588dac9cff4baa054f51a36141793bcf64926edc909594111ceae60fce4ee file-5.31.tar.gz diff --git a/package/file/file.mk b/package/file/file.mk index 2fa6804fbf..4b86f80125 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.30 +FILE_VERSION = 5.31 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib From d3463a9907ecd3a64e6ad1c41d4b5c8f983e12ce Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 6 Sep 2017 16:00:37 +0200 Subject: [PATCH 3270/3392] file: security bump to version 5.32 Fixes CVE-2017-1000249 - Stack buffer overflow with a specially crafted .notes section in an ELF binary file. For more details, see: http://www.openwall.com/lists/oss-security/2017/09/05/3 Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 89a38e6397fb316792da19fbde4bfa4f9c43fb52) Signed-off-by: Peter Korsgaard --- package/file/file.hash | 2 +- package/file/file.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/file/file.hash b/package/file/file.hash index dcf96ecb27..fee516c8e2 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 09c588dac9cff4baa054f51a36141793bcf64926edc909594111ceae60fce4ee file-5.31.tar.gz +sha256 8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50 file-5.32.tar.gz diff --git a/package/file/file.mk b/package/file/file.mk index 4b86f80125..26d3c5f208 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.31 +FILE_VERSION = 5.32 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib From 6f4428337e0c0d0fe03efb781c69508225f087a8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 6 Sep 2017 17:40:39 +0200 Subject: [PATCH 3271/3392] subversion: security bump to version 1.9.7 Fixes CVE-2017-9800: Arbitrary code execution on clients through malicious svn+ssh URLs in svn:externals and svn:sync-from-url For more details, see http://subversion.apache.org/security/CVE-2017-9800-advisory.txt Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit c6b793779c32120bc9ff9334aad4d772d6ee49f1) Signed-off-by: Peter Korsgaard --- package/subversion/subversion.hash | 7 +++---- package/subversion/subversion.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/subversion/subversion.hash b/package/subversion/subversion.hash index 1a85961fe1..6adb57c1ae 100644 --- a/package/subversion/subversion.hash +++ b/package/subversion/subversion.hash @@ -1,5 +1,4 @@ # From http://subversion.apache.org/download.cgi#recommended-release -sha1 8bd6a44a1aed30c4c6b6b068488dafb44eaa6adf subversion-1.9.5.tar.bz2 -# Locally calculated after checking PGP signature -# https://www.apache.org/dist/subversion/subversion-1.9.5.tar.bz2.asc -sha256 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5 subversion-1.9.5.tar.bz2 +sha1 874b81749cdc3e88152d103243c3623ac6338388 subversion-1.9.7.tar.bz2 +# From https://www.apache.org/dist/subversion/subversion-1.9.7.tar.bz2.sha512 +sha512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b subversion-1.9.7.tar.bz2 diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk index 05569c11a7..55738a826d 100644 --- a/package/subversion/subversion.mk +++ b/package/subversion/subversion.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUBVERSION_VERSION = 1.9.5 +SUBVERSION_VERSION = 1.9.7 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = http://mirror.catn.com/pub/apache/subversion SUBVERSION_LICENSE = Apache-2.0 From 4a944b6a2d3ee42bc5b1629816c4aeec146841cf Mon Sep 17 00:00:00 2001 From: Olivier Schonken Date: Mon, 28 Aug 2017 15:54:35 +0200 Subject: [PATCH 3272/3392] openjpeg: security bump to version 2.2.0 Fixes the following security issues: CVE-2016-10504: Heap-based buffer overflow vulnerability in the opj_mqc_byteout function in mqc.c in OpenJPEG before 2.2.0 allows remote attackers to cause a denial of service (application crash) via a crafted bmp file. CVE-2016-10505: NULL pointer dereference vulnerabilities in the imagetopnm function in convert.c, sycc444_to_rgb function in color.c, color_esycc_to_rgb function in color.c, and sycc422_to_rgb function in color.c in OpenJPEG before 2.2.0 allow remote attackers to cause a denial of service (application crash) via crafted j2k files. CVE-2016-10506: Division-by-zero vulnerabilities in the functions opj_pi_next_cprl, opj_pi_next_pcrl, and opj_pi_next_rpcl in pi.c in OpenJPEG before 2.2.0 allow remote attackers to cause a denial of service (application crash) via crafted j2k files. CVE-2016-10507: Integer overflow vulnerability in the bmp24toimage function in convertbmp.c in OpenJPEG before 2.2.0 allows remote attackers to cause a denial of service (heap-based buffer over-read and application crash) via a crafted bmp file. [Peter: extend commit message with security fixes info] Signed-off-by: Olivier Schonken Signed-off-by: Thomas Petazzoni (cherry picked from commit 37b2fe73cff726ac05cdb200e803f267a48721f9) Signed-off-by: Peter Korsgaard --- package/openjpeg/openjpeg.hash | 2 +- package/openjpeg/openjpeg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash index c0abd0c54d..0e51aaec5e 100644 --- a/package/openjpeg/openjpeg.hash +++ b/package/openjpeg/openjpeg.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7 openjpeg-2.1.2.tar.gz +sha256 6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b openjpeg-2.2.0.tar.gz diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index ca22068113..e67171305f 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENJPEG_VERSION = 2.1.2 +OPENJPEG_VERSION = 2.2.0 OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2c OPENJPEG_LICENSE_FILES = LICENSE From 0f6388e374a791d8e9f09434f75481702978c2e1 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 5 Sep 2017 22:05:26 +0300 Subject: [PATCH 3273/3392] mbedtls: security bump to version 2.6.0 Fixes CVE-2017-14032: authentication bypass. https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2017-02 Add license hash. Cc: Gustavo Zacarias Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit aa70897e292dc5a97a2ec99db3fe3f2b9aeea33b) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 7 +++++-- package/mbedtls/mbedtls.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 70a0dc506d..d04b867754 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,2 +1,5 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.4.2-2.1.7-and-1.3.19-released -sha256 17dd98af7478aadacc480c7e4159e447353b5b2037c1b6d48ed4fd157fb1b018 mbedtls-2.4.2-apache.tgz +# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.6.0-2.1.9-and-1.3.21-released +sha1 e914288da50977f541773f9d36e26f14926594a5 mbedtls-2.6.0-apache.tgz +sha256 99bc9d4212d3d885eeb96273bcde8ecc649a481404b8d7ea7bb26397c9909687 mbedtls-2.6.0-apache.tgz +# Locally calculated +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index a571ed0e52..64ce18cf6f 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -5,7 +5,7 @@ ################################################################################ MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.4.2 +MBEDTLS_VERSION = 2.6.0 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz MBEDTLS_CONF_OPTS = \ -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ From 8a673badcb1ec994b8fb8dd1891de4f3de0fc5fb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 21 May 2017 20:14:09 +0200 Subject: [PATCH 3274/3392] package/botan: security bump to version 1.10.16 Fixes CVE-2017-2801: A programming error exists in a way Randombit Botan cryptographic library version 2.0.1 implements x500 string comparisons which could lead to certificate verification issues and abuse. A specially crafted X509 certificate would need to be delivered to the client or server application in order to trigger this vulnerability. [Peter: extend commit message with security fixes info] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 033aa8d4e9ad13ee56dbb372ad45a7d83bca4f53) Signed-off-by: Peter Korsgaard --- package/botan/botan.hash | 2 +- package/botan/botan.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 3da5f690ce..3d46a13584 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90 Botan-1.10.13.tgz +sha256 6c5472401d06527e87adcb53dd270f3c9b1fb688703b04dd7a7cfb86289efe52 Botan-1.10.16.tgz diff --git a/package/botan/botan.mk b/package/botan/botan.mk index fc8fa698e4..282955245b 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 1.10.13 +BOTAN_VERSION = 1.10.16 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tgz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2c From a711d9e25b524b5b2d90d5946b3992c2d64aee1c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Sep 2017 20:23:49 +0200 Subject: [PATCH 3275/3392] linux-headers: bump 4.{4, 9, 12}.x series [Peter: drop 4.12.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 19af2fe70cf8764139bcf16e2b364126cfa2456b) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 986b3b0484..da688696a4 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.43" if BR2_KERNEL_HEADERS_4_1 - default "4.4.86" if BR2_KERNEL_HEADERS_4_4 + default "4.4.87" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.47" if BR2_KERNEL_HEADERS_4_9 + default "4.9.48" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 8681b9477bd49057214ae340d2edc4b5eb135ea8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 7 Sep 2017 21:37:40 +0200 Subject: [PATCH 3276/3392] linux-headers: bump 3.18.x version to 3.18.70 Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index da688696a4..c83e3c5f6a 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,7 +218,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.107" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "3.18.69" if BR2_KERNEL_HEADERS_3_18 + default "3.18.70" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.43" if BR2_KERNEL_HEADERS_4_1 From 8afd8781feee7a53eaa3969006615631f626a560 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Tue, 12 Sep 2017 13:52:37 -0700 Subject: [PATCH 3277/3392] package/gcc: fix ICE on xtensa, PR target/82181 Memory references to DI mode objects could incorrectly be created at offsets that are not supported by instructions l32i/s32i, resulting in ICE at a stage when access to the object is split into access to its subwords: drivers/staging/rtl8188eu/core/rtw_ap.c:445:1: internal compiler error: in change_address_1, at emit-rtl.c:2126 Fixes: https://lkml.org/lkml/2017/9/10/151 Signed-off-by: Max Filippov Signed-off-by: Peter Korsgaard --- .../875-xtensa-fix-PR-target-82181.patch | 31 +++++++++++++++++++ .../875-xtensa-fix-PR-target-82181.patch | 31 +++++++++++++++++++ .../877-xtensa-fix-PR-target-82181.patch | 31 +++++++++++++++++++ .../872-xtensa-fix-PR-target-82181.patch | 31 +++++++++++++++++++ 4 files changed, 124 insertions(+) create mode 100644 package/gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch create mode 100644 package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch create mode 100644 package/gcc/5.4.0/877-xtensa-fix-PR-target-82181.patch create mode 100644 package/gcc/6.3.0/872-xtensa-fix-PR-target-82181.patch diff --git a/package/gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch b/package/gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch new file mode 100644 index 0000000000..a6d1df997c --- /dev/null +++ b/package/gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch @@ -0,0 +1,31 @@ +From 65a3028024a5963d9b988d70fe7ebe116c731310 Mon Sep 17 00:00:00 2001 +From: jcmvbkbc +Date: Mon, 11 Sep 2017 21:53:38 +0000 +Subject: [PATCH] xtensa: fix PR target/82181 + +2017-09-11 Max Filippov +gcc/ + Backport from mainline + * config/xtensa/xtensa.c (xtensa_mem_offset): Check that both + words of DImode object are reachable by xtensa_uimm8x4 access. + +Signed-off-by: Max Filippov +--- + gcc/config/xtensa/xtensa.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index f08854729f50..4b94179636e0 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -599,6 +599,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode) + case HImode: + return xtensa_uimm8x2 (v); + ++ case DImode: + case DFmode: + return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4)); + +-- +2.1.4 + diff --git a/package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch b/package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch new file mode 100644 index 0000000000..3d7f8c1081 --- /dev/null +++ b/package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch @@ -0,0 +1,31 @@ +From 672910e3d1215b781cf0e4757e473f6a25ebf756 Mon Sep 17 00:00:00 2001 +From: jcmvbkbc +Date: Mon, 11 Sep 2017 21:53:38 +0000 +Subject: [PATCH] xtensa: fix PR target/82181 + +2017-09-11 Max Filippov +gcc/ + Backport from mainline + * config/xtensa/xtensa.c (xtensa_mem_offset): Check that both + words of DImode object are reachable by xtensa_uimm8x4 access. + +Signed-off-by: Max Filippov +--- + gcc/config/xtensa/xtensa.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 67b369f015ad..3d1d981f885d 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -612,6 +612,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode) + case HImode: + return xtensa_uimm8x2 (v); + ++ case DImode: + case DFmode: + return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4)); + +-- +2.1.4 + diff --git a/package/gcc/5.4.0/877-xtensa-fix-PR-target-82181.patch b/package/gcc/5.4.0/877-xtensa-fix-PR-target-82181.patch new file mode 100644 index 0000000000..ed91d22e56 --- /dev/null +++ b/package/gcc/5.4.0/877-xtensa-fix-PR-target-82181.patch @@ -0,0 +1,31 @@ +From 329c471661493e48e0fc65fa6c17ef86517483ed Mon Sep 17 00:00:00 2001 +From: jcmvbkbc +Date: Mon, 11 Sep 2017 21:53:38 +0000 +Subject: [PATCH] xtensa: fix PR target/82181 + +2017-09-11 Max Filippov +gcc/ + Backport from mainline + * config/xtensa/xtensa.c (xtensa_mem_offset): Check that both + words of DImode object are reachable by xtensa_uimm8x4 access. + +Signed-off-by: Max Filippov +--- + gcc/config/xtensa/xtensa.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 36ab1e370853..bf02fceb416e 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -637,6 +637,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode) + case HImode: + return xtensa_uimm8x2 (v); + ++ case DImode: + case DFmode: + return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4)); + +-- +2.1.4 + diff --git a/package/gcc/6.3.0/872-xtensa-fix-PR-target-82181.patch b/package/gcc/6.3.0/872-xtensa-fix-PR-target-82181.patch new file mode 100644 index 0000000000..c16feee1e7 --- /dev/null +++ b/package/gcc/6.3.0/872-xtensa-fix-PR-target-82181.patch @@ -0,0 +1,31 @@ +From dc90c186f755e726a097c9bb8bf6c4e7a45d8a07 Mon Sep 17 00:00:00 2001 +From: jcmvbkbc +Date: Mon, 11 Sep 2017 21:53:38 +0000 +Subject: [PATCH] xtensa: fix PR target/82181 + +2017-09-11 Max Filippov +gcc/ + Backport from mainline + * config/xtensa/xtensa.c (xtensa_mem_offset): Check that both + words of DImode object are reachable by xtensa_uimm8x4 access. + +Signed-off-by: Max Filippov +--- + gcc/config/xtensa/xtensa.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 70f698aba0ae..750b685b23e7 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -601,6 +601,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode) + case HImode: + return xtensa_uimm8x2 (v); + ++ case DImode: + case DFmode: + return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4)); + +-- +2.1.4 + From c128009659da38733c1c4f0ae93818c8bef06cc5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 7 Sep 2017 16:45:51 +0200 Subject: [PATCH 3278/3392] gd: security bump to version 2.2.5 Fixes the following security issues: CVE-2017-6362: Double-free in gdImagePngPtr() CVE-2017-7890: Buffer over-read into uninitialized memory Drop patches no more needed: 0001-gdlib-config.patch: @LIBICONV@ is nowadays correct AC_SUBST'ed by configure 0002-gd_bmp-fix-build-with-uClibc.patch: upstream uses ceil() since https://github.com/libgd/libgd/commit/6913dd3cd2a7c2914ad9622419f9343bfe956135 While we're at it, add a hash for the license file. Signed-off-by: Peter Korsgaard (cherry picked from commit 3b85d24c1d927590ed3a336794562e9a512fc216) Signed-off-by: Peter Korsgaard --- package/gd/0001-gdlib-config.patch | 32 ------------ .../0002-gd_bmp-fix-build-with-uClibc.patch | 50 ------------------- package/gd/gd.hash | 3 +- package/gd/gd.mk | 2 +- 4 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 package/gd/0001-gdlib-config.patch delete mode 100644 package/gd/0002-gd_bmp-fix-build-with-uClibc.patch diff --git a/package/gd/0001-gdlib-config.patch b/package/gd/0001-gdlib-config.patch deleted file mode 100644 index 7756bf1240..0000000000 --- a/package/gd/0001-gdlib-config.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix gdlib-config - -Since the @LIBICONV@ macro doesn't get replaced at compile time, we -end up installing an invalid gdlib-config: the gdlib-config --libs -says that one should link against @LIBICONV@ which obviously doesn't -work. - -Use the OpenWRT patch from -https://dev.openwrt.org/browser/packages/libs/gd/patches/101-gdlib-config.patch - -Signed-off-by: Thomas Petazzoni - ---- a/config/gdlib-config.in -+++ b/config/gdlib-config.in -@@ -71,7 +71,7 @@ while test $# -gt 0; do - echo @LDFLAGS@ - ;; - --libs) -- echo -lgd @LIBS@ @LIBICONV@ -+ echo -lgd @LIBS@ - ;; - --cflags|--includes) - echo -I@includedir@ -@@ -84,7 +84,7 @@ while test $# -gt 0; do - echo "includedir: $includedir" - echo "cflags: -I@includedir@" - echo "ldflags: @LDFLAGS@" -- echo "libs: @LIBS@ @LIBICONV@" -+ echo "libs: @LIBS@" - echo "libdir: $libdir" - echo "features: @FEATURES@" - ;; diff --git a/package/gd/0002-gd_bmp-fix-build-with-uClibc.patch b/package/gd/0002-gd_bmp-fix-build-with-uClibc.patch deleted file mode 100644 index 89bc39186e..0000000000 --- a/package/gd/0002-gd_bmp-fix-build-with-uClibc.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ea2a03e983acf34a1320b460dcad43b7e0b0b14f Mon Sep 17 00:00:00 2001 -Message-Id: -From: Baruch Siach -Date: Thu, 10 Apr 2014 15:49:13 +0300 -Subject: [PATCH] gd_bmp: fix build with uClibc - -Some architectures (like ARM) don't have the long double variants of math -functions under uClibc. Add a local ceill definition in this case. - -Patch status: reported upstream, -https://bitbucket.org/libgd/gd-libgd/issue/123/build-failure-agains-uclibc-arm - -Signed-off-by: Baruch Siach ---- - src/gd_bmp.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/gd_bmp.c b/src/gd_bmp.c -index 0fc021909f1b..11b3ec1baa01 100644 ---- a/src/gd_bmp.c -+++ b/src/gd_bmp.c -@@ -25,6 +25,11 @@ - #include "gdhelpers.h" - #include "bmp.h" - -+#include -+#if defined (__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__) -+#define NO_LONG_DOUBLE -+#endif -+ - static int compress_row(unsigned char *uncompressed_row, int length); - static int build_rle_packet(unsigned char *row, int packet_type, int length, unsigned char *data); - -@@ -42,6 +47,13 @@ static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); - - #define BMP_DEBUG(s) - -+#ifdef NO_LONG_DOUBLE -+long double ceill(long double x) -+{ -+ return (long double) ceil((double) x); -+} -+#endif -+ - static int gdBMPPutWord(gdIOCtx *out, int w) - { - /* Byte order is little-endian */ --- -1.9.1 - diff --git a/package/gd/gd.hash b/package/gd/gd.hash index a1991b1820..1cd9e56b18 100644 --- a/package/gd/gd.hash +++ b/package/gd/gd.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 137f13a7eb93ce72e32ccd7cebdab6874f8cf7ddf31d3a455a68e016ecd9e4e6 libgd-2.2.4.tar.xz +sha256 8c302ccbf467faec732f0741a859eef4ecae22fea2d2ab87467be940842bde51 libgd-2.2.5.tar.xz +sha256 d02dae2141d49b8a6b09b2b73e68a8f17d7bbeaaf02b3b841ee11fea2d9e328d COPYING diff --git a/package/gd/gd.mk b/package/gd/gd.mk index 63d16eb3ca..e2a46dca3c 100644 --- a/package/gd/gd.mk +++ b/package/gd/gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GD_VERSION = 2.2.4 +GD_VERSION = 2.2.5 GD_SOURCE = libgd-$(GD_VERSION).tar.xz GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION) GD_INSTALL_STAGING = YES From 3284e172f40b9c82e4b19fa4513793a4728ab9cb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 7 Sep 2017 17:07:54 +0200 Subject: [PATCH 3279/3392] libsoup: security bump to version 2.56.1 Fixes CVE-2017-2885: stack based buffer overflow with HTTP Chunked Encoding For more details, see https://bugzilla.gnome.org/show_bug.cgi?id=785774 While we're at it, add a hash for the license file. Signed-off-by: Peter Korsgaard (cherry picked from commit 0f5398f0e61992bd836474b7350c16f00459d0a5) Signed-off-by: Peter Korsgaard --- package/libsoup/libsoup.hash | 6 ++++-- package/libsoup/libsoup.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index b42cf2f711..6e1ff428af 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,2 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.56/libsoup-2.56.0.sha256sum -sha256 d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5 libsoup-2.56.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.56/libsoup-2.56.1.sha256sum +sha256 c32a46d77b4da433b51d8fd09a57a44b198e03bdc93e5219afcc687c7948eac3 libsoup-2.56.1.tar.xz +# Locally calculated +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index f6e92f8a3b..6eed005b1f 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSOUP_VERSION_MAJOR = 2.56 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).1 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPLv2+ From de22cee0616f21f25b4e2326ea583f04749bf885 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 7 Sep 2017 17:26:55 +0200 Subject: [PATCH 3280/3392] strongswan: add upstream security patch Fixes CVE-2017-11185: The gmp plugin in strongSwan before 5.6.0 allows remote attackers to cause a denial of service (NULL pointer dereference and daemon crash) via a crafted RSA signature. For more details, see https://www.strongswan.org/blog/2017/08/14/strongswan-vulnerability-%28cve-2017-11185%29.html While we're at it, add hashes for the license files. Signed-off-by: Peter Korsgaard (cherry picked from commit 2a59db1bb079dfd7cb40ffff7ac1cd550ff6662e) Signed-off-by: Peter Korsgaard --- package/strongswan/strongswan.hash | 3 +++ package/strongswan/strongswan.mk | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index cbc4e3857a..820c712843 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -5,3 +5,6 @@ sha256 f8288faaea6a9cd8a7d413c0b76b7922be5da3dfcd01fd05cb30d2c55d3bbe89 strongsw # Locally calculated sha256 f5ba7f46cf7ae81dd81bc86f9e4cfa0c5c7c6987149b3bc9c0b8bf08598a1063 strongswan-4.4.0-5.5.2_gmp_mpz_powm_sec.patch sha256 03db8c7a4133e877e8992e155c046dd27ec4810d50f239abf55595f0280caf31 strongswan-5.0.0-5.5.2_asn1_choice.patch +sha256 c80e02c9a5eeaf10f0a8bdde3be6375dd2833e515af03dad3a700e93c4fd041a strongswan-4.4.0-5.5.3_gmp_mpz_export.patch +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 99862fd2bc..ce837d09e0 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -9,7 +9,8 @@ STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_PATCH = \ $(STRONGSWAN_SITE)/patches/21_gmp_mpz_powm_sec_patch/strongswan-4.4.0-5.5.2_gmp_mpz_powm_sec.patch \ - $(STRONGSWAN_SITE)/patches/22_asn1_choice_patch/strongswan-5.0.0-5.5.2_asn1_choice.patch + $(STRONGSWAN_SITE)/patches/22_asn1_choice_patch/strongswan-5.0.0-5.5.2_asn1_choice.patch \ + $(STRONGSWAN_SITE)/patches/23_gmp_mpz_export_patch/strongswan-4.4.0-5.5.3_gmp_mpz_export.patch STRONGSWAN_LICENSE = GPLv2+ STRONGSWAN_LICENSE_FILES = COPYING LICENSE STRONGSWAN_DEPENDENCIES = host-pkgconf From 59e03d863d6bb824be3e882d654c1d4c5d8c65b1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 7 Sep 2017 18:58:38 +0200 Subject: [PATCH 3281/3392] unrar: security bump to version 5.5.8 Fixes the following security issues: CVE-2017-12938 - UnRAR before 5.5.7 allows remote attackers to bypass a directory-traversal protection mechanism via vectors involving a symlink to the . directory, a symlink to the .. directory, and a regular file. CVE-2017-12940 - libunrar.a in UnRAR before 5.5.7 has an out-of-bounds read in the EncodeFileName::Decode call within the Archive::ReadHeader15 function. CVE-2017-12941 - libunrar.a in UnRAR before 5.5.7 has an out-of-bounds read in the Unpack::Unpack20 function. CVE-2017-12942 - libunrar.a in UnRAR before 5.5.7 has a buffer overflow in the Unpack::LongLZ function. For more details, see http://www.openwall.com/lists/oss-security/2017/08/14/3 While we're at it, add a hash for the license file. Signed-off-by: Peter Korsgaard (cherry picked from commit 322599744ca76d6b69960dc37c3cf3baea5dab2c) Signed-off-by: Peter Korsgaard --- package/unrar/unrar.hash | 3 ++- package/unrar/unrar.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index 36450e05e3..81688d7b7d 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c unrarsrc-5.4.5.tar.gz +sha256 9b66e4353a9944bc140eb2a919ff99482dd548f858f5e296d809e8f7cdb2fcf4 unrarsrc-5.5.8.tar.gz +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index f5a95eacc5..d6c97dff2c 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 5.4.5 +UNRAR_VERSION = 5.5.8 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = http://www.rarlab.com/rar UNRAR_LICENSE = unrar From 05355b04d4267ed6818a9923df8befff695360aa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 18 Sep 2017 17:49:08 +0200 Subject: [PATCH 3282/3392] xen: add upstream post-4.7.3 security fixes Fixes the following security issues: XSA-226: multiple problems with transitive grants (CVE-2017-12135) XSA-227: x86: PV privilege escalation via map_grant_ref (CVE-2017-12137) XSA-228: grant_table: Race conditions with maptrack free list handling (CVE-2017-12136) XSA-230: grant_table: possibly premature clearing of GTF_writing / GTF_reading (CVE-2017-12855) XSA-231: Missing NUMA node parameter verification (CVE-2017-14316) XSA-232: Missing check for grant table (CVE-2017-14318) XSA-233: cxenstored: Race in domain cleanup (CVE-2017-14317) XSA-234: insufficient grant unmapping checks for x86 PV guests (CVE-2017-14319) XSA-235: add-to-physmap error paths fail to release lock on ARM Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 9 +++++++++ package/xen/xen.mk | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index 0b14e2966c..c1aac7624b 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,2 +1,11 @@ # Locally computed sha256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f xen-4.7.3.tar.gz +sha256 fffcc0a4428723e6aea391ff4f1d27326b5a3763d2308cbde64e6a786502c702 xsa226-4.7.patch +sha256 9923a47e5f86949800887596f098954a08ef73a01d74b1dbe16cab2e6b1fabb2 xsa227.patch +sha256 5a7416f15ac9cd7cace354b6102ff58199fe0581f65a36a36869650c71784e48 xsa228-4.8.patch +sha256 77a73f1c32d083e315ef0b1bbb119cb8840ceb5ada790cad76cbfb9116f725cc xsa230.patch +sha256 ce29b56a0480f4835b37835b351e704d204bb0ccd22325f487127aa2776cc2cf xsa231-4.7.patch +sha256 5068a78293daa58557c30c95141b775becfb650de6a5eda0d82a4a321ced551c xsa232.patch +sha256 f721cc49ba692b2f36299b631451f51d7340b8b4732f74c98f01cb7a80d8662b xsa233.patch +sha256 169e4e0eaa6b27e58ff0f4ce50e8fcc3f81b1e0a10210decf22d1b4cac7501fb xsa234-4.8.patch +sha256 f30848eee71e66687b421b87be1d8e3f454c0eb395422546c62a689153d1e31c xsa235-4.7.patch diff --git a/package/xen/xen.mk b/package/xen/xen.mk index a973b408da..fe68960cb0 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -6,6 +6,16 @@ XEN_VERSION = 4.7.3 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) +XEN_PATCH = \ + https://xenbits.xenproject.org/xsa/xsa226-4.7.patch \ + https://xenbits.xenproject.org/xsa/xsa227.patch \ + https://xenbits.xenproject.org/xsa/xsa228-4.8.patch \ + https://xenbits.xenproject.org/xsa/xsa230.patch \ + https://xenbits.xenproject.org/xsa/xsa231-4.7.patch \ + https://xenbits.xenproject.org/xsa/xsa232.patch \ + https://xenbits.xenproject.org/xsa/xsa233.patch \ + https://xenbits.xenproject.org/xsa/xsa234-4.8.patch \ + https://xenbits.xenproject.org/xsa/xsa235-4.7.patch XEN_LICENSE = GPLv2 XEN_LICENSE_FILES = COPYING XEN_DEPENDENCIES = host-python From e55836dab0f0a5453a4725b10b5a8c240aa82aba Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 2 Jul 2017 18:53:34 +0200 Subject: [PATCH 3283/3392] qt: don't download patch from Github Patches downloaded from Github are not stable, so bring them in the tree. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 35bc55eaaae8d9d463d3fddcf0b200685014865a) Signed-off-by: Peter Korsgaard --- ...ck-to-treat-alsalib-1.1.x-as-correct.patch | 29 +++++++++++++++++++ ...1-configure.patch => 0002-configure.patch} | 0 ...m.patch => 0003-eglwsegl-use-system.patch} | 0 ...ics.patch => 0004-fix-const-atomics.patch} | 0 ...np.patch => 0005-pthread_getattr_np.patch} | 0 ....patch => 0006-script-qtdbus-no-gui.patch} | 0 ...initial-support-of-ARC-architecture.patch} | 0 ...008-Prevent-unaligned-access-on-ARC.patch} | 0 ...nstructor-error-for-legacy-c-compil.patch} | 0 ...sion-order-when-building-statically.patch} | 0 ...socklen_t-on-other-C-libraries-than.patch} | 0 ...dl-option-only-when-it-is-supported.patch} | 0 ...enGL-EGL-Avoid-X11-header-collision.patch} | 0 package/qt/qt.hash | 1 - package/qt/qt.mk | 3 -- 15 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch rename package/qt/{0001-configure.patch => 0002-configure.patch} (100%) rename package/qt/{0002-eglwsegl-use-system.patch => 0003-eglwsegl-use-system.patch} (100%) rename package/qt/{0003-fix-const-atomics.patch => 0004-fix-const-atomics.patch} (100%) rename package/qt/{0004-pthread_getattr_np.patch => 0005-pthread_getattr_np.patch} (100%) rename package/qt/{0005-script-qtdbus-no-gui.patch => 0006-script-qtdbus-no-gui.patch} (100%) rename package/qt/{0006-Add-initial-support-of-ARC-architecture.patch => 0007-Add-initial-support-of-ARC-architecture.patch} (100%) rename package/qt/{0007-Prevent-unaligned-access-on-ARC.patch => 0008-Prevent-unaligned-access-on-ARC.patch} (100%) rename package/qt/{0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch => 0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch} (100%) rename package/qt/{0009-Fix-library-inclusion-order-when-building-statically.patch => 0010-Fix-library-inclusion-order-when-building-statically.patch} (100%) rename package/qt/{0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch => 0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch} (100%) rename package/qt/{0011-Link-with-ldl-option-only-when-it-is-supported.patch => 0012-Link-with-ldl-option-only-when-it-is-supported.patch} (100%) rename package/qt/{0012-OpenGL-EGL-Avoid-X11-header-collision.patch => 0013-OpenGL-EGL-Avoid-X11-header-collision.patch} (100%) diff --git a/package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch b/package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch new file mode 100644 index 0000000000..4cec4bde52 --- /dev/null +++ b/package/qt/0001-alsatest-fix-the-check-to-treat-alsalib-1.1.x-as-correct.patch @@ -0,0 +1,29 @@ +From b8f98d956501dfa4ce03a137f15d404930a56066 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Sat, 5 Mar 2016 10:25:33 +0300 +Subject: [PATCH] alsatest: Fix the check to treat alsalib 1.1.x as correct + version + +Task-number: QTBUG-51681 +Change-Id: I63266c33342f02f4d1a5ea5786f5fbc5a1b421b3 +Reviewed-by: Oswald Buddenhagen +[Upstream commit: https://github.com/qtproject/qtbase/commit/b8f98d956501dfa4ce03a137f15d404930a56066] +[Patch fixing ALSA detection. Taken from Qt5, but applies fine to Qt4.] +Signed-off-by: Thomas Petazzoni +--- + config.tests/unix/alsa/alsatest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp +index cab6533977..0b45819b61 100644 +--- a/config.tests/unix/alsa/alsatest.cpp ++++ b/config.tests/unix/alsa/alsatest.cpp +@@ -32,7 +32,7 @@ + ****************************************************************************/ + + #include +-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) ++#if SND_LIB_VERSION < 0x1000a // 1.0.10 + #error "Alsa version found too old, require >= 1.0.10" + #endif + diff --git a/package/qt/0001-configure.patch b/package/qt/0002-configure.patch similarity index 100% rename from package/qt/0001-configure.patch rename to package/qt/0002-configure.patch diff --git a/package/qt/0002-eglwsegl-use-system.patch b/package/qt/0003-eglwsegl-use-system.patch similarity index 100% rename from package/qt/0002-eglwsegl-use-system.patch rename to package/qt/0003-eglwsegl-use-system.patch diff --git a/package/qt/0003-fix-const-atomics.patch b/package/qt/0004-fix-const-atomics.patch similarity index 100% rename from package/qt/0003-fix-const-atomics.patch rename to package/qt/0004-fix-const-atomics.patch diff --git a/package/qt/0004-pthread_getattr_np.patch b/package/qt/0005-pthread_getattr_np.patch similarity index 100% rename from package/qt/0004-pthread_getattr_np.patch rename to package/qt/0005-pthread_getattr_np.patch diff --git a/package/qt/0005-script-qtdbus-no-gui.patch b/package/qt/0006-script-qtdbus-no-gui.patch similarity index 100% rename from package/qt/0005-script-qtdbus-no-gui.patch rename to package/qt/0006-script-qtdbus-no-gui.patch diff --git a/package/qt/0006-Add-initial-support-of-ARC-architecture.patch b/package/qt/0007-Add-initial-support-of-ARC-architecture.patch similarity index 100% rename from package/qt/0006-Add-initial-support-of-ARC-architecture.patch rename to package/qt/0007-Add-initial-support-of-ARC-architecture.patch diff --git a/package/qt/0007-Prevent-unaligned-access-on-ARC.patch b/package/qt/0008-Prevent-unaligned-access-on-ARC.patch similarity index 100% rename from package/qt/0007-Prevent-unaligned-access-on-ARC.patch rename to package/qt/0008-Prevent-unaligned-access-on-ARC.patch diff --git a/package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch b/package/qt/0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch similarity index 100% rename from package/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch rename to package/qt/0009-Fix-conversion-constructor-error-for-legacy-c-compil.patch diff --git a/package/qt/0009-Fix-library-inclusion-order-when-building-statically.patch b/package/qt/0010-Fix-library-inclusion-order-when-building-statically.patch similarity index 100% rename from package/qt/0009-Fix-library-inclusion-order-when-building-statically.patch rename to package/qt/0010-Fix-library-inclusion-order-when-building-statically.patch diff --git a/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch b/package/qt/0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch similarity index 100% rename from package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch rename to package/qt/0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch diff --git a/package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch b/package/qt/0012-Link-with-ldl-option-only-when-it-is-supported.patch similarity index 100% rename from package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch rename to package/qt/0012-Link-with-ldl-option-only-when-it-is-supported.patch diff --git a/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch b/package/qt/0013-OpenGL-EGL-Avoid-X11-header-collision.patch similarity index 100% rename from package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch rename to package/qt/0013-OpenGL-EGL-Avoid-X11-header-collision.patch diff --git a/package/qt/qt.hash b/package/qt/qt.hash index de81368511..301010cae1 100644 --- a/package/qt/qt.hash +++ b/package/qt/qt.hash @@ -1,4 +1,3 @@ # md5 http://download.qt.io/official_releases/qt/4.8/4.8.7/md5sums-4.8.7, sha256 locally computed: md5 d990ee66bf7ab0c785589776f35ba6ad qt-everywhere-opensource-src-4.8.7.tar.gz sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 qt-everywhere-opensource-src-4.8.7.tar.gz -sha256 e03740e20b8dbf52d163d8a4a37125e7c55b59a9a5e7cf7e89a08e07286b6135 b8f98d956501dfa4ce03a137f15d404930a56066.patch diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 29dcc46b7b..8809b0c7bb 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -15,9 +15,6 @@ QT_VERSION_MAJOR = 4.8 QT_VERSION = $(QT_VERSION_MAJOR).7 QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION) -# Patch fixing ALSA detection. Taken from Qt5, but applies fine to -# Qt4. -QT_PATCH = https://github.com/qtproject/qtbase/commit/b8f98d956501dfa4ce03a137f15d404930a56066.patch QT_DEPENDENCIES = host-pkgconf QT_INSTALL_STAGING = YES From 215d7a04b74850c44a193502b7d4ad0d1d9e5d54 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 8 Sep 2017 09:35:07 +0200 Subject: [PATCH 3284/3392] qt: add patch fixing build failure on ARMv8 in 32-bit mode The Qt package currently fails to build on ARMv8 cores in 32-bit mode (for example, if you select ARM and then Cortex-A53), because the ARM atomic operation implementation in Qt checks if we're on ARMv7, then on ARMv6, and otherwise falls back to an ARMv5 implementation. The latter uses the swp instruction, which doesn't exist on ARMv8, causing a build failure. To solve this, we simply add a patch that uses the ARMv7 atomic operations for ARMv8-A. There is no autobuilder reference because we don't have any ARMv8 32-bit configuration in the autobuilders. Cc: Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 95389fe98c882f70cbbd25dc1c7ea1480991acef) Signed-off-by: Peter Korsgaard --- ...-qatomic_arm.h-fix-build-on-ARMv8-32.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch diff --git a/package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch b/package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch new file mode 100644 index 0000000000..645041acfe --- /dev/null +++ b/package/qt/0013-src-corelib-arch-qatomic_arm.h-fix-build-on-ARMv8-32.patch @@ -0,0 +1,37 @@ +From 2281fa50f6e13278d3fd4f028377b8249b7b3cdb Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 8 Sep 2017 09:06:54 +0200 +Subject: [PATCH] src/corelib/arch/qatomic_arm.h: fix build on ARMv8 32-bit + +The Qt build fails on ARMv8 32-bit because it falls back to using the +ARMv5 code that uses the swp instruction, which no longer exists: + +/tmp/ccSxVIzw.s: Assembler messages: +/tmp/ccSxVIzw.s:127: Error: swp{b} use is obsoleted for ARMv8 and later +/tmp/ccSxVIzw.s:190: Error: swp{b} use is obsoleted for ARMv8 and later + +So, this commit adjusts the ARM atomic code to assume ARMv8 is similar +to ARMv7. + +Signed-off-by: Thomas Petazzoni +--- + src/corelib/arch/qatomic_arm.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h +index 77cd66f272..e011929d3e 100644 +--- a/src/corelib/arch/qatomic_arm.h ++++ b/src/corelib/arch/qatomic_arm.h +@@ -47,7 +47,8 @@ QT_BEGIN_HEADER + #if defined(__ARM_ARCH_7__) \ + || defined(__ARM_ARCH_7A__) \ + || defined(__ARM_ARCH_7R__) \ +- || defined(__ARM_ARCH_7M__) ++ || defined(__ARM_ARCH_7M__) \ ++ || defined(__ARM_ARCH_8A__) + # define QT_ARCH_ARMV7 + QT_BEGIN_INCLUDE_HEADER + # include "QtCore/qatomic_armv7.h" +-- +2.13.5 + From c56c5956cf6031b7fb9ebd34e7c90104614baf97 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 9 Sep 2017 23:02:53 +0300 Subject: [PATCH 3285/3392] libarchive: security bump to version 3.3.2 CVE-2016-8687: Stack-based buffer overflow in the safe_fprintf function in tar/util.c in libarchive 3.2.1 allows remote attackers to cause a denial of service via a crafted non-printable multibyte character in a filename. CVE-2016-8688: The mtree bidder in libarchive 3.2.1 does not keep track of line sizes when extending the read-ahead, which allows remote attackers to cause a denial of service (crash) via a crafted file, which triggers an invalid read in the (1) detect_form or (2) bid_entry function in libarchive/archive_read_support_format_mtree.c. CVE-2016-8689: The read_Header function in archive_read_support_format_7zip.c in libarchive 3.2.1 allows remote attackers to cause a denial of service (out-of-bounds read) via multiple EmptyStream attributes in a header in a 7zip archive. CVE-2016-10209: The archive_wstring_append_from_mbs function in archive_string.c in libarchive 3.2.2 allows remote attackers to cause a denial of service (NULL pointer dereference and application crash) via a crafted archive file. CVE-2016-10349: The archive_le32dec function in archive_endian.h in libarchive 3.2.2 allows remote attackers to cause a denial of service (heap-based buffer over-read and application crash) via a crafted file. CVE-2016-10350: The archive_read_format_cab_read_header function in archive_read_support_format_cab.c in libarchive 3.2.2 allows remote attackers to cause a denial of service (heap-based buffer over-read and application crash) via a crafted file. CVE-2017-5601: An error in the lha_read_file_header_1() function (archive_read_support_format_lha.c) in libarchive 3.2.2 allows remote attackers to trigger an out-of-bounds read memory access and subsequently cause a crash via a specially crafted archive. Add upstream patch fixing the following issue: CVE-2017-14166: libarchive 3.3.2 allows remote attackers to cause a denial of service (xml_data heap-based buffer over-read and application crash) via a crafted xar archive, related to the mishandling of empty strings in the atol8 function in archive_read_support_format_xar.c. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit f871b21c89e41dfddd60bb25cf55610cd4081eba) Signed-off-by: Peter Korsgaard --- ...sible-for-empty-strings-to-make-fuzz.patch | 42 +++++++++++++++++++ package/libarchive/libarchive.hash | 2 +- package/libarchive/libarchive.mk | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 package/libarchive/0001-Do-something-sensible-for-empty-strings-to-make-fuzz.patch diff --git a/package/libarchive/0001-Do-something-sensible-for-empty-strings-to-make-fuzz.patch b/package/libarchive/0001-Do-something-sensible-for-empty-strings-to-make-fuzz.patch new file mode 100644 index 0000000000..1d1d80d708 --- /dev/null +++ b/package/libarchive/0001-Do-something-sensible-for-empty-strings-to-make-fuzz.patch @@ -0,0 +1,42 @@ +From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001 +From: Joerg Sonnenberger +Date: Tue, 5 Sep 2017 18:12:19 +0200 +Subject: [PATCH] Do something sensible for empty strings to make fuzzers + happy. + +Signed-off-by: Baruch Siach +--- +Upstream status: commit fa7438a0ff + + libarchive/archive_read_support_format_xar.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c +index 7a22beb9d8e4..93eeacc5e6eb 100644 +--- a/libarchive/archive_read_support_format_xar.c ++++ b/libarchive/archive_read_support_format_xar.c +@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt) + uint64_t l; + int digit; + ++ if (char_cnt == 0) ++ return (0); ++ + l = 0; + digit = *p - '0'; + while (digit >= 0 && digit < 10 && char_cnt-- > 0) { +@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt) + { + int64_t l; + int digit; +- ++ ++ if (char_cnt == 0) ++ return (0); ++ + l = 0; + while (char_cnt-- > 0) { + if (*p >= '0' && *p <= '7') +-- +2.14.1 + diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index 2c39bd3e07..98a34ad36c 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2 libarchive-3.2.1.tar.gz +sha256 ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce libarchive-3.3.2.tar.gz diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index bcf92f907a..3ebdc7e395 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.2.1 +LIBARCHIVE_VERSION = 3.3.2 LIBARCHIVE_SITE = http://www.libarchive.org/downloads LIBARCHIVE_INSTALL_STAGING = YES LIBARCHIVE_LICENSE = BSD-2c, BSD-3c From 74d64007d502ec2bb363cb4cb71b003a86938464 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 8 Sep 2017 14:19:03 +0200 Subject: [PATCH 3286/3392] tcpdump: security bump to version 4.9.2 Fixes the following security issues (descriptions not public yet): Fix buffer overflow vulnerabilities: CVE-2017-11543 (SLIP) CVE-2017-13011 (bittok2str_internal) Fix infinite loop vulnerabilities: CVE-2017-12989 (RESP) CVE-2017-12990 (ISAKMP) CVE-2017-12995 (DNS) CVE-2017-12997 (LLDP) Fix buffer over-read vulnerabilities: CVE-2017-11541 (safeputs) CVE-2017-11542 (PIMv1) CVE-2017-12893 (SMB/CIFS) CVE-2017-12894 (lookup_bytestring) CVE-2017-12895 (ICMP) CVE-2017-12896 (ISAKMP) CVE-2017-12897 (ISO CLNS) CVE-2017-12898 (NFS) CVE-2017-12899 (DECnet) CVE-2017-12900 (tok2strbuf) CVE-2017-12901 (EIGRP) CVE-2017-12902 (Zephyr) CVE-2017-12985 (IPv6) CVE-2017-12986 (IPv6 routing headers) CVE-2017-12987 (IEEE 802.11) CVE-2017-12988 (telnet) CVE-2017-12991 (BGP) CVE-2017-12992 (RIPng) CVE-2017-12993 (Juniper) CVE-2017-11542 (PIMv1) CVE-2017-11541 (safeputs) CVE-2017-12994 (BGP) CVE-2017-12996 (PIMv2) CVE-2017-12998 (ISO IS-IS) CVE-2017-12999 (ISO IS-IS) CVE-2017-13000 (IEEE 802.15.4) CVE-2017-13001 (NFS) CVE-2017-13002 (AODV) CVE-2017-13003 (LMP) CVE-2017-13004 (Juniper) CVE-2017-13005 (NFS) CVE-2017-13006 (L2TP) CVE-2017-13007 (Apple PKTAP) CVE-2017-13008 (IEEE 802.11) CVE-2017-13009 (IPv6 mobility) CVE-2017-13010 (BEEP) CVE-2017-13012 (ICMP) CVE-2017-13013 (ARP) CVE-2017-13014 (White Board) CVE-2017-13015 (EAP) CVE-2017-11543 (SLIP) CVE-2017-13016 (ISO ES-IS) CVE-2017-13017 (DHCPv6) CVE-2017-13018 (PGM) CVE-2017-13019 (PGM) CVE-2017-13020 (VTP) CVE-2017-13021 (ICMPv6) CVE-2017-13022 (IP) CVE-2017-13023 (IPv6 mobility) CVE-2017-13024 (IPv6 mobility) CVE-2017-13025 (IPv6 mobility) CVE-2017-13026 (ISO IS-IS) CVE-2017-13027 (LLDP) CVE-2017-13028 (BOOTP) CVE-2017-13029 (PPP) CVE-2017-13030 (PIM) CVE-2017-13031 (IPv6 fragmentation header) CVE-2017-13032 (RADIUS) CVE-2017-13033 (VTP) CVE-2017-13034 (PGM) CVE-2017-13035 (ISO IS-IS) CVE-2017-13036 (OSPFv3) CVE-2017-13037 (IP) CVE-2017-13038 (PPP) CVE-2017-13039 (ISAKMP) CVE-2017-13040 (MPTCP) CVE-2017-13041 (ICMPv6) CVE-2017-13042 (HNCP) CVE-2017-13043 (BGP) CVE-2017-13044 (HNCP) CVE-2017-13045 (VQP) CVE-2017-13046 (BGP) CVE-2017-13047 (ISO ES-IS) CVE-2017-13048 (RSVP) CVE-2017-13049 (Rx) CVE-2017-13050 (RPKI-Router) CVE-2017-13051 (RSVP) CVE-2017-13052 (CFM) CVE-2017-13053 (BGP) CVE-2017-13054 (LLDP) CVE-2017-13055 (ISO IS-IS) CVE-2017-13687 (Cisco HDLC) CVE-2017-13688 (OLSR) CVE-2017-13689 (IKEv1) CVE-2017-13690 (IKEv2) CVE-2017-13725 (IPv6 routing headers) While we're at it, add a hash for the license file. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 478ee139b2c34d34ec64f1a975c1b18dfbbd36d4) Signed-off-by: Peter Korsgaard --- package/tcpdump/tcpdump.hash | 5 +++-- package/tcpdump/tcpdump.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index 4eedc1c165..0eb56e695f 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,2 +1,3 @@ -# Locally calculated after checking pgp signature at http://www.tcpdump.org/release/tcpdump-4.9.1.tar.gz.sig -sha256 f9448cf4deb2049acf713655c736342662e652ef40dbe0a8f6f8d5b9ce5bd8f3 tcpdump-4.9.1.tar.gz +# Locally calculated after checking pgp signature at http://www.tcpdump.org/release/tcpdump-4.9.2.tar.gz.sig +sha256 798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79 tcpdump-4.9.2.tar.gz +sha256 9b03d5d13e66d6de02a4bb2d0dd1cb9f41808d045962cdcc42350d5291b141a1 LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index ac710b8f74..7bea4bf180 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.9.1 +TCPDUMP_VERSION = 4.9.2 TCPDUMP_SITE = http://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3c TCPDUMP_LICENSE_FILES = LICENSE From 38b5b4968925dddccd8173dd0b6f6a9a5c7c7eaa Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 22 Mar 2017 15:25:40 +0000 Subject: [PATCH 3287/3392] ruby: bump version to 2.4.1 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 81de172d11d95a27eac5bc7ad24303cc0cff0b73) Signed-off-by: Peter Korsgaard --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 19722a3c96..624ce40f57 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,2 +1,2 @@ -# From https://www.ruby-lang.org/en/news/2016/12/25/ruby-2-4-0-released/ -sha256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 ruby-2.4.0.tar.xz +# From https://www.ruby-lang.org/en/news/2017/03/22/ruby-2-4-1-released/ +sha256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 ruby-2.4.1.tar.xz diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index f0dc63b471..d0a81f1d3e 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 2.4 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).1 RUBY_VERSION_EXT = 2.4.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From a8676e86fe92dd5eace74a7bc87050d0b24ea949 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 7 Sep 2017 11:17:55 +0200 Subject: [PATCH 3288/3392] ruby: add upstream security patches bumping rubygems to 2.6.13 We unfortunately cannot use the upstream patches directly as they are not in 'patch -p1' format, so convert them and include instead. Fixes: CVE-2017-0899 - RubyGems version 2.6.12 and earlier is vulnerable to maliciously crafted gem specifications that include terminal escape characters. Printing the gem specification would execute terminal escape sequences. CVE-2017-0900 - RubyGems version 2.6.12 and earlier is vulnerable to maliciously crafted gem specifications to cause a denial of service attack against RubyGems clients who have issued a `query` command. CVE-2017-0901 - RubyGems version 2.6.12 and earlier fails to validate specification names, allowing a maliciously crafted gem to potentially overwrite any file on the filesystem. CVE-2017-0902 - RubyGems version 2.6.12 and earlier is vulnerable to a DNS hijacking vulnerability that allows a MITM attacker to force the RubyGems client to download and install gems from a server that the attacker controls. For more details, see https://www.ruby-lang.org/en/news/2017/08/29/multiple-vulnerabilities-in-rubygems/ Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 0e5448af5091ee208fdd38a4e221f444085dd0c8) Signed-off-by: Peter Korsgaard --- package/ruby/0001-rubygems-2612-ruby24.patch | 445 +++++++++++++++++++ package/ruby/0002-rubygems-2613-ruby24.patch | 364 +++++++++++++++ 2 files changed, 809 insertions(+) create mode 100644 package/ruby/0001-rubygems-2612-ruby24.patch create mode 100644 package/ruby/0002-rubygems-2613-ruby24.patch diff --git a/package/ruby/0001-rubygems-2612-ruby24.patch b/package/ruby/0001-rubygems-2612-ruby24.patch new file mode 100644 index 0000000000..ebbefffbed --- /dev/null +++ b/package/ruby/0001-rubygems-2612-ruby24.patch @@ -0,0 +1,445 @@ +[PATCH] bump rubygems to 2.6.12 + +Downloaded from upstream: +https://bugs.ruby-lang.org/attachments/download/6692/rubygems-2612-ruby24.patch + +And converted to patch-p1. + +Signed-off-by: Peter Korsgaard +diff --git a/lib/rubygems.rb b/lib/rubygems.rb +index 5cd1a4c47a..bc5bf9b4c2 100644 +--- a/lib/rubygems.rb ++++ b/lib/rubygems.rb +@@ -10,7 +10,7 @@ + require 'thread' + + module Gem +- VERSION = "2.6.11" ++ VERSION = "2.6.12" + end + + # Must be first since it unloads the prelude from 1.9.2 +@@ -234,6 +234,7 @@ def self.needs + + def self.finish_resolve(request_set=Gem::RequestSet.new) + request_set.import Gem::Specification.unresolved_deps.values ++ request_set.import Gem.loaded_specs.values.map {|s| Gem::Dependency.new(s.name, s.version) } + + request_set.resolve_current.each do |s| + s.full_spec.activate +diff --git a/lib/rubygems/commands/open_command.rb b/lib/rubygems/commands/open_command.rb +index a89b7421e3..059635e835 100644 +--- a/lib/rubygems/commands/open_command.rb ++++ b/lib/rubygems/commands/open_command.rb +@@ -72,7 +72,7 @@ def open_editor path + end + + def spec_for name +- spec = Gem::Specification.find_all_by_name(name, @version).last ++ spec = Gem::Specification.find_all_by_name(name, @version).first + + return spec if spec + +diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb +index f25d120b88..70f8127292 100644 +--- a/lib/rubygems/commands/query_command.rb ++++ b/lib/rubygems/commands/query_command.rb +@@ -86,7 +86,7 @@ def execute + name = Array(options[:name]) + else + args = options[:args].to_a +- name = options[:exact] ? args : args.map{|arg| /#{arg}/i } ++ name = options[:exact] ? args.map{|arg| /\A#{Regexp.escape(arg)}\Z/ } : args.map{|arg| /#{arg}/i } + end + + prerelease = options[:prerelease] +diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb +index 9832afd214..7e46963a4c 100644 +--- a/lib/rubygems/commands/sources_command.rb ++++ b/lib/rubygems/commands/sources_command.rb +@@ -44,7 +44,7 @@ def add_source source_uri # :nodoc: + source = Gem::Source.new source_uri + + begin +- if Gem.sources.include? source_uri then ++ if Gem.sources.include? source then + say "source #{source_uri} already present in the cache" + else + source.load_specs :released +diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb +index 35fe7c4c1a..d8314eaf60 100644 +--- a/lib/rubygems/dependency_list.rb ++++ b/lib/rubygems/dependency_list.rb +@@ -104,7 +104,7 @@ def find_name(full_name) + end + + def inspect # :nodoc: +- "#<%s:0x%x %p>" % [self.class, object_id, map { |s| s.full_name }] ++ "%s %p>" % [super[0..-2], map { |s| s.full_name }] + end + + ## +diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb +index f4d3e728de..967543c2d1 100644 +--- a/lib/rubygems/installer.rb ++++ b/lib/rubygems/installer.rb +@@ -214,7 +214,7 @@ def check_executable_overwrite filename # :nodoc: + + ruby_executable = true + existing = io.read.slice(%r{ +- ^( ++ ^\s*( + gem \s | + load \s Gem\.bin_path\( | + load \s Gem\.activate_bin_path\( +@@ -701,6 +701,8 @@ def verify_gem_home(unpack = false) # :nodoc: + # Return the text for an application file. + + def app_script_text(bin_file_name) ++ # note that the `load` lines cannot be indented, as old RG versions match ++ # against the beginning of the line + return <<-TEXT + #{shebang bin_file_name} + # +@@ -723,7 +725,12 @@ def app_script_text(bin_file_name) + end + end + ++if Gem.respond_to?(:activate_bin_path) + load Gem.activate_bin_path('#{spec.name}', '#{bin_file_name}', version) ++else ++gem #{spec.name.dump}, version ++load Gem.bin_path(#{spec.name.dump}, #{bin_file_name.dump}, version) ++end + TEXT + end + +diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb +index d22d91ae54..2dd9ed5782 100644 +--- a/lib/rubygems/platform.rb ++++ b/lib/rubygems/platform.rb +@@ -112,7 +112,7 @@ def initialize(arch) + end + + def inspect +- "#<%s:0x%x @cpu=%p, @os=%p, @version=%p>" % [self.class, object_id, *to_a] ++ "%s @cpu=%p, @os=%p, @version=%p>" % [super[0..-2], *to_a] + end + + def to_a +diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb +index 119d6d56f7..6963ca156f 100644 +--- a/lib/rubygems/security.rb ++++ b/lib/rubygems/security.rb +@@ -455,7 +455,7 @@ def self.create_cert_self_signed subject, key, age = ONE_YEAR, + + ## + # Creates a new key pair of the specified +length+ and +algorithm+. The +- # default is a 2048 bit RSA key. ++ # default is a 3072 bit RSA key. + + def self.create_key length = KEY_LENGTH, algorithm = KEY_ALGORITHM + algorithm.new length +diff --git a/lib/rubygems/server.rb b/lib/rubygems/server.rb +index 81df0e608e..df4eb566d3 100644 +--- a/lib/rubygems/server.rb ++++ b/lib/rubygems/server.rb +@@ -657,7 +657,7 @@ def root(req, res) + "only_one_executable" => true, + "full_name" => "rubygems-#{Gem::VERSION}", + "has_deps" => false, +- "homepage" => "http://docs.rubygems.org/", ++ "homepage" => "http://guides.rubygems.org/", + "name" => 'rubygems', + "ri_installed" => true, + "summary" => "RubyGems itself", +diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb +index a2f289d162..500f0af768 100644 +--- a/lib/rubygems/specification.rb ++++ b/lib/rubygems/specification.rb +@@ -2105,7 +2105,7 @@ def inspect # :nodoc: + if $DEBUG + super + else +- "#<#{self.class}:0x#{__id__.to_s(16)} #{full_name}>" ++ "#{super[0..-2]} #{full_name}>" + end + end + +diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb +index 86b68e1efb..4e48f1eb4c 100644 +--- a/lib/rubygems/test_case.rb ++++ b/lib/rubygems/test_case.rb +@@ -484,7 +484,7 @@ def git_gem name = 'a', version = 1 + + system @git, 'add', gemspec + system @git, 'commit', '-a', '-m', 'a non-empty commit message', '--quiet' +- head = Gem::Util.popen('git', 'rev-parse', 'master').strip ++ head = Gem::Util.popen(@git, 'rev-parse', 'master').strip + end + + return name, git_spec.version, directory, head +@@ -1498,6 +1498,8 @@ def self.key_path key_name + begin + gem 'rdoc' + require 'rdoc' ++ ++ require 'rubygems/rdoc' + rescue LoadError, Gem::LoadError + end + +@@ -1514,3 +1516,4 @@ def self.key_path key_name + pid = $$ + END {tmpdirs.each {|dir| Dir.rmdir(dir)} if $$ == pid} + Gem.clear_paths ++Gem.loaded_specs.clear +diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb +index a605f9cdfe..62b36dfd41 100644 +--- a/test/rubygems/test_gem.rb ++++ b/test/rubygems/test_gem.rb +@@ -75,6 +75,29 @@ def test_self_finish_resolve_wtf + end + end + ++ def test_self_finish_resolve_respects_loaded_specs ++ save_loaded_features do ++ a1 = new_spec "a", "1", "b" => "> 0" ++ b1 = new_spec "b", "1", "c" => ">= 1" ++ b2 = new_spec "b", "2", "c" => ">= 2" ++ c1 = new_spec "c", "1" ++ c2 = new_spec "c", "2" ++ ++ install_specs c1, c2, b1, b2, a1 ++ ++ a1.activate ++ c1.activate ++ ++ assert_equal %w(a-1 c-1), loaded_spec_names ++ assert_equal ["b (> 0)"], unresolved_names ++ ++ Gem.finish_resolve ++ ++ assert_equal %w(a-1 b-1 c-1), loaded_spec_names ++ assert_equal [], unresolved_names ++ end ++ end ++ + def test_self_install + spec_fetcher do |f| + f.gem 'a', 1 +@@ -492,7 +515,7 @@ def test_self_find_files_with_gemfile + skip if RUBY_VERSION <= "1.8.7" + + cwd = File.expand_path("test/rubygems", @@project_dir) +- $LOAD_PATH.unshift cwd ++ actual_load_path = $LOAD_PATH.unshift(cwd).dup + + discover_path = File.join 'lib', 'sff', 'discover.rb' + +@@ -518,12 +541,12 @@ def test_self_find_files_with_gemfile + expected = [ + File.expand_path('test/rubygems/sff/discover.rb', @@project_dir), + File.join(foo1.full_gem_path, discover_path) +- ] ++ ].sort + +- assert_equal expected, Gem.find_files('sff/discover') +- assert_equal expected, Gem.find_files('sff/**.rb'), '[ruby-core:31730]' ++ assert_equal expected, Gem.find_files('sff/discover').sort ++ assert_equal expected, Gem.find_files('sff/**.rb').sort, '[ruby-core:31730]' + ensure +- assert_equal cwd, $LOAD_PATH.shift unless RUBY_VERSION <= "1.8.7" ++ assert_equal cwd, actual_load_path.shift unless RUBY_VERSION <= "1.8.7" + end + + def test_self_find_latest_files +diff --git a/test/rubygems/test_gem_commands_open_command.rb b/test/rubygems/test_gem_commands_open_command.rb +index 3ec38972e6..a96fa6ea23 100644 +--- a/test/rubygems/test_gem_commands_open_command.rb ++++ b/test/rubygems/test_gem_commands_open_command.rb +@@ -24,7 +24,8 @@ def test_execute + @cmd.options[:args] = %w[foo] + @cmd.options[:editor] = "#{Gem.ruby} -e0 --" + +- spec = gem 'foo' ++ gem 'foo', '1.0.0' ++ spec = gem 'foo', '1.0.1' + mock = MiniTest::Mock.new + mock.expect(:call, true, [spec.full_gem_path]) + +diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb +index 223f205b2d..d8d682b136 100644 +--- a/test/rubygems/test_gem_commands_query_command.rb ++++ b/test/rubygems/test_gem_commands_query_command.rb +@@ -642,7 +642,7 @@ def test_execute_local_details + assert_equal expected, @ui.output + end + +- def test_execute_exact ++ def test_execute_exact_remote + spec_fetcher do |fetcher| + fetcher.spec 'coolgem-omg', 3 + fetcher.spec 'coolgem', '4.2.1' +@@ -665,6 +665,60 @@ def test_execute_exact + assert_equal expected, @ui.output + end + ++ def test_execute_exact_local ++ spec_fetcher do |fetcher| ++ fetcher.spec 'coolgem-omg', 3 ++ fetcher.spec 'coolgem', '4.2.1' ++ fetcher.spec 'wow_coolgem', 1 ++ end ++ ++ @cmd.handle_options %w[--exact coolgem] ++ ++ use_ui @ui do ++ @cmd.execute ++ end ++ ++ expected = <<-EOF ++ ++*** LOCAL GEMS *** ++ ++coolgem (4.2.1) ++ EOF ++ ++ assert_equal expected, @ui.output ++ end ++ ++ def test_execute_exact_multiple ++ spec_fetcher do |fetcher| ++ fetcher.spec 'coolgem-omg', 3 ++ fetcher.spec 'coolgem', '4.2.1' ++ fetcher.spec 'wow_coolgem', 1 ++ ++ fetcher.spec 'othergem-omg', 3 ++ fetcher.spec 'othergem', '1.2.3' ++ fetcher.spec 'wow_othergem', 1 ++ end ++ ++ @cmd.handle_options %w[--exact coolgem othergem] ++ ++ use_ui @ui do ++ @cmd.execute ++ end ++ ++ expected = <<-EOF ++ ++*** LOCAL GEMS *** ++ ++coolgem (4.2.1) ++ ++*** LOCAL GEMS *** ++ ++othergem (1.2.3) ++ EOF ++ ++ assert_equal expected, @ui.output ++ end ++ + private + + def add_gems_to_fetcher +diff --git a/test/rubygems/test_gem_commands_sources_command.rb b/test/rubygems/test_gem_commands_sources_command.rb +index 014b4b4c12..d5b6d99419 100644 +--- a/test/rubygems/test_gem_commands_sources_command.rb ++++ b/test/rubygems/test_gem_commands_sources_command.rb +@@ -108,6 +108,58 @@ def test_execute_add_redundant_source + assert_equal '', @ui.error + end + ++ def test_execute_add_redundant_source_trailing_slash ++ # Remove pre-existing gem source (w/ slash) ++ repo_with_slash = "http://gems.example.com/" ++ @cmd.handle_options %W[--remove #{repo_with_slash}] ++ use_ui @ui do ++ @cmd.execute ++ end ++ source = Gem::Source.new repo_with_slash ++ assert_equal false, Gem.sources.include?(source) ++ ++ expected = <<-EOF ++#{repo_with_slash} removed from sources ++ EOF ++ ++ assert_equal expected, @ui.output ++ assert_equal '', @ui.error ++ ++ # Re-add pre-existing gem source (w/o slash) ++ repo_without_slash = "http://gems.example.com" ++ @cmd.handle_options %W[--add #{repo_without_slash}] ++ use_ui @ui do ++ @cmd.execute ++ end ++ source = Gem::Source.new repo_without_slash ++ assert_equal true, Gem.sources.include?(source) ++ ++ expected = <<-EOF ++http://gems.example.com/ removed from sources ++http://gems.example.com added to sources ++ EOF ++ ++ assert_equal expected, @ui.output ++ assert_equal '', @ui.error ++ ++ # Re-add original gem source (w/ slash) ++ @cmd.handle_options %W[--add #{repo_with_slash}] ++ use_ui @ui do ++ @cmd.execute ++ end ++ source = Gem::Source.new repo_with_slash ++ assert_equal true, Gem.sources.include?(source) ++ ++ expected = <<-EOF ++http://gems.example.com/ removed from sources ++http://gems.example.com added to sources ++source http://gems.example.com/ already present in the cache ++ EOF ++ ++ assert_equal expected, @ui.output ++ assert_equal '', @ui.error ++ end ++ + def test_execute_add_http_rubygems_org + http_rubygems_org = 'http://rubygems.org' + +diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb +index 6ceb2c6dfc..882981d344 100644 +--- a/test/rubygems/test_gem_installer.rb ++++ b/test/rubygems/test_gem_installer.rb +@@ -62,7 +62,12 @@ def test_app_script_text + end + end + ++if Gem.respond_to?(:activate_bin_path) + load Gem.activate_bin_path('a', 'executable', version) ++else ++gem "a", version ++load Gem.bin_path("a", "executable", version) ++end + EOF + + wrapper = @installer.app_script_text 'executable' +diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb +index dd606e44d4..936f78fb2a 100644 +--- a/test/rubygems/test_require.rb ++++ b/test/rubygems/test_require.rb +@@ -301,6 +301,17 @@ def test_default_gem_only + assert_equal %w(default-2.0.0.0), loaded_spec_names + end + ++ def test_realworld_default_gem ++ skip "no default gems on ruby < 2.0" unless RUBY_VERSION >= "2" ++ cmd = <<-RUBY ++ $stderr = $stdout ++ require "json" ++ puts Gem.loaded_specs["json"].default_gem? ++ RUBY ++ output = Gem::Util.popen(Gem.ruby, "-e", cmd).strip ++ assert_equal "true", output ++ end ++ + def test_default_gem_and_normal_gem + default_gem_spec = new_default_spec("default", "2.0.0.0", + nil, "default/gem.rb") diff --git a/package/ruby/0002-rubygems-2613-ruby24.patch b/package/ruby/0002-rubygems-2613-ruby24.patch new file mode 100644 index 0000000000..ea25d90347 --- /dev/null +++ b/package/ruby/0002-rubygems-2613-ruby24.patch @@ -0,0 +1,364 @@ +[PATCH] bump rubygems to 2.6.12 + +Downloaded from upstream: +https://bugs.ruby-lang.org/attachments/download/6693/rubygems-2613-ruby24.patch + +And converted to patch-p1. + +Signed-off-by: Peter Korsgaard + +diff --git a/lib/rubygems.rb b/lib/rubygems.rb +index bc5bf9b4c2..55aa85b8b2 100644 +--- a/lib/rubygems.rb ++++ b/lib/rubygems.rb +@@ -10,7 +10,7 @@ + require 'thread' + + module Gem +- VERSION = "2.6.12" ++ VERSION = "2.6.13" + end + + # Must be first since it unloads the prelude from 1.9.2 +diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb +index 70f8127292..44144203e0 100644 +--- a/lib/rubygems/commands/query_command.rb ++++ b/lib/rubygems/commands/query_command.rb +@@ -226,7 +226,7 @@ def output_versions output, versions + end + end + +- output << make_entry(matching_tuples, platforms) ++ output << clean_text(make_entry(matching_tuples, platforms)) + end + end + +@@ -353,7 +353,8 @@ def spec_platforms entry, platforms + end + + def spec_summary entry, spec +- entry << "\n\n" << format_text(spec.summary, 68, 4) ++ summary = truncate_text(spec.summary, "the summary for #{spec.full_name}") ++ entry << "\n\n" << format_text(summary, 68, 4) + end + + end +diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb +index 967543c2d1..6fd3399dd4 100644 +--- a/lib/rubygems/installer.rb ++++ b/lib/rubygems/installer.rb +@@ -697,6 +697,11 @@ def verify_gem_home(unpack = false) # :nodoc: + unpack or File.writable?(gem_home) + end + ++ def verify_spec_name ++ return if spec.name =~ Gem::Specification::VALID_NAME_PATTERN ++ raise Gem::InstallError, "#{spec} has an invalid name" ++ end ++ + ## + # Return the text for an application file. + +@@ -823,6 +828,8 @@ def pre_install_checks + + ensure_loadable_spec + ++ verify_spec_name ++ + if options[:install_as_default] + Gem.ensure_default_gem_subdirectories gem_home + else +diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb +index e6a13d4b8c..8f0cf0b402 100644 +--- a/lib/rubygems/remote_fetcher.rb ++++ b/lib/rubygems/remote_fetcher.rb +@@ -110,7 +110,7 @@ def api_endpoint(uri) + else + target = res.target.to_s.strip + +- if /\.#{Regexp.quote(host)}\z/ =~ target ++ if URI("http://" + target).host.end_with?(".#{host}") + return URI.parse "#{uri.scheme}://#{target}#{uri.path}" + end + +diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb +index 500f0af768..88e320c05a 100644 +--- a/lib/rubygems/specification.rb ++++ b/lib/rubygems/specification.rb +@@ -108,6 +108,8 @@ class Gem::Specification < Gem::BasicSpecification + + private_constant :LOAD_CACHE if defined? private_constant + ++ VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/ # :nodoc: ++ + # :startdoc: + + ## +@@ -2671,9 +2673,15 @@ def validate packaging = true + end + end + +- unless String === name then ++ if !name.is_a?(String) then + raise Gem::InvalidSpecificationException, +- "invalid value for attribute name: \"#{name.inspect}\"" ++ "invalid value for attribute name: \"#{name.inspect}\" must be a string" ++ elsif name !~ /[a-zA-Z]/ then ++ raise Gem::InvalidSpecificationException, ++ "invalid value for attribute name: #{name.dump} must include at least one letter" ++ elsif name !~ VALID_NAME_PATTERN then ++ raise Gem::InvalidSpecificationException, ++ "invalid value for attribute name: #{name.dump} can only include letters, numbers, dashes, and underscores" + end + + if raw_require_paths.empty? then +diff --git a/lib/rubygems/text.rb b/lib/rubygems/text.rb +index 732f1b99f2..b944b62c27 100644 +--- a/lib/rubygems/text.rb ++++ b/lib/rubygems/text.rb +@@ -6,13 +6,26 @@ + + module Gem::Text + ++ ## ++ # Remove any non-printable characters and make the text suitable for ++ # printing. ++ def clean_text(text) ++ text.gsub(/[\000-\b\v-\f\016-\037\177]/, ".".freeze) ++ end ++ ++ def truncate_text(text, description, max_length = 100_000) ++ raise ArgumentError, "max_length must be positive" unless max_length > 0 ++ return text if text.size <= max_length ++ "Truncating #{description} to #{max_length.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse} characters:\n" + text[0, max_length] ++ end ++ + ## + # Wraps +text+ to +wrap+ characters and optionally indents by +indent+ + # characters + + def format_text(text, wrap, indent=0) + result = [] +- work = text.dup ++ work = clean_text(text) + + while work.length > wrap do + if work =~ /^(.{0,#{wrap}})[ \n]/ then +diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb +index d8d682b136..469223c6c0 100644 +--- a/test/rubygems/test_gem_commands_query_command.rb ++++ b/test/rubygems/test_gem_commands_query_command.rb +@@ -116,6 +116,86 @@ def test_execute_details + This is a lot of text. This is a lot of text. This is a lot of text. + This is a lot of text. + ++pl (1) ++ Platform: i386-linux ++ Author: A User ++ Homepage: http://example.com ++ ++ this is a summary ++ EOF ++ ++ assert_equal expected, @ui.output ++ assert_equal '', @ui.error ++ end ++ ++ def test_execute_details_cleans_text ++ spec_fetcher do |fetcher| ++ fetcher.spec 'a', 2 do |s| ++ s.summary = 'This is a lot of text. ' * 4 ++ s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"] ++ s.homepage = "http://a.example.com/\x03" ++ end ++ ++ fetcher.legacy_platform ++ end ++ ++ @cmd.handle_options %w[-r -d] ++ ++ use_ui @ui do ++ @cmd.execute ++ end ++ ++ expected = <<-EOF ++ ++*** REMOTE GEMS *** ++ ++a (2) ++ Authors: Abraham Lincoln ., . Hirohito ++ Homepage: http://a.example.com/. ++ ++ This is a lot of text. This is a lot of text. This is a lot of text. ++ This is a lot of text. ++ ++pl (1) ++ Platform: i386-linux ++ Author: A User ++ Homepage: http://example.com ++ ++ this is a summary ++ EOF ++ ++ assert_equal expected, @ui.output ++ assert_equal '', @ui.error ++ end ++ ++ def test_execute_details_truncates_summary ++ spec_fetcher do |fetcher| ++ fetcher.spec 'a', 2 do |s| ++ s.summary = 'This is a lot of text. ' * 10_000 ++ s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"] ++ s.homepage = "http://a.example.com/\x03" ++ end ++ ++ fetcher.legacy_platform ++ end ++ ++ @cmd.handle_options %w[-r -d] ++ ++ use_ui @ui do ++ @cmd.execute ++ end ++ ++ expected = <<-EOF ++ ++*** REMOTE GEMS *** ++ ++a (2) ++ Authors: Abraham Lincoln ., . Hirohito ++ Homepage: http://a.example.com/. ++ ++ Truncating the summary for a-2 to 100,000 characters: ++#{" This is a lot of text. This is a lot of text. This is a lot of text.\n" * 1449} This is a lot of te ++ + pl (1) + Platform: i386-linux + Author: A User +diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb +index 882981d344..dd049214fb 100644 +--- a/test/rubygems/test_gem_installer.rb ++++ b/test/rubygems/test_gem_installer.rb +@@ -1448,6 +1448,26 @@ def test_pre_install_checks_wrong_rubygems_version + end + end + ++ def test_pre_install_checks_malicious_name ++ spec = util_spec '../malicious', '1' ++ def spec.full_name # so the spec is buildable ++ "malicious-1" ++ end ++ def spec.validate; end ++ ++ util_build_gem spec ++ ++ gem = File.join(@gemhome, 'cache', spec.file_name) ++ ++ use_ui @ui do ++ @installer = Gem::Installer.at gem ++ e = assert_raises Gem::InstallError do ++ @installer.pre_install_checks ++ end ++ assert_equal '# has an invalid name', e.message ++ end ++ end ++ + def test_shebang + util_make_exec @spec, "#!/usr/bin/ruby" + +diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb +index cb994462cd..fbb7d89019 100644 +--- a/test/rubygems/test_gem_remote_fetcher.rb ++++ b/test/rubygems/test_gem_remote_fetcher.rb +@@ -241,6 +241,21 @@ def test_api_endpoint_ignores_trans_domain_values_that_end_with_original + dns.verify + end + ++ def test_api_endpoint_ignores_trans_domain_values_that_end_with_original_in_path ++ uri = URI.parse "http://example.com/foo" ++ target = MiniTest::Mock.new ++ target.expect :target, "evil.com/a.example.com" ++ ++ dns = MiniTest::Mock.new ++ dns.expect :getresource, target, [String, Object] ++ ++ fetch = Gem::RemoteFetcher.new nil, dns ++ assert_equal URI.parse("http://example.com/foo"), fetch.api_endpoint(uri) ++ ++ target.verify ++ dns.verify ++ end ++ + def test_api_endpoint_timeout_warning + uri = URI.parse "http://gems.example.com/foo" + +diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb +index d43289d745..0fcc11e78f 100644 +--- a/test/rubygems/test_gem_specification.rb ++++ b/test/rubygems/test_gem_specification.rb +@@ -2985,7 +2985,37 @@ def test_validate_name + @a1.validate + end + +- assert_equal 'invalid value for attribute name: ":json"', e.message ++ assert_equal 'invalid value for attribute name: ":json" must be a string', e.message ++ ++ @a1.name = [] ++ e = assert_raises Gem::InvalidSpecificationException do ++ @a1.validate ++ end ++ assert_equal "invalid value for attribute name: \"[]\" must be a string", e.message ++ ++ @a1.name = "" ++ e = assert_raises Gem::InvalidSpecificationException do ++ @a1.validate ++ end ++ assert_equal "invalid value for attribute name: \"\" must include at least one letter", e.message ++ ++ @a1.name = "12345" ++ e = assert_raises Gem::InvalidSpecificationException do ++ @a1.validate ++ end ++ assert_equal "invalid value for attribute name: \"12345\" must include at least one letter", e.message ++ ++ @a1.name = "../malicious" ++ e = assert_raises Gem::InvalidSpecificationException do ++ @a1.validate ++ end ++ assert_equal "invalid value for attribute name: \"../malicious\" can only include letters, numbers, dashes, and underscores", e.message ++ ++ @a1.name = "\ba\t" ++ e = assert_raises Gem::InvalidSpecificationException do ++ @a1.validate ++ end ++ assert_equal "invalid value for attribute name: \"\\ba\\t\" can only include letters, numbers, dashes, and underscores", e.message + end + + def test_validate_non_nil +diff --git a/test/rubygems/test_gem_text.rb b/test/rubygems/test_gem_text.rb +index a6e22e04da..04f3f605e8 100644 +--- a/test/rubygems/test_gem_text.rb ++++ b/test/rubygems/test_gem_text.rb +@@ -36,6 +36,10 @@ def test_format_text_trailing # for two spaces after . + assert_equal expected, format_text(text, 78) + end + ++ def test_format_removes_nonprintable_characters ++ assert_equal "text with weird .. stuff .", format_text("text with weird \x1b\x02 stuff \x7f", 40) ++ end ++ + def test_min3 + assert_equal 1, min3(1, 1, 1) + assert_equal 1, min3(1, 1, 2) +@@ -74,4 +78,11 @@ def test_levenshtein_distance_replace + assert_equal 7, levenshtein_distance("xxxxxxx", "ZenTest") + assert_equal 7, levenshtein_distance("zentest", "xxxxxxx") + end ++ ++ def test_truncate_text ++ assert_equal "abc", truncate_text("abc", "desc") ++ assert_equal "Truncating desc to 2 characters:\nab", truncate_text("abc", "desc", 2) ++ s = "ab" * 500_001 ++ assert_equal "Truncating desc to 1,000,000 characters:\n#{s[0, 1_000_000]}", truncate_text(s, "desc", 1_000_000) ++ end + end From 465aa6e58700c41b2b21d3ea4170c2ec881f6525 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 7 Sep 2017 11:44:59 +0200 Subject: [PATCH 3289/3392] supervisor: security bump to version 3.1.4 Fixes CVE-2017-11610 - The XML-RPC server in supervisor before 3.0.1, 3.1.x before 3.1.4, 3.2.x before 3.2.4, and 3.3.x before 3.3.3 allows remote authenticated users to execute arbitrary commands via a crafted XML-RPC request, related to nested supervisord namespace lookups. For more details, see https://github.com/Supervisor/supervisor/issues/964 While we're at it, add hashes for the license files. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 38a1c4821a163f932793a96e036f8fe451398506) Signed-off-by: Peter Korsgaard --- package/supervisor/supervisor.hash | 4 +++- package/supervisor/supervisor.mk | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/supervisor/supervisor.hash b/package/supervisor/supervisor.hash index 03f337e7d0..0ebc663be9 100644 --- a/package/supervisor/supervisor.hash +++ b/package/supervisor/supervisor.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 e32c546fe8d2a6e079ec4819c49fd24534d4075a58af39118d04367918b3c282 supervisor-3.1.3.tar.gz +sha256 82f75089f719a7a3ca87f35c89a03c20fd3c0912552c96eb6fa40274ced6604e supervisor-3.1.4.tar.gz +sha256 a85a622378c6a892ead1ce5d0488e446e106bf014d3b763fdbc1ad1ae38ee491 COPYRIGHT.txt +sha256 27ba0b2357ed6974d755ed53232c5ab8595622b3111bb91682708ea188cc3696 LICENSES.txt diff --git a/package/supervisor/supervisor.mk b/package/supervisor/supervisor.mk index 4c62b66feb..9b93b449a7 100644 --- a/package/supervisor/supervisor.mk +++ b/package/supervisor/supervisor.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUPERVISOR_VERSION = 3.1.3 -SUPERVISOR_SITE = http://pypi.python.org/packages/source/s/supervisor +SUPERVISOR_VERSION = 3.1.4 +SUPERVISOR_SITE = https://pypi.python.org/packages/12/50/cd330d1a0daffbbe54803cb0c4c1ada892b5d66db08befac385122858eee SUPERVISOR_LICENSE = BSD-like, rdflib (http_client.py), PSF (medusa), ZPL-2.1 SUPERVISOR_LICENSE_FILES = COPYRIGHT.txt LICENSES.txt SUPERVISOR_SETUP_TYPE = setuptools From b0753098a5dacdfee6e0ce8635ced56ef8c4d08e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 Sep 2017 09:13:32 +0200 Subject: [PATCH 3290/3392] linux-headers: bump 4.{9, 12, 13}.x series [Peter: drop 4.12.x/4.13.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 2aae8765fd8ce95a8a1f902f96293b610c5b8405) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index c83e3c5f6a..6794542012 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -224,5 +224,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.1.43" if BR2_KERNEL_HEADERS_4_1 default "4.4.87" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.48" if BR2_KERNEL_HEADERS_4_9 + default "4.9.49" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 251a65c915ede0c7a03543863d8aff44b488ed56 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 17 Aug 2017 06:12:30 +0200 Subject: [PATCH 3291/3392] package/librsync: fix build error with gcc7 Fixes http://autobuild.buildroot.net/results/4a1/4a1931565674442c6117b2b202a002dd0ec12a4b/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit eb7e07702c2f9d7c97a8ac31009ce3e56f4bd577) Signed-off-by: Peter Korsgaard --- .../librsync/0001-fix-build-with-clang.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/librsync/0001-fix-build-with-clang.patch diff --git a/package/librsync/0001-fix-build-with-clang.patch b/package/librsync/0001-fix-build-with-clang.patch new file mode 100644 index 0000000000..ea513c04d9 --- /dev/null +++ b/package/librsync/0001-fix-build-with-clang.patch @@ -0,0 +1,37 @@ +From 1175b1cd102ee15512185c7983868e5746959da0 Mon Sep 17 00:00:00 2001 +From: Adam Schubert +Date: Mon, 11 May 2015 04:25:45 +0200 +Subject: [PATCH] Fix build under clang + +Downloaded from upstream commit: +https://github.com/librsync/librsync/commit/1175b1cd102ee15512185c7983868e5746959da0.patch + +Signed-off-by: Bernd Kuhls + +--- + delta.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/delta.c b/delta.c +index 19498f9..72afdf6 100644 +--- a/delta.c ++++ b/delta.c +@@ -126,12 +126,12 @@ static rs_result rs_delta_s_scan(rs_job_t *job); + static rs_result rs_delta_s_flush(rs_job_t *job); + static rs_result rs_delta_s_end(rs_job_t *job); + void rs_getinput(rs_job_t *job); +-inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len); +-inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len); +-inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len); +-inline rs_result rs_appendflush(rs_job_t *job); +-inline rs_result rs_processmatch(rs_job_t *job); +-inline rs_result rs_processmiss(rs_job_t *job); ++static inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len); ++static inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len); ++static inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len); ++static inline rs_result rs_appendflush(rs_job_t *job); ++static inline rs_result rs_processmatch(rs_job_t *job); ++static inline rs_result rs_processmiss(rs_job_t *job); + + /** + * \brief Get a block of data if possible, and see if it matches. From 3196246a9ba12d246805a9f7f9491baa137a1590 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 12 Sep 2017 20:14:30 +0200 Subject: [PATCH 3292/3392] package/librsync: security bump to version 2.0.0 Removed patch applied upstream, switched to cmake-package following upstream removal of autoconf. Short summary of changes: version 1.0.1 - switched from autoconf to cmake version 1.0.0: - fixed CVE-2014-8242 - project moved to github Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit b860bd83b22429175542f885fdd1fc52d770eeb2) Signed-off-by: Peter Korsgaard --- .../librsync/0001-fix-build-with-clang.patch | 37 ------------------- package/librsync/Config.in | 2 +- package/librsync/librsync.hash | 2 +- package/librsync/librsync.mk | 6 +-- 4 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 package/librsync/0001-fix-build-with-clang.patch diff --git a/package/librsync/0001-fix-build-with-clang.patch b/package/librsync/0001-fix-build-with-clang.patch deleted file mode 100644 index ea513c04d9..0000000000 --- a/package/librsync/0001-fix-build-with-clang.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1175b1cd102ee15512185c7983868e5746959da0 Mon Sep 17 00:00:00 2001 -From: Adam Schubert -Date: Mon, 11 May 2015 04:25:45 +0200 -Subject: [PATCH] Fix build under clang - -Downloaded from upstream commit: -https://github.com/librsync/librsync/commit/1175b1cd102ee15512185c7983868e5746959da0.patch - -Signed-off-by: Bernd Kuhls - ---- - delta.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/delta.c b/delta.c -index 19498f9..72afdf6 100644 ---- a/delta.c -+++ b/delta.c -@@ -126,12 +126,12 @@ static rs_result rs_delta_s_scan(rs_job_t *job); - static rs_result rs_delta_s_flush(rs_job_t *job); - static rs_result rs_delta_s_end(rs_job_t *job); - void rs_getinput(rs_job_t *job); --inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len); --inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len); --inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len); --inline rs_result rs_appendflush(rs_job_t *job); --inline rs_result rs_processmatch(rs_job_t *job); --inline rs_result rs_processmiss(rs_job_t *job); -+static inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t *match_len); -+static inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t match_len); -+static inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len); -+static inline rs_result rs_appendflush(rs_job_t *job); -+static inline rs_result rs_processmatch(rs_job_t *job); -+static inline rs_result rs_processmiss(rs_job_t *job); - - /** - * \brief Get a block of data if possible, and see if it matches. diff --git a/package/librsync/Config.in b/package/librsync/Config.in index 5dcdfc8f2e..652f0cb276 100644 --- a/package/librsync/Config.in +++ b/package/librsync/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBRSYNC remote file synchronization that was popularized by the rsync utility and is used in rproxy. - http://sourceforge.net/projects/librsync/ + https://github.com/librsync/librsync diff --git a/package/librsync/librsync.hash b/package/librsync/librsync.hash index 55ace76394..2d5e2e0028 100644 --- a/package/librsync/librsync.hash +++ b/package/librsync/librsync.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 librsync-0.9.7.tar.gz +sha256 b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169 librsync-v2.0.0.tar.gz diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk index d475c7333d..3031f1a177 100644 --- a/package/librsync/librsync.mk +++ b/package/librsync/librsync.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBRSYNC_VERSION = 0.9.7 -LIBRSYNC_SITE = http://downloads.sourceforge.net/project/librsync/librsync/$(LIBRSYNC_VERSION) +LIBRSYNC_VERSION = v2.0.0 +LIBRSYNC_SITE = $(call github,librsync,librsync,$(LIBRSYNC_VERSION)) LIBRSYNC_LICENSE = LGPLv2.1+ LIBRSYNC_LICENSE_FILES = COPYING LIBRSYNC_INSTALL_STAGING = YES LIBRSYNC_DEPENDENCIES = zlib bzip2 popt -$(eval $(autotools-package)) +$(eval $(cmake-package)) From 1ce4be9c5e6abdf0c2616003485b2cef10b94ce7 Mon Sep 17 00:00:00 2001 From: Petr Kulhavy Date: Tue, 12 Sep 2017 00:13:40 +0200 Subject: [PATCH 3293/3392] download/git: force gzip compression level 6 Force gzip compression level 6 when calculating hash of a downloaded GIT repo. To make sure the tar->gzip->checksum chain always provides consistent result.` The script was relying on the default compression level, which must not be necessarily consistent among different gzip versions. The level 6 is gzip's current default compression level. Signed-off-by: Petr Kulhavy Acked-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard (cherry picked from commit 04a22cf1b521acb5634ed083e0381d42979d1698) Signed-off-by: Peter Korsgaard --- support/download/git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/download/git b/support/download/git index 056057c700..033a984f10 100755 --- a/support/download/git +++ b/support/download/git @@ -98,4 +98,4 @@ LC_ALL=C sort <"${basename}.list" >"${basename}.list.sorted" # sources.buildroot.org and used in the *.hash files tar cf - --numeric-owner --owner=0 --group=0 --mtime="${date}" --format=gnu \ -T "${basename}.list.sorted" >"${output}.tar" -gzip -n <"${output}.tar" >"${output}" +gzip -6 -n <"${output}.tar" >"${output}" From aaeae2707270245b284edc8587114d41430cb3bd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Jun 2017 09:45:37 +0200 Subject: [PATCH 3294/3392] package/imagemagick: change download url to github Upstream quickly removes old versions from http://www.imagemagick.org/download/releases For our LTS versions we should switch to a stable upstream repo which provides all released versions. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 02edd7cd806bf9cac0633611084e3d980f1c701e) Signed-off-by: Peter Korsgaard --- package/imagemagick/imagemagick.hash | 4 ++-- package/imagemagick/imagemagick.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 173dd415c7..3e2749dd4f 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 0058fcde533986334458a5c99600b1b9633182dd9562cbad4ba618c5ccf2a28f ImageMagick-7.0.5-10.tar.xz +# Locally computed +sha256 bd965d36a65cbcd420ec79a509a5ce0ecdfef036770cdc87fcd5374b9ed15ea7 7.0.5-10.tar.gz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 7aade62dad..23552d7087 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -5,8 +5,8 @@ ################################################################################ IMAGEMAGICK_VERSION = 7.0.5-10 -IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz -IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases +IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz +IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE From fc6dda414cd12196c09b0eb6ba43041bc515f837 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Jun 2017 09:45:38 +0200 Subject: [PATCH 3295/3392] package/imagemagick: bump version to 7.0.6-0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit dfde97dce57cee38febb1b5687876c34df1f9bbc) 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 3e2749dd4f..d3097f5224 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 bd965d36a65cbcd420ec79a509a5ce0ecdfef036770cdc87fcd5374b9ed15ea7 7.0.5-10.tar.gz +sha256 3a6b21352ed0eb984bdbd0943471df8605b978b527125921e97e5b404f2bee3a 7.0.6-0.tar.gz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 23552d7087..22c29d36a0 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.5-10 +IMAGEMAGICK_VERSION = 7.0.6-0 IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive IMAGEMAGICK_LICENSE = Apache-2.0 From fe8577d2ce433533ed7c3c2e111fc07d9b32c0e9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 17 Sep 2017 11:16:52 +0200 Subject: [PATCH 3296/3392] package/imagemagick: security bump to version 7.0.7-1 Quoting CVE-related issues from https://github.com/ImageMagick/ImageMagick/blob/master/ChangeLog 2017-07-29 7.0.6-5 Glenn Randers-Pehrson * Fix improper use of NULL in the JNG decoder (CVE-2017-11750, Reference https://github.com/ImageMagick/ImageMagick/issues/632). 2017-07-24 7.0.6-4 Cristy * Fixed numerous memory leaks (reference https://github.com/ImageMagick/ImageMagick/issues) including https://github.com/ImageMagick/ImageMagick/issues/618 (CVE-2017-12676). 2017-07-23 7.0.6-3 Glenn Randers-Pehrson * Fix memory leaks when reading a malformed JNG image: https://github.com/ImageMagick/ImageMagick/issues/600 (CVE-2017-13141), https://github.com/ImageMagick/ImageMagick/issues/602 (CVE-2017-12565). 2017-07-19 7.0.6-2 Cristy * coders/png.c: fixed memory leak of quantum_info (CVE-2017-11539, reference https://github.com/ImageMagick/ImageMagick/issues/582 * coders/png.c: fixed NULL dereference when trying to write an empty MNG (CVE-2017-11522, reference https://github.com/ImageMagick/ImageMagick/issues/586). 2017-06-22 7.0.6-1 Glenn Randers-Pehrson * Stop a memory leak in read_user_chunk_callback() (reference https://github.com/ImageMagick/ImageMagick/issues/517, CVE 2017-11310). Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 1cf1b98de6c81fd21076e6330837bd05e563b040) 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 d3097f5224..92880a9aec 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 3a6b21352ed0eb984bdbd0943471df8605b978b527125921e97e5b404f2bee3a 7.0.6-0.tar.gz +sha256 5a45e29509dbb23793a9c8db5c47ef1114c1ee82c9ca60053eaf06b3fc243e2c 7.0.7-1.tar.gz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 22c29d36a0..9043ce8e5e 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.6-0 +IMAGEMAGICK_VERSION = 7.0.7-1 IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive IMAGEMAGICK_LICENSE = Apache-2.0 From f0b6a90eae8c17687a72eb0da7019eddd365a43b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 13 Sep 2017 14:13:01 +0200 Subject: [PATCH 3297/3392] bluez5_utils: add upstream security fix for CVE-2017-1000250 Fixes CVE-2017-1000250 - All versions of the SDP server in BlueZ 5.46 and earlier are vulnerable to an information disclosure vulnerability which allows remote attackers to obtain sensitive information from the bluetoothd process memory. This vulnerability lies in the processing of SDP search attribute requests. Signed-off-by: Peter Korsgaard --- ...ounds-heap-read-in-service_search_at.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/bluez5_utils/0002-sdp-Fix-Out-of-bounds-heap-read-in-service_search_at.patch diff --git a/package/bluez5_utils/0002-sdp-Fix-Out-of-bounds-heap-read-in-service_search_at.patch b/package/bluez5_utils/0002-sdp-Fix-Out-of-bounds-heap-read-in-service_search_at.patch new file mode 100644 index 0000000000..a73c372e68 --- /dev/null +++ b/package/bluez5_utils/0002-sdp-Fix-Out-of-bounds-heap-read-in-service_search_at.patch @@ -0,0 +1,29 @@ +From 9e009647b14e810e06626dde7f1bb9ea3c375d09 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Wed, 13 Sep 2017 10:01:40 +0300 +Subject: [PATCH] sdp: Fix Out-of-bounds heap read in service_search_attr_req + function + +Check if there is enough data to continue otherwise return an error. + +Signed-off-by: Peter Korsgaard +--- + src/sdpd-request.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sdpd-request.c b/src/sdpd-request.c +index 1eefdce1a..318d04467 100644 +--- a/src/sdpd-request.c ++++ b/src/sdpd-request.c +@@ -917,7 +917,7 @@ static int service_search_attr_req(sdp_req_t *req, sdp_buf_t *buf) + } else { + /* continuation State exists -> get from cache */ + sdp_buf_t *pCache = sdp_get_cached_rsp(cstate); +- if (pCache) { ++ if (pCache && cstate->cStateValue.maxBytesSent < pCache->data_size) { + uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent); + pResponse = pCache->data; + memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent); +-- +2.11.0 + From a86d28d850583091bd1a9d137be12794b1102eae Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 18 Sep 2017 19:38:48 +0200 Subject: [PATCH 3298/3392] cmake: explicitly disable openssl support for host-cmake host-cmake will optionally link with openssl for the embedded copy of libarchive if available, leaking host dependencies and possibly causing build issues in case of compatibility issues - E.G. the host-cmake version we have in 2017.02.x doesn't build against openssl-1.1.0+: https://github.com/libarchive/libarchive/issues/810 The openssl support in libarchive is unlikely to be needed, so explicitly disable it. Signed-off-by: Peter Korsgaard (cherry picked from commit f87138339b17bc2b1d84c59ea176abb941413550) Signed-off-by: Peter Korsgaard --- package/cmake/cmake.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index bc555092c2..69ddbb9b43 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -46,6 +46,7 @@ define HOST_CMAKE_CONFIGURE_CMDS -DCMAKE_C_FLAGS="$(HOST_CMAKE_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(HOST_CMAKE_CXXFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ + -DCMAKE_USE_OPENSSL:BOOL=OFF \ -DBUILD_CursesDialog=OFF \ ) endef From 557039368d2509288eb892c01912466d9a6b9f55 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 18 Sep 2017 11:34:18 +0200 Subject: [PATCH 3299/3392] docs/manual: fix typo Signed-off-by: Luca Ceresoli Signed-off-by: Peter Korsgaard (cherry picked from commit e10e4d19e3c02a9d251499172a65c77c59e15a67) Signed-off-by: Peter Korsgaard --- docs/manual/using-buildroot-development.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/manual/using-buildroot-development.txt b/docs/manual/using-buildroot-development.txt index e167849cdc..1071de5132 100644 --- a/docs/manual/using-buildroot-development.txt +++ b/docs/manual/using-buildroot-development.txt @@ -50,11 +50,11 @@ BUSYBOX_OVERRIDE_SRCDIR = /home/bob/busybox/ When Buildroot finds that for a given package, an +_OVERRIDE_SRCDIR+ has been defined, it will no longer attempt to download, extract and patch the package. Instead, it will directly use -the source code available in in the specified directory and +make -clean+ will not touch this directory. This allows to point Buildroot -to your own directories, that can be managed by Git, Subversion, or -any other version control system. To achieve this, Buildroot will use -_rsync_ to copy the source code of the component from the specified +the source code available in the specified directory and +make clean+ +will not touch this directory. This allows to point Buildroot to your +own directories, that can be managed by Git, Subversion, or any other +version control system. To achieve this, Buildroot will use _rsync_ to +copy the source code of the component from the specified +_OVERRIDE_SRCDIR+ to +output/build/-custom/+. This mechanism is best used in conjunction with the +make From 5fc7f48234cfd91a6848024a3ed456e481da2e7b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 17 Sep 2017 20:52:16 +0200 Subject: [PATCH 3300/3392] package/proxychains-ng: security bump to version 4.11 Version 4.9 fixes CVE-2015-3887: https://github.com/rofl0r/proxychains-ng/issues/60 Added md5 & sha1 hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 9d71b8978aa24dd80c51af239633b17437140c2b) Signed-off-by: Peter Korsgaard --- package/proxychains-ng/proxychains-ng.hash | 5 ++++- package/proxychains-ng/proxychains-ng.mk | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/proxychains-ng/proxychains-ng.hash b/package/proxychains-ng/proxychains-ng.hash index e2e8c01af0..7ca4d5e27a 100644 --- a/package/proxychains-ng/proxychains-ng.hash +++ b/package/proxychains-ng/proxychains-ng.hash @@ -1,2 +1,5 @@ +# From https://sourceforge.net/projects/proxychains-ng/files/ +md5 34d840eb184e96bff418201c28a935c5 proxychains-ng-4.11.tar.bz2 +sha1 00bc3dc18f2b638c79112c99f082a7a2878beaad proxychains-ng-4.11.tar.bz2 # Locally computed: -sha256 859a717e18ed88c9291078a6ed8748dfe95c61220993203890fef8a04d28dda5 proxychains-4.6.tar.bz2 +sha256 dcc4149808cd1fb5d9663cc09791f478805816b1f017381f424414c47f6376b6 proxychains-ng-4.11.tar.bz2 diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index 54e7dcd631..cf2379db95 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -4,8 +4,8 @@ # ################################################################################ -PROXYCHAINS_NG_VERSION = 4.6 -PROXYCHAINS_NG_SOURCE = proxychains-$(PROXYCHAINS_NG_VERSION).tar.bz2 +PROXYCHAINS_NG_VERSION = 4.11 +PROXYCHAINS_NG_SOURCE = proxychains-ng-$(PROXYCHAINS_NG_VERSION).tar.bz2 PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng PROXYCHAINS_NG_LICENSE = GPLv2+ PROXYCHAINS_NG_LICENSE_FILES = COPYING From 43f910fc7d11b09044d2870bc2096f82ff22f997 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 19 Sep 2017 20:54:34 +0200 Subject: [PATCH 3301/3392] package/apache: add patch to fix CVE-2017-9798 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 6d24caf0cd97de39aa1d6f52b58db8c0d63a89ee) Signed-off-by: Peter Korsgaard --- package/apache/0003-CVS-2017-9798.patch | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/apache/0003-CVS-2017-9798.patch diff --git a/package/apache/0003-CVS-2017-9798.patch b/package/apache/0003-CVS-2017-9798.patch new file mode 100644 index 0000000000..dc0a67a1b7 --- /dev/null +++ b/package/apache/0003-CVS-2017-9798.patch @@ -0,0 +1,30 @@ +core: Disallow Methods' registration at run time (.htaccess), they may +be used only if registered at init time (httpd.conf). + +Calling ap_method_register() in children processes is not the right scope +since it won't be shared for all requests. + +git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1807655 13f79535-47bb-0310-9956-ffa450edef68 + +Fixes CVE-2017-9798: https://nvd.nist.gov/vuln/detail/CVE-2017-9798 + +Downloaded from upstream repo: +https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch + +Signed-off-by: Bernd Kuhls + +--- a/server/core.c 2017/08/16 16:50:29 1805223 ++++ b/server/core.c 2017/09/08 13:13:11 1807754 +@@ -2266,6 +2266,12 @@ + /* method has not been registered yet, but resource restriction + * is always checked before method handling, so register it. + */ ++ if (cmd->pool == cmd->temp_pool) { ++ /* In .htaccess, we can't globally register new methods. */ ++ return apr_psprintf(cmd->pool, "Could not register method '%s' " ++ "for %s from .htaccess configuration", ++ method, cmd->cmd->name); ++ } + methnum = ap_method_register(cmd->pool, + apr_pstrdup(cmd->pool, method)); + } From 1944fe8b4608e5a6de2fda4f2ae3d5c734234918 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 19 Sep 2017 13:05:26 +0200 Subject: [PATCH 3302/3392] pkgconf: update upstream URL in Config.in The download location got changed two years ago when the version was bumped to 0.9.12, but the upstream URL in Config.in wasn't updated. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 13cb944aab01daf1683c466233a997afd749aa9a) Signed-off-by: Peter Korsgaard --- package/pkgconf/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkgconf/Config.in b/package/pkgconf/Config.in index f95847fa3c..9d5d9ab194 100644 --- a/package/pkgconf/Config.in +++ b/package/pkgconf/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_PKGCONF but was written from scratch in the summer of 2011 to replace pkg-config, which now needs itself to build itself - https://github.com/nenolod/pkgconf + https://github.com/pkgconf/pkgconf From 643783f9a9174a0f141bb58ee032e18f48819cf8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 20 Sep 2017 09:53:40 +0200 Subject: [PATCH 3303/3392] linux-headers: bump 3.2.x and 4.{4, 9, 12, 13}.x series [Peter: drop 4.12.x/4.13.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit b4afe7a8cf54c1e989829b30ad304f23a394f770) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6794542012..345236d7cf 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -214,7 +214,7 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.92" if BR2_KERNEL_HEADERS_3_2 + default "3.2.93" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.107" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.43" if BR2_KERNEL_HEADERS_4_1 - default "4.4.87" if BR2_KERNEL_HEADERS_4_4 + default "4.4.88" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.49" if BR2_KERNEL_HEADERS_4_9 + default "4.9.51" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 99ab71180fe9dcc646874c79a3825e43bb426e3f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 21 Sep 2017 17:44:41 +0200 Subject: [PATCH 3304/3392] linux-headers: bump 3.18.x and 4.1.x series Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 345236d7cf..89ac5b6a39 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,10 +218,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.107" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "3.18.70" if BR2_KERNEL_HEADERS_3_18 + default "3.18.71" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.43" if BR2_KERNEL_HEADERS_4_1 + default "4.1.44" if BR2_KERNEL_HEADERS_4_1 default "4.4.88" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 default "4.9.51" if BR2_KERNEL_HEADERS_4_9 From ca10c68c6d8701cbbfdd84d052a858ad69cabf95 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 21 Sep 2017 15:26:56 +0200 Subject: [PATCH 3305/3392] package/ffmpeg: security bump to version 3.2.8 Fixes a number of integer overflows and DoS issues. 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 f4470f9c85..dcfc8aa8c6 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 28e75fc32485a88035a7ebf0a956a1e5c7e93b440dd4bbd6bc30c7268cf34fe9 ffmpeg-3.2.7.tar.xz +sha256 42e7362692318afc666f14378dd445effa9a1b09787504a6ab5811fe442674cd ffmpeg-3.2.8.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 00db404593..9b287c7aaa 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.2.7 +FFMPEG_VERSION = 3.2.8 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES From 6f4d4ae57e3b431e8ece83d698e1326e5d8af6f0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 21 Sep 2017 17:42:08 +0200 Subject: [PATCH 3306/3392] package/samba4: security bump to version 4.5.14 Release notes: https://www.samba.org/samba/history/samba-4.5.14.html Fixes - CVE-2017-12150 (SMB1/2/3 connections may not require signing where they should) - CVE-2017-12151 (SMB3 connections don't keep encryption across DFS redirects) - CVE-2017-12163 (Server memory information leak over SMB1) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 2 +- package/samba4/samba4.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 0d8b111082..847be87c1c 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5fc4762d2259469bfb0067c10f77378cb720f2ebdaf2f37b5ca1918dbe84d04d samba-4.5.13.tar.gz +sha256 15dc04fd2b19081daf1118318f43f88ef7260b3fc6e4f86ee7c7913bb7c92ed9 samba-4.5.14.tar.gz diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 08fa4008d6..e4778d0a5d 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.5.13 +SAMBA4_VERSION = 4.5.14 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From d6c24f879f073ec43c969c8fe62b95a73d0fc031 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 20 Sep 2017 11:17:18 +0300 Subject: [PATCH 3307/3392] flashrom: fix static build with uClibc Define HAVE_STRNLEN to avoid local strnlen() definition. Fixes: http://autobuild.buildroot.net/results/7dc/7dc4298e3a07c73e03f70205516d68a0f4c2d297/ http://autobuild.buildroot.net/results/e36/e362848eb45f6b8100131361e6e5faa546f0bbd8/ http://autobuild.buildroot.net/results/69e/69ef10ec710f418b4d10c1edb4f2ce2e49b522bf/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 57f4efed7965e573a444544363d0cf74cec13be1) Signed-off-by: Peter Korsgaard --- package/flashrom/flashrom.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 7ebda338f4..c155d4041e 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -12,7 +12,8 @@ FLASHROM_LICENSE = GPLv2+ FLASHROM_LICENSE_FILES = COPYING define FLASHROM_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -DHAVE_STRNLEN" -C $(@D) endef define FLASHROM_INSTALL_TARGET_CMDS From 0995804d44e90c2d25804a9f1e905226683f4ac5 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 22 Feb 2017 16:14:08 -0300 Subject: [PATCH 3308/3392] gdk-pixbuf: bump to version 2.36.5 This release needs a new tweak regarding loaders.cache - it's now used to build the thumbnailer. Since we already generate it using the host variant for the target we can re-use this for the build step. It's not necessary to used the tweaked version since the build one is only used to account for mime types, not the plugins/loaders themselves. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni (cherry picked from commit 487b419cc647da18f04a98ee69c160705f0c44e8) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.hash | 4 ++-- package/gdk-pixbuf/gdk-pixbuf.mk | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index 827b386380..e92f4982a0 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.36/gdk-pixbuf-2.36.4.sha256sum -sha256 0b19901c3eb0596141d2d48ddb9dac79ad1524bdf59366af58ab38fcb9ee7463 gdk-pixbuf-2.36.4.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.5.sha256sum +sha256 7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc gdk-pixbuf-2.36.5.tar.xz diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 4fe6bd7b7f..e4d3658c51 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,7 +5,7 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.36 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).4 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).5 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+ @@ -73,5 +73,14 @@ define GDK_PIXBUF_DISABLE_TESTS endef GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS +# Target gdk-pixbuf needs loaders.cache populated to build for the +# thumbnailer. Use the host-built since it matches the target options +# regarding mime types (which is the used information). +define GDK_PIXBUF_COPY_LOADERS_CACHE + cp -f $(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ + $(@D)/gdk-pixbuf +endef +GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 6c991406885f1cc965f61b33c704ca90bda99ea2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 23 Feb 2017 16:44:48 -0300 Subject: [PATCH 3309/3392] gdk-pixbuf: copy loaders.cache later on Trying to copy loaders.cache from host-gdk-pixbuf to the gdk-pixbuf build directory in the post-patch hook is too early when using TLP (it breaks horribly) since host-gdk-pixbuf isn't built yet during the massive unpack/patch cycle. Switch it to the pre-build hook instead which ensures that gdk-pixbuf dependencies were already built. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni (cherry picked from commit 1f4e1656bc1176442671104acde1e4033377636e) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index e4d3658c51..0f4eeb1eba 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -80,7 +80,7 @@ define GDK_PIXBUF_COPY_LOADERS_CACHE cp -f $(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ $(@D)/gdk-pixbuf endef -GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE +GDK_PIXBUF_PRE_BUILD_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 4ec2c80824063fd7f6f1315bee8ca9de1541d331 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 27 Mar 2017 17:22:47 +0100 Subject: [PATCH 3310/3392] gdk-pixbuf: bump version to 2.36.6 Signed-off-by: Vicente Olivert Riera Signed-off-by: Thomas Petazzoni (cherry picked from commit 0fcf03eb5d976512477467580687f763677a132a) 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 e92f4982a0..ebb03a8684 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.36/gdk-pixbuf-2.36.5.sha256sum -sha256 7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc gdk-pixbuf-2.36.5.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.6.sha256sum +sha256 455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c gdk-pixbuf-2.36.6.tar.xz diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index 0f4eeb1eba..bf83b19907 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,7 +5,7 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.36 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).5 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).6 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 b6b99d28efd7dbf60a0d644f906f45217d9c44a8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 21 Sep 2017 09:04:16 +0200 Subject: [PATCH 3311/3392] gdk-pixbuf: security bump to version 2.36.10 Fixes the following security issues: CVE-2017-2862 - An exploitable heap overflow vulnerability exists in the gdk_pixbuf__jpeg_image_load_increment functionality of Gdk-Pixbuf 2.36.6. A specially crafted jpeg file can cause a heap overflow resulting in remote code execution. An attacker can send a file or url to trigger this vulnerability. CVE-2017-2870 - An exploitable integer overflow vulnerability exists in the tiff_image_parse functionality of Gdk-Pixbuf 2.36.6 when compiled with Clang. A specially crafted tiff file can cause a heap-overflow resulting in remote code execution. An attacker can send a file or a URL to trigger this vulnerability. CVE-2017-6311 - gdk-pixbuf-thumbnailer.c in gdk-pixbuf allows context-dependent attackers to cause a denial of service (NULL pointer dereference and application crash) via vectors related to printing an error message. The host version now needs the same workaround as we do for the target to not pull in shared-mime-info. Also add a hash for the license file while we're at it. Signed-off-by: Peter Korsgaard (cherry picked from commit 3853675ae03df209253c34d292eb3b9535e3f68c) Signed-off-by: Peter Korsgaard --- package/gdk-pixbuf/gdk-pixbuf.hash | 6 ++++-- package/gdk-pixbuf/gdk-pixbuf.mk | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index ebb03a8684..9cb947f195 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,2 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.6.sha256sum -sha256 455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c gdk-pixbuf-2.36.6.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.10.sha256sum +sha256 f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace gdk-pixbuf-2.36.10.tar.xz +# Locally calculated +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index bf83b19907..5e8bb41728 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,7 +5,7 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.36 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).6 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).10 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+ @@ -20,6 +20,9 @@ GDK_PIXBUF_CONF_ENV = \ ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) \ gio_can_sniff=no +HOST_GDK_PIXBUF_CONF_ENV = \ + gio_can_sniff=no + GDK_PIXBUF_CONF_OPTS = --disable-glibtest ifneq ($(BR2_PACKAGE_LIBPNG),y) From b449b866378c409f72be0b9c9ee4678c41b59cee Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 13 Sep 2017 15:01:14 +0200 Subject: [PATCH 3312/3392] bind: bump to version 9.11.2 Adds support for the new ICANN DNSSEC root key for the upcoming KSK rollover (Oct 11): https://www.icann.org/resources/pages/ksk-rollover For more details, see the release notes: https://kb.isc.org/article/AA-01522 Signed-off-by: Peter Korsgaard (cherry picked from commit f3e3b36159fa077400e7151b3e3d03082a897b2e) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 3a631def65..95362309e1 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,3 +1,3 @@ -# Verified from http://ftp.isc.org/isc/bind9/9.11.1-P3/bind-9.11.1-P3.tar.gz.sha256.asc -sha256 52426e75432e46996dc90f24fca027805a341c38fbbb022b60dc9acd2677ccf4 bind-9.11.1-P3.tar.gz +# Verified from http://ftp.isc.org/isc/bind9/9.11.2/bind-9.11.2.tar.gz.sha256.asc +sha256 7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a bind-9.11.2.tar.gz sha256 d3906dfe153e2c48440d3ca1d5319f5e89b4b820cdfc5d0779c23d7ac2b175e9 COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index c5208c0f56..0fca543612 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.11.1-P3 +BIND_VERSION = 9.11.2 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) From 1f8ed52c552fa58e4fcab3ec157d00af72dba8c3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 13 Sep 2017 15:01:15 +0200 Subject: [PATCH 3313/3392] bind: use http:// instead of ftp:// for site To avoid issues with firewalls blocking ftp. Signed-off-by: Peter Korsgaard (cherry picked from commit 771bb2d58d945ebd2909dc8ca5cccf30f189c581) Signed-off-by: Peter Korsgaard --- package/bind/bind.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 0fca543612..4465a2f73c 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -5,7 +5,7 @@ ################################################################################ BIND_VERSION = 9.11.2 -BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) +BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. BIND_MAKE = $(MAKE1) BIND_INSTALL_STAGING = YES From 8fbd4de7c24ffb762e028afccc87253bf2b9affc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 23 Sep 2017 11:04:39 +0200 Subject: [PATCH 3314/3392] CHANGES: update with recent changes Signed-off-by: Peter Korsgaard --- CHANGES | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CHANGES b/CHANGES index 73936428e1..99ee902348 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,31 @@ +2017.02.6, Not yet released + + Important / security related fixes. + + Cmake: Ensure correct pkg-config is used when building host + packages + + fs/iso9660: Ensure files from earlier builds are not included. + + Updated/fixed packages: apache, bcusdk, bind, binutils, + bluez5_utils, botan, cmake, connman, dbus, dialog, e2fsprogs, + faad2, fakeroot, ffmpeg, file, flashrom, gcc, gd, gdb, + gdk-pixbuf, git, gnupg, gpsd, grub2, imagemagick, iostat, + iucode-tool, jack2, libarchive, libcurl, libgcrypt, + libphidget, librsync, librsvg, libsoup, libxml2, linux-tools, + lua, mariadb, mbedtls, mediastreamer, minidlna, netplug, + nss-pam-ldapd, nvidia-driver, openjpeg, postgresql, + proxychains-ng, python-libconfig, python-service-identity, qt, + rpcbind, ruby, samba4, squashfs, squid, strongswan, + subversion, supervisor, sysvinit, tcpdump, transmission, + unrar, valgrind, vim, webkitgtk, whois, xen, zmqpp + + Issues resolved (http://bugs.buildroot.org): + + #10141: Squashfs extended attribute failures + #10261: Grub2 fails to build for x86_64 + #10276: BR2_PACKAGE_LINUX_TOOLS_GPIO fails for MIPS with... + 2017.02.5, Released July 27th, 2017 Important / security related fixes. From 4adb61ec73a74767851eccb6b7c8d6242fe58fcd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 23 Sep 2017 11:23:36 +0200 Subject: [PATCH 3315/3392] tor: security bump to version 0.2.9.12 Fixes CVE-2017-0380: Stack disclosure in hidden services logs when SafeLogging disabled For more details, see: https://trac.torproject.org/projects/tor/ticket/23490 Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 2 +- package/tor/tor.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index d42c534985..ba0b47af15 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 c1959bebff9a546a54cbedb58c8289a42441991af417d2d16f7b336be8903221 tor-0.2.9.11.tar.gz +sha256 6e7466625d53812f23c2ad60a873c5855f63f756fde0fc5cbeda8d32cee1086b tor-0.2.9.12.tar.gz diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 7bbd2f3430..4cc5c48351 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.2.9.11 +TOR_VERSION = 0.2.9.12 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3c TOR_LICENSE_FILES = LICENSE From 1a22a5fcb3811144fe2d227829a62f6b1b3250f4 Mon Sep 17 00:00:00 2001 From: Olivier Schonken Date: Fri, 8 Sep 2017 09:52:17 +0200 Subject: [PATCH 3316/3392] openjpeg: Fix malloc poison issue The malloc poison issue has been fixed upstream, this patch will thus only be temporary. Fixes the following autobuild issues sparc | http://autobuild.buildroot.net/results/c1b7a316ca2a4db49023f304dbc7fd5fed05bd9d bfin | http://autobuild.buildroot.net/results/031ece7a72e76a9155938cb283de859bd12a8171 sh4 | http://autobuild.buildroot.net/results/88664451f71c12ccd94e874d408fbb680bea1695 xtensa | http://autobuild.buildroot.net/results/fbede64a5a86d4868b6da0ab1275e75803235af0 powerpc | http://autobuild.buildroot.net/results/6c641650509048039b18fbeb010dbca0f0fc5292 microblazeel | http://autobuild.buildroot.net/results/fa2d5272b2db73cbfa441ead9250157c5626ab15 mips64el | http://autobuild.buildroot.net/results/fc96f6628f71e05d9a74e0e13e50178d29a2c495 sh4 | http://autobuild.buildroot.net/results/a6d6a6dcb9b4fa250edaaf5935762c5820457b23 x86_64 | http://autobuild.buildroot.net/results/47b4ca2cc661582d86830b9353a6c8af86e4ba35 arc | http://autobuild.buildroot.net/results/08e2e4eca6c3dbde8116a649dbf46e52ded45d10 arc | http://autobuild.buildroot.net/results/899fa044aab7ee28acfa71544f2105da4a5c97d5 arm | http://autobuild.buildroot.net/results/6016f6885b21d6e8c6199a6833c7acce6210ecc6 arm | http://autobuild.buildroot.net/results/adbb3c76497e89161535c711de98809a0fa168a7 or1k | http://autobuild.buildroot.net/results/de3ef69a72d2c2082e202fbed702c53a51274fef mips64el | http://autobuild.buildroot.net/results/39b186b13001a810e0992b52321f1015b445d2fd x86_64 | http://autobuild.buildroot.net/results/22c6a29a1ded6aedf01adfdfcf26302248dba80c arm | http://autobuild.buildroot.net/results/b62c54b727eb5f576c4a517a69c495b537c3b69a m68k | http://autobuild.buildroot.net/results/a826561c5786be5f0088b50b633210593e23ffff arm | http://autobuild.buildroot.net/results/d32ec927a5e4d5644cb3641014bcf6ebe5c14490 Signed-off-by: Olivier Schonken Tested-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 19d80818654977948f32496cde2537719b150850) Signed-off-by: Peter Korsgaard --- .../0003-avoid-malloc-poisoning-issue.patch | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 package/openjpeg/0003-avoid-malloc-poisoning-issue.patch diff --git a/package/openjpeg/0003-avoid-malloc-poisoning-issue.patch b/package/openjpeg/0003-avoid-malloc-poisoning-issue.patch new file mode 100644 index 0000000000..8463e20d6d --- /dev/null +++ b/package/openjpeg/0003-avoid-malloc-poisoning-issue.patch @@ -0,0 +1,54 @@ +From 51a1dcaa6ed5713520dca36fc58cd9240c08b7ca Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Thu, 7 Sep 2017 17:52:59 +0200 +Subject: [PATCH] Avoid malloc poisoning issue when including of + uclibc (#1013) + +Signed-off-by: Olivier Schonken +--- + src/lib/openjp2/thread.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/lib/openjp2/thread.c b/src/lib/openjp2/thread.c +index 8b56aa4d5..af33c2c80 100644 +--- a/src/lib/openjp2/thread.c ++++ b/src/lib/openjp2/thread.c +@@ -29,9 +29,6 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + +-#include "opj_includes.h" +- +-#include "thread.h" + #include + + #ifdef MUTEX_win32 +@@ -46,6 +43,8 @@ + #include + #include + ++#include "opj_includes.h" ++ + OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void) + { + return OPJ_TRUE; +@@ -289,6 +288,10 @@ void opj_thread_join(opj_thread_t* thread) + #include + #include + ++/* Moved after all system includes, and in particular pthread.h, so as to */ ++/* avoid poisoning issuing with malloc() use in pthread.h with ulibc (#1013) */ ++#include "opj_includes.h" ++ + OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void) + { + return OPJ_TRUE; +@@ -425,6 +428,8 @@ void opj_thread_join(opj_thread_t* thread) + #else + /* Stub implementation */ + ++#include "opj_includes.h" ++ + OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void) + { + return OPJ_FALSE; From 5f9d99944ae41564e735fc5789f95644e9bdcc79 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 23 Sep 2017 19:18:12 +0200 Subject: [PATCH 3317/3392] openjpeg: fix build without C++ support Fixes: http://autobuild.buildroot.net/results/e2f/e2ff0a7fa2b911157edf6c43a8eed797b22edd46/ http://autobuild.buildroot.net/results/670/6706339e7df2f2e7d0d7a15663bed185ca55c2a1/ Openjpeg is written in C, but with the move to CMake the build system now errors out if a C++ compiler isn't available. Fix it by patching the CMakeLists.txt to not require C++ support. Patch submitted upstream: https://github.com/uclouvain/openjpeg/pull/1027 Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit d2911fec6a02cfd9324c96a4dada9c493929c26b) Signed-off-by: Peter Korsgaard --- ...Lists.txt-Don-t-require-a-C-compiler.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/openjpeg/0004-CMakeLists.txt-Don-t-require-a-C-compiler.patch diff --git a/package/openjpeg/0004-CMakeLists.txt-Don-t-require-a-C-compiler.patch b/package/openjpeg/0004-CMakeLists.txt-Don-t-require-a-C-compiler.patch new file mode 100644 index 0000000000..13cceef195 --- /dev/null +++ b/package/openjpeg/0004-CMakeLists.txt-Don-t-require-a-C-compiler.patch @@ -0,0 +1,34 @@ +From 786ddcd1475adc6193c59d53e0d8ed2c502f2b00 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Sat, 23 Sep 2017 18:49:31 +0200 +Subject: [PATCH] CMakeLists.txt: Don't require a C++ compiler + +By default, CMake assumes that the project is using both C and C++. By +explicitly passing 'C' as argument of the project() macro, we tell CMake +that only C is used, which prevents CMake from erroring out if a C++ +compiler doesn't exist. + +Submitted upstream: +https://github.com/uclouvain/openjpeg/pull/1027 + +Signed-off-by: Peter Korsgaard +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec42bc99..d80eb48b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + #string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME) + set(OPENJPEG_LIBRARY_NAME openjp2) + +-project(${OPENJPEG_NAMESPACE}) ++project(${OPENJPEG_NAMESPACE} C) + + # Do full dependency headers. + include_regular_expression("^.*$") +-- +2.11.0 + From bde9621d0f0c5d88f316ea0df9e125f73c88f2bb Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 8 Sep 2017 15:31:56 +0200 Subject: [PATCH 3318/3392] gst1-plugins-bad: fix build against openjpeg 2.2 Add upstream patch to fix build against openjpeg 2.2. Fixes [1]: gstopenjpeg.h:42:37: fatal error: openjpeg-2.1/openjpeg.h: No such file or directory [1] http://autobuild.buildroot.net/results/90f1f7838f08e3a557be27470406d4d84dbcc828 [Peter: drop meson changes for 2017.02.x] Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 3a5d4db9549f6a777b06819bc00146a30d687d22) Signed-off-by: Peter Korsgaard --- ...njpeg-Fix-build-against-openjpeg-2.2.patch | 60 +++++++++++++++++++ .../gst1-plugins-bad/gst1-plugins-bad.mk | 4 ++ 2 files changed, 64 insertions(+) create mode 100644 package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch diff --git a/package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch b/package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch new file mode 100644 index 0000000000..6d4419c3c4 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch @@ -0,0 +1,60 @@ +From daaf649bda7231fd0d760802232a36ba62a4ea2d Mon Sep 17 00:00:00 2001 +From: Clemens Lang +Date: Sun, 13 Aug 2017 21:17:18 +0200 +Subject: [PATCH] openjpeg: Fix build against openjpeg 2.2 + +OpenJPEG 2.2 has some API changes and thus ships its headers in a new +include path. Add a configure check (to both meson and autoconf) to +detect the newer version of OpenJPEG and add conditional includes. + +Fix the autoconf test for OpenJPEG 2.1, which checked for HAVE_OPENJPEG, +which was always set even for 2.0. + +https://bugzilla.gnome.org/show_bug.cgi?id=786250 + +[Peter: drop meson changes for 2017.02.x] +Upstream: https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/patch/?id=15f24fef53a955c7c76fc966302cb0453732e657 +Signed-off-by: Peter Seiderer +--- + configure.ac | 7 ++++++- + ext/openjpeg/gstopenjpeg.h | 4 +++- + 2 files changed, 22 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 30e26b8..c4f08c7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2813,8 +2813,13 @@ AG_GST_CHECK_FEATURE(OPENJPEG, [openjpeg library], openjpeg, [ + if test x"$HAVE_OPENJPEG" = x"yes"; then + dnl minor API changes in v2.1 + AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_1, libopenjp2 >= 2.1) +- if test x"$HAVE_OPENJPEG" = x"yes"; then ++ if test x"$HAVE_OPENJPEG_2_1" = x"yes"; then + AC_DEFINE([HAVE_OPENJPEG_2_1], 1, [Define if OpenJPEG 2.1 is used]) ++ dnl include paths changed for v2.2 ++ AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_2, libopenjp2 >= 2.2) ++ if test x"$HAVE_OPENJPEG_2_2" = x"yes"; then ++ AC_DEFINE([HAVE_OPENJPEG_2_2], 1, [Define if OpenJPEG 2.2 is used]) ++ fi + fi + else + # Fallback to v1.5 +diff --git a/ext/openjpeg/gstopenjpeg.h b/ext/openjpeg/gstopenjpeg.h +index 03ce52e..52410a4 100644 +--- a/ext/openjpeg/gstopenjpeg.h ++++ b/ext/openjpeg/gstopenjpeg.h +@@ -38,7 +38,9 @@ + #define OPJ_CPRL CPRL + #else + #include +-# ifdef HAVE_OPENJPEG_2_1 ++# if defined(HAVE_OPENJPEG_2_2) ++# include ++# elif defined(HAVE_OPENJPEG_2_1) + # include + # else + # include + +-- +2.12.3 + diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 9f39bbf9bb..8e3010b828 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -13,6 +13,10 @@ GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB # enabled. GST1_PLUGINS_BAD_LICENSE = LGPLv2+, LGPLv2.1+ +# patch 0001-openjpeg-Fix-build-against-openjpeg-2.2.patch touches configure.ac +GST1_PLUGINS_BAD_AUTORECONF = YES +GST1_PLUGINS_BAD_GETTEXTIZE = YES + GST1_PLUGINS_BAD_CONF_OPTS = \ --disable-examples \ --disable-valgrind \ From 46b07c8a87f354527d4173d873b6674d99e4fbab Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 15 Sep 2017 07:40:20 +0300 Subject: [PATCH 3319/3392] libidn: add fix for CVE-2017-14062 Add upstream patch fixing CVE-2017-14062: Integer overflow in the decode_digit function in puny_decode.c in Libidn2 before 2.0.4 allows remote attackers to cause a denial of service or possibly have unspecified other impact. This issue also affects libidn. Unfortunately, the patch also triggers reconf of the documentation subdirectory, since lib/punycode.c is listed in GDOC_SRC that is defined in doc/Makefile.am. Add autoreconf to handle that. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 49cb795f7965328ce7a57cbc3736b0fc03919fe7) Signed-off-by: Peter Korsgaard --- ....c-decode_digit-Fix-integer-overflow.patch | 36 +++++++++++++++++++ package/libidn/libidn.mk | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 package/libidn/0001-lib-punycode.c-decode_digit-Fix-integer-overflow.patch diff --git a/package/libidn/0001-lib-punycode.c-decode_digit-Fix-integer-overflow.patch b/package/libidn/0001-lib-punycode.c-decode_digit-Fix-integer-overflow.patch new file mode 100644 index 0000000000..8a8ca47a66 --- /dev/null +++ b/package/libidn/0001-lib-punycode.c-decode_digit-Fix-integer-overflow.patch @@ -0,0 +1,36 @@ +From e9e81b8063b095b02cf104bb992fa9bf9515b9d8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= +Date: Fri, 1 Sep 2017 10:04:48 +0200 +Subject: [PATCH] lib/punycode.c (decode_digit): Fix integer overflow + +This fix is a backport from libidn2 and addresses +CVE-2017-14062. + +Signed-off-by: Baruch Siach +--- +Upstream status: commit e9e81b8063b095 + + lib/punycode.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/punycode.c b/lib/punycode.c +index 86819a7deb85..49250a13e2cc 100644 +--- a/lib/punycode.c ++++ b/lib/punycode.c +@@ -88,10 +88,10 @@ enum + /* point (for use in representing integers) in the range 0 to */ + /* base-1, or base if cp does not represent a value. */ + +-static punycode_uint +-decode_digit (punycode_uint cp) ++static unsigned ++decode_digit (int cp) + { +- return cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 : ++ return (unsigned) cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 : + cp - 97 < 26 ? cp - 97 : base; + } + +-- +2.14.1 + diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk index 99c9e2cb80..80fc827d1d 100644 --- a/package/libidn/libidn.mk +++ b/package/libidn/libidn.mk @@ -12,6 +12,8 @@ LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv) LIBIDN_LICENSE = GPLv2+, GPLv3+, LGPLv3+ LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3 +# lib/punycode.c patch triggers reconf in doc/ +LIBIDN_AUTORECONF = YES define LIBIDN_REMOVE_BINARY rm -f $(TARGET_DIR)/usr/bin/idn From 07ddb405672e14f52f416f525df133201b3bb283 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 23 Sep 2017 22:47:54 +0300 Subject: [PATCH 3320/3392] libidn: fix build without makeinfo Build fails when the makeinfo utility is not installed on the host. Fixes: http://autobuild.buildroot.net/results/dfd/dfdfb34ed81ba3a4b7a7271be482e75eca849dbf/ http://autobuild.buildroot.net/results/b33/b33c0b0e6b1033ab1d1294a91b869ee6adcd391a/ http://autobuild.buildroot.net/results/940/9401cc10f6da6a2e3453ebc65ce573c370733fb5/ Signed-off-by: Baruch Siach Tested-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit f6227928cd55c8d2d6ddac64773367c0edde095d) Signed-off-by: Peter Korsgaard --- package/libidn/libidn.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk index 80fc827d1d..c4088aebd6 100644 --- a/package/libidn/libidn.mk +++ b/package/libidn/libidn.mk @@ -7,7 +7,7 @@ LIBIDN_VERSION = 1.33 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN_INSTALL_STAGING = YES -LIBIDN_CONF_ENV = EMACS="no" +LIBIDN_CONF_ENV = EMACS="no" MAKEINFO=true LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv) LIBIDN_LICENSE = GPLv2+, GPLv3+, LGPLv3+ From 8ee6c1d60ebe1285e7f07afa0f8f9107ce0b3506 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 24 Sep 2017 22:17:59 +0200 Subject: [PATCH 3321/3392] Update for 2017.02.6 Signed-off-by: Peter Korsgaard --- CHANGES | 21 +++++++++++---------- Makefile | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index 99ee902348..56f1c32a5c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -2017.02.6, Not yet released +2017.02.6, Released September 24th, 2017 Important / security related fixes. @@ -10,15 +10,16 @@ Updated/fixed packages: apache, bcusdk, bind, binutils, bluez5_utils, botan, cmake, connman, dbus, dialog, e2fsprogs, faad2, fakeroot, ffmpeg, file, flashrom, gcc, gd, gdb, - gdk-pixbuf, git, gnupg, gpsd, grub2, imagemagick, iostat, - iucode-tool, jack2, libarchive, libcurl, libgcrypt, - libphidget, librsync, librsvg, libsoup, libxml2, linux-tools, - lua, mariadb, mbedtls, mediastreamer, minidlna, netplug, - nss-pam-ldapd, nvidia-driver, openjpeg, postgresql, - proxychains-ng, python-libconfig, python-service-identity, qt, - rpcbind, ruby, samba4, squashfs, squid, strongswan, - subversion, supervisor, sysvinit, tcpdump, transmission, - unrar, valgrind, vim, webkitgtk, whois, xen, zmqpp + gdk-pixbuf, git, gnupg, gpsd, grub2, gst1-plugins-bad, + imagemagick, iostat, iucode-tool, jack2, libarchive, libcurl, + libgcrypt, libidn, libphidget, librsync, librsvg, libsoup, + libxml2, linux-tools, lua, mariadb, mbedtls, mediastreamer, + minidlna, netplug, nss-pam-ldapd, nvidia-driver, openjpeg, + postgresql, proxychains-ng, python-libconfig, + python-service-identity, qt, rpcbind, ruby, samba4, squashfs, + squid, strongswan, subversion, supervisor, sysvinit, tcpdump, + tor, transmission, unrar, valgrind, vim, webkitgtk, whois, + xen, zmqpp Issues resolved (http://bugs.buildroot.org): diff --git a/Makefile b/Makefile index 9b517904e6..3514d938b4 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02.5 +export BR2_VERSION := 2017.02.6 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1501100000 +BR2_VERSION_EPOCH = 1506285000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) From 183c367ddcca626dbbae5a5f6cd0e856d47184ce Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 21 Sep 2017 10:59:38 -0300 Subject: [PATCH 3322/3392] wandboard: genimage: Pass an offset for the rootfs Pass an offset of 1MB for the start of the rootfs. Otherwise we get rootfs corruption when the bootloader is manually written to the SD card. Signed-off-by: Fabio Estevam Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 82c1445fc473cf422a1283283acfa46f0df6cd84) Signed-off-by: Peter Korsgaard --- board/wandboard/genimage.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/board/wandboard/genimage.cfg b/board/wandboard/genimage.cfg index b23a91b0b8..ad4a6a55d5 100644 --- a/board/wandboard/genimage.cfg +++ b/board/wandboard/genimage.cfg @@ -26,6 +26,7 @@ image sdcard.img { partition rootfs { partition-type = 0x83 image = "rootfs.ext4" + offset = 1M size = 512M } } From dbc02af63b90f330c3d4a49ba571fdee6bc6e486 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 27 Sep 2017 18:27:35 +0200 Subject: [PATCH 3323/3392] linux-headers: bump 4.{4, 9, 13}.x series [Peter: drop 4.13.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit dd4dd796351b6da0d637d0f1fa1a7b5ba169f30c) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 89ac5b6a39..3a9d6e0d03 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.44" if BR2_KERNEL_HEADERS_4_1 - default "4.4.88" if BR2_KERNEL_HEADERS_4_4 + default "4.4.89" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.51" if BR2_KERNEL_HEADERS_4_9 + default "4.9.52" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 48fb7bbdca07ac395a47a40da5bf50737939946c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 27 Sep 2017 19:05:00 +0200 Subject: [PATCH 3324/3392] package/openvpn: security bump to version 2.4.4 Fixes CVE-2017-12166: https://community.openvpn.net/openvpn/wiki/CVE-2017-12166 Changelog: https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit aa070c802ef2556a732ff33e55f17fc0d3444436) Signed-off-by: Peter Korsgaard --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 1db3a31e1d..318f9edb88 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,2 +1,2 @@ # Locally calculated after checking signature -sha256 15e15fc97f189b52aee7c90ec8355aa77469c773125110b4c2f089abecde36fb openvpn-2.4.3.tar.xz +sha256 96cd1b8fe1e8cb2920f07c3fd3985faea756e16fdeebd11d3e146d5bd2b04a80 openvpn-2.4.4.tar.xz diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 31b6e00ae3..6cbc35dc11 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.4.3 +OPENVPN_VERSION = 2.4.4 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl From de4be78ba178211d0cc39e5b998da9e426b81cf9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 29 Sep 2017 09:54:16 +0200 Subject: [PATCH 3325/3392] git: security bump to version 2.12.5 Release notes: https://public-inbox.org/git/xmqqy3p29ekj.fsf@gitster.mtv.corp.google.com/ Signed-off-by: Peter Korsgaard --- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/git/git.hash b/package/git/git.hash index b657422c8c..bc81f23a82 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,2 +1,2 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 f8b8ac499034e9f6e44e67dd54351bc5654e228e4cd3b55f6f1c8e736c977ce6 git-2.12.4.tar.xz +sha256 a8c3b3c7dd9202d0e80f824ceb74b4340b60aa8f1ec4ffdde3e982fa5ae16eab git-2.12.5.tar.xz diff --git a/package/git/git.mk b/package/git/git.mk index 94cf7a797b..8ce29fcaf5 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.12.4 +GIT_VERSION = 2.12.5 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2, LGPLv2.1+ From 0c0b7006bdc7ecdf1b8b1792346df7e48f2ab1c6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 29 Sep 2017 10:03:27 +0200 Subject: [PATCH 3326/3392] linux-headers: bump 3.18.x version to 3.18.72 Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3a9d6e0d03..0d4f85a59f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -218,7 +218,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.107" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "3.18.71" if BR2_KERNEL_HEADERS_3_18 + default "3.18.72" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.44" if BR2_KERNEL_HEADERS_4_1 From ad0eab0037892669cad24c19a813fa2d0be3a5cc Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 2 Oct 2017 20:38:25 +0300 Subject: [PATCH 3327/3392] dnsmasq: security bump to version 2.78 Supported Lua version is now 5.2. Add licenses hash. Fixes a number of security issues: CVE-2017-13704 - Crash when DNS query exceeded 512 bytes (a regression in 2.77, so technically not fixed by this bump) CVE-2017-14491 - Heap overflow in DNS code CVE-2017-14492 - Heap overflow in IPv6 router advertisement code CVE-2017-14493 - Stack overflow in DHCPv6 code CVE-2017-14494 - Information leak in DHCPv6 CVE-2017-14496 - Invalid boundary checks allows a malicious DNS queries to trigger DoS CVE-2017-14495 - Out-of-memory Dos vulnerability Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit e77fdc90e320ff38d56d8e5c97fc783e8fbb76bb) Signed-off-by: Peter Korsgaard --- package/dnsmasq/dnsmasq.hash | 6 +++++- package/dnsmasq/dnsmasq.mk | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index a73e911a26..28e2e658e2 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,2 +1,6 @@ # Locally calculated after checking pgp signature -sha256 4b92698dee19ca0cb2a8f2e48f1d2dffd01a21eb15d1fbed4cf085630c8c9f96 dnsmasq-2.76.tar.xz +# http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.78.tar.xz.asc +sha256 89949f438c74b0c7543f06689c319484bd126cc4b1f8c745c742ab397681252b dnsmasq-2.78.tar.xz +# Locally calculated +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index e8240b9003..18216a6e22 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.76 +DNSMASQ_VERSION = 2.78 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" @@ -58,7 +58,7 @@ DNSMASQ_MAKE_OPTS += LIBS+="-ldl" endif define DNSMASQ_ENABLE_LUA - $(SED) 's/lua5.1/lua/g' $(DNSMASQ_DIR)/Makefile + $(SED) 's/lua5.2/lua/g' $(DNSMASQ_DIR)/Makefile $(SED) 's^.*#define HAVE_LUASCRIPT.*^#define HAVE_LUASCRIPT^' \ $(DNSMASQ_DIR)/src/config.h endef From 5648030f9ac8ee0c44a30723a8778ddc7f221a46 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Fri, 22 Sep 2017 15:50:03 +0300 Subject: [PATCH 3328/3392] qt: Allow enabling of QtWebKit with GCC 6+ Building Qt with QtWebKit on configuration step there is a check which disables QtWebKit build with GCC 6+. Back in the day nobody thought about building Qt with GCC version greater than 5.x. And now with modern GCCs like 6.x and 7.x this assumption gets in the way. Given in Buildroot today we don't have GCC older than 4.9 it should be safe to remove now meaningless check completely by adding patch to qt. Signed-off-by: Evgeniy Didin Cc: Alexey Brodkin Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni (cherry picked from commit f95bb8562ef02935d6fcf9b254060454e5be796c) Signed-off-by: Peter Korsgaard --- .../0014-Enable-QtWebKit-with-newer-GCC.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch diff --git a/package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch b/package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch new file mode 100644 index 0000000000..1e555e721f --- /dev/null +++ b/package/qt/0014-Enable-QtWebKit-with-newer-GCC.patch @@ -0,0 +1,50 @@ +From f566411fb314b7e4ab01f28e25e942cfaf8c59b7 Mon Sep 17 00:00:00 2001 +From: Evgeniy Didin +Date: Fri, 15 Sep 2017 19:43:48 +0300 +Subject: [PATCH] qt: Allow enabling of QtWebKit with GCC 6+ + +Building Qt with QtWebKit on configuration step there is +a check which disables QtWebKit build with GCC 6+. +Back in the day nobody thought about building Qt with GCC +version greater than 5.x. And now with modern GCCs like +6.x and 7.x this assumption gets in the way. + +Given in Buildroot today we don't have GCC older than 4.9 +it should be safe to remove now meaningless check completely. + +Signed-off-by: Evgeniy Didin +Cc: Alexey Brodkin +Cc: Thomas Petazzoni + +--- + configure | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/configure b/configure +index 10ad7ca0b0..8771144a65 100755 +--- a/configure ++++ b/configure +@@ -7731,20 +7731,6 @@ case "$XPLATFORM" in + canBuildWebKit="no" + canBuildQtXmlPatterns="no" + ;; +- *-g++*) +- # Check gcc's version +- case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 5*|4*|3.4*) +- ;; +- 3.3*) +- canBuildWebKit="no" +- ;; +- *) +- canBuildWebKit="no" +- canBuildQtXmlPatterns="no" +- ;; +- esac +- ;; + solaris-cc*) + # Check the compiler version + case `${QMAKE_CONF_COMPILER} -V 2>&1 | awk '{print $4}'` in +-- +2.11.0 + From b1cb4d9ea9a352d39f33faf555e8964cc43fad9e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 5 Oct 2017 19:30:06 +0200 Subject: [PATCH 3329/3392] linux-headers: bump 4.{4, 9, 13}.x series [Peter: drop 4.13.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 55a6159dcd86da23f6ca36318e3ec8d17bdb7460) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 0d4f85a59f..da2bbf26d7 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.44" if BR2_KERNEL_HEADERS_4_1 - default "4.4.89" if BR2_KERNEL_HEADERS_4_4 + default "4.4.90" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.52" if BR2_KERNEL_HEADERS_4_9 + default "4.9.53" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 6dee0734aa2dd8368350b4a70b841d4ded2a5ae5 Mon Sep 17 00:00:00 2001 From: Andrey Yurovsky Date: Fri, 10 Feb 2017 11:08:15 -0800 Subject: [PATCH 3330/3392] package: qemu: bump version to 2.8.0 This adds a CPU definition for the Cortex A7 along with improvements described here: http://wiki.qemu-project.org/ChangeLog/2.8 Tested on an ARM Cortex A7 target (both target and host builds). The change log does not describe any incompatible changes that would affect buildroot targets as far as I am aware. Signed-off-by: Andrey Yurovsky Signed-off-by: Thomas Petazzoni (cherry picked from commit f56b13897b9f30c78d7ccd78a25b1e985179d2ab) Signed-off-by: Peter Korsgaard --- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 572a5c911a..19cb306938 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,2 +1,2 @@ # Locally computed, tarball verified with GPG signature -sha256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 qemu-2.7.0.tar.bz2 +sha256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 qemu-2.8.0.tar.bz2 diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 66efcba345..e744556d9b 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 2.7.0 +QEMU_VERSION = 2.8.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2 QEMU_SITE = http://wiki.qemu.org/download QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c From 12ff4e23485258644a9b7199dfcde6ea3160a121 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 5 May 2017 10:43:59 +0200 Subject: [PATCH 3331/3392] qemu: fix user mode emulation build on ARM This commit adds a patch that adjusts how the mcontext structure is used on ARM with a uClibc C library. Fixes: http://autobuild.buildroot.net/results/79900b22c190e883b6d9a3075e1286ec95840ae1/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 40c5fff46629ac4f0f55165f9c3594980a4700ef) Signed-off-by: Peter Korsgaard --- ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch new file mode 100644 index 0000000000..6d6d024d9d --- /dev/null +++ b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch @@ -0,0 +1,35 @@ +From d3f1e7e9ff9aae3f770b0bcb9aa3c2f787f76a1b Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 5 May 2017 09:07:15 +0200 +Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc + +user-exec.c has some conditional code to decide how to use the +mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but +with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path +gets used, which doesn't apply to uClibc. + +Fix this by excluding __UCLIBC__, which ensures we fall back to the +general case of using uc_mcontext.arm_pc, which works fine with +uClibc. + +Signed-off-by: Thomas Petazzoni +--- + user-exec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/user-exec.c b/user-exec.c +index 6db0758..2b3d116 100644 +--- a/user-exec.c ++++ b/user-exec.c +@@ -409,7 +409,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + + #if defined(__NetBSD__) + pc = uc->uc_mcontext.__gregs[_REG_R15]; +-#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) ++#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) + pc = uc->uc_mcontext.gregs[R15]; + #else + pc = uc->uc_mcontext.arm_pc; +-- +2.7.4 + From 37fa007ab6eda5d6f483d36ed83e2bf3f67dd659 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 4 Oct 2017 09:13:57 +0200 Subject: [PATCH 3332/3392] qemu: security bump to version 2.8.1.1 Fixes the following security issues and adds a number of other bigfixes: 2.8.1: Changelog: https://lists.gnu.org/archive/html/qemu-devel/2017-03/msg06332.html CVE-2017-2615 - display: cirrus: oob access while doing bitblt copy backward mode CVE-2017-2620 - display: cirrus: out-of-bounds access issue while in cirrus_bitblt_cputovideo CVE-2017-2630 - nbd: oob stack write in client routine drop_sync 2.8.1.1 Changelog: https://lists.gnu.org/archive/html/qemu-devel/2017-04/msg03460.html CVE-2017-7471 - 9p: virtfs allows guest to change filesystem attributes on host Signed-off-by: Peter Korsgaard (cherry picked from commit af0f2d2bbcaca9000e62b5388f4c3cd8e700c6ff) Signed-off-by: Peter Korsgaard --- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 19cb306938..5164303768 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,2 +1,2 @@ # Locally computed, tarball verified with GPG signature -sha256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 qemu-2.8.0.tar.bz2 +sha256 f62ab18a1fb9ff5b4c81ed44becc945b11581eff777618141bdb787da55d3638 qemu-2.8.1.1.tar.bz2 diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index e744556d9b..1fe4da4ca4 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 2.8.0 +QEMU_VERSION = 2.8.1.1 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2 QEMU_SITE = http://wiki.qemu.org/download QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c From b7fb34cc889be0756b256fae11317d48a4b9c5fe Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 5 Oct 2017 22:36:46 +0200 Subject: [PATCH 3333/3392] qemu: change to .tar.xz format And use the official download location. Suggested-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit b79547014d0cdbf34aa4112a464a63f9e865b9ce) Signed-off-by: Peter Korsgaard --- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 5164303768..405d192508 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,2 +1,2 @@ # Locally computed, tarball verified with GPG signature -sha256 f62ab18a1fb9ff5b4c81ed44becc945b11581eff777618141bdb787da55d3638 qemu-2.8.1.1.tar.bz2 +sha256 7b50634d729dcabe4a96d74062832274fa2f4c883e82904f5e6955f801edab54 qemu-2.8.1.1.tar.xz diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 1fe4da4ca4..1cb6ed1128 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -5,8 +5,8 @@ ################################################################################ QEMU_VERSION = 2.8.1.1 -QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2 -QEMU_SITE = http://wiki.qemu.org/download +QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz +QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses; From 65883534171c1605a7edbb8eb081d4b10f74336d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 9 Sep 2017 23:10:55 +0300 Subject: [PATCH 3334/3392] libcurl: bump to version 7.55.1 Drop upstream patch. Add license hash. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 3f6c10df674b7cc7a854fb0099ebeb926d162975) Signed-off-by: Peter Korsgaard --- ...-system.h-support-more-architectures.patch | 47 ------------------- package/libcurl/libcurl.hash | 5 +- package/libcurl/libcurl.mk | 2 +- 3 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 package/libcurl/0001-curl-system.h-support-more-architectures.patch diff --git a/package/libcurl/0001-curl-system.h-support-more-architectures.patch b/package/libcurl/0001-curl-system.h-support-more-architectures.patch deleted file mode 100644 index 94d9a2a11f..0000000000 --- a/package/libcurl/0001-curl-system.h-support-more-architectures.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7d84bd820ef412d251b643a4faced105668f4ebd Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 11 Aug 2017 18:52:37 +0200 -Subject: [PATCH] curl/system.h: support more architectures - -The long list of architectures in include/curl/system.h is annoying to -maintain, and needs to be extended for each and every architecture to -support. - -Instead, let's rely on the __SIZEOF_LONG__ define of the gcc compiler -(we are in the GNUC condition anyway), which tells us if long is 4 -bytes or 8 bytes. - -This fixes the build of libcurl 7.55.0 on architectures such as -OpenRISC or ARC. - -Signed-off-by: Thomas Petazzoni ---- - include/curl/system.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/include/curl/system.h b/include/curl/system.h -index 79abf8f..0e13075 100644 ---- a/include/curl/system.h -+++ b/include/curl/system.h -@@ -403,7 +403,7 @@ - # if !defined(__LP64__) && (defined(__ILP32__) || \ - defined(__i386__) || defined(__ppc__) || defined(__arm__) || \ - defined(__sparc__) || defined(__mips__) || defined(__sh__) || \ -- defined(__XTENSA__)) -+ defined(__XTENSA__) || (defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 4)) - # define CURL_SIZEOF_LONG 4 - # define CURL_TYPEOF_CURL_OFF_T long long - # define CURL_FORMAT_CURL_OFF_T "lld" -@@ -412,7 +412,8 @@ - # define CURL_SUFFIX_CURL_OFF_T LL - # define CURL_SUFFIX_CURL_OFF_TU ULL - # elif defined(__LP64__) || \ -- defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__) -+ defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__) || \ -+ (defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 8) - # define CURL_SIZEOF_LONG 8 - # define CURL_TYPEOF_CURL_OFF_T long - # define CURL_FORMAT_CURL_OFF_T "ld" --- -2.9.4 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 6d49b67428..571526a9b7 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,3 +1,4 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.55.0.tar.xz.asc -sha256 cdd58522f8607fd4e871df79d73acb3155075e2134641e5adab12a0962df059d curl-7.55.0.tar.xz +# https://curl.haxx.se/download/curl-7.55.1.tar.xz.asc +sha256 3eafca6e84ecb4af5f35795dee84e643d5428287e88c041122bb8dac18676bb7 curl-7.55.1.tar.xz +sha256 cbcf511f5702f7baf5424193a792bc9c18fab22bcbec2e6a587598389dc632c2 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index dd0ccbfa46..64110cccf0 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.55.0 +LIBCURL_VERSION = 7.55.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From b2609e56d6a4095d1b49e15c09191ac7a3232738 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Sep 2017 14:43:58 +0300 Subject: [PATCH 3335/3392] libcurl: fix build without threads When c-ares is not enabled libcurl enables the threaded DNS resolver by default. Make sure the threaded resolvers is disabled when the toolchain does not support threads. Add upstream patch that fixes the configure option for disabling the threaded resolver. Fixes: http://autobuild.buildroot.net/results/39f/39fa63fb2ecb75e4b2521d1ee3dfa357c4e5c594/ http://autobuild.buildroot.net/results/dfd/dfd296086d0d6bed73b92fe2fa4ba5434dddf796/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit 10e998e7ccc827c53f3637abb70a06f1521e239e) Signed-off-by: Peter Korsgaard --- ...pts.m4-fix-disable-threaded-resolver.patch | 40 +++++++++++++++++++ package/libcurl/libcurl.mk | 8 ++++ 2 files changed, 48 insertions(+) create mode 100644 package/libcurl/0001-curl-confopts.m4-fix-disable-threaded-resolver.patch diff --git a/package/libcurl/0001-curl-confopts.m4-fix-disable-threaded-resolver.patch b/package/libcurl/0001-curl-confopts.m4-fix-disable-threaded-resolver.patch new file mode 100644 index 0000000000..c7a563e825 --- /dev/null +++ b/package/libcurl/0001-curl-confopts.m4-fix-disable-threaded-resolver.patch @@ -0,0 +1,40 @@ +From 3cb4bb6b5fb8a936cb69e2e9ea6a4e692122abb9 Mon Sep 17 00:00:00 2001 +From: Jakub Zakrzewski +Date: Tue, 15 Aug 2017 13:21:33 -0400 +Subject: [PATCH] curl-confopts.m4: fix --disable-threaded-resolver + +Closes https://github.com/curl/curl/issues/1784 + +Signed-off-by: Baruch Siach +--- +Upstream status: commit 3cb4bb6b5fb + + m4/curl-confopts.m4 | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4 +index d77a884d58bd..6dcd0f1a6794 100644 +--- a/m4/curl-confopts.m4 ++++ b/m4/curl-confopts.m4 +@@ -37,14 +37,14 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver]) + AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]), + OPT_THRES=$enableval) + case "$OPT_THRES" in +- *) +- dnl configure option not specified +- want_thres="yes" +- ;; + no) + dnl --disable-threaded-resolver option used + want_thres="no" + ;; ++ *) ++ dnl configure option not specified ++ want_thres="yes" ++ ;; + esac + AC_MSG_RESULT([$want_thres]) + ]) +-- +2.14.1 + diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 64110cccf0..d7f860eb1b 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -14,6 +14,8 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_INSTALL_STAGING = YES +# Patching m4/curl-confopts.m4 +LIBCURL_AUTORECONF = YES # We disable NTLM support because it uses fork(), which doesn't work # on non-MMU platforms. Moreover, this authentication method is @@ -22,6 +24,12 @@ LIBCURL_INSTALL_STAGING = YES LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \ --enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBCURL_CONF_OPTS += --enable-threaded-resolver +else +LIBCURL_CONF_OPTS += --disable-threaded-resolver +endif + ifeq ($(BR2_PACKAGE_LIBCURL_VERBOSE),y) LIBCURL_CONF_OPTS += --enable-verbose else From 42f38b057c04ab40028f97055e6e9077b344f69c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 4 Oct 2017 09:35:17 +0200 Subject: [PATCH 3336/3392] libcurl: security bump to version 7.56.0 Drop upstreamed patch. Fixes CVE-2017-1000254 - FTP PWD response parser out of bounds read: https://curl.haxx.se/docs/adv_20171004.html Signed-off-by: Peter Korsgaard (cherry picked from commit 9d95b93e5d36442979cdff7a9f3ee10b1eb9e0c7) Signed-off-by: Peter Korsgaard --- ...pts.m4-fix-disable-threaded-resolver.patch | 40 ------------------- package/libcurl/libcurl.hash | 4 +- package/libcurl/libcurl.mk | 4 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/libcurl/0001-curl-confopts.m4-fix-disable-threaded-resolver.patch diff --git a/package/libcurl/0001-curl-confopts.m4-fix-disable-threaded-resolver.patch b/package/libcurl/0001-curl-confopts.m4-fix-disable-threaded-resolver.patch deleted file mode 100644 index c7a563e825..0000000000 --- a/package/libcurl/0001-curl-confopts.m4-fix-disable-threaded-resolver.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3cb4bb6b5fb8a936cb69e2e9ea6a4e692122abb9 Mon Sep 17 00:00:00 2001 -From: Jakub Zakrzewski -Date: Tue, 15 Aug 2017 13:21:33 -0400 -Subject: [PATCH] curl-confopts.m4: fix --disable-threaded-resolver - -Closes https://github.com/curl/curl/issues/1784 - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 3cb4bb6b5fb - - m4/curl-confopts.m4 | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4 -index d77a884d58bd..6dcd0f1a6794 100644 ---- a/m4/curl-confopts.m4 -+++ b/m4/curl-confopts.m4 -@@ -37,14 +37,14 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver]) - AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]), - OPT_THRES=$enableval) - case "$OPT_THRES" in -- *) -- dnl configure option not specified -- want_thres="yes" -- ;; - no) - dnl --disable-threaded-resolver option used - want_thres="no" - ;; -+ *) -+ dnl configure option not specified -+ want_thres="yes" -+ ;; - esac - AC_MSG_RESULT([$want_thres]) - ]) --- -2.14.1 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 571526a9b7..c6970632ac 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.55.1.tar.xz.asc -sha256 3eafca6e84ecb4af5f35795dee84e643d5428287e88c041122bb8dac18676bb7 curl-7.55.1.tar.xz +# https://curl.haxx.se/download/curl-7.56.0.tar.xz.asc +sha256 32437bcca0e9434384329fdc733547879d25ba70335b3cf9e3d9cbc3e71fd172 curl-7.56.0.tar.xz sha256 cbcf511f5702f7baf5424193a792bc9c18fab22bcbec2e6a587598389dc632c2 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index d7f860eb1b..a6b699ce9c 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.55.1 +LIBCURL_VERSION = 7.56.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -14,8 +14,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_INSTALL_STAGING = YES -# Patching m4/curl-confopts.m4 -LIBCURL_AUTORECONF = YES # We disable NTLM support because it uses fork(), which doesn't work # on non-MMU platforms. Moreover, this authentication method is From a67eba5404d1286bff365b04bddb361f0c9832f4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 4 Mar 2017 20:54:53 +0100 Subject: [PATCH 3337/3392] package/x11r7/xserver_xorg-server: bump version to 1.19.2 Changed _SITE according to URL mentioned in upstream release note. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit d48cc32653307c56e2d7ffb4dc9baf47f49ba02d) Signed-off-by: Peter Korsgaard --- .../{1.19.1 => 1.19.2}/0001-modesettings-needs-dri2.patch | 0 .../0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0 .../0003-Remove-check-for-useSIGIO-option.patch | 0 package/x11r7/xserver_xorg-server/Config.in | 4 ++-- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 4 ++-- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename package/x11r7/xserver_xorg-server/{1.19.1 => 1.19.2}/0001-modesettings-needs-dri2.patch (100%) rename package/x11r7/xserver_xorg-server/{1.19.1 => 1.19.2}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%) rename package/x11r7/xserver_xorg-server/{1.19.1 => 1.19.2}/0003-Remove-check-for-useSIGIO-option.patch (100%) diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.19.2/0001-modesettings-needs-dri2.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.1/0001-modesettings-needs-dri2.patch rename to package/x11r7/xserver_xorg-server/1.19.2/0001-modesettings-needs-dri2.patch diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/package/x11r7/xserver_xorg-server/1.19.2/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.1/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch rename to package/x11r7/xserver_xorg-server/1.19.2/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0003-Remove-check-for-useSIGIO-option.patch b/package/x11r7/xserver_xorg-server/1.19.2/0003-Remove-check-for-useSIGIO-option.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.1/0003-Remove-check-for-useSIGIO-option.patch rename to package/x11r7/xserver_xorg-server/1.19.2/0003-Remove-check-for-useSIGIO-option.patch diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 1c8f8cfdbf..032811ea72 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -79,7 +79,7 @@ choice bool "X Window System server version" config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 - bool "1.19.1" + bool "1.19.2" select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23 select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XPROTO_PRESENTPROTO @@ -99,7 +99,7 @@ endchoice config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION string - default "1.19.1" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 + default "1.19.2" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 2f13ca6419..456fb8b460 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -3,5 +3,5 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2017-January/002754.html -sha256 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb xorg-server-1.19.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-March/002779.html +sha256 4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb xorg-server-1.19.2.tar.bz2 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 7aebbc1d2d..f32383f9a4 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -6,7 +6,7 @@ XSERVER_XORG_SERVER_VERSION = $(call qstrip,$(BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION)) XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 -XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver +XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING XSERVER_XORG_SERVER_INSTALL_STAGING = YES From 521b95c13a890bded85aab1c74b57a29bd299b3b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 19 Mar 2017 21:51:54 +0100 Subject: [PATCH 3338/3392] package/x11r7/xserver_xorg-server: bump to version 1.19.3 Signed-off-by: Romain Naour Cc: Bernd Kuhls [Thomas: fix hash file, as noticed by Bernd.] Signed-off-by: Thomas Petazzoni (cherry picked from commit f0772c92c88e7fce42fb2a29dd965f0c99b6969b) Signed-off-by: Peter Korsgaard --- .../{1.19.2 => 1.19.3}/0001-modesettings-needs-dri2.patch | 0 .../0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0 .../0003-Remove-check-for-useSIGIO-option.patch | 0 package/x11r7/xserver_xorg-server/Config.in | 4 ++-- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename package/x11r7/xserver_xorg-server/{1.19.2 => 1.19.3}/0001-modesettings-needs-dri2.patch (100%) rename package/x11r7/xserver_xorg-server/{1.19.2 => 1.19.3}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%) rename package/x11r7/xserver_xorg-server/{1.19.2 => 1.19.3}/0003-Remove-check-for-useSIGIO-option.patch (100%) diff --git a/package/x11r7/xserver_xorg-server/1.19.2/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.19.3/0001-modesettings-needs-dri2.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.2/0001-modesettings-needs-dri2.patch rename to package/x11r7/xserver_xorg-server/1.19.3/0001-modesettings-needs-dri2.patch diff --git a/package/x11r7/xserver_xorg-server/1.19.2/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/package/x11r7/xserver_xorg-server/1.19.3/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.2/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch rename to package/x11r7/xserver_xorg-server/1.19.3/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch diff --git a/package/x11r7/xserver_xorg-server/1.19.2/0003-Remove-check-for-useSIGIO-option.patch b/package/x11r7/xserver_xorg-server/1.19.3/0003-Remove-check-for-useSIGIO-option.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.2/0003-Remove-check-for-useSIGIO-option.patch rename to package/x11r7/xserver_xorg-server/1.19.3/0003-Remove-check-for-useSIGIO-option.patch diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 032811ea72..b04ccf4d75 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -79,7 +79,7 @@ choice bool "X Window System server version" config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 - bool "1.19.2" + bool "1.19.3" select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23 select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XPROTO_PRESENTPROTO @@ -99,7 +99,7 @@ endchoice config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION string - default "1.19.2" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 + default "1.19.3" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 456fb8b460..841be041fe 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -3,5 +3,5 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2017-March/002779.html -sha256 4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb xorg-server-1.19.2.tar.bz2 +# From https://lists.freedesktop.org/archives/xorg/2017-March/058662.html +sha256 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 xorg-server-1.19.3.tar.bz2 From 0ccdc2c08916807c233415089ee500d7f5d18078 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Sep 2017 13:30:18 +0200 Subject: [PATCH 3339/3392] package/x11r7/xserver_xorg-server: glamor support needs egl Glamor support in xserver_xorg-server depends on gbm: https://cgit.freedesktop.org/xorg/xserver/tree/configure.ac#n2100 Gbm is provided by mesa3d only if egl is enabled: https://git.buildroot.net/buildroot/tree/package/mesa3d/mesa3d.mk#n167 This patch adds libegl as additional prerequisite for enabling glamor support in xserver_xorg-server. Fixes http://autobuild.buildroot.net/results/04d/04d93745d63fcfbea070c0126862b49f1b6f473e/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 5b4bcbdafbe8e7b42d4e085a0524d70665cdbaf5) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index f32383f9a4..4404de8363 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -223,7 +223,7 @@ endif ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3 -ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yy) +ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy) XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy XSERVER_XORG_SERVER_CONF_OPTS += --enable-glamor else From 2b5fe1c29e1a4a8697e0b0eeea4fbf66cd089e79 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 6 Oct 2017 07:22:59 +0200 Subject: [PATCH 3340/3392] package/x11r7/xserver_xorg-server: security bump to version 1.19.4 Fixes CVE-2017-13721 & CVE-2017-13723: https://lists.x.org/archives/xorg-announce/2017-October/002809.html Added all hashes provided by upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 436659c55f8d3c6155546cfc666a13c793d992f9) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/Config.in | 2 +- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index b04ccf4d75..0f1e81994f 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -99,7 +99,7 @@ endchoice config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION string - default "1.19.3" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 + default "1.19.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 841be041fe..d0acc24102 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -3,5 +3,8 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 -# From https://lists.freedesktop.org/archives/xorg/2017-March/058662.html -sha256 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 xorg-server-1.19.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-October/002808.html +md5 28cb6d773bfcdfd43500dd64527d2ab0 xorg-server-1.19.4.tar.bz2 +sha1 7a47d5f927ea69681e279c6e5f5e8ff3a21c7152 xorg-server-1.19.4.tar.bz2 +sha256 aa758acea91deaf1f95069ddc5ea3818e13675fb14fef40ad1b3d0b2bf03c9a8 xorg-server-1.19.4.tar.bz2 +sha512 ff80934e42a7dd2d437e947fe02c74c3b25bdbb3002b7005191d52272d5eae8cb3a83377fa32f40000011be88405830e796f6bd3b914bd7fc163ea8ece76226b xorg-server-1.19.4.tar.bz2 From a8c1ce21725074a4cfa5c33b2097eb8c76af9148 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 7 Oct 2017 15:01:56 +0200 Subject: [PATCH 3341/3392] package/x11r7/xserver_xorg-server: rename patch directory after the last version bump The last bump [1] forgot to rename the patch directory and remove upstream patches. We still need to fix the monotonic clock check which doesn't work when cross-compiling. [1] 436659c55f8d3c6155546cfc666a13c793d992f9 Signed-off-by: Romain Naour Cc: Bernd Kuhls Cc: Peter Korsgaard Acked-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7cf8a08feb67052d9b3502dbdcbeaeda26b55665) Signed-off-by: Peter Korsgaard --- ...t-buffer-in-SProcXSendExtensionEvent.patch | 39 ---------- ...ow-GenericEvent-in-SendEvent-request.patch | 71 ------------------- ...ll-events-in-ProcXSendExtensionEvent.patch | 50 ------------- ...7-Xi-Do-not-try-to-swap-GenericEvent.patch | 45 ------------ .../0001-modesettings-needs-dri2.patch | 0 ...ure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0 ...003-Remove-check-for-useSIGIO-option.patch | 0 7 files changed, 205 deletions(-) delete mode 100644 package/x11r7/xserver_xorg-server/1.19.1/0004-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch delete mode 100644 package/x11r7/xserver_xorg-server/1.19.1/0005-dix-Disallow-GenericEvent-in-SendEvent-request.patch delete mode 100644 package/x11r7/xserver_xorg-server/1.19.1/0006-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch delete mode 100644 package/x11r7/xserver_xorg-server/1.19.1/0007-Xi-Do-not-try-to-swap-GenericEvent.patch rename package/x11r7/xserver_xorg-server/{1.19.3 => 1.19.4}/0001-modesettings-needs-dri2.patch (100%) rename package/x11r7/xserver_xorg-server/{1.19.3 => 1.19.4}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%) rename package/x11r7/xserver_xorg-server/{1.19.3 => 1.19.4}/0003-Remove-check-for-useSIGIO-option.patch (100%) diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0004-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch b/package/x11r7/xserver_xorg-server/1.19.1/0004-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch deleted file mode 100644 index c15dc9f50c..0000000000 --- a/package/x11r7/xserver_xorg-server/1.19.1/0004-Xi-Zero-target-buffer-in-SProcXSendExtensionEvent.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 05442de962d3dc624f79fc1a00eca3ffc5489ced Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:39 +0300 -Subject: [PATCH] Xi: Zero target buffer in SProcXSendExtensionEvent. - -Make sure that the xEvent eventT is initialized with zeros, the same way as -in SProcSendEvent. - -Some event swapping functions do not overwrite all 32 bytes of xEvent -structure, for example XSecurityAuthorizationRevoked. Two cooperating -clients, one swapped and the other not, can send -XSecurityAuthorizationRevoked event to each other to retrieve old stack data -from X server. This can be potentialy misused to go around ASLR or -stack-protector. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - Xi/sendexev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 11d82029f..1cf118ab6 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -78,7 +78,7 @@ SProcXSendExtensionEvent(ClientPtr client) - { - CARD32 *p; - int i; -- xEvent eventT; -+ xEvent eventT = { .u.u.type = 0 }; - xEvent *eventP; - EventSwapPtr proc; - --- -2.11.0 - diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0005-dix-Disallow-GenericEvent-in-SendEvent-request.patch b/package/x11r7/xserver_xorg-server/1.19.1/0005-dix-Disallow-GenericEvent-in-SendEvent-request.patch deleted file mode 100644 index 12da5f5cba..0000000000 --- a/package/x11r7/xserver_xorg-server/1.19.1/0005-dix-Disallow-GenericEvent-in-SendEvent-request.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:40 +0300 -Subject: [PATCH] dix: Disallow GenericEvent in SendEvent request. - -The SendEvent request holds xEvent which is exactly 32 bytes long, no more, -no less. Both ProcSendEvent and SProcSendEvent verify that the received data -exactly match the request size. However nothing stops the client from passing -in event with xEvent::type = GenericEvent and any value of -xGenericEvent::length. - -In the case of ProcSendEvent, the event will be eventually passed to -WriteEventsToClient which will see that it is Generic event and copy the -arbitrary length from the receive buffer (and possibly past it) and send it to -the other client. This allows clients to copy unitialized heap memory out of X -server or to crash it. - -In case of SProcSendEvent, it will attempt to swap the incoming event by -calling a swapping function from the EventSwapVector array. The swapped event -is written to target buffer, which in this case is local xEvent variable. The -xEvent variable is 32 bytes long, but the swapping functions for GenericEvents -expect that the target buffer has size matching the size of the source -GenericEvent. This allows clients to cause stack buffer overflows. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - dix/events.c | 6 ++++++ - dix/swapreq.c | 7 +++++++ - 2 files changed, 13 insertions(+) - -diff --git a/dix/events.c b/dix/events.c -index 3e3a01ef9..d3a33ea3f 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client) - client->errorValue = stuff->event.u.u.type; - return BadValue; - } -+ /* Generic events can have variable size, but SendEvent request holds -+ exactly 32B of event data. */ -+ if (stuff->event.u.u.type == GenericEvent) { -+ client->errorValue = stuff->event.u.u.type; -+ return BadValue; -+ } - if (stuff->event.u.u.type == ClientMessage && - stuff->event.u.u.detail != 8 && - stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) { -diff --git a/dix/swapreq.c b/dix/swapreq.c -index 719e9b81c..67850593b 100644 ---- a/dix/swapreq.c -+++ b/dix/swapreq.c -@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client) - swapl(&stuff->destination); - swapl(&stuff->eventMask); - -+ /* Generic events can have variable size, but SendEvent request holds -+ exactly 32B of event data. */ -+ if (stuff->event.u.u.type == GenericEvent) { -+ client->errorValue = stuff->event.u.u.type; -+ return BadValue; -+ } -+ - /* Swap event */ - proc = EventSwapVector[stuff->event.u.u.type & 0177]; - if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */ --- -2.11.0 - diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0006-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch b/package/x11r7/xserver_xorg-server/1.19.1/0006-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch deleted file mode 100644 index 2e651006ba..0000000000 --- a/package/x11r7/xserver_xorg-server/1.19.1/0006-Xi-Verify-all-events-in-ProcXSendExtensionEvent.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:41 +0300 -Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent. - -The requirement is that events have type in range -EXTENSION_EVENT_BASE..lastEvent, but it was tested -only for first event of all. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - Xi/sendexev.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 1cf118ab6..5e63bfcca 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client) - int - ProcXSendExtensionEvent(ClientPtr client) - { -- int ret; -+ int ret, i; - DeviceIntPtr dev; - xEvent *first; - XEventClass *list; -@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client) - /* The client's event type must be one defined by an extension. */ - - first = ((xEvent *) &stuff[1]); -- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && -- (first->u.u.type < lastEvent))) { -- client->errorValue = first->u.u.type; -- return BadValue; -+ for (i = 0; i < stuff->num_events; i++) { -+ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) && -+ (first[i].u.u.type < lastEvent))) { -+ client->errorValue = first[i].u.u.type; -+ return BadValue; -+ } - } - - list = (XEventClass *) (first + stuff->num_events); --- -2.11.0 - diff --git a/package/x11r7/xserver_xorg-server/1.19.1/0007-Xi-Do-not-try-to-swap-GenericEvent.patch b/package/x11r7/xserver_xorg-server/1.19.1/0007-Xi-Do-not-try-to-swap-GenericEvent.patch deleted file mode 100644 index 871e7621ed..0000000000 --- a/package/x11r7/xserver_xorg-server/1.19.1/0007-Xi-Do-not-try-to-swap-GenericEvent.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 24 May 2017 15:54:42 +0300 -Subject: [PATCH] Xi: Do not try to swap GenericEvent. - -The SProcXSendExtensionEvent must not attempt to swap GenericEvent because -it is assuming that the event has fixed size and gives the swapping function -xEvent-sized buffer. - -A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway. - -Signed-off-by: Michal Srb -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -Signed-off-by: Peter Korsgaard ---- - Xi/sendexev.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 5e63bfcca..5c2e0fc56 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client) - - eventP = (xEvent *) &stuff[1]; - for (i = 0; i < stuff->num_events; i++, eventP++) { -+ if (eventP->u.u.type == GenericEvent) { -+ client->errorValue = eventP->u.u.type; -+ return BadValue; -+ } -+ - proc = EventSwapVector[eventP->u.u.type & 0177]; -- if (proc == NotImplemented) /* no swapping proc; invalid event type? */ -+ /* no swapping proc; invalid event type? */ -+ if (proc == NotImplemented) { -+ client->errorValue = eventP->u.u.type; - return BadValue; -+ } - (*proc) (eventP, &eventT); - *eventP = eventT; - } --- -2.11.0 - diff --git a/package/x11r7/xserver_xorg-server/1.19.3/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.19.4/0001-modesettings-needs-dri2.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.3/0001-modesettings-needs-dri2.patch rename to package/x11r7/xserver_xorg-server/1.19.4/0001-modesettings-needs-dri2.patch diff --git a/package/x11r7/xserver_xorg-server/1.19.3/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/package/x11r7/xserver_xorg-server/1.19.4/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.3/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch rename to package/x11r7/xserver_xorg-server/1.19.4/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch diff --git a/package/x11r7/xserver_xorg-server/1.19.3/0003-Remove-check-for-useSIGIO-option.patch b/package/x11r7/xserver_xorg-server/1.19.4/0003-Remove-check-for-useSIGIO-option.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.3/0003-Remove-check-for-useSIGIO-option.patch rename to package/x11r7/xserver_xorg-server/1.19.4/0003-Remove-check-for-useSIGIO-option.patch From dad64de9078b438e73b52d7d232ceff258729106 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 7 Oct 2017 13:02:08 +0200 Subject: [PATCH 3342/3392] package/iucode-tool: security bump to version 2.2 Version 2.1.1 fixed CVE-2017-0357: https://gitlab.com/iucode-tool/iucode-tool/commit/657ce44ac462bcec35a3e12f9e7f53ca92ae62b7 Dropped IUCODE_TOOL_CONF_ENV after version 2.2 added a configure check for libargp: https://gitlab.com/iucode-tool/iucode-tool/commit/b14bed6771e7ab48371b272a0c68dd017767142a Added hash for license file. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 1462c07914f5e53cb7816ad86abee3e31b2bc1b6) Signed-off-by: Peter Korsgaard --- package/iucode-tool/iucode-tool.hash | 3 ++- package/iucode-tool/iucode-tool.mk | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iucode-tool/iucode-tool.hash b/package/iucode-tool/iucode-tool.hash index c1f3bef045..1dab8de978 100644 --- a/package/iucode-tool/iucode-tool.hash +++ b/package/iucode-tool/iucode-tool.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 33271652032f20f866a212bc98ea01a8db65c4ac839fa820aa23da974fd6ff62 iucode-tool_1.5.tar.xz +sha256 9810daf925b8a9ca244adc4e1916bcab65601c9ebe87e91c2281f78055982971 iucode-tool_2.2.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/iucode-tool/iucode-tool.mk b/package/iucode-tool/iucode-tool.mk index 1dfda70293..3280c1ed63 100644 --- a/package/iucode-tool/iucode-tool.mk +++ b/package/iucode-tool/iucode-tool.mk @@ -4,11 +4,10 @@ # ################################################################################ -IUCODE_TOOL_VERSION = 1.5 +IUCODE_TOOL_VERSION = 2.2 IUCODE_TOOL_SOURCE = iucode-tool_$(IUCODE_TOOL_VERSION).tar.xz IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/master ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -IUCODE_TOOL_CONF_ENV = LIBS="-largp" IUCODE_TOOL_DEPENDENCIES = argp-standalone endif IUCODE_TOOL_LICENSE = GPLv2+ From cd12cca54c29181e299748714d2fda94fdcc59a8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Oct 2017 21:58:30 +0200 Subject: [PATCH 3343/3392] xlib_libXfont{, 2}: add upstream security fixes Fixes the following security issues: CVE-2017-13720 - Check for end of string in PatternMatch CVE-2017-13722 - pcfGetProperties: Check string boundaries Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 46a54b6464d09edc36ae0d1d041f89ffd77b3ea1) Signed-off-by: Peter Korsgaard --- ...-string-in-PatternMatch-CVE-2017-137.patch | 34 ++++++++++++ ...-Check-string-boundaries-CVE-2017-13.patch | 52 +++++++++++++++++++ ...-string-in-PatternMatch-CVE-2017-137.patch | 34 ++++++++++++ ...-Check-string-boundaries-CVE-2017-13.patch | 52 +++++++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 package/x11r7/xlib_libXfont/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch create mode 100644 package/x11r7/xlib_libXfont/0002-pcfGetProperties-Check-string-boundaries-CVE-2017-13.patch create mode 100644 package/x11r7/xlib_libXfont2/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch create mode 100644 package/x11r7/xlib_libXfont2/0002-pcfGetProperties-Check-string-boundaries-CVE-2017-13.patch diff --git a/package/x11r7/xlib_libXfont/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch b/package/x11r7/xlib_libXfont/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch new file mode 100644 index 0000000000..3795179af1 --- /dev/null +++ b/package/x11r7/xlib_libXfont/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch @@ -0,0 +1,34 @@ +From d1e670a4a8704b8708e493ab6155589bcd570608 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Thu, 20 Jul 2017 13:38:53 +0200 +Subject: [PATCH] Check for end of string in PatternMatch (CVE-2017-13720) + +If a pattern contains '?' character, any character in the string is skipped, +even if it is '\0'. The rest of the matching then reads invalid memory. + +Reviewed-by: Peter Hutterer +Signed-off-by: Julien Cristau +Signed-off-by: Peter Korsgaard +--- + src/fontfile/fontdir.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c +index 4ce2473..996b7d1 100644 +--- a/src/fontfile/fontdir.c ++++ b/src/fontfile/fontdir.c +@@ -400,8 +400,10 @@ PatternMatch(char *pat, int patdashes, char *string, int stringdashes) + } + } + case '?': +- if (*string++ == XK_minus) ++ if ((t = *string++) == XK_minus) + stringdashes--; ++ if (!t) ++ return 0; + break; + case '\0': + return (*string == '\0'); +-- +2.11.0 + diff --git a/package/x11r7/xlib_libXfont/0002-pcfGetProperties-Check-string-boundaries-CVE-2017-13.patch b/package/x11r7/xlib_libXfont/0002-pcfGetProperties-Check-string-boundaries-CVE-2017-13.patch new file mode 100644 index 0000000000..709e446efe --- /dev/null +++ b/package/x11r7/xlib_libXfont/0002-pcfGetProperties-Check-string-boundaries-CVE-2017-13.patch @@ -0,0 +1,52 @@ +From 672bb944311392e2415b39c0d63b1e1902905bcd Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Thu, 20 Jul 2017 17:05:23 +0200 +Subject: [PATCH] pcfGetProperties: Check string boundaries (CVE-2017-13722) + +Without the checks a malformed PCF file can cause the library to make +atom from random heap memory that was behind the `strings` buffer. +This may crash the process or leak information. + +Signed-off-by: Julien Cristau +Signed-off-by: Peter Korsgaard +--- + src/bitmap/pcfread.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c +index dab1c44..ae34c28 100644 +--- a/src/bitmap/pcfread.c ++++ b/src/bitmap/pcfread.c +@@ -45,6 +45,7 @@ from The Open Group. + + #include + #include ++#include + + void + pcfError(const char* message, ...) +@@ -311,11 +312,19 @@ pcfGetProperties(FontInfoPtr pFontInfo, FontFilePtr file, + if (IS_EOF(file)) goto Bail; + position += string_size; + for (i = 0; i < nprops; i++) { ++ if (props[i].name >= string_size) { ++ pcfError("pcfGetProperties(): String starts out of bounds (%ld/%d)\n", props[i].name, string_size); ++ goto Bail; ++ } + props[i].name = MakeAtom(strings + props[i].name, +- strlen(strings + props[i].name), TRUE); ++ strnlen(strings + props[i].name, string_size - props[i].name), TRUE); + if (isStringProp[i]) { ++ if (props[i].value >= string_size) { ++ pcfError("pcfGetProperties(): String starts out of bounds (%ld/%d)\n", props[i].value, string_size); ++ goto Bail; ++ } + props[i].value = MakeAtom(strings + props[i].value, +- strlen(strings + props[i].value), TRUE); ++ strnlen(strings + props[i].value, string_size - props[i].value), TRUE); + } + } + free(strings); +-- +2.11.0 + diff --git a/package/x11r7/xlib_libXfont2/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch b/package/x11r7/xlib_libXfont2/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch new file mode 100644 index 0000000000..3795179af1 --- /dev/null +++ b/package/x11r7/xlib_libXfont2/0001-Check-for-end-of-string-in-PatternMatch-CVE-2017-137.patch @@ -0,0 +1,34 @@ +From d1e670a4a8704b8708e493ab6155589bcd570608 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Thu, 20 Jul 2017 13:38:53 +0200 +Subject: [PATCH] Check for end of string in PatternMatch (CVE-2017-13720) + +If a pattern contains '?' character, any character in the string is skipped, +even if it is '\0'. The rest of the matching then reads invalid memory. + +Reviewed-by: Peter Hutterer +Signed-off-by: Julien Cristau +Signed-off-by: Peter Korsgaard +--- + src/fontfile/fontdir.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c +index 4ce2473..996b7d1 100644 +--- a/src/fontfile/fontdir.c ++++ b/src/fontfile/fontdir.c +@@ -400,8 +400,10 @@ PatternMatch(char *pat, int patdashes, char *string, int stringdashes) + } + } + case '?': +- if (*string++ == XK_minus) ++ if ((t = *string++) == XK_minus) + stringdashes--; ++ if (!t) ++ return 0; + break; + case '\0': + return (*string == '\0'); +-- +2.11.0 + diff --git a/package/x11r7/xlib_libXfont2/0002-pcfGetProperties-Check-string-boundaries-CVE-2017-13.patch b/package/x11r7/xlib_libXfont2/0002-pcfGetProperties-Check-string-boundaries-CVE-2017-13.patch new file mode 100644 index 0000000000..709e446efe --- /dev/null +++ b/package/x11r7/xlib_libXfont2/0002-pcfGetProperties-Check-string-boundaries-CVE-2017-13.patch @@ -0,0 +1,52 @@ +From 672bb944311392e2415b39c0d63b1e1902905bcd Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Thu, 20 Jul 2017 17:05:23 +0200 +Subject: [PATCH] pcfGetProperties: Check string boundaries (CVE-2017-13722) + +Without the checks a malformed PCF file can cause the library to make +atom from random heap memory that was behind the `strings` buffer. +This may crash the process or leak information. + +Signed-off-by: Julien Cristau +Signed-off-by: Peter Korsgaard +--- + src/bitmap/pcfread.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c +index dab1c44..ae34c28 100644 +--- a/src/bitmap/pcfread.c ++++ b/src/bitmap/pcfread.c +@@ -45,6 +45,7 @@ from The Open Group. + + #include + #include ++#include + + void + pcfError(const char* message, ...) +@@ -311,11 +312,19 @@ pcfGetProperties(FontInfoPtr pFontInfo, FontFilePtr file, + if (IS_EOF(file)) goto Bail; + position += string_size; + for (i = 0; i < nprops; i++) { ++ if (props[i].name >= string_size) { ++ pcfError("pcfGetProperties(): String starts out of bounds (%ld/%d)\n", props[i].name, string_size); ++ goto Bail; ++ } + props[i].name = MakeAtom(strings + props[i].name, +- strlen(strings + props[i].name), TRUE); ++ strnlen(strings + props[i].name, string_size - props[i].name), TRUE); + if (isStringProp[i]) { ++ if (props[i].value >= string_size) { ++ pcfError("pcfGetProperties(): String starts out of bounds (%ld/%d)\n", props[i].value, string_size); ++ goto Bail; ++ } + props[i].value = MakeAtom(strings + props[i].value, +- strlen(strings + props[i].value), TRUE); ++ strnlen(strings + props[i].value, string_size - props[i].value), TRUE); + } + } + free(strings); +-- +2.11.0 + From 79da53917e9bb05b21db99744900232d48358374 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 10 Oct 2017 10:32:29 +0200 Subject: [PATCH 3344/3392] support/kconfig: fix usage typo and align verb tenses Fix typo 'selectes' -> 'selects'. Additionally, change 'will exclude' to 'excludes' to align with 'selects'. Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni (cherry picked from commit 787f4fee7184e4b86343a1d6d60c303622d458b9) Signed-off-by: Peter Korsgaard --- support/kconfig/mconf.c | 2 +- support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/support/kconfig/mconf.c b/support/kconfig/mconf.c index 7d6cf80703..91c4df78f3 100644 --- a/support/kconfig/mconf.c +++ b/support/kconfig/mconf.c @@ -176,7 +176,7 @@ menu_instructions[] = N_( "Arrow keys navigate the menu. " " selects submenus ---> (or empty submenus ----). " "Highlighted letters are hotkeys. " - "Pressing selectes a feature, while will exclude a feature. " + "Pressing selects a feature, while excludes a feature. " "Press to exit, for Help, for Search. " "Legend: [*] feature is selected [ ] feature is excluded"), radiolist_instructions[] = N_( diff --git a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch index ecfe76b6e2..e76198a36b 100644 --- a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch +++ b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch @@ -28,7 +28,7 @@ Index: kconfig/mconf.c " selects submenus ---> (or empty submenus ----). " "Highlighted letters are hotkeys. " - "Pressing includes, excludes, modularizes features. " -+ "Pressing selectes a feature, while will exclude a feature. " ++ "Pressing selects a feature, while excludes a feature. " "Press to exit, for Help, for Search. " - "Legend: [*] built-in [ ] excluded module < > module capable"), + "Legend: [*] feature is selected [ ] feature is excluded"), From 4d63e4332dfb6aec9122a427756a225684274f49 Mon Sep 17 00:00:00 2001 From: Alexander Mukhin Date: Thu, 14 Sep 2017 18:11:14 +0300 Subject: [PATCH 3345/3392] hostapd: fix upstream URL hostapd project URL has been changed to w1.fi/hostapd. The old domain epitest.fi has expired. Signed-off-by: Alexander Mukhin Signed-off-by: Thomas Petazzoni (cherry picked from commit 8a2396b90aeb411a856335d976a427eed6e115bc) Signed-off-by: Peter Korsgaard --- package/hostapd/Config.in | 2 +- package/hostapd/hostapd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 62fbb66d63..1609d0df5d 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_HOSTAPD IEEE 802.1X/WPA/WPA2/EAP authenticators, RADIUS client, EAP server and RADIUS authentication server. - http://hostap.epitest.fi/ + http://w1.fi/hostapd/ if BR2_PACKAGE_HOSTAPD diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index a499011385..39c8788a01 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -5,7 +5,7 @@ ################################################################################ HOSTAPD_VERSION = 2.6 -HOSTAPD_SITE = http://hostap.epitest.fi/releases +HOSTAPD_SITE = http://w1.fi/releases HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config HOSTAPD_DEPENDENCIES = host-pkgconf libnl From e42b881a59118ab791b8fba5455c4022a1a74437 Mon Sep 17 00:00:00 2001 From: Cam Hutchison Date: Sun, 15 Oct 2017 11:55:07 +1100 Subject: [PATCH 3346/3392] docs/manual: fix BR2_EXTERNAL path typo Signed-off-by: Cam Hutchison Signed-off-by: Thomas Petazzoni (cherry picked from commit 0c76d89e54705a477cedad5dc39b668af771be7d) Signed-off-by: Peter Korsgaard --- docs/manual/customize-outside-br.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/customize-outside-br.txt b/docs/manual/customize-outside-br.txt index ea0e12033e..b1eed326aa 100644 --- a/docs/manual/customize-outside-br.txt +++ b/docs/manual/customize-outside-br.txt @@ -199,7 +199,7 @@ and to the kernel configuration file as follows (e.g. by running ---- BR2_GLOBAL_PATCH_DIR=$(BR2_EXTERNAL_BAR_42_PATH)/patches/ BR2_ROOTFS_OVERLAY=$(BR2_EXTERNAL_BAR_42_PATH)/board//overlay/ -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_FOO)/board//kernel.config +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=$(BR2_EXTERNAL_BAR_42_PATH)/board//kernel.config ---- ===== Example layout @@ -263,7 +263,7 @@ illustration, of course): | |BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_BAR_42_PATH)/patches/" | |BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/overlay/" | |BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/post-image.sh" - | |BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BAR_42_FOO)/board/my-board/kernel.config" + | |BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/kernel.config" | `---- | |- patches/linux/0001-some-change.patch From 5ec89c79ee7a22615c04a44a1688496032dffbb8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 14 Oct 2017 13:37:28 +0200 Subject: [PATCH 3347/3392] package/x11r7/xserver_xorg-server: security bump version to 1.19.5 Fixes xfixes: unvalidated lengths (CVE-2017-12183) Xi: fix wrong extra length check in ProcXIChangeHierarchy (CVE-2017-12178) dbe: Unvalidated variable-length request in ProcDbeGetVisualInfo (CVE-2017-12177) Unvalidated extra length in ProcEstablishConnection (CVE-2017-12176) Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit e7713abf89f3fa3ab773813a10b61080471f5bcb) Signed-off-by: Peter Korsgaard --- .../0001-modesettings-needs-dri2.patch | 0 ...02-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0 .../0003-Remove-check-for-useSIGIO-option.patch | 0 package/x11r7/xserver_xorg-server/Config.in | 4 ++-- .../x11r7/xserver_xorg-server/xserver_xorg-server.hash | 10 +++++----- 5 files changed, 7 insertions(+), 7 deletions(-) rename package/x11r7/xserver_xorg-server/{1.19.4 => 1.19.5}/0001-modesettings-needs-dri2.patch (100%) rename package/x11r7/xserver_xorg-server/{1.19.4 => 1.19.5}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%) rename package/x11r7/xserver_xorg-server/{1.19.4 => 1.19.5}/0003-Remove-check-for-useSIGIO-option.patch (100%) diff --git a/package/x11r7/xserver_xorg-server/1.19.4/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.19.5/0001-modesettings-needs-dri2.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.4/0001-modesettings-needs-dri2.patch rename to package/x11r7/xserver_xorg-server/1.19.5/0001-modesettings-needs-dri2.patch diff --git a/package/x11r7/xserver_xorg-server/1.19.4/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/package/x11r7/xserver_xorg-server/1.19.5/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.4/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch rename to package/x11r7/xserver_xorg-server/1.19.5/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch diff --git a/package/x11r7/xserver_xorg-server/1.19.4/0003-Remove-check-for-useSIGIO-option.patch b/package/x11r7/xserver_xorg-server/1.19.5/0003-Remove-check-for-useSIGIO-option.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.19.4/0003-Remove-check-for-useSIGIO-option.patch rename to package/x11r7/xserver_xorg-server/1.19.5/0003-Remove-check-for-useSIGIO-option.patch diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 0f1e81994f..787c9d7d80 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -79,7 +79,7 @@ choice bool "X Window System server version" config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 - bool "1.19.3" + bool "1.19.5" select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23 select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XPROTO_PRESENTPROTO @@ -99,7 +99,7 @@ endchoice config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION string - default "1.19.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 + default "1.19.5" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index d0acc24102..c0feb985d2 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -3,8 +3,8 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2017-October/002808.html -md5 28cb6d773bfcdfd43500dd64527d2ab0 xorg-server-1.19.4.tar.bz2 -sha1 7a47d5f927ea69681e279c6e5f5e8ff3a21c7152 xorg-server-1.19.4.tar.bz2 -sha256 aa758acea91deaf1f95069ddc5ea3818e13675fb14fef40ad1b3d0b2bf03c9a8 xorg-server-1.19.4.tar.bz2 -sha512 ff80934e42a7dd2d437e947fe02c74c3b25bdbb3002b7005191d52272d5eae8cb3a83377fa32f40000011be88405830e796f6bd3b914bd7fc163ea8ece76226b xorg-server-1.19.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-October/002814.html +md5 4ac6feeae6790436ce9de879ca9a3bf8 xorg-server-1.19.5.tar.bz2 +sha1 307d3405f709f7e41966c850b37deefe7f83eb9b xorg-server-1.19.5.tar.bz2 +sha256 18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447 xorg-server-1.19.5.tar.bz2 +sha512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c xorg-server-1.19.5.tar.bz2 From 59af8829ae083ace1bb6fcd716df0dce662943a2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 15 Jun 2017 13:34:56 +0300 Subject: [PATCH 3348/3392] libnspr: bump to version 4.15 Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit f234748a48d5640c8d1f4a84fcb1b5b9ac5bd77d) Signed-off-by: Peter Korsgaard --- 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 9111a32c86..13cee6e7ef 100644 --- a/package/libnspr/libnspr.hash +++ b/package/libnspr/libnspr.hash @@ -1,2 +1,2 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.14/src/SHA256SUMS -sha256 64fc18826257403a9132240aa3c45193d577a84b08e96f7e7770a97c074d17d5 nspr-4.14.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.15/src/SHA256SUMS +sha256 27dde06bc3d0c88903a20d6ad807361a912cfb624ca0ab4efb10fc50b19e2d80 nspr-4.15.tar.gz diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index f891bb3bfb..899aec104c 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.14 +LIBNSPR_VERSION = 4.15 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 4720122d2c37e0992214fd106321d43adcc8ffe4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 12 Oct 2017 23:17:51 +0200 Subject: [PATCH 3349/3392] libnspr: bump version to 4.17 libnss 3.33 needs libnspr >= 4.17. Also add a hash for the license file while we're at it. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit b1363093248b6198eab285124b2c87411155a0a1) Signed-off-by: Peter Korsgaard --- package/libnspr/libnspr.hash | 6 ++++-- package/libnspr/libnspr.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash index 13cee6e7ef..46c091e0da 100644 --- a/package/libnspr/libnspr.hash +++ b/package/libnspr/libnspr.hash @@ -1,2 +1,4 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.15/src/SHA256SUMS -sha256 27dde06bc3d0c88903a20d6ad807361a912cfb624ca0ab4efb10fc50b19e2d80 nspr-4.15.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.17/src/SHA256SUMS +sha256 590a0aea29412ae22d7728038c21ef2ab42646e48172a47d2e4bb782846d1095 nspr-4.17.tar.gz +# Locally calculated +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 899aec104c..b41b06291f 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.15 +LIBNSPR_VERSION = 4.17 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 ff4d2c18b6553ed0f76cc2a74d6cf623164079b2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 15 Jun 2017 13:34:57 +0300 Subject: [PATCH 3350/3392] libnss: bump to version 3.31 Fixes build with gcc 7. https://hg.mozilla.org/projects/nss/rev/0dca14409fef Fixes: http://autobuild.buildroot.net/results/b71/b71e4e003ec5753708a07cfd04e3025c93f80e67/ http://autobuild.buildroot.net/results/66d/66d31923824d34df3b20a363a1346df1c00ae222/ Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit b39e6dbed1536cb5dbd91724cc25df050d8dd54d) Signed-off-by: Peter Korsgaard --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 7be7e48a69..e4e24283cb 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,2 +1,2 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_30_2_RTM/src/SHA256SUMS -sha256 0d4a77ff26bcee79fa8afe0125e0df6ae9e798b6b36782fa29e28febf7cfce24 nss-3.30.2.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_31_RTM/src/SHA256SUMS +sha256 e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d nss-3.31.tar.gz diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 3c38bb0c16..994db001d7 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.30.2 +LIBNSS_VERSION = 3.31 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From fd49d225a392077fcf9ea937b6e68d12c34f57d9 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 12 Oct 2017 23:17:52 +0200 Subject: [PATCH 3351/3392] libnss: security bump to version 3.33 Fixes CVE-2017-7805 - Martin Thomson discovered that nss, the Mozilla Network Security Service library, is prone to a use-after-free vulnerability in the TLS 1.2 implementation when handshake hashes are generated. A remote attacker can take advantage of this flaw to cause an application using the nss library to crash, resulting in a denial of service, or potentially to execute arbitrary code. Also add a hash for the license file while we're at it. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 746502418fbf603464efe0dfc77c6bc10b10603e) Signed-off-by: Peter Korsgaard --- package/libnss/libnss.hash | 6 ++++-- package/libnss/libnss.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index e4e24283cb..6c8ce83784 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,2 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_31_RTM/src/SHA256SUMS -sha256 e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d nss-3.31.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_33_RTM/src/SHA256SUMS +sha256 98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4 nss-3.33.tar.gz +# Locally calculated +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 994db001d7..53e278557e 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.31 +LIBNSS_VERSION = 3.33 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From 334401cc8d216e8cfe44d6eedf59dd481206b0b7 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 13 Oct 2017 13:14:43 -0300 Subject: [PATCH 3352/3392] linux-headers: bump 3.2.x and 4.{4, 9, 13}.x series [Peter: drop 4.13.x bump] Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni (cherry picked from commit 2cd4c845865ca86ee3d7b015670063b347cb49f8) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index da2bbf26d7..cb1a2e4d1a 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -214,7 +214,7 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.93" if BR2_KERNEL_HEADERS_3_2 + default "3.2.94" if BR2_KERNEL_HEADERS_3_2 default "3.4.113" if BR2_KERNEL_HEADERS_3_4 default "3.10.107" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.44" if BR2_KERNEL_HEADERS_4_1 - default "4.4.90" if BR2_KERNEL_HEADERS_4_4 + default "4.4.92" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.53" if BR2_KERNEL_HEADERS_4_9 + default "4.9.56" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 33156ba957fe8f6dd06081db1e5ed4afe580b881 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Fri, 13 Oct 2017 12:43:24 +0200 Subject: [PATCH 3353/3392] bzip2: fix passing of TARGET_MAKE_ENV to make TARGET_MAKE_ENV is not passed to make because it is on a different line without a backslash. Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni (cherry picked from commit 7690bc03358b7460aa138f785b3a5704b919882a) Signed-off-by: Peter Korsgaard --- package/bzip2/bzip2.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index 0597ab97d6..e07b0ed086 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -12,13 +12,13 @@ BZIP2_LICENSE_FILES = LICENSE ifeq ($(BR2_STATIC_LIBS),) define BZIP2_BUILD_SHARED_CMDS - $(TARGET_MAKE_ENV) + $(TARGET_MAKE_ENV) \ $(MAKE) -C $(@D) -f Makefile-libbz2_so $(TARGET_CONFIGURE_OPTS) endef endif define BZIP2_BUILD_CMDS - $(TARGET_MAKE_ENV) + $(TARGET_MAKE_ENV) \ $(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover $(TARGET_CONFIGURE_OPTS) $(BZIP2_BUILD_SHARED_CMDS) endef From 6d3669070ae3fd801c35f6b03f641e1b4c4ccfdb Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 9 Oct 2017 22:02:10 +0200 Subject: [PATCH 3354/3392] toolchain-external: bump Linaro ARM toolchain to 2017.02 Tested with qemu-2.7.1-2.fc25 and the qemu_arm_vexpress_defconfig Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 075d26900b4fdd4994831fc66e26682bacb5a90a) Signed-off-by: Marc Gonzalez Signed-off-by: Peter Korsgaard --- .../toolchain-external-linaro-arm/Config.in | 6 +++--- .../toolchain-external-linaro-arm.hash | 4 ++-- .../toolchain-external-linaro-arm.mk | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index 78aeb8ea41..f538eb7eb3 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -4,7 +4,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM - bool "Linaro ARM 2016.11" + bool "Linaro ARM 2017.02" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -19,8 +19,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM select BR2_TOOLCHAIN_HAS_FORTRAN help Linaro toolchain for the ARM architecture. It uses Linaro - GCC 2016.11 (based on gcc 6.2.1), Linaro GDB 2016.11 (based on - GDB 7.12), glibc 2.23, Binutils 2016.11 (based on 2.27). It + GCC 2017.02 (based on gcc 6.3.1), Linaro GDB 2017.02 (based on + GDB 7.12), glibc 2.23, Binutils 2017.02 (based on 2.27). It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated is Thumb 2, with the hard floating point calling convention, and uses diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash index d4452c3786..ec861ec1d9 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a2a4968bfb8537c1b3280b4f475d90d53a1a0f05f7afc7b43efed266cc4de446 gcc-linaro-6.2.1-2016.11-i686_arm-linux-gnueabihf.tar.xz -sha256 5eb7ab2f8a0b4b960900321505cd6923a072cb3e2412102f5f72a6e74c2f0a55 gcc-linaro-6.2.1-2016.11-x86_64_arm-linux-gnueabihf.tar.xz +sha256 2505348d30fd3f67544b8915ad7a557e643fbf987f3113e092463b37577c9b95 gcc-linaro-6.3.1-2017.02-i686_arm-linux-gnueabihf.tar.xz +sha256 fe1cae02e0734665487b9b642171a5685a6e91416cea869bb22590f6dc7260c3 gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk index e098f47757..b8ba43ced8 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2016.11 -TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/6.2-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf +TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2017.02 +TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/6.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz endif $(eval $(toolchain-external-package)) From a3b94261946daacfedc4842d0d84049df1b530c3 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 9 Oct 2017 22:02:29 +0200 Subject: [PATCH 3355/3392] toolchain-external: bump Linaro ARMeb toolchain to 2017.02 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 52f059f38d463159540d87c0a46edd98eea5629d) Signed-off-by: Marc Gonzalez Signed-off-by: Peter Korsgaard --- .../toolchain-external-linaro-armeb/Config.in | 6 +++--- .../toolchain-external-linaro-armeb.hash | 4 ++-- .../toolchain-external-linaro-armeb.mk | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index c7f2f5f60c..14c7481f81 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -4,7 +4,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB - bool "Linaro armeb 2016.11" + bool "Linaro armeb 2017.02" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -18,8 +18,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB select BR2_TOOLCHAIN_GCC_AT_LEAST_6 help Linaro toolchain for the ARM big endian architecture. It - uses Linaro GCC 2016.11 (based on gcc 6.2.1), Linaro GDB - 2016.11 (based on GDB 7.12), glibc 2.23, Binutils 2016.11 + uses Linaro GCC 2017.02 (based on gcc 6.3.1), Linaro GDB + 2017.02 (based on GDB 7.12), glibc 2.23, Binutils 2017.02 (based on 2.27). It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated is Thumb 2, with the hard floating point calling diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash index a041539ba6..8266145d4f 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 05a34c56da56b9b1e1a61ad1217dc4e751e1d277932dbeaa82b6c242cf0f2ec9 gcc-linaro-6.2.1-2016.11-i686_armeb-linux-gnueabihf.tar.xz -sha256 319cb7c6363a3116357b163d0b4f9e0c27cfcb6153f3c26a34edf892819f12e5 gcc-linaro-6.2.1-2016.11-x86_64_armeb-linux-gnueabihf.tar.xz +sha256 e98aeec91bf8a75247220f41ed189a3e81f1e6c6869423c9b6c83716d6558e61 gcc-linaro-6.3.1-2017.02-i686_armeb-linux-gnueabihf.tar.xz +sha256 7a1ec874859c8b30b5e13bfba63372170ea78587a0ab6a587a115c932bb3498c gcc-linaro-6.3.1-2017.02-x86_64_armeb-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk index ba138e1b50..999d11eda7 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2016.11 -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/6.2-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2017.02 +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/6.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz endif $(eval $(toolchain-external-package)) From 7f7c6ea1142de37dc16439542da3b86850b007c2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 9 Oct 2017 22:02:44 +0200 Subject: [PATCH 3356/3392] toolchain-external: bump Linaro AArch64 toolchain to 2017.02 Tested with qemu-2.7.1-2.fc25 and the qemu_aarch64_virt_defconfig Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 641fe0e39240af8e7cf03bc5ff14ba268f41bba7) Signed-off-by: Marc Gonzalez Signed-off-by: Peter Korsgaard --- .../toolchain-external-linaro-aarch64/Config.in | 2 +- .../toolchain-external-linaro-aarch64.hash | 4 ++-- .../toolchain-external-linaro-aarch64.mk | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in index 4dc8dacbe4..caa5ed340a 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 - bool "Linaro AArch64 2016.11" + bool "Linaro AArch64 2017.02" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash index f7f4209060..2379290943 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 057156a47b9cd68cdc0b48adcbe96c8249e3653b082f6c051dd75cb644f64b3a gcc-linaro-6.2.1-2016.11-i686_aarch64-linux-gnu.tar.xz -sha256 539cc29320bd84178cd093aae0b06b1ee5476511cecaba989faf9c6a1d4cdf81 gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz +sha256 e8d1dba8712e3f3994faf742d5c5dff7deba69f94e9655b1e673df7f26b0908b gcc-linaro-6.3.1-2017.02-i686_aarch64-linux-gnu.tar.xz +sha256 10670e1c5d2ab77b937a26cc7f2a22e8eb6cb223e2df7c763f02ce63339e66bc gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk index fb498fe273..ff3d3dbf33 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2016.11 -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/6.2-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2017.02 +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/6.3-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz endif $(eval $(toolchain-external-package)) From dbf660aea8d68ee9fd2da6d0c9f3ef7173f106c0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 9 Oct 2017 22:02:59 +0200 Subject: [PATCH 3357/3392] toolchain-external: bump version of Linaro ARM toolchain to 2017.08 GDB has been updated to 8.0 version in the release. https://releases.linaro.org/components/toolchain/binaries/6.4-2017.08 Tested with qemu_arm_vexpress_defconfig. 6.4-2017.08 includes several patches for glibc 2.23 mitigating some of the "stack clash" vulnerabilities reported by Qualys. https://www.qualys.com/2017/06/19/stack-clash/stack-clash.txt https://git.linaro.org/toolchain/glibc.git/log/?h=linaro/2.23/master Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit aed5a0fcf7c0ce964deb5fe96d60f5e4d260fe14) Signed-off-by: Marc Gonzalez Signed-off-by: Peter Korsgaard --- .../toolchain-external-linaro-arm/Config.in | 6 +++--- .../toolchain-external-linaro-arm.hash | 4 ++-- .../toolchain-external-linaro-arm.mk | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index f538eb7eb3..fd4e03b2bc 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -4,7 +4,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM - bool "Linaro ARM 2017.02" + bool "Linaro ARM 2017.08" depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -19,8 +19,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM select BR2_TOOLCHAIN_HAS_FORTRAN help Linaro toolchain for the ARM architecture. It uses Linaro - GCC 2017.02 (based on gcc 6.3.1), Linaro GDB 2017.02 (based on - GDB 7.12), glibc 2.23, Binutils 2017.02 (based on 2.27). It + GCC 2017.08 (based on gcc 6.4.1), Linaro GDB 2017.08 (based on + GDB 8.0), glibc 2.23, Binutils 2017.08 (based on 2.27). It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated is Thumb 2, with the hard floating point calling convention, and uses diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash index ec861ec1d9..664663df05 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2505348d30fd3f67544b8915ad7a557e643fbf987f3113e092463b37577c9b95 gcc-linaro-6.3.1-2017.02-i686_arm-linux-gnueabihf.tar.xz -sha256 fe1cae02e0734665487b9b642171a5685a6e91416cea869bb22590f6dc7260c3 gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf.tar.xz +sha256 a99029dff3d17d28c89831f2cd2aa37752c2f85fe89fe38fdd17971c36a9f1dc gcc-linaro-6.4.1-2017.08-i686_arm-linux-gnueabihf.tar.xz +sha256 1c975a1936cc966099b3fcaff8f387d748caff27f43593214ae6d4601241ae40 gcc-linaro-6.4.1-2017.08-x86_64_arm-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk index b8ba43ced8..a165184b5b 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2017.02 -TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/6.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf +TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2017.08 +TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/6.4-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz endif $(eval $(toolchain-external-package)) From ef2798d8b0e5c986aaca1d8e7d53b87e065ecb67 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 9 Oct 2017 22:03:35 +0200 Subject: [PATCH 3358/3392] toolchain-external: bump version of Linaro ARMeb toolchain to 2017.08 GDB has been updated to 8.0 version in the release. https://releases.linaro.org/components/toolchain/binaries/6.4-2017.08 6.4-2017.08 includes several patches for glibc 2.23 mitigating some of the "stack clash" vulnerabilities reported by Qualys. https://www.qualys.com/2017/06/19/stack-clash/stack-clash.txt https://git.linaro.org/toolchain/glibc.git/log/?h=linaro/2.23/master Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 90524c69f42b8331dd1aa534994fe7f63f618ebf) Signed-off-by: Marc Gonzalez Signed-off-by: Peter Korsgaard --- .../toolchain-external-linaro-armeb/Config.in | 6 +++--- .../toolchain-external-linaro-armeb.hash | 4 ++-- .../toolchain-external-linaro-armeb.mk | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index 14c7481f81..5fb7eb5c1d 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -4,7 +4,7 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB - bool "Linaro armeb 2017.02" + bool "Linaro armeb 2017.08" depends on BR2_armeb depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" @@ -18,8 +18,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB select BR2_TOOLCHAIN_GCC_AT_LEAST_6 help Linaro toolchain for the ARM big endian architecture. It - uses Linaro GCC 2017.02 (based on gcc 6.3.1), Linaro GDB - 2017.02 (based on GDB 7.12), glibc 2.23, Binutils 2017.02 + uses Linaro GCC 2017.08 (based on gcc 6.4.1), Linaro GDB + 2017.08 (based on GDB 8.0), glibc 2.23, Binutils 2017.08 (based on 2.27). It generates code that runs on all Cortex-A profile devices, but tuned for the Cortex-A9. The code generated is Thumb 2, with the hard floating point calling diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash index 8266145d4f..c70d64047f 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e98aeec91bf8a75247220f41ed189a3e81f1e6c6869423c9b6c83716d6558e61 gcc-linaro-6.3.1-2017.02-i686_armeb-linux-gnueabihf.tar.xz -sha256 7a1ec874859c8b30b5e13bfba63372170ea78587a0ab6a587a115c932bb3498c gcc-linaro-6.3.1-2017.02-x86_64_armeb-linux-gnueabihf.tar.xz +sha256 7472ed65dd73945d4574e30fd2d26ef15d65b309dee83aaaf5a97df8fe3a94c7 gcc-linaro-6.4.1-2017.08-i686_armeb-linux-gnueabihf.tar.xz +sha256 97a0de6ce7a77a2df7398e907621242752e6e5f1787772d7b308c82a3a039fab gcc-linaro-6.4.1-2017.08-x86_64_armeb-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk index 999d11eda7..ff2c5d6078 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2017.02 -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/6.3-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2017.08 +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/6.4-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz endif $(eval $(toolchain-external-package)) From 842dbd20f0462c460e483e87c76e467da6e6f262 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 9 Oct 2017 22:03:53 +0200 Subject: [PATCH 3359/3392] toolchain-external: bump version of Linaro AArch64 toolchain to 2017.08 GDB has been updated to 8.0 version in the release. https://releases.linaro.org/components/toolchain/binaries/6.4-2017.08 Tested with qemu_aarch64_virt_defconfig. 6.4-2017.08 includes several patches for glibc 2.23 mitigating some of the "stack clash" vulnerabilities reported by Qualys. https://www.qualys.com/2017/06/19/stack-clash/stack-clash.txt https://git.linaro.org/toolchain/glibc.git/log/?h=linaro/2.23/master Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit 0365f41c874e9d22a73153d43e96c90e19bc1ea6) Signed-off-by: Marc Gonzalez Signed-off-by: Peter Korsgaard --- .../toolchain-external-linaro-aarch64/Config.in | 2 +- .../toolchain-external-linaro-aarch64.hash | 4 ++-- .../toolchain-external-linaro-aarch64.mk | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in index caa5ed340a..5f66f56662 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in @@ -1,5 +1,5 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 - bool "Linaro AArch64 2017.02" + bool "Linaro AArch64 2017.08" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash index 2379290943..2360280e95 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e8d1dba8712e3f3994faf742d5c5dff7deba69f94e9655b1e673df7f26b0908b gcc-linaro-6.3.1-2017.02-i686_aarch64-linux-gnu.tar.xz -sha256 10670e1c5d2ab77b937a26cc7f2a22e8eb6cb223e2df7c763f02ce63339e66bc gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu.tar.xz +sha256 6365480ab93e30185ffd33070b9332e0caa2c3c0813dd71bfbc83d300b76b4c9 gcc-linaro-6.4.1-2017.08-i686_aarch64-linux-gnu.tar.xz +sha256 f507d071c6969665e26c595d6d952d7b18eb11609a71cb6debbafb55d700522a gcc-linaro-6.4.1-2017.08-x86_64_aarch64-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk index ff3d3dbf33..6053ea78a6 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk @@ -4,13 +4,13 @@ # ################################################################################ -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2017.02 -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/6.3-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2017.08 +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/6.4-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz else -TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.3.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz +TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz endif $(eval $(toolchain-external-package)) From 35400f56615fcf2cf622c3cfc58a95263344a39f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 16 Oct 2017 13:19:21 +0200 Subject: [PATCH 3360/3392] hostapd: add upstream security fixes Fixes CVE-2017-13082 http://lists.infradead.org/pipermail/hostap/2017-October/037989.html Signed-off-by: Peter Korsgaard (cherry picked from commit 5259c5c8058aa2c9608fd202c35477015a41c326) Signed-off-by: Peter Korsgaard --- package/hostapd/hostapd.hash | 2 ++ package/hostapd/hostapd.mk | 3 +++ 2 files changed, 5 insertions(+) diff --git a/package/hostapd/hostapd.hash b/package/hostapd/hostapd.hash index fb891476b3..b20c89b184 100644 --- a/package/hostapd/hostapd.hash +++ b/package/hostapd/hostapd.hash @@ -1,2 +1,4 @@ # Locally calculated sha256 01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d hostapd-2.6.tar.gz +sha256 529113cc81256c6178f3c1cf25dd8d3f33e6d770e4a180bd31c6ab7e4917f40b rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch +sha256 147c8abe07606905d16404fb2d2c8849796ca7c85ed8673c09bb50038bcdeb9e rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 39c8788a01..3ac1979c37 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -6,6 +6,9 @@ HOSTAPD_VERSION = 2.6 HOSTAPD_SITE = http://w1.fi/releases +HOSTAPD_PATCH = \ + http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch \ + http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch HOSTAPD_SUBDIR = hostapd HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config HOSTAPD_DEPENDENCIES = host-pkgconf libnl From 65f93a4f3f96bc28887c913fe801e51725a9e267 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 16 Oct 2017 13:19:20 +0200 Subject: [PATCH 3361/3392] wpa_supplicant: add upstream security fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes CVE-2017-13078, CVE-2017-13079, CVE-2017-13080, CVE-2017-13081, CVE-2017-13087, CVE-2017-13088: http://lists.infradead.org/pipermail/hostap/2017-October/037989.html [Peter: also add patch 0001 as suggested by Jörg Krause] Signed-off-by: Peter Korsgaard (cherry picked from commit 57c0a485cc0a5681e772ddaf1c886e810d3d7ae4) Signed-off-by: Peter Korsgaard --- package/wpa_supplicant/wpa_supplicant.hash | 7 +++++++ package/wpa_supplicant/wpa_supplicant.mk | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash index 22b2e8ddd8..65a6ae246f 100644 --- a/package/wpa_supplicant/wpa_supplicant.hash +++ b/package/wpa_supplicant/wpa_supplicant.hash @@ -1,2 +1,9 @@ # Locally calculated sha256 b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450 wpa_supplicant-2.6.tar.gz +sha256 529113cc81256c6178f3c1cf25dd8d3f33e6d770e4a180bd31c6ab7e4917f40b rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch +sha256 d86d47ab74170f3648b45b91bce780949ca92b09ab43df065178850ec0c335d7 rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch +sha256 d4535e36739a0cc7f3585e6bcba3c0bb8fc67cb3e729844e448c5dc751f47e81 rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch +sha256 793a54748161b5af430dd9de4a1988d19cb8e85ab29bc2340f886b0297cee20b rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch +sha256 596d4d3b63ea859ed7ea9791b3a21cb11b6173b04c0a14a2afa47edf1666afa6 rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch +sha256 c5a17af84aec2d88c56ce0da2d6945be398fe7cab5c0c340deb30973900c2736 rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch +sha256 c8840d857b9432f3b488113c85c1ff5d4a4b8d81078b7033388dae1e990843b1 rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 9c8414b568..9eb1a32928 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -6,6 +6,14 @@ WPA_SUPPLICANT_VERSION = 2.6 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases +WPA_SUPPLICANT_PATCH = \ + http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch \ + http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch \ + http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch \ + http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch \ + http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch \ + http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch \ + http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch WPA_SUPPLICANT_LICENSE = BSD-3c WPA_SUPPLICANT_LICENSE_FILES = README WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config From 457e09a2f8edd49ec85a7d791871764909190533 Mon Sep 17 00:00:00 2001 From: Alexander Mukhin Date: Wed, 18 Oct 2017 12:34:06 +0300 Subject: [PATCH 3362/3392] wpa_supplicant: fix upstream URL wpa_supplicant project URL has been changed to w1.fi/wpa_supplicant. The old domain epitest.fi has expired. Signed-off-by: Alexander Mukhin Signed-off-by: Thomas Petazzoni (cherry picked from commit 38e36cd0e1ec55743766e48564d952e38ff40113) Signed-off-by: Peter Korsgaard --- package/wpa_supplicant/Config.in | 2 +- package/wpa_supplicant/wpa_supplicant.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 9250a3b200..1b2baf4e65 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT help WPA supplicant for secure wireless networks - http://hostap.epitest.fi/wpa_supplicant/ + http://w1.fi/wpa_supplicant/ if BR2_PACKAGE_WPA_SUPPLICANT diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 9eb1a32928..7ac12ca336 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -5,7 +5,7 @@ ################################################################################ WPA_SUPPLICANT_VERSION = 2.6 -WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases +WPA_SUPPLICANT_SITE = http://w1.fi/releases WPA_SUPPLICANT_PATCH = \ http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch \ http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch \ From 4c05a1fd669be684d0f579bbf6f3ccca9565d71e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 21 Oct 2017 11:25:15 +0200 Subject: [PATCH 3363/3392] musl: add upstream security fix for CVE-2017-15650 >From the upstream announcement: http://www.openwall.com/lists/oss-security/2017/10/19/5 Felix Wilhelm has discovered a flaw in the dns response parsing for musl libc 1.1.16 that leads to overflow of a stack-based buffer. Earlier versions are also affected. When an application makes a request via getaddrinfo for both IPv4 and IPv6 results (AF_UNSPEC), an attacker who controls or can spoof the nameservers configured in resolv.conf can reply to both the A and AAAA queries with A results. Since A records are smaller than AAAA records, it's possible to fit more addresses than the precomputed bound, and a buffer overflow occurs. Signed-off-by: Peter Korsgaard --- ...allback-enforce-MAXADDRS-to-preclude.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/musl/0002-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch diff --git a/package/musl/0002-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch b/package/musl/0002-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch new file mode 100644 index 0000000000..c6b5ef26b4 --- /dev/null +++ b/package/musl/0002-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch @@ -0,0 +1,35 @@ +From 45ca5d3fcb6f874bf5ba55d0e9651cef68515395 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Wed, 18 Oct 2017 14:50:03 -0400 +Subject: [PATCH] in dns parsing callback, enforce MAXADDRS to preclude + overflow + +MAXADDRS was chosen not to need enforcement, but the logic used to +compute it assumes the answers received match the RR types of the +queries. specifically, it assumes that only one replu contains A +record answers. if the replies to both the A and the AAAA query have +their answer sections filled with A records, MAXADDRS can be exceeded +and clobber the stack of the calling function. + +this bug was found and reported by Felix Wilhelm. + +Signed-off-by: Peter Korsgaard +--- + src/network/lookup_name.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c +index 066be4d5..209c20f0 100644 +--- a/src/network/lookup_name.c ++++ b/src/network/lookup_name.c +@@ -111,6 +111,7 @@ static int dns_parse_callback(void *c, int rr, const void *data, int len, const + { + char tmp[256]; + struct dpc_ctx *ctx = c; ++ if (ctx->cnt >= MAXADDRS) return -1; + switch (rr) { + case RR_A: + if (len != 4) return -1; +-- +2.11.0 + From ace9345c96fe013468a7ab548b69dd1510e463c8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 21 Oct 2017 19:09:37 +0200 Subject: [PATCH 3364/3392] busybox: add upstream post-1.26.2 fixes Suggested-by: Scott Fan Signed-off-by: Peter Korsgaard --- ...in-damaged-HTTP-servers.-Closes-9471.patch | 87 +++ ...se-CDF-to-find-compressed-files.-Clo.patch | 494 +++++++++++++++++ .../0005-typo-fix-in-config-help-text.patch | 27 + ...-pointless-lseek-which-returns-curre.patch | 50 ++ ...-CDF.extra_len-read-local-file-heade.patch | 509 ++++++++++++++++++ ...httpd-fix-handling-of-range-requests.patch | 27 + 6 files changed, 1194 insertions(+) create mode 100644 package/busybox/0003-wget-fix-for-brain-damaged-HTTP-servers.-Closes-9471.patch create mode 100644 package/busybox/0004-unzip-properly-use-CDF-to-find-compressed-files.-Clo.patch create mode 100644 package/busybox/0005-typo-fix-in-config-help-text.patch create mode 100644 package/busybox/0006-unzip-remove-now-pointless-lseek-which-returns-curre.patch create mode 100644 package/busybox/0007-unzip-do-not-use-CDF.extra_len-read-local-file-heade.patch create mode 100644 package/busybox/0008-httpd-fix-handling-of-range-requests.patch diff --git a/package/busybox/0003-wget-fix-for-brain-damaged-HTTP-servers.-Closes-9471.patch b/package/busybox/0003-wget-fix-for-brain-damaged-HTTP-servers.-Closes-9471.patch new file mode 100644 index 0000000000..a39bc894ed --- /dev/null +++ b/package/busybox/0003-wget-fix-for-brain-damaged-HTTP-servers.-Closes-9471.patch @@ -0,0 +1,87 @@ +From dac762a702d01c8c2d42135795cc9bf23ff324a2 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Wed, 11 Jan 2017 20:16:45 +0100 +Subject: [PATCH] wget: fix for brain-damaged HTTP servers. Closes 9471 + +write(3, "GET / HTTP/1.1\r\nUser-Agent: Wget\r\nConnection: close\r\n\r\n", 74) = 74 +shutdown(3, SHUT_WR) = 0 +alarm(900) = 900 +read(3, "", 1024) = 0 +write(2, "wget: error getting response\n", 29) = 29 +exit(1) + +The peer simply does not return anything. It closes its connection. + +Probably it detects wget closing its writing end: shutdown(3, SHUT_WR). + +The point it, closing write side of the socket is _valid_ for HTTP. +wget sent the full request, it won't be sending anything more: +it will only receive the response, and that's it. + +Signed-off-by: Denys Vlasenko +Signed-off-by: Peter Korsgaard +--- + networking/wget.c | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +diff --git a/networking/wget.c b/networking/wget.c +index b082a0f59..afb09f587 100644 +--- a/networking/wget.c ++++ b/networking/wget.c +@@ -141,6 +141,8 @@ + #endif + + ++#define SSL_SUPPORTED (ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER) ++ + struct host_info { + char *allocated; + const char *path; +@@ -151,7 +153,7 @@ struct host_info { + }; + static const char P_FTP[] ALIGN1 = "ftp"; + static const char P_HTTP[] ALIGN1 = "http"; +-#if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER ++#if SSL_SUPPORTED + static const char P_HTTPS[] ALIGN1 = "https"; + #endif + +@@ -452,7 +454,7 @@ static void parse_url(const char *src_url, struct host_info *h) + if (strcmp(url, P_FTP) == 0) { + h->port = bb_lookup_port(P_FTP, "tcp", 21); + } else +-#if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER ++#if SSL_SUPPORTED + if (strcmp(url, P_HTTPS) == 0) { + h->port = bb_lookup_port(P_HTTPS, "tcp", 443); + h->protocol = P_HTTPS; +@@ -1093,12 +1095,20 @@ static void download_one_url(const char *url) + } + + fflush(sfp); +- /* If we use SSL helper, keeping our end of the socket open for writing +- * makes our end (i.e. the same fd!) readable (EAGAIN instead of EOF) +- * even after child closes its copy of the fd. +- * This helps: +- */ +- shutdown(fileno(sfp), SHUT_WR); ++ ++/* Tried doing this unconditionally. ++ * Cloudflare and nginx/1.11.5 are shocked to see SHUT_WR on non-HTTPS. ++ */ ++#if SSL_SUPPORTED ++ if (target.protocol == P_HTTPS) { ++ /* If we use SSL helper, keeping our end of the socket open for writing ++ * makes our end (i.e. the same fd!) readable (EAGAIN instead of EOF) ++ * even after child closes its copy of the fd. ++ * This helps: ++ */ ++ shutdown(fileno(sfp), SHUT_WR); ++ } ++#endif + + /* + * Retrieve HTTP response line and check for "200" status code. +-- +2.11.0 + diff --git a/package/busybox/0004-unzip-properly-use-CDF-to-find-compressed-files.-Clo.patch b/package/busybox/0004-unzip-properly-use-CDF-to-find-compressed-files.-Clo.patch new file mode 100644 index 0000000000..66d309d877 --- /dev/null +++ b/package/busybox/0004-unzip-properly-use-CDF-to-find-compressed-files.-Clo.patch @@ -0,0 +1,494 @@ +From fa654812e79d2422b41cfff6443e2abcb7737517 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 5 Jan 2017 11:43:53 +0100 +Subject: [PATCH] unzip: properly use CDF to find compressed files. Closes 9536 + +function old new delta +unzip_main 2437 2350 -87 + +Signed-off-by: Denys Vlasenko +Signed-off-by: Peter Korsgaard +--- + archival/unzip.c | 285 +++++++++++++++++++++++++++++--------------------- + testsuite/unzip.tests | 6 +- + 2 files changed, 168 insertions(+), 123 deletions(-) + +diff --git a/archival/unzip.c b/archival/unzip.c +index c540485ac..edef22f75 100644 +--- a/archival/unzip.c ++++ b/archival/unzip.c +@@ -16,7 +16,6 @@ + * TODO + * Zip64 + other methods + */ +- + //config:config UNZIP + //config: bool "unzip" + //config: default y +@@ -24,8 +23,17 @@ + //config: unzip will list or extract files from a ZIP archive, + //config: commonly found on DOS/WIN systems. The default behavior + //config: (with no options) is to extract the archive into the +-//config: current directory. Use the `-d' option to extract to a +-//config: directory of your choice. ++//config: current directory. ++//config: ++//config:config FEATURE_UNZIP_CDF ++//config: bool "Read and use Central Directory data" ++//config: default y ++//config: depends on UNZIP ++//config: help ++//config: If you know that you only need to deal with simple ++//config: ZIP files without deleted/updated files, SFX archves etc, ++//config: you can reduce code size by unselecting this option. ++//config: To support less trivial ZIPs, say Y. + + //applet:IF_UNZIP(APPLET(unzip, BB_DIR_USR_BIN, BB_SUID_DROP)) + //kbuild:lib-$(CONFIG_UNZIP) += unzip.o +@@ -80,30 +88,20 @@ typedef union { + uint32_t ucmpsize PACKED; /* 18-21 */ + uint16_t filename_len; /* 22-23 */ + uint16_t extra_len; /* 24-25 */ ++ /* filename follows (not NUL terminated) */ ++ /* extra field follows */ ++ /* data follows */ + } formatted PACKED; + } zip_header_t; /* PACKED - gcc 4.2.1 doesn't like it (spews warning) */ + +-/* Check the offset of the last element, not the length. This leniency +- * allows for poor packing, whereby the overall struct may be too long, +- * even though the elements are all in the right place. +- */ +-struct BUG_zip_header_must_be_26_bytes { +- char BUG_zip_header_must_be_26_bytes[ +- offsetof(zip_header_t, formatted.extra_len) + 2 +- == ZIP_HEADER_LEN ? 1 : -1]; +-}; +- +-#define FIX_ENDIANNESS_ZIP(zip_header) do { \ +- (zip_header).formatted.version = SWAP_LE16((zip_header).formatted.version ); \ +- (zip_header).formatted.method = SWAP_LE16((zip_header).formatted.method ); \ +- (zip_header).formatted.modtime = SWAP_LE16((zip_header).formatted.modtime ); \ +- (zip_header).formatted.moddate = SWAP_LE16((zip_header).formatted.moddate ); \ ++#define FIX_ENDIANNESS_ZIP(zip_header) \ ++do { if (BB_BIG_ENDIAN) { \ + (zip_header).formatted.crc32 = SWAP_LE32((zip_header).formatted.crc32 ); \ + (zip_header).formatted.cmpsize = SWAP_LE32((zip_header).formatted.cmpsize ); \ + (zip_header).formatted.ucmpsize = SWAP_LE32((zip_header).formatted.ucmpsize ); \ + (zip_header).formatted.filename_len = SWAP_LE16((zip_header).formatted.filename_len); \ + (zip_header).formatted.extra_len = SWAP_LE16((zip_header).formatted.extra_len ); \ +-} while (0) ++}} while (0) + + #define CDF_HEADER_LEN 42 + +@@ -115,8 +113,8 @@ typedef union { + uint16_t version_needed; /* 2-3 */ + uint16_t cdf_flags; /* 4-5 */ + uint16_t method; /* 6-7 */ +- uint16_t mtime; /* 8-9 */ +- uint16_t mdate; /* 10-11 */ ++ uint16_t modtime; /* 8-9 */ ++ uint16_t moddate; /* 10-11 */ + uint32_t crc32; /* 12-15 */ + uint32_t cmpsize; /* 16-19 */ + uint32_t ucmpsize; /* 20-23 */ +@@ -127,27 +125,27 @@ typedef union { + uint16_t internal_file_attributes; /* 32-33 */ + uint32_t external_file_attributes PACKED; /* 34-37 */ + uint32_t relative_offset_of_local_header PACKED; /* 38-41 */ ++ /* filename follows (not NUL terminated) */ ++ /* extra field follows */ ++ /* comment follows */ + } formatted PACKED; + } cdf_header_t; + +-struct BUG_cdf_header_must_be_42_bytes { +- char BUG_cdf_header_must_be_42_bytes[ +- offsetof(cdf_header_t, formatted.relative_offset_of_local_header) + 4 +- == CDF_HEADER_LEN ? 1 : -1]; +-}; +- +-#define FIX_ENDIANNESS_CDF(cdf_header) do { \ ++#define FIX_ENDIANNESS_CDF(cdf_header) \ ++do { if (BB_BIG_ENDIAN) { \ ++ (cdf_header).formatted.version_made_by = SWAP_LE16((cdf_header).formatted.version_made_by); \ ++ (cdf_header).formatted.version_needed = SWAP_LE16((cdf_header).formatted.version_needed); \ ++ (cdf_header).formatted.method = SWAP_LE16((cdf_header).formatted.method ); \ ++ (cdf_header).formatted.modtime = SWAP_LE16((cdf_header).formatted.modtime ); \ ++ (cdf_header).formatted.moddate = SWAP_LE16((cdf_header).formatted.moddate ); \ + (cdf_header).formatted.crc32 = SWAP_LE32((cdf_header).formatted.crc32 ); \ + (cdf_header).formatted.cmpsize = SWAP_LE32((cdf_header).formatted.cmpsize ); \ + (cdf_header).formatted.ucmpsize = SWAP_LE32((cdf_header).formatted.ucmpsize ); \ + (cdf_header).formatted.file_name_length = SWAP_LE16((cdf_header).formatted.file_name_length); \ + (cdf_header).formatted.extra_field_length = SWAP_LE16((cdf_header).formatted.extra_field_length); \ + (cdf_header).formatted.file_comment_length = SWAP_LE16((cdf_header).formatted.file_comment_length); \ +- IF_DESKTOP( \ +- (cdf_header).formatted.version_made_by = SWAP_LE16((cdf_header).formatted.version_made_by); \ + (cdf_header).formatted.external_file_attributes = SWAP_LE32((cdf_header).formatted.external_file_attributes); \ +- ) \ +-} while (0) ++}} while (0) + + #define CDE_HEADER_LEN 16 + +@@ -166,20 +164,38 @@ typedef union { + } formatted PACKED; + } cde_header_t; + +-struct BUG_cde_header_must_be_16_bytes { ++#define FIX_ENDIANNESS_CDE(cde_header) \ ++do { if (BB_BIG_ENDIAN) { \ ++ (cde_header).formatted.cdf_offset = SWAP_LE32((cde_header).formatted.cdf_offset); \ ++}} while (0) ++ ++struct BUG { ++ /* Check the offset of the last element, not the length. This leniency ++ * allows for poor packing, whereby the overall struct may be too long, ++ * even though the elements are all in the right place. ++ */ ++ char BUG_zip_header_must_be_26_bytes[ ++ offsetof(zip_header_t, formatted.extra_len) + 2 ++ == ZIP_HEADER_LEN ? 1 : -1]; ++ char BUG_cdf_header_must_be_42_bytes[ ++ offsetof(cdf_header_t, formatted.relative_offset_of_local_header) + 4 ++ == CDF_HEADER_LEN ? 1 : -1]; + char BUG_cde_header_must_be_16_bytes[ + sizeof(cde_header_t) == CDE_HEADER_LEN ? 1 : -1]; + }; + +-#define FIX_ENDIANNESS_CDE(cde_header) do { \ +- (cde_header).formatted.cdf_offset = SWAP_LE32((cde_header).formatted.cdf_offset); \ +-} while (0) + + enum { zip_fd = 3 }; + + +-#if ENABLE_DESKTOP ++/* This value means that we failed to find CDF */ ++#define BAD_CDF_OFFSET ((uint32_t)0xffffffff) ++ ++#if !ENABLE_FEATURE_UNZIP_CDF + ++# define find_cdf_offset() BAD_CDF_OFFSET ++ ++#else + /* Seen in the wild: + * Self-extracting PRO2K3XP_32.exe contains 19078464 byte zip archive, + * where CDE was nearly 48 kbytes before EOF. +@@ -188,25 +204,26 @@ enum { zip_fd = 3 }; + * To make extraction work, bumped PEEK_FROM_END from 16k to 64k. + */ + #define PEEK_FROM_END (64*1024) +- +-/* This value means that we failed to find CDF */ +-#define BAD_CDF_OFFSET ((uint32_t)0xffffffff) +- + /* NB: does not preserve file position! */ + static uint32_t find_cdf_offset(void) + { + cde_header_t cde_header; ++ unsigned char *buf; + unsigned char *p; + off_t end; +- unsigned char *buf = xzalloc(PEEK_FROM_END); + uint32_t found; + +- end = xlseek(zip_fd, 0, SEEK_END); ++ end = lseek(zip_fd, 0, SEEK_END); ++ if (end == (off_t) -1) ++ return BAD_CDF_OFFSET; ++ + end -= PEEK_FROM_END; + if (end < 0) + end = 0; ++ + dbg("Looking for cdf_offset starting from 0x%"OFF_FMT"x", end); + xlseek(zip_fd, end, SEEK_SET); ++ buf = xzalloc(PEEK_FROM_END); + full_read(zip_fd, buf, PEEK_FROM_END); + + found = BAD_CDF_OFFSET; +@@ -252,30 +269,36 @@ static uint32_t find_cdf_offset(void) + static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr) + { + off_t org; ++ uint32_t magic; + +- org = xlseek(zip_fd, 0, SEEK_CUR); ++ if (cdf_offset == BAD_CDF_OFFSET) ++ return cdf_offset; + +- if (!cdf_offset) +- cdf_offset = find_cdf_offset(); +- +- if (cdf_offset != BAD_CDF_OFFSET) { +- dbg("Reading CDF at 0x%x", (unsigned)cdf_offset); +- xlseek(zip_fd, cdf_offset + 4, SEEK_SET); +- xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN); +- FIX_ENDIANNESS_CDF(*cdf_ptr); +- dbg(" file_name_length:%u extra_field_length:%u file_comment_length:%u", +- (unsigned)cdf_ptr->formatted.file_name_length, +- (unsigned)cdf_ptr->formatted.extra_field_length, +- (unsigned)cdf_ptr->formatted.file_comment_length +- ); +- cdf_offset += 4 + CDF_HEADER_LEN +- + cdf_ptr->formatted.file_name_length +- + cdf_ptr->formatted.extra_field_length +- + cdf_ptr->formatted.file_comment_length; ++ org = xlseek(zip_fd, 0, SEEK_CUR); ++ dbg("Reading CDF at 0x%x", (unsigned)cdf_offset); ++ xlseek(zip_fd, cdf_offset, SEEK_SET); ++ xread(zip_fd, &magic, 4); ++ /* Central Directory End? */ ++ if (magic == ZIP_CDE_MAGIC) { ++ dbg("got ZIP_CDE_MAGIC"); ++ return 0; /* EOF */ + } ++ xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN); ++ /* Caller doesn't need this: */ ++ /* dbg("Returning file position to 0x%"OFF_FMT"x", org); */ ++ /* xlseek(zip_fd, org, SEEK_SET); */ ++ ++ FIX_ENDIANNESS_CDF(*cdf_ptr); ++ dbg(" file_name_length:%u extra_field_length:%u file_comment_length:%u", ++ (unsigned)cdf_ptr->formatted.file_name_length, ++ (unsigned)cdf_ptr->formatted.extra_field_length, ++ (unsigned)cdf_ptr->formatted.file_comment_length ++ ); ++ cdf_offset += 4 + CDF_HEADER_LEN ++ + cdf_ptr->formatted.file_name_length ++ + cdf_ptr->formatted.extra_field_length ++ + cdf_ptr->formatted.file_comment_length; + +- dbg("Returning file position to 0x%"OFF_FMT"x", org); +- xlseek(zip_fd, org, SEEK_SET); + return cdf_offset; + }; + #endif +@@ -324,6 +347,7 @@ static void unzip_extract(zip_header_t *zip_header, int dst_fd) + bb_error_msg("bad length"); + } + } ++ /* TODO? method 12: bzip2, method 14: LZMA */ + } + + static void my_fgets80(char *buf80) +@@ -339,15 +363,12 @@ int unzip_main(int argc, char **argv) + { + enum { O_PROMPT, O_NEVER, O_ALWAYS }; + +- zip_header_t zip_header; + smallint quiet = 0; +- IF_NOT_DESKTOP(const) smallint verbose = 0; ++ IF_NOT_FEATURE_UNZIP_CDF(const) smallint verbose = 0; + smallint listing = 0; + smallint overwrite = O_PROMPT; + smallint x_opt_seen; +-#if ENABLE_DESKTOP + uint32_t cdf_offset; +-#endif + unsigned long total_usize; + unsigned long total_size; + unsigned total_entries; +@@ -430,7 +451,7 @@ int unzip_main(int argc, char **argv) + break; + + case 'v': /* Verbose list */ +- IF_DESKTOP(verbose++;) ++ IF_FEATURE_UNZIP_CDF(verbose++;) + listing = 1; + break; + +@@ -545,78 +566,102 @@ int unzip_main(int argc, char **argv) + total_usize = 0; + total_size = 0; + total_entries = 0; +-#if ENABLE_DESKTOP +- cdf_offset = 0; +-#endif ++ cdf_offset = find_cdf_offset(); /* try to seek to the end, find CDE and CDF start */ + while (1) { +- uint32_t magic; ++ zip_header_t zip_header; + mode_t dir_mode = 0777; +-#if ENABLE_DESKTOP ++#if ENABLE_FEATURE_UNZIP_CDF + mode_t file_mode = 0666; + #endif + +- /* Check magic number */ +- xread(zip_fd, &magic, 4); +- /* Central directory? It's at the end, so exit */ +- if (magic == ZIP_CDF_MAGIC) { +- dbg("got ZIP_CDF_MAGIC"); +- break; +- } +-#if ENABLE_DESKTOP +- /* Data descriptor? It was a streaming file, go on */ +- if (magic == ZIP_DD_MAGIC) { +- dbg("got ZIP_DD_MAGIC"); +- /* skip over duplicate crc32, cmpsize and ucmpsize */ +- unzip_skip(3 * 4); +- continue; +- } +-#endif +- if (magic != ZIP_FILEHEADER_MAGIC) +- bb_error_msg_and_die("invalid zip magic %08X", (int)magic); +- dbg("got ZIP_FILEHEADER_MAGIC"); +- +- /* Read the file header */ +- xread(zip_fd, zip_header.raw, ZIP_HEADER_LEN); +- FIX_ENDIANNESS_ZIP(zip_header); +- if ((zip_header.formatted.method != 0) && (zip_header.formatted.method != 8)) { +- bb_error_msg_and_die("unsupported method %d", zip_header.formatted.method); +- } +-#if !ENABLE_DESKTOP +- if (zip_header.formatted.zip_flags & SWAP_LE16(0x0009)) { +- bb_error_msg_and_die("zip flags 1 and 8 are not supported"); +- } +-#else +- if (zip_header.formatted.zip_flags & SWAP_LE16(0x0001)) { +- /* 0x0001 - encrypted */ +- bb_error_msg_and_die("zip flag 1 (encryption) is not supported"); +- } ++ if (!ENABLE_FEATURE_UNZIP_CDF || cdf_offset == BAD_CDF_OFFSET) { ++ /* Normally happens when input is unseekable. ++ * ++ * Valid ZIP file has Central Directory at the end ++ * with central directory file headers (CDFs). ++ * After it, there is a Central Directory End structure. ++ * CDFs identify what files are in the ZIP and where ++ * they are located. This allows ZIP readers to load ++ * the list of files without reading the entire ZIP archive. ++ * ZIP files may be appended to, only files specified in ++ * the CD are valid. Scanning for local file headers is ++ * not a correct algorithm. ++ * ++ * We try to do the above, and resort to "linear" reading ++ * of ZIP file only if seek failed or CDE wasn't found. ++ */ ++ uint32_t magic; + +- if (cdf_offset != BAD_CDF_OFFSET) { ++ /* Check magic number */ ++ xread(zip_fd, &magic, 4); ++ /* Central directory? It's at the end, so exit */ ++ if (magic == ZIP_CDF_MAGIC) { ++ dbg("got ZIP_CDF_MAGIC"); ++ break; ++ } ++ /* Data descriptor? It was a streaming file, go on */ ++ if (magic == ZIP_DD_MAGIC) { ++ dbg("got ZIP_DD_MAGIC"); ++ /* skip over duplicate crc32, cmpsize and ucmpsize */ ++ unzip_skip(3 * 4); ++ continue; ++ } ++ if (magic != ZIP_FILEHEADER_MAGIC) ++ bb_error_msg_and_die("invalid zip magic %08X", (int)magic); ++ dbg("got ZIP_FILEHEADER_MAGIC"); ++ ++ xread(zip_fd, zip_header.raw, ZIP_HEADER_LEN); ++ FIX_ENDIANNESS_ZIP(zip_header); ++ if ((zip_header.formatted.method != 0) ++ && (zip_header.formatted.method != 8) ++ ) { ++ /* TODO? method 12: bzip2, method 14: LZMA */ ++ bb_error_msg_and_die("unsupported method %d", zip_header.formatted.method); ++ } ++ if (zip_header.formatted.zip_flags & SWAP_LE16(0x0009)) { ++ bb_error_msg_and_die("zip flags 1 and 8 are not supported"); ++ } ++ } ++#if ENABLE_FEATURE_UNZIP_CDF ++ else { ++ /* cdf_offset is valid (and we know the file is seekable) */ + cdf_header_t cdf_header; + cdf_offset = read_next_cdf(cdf_offset, &cdf_header); +- /* +- * Note: cdf_offset can become BAD_CDF_OFFSET after the above call. +- */ ++ if (cdf_offset == 0) /* EOF? */ ++ break; ++# if 0 ++ xlseek(zip_fd, ++ SWAP_LE32(cdf_header.formatted.relative_offset_of_local_header) + 4, ++ SEEK_SET); ++ xread(zip_fd, zip_header.raw, ZIP_HEADER_LEN); ++ FIX_ENDIANNESS_ZIP(zip_header); + if (zip_header.formatted.zip_flags & SWAP_LE16(0x0008)) { + /* 0x0008 - streaming. [u]cmpsize can be reliably gotten +- * only from Central Directory. See unzip_doc.txt ++ * only from Central Directory. + */ + zip_header.formatted.crc32 = cdf_header.formatted.crc32; + zip_header.formatted.cmpsize = cdf_header.formatted.cmpsize; + zip_header.formatted.ucmpsize = cdf_header.formatted.ucmpsize; + } ++# else ++ /* CDF has the same data as local header, no need to read the latter */ ++ memcpy(&zip_header.formatted.version, ++ &cdf_header.formatted.version_needed, ZIP_HEADER_LEN); ++ xlseek(zip_fd, ++ SWAP_LE32(cdf_header.formatted.relative_offset_of_local_header) + 4 + ZIP_HEADER_LEN, ++ SEEK_SET); ++# endif + if ((cdf_header.formatted.version_made_by >> 8) == 3) { + /* This archive is created on Unix */ + dir_mode = file_mode = (cdf_header.formatted.external_file_attributes >> 16); + } + } +- if (cdf_offset == BAD_CDF_OFFSET +- && (zip_header.formatted.zip_flags & SWAP_LE16(0x0008)) +- ) { +- /* If it's a streaming zip, we _require_ CDF */ +- bb_error_msg_and_die("can't find file table"); +- } + #endif ++ ++ if (zip_header.formatted.zip_flags & SWAP_LE16(0x0001)) { ++ /* 0x0001 - encrypted */ ++ bb_error_msg_and_die("zip flag 1 (encryption) is not supported"); ++ } + dbg("File cmpsize:0x%x extra_len:0x%x ucmpsize:0x%x", + (unsigned)zip_header.formatted.cmpsize, + (unsigned)zip_header.formatted.extra_len, +@@ -751,7 +796,7 @@ int unzip_main(int argc, char **argv) + overwrite = O_ALWAYS; + case 'y': /* Open file and fall into unzip */ + unzip_create_leading_dirs(dst_fn); +-#if ENABLE_DESKTOP ++#if ENABLE_FEATURE_UNZIP_CDF + dst_fd = xopen3(dst_fn, O_WRONLY | O_CREAT | O_TRUNC, file_mode); + #else + dst_fd = xopen(dst_fn, O_WRONLY | O_CREAT | O_TRUNC); +diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests +index d8738a3bd..d9c45242c 100755 +--- a/testsuite/unzip.tests ++++ b/testsuite/unzip.tests +@@ -31,11 +31,10 @@ rmdir foo + rm foo.zip + + # File containing some damaged encrypted stream ++optional FEATURE_UNZIP_CDF + testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \ + "Archive: bad.zip +- inflating: ]3j½r«IK-%Ix +-unzip: corrupted data +-unzip: inflate error ++unzip: short read + 1 + " \ + "" "\ +@@ -49,6 +48,7 @@ BDYAAAAMAAEADQAAADIADQAAAEEAAAASw73Ct1DKokohPXQiNzA+FAI1HCcW + NzITNFBLBQUKAC4JAA04Cw0EOhZQSwUGAQAABAIAAgCZAAAAeQAAAAIALhM= + ==== + " ++SKIP= + + rm * + +-- +2.11.0 + diff --git a/package/busybox/0005-typo-fix-in-config-help-text.patch b/package/busybox/0005-typo-fix-in-config-help-text.patch new file mode 100644 index 0000000000..33b91707ec --- /dev/null +++ b/package/busybox/0005-typo-fix-in-config-help-text.patch @@ -0,0 +1,27 @@ +From f8692dc6a0035788a83821fa18b987d8748f97a7 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 5 Jan 2017 11:47:28 +0100 +Subject: [PATCH] typo fix in config help text + +Signed-off-by: Denys Vlasenko +Signed-off-by: Peter Korsgaard +--- + archival/unzip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/archival/unzip.c b/archival/unzip.c +index edef22f75..f1726439d 100644 +--- a/archival/unzip.c ++++ b/archival/unzip.c +@@ -31,7 +31,7 @@ + //config: depends on UNZIP + //config: help + //config: If you know that you only need to deal with simple +-//config: ZIP files without deleted/updated files, SFX archves etc, ++//config: ZIP files without deleted/updated files, SFX archives etc, + //config: you can reduce code size by unselecting this option. + //config: To support less trivial ZIPs, say Y. + +-- +2.11.0 + diff --git a/package/busybox/0006-unzip-remove-now-pointless-lseek-which-returns-curre.patch b/package/busybox/0006-unzip-remove-now-pointless-lseek-which-returns-curre.patch new file mode 100644 index 0000000000..ebe08c4904 --- /dev/null +++ b/package/busybox/0006-unzip-remove-now-pointless-lseek-which-returns-curre.patch @@ -0,0 +1,50 @@ +From 50504d3a3badb8ab80bd33797abcbb3b7427c267 Mon Sep 17 00:00:00 2001 +From: Cristian Ionescu-Idbohrn +Date: Thu, 5 Jan 2017 19:07:54 +0100 +Subject: [PATCH] unzip: remove now-pointless lseek which returns current + position + +archival/unzip.c: In function 'read_next_cdf': +archival/unzip.c:271:8: warning: variable 'org' set but + not used [-Wunused-but-set-variable] + off_t org; + ^~~ + +Signed-off-by: Cristian Ionescu-Idbohrn +Signed-off-by: Denys Vlasenko +Signed-off-by: Peter Korsgaard +--- + archival/unzip.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/archival/unzip.c b/archival/unzip.c +index f1726439d..98a71c09d 100644 +--- a/archival/unzip.c ++++ b/archival/unzip.c +@@ -268,13 +268,11 @@ static uint32_t find_cdf_offset(void) + + static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr) + { +- off_t org; + uint32_t magic; + + if (cdf_offset == BAD_CDF_OFFSET) + return cdf_offset; + +- org = xlseek(zip_fd, 0, SEEK_CUR); + dbg("Reading CDF at 0x%x", (unsigned)cdf_offset); + xlseek(zip_fd, cdf_offset, SEEK_SET); + xread(zip_fd, &magic, 4); +@@ -284,9 +282,6 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr) + return 0; /* EOF */ + } + xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN); +- /* Caller doesn't need this: */ +- /* dbg("Returning file position to 0x%"OFF_FMT"x", org); */ +- /* xlseek(zip_fd, org, SEEK_SET); */ + + FIX_ENDIANNESS_CDF(*cdf_ptr); + dbg(" file_name_length:%u extra_field_length:%u file_comment_length:%u", +-- +2.11.0 + diff --git a/package/busybox/0007-unzip-do-not-use-CDF.extra_len-read-local-file-heade.patch b/package/busybox/0007-unzip-do-not-use-CDF.extra_len-read-local-file-heade.patch new file mode 100644 index 0000000000..97482c3954 --- /dev/null +++ b/package/busybox/0007-unzip-do-not-use-CDF.extra_len-read-local-file-heade.patch @@ -0,0 +1,509 @@ +From ee72302ac5e3b0b2217f616ab316d3c89e5a1f4c Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Sun, 8 Jan 2017 14:14:19 +0100 +Subject: [PATCH] unzip: do not use CDF.extra_len, read local file header. + Closes 9536 + +While at it, shorten many field and variable names. + +function old new delta +unzip_main 2334 2376 +42 + +Signed-off-by: Denys Vlasenko +Signed-off-by: Peter Korsgaard +--- + archival/unzip.c | 236 ++++++++++++++++++++++++++------------------------ + testsuite/unzip.tests | 4 +- + 2 files changed, 125 insertions(+), 115 deletions(-) + +diff --git a/archival/unzip.c b/archival/unzip.c +index 98a71c09d..921493591 100644 +--- a/archival/unzip.c ++++ b/archival/unzip.c +@@ -62,8 +62,8 @@ + enum { + #if BB_BIG_ENDIAN + ZIP_FILEHEADER_MAGIC = 0x504b0304, +- ZIP_CDF_MAGIC = 0x504b0102, /* central directory's file header */ +- ZIP_CDE_MAGIC = 0x504b0506, /* "end of central directory" record */ ++ ZIP_CDF_MAGIC = 0x504b0102, /* CDF item */ ++ ZIP_CDE_MAGIC = 0x504b0506, /* End of CDF */ + ZIP_DD_MAGIC = 0x504b0708, + #else + ZIP_FILEHEADER_MAGIC = 0x04034b50, +@@ -91,16 +91,16 @@ typedef union { + /* filename follows (not NUL terminated) */ + /* extra field follows */ + /* data follows */ +- } formatted PACKED; ++ } fmt PACKED; + } zip_header_t; /* PACKED - gcc 4.2.1 doesn't like it (spews warning) */ + +-#define FIX_ENDIANNESS_ZIP(zip_header) \ ++#define FIX_ENDIANNESS_ZIP(zip) \ + do { if (BB_BIG_ENDIAN) { \ +- (zip_header).formatted.crc32 = SWAP_LE32((zip_header).formatted.crc32 ); \ +- (zip_header).formatted.cmpsize = SWAP_LE32((zip_header).formatted.cmpsize ); \ +- (zip_header).formatted.ucmpsize = SWAP_LE32((zip_header).formatted.ucmpsize ); \ +- (zip_header).formatted.filename_len = SWAP_LE16((zip_header).formatted.filename_len); \ +- (zip_header).formatted.extra_len = SWAP_LE16((zip_header).formatted.extra_len ); \ ++ (zip).fmt.crc32 = SWAP_LE32((zip).fmt.crc32 ); \ ++ (zip).fmt.cmpsize = SWAP_LE32((zip).fmt.cmpsize ); \ ++ (zip).fmt.ucmpsize = SWAP_LE32((zip).fmt.ucmpsize ); \ ++ (zip).fmt.filename_len = SWAP_LE16((zip).fmt.filename_len); \ ++ (zip).fmt.extra_len = SWAP_LE16((zip).fmt.extra_len ); \ + }} while (0) + + #define CDF_HEADER_LEN 42 +@@ -118,39 +118,39 @@ typedef union { + uint32_t crc32; /* 12-15 */ + uint32_t cmpsize; /* 16-19 */ + uint32_t ucmpsize; /* 20-23 */ +- uint16_t file_name_length; /* 24-25 */ +- uint16_t extra_field_length; /* 26-27 */ ++ uint16_t filename_len; /* 24-25 */ ++ uint16_t extra_len; /* 26-27 */ + uint16_t file_comment_length; /* 28-29 */ + uint16_t disk_number_start; /* 30-31 */ +- uint16_t internal_file_attributes; /* 32-33 */ +- uint32_t external_file_attributes PACKED; /* 34-37 */ ++ uint16_t internal_attributes; /* 32-33 */ ++ uint32_t external_attributes PACKED; /* 34-37 */ + uint32_t relative_offset_of_local_header PACKED; /* 38-41 */ + /* filename follows (not NUL terminated) */ + /* extra field follows */ +- /* comment follows */ +- } formatted PACKED; ++ /* file comment follows */ ++ } fmt PACKED; + } cdf_header_t; + +-#define FIX_ENDIANNESS_CDF(cdf_header) \ ++#define FIX_ENDIANNESS_CDF(cdf) \ + do { if (BB_BIG_ENDIAN) { \ +- (cdf_header).formatted.version_made_by = SWAP_LE16((cdf_header).formatted.version_made_by); \ +- (cdf_header).formatted.version_needed = SWAP_LE16((cdf_header).formatted.version_needed); \ +- (cdf_header).formatted.method = SWAP_LE16((cdf_header).formatted.method ); \ +- (cdf_header).formatted.modtime = SWAP_LE16((cdf_header).formatted.modtime ); \ +- (cdf_header).formatted.moddate = SWAP_LE16((cdf_header).formatted.moddate ); \ +- (cdf_header).formatted.crc32 = SWAP_LE32((cdf_header).formatted.crc32 ); \ +- (cdf_header).formatted.cmpsize = SWAP_LE32((cdf_header).formatted.cmpsize ); \ +- (cdf_header).formatted.ucmpsize = SWAP_LE32((cdf_header).formatted.ucmpsize ); \ +- (cdf_header).formatted.file_name_length = SWAP_LE16((cdf_header).formatted.file_name_length); \ +- (cdf_header).formatted.extra_field_length = SWAP_LE16((cdf_header).formatted.extra_field_length); \ +- (cdf_header).formatted.file_comment_length = SWAP_LE16((cdf_header).formatted.file_comment_length); \ +- (cdf_header).formatted.external_file_attributes = SWAP_LE32((cdf_header).formatted.external_file_attributes); \ ++ (cdf).fmt.version_made_by = SWAP_LE16((cdf).fmt.version_made_by); \ ++ (cdf).fmt.version_needed = SWAP_LE16((cdf).fmt.version_needed); \ ++ (cdf).fmt.method = SWAP_LE16((cdf).fmt.method ); \ ++ (cdf).fmt.modtime = SWAP_LE16((cdf).fmt.modtime ); \ ++ (cdf).fmt.moddate = SWAP_LE16((cdf).fmt.moddate ); \ ++ (cdf).fmt.crc32 = SWAP_LE32((cdf).fmt.crc32 ); \ ++ (cdf).fmt.cmpsize = SWAP_LE32((cdf).fmt.cmpsize ); \ ++ (cdf).fmt.ucmpsize = SWAP_LE32((cdf).fmt.ucmpsize ); \ ++ (cdf).fmt.filename_len = SWAP_LE16((cdf).fmt.filename_len); \ ++ (cdf).fmt.extra_len = SWAP_LE16((cdf).fmt.extra_len ); \ ++ (cdf).fmt.file_comment_length = SWAP_LE16((cdf).fmt.file_comment_length); \ ++ (cdf).fmt.external_attributes = SWAP_LE32((cdf).fmt.external_attributes); \ + }} while (0) + +-#define CDE_HEADER_LEN 16 ++#define CDE_LEN 16 + + typedef union { +- uint8_t raw[CDE_HEADER_LEN]; ++ uint8_t raw[CDE_LEN]; + struct { + /* uint32_t signature; 50 4b 05 06 */ + uint16_t this_disk_no; +@@ -159,14 +159,14 @@ typedef union { + uint16_t cdf_entries_total; + uint32_t cdf_size; + uint32_t cdf_offset; +- /* uint16_t file_comment_length; */ +- /* .ZIP file comment (variable size) */ +- } formatted PACKED; +-} cde_header_t; ++ /* uint16_t archive_comment_length; */ ++ /* archive comment follows */ ++ } fmt PACKED; ++} cde_t; + +-#define FIX_ENDIANNESS_CDE(cde_header) \ ++#define FIX_ENDIANNESS_CDE(cde) \ + do { if (BB_BIG_ENDIAN) { \ +- (cde_header).formatted.cdf_offset = SWAP_LE32((cde_header).formatted.cdf_offset); \ ++ (cde).fmt.cdf_offset = SWAP_LE32((cde).fmt.cdf_offset); \ + }} while (0) + + struct BUG { +@@ -175,13 +175,13 @@ struct BUG { + * even though the elements are all in the right place. + */ + char BUG_zip_header_must_be_26_bytes[ +- offsetof(zip_header_t, formatted.extra_len) + 2 ++ offsetof(zip_header_t, fmt.extra_len) + 2 + == ZIP_HEADER_LEN ? 1 : -1]; + char BUG_cdf_header_must_be_42_bytes[ +- offsetof(cdf_header_t, formatted.relative_offset_of_local_header) + 4 ++ offsetof(cdf_header_t, fmt.relative_offset_of_local_header) + 4 + == CDF_HEADER_LEN ? 1 : -1]; +- char BUG_cde_header_must_be_16_bytes[ +- sizeof(cde_header_t) == CDE_HEADER_LEN ? 1 : -1]; ++ char BUG_cde_must_be_16_bytes[ ++ sizeof(cde_t) == CDE_LEN ? 1 : -1]; + }; + + +@@ -207,7 +207,7 @@ enum { zip_fd = 3 }; + /* NB: does not preserve file position! */ + static uint32_t find_cdf_offset(void) + { +- cde_header_t cde_header; ++ cde_t cde; + unsigned char *buf; + unsigned char *p; + off_t end; +@@ -228,7 +228,7 @@ static uint32_t find_cdf_offset(void) + + found = BAD_CDF_OFFSET; + p = buf; +- while (p <= buf + PEEK_FROM_END - CDE_HEADER_LEN - 4) { ++ while (p <= buf + PEEK_FROM_END - CDE_LEN - 4) { + if (*p != 'P') { + p++; + continue; +@@ -240,19 +240,19 @@ static uint32_t find_cdf_offset(void) + if (*++p != 6) + continue; + /* we found CDE! */ +- memcpy(cde_header.raw, p + 1, CDE_HEADER_LEN); +- FIX_ENDIANNESS_CDE(cde_header); ++ memcpy(cde.raw, p + 1, CDE_LEN); ++ FIX_ENDIANNESS_CDE(cde); + /* + * I've seen .ZIP files with seemingly valid CDEs + * where cdf_offset points past EOF - ?? + * This check ignores such CDEs: + */ +- if (cde_header.formatted.cdf_offset < end + (p - buf)) { +- found = cde_header.formatted.cdf_offset; ++ if (cde.fmt.cdf_offset < end + (p - buf)) { ++ found = cde.fmt.cdf_offset; + dbg("Possible cdf_offset:0x%x at 0x%"OFF_FMT"x", + (unsigned)found, end + (p-3 - buf)); + dbg(" cdf_offset+cdf_size:0x%x", +- (unsigned)(found + SWAP_LE32(cde_header.formatted.cdf_size))); ++ (unsigned)(found + SWAP_LE32(cde.fmt.cdf_size))); + /* + * We do not "break" here because only the last CDE is valid. + * I've seen a .zip archive which contained a .zip file, +@@ -266,7 +266,7 @@ static uint32_t find_cdf_offset(void) + return found; + }; + +-static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr) ++static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf) + { + uint32_t magic; + +@@ -276,23 +276,25 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr) + dbg("Reading CDF at 0x%x", (unsigned)cdf_offset); + xlseek(zip_fd, cdf_offset, SEEK_SET); + xread(zip_fd, &magic, 4); +- /* Central Directory End? */ ++ /* Central Directory End? Assume CDF has ended. ++ * (more correct method is to use cde.cdf_entries_total counter) ++ */ + if (magic == ZIP_CDE_MAGIC) { + dbg("got ZIP_CDE_MAGIC"); + return 0; /* EOF */ + } +- xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN); ++ xread(zip_fd, cdf->raw, CDF_HEADER_LEN); + +- FIX_ENDIANNESS_CDF(*cdf_ptr); +- dbg(" file_name_length:%u extra_field_length:%u file_comment_length:%u", +- (unsigned)cdf_ptr->formatted.file_name_length, +- (unsigned)cdf_ptr->formatted.extra_field_length, +- (unsigned)cdf_ptr->formatted.file_comment_length ++ FIX_ENDIANNESS_CDF(*cdf); ++ dbg(" filename_len:%u extra_len:%u file_comment_length:%u", ++ (unsigned)cdf->fmt.filename_len, ++ (unsigned)cdf->fmt.extra_len, ++ (unsigned)cdf->fmt.file_comment_length + ); + cdf_offset += 4 + CDF_HEADER_LEN +- + cdf_ptr->formatted.file_name_length +- + cdf_ptr->formatted.extra_field_length +- + cdf_ptr->formatted.file_comment_length; ++ + cdf->fmt.filename_len ++ + cdf->fmt.extra_len ++ + cdf->fmt.file_comment_length; + + return cdf_offset; + }; +@@ -315,28 +317,28 @@ static void unzip_create_leading_dirs(const char *fn) + free(name); + } + +-static void unzip_extract(zip_header_t *zip_header, int dst_fd) ++static void unzip_extract(zip_header_t *zip, int dst_fd) + { +- if (zip_header->formatted.method == 0) { ++ if (zip->fmt.method == 0) { + /* Method 0 - stored (not compressed) */ +- off_t size = zip_header->formatted.ucmpsize; ++ off_t size = zip->fmt.ucmpsize; + if (size) + bb_copyfd_exact_size(zip_fd, dst_fd, size); + } else { + /* Method 8 - inflate */ + transformer_state_t xstate; + init_transformer_state(&xstate); +- xstate.bytes_in = zip_header->formatted.cmpsize; ++ xstate.bytes_in = zip->fmt.cmpsize; + xstate.src_fd = zip_fd; + xstate.dst_fd = dst_fd; + if (inflate_unzip(&xstate) < 0) + bb_error_msg_and_die("inflate error"); + /* Validate decompression - crc */ +- if (zip_header->formatted.crc32 != (xstate.crc32 ^ 0xffffffffL)) { ++ if (zip->fmt.crc32 != (xstate.crc32 ^ 0xffffffffL)) { + bb_error_msg_and_die("crc error"); + } + /* Validate decompression - size */ +- if (zip_header->formatted.ucmpsize != xstate.bytes_out) { ++ if (zip->fmt.ucmpsize != xstate.bytes_out) { + /* Don't die. Who knows, maybe len calculation + * was botched somewhere. After all, crc matched! */ + bb_error_msg("bad length"); +@@ -563,7 +565,7 @@ int unzip_main(int argc, char **argv) + total_entries = 0; + cdf_offset = find_cdf_offset(); /* try to seek to the end, find CDE and CDF start */ + while (1) { +- zip_header_t zip_header; ++ zip_header_t zip; + mode_t dir_mode = 0777; + #if ENABLE_FEATURE_UNZIP_CDF + mode_t file_mode = 0666; +@@ -589,7 +591,7 @@ int unzip_main(int argc, char **argv) + + /* Check magic number */ + xread(zip_fd, &magic, 4); +- /* Central directory? It's at the end, so exit */ ++ /* CDF item? Assume there are no more files, exit */ + if (magic == ZIP_CDF_MAGIC) { + dbg("got ZIP_CDF_MAGIC"); + break; +@@ -605,71 +607,74 @@ int unzip_main(int argc, char **argv) + bb_error_msg_and_die("invalid zip magic %08X", (int)magic); + dbg("got ZIP_FILEHEADER_MAGIC"); + +- xread(zip_fd, zip_header.raw, ZIP_HEADER_LEN); +- FIX_ENDIANNESS_ZIP(zip_header); +- if ((zip_header.formatted.method != 0) +- && (zip_header.formatted.method != 8) ++ xread(zip_fd, zip.raw, ZIP_HEADER_LEN); ++ FIX_ENDIANNESS_ZIP(zip); ++ if ((zip.fmt.method != 0) ++ && (zip.fmt.method != 8) + ) { + /* TODO? method 12: bzip2, method 14: LZMA */ +- bb_error_msg_and_die("unsupported method %d", zip_header.formatted.method); ++ bb_error_msg_and_die("unsupported method %d", zip.fmt.method); + } +- if (zip_header.formatted.zip_flags & SWAP_LE16(0x0009)) { ++ if (zip.fmt.zip_flags & SWAP_LE16(0x0009)) { + bb_error_msg_and_die("zip flags 1 and 8 are not supported"); + } + } + #if ENABLE_FEATURE_UNZIP_CDF + else { + /* cdf_offset is valid (and we know the file is seekable) */ +- cdf_header_t cdf_header; +- cdf_offset = read_next_cdf(cdf_offset, &cdf_header); ++ cdf_header_t cdf; ++ cdf_offset = read_next_cdf(cdf_offset, &cdf); + if (cdf_offset == 0) /* EOF? */ + break; +-# if 0 ++# if 1 + xlseek(zip_fd, +- SWAP_LE32(cdf_header.formatted.relative_offset_of_local_header) + 4, ++ SWAP_LE32(cdf.fmt.relative_offset_of_local_header) + 4, + SEEK_SET); +- xread(zip_fd, zip_header.raw, ZIP_HEADER_LEN); +- FIX_ENDIANNESS_ZIP(zip_header); +- if (zip_header.formatted.zip_flags & SWAP_LE16(0x0008)) { ++ xread(zip_fd, zip.raw, ZIP_HEADER_LEN); ++ FIX_ENDIANNESS_ZIP(zip); ++ if (zip.fmt.zip_flags & SWAP_LE16(0x0008)) { + /* 0x0008 - streaming. [u]cmpsize can be reliably gotten + * only from Central Directory. + */ +- zip_header.formatted.crc32 = cdf_header.formatted.crc32; +- zip_header.formatted.cmpsize = cdf_header.formatted.cmpsize; +- zip_header.formatted.ucmpsize = cdf_header.formatted.ucmpsize; ++ zip.fmt.crc32 = cdf.fmt.crc32; ++ zip.fmt.cmpsize = cdf.fmt.cmpsize; ++ zip.fmt.ucmpsize = cdf.fmt.ucmpsize; + } + # else +- /* CDF has the same data as local header, no need to read the latter */ +- memcpy(&zip_header.formatted.version, +- &cdf_header.formatted.version_needed, ZIP_HEADER_LEN); ++ /* CDF has the same data as local header, no need to read the latter... ++ * ...not really. An archive was seen with cdf.extra_len == 6 but ++ * zip.extra_len == 0. ++ */ ++ memcpy(&zip.fmt.version, ++ &cdf.fmt.version_needed, ZIP_HEADER_LEN); + xlseek(zip_fd, +- SWAP_LE32(cdf_header.formatted.relative_offset_of_local_header) + 4 + ZIP_HEADER_LEN, ++ SWAP_LE32(cdf.fmt.relative_offset_of_local_header) + 4 + ZIP_HEADER_LEN, + SEEK_SET); + # endif +- if ((cdf_header.formatted.version_made_by >> 8) == 3) { ++ if ((cdf.fmt.version_made_by >> 8) == 3) { + /* This archive is created on Unix */ +- dir_mode = file_mode = (cdf_header.formatted.external_file_attributes >> 16); ++ dir_mode = file_mode = (cdf.fmt.external_attributes >> 16); + } + } + #endif + +- if (zip_header.formatted.zip_flags & SWAP_LE16(0x0001)) { ++ if (zip.fmt.zip_flags & SWAP_LE16(0x0001)) { + /* 0x0001 - encrypted */ + bb_error_msg_and_die("zip flag 1 (encryption) is not supported"); + } + dbg("File cmpsize:0x%x extra_len:0x%x ucmpsize:0x%x", +- (unsigned)zip_header.formatted.cmpsize, +- (unsigned)zip_header.formatted.extra_len, +- (unsigned)zip_header.formatted.ucmpsize ++ (unsigned)zip.fmt.cmpsize, ++ (unsigned)zip.fmt.extra_len, ++ (unsigned)zip.fmt.ucmpsize + ); + + /* Read filename */ + free(dst_fn); +- dst_fn = xzalloc(zip_header.formatted.filename_len + 1); +- xread(zip_fd, dst_fn, zip_header.formatted.filename_len); ++ dst_fn = xzalloc(zip.fmt.filename_len + 1); ++ xread(zip_fd, dst_fn, zip.fmt.filename_len); + + /* Skip extra header bytes */ +- unzip_skip(zip_header.formatted.extra_len); ++ unzip_skip(zip.fmt.extra_len); + + /* Guard against "/abspath", "/../" and similar attacks */ + overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn)); +@@ -684,32 +689,32 @@ int unzip_main(int argc, char **argv) + /* List entry */ + char dtbuf[sizeof("mm-dd-yyyy hh:mm")]; + sprintf(dtbuf, "%02u-%02u-%04u %02u:%02u", +- (zip_header.formatted.moddate >> 5) & 0xf, // mm: 0x01e0 +- (zip_header.formatted.moddate) & 0x1f, // dd: 0x001f +- (zip_header.formatted.moddate >> 9) + 1980, // yy: 0xfe00 +- (zip_header.formatted.modtime >> 11), // hh: 0xf800 +- (zip_header.formatted.modtime >> 5) & 0x3f // mm: 0x07e0 +- // seconds/2 are not shown, encoded in ----------- 0x001f ++ (zip.fmt.moddate >> 5) & 0xf, // mm: 0x01e0 ++ (zip.fmt.moddate) & 0x1f, // dd: 0x001f ++ (zip.fmt.moddate >> 9) + 1980, // yy: 0xfe00 ++ (zip.fmt.modtime >> 11), // hh: 0xf800 ++ (zip.fmt.modtime >> 5) & 0x3f // mm: 0x07e0 ++ // seconds/2 not shown, encoded in -- 0x001f + ); + if (!verbose) { + // " Length Date Time Name\n" + // "--------- ---------- ----- ----" + printf( "%9u " "%s " "%s\n", +- (unsigned)zip_header.formatted.ucmpsize, ++ (unsigned)zip.fmt.ucmpsize, + dtbuf, + dst_fn); + } else { +- unsigned long percents = zip_header.formatted.ucmpsize - zip_header.formatted.cmpsize; ++ unsigned long percents = zip.fmt.ucmpsize - zip.fmt.cmpsize; + if ((int32_t)percents < 0) + percents = 0; /* happens if ucmpsize < cmpsize */ + percents = percents * 100; +- if (zip_header.formatted.ucmpsize) +- percents /= zip_header.formatted.ucmpsize; ++ if (zip.fmt.ucmpsize) ++ percents /= zip.fmt.ucmpsize; + // " Length Method Size Cmpr Date Time CRC-32 Name\n" + // "-------- ------ ------- ---- ---------- ----- -------- ----" + printf( "%8u %s" "%9u%4u%% " "%s " "%08x " "%s\n", +- (unsigned)zip_header.formatted.ucmpsize, +- zip_header.formatted.method == 0 ? "Stored" : "Defl:N", /* Defl is method 8 */ ++ (unsigned)zip.fmt.ucmpsize, ++ zip.fmt.method == 0 ? "Stored" : "Defl:N", /* Defl is method 8 */ + /* TODO: show other methods? + * 1 - Shrunk + * 2 - Reduced with compression factor 1 +@@ -722,15 +727,16 @@ int unzip_main(int argc, char **argv) + * 10 - PKWARE Data Compression Library Imploding + * 11 - Reserved by PKWARE + * 12 - BZIP2 ++ * 14 - LZMA + */ +- (unsigned)zip_header.formatted.cmpsize, ++ (unsigned)zip.fmt.cmpsize, + (unsigned)percents, + dtbuf, +- zip_header.formatted.crc32, ++ zip.fmt.crc32, + dst_fn); +- total_size += zip_header.formatted.cmpsize; ++ total_size += zip.fmt.cmpsize; + } +- total_usize += zip_header.formatted.ucmpsize; ++ total_usize += zip.fmt.ucmpsize; + i = 'n'; + } else if (dst_fd == STDOUT_FILENO) { + /* Extracting to STDOUT */ +@@ -798,9 +804,11 @@ int unzip_main(int argc, char **argv) + #endif + case -1: /* Unzip */ + if (!quiet) { +- printf(" inflating: %s\n", dst_fn); ++ printf(/* zip.fmt.method == 0 ++ ? " extracting: %s\n" ++ : */ " inflating: %s\n", dst_fn); + } +- unzip_extract(&zip_header, dst_fd); ++ unzip_extract(&zip, dst_fd); + if (dst_fd != STDOUT_FILENO) { + /* closing STDOUT is potentially bad for future business */ + close(dst_fd); +@@ -811,7 +819,7 @@ int unzip_main(int argc, char **argv) + overwrite = O_NEVER; + case 'n': + /* Skip entry data */ +- unzip_skip(zip_header.formatted.cmpsize); ++ unzip_skip(zip.fmt.cmpsize); + break; + + case 'r': +diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests +index d9c45242c..2e4becdb8 100755 +--- a/testsuite/unzip.tests ++++ b/testsuite/unzip.tests +@@ -34,7 +34,9 @@ rm foo.zip + optional FEATURE_UNZIP_CDF + testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \ + "Archive: bad.zip +-unzip: short read ++ inflating: ]3j½r«IK-%Ix ++unzip: corrupted data ++unzip: inflate error + 1 + " \ + "" "\ +-- +2.11.0 + diff --git a/package/busybox/0008-httpd-fix-handling-of-range-requests.patch b/package/busybox/0008-httpd-fix-handling-of-range-requests.patch new file mode 100644 index 0000000000..3b9d70f742 --- /dev/null +++ b/package/busybox/0008-httpd-fix-handling-of-range-requests.patch @@ -0,0 +1,27 @@ +From 4316dff48aacb29307e1b52cb761fef603759b9d Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Mon, 18 Sep 2017 13:09:11 +0200 +Subject: [PATCH] httpd: fix handling of range requests + +Signed-off-by: Denys Vlasenko +Signed-off-by: Peter Korsgaard +--- + networking/httpd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/networking/httpd.c b/networking/httpd.c +index d301d598d..84d819723 100644 +--- a/networking/httpd.c ++++ b/networking/httpd.c +@@ -2337,7 +2337,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr) + if (STRNCASECMP(iobuf, "Range:") == 0) { + /* We know only bytes=NNN-[MMM] */ + char *s = skip_whitespace(iobuf + sizeof("Range:")-1); +- if (is_prefixed_with(s, "bytes=") == 0) { ++ if (is_prefixed_with(s, "bytes=")) { + s += sizeof("bytes=")-1; + range_start = BB_STRTOOFF(s, &s, 10); + if (s[0] != '-' || range_start < 0) { +-- +2.11.0 + From 475000af0ec9d4110089edd050d77424dd964b82 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 21 Oct 2017 18:24:37 +0200 Subject: [PATCH 3365/3392] xen: add upstream post-4.7.3 security fix for XSA-245 Fixes XA-245: ARM: Some memory not scrubbed at boot https://xenbits.xenproject.org/xsa/advisory-245.html Notice: Not applying XSA-237..244 as they are x86 only and have patch file name conflicts between 2017.02.x and master. Signed-off-by: Peter Korsgaard --- package/xen/xen.hash | 2 ++ package/xen/xen.mk | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index c1aac7624b..8a9f65a4e8 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -9,3 +9,5 @@ sha256 5068a78293daa58557c30c95141b775becfb650de6a5eda0d82a4a321ced551c xsa232.p sha256 f721cc49ba692b2f36299b631451f51d7340b8b4732f74c98f01cb7a80d8662b xsa233.patch sha256 169e4e0eaa6b27e58ff0f4ce50e8fcc3f81b1e0a10210decf22d1b4cac7501fb xsa234-4.8.patch sha256 f30848eee71e66687b421b87be1d8e3f454c0eb395422546c62a689153d1e31c xsa235-4.7.patch +sha256 526f9e1b127fbb316762ce8e8f4563bc9de0c55a1db581456a3017d570d35bdd 0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in.patch +sha256 7164010112fcccd9cd88e72ace2eeabdb364dd6f4d05c434686267d18067f420 0002-xen-arm-Correctly-report-the-memory-region-in-the-du.patch diff --git a/package/xen/xen.mk b/package/xen/xen.mk index fe68960cb0..2a87d8f90c 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -15,7 +15,9 @@ XEN_PATCH = \ https://xenbits.xenproject.org/xsa/xsa232.patch \ https://xenbits.xenproject.org/xsa/xsa233.patch \ https://xenbits.xenproject.org/xsa/xsa234-4.8.patch \ - https://xenbits.xenproject.org/xsa/xsa235-4.7.patch + https://xenbits.xenproject.org/xsa/xsa235-4.7.patch \ + https://xenbits.xenproject.org/xsa/xsa245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in.patch \ + https://xenbits.xenproject.org/xsa/xsa245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du.patch XEN_LICENSE = GPLv2 XEN_LICENSE_FILES = COPYING XEN_DEPENDENCIES = host-python From 103facc2f24c77af7e6a39316caa5562f908d453 Mon Sep 17 00:00:00 2001 From: Lothar Felten Date: Fri, 20 Oct 2017 13:19:17 +0200 Subject: [PATCH 3366/3392] Config.in: fix help comment for gcc optimization The default for is set to BR2_OPTIMIZE_S, the help comment designated BR2_OPTIMIZE_0 as default. Changed the help comment to show that BR2_OPTIMIZE_S is the default. Signed-off-by: Lothar Felten Signed-off-by: Thomas Petazzoni (cherry picked from commit 4e09fd8bdef6ddea1097f91df07515abde389cd0) Signed-off-by: Peter Korsgaard --- Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Config.in b/Config.in index 434935bff0..345d5c5b60 100644 --- a/Config.in +++ b/Config.in @@ -467,7 +467,7 @@ choice config BR2_OPTIMIZE_0 bool "optimization level 0" help - Do not optimize. This is the default. + Do not optimize. config BR2_OPTIMIZE_1 bool "optimization level 1" @@ -534,6 +534,7 @@ config BR2_OPTIMIZE_S -falign-loops -falign-labels -freorder-blocks -freorder-blocks-and-partition -fprefetch-loop-arrays -ftree-vect-loop-version + This is the default. endchoice From fdb7391ba840376c0b8153d4428864bc791df446 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 13 Sep 2017 19:51:20 +0300 Subject: [PATCH 3367/3392] webkitgtk: update to version 2.18.0 Release notes: https://webkitgtk.org/2017/09/11/webkitgtk2.18.0-released.html No corresponding WebKit Security Advisory (WSA) has been published. All patches have been applied upstream. This also bumps the required target GCC version, due to the WebKit code now using more modern C++ features which were introduced in version 5.x of the compiler. Signed-off-by: Adrian Perez de Castro [Arnout: - propagate dependency to midori; - mention in commit message why patches were removed.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 905b1ab5c21f39f9cd1777f6d5745c90d863da4b) Signed-off-by: Peter Korsgaard --- package/midori/Config.in | 6 +- ...uild-when-the-compiler-specifically-.patch | 36 --- ...to-build-when-the-compiler-specifica.patch | 36 --- ...-build-when-ENABLE_VIDEO-is-disabled.patch | 207 ------------------ ...rom-pkg-config-for-E-GL-are-not-pass.patch | 64 ------ package/webkitgtk/Config.in | 6 +- package/webkitgtk/webkitgtk.hash | 8 +- package/webkitgtk/webkitgtk.mk | 2 +- 8 files changed, 11 insertions(+), 354 deletions(-) delete mode 100644 package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch delete mode 100644 package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch delete mode 100644 package/webkitgtk/0003-Fix-broken-build-when-ENABLE_VIDEO-is-disabled.patch delete mode 100644 package/webkitgtk/0004-GTK-WPE-CFLAGS-from-pkg-config-for-E-GL-are-not-pass.patch diff --git a/package/midori/Config.in b/package/midori/Config.in index 0d7672c134..35dac156bd 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -1,7 +1,7 @@ -comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9" +comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 5" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_USES_GLIBC + || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_MIDORI bool "midori" @@ -18,7 +18,7 @@ config BR2_PACKAGE_MIDORI depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2 depends on BR2_PACKAGE_LIBGTK3 depends on BR2_INSTALL_LIBSTDCPP # webkitgtk - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # webkitgtk + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # webkitgtk depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS help diff --git a/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch b/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch deleted file mode 100644 index 017771a07d..0000000000 --- a/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 09d5520d910b63fba67bea1d8c71f5d426f345b7 Mon Sep 17 00:00:00 2001 -From: "aperez@igalia.com" - -Date: Wed, 12 Jul 2017 18:42:29 +0000 -Subject: [PATCH] [WTF] Failure to build when the compiler specifically targets - ARMv8-A / defines __ARM_ARCH_8A__ - https://bugs.webkit.org/show_bug.cgi?id=174425 - -Reviewed by Michael Catanzaro. - -* wtf/Platform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8. - -Signed-off-by: Adrian Perez de Castro - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219415 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/WTF/wtf/Platform.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 44d929c333c..7dccb44fcbf 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -238,7 +238,8 @@ - || defined(__ARM_ARCH_7S__) - #define WTF_ARM_ARCH_VERSION 7 - --#elif defined(__ARM_ARCH_8__) -+#elif defined(__ARM_ARCH_8__) \ -+ || defined(__ARM_ARCH_8A__) - #define WTF_ARM_ARCH_VERSION 8 - - /* MSVC sets _M_ARM */ --- -2.13.3 - diff --git a/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch b/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch deleted file mode 100644 index e1623bffa0..0000000000 --- a/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 07dab7fe552c53e7840e34d3c8bb1cc43a921706 Mon Sep 17 00:00:00 2001 -From: "aperez@igalia.com" - -Date: Wed, 12 Jul 2017 18:43:36 +0000 -Subject: [PATCH] bmalloc: Failure to build when the compiler specifically - targets ARMv8-A / defines __ARM_ARCH_8A__ - https://bugs.webkit.org/show_bug.cgi?id=174424 - -Reviewed by Michael Catanzaro. - -* bmalloc/BPlatform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8. - -Signed-off-by: Adrian Perez de Castro - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219416 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/bmalloc/bmalloc/BPlatform.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Source/bmalloc/bmalloc/BPlatform.h b/Source/bmalloc/bmalloc/BPlatform.h -index 8d768db63fb..400143a63fb 100644 ---- a/Source/bmalloc/bmalloc/BPlatform.h -+++ b/Source/bmalloc/bmalloc/BPlatform.h -@@ -120,7 +120,8 @@ - || defined(__ARM_ARCH_7S__) - #define BARM_ARCH_VERSION 7 - --#elif defined(__ARM_ARCH_8__) -+#elif defined(__ARM_ARCH_8__) \ -+|| defined(__ARM_ARCH_8A__) - #define BARM_ARCH_VERSION 8 - - /* MSVC sets _M_ARM */ --- -2.13.3 - diff --git a/package/webkitgtk/0003-Fix-broken-build-when-ENABLE_VIDEO-is-disabled.patch b/package/webkitgtk/0003-Fix-broken-build-when-ENABLE_VIDEO-is-disabled.patch deleted file mode 100644 index b460b0c924..0000000000 --- a/package/webkitgtk/0003-Fix-broken-build-when-ENABLE_VIDEO-is-disabled.patch +++ /dev/null @@ -1,207 +0,0 @@ -From c054224e551547c3e3593b60ca1226fa4ac41c01 Mon Sep 17 00:00:00 2001 -From: "timothy@hatcher.name" - -Date: Tue, 11 Jul 2017 18:07:24 +0000 -Subject: [PATCH] Fix broken build when ENABLE_VIDEO is disabled. - https://bugs.webkit.org/show_bug.cgi?id=174368 - -Reviewed by Alex Christensen. - -* dom/Document.cpp: -* html/canvas/WebGLRenderingContextBase.cpp: -(WebCore::WebGLRenderingContextBase::texSubImage2D): -(WebCore::WebGLRenderingContextBase::texImage2D): -* html/canvas/WebGLRenderingContextBase.h: -* html/canvas/WebGLRenderingContextBase.idl: -* testing/Internals.cpp: -(WebCore::Internals::mediaResponseSources): -(WebCore::Internals::mediaResponseContentRanges): -* testing/Internals.h: -* testing/Internals.idl: - -Signed-off-by: Adrian Perez de Castro - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219343 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - .../html/canvas/WebGLRenderingContextBase.cpp | 16 +++++++++++---- - .../html/canvas/WebGLRenderingContextBase.h | 12 ++++++++++- - .../html/canvas/WebGLRenderingContextBase.idl | 4 ++++ - Source/WebCore/testing/Internals.cpp | 24 ++++++++++++++++++++++ - Source/WebCore/testing/Internals.h | 2 ++ - Source/WebCore/testing/Internals.idl | 2 ++ - 6 files changed, 55 insertions(+), 5 deletions(-) - -diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp -index f8fd63f7d87..a76a44ff06b 100644 ---- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp -+++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp -@@ -3597,7 +3597,9 @@ ExceptionOr WebGLRenderingContextBase::texSubImage2D(GC3Denum target, GC3D - else - texSubImage2DImpl(target, level, xoffset, yoffset, format, type, canvas->copiedImage(), GraphicsContext3D::HtmlDomCanvas, m_unpackFlipY, m_unpackPremultiplyAlpha); - return { }; -- }, [&](const RefPtr& video) -> ExceptionOr { -+ } -+#if ENABLE(VIDEO) -+ , [&](const RefPtr& video) -> ExceptionOr { - ExceptionCode ec = 0; - if (isContextLostOrPending() || !validateHTMLVideoElement("texSubImage2D", video.get(), ec)) - return ec ? Exception { ec } : ExceptionOr { }; -@@ -3620,7 +3622,9 @@ ExceptionOr WebGLRenderingContextBase::texSubImage2D(GC3Denum target, GC3D - return { }; - texSubImage2DImpl(target, level, xoffset, yoffset, format, type, image.get(), GraphicsContext3D::HtmlDomVideo, m_unpackFlipY, m_unpackPremultiplyAlpha); - return { }; -- }); -+ } -+#endif -+ ); - - return WTF::visit(visitor, source.value()); - } -@@ -4107,7 +4111,9 @@ ExceptionOr WebGLRenderingContextBase::texImage2D(GC3Denum target, GC3Dint - else - texImage2DImpl(target, level, internalformat, format, type, canvas->copiedImage(), GraphicsContext3D::HtmlDomCanvas, m_unpackFlipY, m_unpackPremultiplyAlpha); - return { }; -- }, [&](const RefPtr& video) -> ExceptionOr { -+ } -+#if ENABLE(VIDEO) -+ , [&](const RefPtr& video) -> ExceptionOr { - ExceptionCode ec = 0; - if (isContextLostOrPending() || !validateHTMLVideoElement("texImage2D", video.get(), ec) - || !validateTexFunc("texImage2D", TexImage, SourceHTMLVideoElement, target, level, internalformat, video->videoWidth(), video->videoHeight(), 0, format, type, 0, 0)) -@@ -4137,7 +4143,9 @@ ExceptionOr WebGLRenderingContextBase::texImage2D(GC3Denum target, GC3Dint - return { }; - texImage2DImpl(target, level, internalformat, format, type, image.get(), GraphicsContext3D::HtmlDomVideo, m_unpackFlipY, m_unpackPremultiplyAlpha); - return { }; -- }); -+ } -+#endif -+ ); - - return WTF::visit(visitor, source.value()); - } -diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.h b/Source/WebCore/html/canvas/WebGLRenderingContextBase.h -index 31e5542e612..d4738e834a1 100644 ---- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.h -+++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.h -@@ -57,7 +57,6 @@ class EXTShaderTextureLOD; - class EXTsRGB; - class EXTFragDepth; - class HTMLImageElement; --class HTMLVideoElement; - class ImageData; - class IntSize; - class OESStandardDerivatives; -@@ -85,6 +84,10 @@ class WebGLSharedObject; - class WebGLShaderPrecisionFormat; - class WebGLUniformLocation; - -+#if ENABLE(VIDEO) -+class HTMLVideoElement; -+#endif -+ - inline void clip1D(GC3Dint start, GC3Dsizei range, GC3Dsizei sourceRange, GC3Dint* clippedStart, GC3Dsizei* clippedRange) - { - ASSERT(clippedStart && clippedRange); -@@ -244,7 +247,12 @@ public: - - void texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, RefPtr&&); - -+#if ENABLE(VIDEO) - using TexImageSource = WTF::Variant, RefPtr, RefPtr, RefPtr>; -+#else -+ using TexImageSource = WTF::Variant, RefPtr, RefPtr>; -+#endif -+ - ExceptionOr texImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Denum format, GC3Denum type, std::optional); - - void texParameterf(GC3Denum target, GC3Denum pname, GC3Dfloat param); -@@ -677,7 +685,9 @@ protected: - SourceImageData, - SourceHTMLImageElement, - SourceHTMLCanvasElement, -+#if ENABLE(VIDEO) - SourceHTMLVideoElement, -+#endif - }; - - // Helper function for tex{Sub}Image2D to check if the input format/type/level/target/width/height/border/xoffset/yoffset are valid. -diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl b/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl -index 63b64cdebd2..3111e798a89 100644 ---- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl -+++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl -@@ -42,7 +42,11 @@ typedef (Float32Array or sequence) Float32List; - typedef (Int32Array or sequence) Int32List; - - // FIXME: Should allow ImageBitmap too. -+#ifdef ENABLE_VIDEO - typedef (ImageData or HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) TexImageSource; -+#else -+typedef (ImageData or HTMLImageElement or HTMLCanvasElement) TexImageSource; -+#endif - - [ - Conditional=WEBGL, -diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp -index 6d26d556e33..6d64845fd27 100644 ---- a/Source/WebCore/testing/Internals.cpp -+++ b/Source/WebCore/testing/Internals.cpp -@@ -2765,6 +2765,30 @@ String Internals::getImageSourceURL(Element& element) - - #if ENABLE(VIDEO) - -+Vector Internals::mediaResponseSources(HTMLMediaElement& media) -+{ -+ auto* resourceLoader = media.lastMediaResourceLoaderForTesting(); -+ if (!resourceLoader) -+ return { }; -+ Vector result; -+ auto responses = resourceLoader->responsesForTesting(); -+ for (auto& response : responses) -+ result.append(responseSourceToString(response)); -+ return result; -+} -+ -+Vector Internals::mediaResponseContentRanges(HTMLMediaElement& media) -+{ -+ auto* resourceLoader = media.lastMediaResourceLoaderForTesting(); -+ if (!resourceLoader) -+ return { }; -+ Vector result; -+ auto responses = resourceLoader->responsesForTesting(); -+ for (auto& response : responses) -+ result.append(response.httpHeaderField(HTTPHeaderName::ContentRange)); -+ return result; -+} -+ - void Internals::simulateAudioInterruption(HTMLMediaElement& element) - { - #if USE(GSTREAMER) -diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h -index f5c08a87dfd..d35f651e452 100644 ---- a/Source/WebCore/testing/Internals.h -+++ b/Source/WebCore/testing/Internals.h -@@ -401,6 +401,8 @@ public: - String getImageSourceURL(Element&); - - #if ENABLE(VIDEO) -+ Vector mediaResponseSources(HTMLMediaElement&); -+ Vector mediaResponseContentRanges(HTMLMediaElement&); - void simulateAudioInterruption(HTMLMediaElement&); - ExceptionOr mediaElementHasCharacteristic(HTMLMediaElement&, const String&); - #endif -diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl -index 155b70b4abf..3fe6885d362 100644 ---- a/Source/WebCore/testing/Internals.idl -+++ b/Source/WebCore/testing/Internals.idl -@@ -386,6 +386,8 @@ enum EventThrottlingBehavior { - - void enableAutoSizeMode(boolean enabled, long minimumWidth, long minimumHeight, long maximumWidth, long maximumHeight); - -+ [Conditional=VIDEO] sequence mediaResponseSources(HTMLMediaElement media); -+ [Conditional=VIDEO] sequence mediaResponseContentRanges(HTMLMediaElement media); - [Conditional=VIDEO] void simulateAudioInterruption(HTMLMediaElement element); - [Conditional=VIDEO, MayThrowException] boolean mediaElementHasCharacteristic(HTMLMediaElement element, DOMString characteristic); - --- -2.13.3 - diff --git a/package/webkitgtk/0004-GTK-WPE-CFLAGS-from-pkg-config-for-E-GL-are-not-pass.patch b/package/webkitgtk/0004-GTK-WPE-CFLAGS-from-pkg-config-for-E-GL-are-not-pass.patch deleted file mode 100644 index 91c5116a2a..0000000000 --- a/package/webkitgtk/0004-GTK-WPE-CFLAGS-from-pkg-config-for-E-GL-are-not-pass.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 6579c307d85a9b447d3b7f13b25fb0a52177ed09 Mon Sep 17 00:00:00 2001 -From: Carlos Alberto Lopez Perez -Date: Thu, 3 Aug 2017 13:57:14 +0300 -Subject: [PATCH] [GTK][WPE] CFLAGS from pkg-config for (E)GL are not passed to - WebKit https://bugs.webkit.org/show_bug.cgi?id=175125 - -Patch by Carlos Alberto Lopez Perez on 2017-08-03 -Reviewed by NOBODY (OOPS!). - -* CMakeLists.txt: Pass GL-related flags to the WebKit component when - appropriate. - -Signed-off-by: Adrian Perez de Castro - ---- - Source/WebKit2/CMakeLists.txt | 31 +++++++++++++++++++++++++++++++ - Source/WebKit2/ChangeLog | 10 ++++++++++ - 2 files changed, 41 insertions(+) - -diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt -index 2d8215f6a35..b25e9872de2 100644 ---- a/Source/WebKit2/CMakeLists.txt -+++ b/Source/WebKit2/CMakeLists.txt -@@ -88,6 +88,37 @@ set(WebKit2_SYSTEM_INCLUDE_DIRECTORIES - ) - - if (ENABLE_GRAPHICS_CONTEXT_3D) -+ # For platforms that want to use system-provided OpenGL (ES) / EGL headers, -+ # these include directories, libraries or definitions need to be -+ # added before the ANGLE directories. -+ if (USE_OPENGL) -+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES -+ ${OPENGL_INCLUDE_DIRS} -+ ) -+ list(APPEND WebKit2_LIBRARIES -+ ${OPENGL_LIBRARIES} -+ ) -+ add_definitions(${OPENGL_DEFINITIONS}) -+ elseif (USE_OPENGL_ES_2) -+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES -+ ${OPENGLES2_INCLUDE_DIRS} -+ ) -+ list(APPEND WebKit2_LIBRARIES -+ ${OPENGLES2_LIBRARIES} -+ ) -+ add_definitions(${OPENGLES2_DEFINITIONS}) -+ endif () -+ -+ if (USE_EGL) -+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES -+ ${EGL_INCLUDE_DIRS} -+ ) -+ list(APPEND WebKit2_LIBRARIES -+ ${EGL_LIBRARIES} -+ ) -+ add_definitions(${EGL_DEFINITIONS}) -+ endif () -+ - list(APPEND WebKit2_INCLUDE_DIRECTORIES - "${THIRDPARTY_DIR}/ANGLE" - "${THIRDPARTY_DIR}/ANGLE/include/KHR" --- -2.13.4 - diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 7b50a13a04..bfe344419b 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -11,17 +11,17 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 5" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_USE_MMU config BR2_PACKAGE_WEBKITGTK bool "webkitgtk" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 2c0fc50611..c7a87f83de 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,4 +1,4 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.16.6.tar.xz.sums -md5 0e2d142a586e4ff79cf0324f4fdbf20c webkitgtk-2.16.6.tar.xz -sha1 f7fca3fbac3dc99e39f353a6df250635e684c922 webkitgtk-2.16.6.tar.xz -sha256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 webkitgtk-2.16.6.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.18.0.tar.xz.sums +md5 10d86dd5a5b68875654cc38af139f382 webkitgtk-2.18.0.tar.xz +sha1 e4d6cc7cff8729aa5ae6c17e10ed5ddf31048983 webkitgtk-2.18.0.tar.xz +sha256 b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d webkitgtk-2.18.0.tar.xz diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index fc51031582..60d833322f 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.16.6 +WEBKITGTK_VERSION = 2.18.0 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From 4313bc4b45d231cb2e80670fc167310ecd9e223c Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 19 Oct 2017 02:07:06 +0300 Subject: [PATCH 3368/3392] webkitgtk: security bump to version 2.18.1 This is a maintenance release of the current stable WebKitGTK+ version, which contains bugfixes (many of them related to rendering, plus one important fix for touch input) and many security fixes. Release notes: https://webkitgtk.org/2017/10/18/webkitgtk2.18.1-released.html Fixes CVE-2017-7081, CVE-2017-7087, CVE-2017-7089, CVE-2017-7090, CVE-2017-7091, CVE-2017-7092, CVE-2017-7093, CVE-2017-7094, CVE-2017-7095, CVE-2017-7096, CVE-2017-7098, CVE-2017-7099, CVE-2017-7100, CVE-2017-7102, CVE-2017-7104, CVE-2017-7107, CVE-2017-7109, CVE-2017-7111, CVE-2017-7117, CVE-2017-7120, CVE-2017-7142: https://webkitgtk.org/security/WSA-2017-0008.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 6d623e72770534c8e40e5afd7aa8fb77e49d1974) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index c7a87f83de..f83bd0878a 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,4 +1,4 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.18.0.tar.xz.sums -md5 10d86dd5a5b68875654cc38af139f382 webkitgtk-2.18.0.tar.xz -sha1 e4d6cc7cff8729aa5ae6c17e10ed5ddf31048983 webkitgtk-2.18.0.tar.xz -sha256 b583e46a3de36a3e80ba33b084ead60512a2046aca01ff61e50e519436e5038d webkitgtk-2.18.0.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.18.1.tar.xz.sums +md5 951a6082ada2f7d0292d3251a3f9532b webkitgtk-2.18.1.tar.xz +sha1 5054dd6b8afdc6e98b947e361011d6dca6da74e2 webkitgtk-2.18.1.tar.xz +sha256 9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 webkitgtk-2.18.1.tar.xz diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 60d833322f..8b6c144fd5 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.18.0 +WEBKITGTK_VERSION = 2.18.1 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From f383d667e9ce89c1220dea22b920b31f7ec8c6d8 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 16 Oct 2017 19:08:45 +0200 Subject: [PATCH 3369/3392] package/go: fix cross-compilation settings This patch fixes a bug with the BR2_TOOLCHAIN_HAS_THREADS variable handling which causes CGO_ENABLED to be always 0. Furthermore, it fixes the cross compilation options for the go compiler: setting CGO_ENABLED should be done only for the target compiler not the host one. Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni Acked-by: Christian Stewart (cherry picked from commit 80ea21bc3c2147adf810731b0b242e94a3ad294e) Signed-off-by: Peter Korsgaard --- package/go/go.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/go/go.mk b/package/go/go.mk index bd308902b2..a5ac74b590 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -52,7 +52,7 @@ HOST_GO_TARGET_ENV = \ # set, build in cgo support for any go programs that may need it. Note that # any target package needing cgo support must include # 'depends on BR2_TOOLCHAIN_HAS_THREADS' in its config file. -ifeq (BR2_TOOLCHAIN_HAS_THREADS,y) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) HOST_GO_CGO_ENABLED = 1 else HOST_GO_CGO_ENABLED = 0 @@ -74,8 +74,8 @@ HOST_GO_MAKE_ENV = \ GOARCH=$(GO_GOARCH) \ $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ GOOS=linux \ - CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ - CC=$(HOSTCC_NOCCACHE) + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) HOST_GO_TARGET_CC = \ CC_FOR_TARGET="$(TARGET_CC)" \ @@ -83,16 +83,18 @@ HOST_GO_TARGET_CC = \ HOST_GO_HOST_CC = \ CC_FOR_TARGET=$(HOSTCC_NOCCACHE) \ - CXX_FOR_TARGET=$(HOSTCC_NOCCACHE) + CXX_FOR_TARGET=$(HOSTCXX_NOCCACHE) HOST_GO_TMP = $(@D)/host-go-tmp define HOST_GO_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_MAKE_ENV) $(HOST_GO_HOST_CC) ./make.bash + cd $(@D)/src && \ + $(HOST_GO_MAKE_ENV) $(HOST_GO_HOST_CC) CGO_ENABLED=0 ./make.bash mkdir -p $(HOST_GO_TMP) mv $(@D)/pkg/tool $(HOST_GO_TMP)/ mv $(@D)/bin/ $(HOST_GO_TMP)/ - cd $(@D)/src && $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) ./make.bash + cd $(@D)/src && \ + $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) CGO_ENABLED=$(HOST_GO_CGO_ENABLED) ./make.bash endef define HOST_GO_INSTALL_CMDS From 5a9013c6d1203f107b64d7003e7621e75b3972af Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 21 Oct 2017 21:12:59 +0200 Subject: [PATCH 3370/3392] musl: add upstream security fix for CVE-2017-15650 >From the upstream announcement: http://www.openwall.com/lists/oss-security/2017/10/19/5 Felix Wilhelm has discovered a flaw in the dns response parsing for musl libc 1.1.16 that leads to overflow of a stack-based buffer. Earlier versions are also affected. When an application makes a request via getaddrinfo for both IPv4 and IPv6 results (AF_UNSPEC), an attacker who controls or can spoof the nameservers configured in resolv.conf can reply to both the A and AAAA queries with A results. Since A records are smaller than AAAA records, it's possible to fit more addresses than the precomputed bound, and a buffer overflow occurs. Signed-off-by: Peter Korsgaard (cherry picked from commit 209f42fd3a5f4357e22fb72f1597a6868566aabd) Signed-off-by: Peter Korsgaard --- ...allback-enforce-MAXADDRS-to-preclude.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch diff --git a/package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch b/package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch new file mode 100644 index 0000000000..c6b5ef26b4 --- /dev/null +++ b/package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch @@ -0,0 +1,35 @@ +From 45ca5d3fcb6f874bf5ba55d0e9651cef68515395 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Wed, 18 Oct 2017 14:50:03 -0400 +Subject: [PATCH] in dns parsing callback, enforce MAXADDRS to preclude + overflow + +MAXADDRS was chosen not to need enforcement, but the logic used to +compute it assumes the answers received match the RR types of the +queries. specifically, it assumes that only one replu contains A +record answers. if the replies to both the A and the AAAA query have +their answer sections filled with A records, MAXADDRS can be exceeded +and clobber the stack of the calling function. + +this bug was found and reported by Felix Wilhelm. + +Signed-off-by: Peter Korsgaard +--- + src/network/lookup_name.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c +index 066be4d5..209c20f0 100644 +--- a/src/network/lookup_name.c ++++ b/src/network/lookup_name.c +@@ -111,6 +111,7 @@ static int dns_parse_callback(void *c, int rr, const void *data, int len, const + { + char tmp[256]; + struct dpc_ctx *ctx = c; ++ if (ctx->cnt >= MAXADDRS) return -1; + switch (rr) { + case RR_A: + if (len != 4) return -1; +-- +2.11.0 + From 50dffb7d4a1f1c233c0e3a0e99903fa258f762fb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 22 Oct 2017 13:15:08 +0200 Subject: [PATCH 3371/3392] lame: security bump to version 3.100 Fixes the following security issues: CVE-2017-9410: fill_buffer_resample function in libmp3lame/util.c heap-based buffer over-read and ap CVE-2017-9411: fill_buffer_resample function in libmp3lame/util.c invalid memory read and application crash CVE-2017-9412: unpack_read_samples function in frontend/get_audio.c invalid memory read and application crash Drop patches now upstream or no longer needed: 0001-configure.patch: Upstream as mentioned in patch description 0002-gtk1-ac-directives.patch: Upstream as mentioned in patch description/release notes: Resurrect Owen Taylor's code dated from 97-11-3 to properly deal with GTK1. This was transplanted back from aclocal.m4 with a patch provided by Andres Mejia. This change makes it easy to regenerate autotools' files with a simple invocation of autoconf -vfi. 0003-msse.patch: Not needed as -march nowadays implies -msse. With these removed, autoreconf is no longer needed. Also add a hash for the license file while we're at it. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni (cherry picked from commit 7e3583dd558925a447eaa4367d659f39482fbbc0) Signed-off-by: Peter Korsgaard --- package/lame/0001-configure.patch | 69 ------- package/lame/0002-gtk1-ac-directives.patch | 210 --------------------- package/lame/0003-msse.patch | 24 --- package/lame/lame.hash | 3 +- package/lame/lame.mk | 6 +- 5 files changed, 4 insertions(+), 308 deletions(-) delete mode 100644 package/lame/0001-configure.patch delete mode 100644 package/lame/0002-gtk1-ac-directives.patch delete mode 100644 package/lame/0003-msse.patch diff --git a/package/lame/0001-configure.patch b/package/lame/0001-configure.patch deleted file mode 100644 index 7e407f28c0..0000000000 --- a/package/lame/0001-configure.patch +++ /dev/null @@ -1,69 +0,0 @@ -Various patches to fix autoreconf errors. - -All patches besides -- AM_ICONV in configure.in -are already applied upstream: -http://lame.cvs.sourceforge.net/viewvc/lame/lame/configure.in?r1=1.145&r2=1.146 -http://lame.cvs.sourceforge.net/viewvc/lame/lame/doc/html/Makefile.am?r1=1.8&r2=1.9 -http://lame.cvs.sourceforge.net/viewvc/lame/lame/doc/man/Makefile.am?r1=1.1&r2=1.2 - -libmp3lame/i386/Makefile.am patch ported from Debian -http://anonscm.debian.org/cgit/pkg-multimedia/lame.git/tree/debian/patches/ansi2knr2devnull.patch - -Signed-off-by: Bernd Kuhls - -diff -uNr lame-3.99.5.org/configure.in lame-3.99.5/configure.in ---- lame-3.99.5.org/configure.in 2012-02-28 19:50:27.000000000 +0100 -+++ lame-3.99.5/configure.in 2015-04-11 11:36:15.464835008 +0200 -@@ -77,9 +77,6 @@ - AC_MSG_RESULT(${GCC_version}) - fi - --dnl more automake stuff --AM_C_PROTOTYPES -- - AC_CHECK_HEADER(dmalloc.h) - if test "${ac_cv_header_dmalloc_h}" = "yes"; then - AM_WITH_DMALLOC -@@ -376,8 +373,6 @@ - AC_CHECK_LIB(curses, initscr, HAVE_TERMCAP="curses") - AC_CHECK_LIB(ncurses, initscr, HAVE_TERMCAP="ncurses") - --AM_ICONV -- - dnl math lib - AC_CHECK_LIB(m, cos, USE_LIBM="-lm") - dnl free fast math library -diff -uNr lame-3.99.5.org/doc/html/Makefile.am lame-3.99.5/doc/html/Makefile.am ---- lame-3.99.5.org/doc/html/Makefile.am 2010-09-30 22:58:40.000000000 +0200 -+++ lame-3.99.5/doc/html/Makefile.am 2015-04-11 11:37:02.880239754 +0200 -@@ -1,6 +1,6 @@ - ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $ - --AUTOMAKE_OPTIONS = foreign ansi2knr -+AUTOMAKE_OPTIONS = foreign - - docdir = $(datadir)/doc - pkgdocdir = $(docdir)/$(PACKAGE) -diff -uNr lame-3.99.5.org/doc/man/Makefile.am lame-3.99.5/doc/man/Makefile.am ---- lame-3.99.5.org/doc/man/Makefile.am 2000-10-22 13:39:44.000000000 +0200 -+++ lame-3.99.5/doc/man/Makefile.am 2015-04-11 11:37:08.704167318 +0200 -@@ -1,6 +1,6 @@ - ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $ - --AUTOMAKE_OPTIONS = foreign ansi2knr -+AUTOMAKE_OPTIONS = foreign - - man_MANS = lame.1 - EXTRA_DIST = ${man_MANS} -diff -uNr lame-3.99.5.org/libmp3lame/i386/Makefile.am lame-3.99.5/libmp3lame/i386/Makefile.am ---- lame-3.99.5.org/libmp3lame/i386/Makefile.am 2011-04-04 11:42:34.000000000 +0200 -+++ lame-3.99.5/libmp3lame/i386/Makefile.am 2015-04-11 11:37:35.191833351 +0200 -@@ -1,6 +1,6 @@ - ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $ - --AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr -+AUTOMAKE_OPTIONS = foreign - - DEFS = @DEFS@ @CONFIG_DEFS@ - diff --git a/package/lame/0002-gtk1-ac-directives.patch b/package/lame/0002-gtk1-ac-directives.patch deleted file mode 100644 index 858ee0baf8..0000000000 --- a/package/lame/0002-gtk1-ac-directives.patch +++ /dev/null @@ -1,210 +0,0 @@ -Include GTK-1 autoconf directives in build system. -Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/acinclude.m4?r1=1.5&r2=1.6 - -Downloaded from -http://lame.cvs.sf.net/viewvc/lame/lame/acinclude.m4?r1=1.5&r2=1.6&view=patch - -to fix autoreconf. - -Signed-off-by: Bernd Kuhls - ---- a/acinclude.m4 2006/12/21 09:03:03 1.5 -+++ b/acinclude.m4 2012/06/18 20:51:05 1.6 -@@ -85,4 +85,197 @@ - [AC_MSG_WARN(can't check for IEEE854 compliant 80 bit floats)] - )])]) # alex_IEEE854_FLOAT80 - -+# Configure paths for GTK+ -+# Owen Taylor 97-11-3 - -+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -+dnl -+AC_DEFUN([AM_PATH_GTK], -+[dnl -+dnl Get the cflags and libraries from the gtk-config script -+dnl -+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], -+ gtk_config_prefix="$withval", gtk_config_prefix="") -+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], -+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], -+ , enable_gtktest=yes) -+ -+ for module in . $4 -+ do -+ case "$module" in -+ gthread) -+ gtk_config_args="$gtk_config_args gthread" -+ ;; -+ esac -+ done -+ -+ if test x$gtk_config_exec_prefix != x ; then -+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ fi -+ fi -+ if test x$gtk_config_prefix != x ; then -+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ fi -+ fi -+ -+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no) -+ min_gtk_version=ifelse([$1], ,0.99.7,$1) -+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) -+ no_gtk="" -+ if test "$GTK_CONFIG" = "no" ; then -+ no_gtk=yes -+ else -+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+dnl -+dnl Now check if the installed GTK is sufficiently new. (Also sanity -+dnl checks the results of gtk-config to some extent -+dnl -+ rm -f conf.gtktest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.gtktest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_gtk_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) -+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || -+ (gtk_minor_version != GTK_MINOR_VERSION) || -+ (gtk_micro_version != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ } -+#endif /* defined (GTK_MAJOR_VERSION) ... */ -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -+ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$GTK_CONFIG" = "no" ; then -+ echo "*** The gtk-config script installed by GTK could not be found" -+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GTK_CONFIG environment variable to the" -+ echo "*** full path to gtk-config." -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK test program, checking why..." -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK or finding the wrong" -+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps gtk gtk-devel" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GTK was incorrectly installed" -+ echo "*** or that you have moved GTK since it was installed. In the latter case, you" -+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+ rm -f conf.gtktest -+]) diff --git a/package/lame/0003-msse.patch b/package/lame/0003-msse.patch deleted file mode 100644 index ca4f65f40b..0000000000 --- a/package/lame/0003-msse.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix compile on 32bit Intel - -Downloaded from -http://anonscm.debian.org/cgit/pkg-multimedia/lame.git/tree/debian/patches/msse.patch - -Signed-off-by: Bernd Kuhls - -Description: Build xmm_quantize_sub.c with -msse -Author: Sebastian Ramacher -Bug: http://sourceforge.net/p/lame/bugs/443/ -Bug-Debian: https://bugs.debian.org/760047 -Forwarded: http://sourceforge.net/p/lame/bugs/443/ -Last-Update: 2014-08-31 - ---- lame-3.99.5+repack1.orig/libmp3lame/vector/Makefile.am -+++ lame-3.99.5+repack1/libmp3lame/vector/Makefile.am -@@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c - - if WITH_XMM - liblamevectorroutines_la_SOURCES = $(xmm_sources) -+liblamevectorroutines_la_CFLAGS = -msse - endif - - noinst_HEADERS = lame_intrin.h diff --git a/package/lame/lame.hash b/package/lame/lame.hash index 875b49c2fc..58dc6f78ef 100644 --- a/package/lame/lame.hash +++ b/package/lame/lame.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff lame-3.99.5.tar.gz +sha256 ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e lame-3.100.tar.gz +sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/lame/lame.mk b/package/lame/lame.mk index 934579953b..342e5c41c6 100644 --- a/package/lame/lame.mk +++ b/package/lame/lame.mk @@ -4,11 +4,9 @@ # ################################################################################ -LAME_VERSION_MAJOR = 3.99 -LAME_VERSION = $(LAME_VERSION_MAJOR).5 -LAME_SITE = http://downloads.sourceforge.net/project/lame/lame/$(LAME_VERSION_MAJOR) +LAME_VERSION = 3.100 +LAME_SITE = http://downloads.sourceforge.net/project/lame/lame/$(LAME_VERSION) LAME_DEPENDENCIES = host-pkgconf -LAME_AUTORECONF = YES LAME_INSTALL_STAGING = YES LAME_CONF_ENV = GTK_CONFIG=/bin/false LAME_CONF_OPTS = --enable-dynamic-frontends From 37a757038e864032e203d24f632a7951e18889a7 Mon Sep 17 00:00:00 2001 From: Alfredo Alvarez Fernandez Date: Fri, 28 Apr 2017 11:35:20 +0200 Subject: [PATCH 3372/3392] dependencies: always use HOSTCC_NOCACHE for DEPENDENCIES_HOST_PREREQ Currently, HOSTCC and HOSTCXX are set to their _NOCACHE variants in the 'dependencies' target. This is needed because at that time, ccache is not built yet - host-ccache is one of the dependencies. However, because this override is only specified for the 'dependencies' target (and thereby gets inherited by its dependencies), the override is only applied when the package is reached through the 'dependencies' target. This is not the case when one of DEPENDENCIES_HOST_PREREQ is built directly from the command line, e.g. when doing 'make host-ccache'. So in that case, ccache will be built with ccache... which fails of course. To fix this, directly apply the override to the DEPENCIES_HOST_PREREQ targets. Note that this only fixes the issue for 'make host-ccache', NOT for e.g. 'make host-ccache-configure'. Signed-off-by: Alfredo Alvarez Fernandez [Arnout: improve commit message] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 36d398ac30f35ca9d4405a9dee2b33560ec3595d) Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk index d4b0409cda..ef2ae9b7e1 100644 --- a/support/dependencies/dependencies.mk +++ b/support/dependencies/dependencies.mk @@ -23,8 +23,8 @@ core-dependencies: DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \ $(TOPDIR)/support/dependencies/dependencies.sh -dependencies: HOSTCC=$(HOSTCC_NOCCACHE) -dependencies: HOSTCXX=$(HOSTCXX_NOCCACHE) +core-dependencies $(DEPENDENCIES_HOST_PREREQ): HOSTCC=$(HOSTCC_NOCCACHE) +core-dependencies $(DEPENDENCIES_HOST_PREREQ): HOSTCXX=$(HOSTCXX_NOCCACHE) dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ) ################################################################################ From 572ec0fc9392bc4f0ebaea7dbc2c06c6e62262d5 Mon Sep 17 00:00:00 2001 From: Alfredo Alvarez Fernandez Date: Fri, 28 Apr 2017 11:35:21 +0200 Subject: [PATCH 3373/3392] Add DEPENDENCIES_HOST_PREREQ to the list of packages That way packages included in that list like ccache will also be regarded as a normal packages for targets like external-deps, show-targets or legal-info Signed-off-by: Alfredo Alvarez Fernandez Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 862b76cfefc101943f09db2a73f5519f9a5bb2cb) Signed-off-by: Peter Korsgaard --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 3514d938b4..7a369b3703 100644 --- a/Makefile +++ b/Makefile @@ -481,6 +481,8 @@ include Makefile.legacy include package/Makefile.in include support/dependencies/dependencies.mk +PACKAGES += $(DEPENDENCIES_HOST_PREREQ) + include toolchain/*.mk include toolchain/*/*.mk From d9ecca758b7df2ee0aac5cd9305001756e89df2c Mon Sep 17 00:00:00 2001 From: Mauro Condarelli Date: Fri, 21 Apr 2017 12:33:08 +0200 Subject: [PATCH 3374/3392] libffi: add patch to fix MIPS support Building Python 3.x on MIPS with musl fails because the libffi code uses a "#ifdef linux" test to decide if we're building on Linux or not. When building with -std=c99, "linux" is not defined, so instead of including , libffi's code tries to include , which doesn't exist on musl. The right fix is to use __linux__, which is POSIX compliant, and therefore defined even when -std=c99 is used. Note that glibc and uClibc were not affected because they do provide a header in addition to the one. Signed-off-by: Mauro Condarelli [Thomas: reformat patch with Git, add a better commit log and description.] Signed-off-by: Thomas Petazzoni (cherry picked from commit 4852f05907cd365825f37c283a415a77ba1fcba9) Signed-off-by: Peter Korsgaard --- ...005-mips-use-__linux__-and-not-linux.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/libffi/0005-mips-use-__linux__-and-not-linux.patch diff --git a/package/libffi/0005-mips-use-__linux__-and-not-linux.patch b/package/libffi/0005-mips-use-__linux__-and-not-linux.patch new file mode 100644 index 0000000000..a48f3d3b6d --- /dev/null +++ b/package/libffi/0005-mips-use-__linux__-and-not-linux.patch @@ -0,0 +1,37 @@ +From 1f43e5edfd91bee80e518432b80db01f1bf226e3 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 22 Oct 2017 15:02:11 +0200 +Subject: [PATCH] mips: use __linux__ and not linux + +The "linux" symbol is not POSIX compliant [1], and therefore not +defined when building with -std=c99. Due to this, the linux +conditional block doesn't get used on Linux when building Python 3.x +(which is built with -std=c99). To fix this, we use the POSIX +compliant __linux__ symbol, which is defined when -std=c99 is used. + +This fixes the build of Python 3.x on MIPS/musl configuration, as it +makes sures that gets included and not . + +[1] https://sourceforge.net/p/predef/wiki/OperatingSystems/ + +Signed-off-by: Thomas Petazzoni +--- + src/mips/ffitarget.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mips/ffitarget.h b/src/mips/ffitarget.h +index 717d659..6faa358 100644 +--- a/src/mips/ffitarget.h ++++ b/src/mips/ffitarget.h +@@ -32,7 +32,7 @@ + #error "Please do not include ffitarget.h directly into your source. Use ffi.h instead." + #endif + +-#ifdef linux ++#ifdef __linux__ + # include + #elif defined(__rtems__) + /* +-- +2.13.6 + From e8af016894c7c1a5ddc6fd947e0ecd83032f6f23 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 19 Oct 2017 19:34:02 +0200 Subject: [PATCH 3375/3392] linux-headers: bump 4.{1, 4, 9, 13}.x series [Peter: drop 4.13.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 60e3da602d3d5b017b5176848abcba92866df3f3) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cb1a2e4d1a..642bc8c538 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -221,8 +221,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.18.72" if BR2_KERNEL_HEADERS_3_18 default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 - default "4.1.44" if BR2_KERNEL_HEADERS_4_1 - default "4.4.92" if BR2_KERNEL_HEADERS_4_4 + default "4.1.45" if BR2_KERNEL_HEADERS_4_1 + default "4.4.93" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.56" if BR2_KERNEL_HEADERS_4_9 + default "4.9.57" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From d2bad2d07986b4a5b39b9acfa69d4d339c7966e8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 22 Oct 2017 19:04:11 +0200 Subject: [PATCH 3376/3392] linux-headers: bump 4.{4, 9, 13}.x series [Peter: drop 4.13.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit f7479f4c818f335332fdca128d7d4f3e5e7c02ac) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 642bc8c538..fedfd7a14f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.45" if BR2_KERNEL_HEADERS_4_1 - default "4.4.93" if BR2_KERNEL_HEADERS_4_4 + default "4.4.94" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.57" if BR2_KERNEL_HEADERS_4_9 + default "4.9.58" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 98bd08f6037d5157a6cd8dff78a2fcd7049531f0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 25 Oct 2017 22:16:13 +0200 Subject: [PATCH 3377/3392] nodejs: security bump to version 6.11.5 Fixes CVE-2017-14919 - In zlib v1.2.9, a change was made that causes an error to be raised when a raw deflate stream is initialized with windowBits set to 8. On some versions this crashes Node and you cannot recover from it, while on some versions it throws an exception. Node.js will now gracefully set windowBits to 9 replicating the legacy behavior to avoid a DOS vector. For more details, see the announcement: https://nodejs.org/en/blog/vulnerability/oct-2017-dos/ Drop 0002-inspector-don-t-build-when-ssl-support-is-disabled.patch as that is now upstream: https://github.com/nodejs/node/commit/ba23506419 And refresh the other patches. Signed-off-by: Peter Korsgaard --- ...t-build-when-ssl-support-is-disabled.patch | 35 ------------------- ...01-gyp-force-link-command-to-use-CXX.patch | 6 ++-- ...OPENSSL-directive-to-openssl_config.patch} | 6 ++-- package/nodejs/Config.in | 2 +- package/nodejs/nodejs.hash | 4 +-- 5 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 package/nodejs/6.11.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch rename package/nodejs/{6.11.1 => 6.11.5}/0001-gyp-force-link-command-to-use-CXX.patch (85%) rename package/nodejs/{6.11.1/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch => 6.11.5/0002-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch} (90%) diff --git a/package/nodejs/6.11.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.11.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch deleted file mode 100644 index c07cbf8c65..0000000000 --- a/package/nodejs/6.11.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7fa541f6c0a31e3ddcab6ea85040b531bbaa4651 Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Tue, 12 Jul 2016 19:03:28 +0100 -Subject: [PATCH] inspector: don't build when ssl support is disabled - -Signed-off-by: Martin Bark ---- - node.gyp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/node.gyp b/node.gyp -index 8a8bd00..fdccd60 100644 ---- a/node.gyp -+++ b/node.gyp -@@ -302,7 +302,7 @@ - 'deps/v8/src/third_party/vtune/v8vtune.gyp:v8_vtune' - ], - }], -- [ 'v8_inspector=="true"', { -+ [ 'v8_inspector=="true" and node_use_openssl =="true"', { - 'defines': [ - 'HAVE_INSPECTOR=1', - 'V8_INSPECTOR_USE_STL=1', -@@ -828,7 +828,7 @@ - ], - - 'conditions': [ -- ['v8_inspector=="true"', { -+ ['v8_inspector=="true" and node_use_openssl =="true"', { - 'sources': [ - 'src/inspector_socket.cc', - 'test/cctest/test_inspector_socket.cc' --- -2.7.4 - diff --git a/package/nodejs/6.11.1/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.11.5/0001-gyp-force-link-command-to-use-CXX.patch similarity index 85% rename from package/nodejs/6.11.1/0001-gyp-force-link-command-to-use-CXX.patch rename to package/nodejs/6.11.5/0001-gyp-force-link-command-to-use-CXX.patch index 5746582c14..7b5a9947c5 100644 --- a/package/nodejs/6.11.1/0001-gyp-force-link-command-to-use-CXX.patch +++ b/package/nodejs/6.11.5/0001-gyp-force-link-command-to-use-CXX.patch @@ -15,12 +15,12 @@ diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generat index b88a433..0a1f2e0 100644 --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py -@@ -142,7 +142,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^) +@@ -147,7 +147,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^) # special "figure out circular dependencies" flags around the entire # input list during linking. quiet_cmd_link = LINK($(TOOLSET)) $@ --cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS) -+cmd_link = $(CXX.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS) +-cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group ++cmd_link = $(CXX.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group # We support two kinds of shared objects (.so): # 1) shared_library, which is just bundling together many dependent libraries diff --git a/package/nodejs/6.11.1/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch b/package/nodejs/6.11.5/0002-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch similarity index 90% rename from package/nodejs/6.11.1/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch rename to package/nodejs/6.11.5/0002-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch index f07fdc2455..c22311ed3f 100644 --- a/package/nodejs/6.11.1/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch +++ b/package/nodejs/6.11.5/0002-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch @@ -33,9 +33,9 @@ diff --git a/src/node.cc b/src/node.cc index 57415bba41..ec78339d89 100644 --- a/src/node.cc +++ b/src/node.cc -@@ -4233,8 +4233,10 @@ void Init(int* argc, - if (config_warning_file.empty()) - SafeGetenv("NODE_REDIRECT_WARNINGS", &config_warning_file); +@@ -4389,8 +4389,10 @@ void Init(int* argc, + V8::SetFlagsFromString(NODE_V8_OPTIONS, sizeof(NODE_V8_OPTIONS) - 1); + #endif +#if HAVE_OPENSSL if (openssl_config.empty()) diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 31dcfb67d9..9ce02306e4 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_PACKAGE_NODEJS_VERSION_STRING string - default "6.11.1" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS + default "6.11.5" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS default "0.10.48" config BR2_PACKAGE_NODEJS_NPM diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2dbbdc7cc2..319774c62d 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ # From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt sha256 365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e node-v0.10.48.tar.xz -# From upstream URL: http://nodejs.org/dist/v6.11.1/SHASUMS256.txt -sha256 6f6655b85919aa54cb045a6d69a226849802fcc26491d0db4ce59873e41cc2b8 node-v6.11.1.tar.xz +# From upstream URL: http://nodejs.org/dist/v6.11.5/SHASUMS256.txt +sha256 1c6de415216799fbaeca82304b3fef87accc7101ebf2ead7d5c545e0779e8aaf node-v6.11.5.tar.xz From 2fbb653713d89da1a1f032a8b30833a1aad29205 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Oct 2017 01:08:36 +0200 Subject: [PATCH 3378/3392] irssi: security bump to version 1.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following security issues: (a) When installing themes with unterminated colour formatting sequences, Irssi may access data beyond the end of the string. (CWE-126) Found by Hanno Böck. CVE-2017-15228 was assigned to this issue. (b) While waiting for the channel synchronisation, Irssi may incorrectly fail to remove destroyed channels from the query list, resulting in use after free conditions when updating the state later on. Found by Joseph Bisch. (CWE-416 caused by CWE-672) CVE-2017-15227 was assigned to this issue. (c) Certain incorrectly formatted DCC CTCP messages could cause NULL pointer dereference. Found by Joseph Bisch. This is a separate, but similar issue to CVE-2017-9468. (CWE-690) CVE-2017-15721 was assigned to this issue. (d) Overlong nicks or targets may result in a NULL pointer dereference while splitting the message. Found by Joseph Bisch. (CWE-690) CVE-2017-15723 was assigned to this issue. (e) In certain cases Irssi may fail to verify that a Safe channel ID is long enough, causing reads beyond the end of the string. Found by Joseph Bisch. (CWE-126) CVE-2017-15722 was assigned to this issue. For more details, see the advisory: https://irssi.org/security/irssi_sa_2017_10.txt While we're at it, also add a hash for the license file. Signed-off-by: Peter Korsgaard (cherry picked from commit a9a4ec0dcce4500319e00e7d875414d6bc6606fa) Signed-off-by: Peter Korsgaard --- package/irssi/irssi.hash | 4 +++- package/irssi/irssi.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index 7b019025d8..0a6c3f614a 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 b85c07dbafe178213eccdc69f5f8f0ac024dea01c67244668f91ec1c06b986ca irssi-1.0.4.tar.xz +sha256 c2556427e12eb06cabfed40839ac6f57eb8b1aa6365fab6dfcd331b7a04bb914 irssi-1.0.5.tar.xz +# Locally calculated +sha256 a1a27cb2ecee8d5378fbb3562f577104a445d6d66fee89286e16758305e63e2b COPYING diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index 4fef1125b1..3ea81a95db 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRSSI_VERSION = 1.0.4 +IRSSI_VERSION = 1.0.5 IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz # Do not use the github helper here. The generated tarball is *NOT* the # same as the one uploaded by upstream for the release. From f87be529216e34bec50a14667b4eeefde4c29e8a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 24 Oct 2017 01:13:17 +0200 Subject: [PATCH 3379/3392] libcurl: security bump to version 7.56.1 Fixes CVE-2017-1000257 - IMAP FETCH response out of bounds read https://curl.haxx.se/docs/adv_20171023.html Signed-off-by: Peter Korsgaard (cherry picked from commit 62d4dd2999a0446c2b868a7c6fbcc764a470493d) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index c6970632ac..49292dfb9e 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://curl.haxx.se/download/curl-7.56.0.tar.xz.asc -sha256 32437bcca0e9434384329fdc733547879d25ba70335b3cf9e3d9cbc3e71fd172 curl-7.56.0.tar.xz +# https://curl.haxx.se/download/curl-7.56.1.tar.xz.asc +sha256 8eed282cf3a0158d567a0feaa3c4619e8e847970597b5a2c81879e8f0d1a39d1 curl-7.56.1.tar.xz sha256 cbcf511f5702f7baf5424193a792bc9c18fab22bcbec2e6a587598389dc632c2 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a6b699ce9c..57b9c2cbca 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.56.0 +LIBCURL_VERSION = 7.56.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 7da33400815fab3340d0ba0899c0da3c70ef8282 Mon Sep 17 00:00:00 2001 From: Olivier Schonken Date: Sun, 1 Oct 2017 20:46:00 +0200 Subject: [PATCH 3380/3392] sdl2: Bump version to 2.0.6 Bump version and remove patches that were merged upstream Signed-off-by: Olivier Schonken Signed-off-by: Peter Korsgaard (cherry picked from commit 380093238674031d51c56abb0a2a22f721504931) Signed-off-by: Peter Korsgaard --- package/sdl2/0001-ppc.patch | 47 -------------------------- package/sdl2/0002-gcc6.patch | 64 ------------------------------------ package/sdl2/sdl2.hash | 4 +-- package/sdl2/sdl2.mk | 2 +- 4 files changed, 3 insertions(+), 114 deletions(-) delete mode 100644 package/sdl2/0001-ppc.patch delete mode 100644 package/sdl2/0002-gcc6.patch diff --git a/package/sdl2/0001-ppc.patch b/package/sdl2/0001-ppc.patch deleted file mode 100644 index 0161103067..0000000000 --- a/package/sdl2/0001-ppc.patch +++ /dev/null @@ -1,47 +0,0 @@ -Fixed bug 3466 - Can't build 2.0.5 on ppc64 - -/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c: In function 'calc_swizzle32': -/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c:127:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] -const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, -^ - -Downloaded from upstream repo -https://hg.libsdl.org/SDL/rev/5184186d4366 - -Signed-off-by: Bernd Kuhls - -diff -r 71d4148e32de -r 5184186d4366 src/video/SDL_blit_N.c ---- a/src/video/SDL_blit_N.c Wed Oct 19 21:22:42 2016 -0700 -+++ b/src/video/SDL_blit_N.c Sat Oct 22 11:01:55 2016 -0700 -@@ -118,12 +118,6 @@ - 16, 8, 0, 24, - 0, NULL - }; -- if (!srcfmt) { -- srcfmt = &default_pixel_format; -- } -- if (!dstfmt) { -- dstfmt = &default_pixel_format; -- } - const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, - 0x04, 0x04, 0x04, 0x04, - 0x08, 0x08, 0x08, 0x08, -@@ -136,6 +130,14 @@ - Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift); - Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift); - Uint32 amask; -+ -+ if (!srcfmt) { -+ srcfmt = &default_pixel_format; -+ } -+ if (!dstfmt) { -+ dstfmt = &default_pixel_format; -+ } -+ - /* Use zero for alpha if either surface doesn't have alpha */ - if (dstfmt->Amask) { - amask = - - - - diff --git a/package/sdl2/0002-gcc6.patch b/package/sdl2/0002-gcc6.patch deleted file mode 100644 index 6b5e901dfe..0000000000 --- a/package/sdl2/0002-gcc6.patch +++ /dev/null @@ -1,64 +0,0 @@ - -# HG changeset patch -# User Sam Lantinga -# Date 1479201270 28800 -# Node ID ea44906e19b837f4d5b309525ca79ed9d00b1897 -# Parent 6b2307dbec54f0bf4d5d8abf86241e29f3a03562 -Fixed bug 3490 - Build failure with --enable-video-directfb - -felix - -Building SDL 2.0.5, or even the Mercurial snapshot (r10608) with GCC 6.2.1 and --enable-video-directfb generates a number of compiler diagnostics and fails. - -Downloaded from upstream repo -https://hg.libsdl.org/SDL/rev/ea44906e19b8 - -Signed-off-by: Bernd Kuhls - -diff -r 6b2307dbec54 -r ea44906e19b8 src/video/directfb/SDL_DirectFB_render.c ---- a/src/video/directfb/SDL_DirectFB_render.c Tue Nov 15 01:12:27 2016 -0800 -+++ b/src/video/directfb/SDL_DirectFB_render.c Tue Nov 15 01:14:30 2016 -0800 -@@ -1273,7 +1273,7 @@ - Uint32 format, void * pixels, int pitch) - { - Uint32 sdl_format; -- void * laypixels; -+ unsigned char* laypixels; - int laypitch; - DFBSurfacePixelFormat dfb_format; - DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata; -@@ -1303,7 +1303,7 @@ - SDL_Window *window = renderer->window; - SDL_DFB_WINDOWDATA(window); - Uint32 sdl_format; -- void * laypixels; -+ unsigned char* laypixels; - int laypitch; - DFBSurfacePixelFormat dfb_format; - -diff -r 6b2307dbec54 -r ea44906e19b8 src/video/directfb/SDL_DirectFB_shape.c ---- a/src/video/directfb/SDL_DirectFB_shape.c Tue Nov 15 01:12:27 2016 -0800 -+++ b/src/video/directfb/SDL_DirectFB_shape.c Tue Nov 15 01:14:30 2016 -0800 -@@ -37,17 +37,19 @@ - SDL_WindowShaper* - DirectFB_CreateShaper(SDL_Window* window) { - SDL_WindowShaper* result = NULL; -+ SDL_ShapeData* data; -+ int resized_properly; - - result = malloc(sizeof(SDL_WindowShaper)); - result->window = window; - result->mode.mode = ShapeModeDefault; - result->mode.parameters.binarizationCutoff = 1; - result->userx = result->usery = 0; -- SDL_ShapeData* data = SDL_malloc(sizeof(SDL_ShapeData)); -+ data = SDL_malloc(sizeof(SDL_ShapeData)); - result->driverdata = data; - data->surface = NULL; - window->shaper = result; -- int resized_properly = DirectFB_ResizeWindowShape(window); -+ resized_properly = DirectFB_ResizeWindowShape(window); - SDL_assert(resized_properly == 0); - - return result; - diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index d69d43811d..c0a8bfc77c 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,2 +1,2 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.5.tar.gz.sig -sha256 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 SDL2-2.0.5.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.6.tar.gz.sig +sha256 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df SDL2-2.0.6.tar.gz diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 2ec12e639e..7710a407d0 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.0.5 +SDL2_VERSION = 2.0.6 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = zlib From 2bcace3da781cad01ee8fca04d871e312108f916 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 25 Oct 2017 18:03:26 +0200 Subject: [PATCH 3381/3392] sdl2: explicitly disable raspberry pi video backend Fixes: http://autobuild.buildroot.net/results/d59/d5992dcc9a49ee77afaebdcc9448ac1868fa7de1/ http://autobuild.buildroot.net/results/e89/e894f21ce1983ee3bd8d65a8e59e1adab9a62707/ The configure script automatically enables support for the raspberry pi video backend if it detects the rpi-userland package. Unfortunately it hardcodes a number of include/linker paths unsuitable for cross compilation, breaking the build: if test x$enable_video = xyes -a x$enable_video_rpi = xyes; then .. RPI_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux" RPI_LDFLAGS="-L/opt/vc/lib -lbcm_host" fi So explicitly disable it until the configure script is fixed. Signed-off-by: Peter Korsgaard (cherry picked from commit 3a798acf239dee04d573f575337bf823c13020fd) Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 7710a407d0..d15b198a67 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -20,7 +20,8 @@ SDL2_CONF_OPTS += \ --disable-pulseaudio \ --disable-video-opengl \ --disable-video-opengles \ - --disable-video-wayland + --disable-video-wayland \ + --disable-video-rpi # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static From 17a169042ec1892717d617ff852f1397d12877f1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 26 Oct 2017 14:18:43 +0200 Subject: [PATCH 3382/3392] sdl2: security bump to version 2.0.7 Fixes CVE-2017-2888 - An exploitable integer overflow vulnerability exists when creating a new RGB Surface in SDL 2.0.5. A specially crafted file can cause an integer overflow resulting in too little memory being allocated which can lead to a buffer overflow and potential code execution. An attacker can provide a specially crafted image file to trigger this vulnerability. Also add a hash for the license file while we're at it. Signed-off-by: Peter Korsgaard (cherry picked from commit 07a9f0200cfd1c34f33e8054f62b990d05ccb934) Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 6 ++++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index c0a8bfc77c..588f8f49ef 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,2 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.6.tar.gz.sig -sha256 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df SDL2-2.0.6.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.7.tar.gz.sig +sha256 ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e SDL2-2.0.7.tar.gz +# Locally calculated +sha256 bbd2edb1789c33de29bb9f8d1dbe2774584a9ce8c4e3162944b7a3a447f5e85d COPYING.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index d15b198a67..ce5f074142 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.0.6 +SDL2_VERSION = 2.0.7 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = zlib From 7e10bd482597cdb76c54eb6777847a4d3ef3ab51 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Thu, 18 May 2017 11:32:34 +0100 Subject: [PATCH 3383/3392] redis: bump version to 3.2.9 Remove sha1 hash. Upstream provides now a sha256 hash. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard (cherry picked from commit 34761b2c409cf4bfd8be46e2e531adeafb39b742) Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 4 +--- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 3cd86470bd..2eef91cc0b 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,4 +1,2 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha1 6780d1abb66f33a97aad0edbe020403d0a15b67f redis-3.2.8.tar.gz -# Calculated based on the hash above -sha256 61b373c23d18e6cc752a69d5ab7f676c6216dc2853e46750a8c4ed791d68482c redis-3.2.8.tar.gz +sha256 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26 redis-3.2.9.tar.gz diff --git a/package/redis/redis.mk b/package/redis/redis.mk index c16bd238dc..671ffac52e 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 3.2.8 +REDIS_VERSION = 3.2.9 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From 58ea6ad528a53b1b3f19efb441bbeb6451695b8e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 26 Oct 2017 14:44:15 +0200 Subject: [PATCH 3384/3392] redis: bump to version 3.2.11 3.2.11 fixes important issues. From the release notes: ================================================================================ Redis 3.2.11 Released Thu Sep 21 15:47:53 CEST 2017 ================================================================================ Upgrade urgency HIGH: Potentially critical bugs fixed. AOF flush on SHUTDOWN did not cared to really write the AOF buffers (not in the kernel but in the Redis process memory) to disk before exiting. Calling SHUTDOWN during traffic resulted into not every operation to be persisted on disk. Also add a hash for the license file while we're at it. Signed-off-by: Peter Korsgaard (cherry picked from commit 751cd4cfab88ff15143d13eccf87f982a274e4e3) Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 4 +++- package/redis/redis.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 2eef91cc0b..ce2d66b8c2 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,2 +1,4 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha256 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26 redis-3.2.9.tar.gz +sha256 31ae927cab09f90c9ca5954aab7aeecc3bb4da6087d3d12ba0a929ceb54081b5 redis-3.2.11.tar.gz +# Locally calculated +sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 671ffac52e..d356b23a92 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 3.2.9 +REDIS_VERSION = 3.2.11 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From 701f943d203eaa18879d800180764f8da2fce952 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 2 Jul 2017 18:53:31 +0200 Subject: [PATCH 3385/3392] openssh: don't download patch from Github Patches downloaded from Github are not stable, so bring them in the tree. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 4e7522aacd4e76c0ab5e602ade9a60f5a4473939) Signed-off-by: Peter Korsgaard --- .../0001-configure-ac-detect-mips-abi.patch | 44 +++++++++++++ ...ly-set-seccomp-audit-arch-for-mips64.patch | 63 +++++++++++++++++++ ... 0003-fix-pam-uclibc-pthreads-clash.patch} | 0 ...e.patch => 0004-fix-howmany-include.patch} | 0 package/openssh/openssh.hash | 2 - package/openssh/openssh.mk | 6 +- 6 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 package/openssh/0001-configure-ac-detect-mips-abi.patch create mode 100644 package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch rename package/openssh/{0001-fix-pam-uclibc-pthreads-clash.patch => 0003-fix-pam-uclibc-pthreads-clash.patch} (100%) rename package/openssh/{0002-fix-howmany-include.patch => 0004-fix-howmany-include.patch} (100%) diff --git a/package/openssh/0001-configure-ac-detect-mips-abi.patch b/package/openssh/0001-configure-ac-detect-mips-abi.patch new file mode 100644 index 0000000000..0d43e6baf0 --- /dev/null +++ b/package/openssh/0001-configure-ac-detect-mips-abi.patch @@ -0,0 +1,44 @@ +From f4fcd8c788a4854d4ebae400cf55e3957f906835 Mon Sep 17 00:00:00 2001 +From: Vicente Olivert Riera +Date: Tue, 20 Jun 2017 16:42:11 +0100 +Subject: [PATCH] configure.ac: detect MIPS ABI + +Signed-off-by: Vicente Olivert Riera +[Upstream commit: ttps://github.com/openssh/openssh-portable/commit/f4fcd8c788a4854d4ebae400cf55e3957f906835] +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 18079acba..f990cfe08 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -746,6 +746,27 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) + fi + AC_CHECK_HEADERS([linux/seccomp.h linux/filter.h linux/audit.h], [], + [], [#include ]) ++ # Obtain MIPS ABI ++ case "$host" in ++ mips*) ++ AC_COMPILE_IFELSE([ ++#if _MIPS_SIM != _ABIO32 ++#error ++#endif ++ ],[mips_abi="o32"],[AC_COMPILE_IFELSE([ ++#if _MIPS_SIM != _ABIN32 ++#error ++#endif ++ ],[mips_abi="n32"],[AC_COMPILE_IFELSE([ ++#if _MIPS_SIM != _ABI64 ++#error ++#endif ++ ],[mips_abi="n64"],[AC_MSG_ERROR([unknown MIPS ABI]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac + AC_MSG_CHECKING([for seccomp architecture]) + seccomp_audit_arch= + case "$host" in diff --git a/package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch b/package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch new file mode 100644 index 0000000000..879af5e3d5 --- /dev/null +++ b/package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch @@ -0,0 +1,63 @@ +From afc3e31b637db9dae106d4fad78f7b481c8c24e3 Mon Sep 17 00:00:00 2001 +From: Vicente Olivert Riera +Date: Tue, 20 Jun 2017 16:42:28 +0100 +Subject: [PATCH] configure.ac: properly set seccomp_audit_arch for MIPS64 + +Currently seccomp_audit_arch is set to AUDIT_ARCH_MIPS64 or +AUDIT_ARCH_MIPSEL64 (depending on the endinness) when openssh is built +for MIPS64. However, that's only valid for n64 ABI. The right macros for +n32 ABI defined in seccomp.h are AUDIT_ARCH_MIPS64N32 and +AUDIT_ARCH_MIPSEL64N32, for big and little endian respectively. + +Because of that an sshd built for MIPS64 n32 rejects connection attempts +and the output of strace reveals that the problem is related to seccomp +audit: + +[pid 194] prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, {len=57, +filter=0x555d5da0}) = 0 +[pid 194] write(7, "\0\0\0]\0\0\0\5\0\0\0Ulist_hostkey_types: "..., 97) = ? +[pid 193] <... poll resumed> ) = 2 ([{fd=5, revents=POLLIN|POLLHUP}, +{fd=6, revents=POLLHUP}]) +[pid 194] +++ killed by SIGSYS +++ + +This patch fixes that problem by setting the right value to +seccomp_audit_arch taking into account the MIPS64 ABI. + +Signed-off-by: Vicente Olivert Riera +[Upstream commit: https://github.com/openssh/openssh-portable/commit/afc3e31b637db9dae106d4fad78f7b481c8c24e3] +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f990cfe08..5d640f679 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -801,10 +801,24 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) + seccomp_audit_arch=AUDIT_ARCH_MIPSEL + ;; + mips64-*) +- seccomp_audit_arch=AUDIT_ARCH_MIPS64 ++ case "$mips_abi" in ++ "n32") ++ seccomp_audit_arch=AUDIT_ARCH_MIPS64N32 ++ ;; ++ "n64") ++ seccomp_audit_arch=AUDIT_ARCH_MIPS64 ++ ;; ++ esac + ;; + mips64el-*) +- seccomp_audit_arch=AUDIT_ARCH_MIPSEL64 ++ case "$mips_abi" in ++ "n32") ++ seccomp_audit_arch=AUDIT_ARCH_MIPSEL64N32 ++ ;; ++ "n64") ++ seccomp_audit_arch=AUDIT_ARCH_MIPSEL64 ++ ;; ++ esac + ;; + esac + if test "x$seccomp_audit_arch" != "x" ; then diff --git a/package/openssh/0001-fix-pam-uclibc-pthreads-clash.patch b/package/openssh/0003-fix-pam-uclibc-pthreads-clash.patch similarity index 100% rename from package/openssh/0001-fix-pam-uclibc-pthreads-clash.patch rename to package/openssh/0003-fix-pam-uclibc-pthreads-clash.patch diff --git a/package/openssh/0002-fix-howmany-include.patch b/package/openssh/0004-fix-howmany-include.patch similarity index 100% rename from package/openssh/0002-fix-howmany-include.patch rename to package/openssh/0004-fix-howmany-include.patch diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index ed628fa98b..3685bc0dbf 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,2 @@ # From http://www.openssh.com/txt/release-7.5 (base64 encoded) sha256 9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 openssh-7.5p1.tar.gz -sha256 310860606c4175cdfd095e724f624df27340c89a916f7a09300bcb7988d5cfbf afc3e31b637db9dae106d4fad78f7b481c8c24e3.patch -sha256 395aa1006967713b599555440e09f898781a5559e496223587401768ece10904 f4fcd8c788a4854d4ebae400cf55e3957f906835.patch diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index dea7b472f0..f9167e504d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -9,11 +9,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3c, BSD-2c, Public Domain OPENSSH_LICENSE_FILES = LICENCE # Autoreconf needed due to the following patches modifying configure.ac: -# f4fcd8c788a4854d4ebae400cf55e3957f906835.patch -# afc3e31b637db9dae106d4fad78f7b481c8c24e3.patch +# 0001-configure-ac-detect-mips-abi.patch +# 0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch OPENSSH_AUTORECONF = YES -OPENSSH_PATCH = https://github.com/openssh/openssh-portable/commit/f4fcd8c788a4854d4ebae400cf55e3957f906835.patch \ - https://github.com/openssh/openssh-portable/commit/afc3e31b637db9dae106d4fad78f7b481c8c24e3.patch OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)" OPENSSH_CONF_OPTS = \ --sysconfdir=/etc/ssh \ From f0fb2d244df34f75bc71e39bc13c209a099c23cc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 26 Oct 2017 14:52:47 +0200 Subject: [PATCH 3386/3392] openssh: security bump to version 7.6p1 Fixes CVE-2017-15906 - The process_open function in sftp-server.c in OpenSSH before 7.6 does not properly prevent write operations in readonly mode, which allows attackers to create zero-length files. For more details, see the release notes: https://www.openssh.com/txt/release-7.6 Also add a hash for the license file while we're at it. Signed-off-by: Peter Korsgaard (cherry picked from commit 70663a9a4fcb9211fcef7668a8a35de11cc54775) Signed-off-by: Peter Korsgaard --- package/openssh/openssh.hash | 6 ++++-- package/openssh/openssh.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 3685bc0dbf..d8a4da32ad 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,2 +1,4 @@ -# From http://www.openssh.com/txt/release-7.5 (base64 encoded) -sha256 9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 openssh-7.5p1.tar.gz +# From http://www.openssh.com/txt/release-7.6 (base64 encoded) +sha256 a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723 openssh-7.6p1.tar.gz +# Locally calculated +sha256 05a4c25ef464e19656c5259bd4f4da8428efab01044f3541b79fbb3ff209350f LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index f9167e504d..368cb33fef 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION = 7.5p1 +OPENSSH_VERSION = 7.6p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3c, BSD-2c, Public Domain OPENSSH_LICENSE_FILES = LICENCE From f34e9d9f6ef6451f0cf47a7ca9d28ced7c8c5fdf Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Fri, 27 Oct 2017 19:10:33 +0300 Subject: [PATCH 3387/3392] webkitgtk: security bump to version 2.18.2 This is a maintenance release of the current stable WebKitGTK+ version, which contains bugfixes; mostly for crashes and rendering issues, plus one important fix for the layout or Arabic text. Release notes: https://webkitgtk.org/2017/10/27/webkitgtk2.18.2-released.html Even though an acconpanying security advisory has not been published for this release, the release contains fixes for several crashes (one of them for the decoder of the very common GIF image format), which arguably can be considered potential security issues. Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit e3459fd9c5cc4ddb04d22b534ef66b441e1aea71) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index f83bd0878a..b1161157e7 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,4 +1,4 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.18.1.tar.xz.sums -md5 951a6082ada2f7d0292d3251a3f9532b webkitgtk-2.18.1.tar.xz -sha1 5054dd6b8afdc6e98b947e361011d6dca6da74e2 webkitgtk-2.18.1.tar.xz -sha256 9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 webkitgtk-2.18.1.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.18.2.tar.xz.sums +md5 f63b3897d6fbf660bf72dfaca1fdea16 webkitgtk-2.18.2.tar.xz +sha1 75571807a1f8c9efdf62f1c37e9fadf52b73d367 webkitgtk-2.18.2.tar.xz +sha256 b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 webkitgtk-2.18.2.tar.xz diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 8b6c144fd5..092c24e028 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.18.1 +WEBKITGTK_VERSION = 2.18.2 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From 4a4d8f725885a17a660bb08c1e2ca0e0dc1cc23a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 28 Oct 2017 08:52:48 +0200 Subject: [PATCH 3388/3392] linux-headers: bump 4.{4, 9, 13}.x series [Peter: drop 4.13.x bump] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ec2851f4b97b19ab386e6f8d7ca52c277c2cee91) Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fedfd7a14f..ed02cb54c1 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.45" if BR2_KERNEL_HEADERS_4_1 - default "4.4.94" if BR2_KERNEL_HEADERS_4_4 + default "4.4.95" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 - default "4.9.58" if BR2_KERNEL_HEADERS_4_9 + default "4.9.59" if BR2_KERNEL_HEADERS_4_9 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From a34098ccc26e8deb599cdf158bd7934da79e8357 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 27 Oct 2017 14:02:08 +0200 Subject: [PATCH 3389/3392] wget: security bump to version 1.19.2 Fixes the following security issues: CVE-2017-13089: The http.c:skip_short_body() function is called in some circumstances, such as when processing redirects. When the response is sent chunked, the chunk parser uses strtol() to read each chunk's length, but doesn't check that the chunk length is a non-negative number. The code then tries to skip the chunk in pieces of 512 bytes by using the MIN() macro, but ends up passing the negative chunk length to connect.c:fd_read(). As fd_read() takes an int argument, the high 32 bits of the chunk length are discarded, leaving fd_read() with a completely attacker controlled length argument. CVE-2017-13090: The retr.c:fd_read_body() function is called when processing OK responses. When the response is sent chunked, the chunk parser uses strtol() to read each chunk's length, but doesn't check that the chunk length is a non-negative number. The code then tries to read the chunk in pieces of 8192 bytes by using the MIN() macro, but ends up passing the negative chunk length to retr.c:fd_read(). As fd_read() takes an int argument, the high 32 bits of the chunk length are discarded, leaving fd_read() with a completely attacker controlled length argument. The attacker can corrupt malloc metadata after the allocated buffer. Drop now upstreamed patch and change to .tar.lz as .tar.xz is no longer available. Also add a hash for the license file while we're at it. Signed-off-by: Peter Korsgaard (cherry picked from commit 86eb94636e0dcfaf332ba808eeee04a61b13af60) Signed-off-by: Peter Korsgaard --- ...Fix-CRLF-injection-in-Wget-host-part.patch | 40 ------------------- package/wget/wget.hash | 4 +- package/wget/wget.mk | 4 +- 3 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 package/wget/0001-Fix-CRLF-injection-in-Wget-host-part.patch diff --git a/package/wget/0001-Fix-CRLF-injection-in-Wget-host-part.patch b/package/wget/0001-Fix-CRLF-injection-in-Wget-host-part.patch deleted file mode 100644 index 380b075244..0000000000 --- a/package/wget/0001-Fix-CRLF-injection-in-Wget-host-part.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Mon, 6 Mar 2017 10:04:22 +0100 -Subject: [PATCH] Fix CRLF injection in Wget host part - -* src/url.c (url_parse): Reject control characters in host part of URL - -Reported-by: Orange Tsai -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit 4d729e322fae35 - - src/url.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/url.c b/src/url.c -index 8f8ff0b881af..7d36b27d7b92 100644 ---- a/src/url.c -+++ b/src/url.c -@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode) - url_unescape (u->host); - host_modified = true; - -+ /* check for invalid control characters in host name */ -+ for (p = u->host; *p; p++) -+ { -+ if (c_iscntrl(*p)) -+ { -+ url_free(u); -+ error_code = PE_INVALID_HOST_NAME; -+ goto error; -+ } -+ } -+ - /* Apply IDNA regardless of iri->utf8_encode status */ - if (opt.enable_iri && iri) - { --- -2.11.0 - diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 5f22396b05..0048557946 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,2 +1,4 @@ # Locally calculated after checking pgp signature -sha256 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 wget-1.19.1.tar.xz +sha256 d59a745ad2c522970660bb30d38601f9457b151b322e01fa20a5a0da0f55df07 wget-1.19.2.tar.lz +# Locally calculated +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 22e057dbae..1081bb99aa 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,8 +4,8 @@ # ################################################################################ -WGET_VERSION = 1.19.1 -WGET_SOURCE = wget-$(WGET_VERSION).tar.xz +WGET_VERSION = 1.19.2 +WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf WGET_LICENSE = GPLv3+ From 8232ff1ed3766446f52095671497ab454dab94c1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 27 Oct 2017 14:18:58 +0200 Subject: [PATCH 3390/3392] wget: add optional zlib support Signed-off-by: Peter Korsgaard (cherry picked from commit aff7673602d21b599470227edf323e72831dd3eb) Signed-off-by: Peter Korsgaard --- package/wget/wget.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 1081bb99aa..719e2dad9d 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -30,4 +30,11 @@ ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) WGET_DEPENDENCIES += util-linux endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +WGET_CONF_OPTS += --with-zlib +WGET_DEPENDENCIES += zlib +else +WGET_CONF_OPTS += --without-zlib +endif + $(eval $(autotools-package)) From dce5ba6dcb9edd60c54a0e5a559191c248e46e3d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 28 Oct 2017 20:47:31 +0200 Subject: [PATCH 3391/3392] Revert "musl: add upstream security fix for CVE-2017-15650" This reverts commit 5a9013c6d1203f107b64d7003e7621e75b3972af. This patch was already added by commit 4c05a1fd669be68, no need to add it twice. Signed-off-by: Peter Korsgaard --- ...allback-enforce-MAXADDRS-to-preclude.patch | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch diff --git a/package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch b/package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch deleted file mode 100644 index c6b5ef26b4..0000000000 --- a/package/musl/0003-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 45ca5d3fcb6f874bf5ba55d0e9651cef68515395 Mon Sep 17 00:00:00 2001 -From: Rich Felker -Date: Wed, 18 Oct 2017 14:50:03 -0400 -Subject: [PATCH] in dns parsing callback, enforce MAXADDRS to preclude - overflow - -MAXADDRS was chosen not to need enforcement, but the logic used to -compute it assumes the answers received match the RR types of the -queries. specifically, it assumes that only one replu contains A -record answers. if the replies to both the A and the AAAA query have -their answer sections filled with A records, MAXADDRS can be exceeded -and clobber the stack of the calling function. - -this bug was found and reported by Felix Wilhelm. - -Signed-off-by: Peter Korsgaard ---- - src/network/lookup_name.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c -index 066be4d5..209c20f0 100644 ---- a/src/network/lookup_name.c -+++ b/src/network/lookup_name.c -@@ -111,6 +111,7 @@ static int dns_parse_callback(void *c, int rr, const void *data, int len, const - { - char tmp[256]; - struct dpc_ctx *ctx = c; -+ if (ctx->cnt >= MAXADDRS) return -1; - switch (rr) { - case RR_A: - if (len != 4) return -1; --- -2.11.0 - From 05a2e38af23ecdb04f54da97f5ce2b1f7f41b842 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 28 Oct 2017 20:55:26 +0200 Subject: [PATCH 3392/3392] Update for 2017.02.7 Signed-off-by: Peter Korsgaard --- CHANGES | 18 ++++++++++++++++++ Makefile | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 56f1c32a5c..093f8f0473 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,21 @@ +2017.02.7, Released October 28th, 2017 + + Important / security related fixes. + + Webkitgtk bumped to the 2.18.x series, fixing a large number + of security issues. + + Defconfigs: wandboard: Correct rootfs offset + + Toolchain: Linaro toolchains updated to 2017.08 release, + fixing a number of issues. Musl: fix for CVE-2017-15650. + + Updated/fixed packages: busybox, bzip2, dnsmasq, git, go, + hostapd, irssi, iucode-tool, lame, libcurl, libffi, libnspr, + libnss, nodejs, openssh, openvpn, qemu, qt, redis, sdl2, + webkitgtk, wget, wpa_supplicant, xen, xlib_libXfont, + xlib_libXfont2, xserver_xorg-server + 2017.02.6, Released September 24th, 2017 Important / security related fixes. diff --git a/Makefile b/Makefile index 7a369b3703..ae36c66b41 100644 --- a/Makefile +++ b/Makefile @@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O) all: # Set and export the version string -export BR2_VERSION := 2017.02.6 +export BR2_VERSION := 2017.02.7 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1506285000 +BR2_VERSION_EPOCH = 1509216000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION)